fss-link 1.0.49 → 1.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fss-link",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "FSS Link - AI-powered coding assistant",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "sandboxImageUri": "ghcr.io/fsscoding/fss-link:0.0.10"
   },
   "dependencies": {
-    "fss-link-core": "1.0.46",
+    "fss-link-core": "1.0.48",
     "@google/genai": "1.9.0",
     "@iarna/toml": "^2.2.5",
     "@modelcontextprotocol/sdk": "^1.15.1",

package/dist/commands/mcp/add.test.ts

@@ -1,122 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import yargs from 'yargs';
-import { addCommand } from './add.js';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-
-vi.mock('fs/promises', () => ({
-  readFile: vi.fn(),
-  writeFile: vi.fn(),
-}));
-
-vi.mock('../../config/settings.js', async () => {
-  const actual = await vi.importActual('../../config/settings.js');
-  return {
-    ...actual,
-    loadSettings: vi.fn(),
-  };
-});
-
-const mockedLoadSettings = loadSettings as vi.Mock;
-
-describe('mcp add command', () => {
-  let parser: yargs.Argv;
-  let mockSetValue: vi.Mock;
-
-  beforeEach(() => {
-    vi.resetAllMocks();
-    const yargsInstance = yargs([]).command(addCommand);
-    parser = yargsInstance;
-    mockSetValue = vi.fn();
-    mockedLoadSettings.mockReturnValue({
-      forScope: () => ({ settings: {} }),
-      setValue: mockSetValue,
-    });
-  });
-
-  it('should add a stdio server to project settings', async () => {
-    await parser.parseAsync(
-      'add my-server /path/to/server arg1 arg2 -e FOO=bar',
-    );
-
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'my-server': {
-          command: '/path/to/server',
-          args: ['arg1', 'arg2'],
-          env: { FOO: 'bar' },
-        },
-      },
-    );
-  });
-
-  it('should add an sse server to user settings', async () => {
-    await parser.parseAsync(
-      'add --transport sse sse-server https://example.com/sse-endpoint --scope user -H "X-API-Key: your-key"',
-    );
-
-    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', {
-      'sse-server': {
-        url: 'https://example.com/sse-endpoint',
-        headers: { 'X-API-Key': 'your-key' },
-      },
-    });
-  });
-
-  it('should add an http server to project settings', async () => {
-    await parser.parseAsync(
-      'add --transport http http-server https://example.com/mcp -H "Authorization: Bearer your-token"',
-    );
-
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'http-server': {
-          httpUrl: 'https://example.com/mcp',
-          headers: { Authorization: 'Bearer your-token' },
-        },
-      },
-    );
-  });
-
-  it('should handle MCP server args with -- separator', async () => {
-    await parser.parseAsync(
-      'add my-server npx -- -y http://example.com/some-package',
-    );
-
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'my-server': {
-          command: 'npx',
-          args: ['-y', 'http://example.com/some-package'],
-        },
-      },
-    );
-  });
-
-  it('should handle unknown options as MCP server args', async () => {
-    await parser.parseAsync(
-      'add test-server npx -y http://example.com/some-package',
-    );
-
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'test-server': {
-          command: 'npx',
-          args: ['-y', 'http://example.com/some-package'],
-        },
-      },
-    );
-  });
-});

package/dist/commands/mcp/add.ts

