mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-03-17 10:03:08 +00:00
* fix(copilot): correct tool.execution_complete event handling The CopilotProvider was using incorrect event type and data structure for tool execution completion events from the @github/copilot-sdk, causing tool call outputs to be empty. Changes: - Update event type from 'tool.execution_end' to 'tool.execution_complete' - Fix data structure to use nested result.content instead of flat result - Fix error structure to use error.message instead of flat error - Add success field to match SDK event structure - Add tests for empty and missing result handling This aligns with the official @github/copilot-sdk v0.1.16 types defined in session-events.d.ts. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test(copilot): add edge case test for error with code field Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor(copilot): improve error handling and code quality Code review improvements: - Extract magic string '[ERROR]' to TOOL_ERROR_PREFIX constant - Add null-safe error handling with direct error variable assignment - Include error codes in error messages for better debugging - Add JSDoc documentation for tool.execution_complete handler - Update tests to verify error codes are displayed - Add missing tool_use_id assertion in error test These changes improve: - Code maintainability (no magic strings) - Debugging experience (error codes now visible) - Type safety (explicit null checks) - Test coverage (verify error code formatting) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Changes from fix/bug-fixes-1-0 * test(copilot): add edge case test for error with code field Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Changes from fix/bug-fixes-1-0 * fix: Handle detached HEAD state in worktree discovery and recovery * fix: Remove unused isDevServerStarting prop and md: breakpoint classes * fix: Add missing dependency and sanitize persisted cache data * feat: Ensure NODE_ENV is set to test in vitest configs * feat: Configure Playwright to run only E2E tests * fix: Improve PR tracking and dev server lifecycle management * feat: Add settings-based defaults for planning mode, model config, and custom providers. Fixes #816 * feat: Add worktree and branch selector to graph view * fix: Add timeout and error handling for worktree HEAD ref resolution * fix: use absolute icon path and place icon outside asar on Linux The hicolor icon theme index only lists sizes up to 512x512, so an icon installed only at 1024x1024 is invisible to GNOME/KDE's theme resolver, causing both the app launcher and taskbar to show a generic icon. Additionally, BrowserWindow.icon cannot be read by the window manager when the file is inside app.asar. - extraResources: copy logo_larger.png to resources/ (outside asar) so it lands at /opt/Automaker/resources/logo_larger.png on install - linux.desktop.Icon: set to the absolute resources path, bypassing the hicolor theme lookup and its size constraints entirely - icon-manager.ts: on Linux production use process.resourcesPath so BrowserWindow receives a real filesystem path the WM can read directly Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: use linux.desktop.entry for custom desktop Icon field electron-builder v26 rejects arbitrary keys in linux.desktop — the correct schema wraps custom .desktop overrides inside desktop.entry. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: set desktop name on Linux so taskbar uses the correct app icon Without app.setDesktopName(), the window manager cannot associate the running Electron process with automaker.desktop. GNOME/KDE fall back to _NET_WM_ICON which defaults to Electron's own bundled icon. Calling app.setDesktopName('automaker.desktop') before any window is created sets the _GTK_APPLICATION_ID hint and XDG app_id so the WM picks up the desktop entry's Icon for the taskbar. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Fix: memory and context views mobile friendly (#818) * Changes from fix/memory-and-context-mobile-friendly * fix: Improve file extension detection and add path traversal protection * refactor: Extract file extension utilities and add path traversal guards Code review improvements: - Extract isMarkdownFilename and isImageFilename to shared image-utils.ts - Remove duplicated code from context-view.tsx and memory-view.tsx - Add path traversal guard for context fixture utilities (matching memory) - Add 7 new tests for context fixture path traversal protection - Total 61 tests pass Addresses code review feedback from PR #813 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * test: Add e2e tests for profiles crud and board background persistence * Update apps/ui/playwright.config.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix: Add robust test navigation handling and file filtering * fix: Format NODE_OPTIONS configuration on single line * test: Update profiles and board background persistence tests * test: Replace iPhone 13 Pro with Pixel 5 for mobile test consistency * Update apps/ui/src/components/views/context-view.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * chore: Remove test project directory * feat: Filter context files by type and improve mobile menu visibility --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix: Improve test reliability and localhost handling * chore: Use explicit TEST_USE_EXTERNAL_BACKEND env var for server cleanup * feat: Add E2E/CI mock mode for provider factory and auth verification * feat: Add remoteBranch parameter to pull and rebase operations * chore: Enhance E2E testing setup with worker isolation and auth state management - Updated .gitignore to include worker-specific test fixtures. - Modified e2e-tests.yml to implement test sharding for improved CI performance. - Refactored global setup to authenticate once and save session state for reuse across tests. - Introduced worker-isolated fixture paths to prevent conflicts during parallel test execution. - Improved test navigation and loading handling for better reliability. - Updated various test files to utilize new auth state management and fixture paths. * fix: Update Playwright configuration and improve test reliability - Increased the number of workers in Playwright configuration for better parallelism in CI environments. - Enhanced the board background persistence test to ensure dropdown stability by waiting for the list to populate before interaction, improving test reliability. * chore: Simplify E2E test configuration and enhance mock implementations - Updated e2e-tests.yml to run tests in a single shard for streamlined CI execution. - Enhanced unit tests for worktree list handling by introducing a mock for execGitCommand, improving test reliability and coverage. - Refactored setup functions to better manage command mocks for git operations in tests. - Improved error handling in mkdirSafe function to account for undefined stats in certain environments. * refactor: Improve test configurations and enhance error handling - Updated Playwright configuration to clear VITE_SERVER_URL, ensuring the frontend uses the Vite proxy and preventing cookie domain mismatches. - Enhanced MergeRebaseDialog logic to normalize selectedBranch for better handling of various ref formats. - Improved global setup with a more robust backend health check, throwing an error if the backend is not healthy after retries. - Refactored project creation tests to handle file existence checks more reliably. - Added error handling for missing E2E source fixtures to guide setup process. - Enhanced memory navigation to handle sandbox dialog visibility more effectively. * refactor: Enhance Git command execution and improve test configurations - Updated Git command execution to merge environment paths correctly, ensuring proper command execution context. - Refactored the Git initialization process to handle errors more gracefully and ensure user configuration is set before creating the initial commit. - Improved test configurations by updating Playwright test identifiers for better clarity and consistency across different project states. - Enhanced cleanup functions in tests to handle directory removal more robustly, preventing errors during test execution. * fix: Resolve React hooks errors from duplicate instances in dependency tree * style: Format alias configuration for improved readability --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: DhanushSantosh <dhanushsantoshs05@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
983 lines
33 KiB
TypeScript
983 lines
33 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
import {
|
|
getMCPServersFromSettings,
|
|
getProviderById,
|
|
getProviderByModelId,
|
|
resolveProviderContext,
|
|
getAllProviderModels,
|
|
} from '@/lib/settings-helpers.js';
|
|
import type { SettingsService } from '@/services/settings-service.js';
|
|
|
|
// Mock the logger
|
|
vi.mock('@automaker/utils', async () => {
|
|
const actual = await vi.importActual('@automaker/utils');
|
|
const mockLogger = {
|
|
info: vi.fn(),
|
|
error: vi.fn(),
|
|
warn: vi.fn(),
|
|
debug: vi.fn(),
|
|
};
|
|
return {
|
|
...actual,
|
|
createLogger: () => mockLogger,
|
|
};
|
|
});
|
|
|
|
describe('settings-helpers.ts', () => {
|
|
describe('getMCPServersFromSettings', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it('should return empty object when settingsService is null', async () => {
|
|
const result = await getMCPServersFromSettings(null);
|
|
expect(result).toEqual({});
|
|
});
|
|
|
|
it('should return empty object when settingsService is undefined', async () => {
|
|
const result = await getMCPServersFromSettings(undefined);
|
|
expect(result).toEqual({});
|
|
});
|
|
|
|
it('should return empty object when no MCP servers configured', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({ mcpServers: [] }),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result).toEqual({});
|
|
});
|
|
|
|
it('should return empty object when mcpServers is undefined', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result).toEqual({});
|
|
});
|
|
|
|
it('should convert enabled stdio server to SDK format', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'test-server',
|
|
type: 'stdio',
|
|
command: 'node',
|
|
args: ['server.js'],
|
|
env: { NODE_ENV: 'test' },
|
|
enabled: true,
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result).toEqual({
|
|
'test-server': {
|
|
type: 'stdio',
|
|
command: 'node',
|
|
args: ['server.js'],
|
|
env: { NODE_ENV: 'test' },
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should convert enabled SSE server to SDK format', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'sse-server',
|
|
type: 'sse',
|
|
url: 'http://localhost:3000/sse',
|
|
headers: { Authorization: 'Bearer token' },
|
|
enabled: true,
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result).toEqual({
|
|
'sse-server': {
|
|
type: 'sse',
|
|
url: 'http://localhost:3000/sse',
|
|
headers: { Authorization: 'Bearer token' },
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should convert enabled HTTP server to SDK format', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'http-server',
|
|
type: 'http',
|
|
url: 'http://localhost:3000/api',
|
|
headers: { 'X-API-Key': 'secret' },
|
|
enabled: true,
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result).toEqual({
|
|
'http-server': {
|
|
type: 'http',
|
|
url: 'http://localhost:3000/api',
|
|
headers: { 'X-API-Key': 'secret' },
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should filter out disabled servers', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'enabled-server',
|
|
type: 'stdio',
|
|
command: 'node',
|
|
enabled: true,
|
|
},
|
|
{
|
|
id: '2',
|
|
name: 'disabled-server',
|
|
type: 'stdio',
|
|
command: 'python',
|
|
enabled: false,
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(Object.keys(result)).toHaveLength(1);
|
|
expect(result['enabled-server']).toBeDefined();
|
|
expect(result['disabled-server']).toBeUndefined();
|
|
});
|
|
|
|
it('should treat servers without enabled field as enabled', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'implicit-enabled',
|
|
type: 'stdio',
|
|
command: 'node',
|
|
// enabled field not set
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result['implicit-enabled']).toBeDefined();
|
|
});
|
|
|
|
it('should handle multiple enabled servers', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{ id: '1', name: 'server1', type: 'stdio', command: 'node', enabled: true },
|
|
{ id: '2', name: 'server2', type: 'stdio', command: 'python', enabled: true },
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(Object.keys(result)).toHaveLength(2);
|
|
expect(result['server1']).toBeDefined();
|
|
expect(result['server2']).toBeDefined();
|
|
});
|
|
|
|
it('should return empty object and log error on exception', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockRejectedValue(new Error('Settings error')),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService, '[Test]');
|
|
expect(result).toEqual({});
|
|
// Logger will be called with error, but we don't need to assert it
|
|
});
|
|
|
|
it('should throw error for SSE server without URL', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'bad-sse',
|
|
type: 'sse',
|
|
enabled: true,
|
|
// url missing
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
// The error is caught and logged, returns empty
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result).toEqual({});
|
|
});
|
|
|
|
it('should throw error for HTTP server without URL', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'bad-http',
|
|
type: 'http',
|
|
enabled: true,
|
|
// url missing
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result).toEqual({});
|
|
});
|
|
|
|
it('should throw error for stdio server without command', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'bad-stdio',
|
|
type: 'stdio',
|
|
enabled: true,
|
|
// command missing
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result).toEqual({});
|
|
});
|
|
|
|
it('should default to stdio type when type is not specified', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
mcpServers: [
|
|
{
|
|
id: '1',
|
|
name: 'no-type',
|
|
command: 'node',
|
|
enabled: true,
|
|
// type not specified, should default to stdio
|
|
},
|
|
],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getMCPServersFromSettings(mockSettingsService);
|
|
expect(result['no-type']).toEqual({
|
|
type: 'stdio',
|
|
command: 'node',
|
|
args: undefined,
|
|
env: undefined,
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('getProviderById', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it('should return provider when found by ID', async () => {
|
|
const mockProvider = { id: 'zai-1', name: 'Zai', enabled: true };
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getProviderById('zai-1', mockSettingsService);
|
|
expect(result.provider).toEqual(mockProvider);
|
|
});
|
|
|
|
it('should return undefined when provider not found', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getProviderById('unknown', mockSettingsService);
|
|
expect(result.provider).toBeUndefined();
|
|
});
|
|
|
|
it('should return provider even if disabled (caller handles enabled state)', async () => {
|
|
const mockProvider = { id: 'disabled-1', name: 'Disabled', enabled: false };
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getProviderById('disabled-1', mockSettingsService);
|
|
expect(result.provider).toEqual(mockProvider);
|
|
});
|
|
});
|
|
|
|
describe('getProviderByModelId', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it('should return provider and modelConfig when found by model ID', async () => {
|
|
const mockModel = { id: 'custom-model-1', name: 'Custom Model' };
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [mockModel],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getProviderByModelId('custom-model-1', mockSettingsService);
|
|
expect(result.provider).toEqual(mockProvider);
|
|
expect(result.modelConfig).toEqual(mockModel);
|
|
});
|
|
|
|
it('should resolve mapped Claude model when mapsToClaudeModel is present', async () => {
|
|
const mockModel = {
|
|
id: 'custom-model-1',
|
|
name: 'Custom Model',
|
|
mapsToClaudeModel: 'sonnet-3-5',
|
|
};
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [mockModel],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getProviderByModelId('custom-model-1', mockSettingsService);
|
|
expect(result.resolvedModel).toBeDefined();
|
|
// resolveModelString('sonnet-3-5') usually returns 'claude-3-5-sonnet-20240620' or similar
|
|
});
|
|
|
|
it('should ignore disabled providers', async () => {
|
|
const mockModel = { id: 'custom-model-1', name: 'Custom Model' };
|
|
const mockProvider = {
|
|
id: 'disabled-1',
|
|
name: 'Disabled Provider',
|
|
enabled: false,
|
|
models: [mockModel],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getProviderByModelId('custom-model-1', mockSettingsService);
|
|
expect(result.provider).toBeUndefined();
|
|
});
|
|
});
|
|
|
|
describe('resolveProviderContext', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it('should resolve provider by explicit providerId', async () => {
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [{ id: 'custom-model-1', name: 'Custom Model' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({ anthropicApiKey: 'test-key' }),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(
|
|
mockSettingsService,
|
|
'custom-model-1',
|
|
'provider-1'
|
|
);
|
|
|
|
expect(result.provider).toEqual(mockProvider);
|
|
expect(result.credentials).toEqual({ anthropicApiKey: 'test-key' });
|
|
});
|
|
|
|
it('should return undefined provider when explicit providerId not found', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(
|
|
mockSettingsService,
|
|
'some-model',
|
|
'unknown-provider'
|
|
);
|
|
|
|
expect(result.provider).toBeUndefined();
|
|
});
|
|
|
|
it('should fallback to model-based lookup when providerId not provided', async () => {
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [{ id: 'custom-model-1', name: 'Custom Model' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(mockSettingsService, 'custom-model-1');
|
|
|
|
expect(result.provider).toEqual(mockProvider);
|
|
expect(result.modelConfig?.id).toBe('custom-model-1');
|
|
});
|
|
|
|
it('should resolve mapsToClaudeModel to actual Claude model', async () => {
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [
|
|
{
|
|
id: 'custom-model-1',
|
|
name: 'Custom Model',
|
|
mapsToClaudeModel: 'sonnet',
|
|
},
|
|
],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(mockSettingsService, 'custom-model-1');
|
|
|
|
// resolveModelString('sonnet') should return a valid Claude model ID
|
|
expect(result.resolvedModel).toBeDefined();
|
|
expect(result.resolvedModel).toContain('claude');
|
|
});
|
|
|
|
it('should handle empty providers list', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(mockSettingsService, 'some-model');
|
|
|
|
expect(result.provider).toBeUndefined();
|
|
expect(result.resolvedModel).toBeUndefined();
|
|
expect(result.modelConfig).toBeUndefined();
|
|
});
|
|
|
|
it('should handle missing claudeCompatibleProviders field', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(mockSettingsService, 'some-model');
|
|
|
|
expect(result.provider).toBeUndefined();
|
|
});
|
|
|
|
it('should skip disabled providers during fallback lookup', async () => {
|
|
const disabledProvider = {
|
|
id: 'disabled-1',
|
|
name: 'Disabled Provider',
|
|
enabled: false,
|
|
models: [{ id: 'model-in-disabled', name: 'Model' }],
|
|
};
|
|
const enabledProvider = {
|
|
id: 'enabled-1',
|
|
name: 'Enabled Provider',
|
|
enabled: true,
|
|
models: [{ id: 'model-in-enabled', name: 'Model' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [disabledProvider, enabledProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
// Should skip the disabled provider and find the model in the enabled one
|
|
const result = await resolveProviderContext(mockSettingsService, 'model-in-enabled');
|
|
expect(result.provider?.id).toBe('enabled-1');
|
|
|
|
// Should not find model that only exists in disabled provider
|
|
const result2 = await resolveProviderContext(mockSettingsService, 'model-in-disabled');
|
|
expect(result2.provider).toBeUndefined();
|
|
});
|
|
|
|
it('should perform case-insensitive model ID matching', async () => {
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [{ id: 'Custom-Model-1', name: 'Custom Model' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(mockSettingsService, 'custom-model-1');
|
|
|
|
expect(result.provider).toEqual(mockProvider);
|
|
expect(result.modelConfig?.id).toBe('Custom-Model-1');
|
|
});
|
|
|
|
it('should return error result on exception', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockRejectedValue(new Error('Settings error')),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(mockSettingsService, 'some-model');
|
|
|
|
expect(result.provider).toBeUndefined();
|
|
expect(result.credentials).toBeUndefined();
|
|
expect(result.resolvedModel).toBeUndefined();
|
|
expect(result.modelConfig).toBeUndefined();
|
|
});
|
|
|
|
it('should persist and load provider config from server settings', async () => {
|
|
// This test verifies the main bug fix: providers are loaded from server settings
|
|
const savedProvider = {
|
|
id: 'saved-provider-1',
|
|
name: 'Saved Provider',
|
|
enabled: true,
|
|
apiKeySource: 'credentials' as const,
|
|
models: [
|
|
{
|
|
id: 'saved-model-1',
|
|
name: 'Saved Model',
|
|
mapsToClaudeModel: 'sonnet',
|
|
},
|
|
],
|
|
};
|
|
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [savedProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({
|
|
anthropicApiKey: 'saved-api-key',
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
// Simulate loading saved provider config
|
|
const result = await resolveProviderContext(
|
|
mockSettingsService,
|
|
'saved-model-1',
|
|
'saved-provider-1'
|
|
);
|
|
|
|
// Verify the provider is loaded from server settings
|
|
expect(result.provider).toEqual(savedProvider);
|
|
expect(result.provider?.id).toBe('saved-provider-1');
|
|
expect(result.provider?.models).toHaveLength(1);
|
|
expect(result.credentials?.anthropicApiKey).toBe('saved-api-key');
|
|
// Verify model mapping is resolved
|
|
expect(result.resolvedModel).toContain('claude');
|
|
});
|
|
|
|
it('should accept custom logPrefix parameter', async () => {
|
|
// Verify that the logPrefix parameter is accepted (used by facade.ts)
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [{ id: 'model-1', name: 'Model' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
// Call with custom logPrefix (as facade.ts does)
|
|
const result = await resolveProviderContext(
|
|
mockSettingsService,
|
|
'model-1',
|
|
undefined,
|
|
'[CustomPrefix]'
|
|
);
|
|
|
|
// Function should work the same with custom prefix
|
|
expect(result.provider).toEqual(mockProvider);
|
|
});
|
|
|
|
// Session restore scenarios - provider.enabled: undefined should be treated as enabled
|
|
describe('session restore scenarios (enabled: undefined)', () => {
|
|
it('should treat provider with enabled: undefined as enabled', async () => {
|
|
// This is the main bug fix: when providers are loaded from settings on session restore,
|
|
// enabled might be undefined (not explicitly set) and should be treated as enabled
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: undefined, // Not explicitly set - should be treated as enabled
|
|
models: [{ id: 'model-1', name: 'Model' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(mockSettingsService, 'model-1');
|
|
|
|
// Provider should be found and used even though enabled is undefined
|
|
expect(result.provider).toEqual(mockProvider);
|
|
expect(result.modelConfig?.id).toBe('model-1');
|
|
});
|
|
|
|
it('should use provider by ID when enabled is undefined', async () => {
|
|
// This tests the explicit providerId lookup with undefined enabled
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: undefined, // Not explicitly set - should be treated as enabled
|
|
models: [{ id: 'custom-model', name: 'Custom Model', mapsToClaudeModel: 'sonnet' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({ anthropicApiKey: 'test-key' }),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(
|
|
mockSettingsService,
|
|
'custom-model',
|
|
'provider-1'
|
|
);
|
|
|
|
// Provider should be found and used even though enabled is undefined
|
|
expect(result.provider).toEqual(mockProvider);
|
|
expect(result.credentials?.anthropicApiKey).toBe('test-key');
|
|
expect(result.resolvedModel).toContain('claude');
|
|
});
|
|
|
|
it('should find model via fallback in provider with enabled: undefined', async () => {
|
|
// Test fallback model lookup when provider has undefined enabled
|
|
const providerWithUndefinedEnabled = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
// enabled is not set (undefined)
|
|
models: [{ id: 'model-1', name: 'Model' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [providerWithUndefinedEnabled],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(mockSettingsService, 'model-1');
|
|
|
|
expect(result.provider).toEqual(providerWithUndefinedEnabled);
|
|
expect(result.modelConfig?.id).toBe('model-1');
|
|
});
|
|
|
|
it('should still use provider for connection when model not found in its models array', async () => {
|
|
// This tests the fix: when providerId is explicitly set and provider is found,
|
|
// but the model isn't in that provider's models array, we still use that provider
|
|
// for connection settings (baseUrl, credentials)
|
|
const mockProvider = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
baseUrl: 'https://custom-api.example.com',
|
|
models: [{ id: 'other-model', name: 'Other Model' }],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [mockProvider],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({ anthropicApiKey: 'test-key' }),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(
|
|
mockSettingsService,
|
|
'unknown-model', // Model not in provider's models array
|
|
'provider-1'
|
|
);
|
|
|
|
// Provider should still be returned for connection settings
|
|
expect(result.provider).toEqual(mockProvider);
|
|
// modelConfig should be undefined since the model wasn't found
|
|
expect(result.modelConfig).toBeUndefined();
|
|
// resolvedModel should be undefined since no mapping was found
|
|
expect(result.resolvedModel).toBeUndefined();
|
|
});
|
|
|
|
it('should fallback to find modelConfig in other providers when not in explicit providerId provider', async () => {
|
|
// When providerId is set and provider is found, but model isn't there,
|
|
// we should still search for modelConfig in other providers
|
|
const provider1 = {
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
baseUrl: 'https://provider1.example.com',
|
|
models: [{ id: 'provider1-model', name: 'Provider 1 Model' }],
|
|
};
|
|
const provider2 = {
|
|
id: 'provider-2',
|
|
name: 'Provider 2',
|
|
enabled: true,
|
|
baseUrl: 'https://provider2.example.com',
|
|
models: [
|
|
{
|
|
id: 'shared-model',
|
|
name: 'Shared Model',
|
|
mapsToClaudeModel: 'sonnet',
|
|
},
|
|
],
|
|
};
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [provider1, provider2],
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({ anthropicApiKey: 'test-key' }),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await resolveProviderContext(
|
|
mockSettingsService,
|
|
'shared-model', // This model is in provider-2, not provider-1
|
|
'provider-1' // But we explicitly want to use provider-1
|
|
);
|
|
|
|
// Provider should still be provider-1 (for connection settings)
|
|
expect(result.provider).toEqual(provider1);
|
|
// But modelConfig should be found from provider-2
|
|
expect(result.modelConfig?.id).toBe('shared-model');
|
|
// And the model mapping should be resolved
|
|
expect(result.resolvedModel).toContain('claude');
|
|
});
|
|
|
|
it('should handle multiple providers with mixed enabled states', async () => {
|
|
// Test the full session restore scenario with multiple providers
|
|
const providers = [
|
|
{
|
|
id: 'provider-1',
|
|
name: 'First Provider',
|
|
enabled: undefined, // Undefined after restore
|
|
models: [{ id: 'model-a', name: 'Model A' }],
|
|
},
|
|
{
|
|
id: 'provider-2',
|
|
name: 'Second Provider',
|
|
// enabled field missing entirely
|
|
models: [{ id: 'model-b', name: 'Model B', mapsToClaudeModel: 'opus' }],
|
|
},
|
|
{
|
|
id: 'provider-3',
|
|
name: 'Disabled Provider',
|
|
enabled: false, // Explicitly disabled
|
|
models: [{ id: 'model-c', name: 'Model C' }],
|
|
},
|
|
];
|
|
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: providers,
|
|
}),
|
|
getCredentials: vi.fn().mockResolvedValue({ anthropicApiKey: 'test-key' }),
|
|
} as unknown as SettingsService;
|
|
|
|
// Provider 1 should work (enabled: undefined)
|
|
const result1 = await resolveProviderContext(mockSettingsService, 'model-a', 'provider-1');
|
|
expect(result1.provider?.id).toBe('provider-1');
|
|
expect(result1.modelConfig?.id).toBe('model-a');
|
|
|
|
// Provider 2 should work (enabled field missing)
|
|
const result2 = await resolveProviderContext(mockSettingsService, 'model-b', 'provider-2');
|
|
expect(result2.provider?.id).toBe('provider-2');
|
|
expect(result2.modelConfig?.id).toBe('model-b');
|
|
expect(result2.resolvedModel).toContain('claude');
|
|
|
|
// Provider 3 with explicit providerId IS returned even if disabled
|
|
// (caller handles enabled state check)
|
|
const result3 = await resolveProviderContext(mockSettingsService, 'model-c', 'provider-3');
|
|
// Provider is found but modelConfig won't be found since disabled providers
|
|
// skip model lookup in their models array
|
|
expect(result3.provider).toEqual(providers[2]);
|
|
expect(result3.modelConfig).toBeUndefined();
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('getAllProviderModels', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it('should return all models from enabled providers', async () => {
|
|
const mockProviders = [
|
|
{
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [
|
|
{ id: 'model-1', name: 'Model 1' },
|
|
{ id: 'model-2', name: 'Model 2' },
|
|
],
|
|
},
|
|
{
|
|
id: 'provider-2',
|
|
name: 'Provider 2',
|
|
enabled: true,
|
|
models: [{ id: 'model-3', name: 'Model 3' }],
|
|
},
|
|
];
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: mockProviders,
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getAllProviderModels(mockSettingsService);
|
|
|
|
expect(result).toHaveLength(3);
|
|
expect(result[0].providerId).toBe('provider-1');
|
|
expect(result[0].model.id).toBe('model-1');
|
|
expect(result[2].providerId).toBe('provider-2');
|
|
});
|
|
|
|
it('should filter out disabled providers', async () => {
|
|
const mockProviders = [
|
|
{
|
|
id: 'enabled-1',
|
|
name: 'Enabled Provider',
|
|
enabled: true,
|
|
models: [{ id: 'model-1', name: 'Model 1' }],
|
|
},
|
|
{
|
|
id: 'disabled-1',
|
|
name: 'Disabled Provider',
|
|
enabled: false,
|
|
models: [{ id: 'model-2', name: 'Model 2' }],
|
|
},
|
|
];
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: mockProviders,
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getAllProviderModels(mockSettingsService);
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0].providerId).toBe('enabled-1');
|
|
});
|
|
|
|
it('should return empty array when no providers configured', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: [],
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getAllProviderModels(mockSettingsService);
|
|
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it('should handle missing claudeCompatibleProviders field', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getAllProviderModels(mockSettingsService);
|
|
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it('should handle provider with no models', async () => {
|
|
const mockProviders = [
|
|
{
|
|
id: 'provider-1',
|
|
name: 'Provider 1',
|
|
enabled: true,
|
|
models: [],
|
|
},
|
|
{
|
|
id: 'provider-2',
|
|
name: 'Provider 2',
|
|
enabled: true,
|
|
// no models field
|
|
},
|
|
];
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockResolvedValue({
|
|
claudeCompatibleProviders: mockProviders,
|
|
}),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getAllProviderModels(mockSettingsService);
|
|
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it('should return empty array on exception', async () => {
|
|
const mockSettingsService = {
|
|
getGlobalSettings: vi.fn().mockRejectedValue(new Error('Settings error')),
|
|
} as unknown as SettingsService;
|
|
|
|
const result = await getAllProviderModels(mockSettingsService);
|
|
|
|
expect(result).toEqual([]);
|
|
});
|
|
});
|
|
});
|