@gguf/coder 0.2.9 → 0.3.1

package/source/wizard/validation-array.spec.ts

@@ -0,0 +1,264 @@
+import test from 'ava';
+import type {ProviderConfig} from '../types/config';
+import type {McpServerConfig} from './templates/mcp-templates';
+import {buildConfigObject, validateConfig} from './validation';
+
+// ============================================================================
+// Tests for Issue #95 Fix: Record to Array Conversion
+// ============================================================================
+
+test('buildConfigObject: converts MCP servers from Record to Array', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers: Record<string, McpServerConfig> = {
+		filesystem: {
+			name: 'filesystem',
+			transport: 'stdio',
+			command: 'npx',
+			args: ['-y', '@modelcontextprotocol/server-filesystem', '/tmp'],
+		},
+		github: {
+			name: 'github',
+			transport: 'stdio',
+			command: 'npx',
+			args: ['-y', '@modelcontextprotocol/server-github'],
+			env: {GITHUB_TOKEN: 'token'},
+		},
+	};
+
+	const config = buildConfigObject(providers, mcpServers);
+
+	// Should be an array, not an object
+	t.truthy(config.coder.mcpServers);
+	t.true(Array.isArray(config.coder.mcpServers));
+
+	// Should have correct length
+	t.is(config.coder.mcpServers!.length, 2);
+
+	// Should contain all servers
+	const serverNames = config.coder.mcpServers!.map(s => s.name);
+	t.true(serverNames.includes('filesystem'));
+	t.true(serverNames.includes('github'));
+});
+
+test('buildConfigObject: preserves all server fields in array format', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers: Record<string, McpServerConfig> = {
+		filesystem: {
+			name: 'filesystem',
+			transport: 'stdio',
+			command: 'npx',
+			args: ['-y', '@modelcontextprotocol/server-filesystem', '/tmp'],
+			description: 'File system access',
+			tags: ['files', 'local'],
+		},
+		'remote-server': {
+			name: 'remote-server',
+			transport: 'http',
+			url: 'https://example.com/mcp',
+			timeout: 30000,
+			description: 'Remote MCP server',
+			tags: ['remote', 'http'],
+		},
+	};
+
+	const config = buildConfigObject(providers, mcpServers);
+
+	const filesystemServer = config.coder.mcpServers!.find(
+		s => s.name === 'filesystem',
+	);
+	const remoteServer = config.coder.mcpServers!.find(
+		s => s.name === 'remote-server',
+	);
+
+	// Test stdio server fields
+	t.truthy(filesystemServer);
+	t.is(filesystemServer!.name, 'filesystem');
+	t.is(filesystemServer!.transport, 'stdio');
+	t.is(filesystemServer!.command, 'npx');
+	t.deepEqual(filesystemServer!.args, [
+		'-y',
+		'@modelcontextprotocol/server-filesystem',
+		'/tmp',
+	]);
+	t.is(filesystemServer!.description, 'File system access');
+	t.deepEqual(filesystemServer!.tags, ['files', 'local']);
+
+	// Test remote server fields
+	t.truthy(remoteServer);
+	t.is(remoteServer!.name, 'remote-server');
+	t.is(remoteServer!.transport, 'http');
+	t.is(remoteServer!.url, 'https://example.com/mcp');
+	t.is(remoteServer!.timeout, 30000);
+	t.is(remoteServer!.description, 'Remote MCP server');
+	t.deepEqual(remoteServer!.tags, ['remote', 'http']);
+});
+
+test('buildConfigObject: sets enabled flag for wizard-generated configs', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers: Record<string, McpServerConfig> = {
+		testServer: {
+			name: 'test-server',
+			transport: 'stdio',
+			command: 'node',
+			args: ['server.js'],
+		},
+	};
+
+	const config = buildConfigObject(providers, mcpServers);
+
+	const testServer = config.coder.mcpServers!.find(
+		s => s.name === 'test-server',
+	);
+	t.truthy(testServer);
+	t.true(testServer!.enabled); // Should default to true for wizard configurations
+});
+
+test('buildConfigObject: handles empty MCP servers', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	// When no MCP servers are provided, mcpServers should be undefined
+	t.is(config.coder.mcpServers, undefined);
+});
+
+test('buildConfigObject: maintains providers configuration', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'openai',
+			apiKey: 'sk-test-key',
+			models: ['gpt-4'],
+			timeout: 60000,
+		},
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	t.is(config.coder.providers.length, 2);
+	t.is(config.coder.providers[0].name, 'openai');
+	t.is(config.coder.providers[0].apiKey, 'sk-test-key');
+	t.is(config.coder.providers[1].name, 'ollama');
+	t.is(config.coder.providers[1].baseUrl, 'http://localhost:11434');
+});
+
+// ============================================================================
+// Backward Compatibility Tests
+// ============================================================================
+
+test('validateConfig: works with both old and new MCP server formats', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	// New format with transport field
+	const mcpServersNew: Record<string, McpServerConfig> = {
+		filesystem: {
+			name: 'filesystem',
+			transport: 'stdio',
+			command: 'npx',
+			args: ['-y', '@modelcontextprotocol/server-filesystem', '/tmp'],
+		},
+	};
+
+	const result = validateConfig(providers, mcpServersNew);
+	t.true(result.valid);
+	t.is(result.errors.length, 0);
+});
+
+test('buildConfigObject: maintains backward compatibility with provider fields', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'anthropic',
+			apiKey: 'sk-ant-test',
+			models: ['claude-3-sonnet'],
+			organizationId: 'org-123',
+			timeout: 45000,
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	const provider = config.coder.providers[0];
+	t.is(provider.name, 'anthropic');
+	t.is(provider.apiKey, 'sk-ant-test');
+	t.deepEqual(provider.models, ['claude-3-sonnet']);
+	t.is(provider.organizationId, 'org-123');
+	t.is(provider.timeout, 45000);
+});
+
+test('buildConfigObject: correctly maps all transport types', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers: Record<string, McpServerConfig> = {
+		stdioServer: {
+			name: 'stdioServer',
+			transport: 'stdio',
+			command: 'node',
+			args: ['server.js'],
+		},
+		wsServer: {
+			name: 'wsServer',
+			transport: 'websocket',
+			url: 'ws://localhost:3000/mcp',
+		},
+		httpServer: {
+			name: 'httpServer',
+			transport: 'http',
+			url: 'https://example.com/mcp',
+		},
+	};
+
+	const config = buildConfigObject(providers, mcpServers);
+
+	const servers = config.coder.mcpServers!;
+
+	const stdio = servers.find(s => s.name === 'stdioServer');
+	const ws = servers.find(s => s.name === 'wsServer');
+	const http = servers.find(s => s.name === 'httpServer');
+
+	t.is(stdio?.transport, 'stdio');
+	t.is(ws?.transport, 'websocket');
+	t.is(http?.transport, 'http');
+});