@@ -1,222 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// File for 'gemini mcp add' command
-import type { CommandModule } from 'yargs';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { MCPServerConfig } from 'fss-link-core';
-
-async function addMcpServer(
-  name: string,
-  commandOrUrl: string,
-  args: Array<string | number> | undefined,
-  options: {
-    scope: string;
-    transport: string;
-    env: string[] | undefined;
-    header: string[] | undefined;
-    timeout?: number;
-    trust?: boolean;
-    description?: string;
-    includeTools?: string[];
-    excludeTools?: string[];
-  },
-) {
-  const {
-    scope,
-    transport,
-    env,
-    header,
-    timeout,
-    trust,
-    description,
-    includeTools,
-    excludeTools,
-  } = options;
-  const settingsScope =
-    scope === 'user' ? SettingScope.User : SettingScope.Workspace;
-  const settings = loadSettings(process.cwd());
-
-  let newServer: Partial<MCPServerConfig> = {};
-
-  const headers = header?.reduce(
-    (acc, curr) => {
-      const [key, ...valueParts] = curr.split(':');
-      const value = valueParts.join(':').trim();
-      if (key.trim() && value) {
-        acc[key.trim()] = value;
-      }
-      return acc;
-    },
-    {} as Record<string, string>,
-  );
-
-  switch (transport) {
-    case 'sse':
-      newServer = {
-        url: commandOrUrl,
-        headers,
-        timeout,
-        trust,
-        description,
-        includeTools,
-        excludeTools,
-      };
-      break;
-    case 'http':
-      newServer = {
-        httpUrl: commandOrUrl,
-        headers,
-        timeout,
-        trust,
-        description,
-        includeTools,
-        excludeTools,
-      };
-      break;
-    case 'stdio':
-    default:
-      newServer = {
-        command: commandOrUrl,
-        args: args?.map(String),
-        env: env?.reduce(
-          (acc, curr) => {
-            const [key, value] = curr.split('=');
-            if (key && value) {
-              acc[key] = value;
-            }
-            return acc;
-          },
-          {} as Record<string, string>,
-        ),
-        timeout,
-        trust,
-        description,
-        includeTools,
-        excludeTools,
-      };
-      break;
-  }
-
-  const existingSettings = settings.forScope(settingsScope).settings;
-  const mcpServers = existingSettings.mcpServers || {};
-
-  const isExistingServer = !!mcpServers[name];
-  if (isExistingServer) {
-    console.log(
-      `MCP server "${name}" is already configured within ${scope} settings.`,
-    );
-  }
-
-  mcpServers[name] = newServer as MCPServerConfig;
-
-  settings.setValue(settingsScope, 'mcpServers', mcpServers);
-
-  if (isExistingServer) {
-    console.log(`MCP server "${name}" updated in ${scope} settings.`);
-  } else {
-    console.log(
-      `MCP server "${name}" added to ${scope} settings. (${transport})`,
-    );
-  }
-}
-
-export const addCommand: CommandModule = {
-  command: 'add <name> <commandOrUrl> [args...]',
-  describe: 'Add a server',
-  builder: (yargs) =>
-    yargs
-      .usage('Usage: gemini mcp add [options] <name> <commandOrUrl> [args...]')
-      .parserConfiguration({
-        'unknown-options-as-args': true, // Pass unknown options as server args
-        'populate--': true, // Populate server args after -- separator
-      })
-      .positional('name', {
-        describe: 'Name of the server',
-        type: 'string',
-        demandOption: true,
-      })
-      .positional('commandOrUrl', {
-        describe: 'Command (stdio) or URL (sse, http)',
-        type: 'string',
-        demandOption: true,
-      })
-      .option('scope', {
-        alias: 's',
-        describe: 'Configuration scope (user or project)',
-        type: 'string',
-        default: 'project',
-        choices: ['user', 'project'],
-      })
-      .option('transport', {
-        alias: 't',
-        describe: 'Transport type (stdio, sse, http)',
-        type: 'string',
-        default: 'stdio',
-        choices: ['stdio', 'sse', 'http'],
-      })
-      .option('env', {
-        alias: 'e',
-        describe: 'Set environment variables (e.g. -e KEY=value)',
-        type: 'array',
-        string: true,
-      })
-      .option('header', {
-        alias: 'H',
-        describe:
-          'Set HTTP headers for SSE and HTTP transports (e.g. -H "X-Api-Key: abc123" -H "Authorization: Bearer abc123")',
-        type: 'array',
-        string: true,
-      })
-      .option('timeout', {
-        describe: 'Set connection timeout in milliseconds',
-        type: 'number',
-      })
-      .option('trust', {
-        describe:
-          'Trust the server (bypass all tool call confirmation prompts)',
-        type: 'boolean',
-      })
-      .option('description', {
-        describe: 'Set the description for the server',
-        type: 'string',
-      })
-      .option('include-tools', {
-        describe: 'A comma-separated list of tools to include',
-        type: 'array',
-        string: true,
-      })
-      .option('exclude-tools', {
-        describe: 'A comma-separated list of tools to exclude',
-        type: 'array',
-        string: true,
-      })
-      .middleware((argv) => {
-        // Handle -- separator args as server args if present
-        if (argv['--']) {
-          const existingArgs = (argv['args'] as Array<string | number>) || [];
-          argv['args'] = [...existingArgs, ...(argv['--'] as string[])];
-        }
-      }),
-  handler: async (argv) => {
-    await addMcpServer(
-      argv['name'] as string,
-      argv['commandOrUrl'] as string,
-      argv['args'] as Array<string | number>,
-      {
-        scope: argv['scope'] as string,
-        transport: argv['transport'] as string,
-        env: argv['env'] as string[],
-        header: argv['header'] as string[],
-        timeout: argv['timeout'] as number | undefined,
-        trust: argv['trust'] as boolean | undefined,
-        description: argv['description'] as string | undefined,
-        includeTools: argv['includeTools'] as string[] | undefined,
-        excludeTools: argv['excludeTools'] as string[] | undefined,
-      },
-    );
-  },
-};

