Kenny
76508cfc7d
BREAKING CHANGE: Model resolution overhauled - Created centralized model-resolver.ts with priority chain: userModel → inheritedModel → systemDefaultModel - Removed model field from all 7 DEFAULT_CATEGORIES entries - Removed DEFAULT_MODEL constants from 10 agents - Removed singleton agent exports (use factories instead) - Made CategoryConfigSchema.model optional - CLI no longer generates model overrides - Empty strings treated as unset (uses fallback) Users must now: 1. Use factory functions (createOracleAgent, etc.) instead of singletons 2. Provide model explicitly or use systemDefaultModel 3. Configure category models explicitly if needed Fixes model fallback bug where hardcoded defaults overrode user's OpenCode configured model.
36 lines
1010 B
TypeScript
36 lines
1010 B
TypeScript
/**
|
|
* Input for model resolution.
|
|
* All model strings are optional except systemDefault which is the terminal fallback.
|
|
*/
|
|
export type ModelResolutionInput = {
|
|
/** Model from user category config */
|
|
userModel?: string;
|
|
/** Model inherited from parent task/session */
|
|
inheritedModel?: string;
|
|
/** System default model from OpenCode config - always required */
|
|
systemDefault: string;
|
|
};
|
|
|
|
/**
|
|
* Normalizes a model string.
|
|
* Trims whitespace and treats empty/whitespace-only as undefined.
|
|
*/
|
|
function normalizeModel(model?: string): string | undefined {
|
|
const trimmed = model?.trim();
|
|
return trimmed || undefined;
|
|
}
|
|
|
|
/**
|
|
* Resolves the effective model using priority chain:
|
|
* userModel → inheritedModel → systemDefault
|
|
*
|
|
* Empty strings and whitespace-only strings are treated as unset.
|
|
*/
|
|
export function resolveModel(input: ModelResolutionInput): string {
|
|
return (
|
|
normalizeModel(input.userModel) ??
|
|
normalizeModel(input.inheritedModel) ??
|
|
input.systemDefault
|
|
);
|
|
}
|