-
Notifications
You must be signed in to change notification settings - Fork 577
feat: Claude Compatible Providers System #629
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
stefandevo
merged 9 commits into
AutoMaker-Org:v0.13.0rc
from
stefandevo:stefandevo/model-providers
Jan 20, 2026
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2ceab3d
feat: refactor Claude API Profiles to Claude Compatible Providers
stefandevo 8ffe69f
merge: integrate v0.13.0rc with React Query refactor
stefandevo 86e3892
fix: atomic writer race condition and bulk replace reset to defaults
stefandevo 8efd14c
fix: update tests for new model resolver passthrough behavior
stefandevo f007ca2
refactor: simplify getPhaseModelWithOverrides calls per code review
stefandevo e3f3f5f
test: fix server tests for provider model passthrough behavior
stefandevo c343eb9
fix: address code review feedback for model providers
stefandevo 35ea368
fix: address CodeRabbit review issues for Claude Compatible Providers
stefandevo 9d6f681
fix: skip broken list-view-priority E2E test and add Priority column …
stefandevo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,12 @@ import type { | |
| McpServerConfig, | ||
| PromptCustomization, | ||
| ClaudeApiProfile, | ||
| ClaudeCompatibleProvider, | ||
| PhaseModelKey, | ||
| PhaseModelEntry, | ||
| Credentials, | ||
| } from '@automaker/types'; | ||
| import { DEFAULT_PHASE_MODELS } from '@automaker/types'; | ||
| import { | ||
| mergeAutoModePrompts, | ||
| mergeAgentPrompts, | ||
|
|
@@ -364,6 +369,9 @@ export interface ActiveClaudeApiProfileResult { | |
| * Checks project settings first for per-project overrides, then falls back to global settings. | ||
| * Returns both the profile and credentials for resolving 'credentials' apiKeySource. | ||
| * | ||
| * @deprecated Use getProviderById and getPhaseModelWithOverrides instead for the new provider system. | ||
| * This function is kept for backward compatibility during migration. | ||
| * | ||
| * @param settingsService - Optional settings service instance | ||
| * @param logPrefix - Prefix for log messages (e.g., '[AgentService]') | ||
| * @param projectPath - Optional project path for per-project override | ||
|
|
@@ -427,3 +435,296 @@ export async function getActiveClaudeApiProfile( | |
| return { profile: undefined, credentials: undefined }; | ||
| } | ||
| } | ||
|
|
||
| // ============================================================================ | ||
| // New Provider System Helpers | ||
| // ============================================================================ | ||
|
|
||
| /** Result from getProviderById */ | ||
| export interface ProviderByIdResult { | ||
| /** The provider, or undefined if not found */ | ||
| provider: ClaudeCompatibleProvider | undefined; | ||
| /** Credentials for resolving 'credentials' apiKeySource */ | ||
| credentials: Credentials | undefined; | ||
| } | ||
|
|
||
| /** | ||
| * Get a ClaudeCompatibleProvider by its ID. | ||
| * Returns the provider configuration and credentials for API key resolution. | ||
| * | ||
| * @param providerId - The provider ID to look up | ||
| * @param settingsService - Settings service instance | ||
| * @param logPrefix - Prefix for log messages | ||
| * @returns Promise resolving to object with provider and credentials | ||
| */ | ||
| export async function getProviderById( | ||
| providerId: string, | ||
| settingsService: SettingsService, | ||
| logPrefix = '[SettingsHelper]' | ||
| ): Promise<ProviderByIdResult> { | ||
| try { | ||
| const globalSettings = await settingsService.getGlobalSettings(); | ||
| const credentials = await settingsService.getCredentials(); | ||
| const providers = globalSettings.claudeCompatibleProviders || []; | ||
|
|
||
| const provider = providers.find((p) => p.id === providerId); | ||
|
|
||
| if (provider) { | ||
| if (provider.enabled === false) { | ||
| logger.warn(`${logPrefix} Provider "${provider.name}" (${providerId}) is disabled`); | ||
| } else { | ||
| logger.debug(`${logPrefix} Found provider: ${provider.name}`); | ||
| } | ||
| return { provider, credentials }; | ||
| } else { | ||
| logger.warn(`${logPrefix} Provider not found: ${providerId}`); | ||
| return { provider: undefined, credentials }; | ||
| } | ||
| } catch (error) { | ||
| logger.error(`${logPrefix} Failed to load provider by ID:`, error); | ||
| return { provider: undefined, credentials: undefined }; | ||
| } | ||
| } | ||
|
|
||
| /** Result from getPhaseModelWithOverrides */ | ||
| export interface PhaseModelWithOverridesResult { | ||
| /** The resolved phase model entry */ | ||
| phaseModel: PhaseModelEntry; | ||
| /** Whether a project override was applied */ | ||
| isProjectOverride: boolean; | ||
| /** The provider if providerId is set and found */ | ||
| provider: ClaudeCompatibleProvider | undefined; | ||
| /** Credentials for API key resolution */ | ||
| credentials: Credentials | undefined; | ||
| } | ||
|
|
||
| /** | ||
| * Get the phase model configuration for a specific phase, applying project overrides if available. | ||
| * Also resolves the provider if the phase model has a providerId. | ||
| * | ||
| * @param phase - The phase key (e.g., 'enhancementModel', 'specGenerationModel') | ||
| * @param settingsService - Optional settings service instance (returns defaults if undefined) | ||
| * @param projectPath - Optional project path for checking overrides | ||
| * @param logPrefix - Prefix for log messages | ||
| * @returns Promise resolving to phase model with provider info | ||
| */ | ||
| export async function getPhaseModelWithOverrides( | ||
| phase: PhaseModelKey, | ||
| settingsService?: SettingsService | null, | ||
| projectPath?: string, | ||
| logPrefix = '[SettingsHelper]' | ||
| ): Promise<PhaseModelWithOverridesResult> { | ||
| // Handle undefined settingsService gracefully | ||
| if (!settingsService) { | ||
| logger.info(`${logPrefix} SettingsService not available, using default for ${phase}`); | ||
| return { | ||
| phaseModel: DEFAULT_PHASE_MODELS[phase] || { model: 'sonnet' }, | ||
| isProjectOverride: false, | ||
| provider: undefined, | ||
| credentials: undefined, | ||
| }; | ||
| } | ||
|
|
||
| try { | ||
| const globalSettings = await settingsService.getGlobalSettings(); | ||
| const credentials = await settingsService.getCredentials(); | ||
| const globalPhaseModels = globalSettings.phaseModels || {}; | ||
|
|
||
| // Start with global phase model | ||
| let phaseModel = globalPhaseModels[phase]; | ||
| let isProjectOverride = false; | ||
|
|
||
| // Check for project override | ||
| if (projectPath) { | ||
| const projectSettings = await settingsService.getProjectSettings(projectPath); | ||
| const projectOverrides = projectSettings.phaseModelOverrides || {}; | ||
|
|
||
| if (projectOverrides[phase]) { | ||
| phaseModel = projectOverrides[phase]; | ||
| isProjectOverride = true; | ||
| logger.debug(`${logPrefix} Using project override for ${phase}`); | ||
| } | ||
| } | ||
|
|
||
| // If no phase model found, use per-phase default | ||
| if (!phaseModel) { | ||
| phaseModel = DEFAULT_PHASE_MODELS[phase] || { model: 'sonnet' }; | ||
| logger.debug(`${logPrefix} No ${phase} configured, using default: ${phaseModel.model}`); | ||
| } | ||
|
|
||
| // Resolve provider if providerId is set | ||
| let provider: ClaudeCompatibleProvider | undefined; | ||
| if (phaseModel.providerId) { | ||
| const providers = globalSettings.claudeCompatibleProviders || []; | ||
| provider = providers.find((p) => p.id === phaseModel.providerId); | ||
|
|
||
| if (provider) { | ||
| if (provider.enabled === false) { | ||
| logger.warn( | ||
| `${logPrefix} Provider "${provider.name}" for ${phase} is disabled, falling back to direct API` | ||
| ); | ||
| provider = undefined; | ||
| } else { | ||
| logger.debug(`${logPrefix} Using provider "${provider.name}" for ${phase}`); | ||
| } | ||
| } else { | ||
| logger.warn( | ||
| `${logPrefix} Provider ${phaseModel.providerId} not found for ${phase}, falling back to direct API` | ||
| ); | ||
| } | ||
| } | ||
|
Comment on lines
+556
to
+575
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Disabled/missing provider still returns provider model IDs. Line 556–575 clears 💡 Suggested patch if (provider) {
if (provider.enabled === false) {
logger.warn(
`${logPrefix} Provider "${provider.name}" for ${phase} is disabled, falling back to direct API`
);
- provider = undefined;
+ provider = undefined;
+ phaseModel = DEFAULT_PHASE_MODELS[phase] ?? { model: 'sonnet' };
} else {
logger.debug(`${logPrefix} Using provider "${provider.name}" for ${phase}`);
}
} else {
logger.warn(
`${logPrefix} Provider ${phaseModel.providerId} not found for ${phase}, falling back to direct API`
);
+ phaseModel = DEFAULT_PHASE_MODELS[phase] ?? { model: 'sonnet' };
}🤖 Prompt for AI Agents |
||
|
|
||
| return { | ||
| phaseModel, | ||
| isProjectOverride, | ||
| provider, | ||
| credentials, | ||
| }; | ||
| } catch (error) { | ||
| logger.error(`${logPrefix} Failed to get phase model with overrides:`, error); | ||
| // Return a safe default | ||
| return { | ||
| phaseModel: { model: 'sonnet' }, | ||
| isProjectOverride: false, | ||
| provider: undefined, | ||
| credentials: undefined, | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| /** Result from getProviderByModelId */ | ||
| export interface ProviderByModelIdResult { | ||
| /** The provider that contains this model, or undefined if not found */ | ||
| provider: ClaudeCompatibleProvider | undefined; | ||
| /** The model configuration if found */ | ||
| modelConfig: import('@automaker/types').ProviderModel | undefined; | ||
| /** Credentials for API key resolution */ | ||
| credentials: Credentials | undefined; | ||
| /** The resolved Claude model ID to use for API calls (from mapsToClaudeModel) */ | ||
| resolvedModel: string | undefined; | ||
| } | ||
|
|
||
| /** | ||
| * Find a ClaudeCompatibleProvider by one of its model IDs. | ||
| * Searches through all enabled providers to find one that contains the specified model. | ||
| * This is useful when you have a model string from the UI but need the provider config. | ||
| * | ||
| * Also resolves the `mapsToClaudeModel` field to get the actual Claude model ID to use | ||
| * when calling the API (e.g., "GLM-4.5-Air" -> "claude-haiku-4-5"). | ||
| * | ||
| * @param modelId - The model ID to search for (e.g., "GLM-4.7", "MiniMax-M2.1") | ||
| * @param settingsService - Settings service instance | ||
| * @param logPrefix - Prefix for log messages | ||
| * @returns Promise resolving to object with provider, model config, credentials, and resolved model | ||
| */ | ||
| export async function getProviderByModelId( | ||
| modelId: string, | ||
| settingsService: SettingsService, | ||
| logPrefix = '[SettingsHelper]' | ||
| ): Promise<ProviderByModelIdResult> { | ||
| try { | ||
| const globalSettings = await settingsService.getGlobalSettings(); | ||
| const credentials = await settingsService.getCredentials(); | ||
| const providers = globalSettings.claudeCompatibleProviders || []; | ||
|
|
||
| // Search through all enabled providers for this model | ||
| for (const provider of providers) { | ||
| // Skip disabled providers | ||
| if (provider.enabled === false) { | ||
| continue; | ||
| } | ||
|
|
||
| // Check if this provider has the model | ||
| const modelConfig = provider.models?.find( | ||
| (m) => m.id === modelId || m.id.toLowerCase() === modelId.toLowerCase() | ||
| ); | ||
|
|
||
| if (modelConfig) { | ||
| logger.info(`${logPrefix} Found model "${modelId}" in provider "${provider.name}"`); | ||
|
|
||
| // Resolve the mapped Claude model if specified | ||
| let resolvedModel: string | undefined; | ||
| if (modelConfig.mapsToClaudeModel) { | ||
| // Import resolveModelString to convert alias to full model ID | ||
| const { resolveModelString } = await import('@automaker/model-resolver'); | ||
| resolvedModel = resolveModelString(modelConfig.mapsToClaudeModel); | ||
| logger.info( | ||
| `${logPrefix} Model "${modelId}" maps to Claude model "${modelConfig.mapsToClaudeModel}" -> "${resolvedModel}"` | ||
| ); | ||
| } | ||
|
|
||
| return { provider, modelConfig, credentials, resolvedModel }; | ||
| } | ||
| } | ||
|
|
||
| // Model not found in any provider | ||
| logger.debug(`${logPrefix} Model "${modelId}" not found in any provider`); | ||
| return { | ||
| provider: undefined, | ||
| modelConfig: undefined, | ||
| credentials: undefined, | ||
| resolvedModel: undefined, | ||
| }; | ||
| } catch (error) { | ||
| logger.error(`${logPrefix} Failed to find provider by model ID:`, error); | ||
| return { | ||
| provider: undefined, | ||
| modelConfig: undefined, | ||
| credentials: undefined, | ||
| resolvedModel: undefined, | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get all enabled provider models for use in model dropdowns. | ||
| * Returns models from all enabled ClaudeCompatibleProviders. | ||
| * | ||
| * @param settingsService - Settings service instance | ||
| * @param logPrefix - Prefix for log messages | ||
| * @returns Promise resolving to array of provider models with their provider info | ||
| */ | ||
| export async function getAllProviderModels( | ||
| settingsService: SettingsService, | ||
| logPrefix = '[SettingsHelper]' | ||
| ): Promise< | ||
| Array<{ | ||
| providerId: string; | ||
| providerName: string; | ||
| model: import('@automaker/types').ProviderModel; | ||
| }> | ||
| > { | ||
| try { | ||
| const globalSettings = await settingsService.getGlobalSettings(); | ||
| const providers = globalSettings.claudeCompatibleProviders || []; | ||
|
|
||
| const allModels: Array<{ | ||
| providerId: string; | ||
| providerName: string; | ||
| model: import('@automaker/types').ProviderModel; | ||
| }> = []; | ||
|
|
||
| for (const provider of providers) { | ||
| // Skip disabled providers | ||
| if (provider.enabled === false) { | ||
| continue; | ||
| } | ||
|
|
||
| for (const model of provider.models || []) { | ||
| allModels.push({ | ||
| providerId: provider.id, | ||
| providerName: provider.name, | ||
| model, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| logger.debug( | ||
| `${logPrefix} Found ${allModels.length} models from ${providers.length} providers` | ||
| ); | ||
| return allModels; | ||
| } catch (error) { | ||
| logger.error(`${logPrefix} Failed to get all provider models:`, error); | ||
| return []; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.