package/dist/commands/mcp/list.test.ts

@@ -1,154 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { listMcpServers } from './list.js';
-import { loadSettings } from '../../config/settings.js';
-import { loadExtensions } from '../../config/extension.js';
-import { createTransport } from 'fss-link-core';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-
-vi.mock('../../config/settings.js');
-vi.mock('../../config/extension.js');
-vi.mock('fss-link-core');
-vi.mock('@modelcontextprotocol/sdk/client/index.js');
-
-const mockedLoadSettings = loadSettings as vi.Mock;
-const mockedLoadExtensions = loadExtensions as vi.Mock;
-const mockedCreateTransport = createTransport as vi.Mock;
-const MockedClient = Client as vi.Mock;
-
-interface MockClient {
-  connect: vi.Mock;
-  ping: vi.Mock;
-  close: vi.Mock;
-}
-
-interface MockTransport {
-  close: vi.Mock;
-}
-
-describe('mcp list command', () => {
-  let consoleSpy: vi.SpyInstance;
-  let mockClient: MockClient;
-  let mockTransport: MockTransport;
-
-  beforeEach(() => {
-    vi.resetAllMocks();
-
-    consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-
-    mockTransport = { close: vi.fn() };
-    mockClient = {
-      connect: vi.fn(),
-      ping: vi.fn(),
-      close: vi.fn(),
-    };
-
-    MockedClient.mockImplementation(() => mockClient);
-    mockedCreateTransport.mockResolvedValue(mockTransport);
-    mockedLoadExtensions.mockReturnValue([]);
-  });
-
-  afterEach(() => {
-    consoleSpy.mockRestore();
-  });
-
-  it('should display message when no servers configured', async () => {
-    mockedLoadSettings.mockReturnValue({ merged: { mcpServers: {} } });
-
-    await listMcpServers();
-
-    expect(consoleSpy).toHaveBeenCalledWith('No MCP servers configured.');
-  });
-
-  it('should display different server types with connected status', async () => {
-    mockedLoadSettings.mockReturnValue({
-      merged: {
-        mcpServers: {
-          'stdio-server': { command: '/path/to/server', args: ['arg1'] },
-          'sse-server': { url: 'https://example.com/sse' },
-          'http-server': { httpUrl: 'https://example.com/http' },
-        },
-      },
-    });
-
-    mockClient.connect.mockResolvedValue(undefined);
-    mockClient.ping.mockResolvedValue(undefined);
-
-    await listMcpServers();
-
-    expect(consoleSpy).toHaveBeenCalledWith('Configured MCP servers:\n');
-    expect(consoleSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'stdio-server: /path/to/server arg1 (stdio) - Connected',
-      ),
-    );
-    expect(consoleSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'sse-server: https://example.com/sse (sse) - Connected',
-      ),
-    );
-    expect(consoleSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'http-server: https://example.com/http (http) - Connected',
-      ),
-    );
-  });
-
-  it('should display disconnected status when connection fails', async () => {
-    mockedLoadSettings.mockReturnValue({
-      merged: {
-        mcpServers: {
-          'test-server': { command: '/test/server' },
-        },
-      },
-    });
-
-    mockClient.connect.mockRejectedValue(new Error('Connection failed'));
-
-    await listMcpServers();
-
-    expect(consoleSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'test-server: /test/server  (stdio) - Disconnected',
-      ),
-    );
-  });
-
-  it('should merge extension servers with config servers', async () => {
-    mockedLoadSettings.mockReturnValue({
-      merged: {
-        mcpServers: { 'config-server': { command: '/config/server' } },
-      },
-    });
-
-    mockedLoadExtensions.mockReturnValue([
-      {
-        config: {
-          name: 'test-extension',
-          mcpServers: { 'extension-server': { command: '/ext/server' } },
-        },
-      },
-    ]);
-
-    mockClient.connect.mockResolvedValue(undefined);
-    mockClient.ping.mockResolvedValue(undefined);
-
-    await listMcpServers();
-
-    expect(consoleSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'config-server: /config/server  (stdio) - Connected',
-      ),
-    );
-    expect(consoleSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'extension-server: /ext/server  (stdio) - Connected',
-      ),
-    );
-  });
-});