package/source/wizard/validation.spec.ts

@@ -0,0 +1,373 @@
+import test from 'ava';
+import type {ProviderConfig} from '../types/config.js';
+import type {McpServerConfig} from './templates/mcp-templates.js';
+import {
+	buildConfigObject,
+	testProviderConnection,
+	validateConfig,
+} from './validation.js';
+
+// ============================================================================
+// Tests for validateConfig
+// ============================================================================
+
+test('validateConfig: returns valid for correct configuration', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers: Record<string, McpServerConfig> = {
+		filesystem: {
+			name: 'filesystem',
+			transport: 'stdio',
+			command: 'npx',
+			args: ['-y', '@modelcontextprotocol/server-filesystem', '/tmp'],
+		},
+	};
+
+	const result = validateConfig(providers, mcpServers);
+
+	t.true(result.valid);
+	t.is(result.errors.length, 0);
+	t.is(result.warnings.length, 0);
+});
+
+test('validateConfig: warns when no providers configured', t => {
+	const providers: ProviderConfig[] = [];
+	const mcpServers: Record<string, McpServerConfig> = {};
+
+	const result = validateConfig(providers, mcpServers);
+
+	t.true(result.valid); // Warnings don't invalidate, only errors do
+	t.is(result.warnings.length, 1);
+	t.regex(result.warnings[0], /No providers configured/);
+});
+
+test('validateConfig: errors when provider missing name', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: '',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const result = validateConfig(providers, {});
+
+	t.false(result.valid);
+	t.is(result.errors.length, 1);
+	t.regex(result.errors[0], /Provider missing name/);
+});
+
+test('validateConfig: errors when provider has no models', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: [],
+		},
+	];
+
+	const result = validateConfig(providers, {});
+
+	t.false(result.valid);
+	t.is(result.errors.length, 1);
+	t.regex(result.errors[0], /has no models configured/);
+});
+
+test('validateConfig: errors when provider has invalid base URL', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'not-a-valid-url',
+			models: ['llama2'],
+		},
+	];
+
+	const result = validateConfig(providers, {});
+
+	t.false(result.valid);
+	t.is(result.errors.length, 1);
+	t.regex(result.errors[0], /invalid base URL/);
+});
+
+test('validateConfig: errors when MCP server missing command', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers = {
+		filesystem: {
+			name: 'filesystem',
+			args: ['-y', '@modelcontextprotocol/server-filesystem', '/tmp'],
+		},
+	} as unknown as Record<string, McpServerConfig>;
+
+	const result = validateConfig(providers, mcpServers);
+
+	t.false(result.valid);
+	t.is(result.errors.length, 1);
+	t.regex(result.errors[0], /missing command/);
+});
+
+test('validateConfig: errors when MCP server missing args', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers = {
+		filesystem: {name: 'filesystem', transport: 'stdio', command: 'npx'},
+	} as unknown as Record<string, McpServerConfig>;
+
+	const result = validateConfig(providers, mcpServers);
+
+	t.false(result.valid);
+	t.is(result.errors.length, 1);
+	t.regex(result.errors[0], /missing args array/);
+});
+
+test('validateConfig: accumulates multiple errors', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: '',
+			baseUrl: 'invalid-url',
+			models: [],
+		},
+		{
+			name: 'provider2',
+			baseUrl: 'http://localhost:11434',
+			models: [],
+		},
+	];
+
+	const result = validateConfig(providers, {});
+
+	t.false(result.valid);
+	t.true(result.errors.length >= 3); // Missing name, invalid URL, no models (×2)
+});
+
+// ============================================================================
+// Tests for buildConfigObject
+// ============================================================================
+
+test('buildConfigObject: builds correct config with providers only', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2', 'codellama'],
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	t.truthy(config.coder);
+	t.is(config.coder.providers.length, 1);
+	t.is(config.coder.providers[0].name, 'ollama');
+	t.is(config.coder.providers[0].baseUrl, 'http://localhost:11434');
+	t.deepEqual(config.coder.providers[0].models, ['llama2', 'codellama']);
+	t.is(config.coder.mcpServers, undefined);
+});
+
+test('buildConfigObject: includes MCP servers when provided', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers: Record<string, McpServerConfig> = {
+		filesystem: {
+			name: 'filesystem',
+			transport: 'stdio',
+			command: 'npx',
+			args: ['-y', '@modelcontextprotocol/server-filesystem', '/tmp'],
+		},
+	};
+
+	const config = buildConfigObject(providers, mcpServers);
+
+	t.truthy(config.coder.mcpServers);
+	t.true(Array.isArray(config.coder.mcpServers));
+	const filesystemServer = config.coder.mcpServers?.find(
+		s => s.name === 'filesystem',
+	);
+	t.truthy(filesystemServer);
+	t.is(filesystemServer?.command, 'npx');
+});
+
+test('buildConfigObject: includes apiKey when present', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'openai',
+			apiKey: 'sk-test-key',
+			models: ['gpt-4'],
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	t.is(config.coder.providers[0].apiKey, 'sk-test-key');
+});
+
+test('buildConfigObject: includes organizationId when present', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'openai',
+			organizationId: 'org-123',
+			models: ['gpt-4'],
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	t.is(config.coder.providers[0].organizationId, 'org-123');
+});
+
+test('buildConfigObject: includes timeout when present', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			timeout: 30000,
+			models: ['llama2'],
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	t.is(config.coder.providers[0].timeout, 30000);
+});
+
+test('buildConfigObject: omits optional fields when not present', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	t.is(config.coder.providers[0].apiKey, undefined);
+	t.is(config.coder.providers[0].organizationId, undefined);
+	t.is(config.coder.providers[0].timeout, undefined);
+});
+
+test('buildConfigObject: handles multiple providers', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+		{
+			name: 'openai',
+			apiKey: 'sk-test',
+			models: ['gpt-4'],
+		},
+	];
+
+	const config = buildConfigObject(providers, {});
+
+	t.is(config.coder.providers.length, 2);
+	t.is(config.coder.providers[0].name, 'ollama');
+	t.is(config.coder.providers[1].name, 'openai');
+});
+
+test('buildConfigObject: handles multiple MCP servers', t => {
+	const providers: ProviderConfig[] = [
+		{
+			name: 'ollama',
+			baseUrl: 'http://localhost:11434',
+			models: ['llama2'],
+		},
+	];
+
+	const mcpServers: Record<string, McpServerConfig> = {
+		filesystem: {
+			name: 'filesystem',
+			transport: 'stdio',
+			command: 'npx',
+			args: ['-y', '@modelcontextprotocol/server-filesystem', '/tmp'],
+		},
+		github: {
+			name: 'github',
+			transport: 'stdio',
+			command: 'npx',
+			args: ['-y', '@modelcontextprotocol/server-github'],
+			env: {GITHUB_TOKEN: 'token'},
+		},
+	};
+
+	const config = buildConfigObject(providers, mcpServers);
+
+	t.is(Object.keys(config.coder.mcpServers ?? {}).length, 2);
+	const filesystemServer = config.coder.mcpServers?.find(
+		s => s.name === 'filesystem',
+	);
+	const githubServer = config.coder.mcpServers?.find(
+		s => s.name === 'github',
+	);
+	t.truthy(filesystemServer);
+	t.truthy(githubServer);
+});
+
+// ============================================================================
+// Tests for testProviderConnection
+// ============================================================================
+
+test('testProviderConnection: returns connected=true when no baseUrl', async t => {
+	const provider: ProviderConfig = {
+		name: 'openai',
+		models: ['gpt-4'],
+	};
+
+	const result = await testProviderConnection(provider);
+
+	t.is(result.providerName, 'openai');
+	t.true(result.connected);
+	t.is(result.error, undefined);
+});
+
+test('testProviderConnection: returns connected=true for non-localhost URLs', async t => {
+	const provider: ProviderConfig = {
+		name: 'openai',
+		baseUrl: 'https://api.openai.com',
+		models: ['gpt-4'],
+	};
+
+	const result = await testProviderConnection(provider);
+
+	t.is(result.providerName, 'openai');
+	t.true(result.connected);
+});
+
+test('testProviderConnection: returns connected=false for unreachable localhost', async t => {
+	const provider: ProviderConfig = {
+		name: 'ollama',
+		baseUrl: 'http://localhost:99999',
+		models: ['llama2'],
+	};
+
+	const result = await testProviderConnection(provider, 1000);
+
+	t.is(result.providerName, 'ollama');
+	t.false(result.connected);
+	t.truthy(result.error);
+});