package/dist/commands/mcp/list.ts

@@ -1,139 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// File for 'gemini mcp list' command
-import type { CommandModule } from 'yargs';
-import { loadSettings } from '../../config/settings.js';
-import {
-  MCPServerConfig,
-  MCPServerStatus,
-  createTransport,
-} from 'fss-link-core';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { loadExtensions } from '../../config/extension.js';
-
-const COLOR_GREEN = '\u001b[32m';
-const COLOR_YELLOW = '\u001b[33m';
-const COLOR_RED = '\u001b[31m';
-const RESET_COLOR = '\u001b[0m';
-
-async function getMcpServersFromConfig(): Promise<
-  Record<string, MCPServerConfig>
-> {
-  const settings = loadSettings(process.cwd());
-  const extensions = loadExtensions(process.cwd());
-  const mcpServers = { ...(settings.merged.mcpServers || {}) };
-  for (const extension of extensions) {
-    Object.entries(extension.config.mcpServers || {}).forEach(
-      ([key, server]) => {
-        if (mcpServers[key]) {
-          return;
-        }
-        mcpServers[key] = {
-          ...server,
-          extensionName: extension.config.name,
-        };
-      },
-    );
-  }
-  return mcpServers;
-}
-
-async function testMCPConnection(
-  serverName: string,
-  config: MCPServerConfig,
-): Promise<MCPServerStatus> {
-  const client = new Client({
-    name: 'mcp-test-client',
-    version: '0.0.1',
-  });
-
-  let transport;
-  try {
-    // Use the same transport creation logic as core
-    transport = await createTransport(serverName, config, false);
-  } catch (_error) {
-    await client.close();
-    return MCPServerStatus.DISCONNECTED;
-  }
-
-  try {
-    // Attempt actual MCP connection with short timeout
-    await client.connect(transport, { timeout: 5000 }); // 5s timeout
-
-    // Test basic MCP protocol by pinging the server
-    await client.ping();
-
-    await client.close();
-    return MCPServerStatus.CONNECTED;
-  } catch (_error) {
-    await transport.close();
-    return MCPServerStatus.DISCONNECTED;
-  }
-}
-
-async function getServerStatus(
-  serverName: string,
-  server: MCPServerConfig,
-): Promise<MCPServerStatus> {
-  // Test all server types by attempting actual connection
-  return await testMCPConnection(serverName, server);
-}
-
-export async function listMcpServers(): Promise<void> {
-  const mcpServers = await getMcpServersFromConfig();
-  const serverNames = Object.keys(mcpServers);
-
-  if (serverNames.length === 0) {
-    console.log('No MCP servers configured.');
-    return;
-  }
-
-  console.log('Configured MCP servers:\n');
-
-  for (const serverName of serverNames) {
-    const server = mcpServers[serverName];
-
-    const status = await getServerStatus(serverName, server);
-
-    let statusIndicator = '';
-    let statusText = '';
-    switch (status) {
-      case MCPServerStatus.CONNECTED:
-        statusIndicator = COLOR_GREEN + '✓' + RESET_COLOR;
-        statusText = 'Connected';
-        break;
-      case MCPServerStatus.CONNECTING:
-        statusIndicator = COLOR_YELLOW + '…' + RESET_COLOR;
-        statusText = 'Connecting';
-        break;
-      case MCPServerStatus.DISCONNECTED:
-      default:
-        statusIndicator = COLOR_RED + '✗' + RESET_COLOR;
-        statusText = 'Disconnected';
-        break;
-    }
-
-    let serverInfo = `${serverName}: `;
-    if (server.httpUrl) {
-      serverInfo += `${server.httpUrl} (http)`;
-    } else if (server.url) {
-      serverInfo += `${server.url} (sse)`;
-    } else if (server.command) {
-      serverInfo += `${server.command} ${server.args?.join(' ') || ''} (stdio)`;
-    }
-
-    console.log(`${statusIndicator} ${serverInfo} - ${statusText}`);
-  }
-}
-
-export const listCommand: CommandModule = {
-  command: 'list',
-  describe: 'List all configured MCP servers',
-  handler: async () => {
-    await listMcpServers();
-  },
-};