@machina.ai/cell-cli-core 1.20.2-rc1 → 1.25.0-rc1

package/dist/src/services/modelConfigService.d.ts

@@ -7,6 +7,7 @@ import type { GenerateContentConfig } from '@google/genai';
 export interface ModelConfigKey {
     model: string;
     overrideScope?: string;
+    isRetry?: boolean;
 }
 export interface ModelConfig {
     model?: string;
@@ -16,6 +17,7 @@ export interface ModelConfigOverride {
     match: {
         model?: string;
         overrideScope?: string;
+        isRetry?: boolean;
     };
     modelConfig: ModelConfig;
 }
@@ -27,6 +29,7 @@ export interface ModelConfigServiceConfig {
     aliases?: Record<string, ModelConfigAlias>;
     customAliases?: Record<string, ModelConfigAlias>;
     overrides?: ModelConfigOverride[];
+    customOverrides?: ModelConfigOverride[];
 }
 export type ResolvedModelConfig = _ResolvedModelConfig & {
     readonly _brand: unique symbol;
@@ -38,12 +41,46 @@ export interface _ResolvedModelConfig {
 export declare class ModelConfigService {
     private readonly config;
     private readonly runtimeAliases;
+    private readonly runtimeOverrides;
     constructor(config: ModelConfigServiceConfig);
     registerRuntimeModelConfig(aliasName: string, alias: ModelConfigAlias): void;
-    private resolveAlias;
+    registerRuntimeModelOverride(override: ModelConfigOverride): void;
+    /**
+     * Resolves a model configuration by merging settings from aliases and applying overrides.
+     *
+     * The resolution follows a linear application pipeline:
+     *
+     * 1. Alias Chain Resolution:
+     *    Builds the inheritance chain from root to leaf. Configurations are merged starting from
+     *    the root, so that children naturally override parents.
+     *
+     * 2. Override Level Assignment:
+     *    Overrides are matched against the hierarchy and assigned a "Level" for application:
+     *    - Level 0: Broad matches (Global or Resolved Model name).
+     *    - Level 1..N: Hierarchy matches (from Root-most alias to Leaf-most alias).
+     *
+     * 3. Precedence & Application:
+     *    Overrides are applied in order of their Level (ASC), then Specificity (ASC), then
+     *    Configuration Order (ASC). This ensures that more targeted and "deeper" rules
+     *    naturally layer on top of broader ones.
+     *
+     * 4. Orthogonality:
+     *    All fields (including 'model') are treated equally. A more specific or deeper override
+     *    can freely change any setting, including the target model name.
+     */
     private internalGetResolvedConfig;
+    private resolveAliasChain;
+    private buildModelLevelMap;
+    private findMatchingOverrides;
+    private sortOverrides;
     getResolvedConfig(context: ModelConfigKey): ResolvedModelConfig;
-    private isObject;
-    private deepMerge;
-    private genericDeepMerge;
+    static isObject(item: unknown): item is Record<string, unknown>;
+    /**
+     * Merges an override `ModelConfig` into a base `ModelConfig`.
+     * The override's model name takes precedence if provided.
+     * The `generateContentConfig` properties are deeply merged.
+     */
+    static merge(base: ModelConfig, override: ModelConfig): ModelConfig;
+    static deepMerge(config1: GenerateContentConfig | undefined, config2: GenerateContentConfig | undefined): GenerateContentConfig;
+    private static genericDeepMerge;
 }

package/dist/src/services/modelConfigService.js

@@ -3,9 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+const MAX_ALIAS_CHAIN_DEPTH = 100;
 export class ModelConfigService {
     config;
     runtimeAliases = {};
+    runtimeOverrides = [];
     // TODO(12597): Process config to build a typed alias hierarchy.
     constructor(config) {
         this.config = config;
@@ -13,104 +15,150 @@ export class ModelConfigService {
     registerRuntimeModelConfig(aliasName, alias) {
         this.runtimeAliases[aliasName] = alias;
     }
-    resolveAlias(aliasName, aliases, visited = new Set()) {
-        if (visited.has(aliasName)) {
-            throw new Error(`Circular alias dependency: ${[...visited, aliasName].join(' -> ')}`);
-        }
-        visited.add(aliasName);
-        const alias = aliases[aliasName];
-        if (!alias) {
-            throw new Error(`Alias "${aliasName}" not found.`);
-        }
-        if (!alias.extends) {
-            return alias;
-        }
-        const baseAlias = this.resolveAlias(alias.extends, aliases, visited);
-        return {
-            modelConfig: {
-                model: alias.modelConfig.model ?? baseAlias.modelConfig.model,
-                generateContentConfig: this.deepMerge(baseAlias.modelConfig.generateContentConfig, alias.modelConfig.generateContentConfig),
-            },
-        };
+    registerRuntimeModelOverride(override) {
+        this.runtimeOverrides.push(override);
     }
+    /**
+     * Resolves a model configuration by merging settings from aliases and applying overrides.
+     *
+     * The resolution follows a linear application pipeline:
+     *
+     * 1. Alias Chain Resolution:
+     *    Builds the inheritance chain from root to leaf. Configurations are merged starting from
+     *    the root, so that children naturally override parents.
+     *
+     * 2. Override Level Assignment:
+     *    Overrides are matched against the hierarchy and assigned a "Level" for application:
+     *    - Level 0: Broad matches (Global or Resolved Model name).
+     *    - Level 1..N: Hierarchy matches (from Root-most alias to Leaf-most alias).
+     *
+     * 3. Precedence & Application:
+     *    Overrides are applied in order of their Level (ASC), then Specificity (ASC), then
+     *    Configuration Order (ASC). This ensures that more targeted and "deeper" rules
+     *    naturally layer on top of broader ones.
+     *
+     * 4. Orthogonality:
+     *    All fields (including 'model') are treated equally. A more specific or deeper override
+     *    can freely change any setting, including the target model name.
+     */
     internalGetResolvedConfig(context) {
-        const config = this.config || {};
-        const { aliases = {}, customAliases = {}, overrides = [] } = config;
+        const { aliases = {}, customAliases = {}, overrides = [], customOverrides = [], } = this.config || {};
         const allAliases = {
             ...aliases,
             ...customAliases,
             ...this.runtimeAliases,
         };
-        let baseModel = context.model;
-        let resolvedConfig = {};
-        // Step 1: Alias Resolution
-        if (allAliases[context.model]) {
-            const resolvedAlias = this.resolveAlias(context.model, allAliases);
-            baseModel = resolvedAlias.modelConfig.model; // This can now be undefined
-            resolvedConfig = this.deepMerge(resolvedConfig, resolvedAlias.modelConfig.generateContentConfig);
+        const { aliasChain, baseModel, resolvedConfig } = this.resolveAliasChain(context.model, allAliases);
+        const modelToLevel = this.buildModelLevelMap(aliasChain, baseModel);
+        const allOverrides = [
+            ...overrides,
+            ...customOverrides,
+            ...this.runtimeOverrides,
+        ];
+        const matches = this.findMatchingOverrides(allOverrides, context, modelToLevel);
+        this.sortOverrides(matches);
+        let currentConfig = {
+            model: baseModel,
+            generateContentConfig: resolvedConfig,
+        };
+        for (const match of matches) {
+            currentConfig = ModelConfigService.merge(currentConfig, match.modelConfig);
         }
-        // If an alias was used but didn't resolve to a model, `baseModel` is undefined.
-        // We still need a model for matching overrides. We'll use the original alias name
-        // for matching if no model is resolved yet.
-        const modelForMatching = baseModel ?? context.model;
-        const finalContext = {
-            ...context,
-            model: modelForMatching,
+        return {
+            model: currentConfig.model,
+            generateContentConfig: currentConfig.generateContentConfig ?? {},
+        };
+    }
+    resolveAliasChain(requestedModel, allAliases) {
+        const aliasChain = [];
+        if (allAliases[requestedModel]) {
+            let current = requestedModel;
+            const visited = new Set();
+            while (current) {
+                const alias = allAliases[current];
+                if (!alias) {
+                    throw new Error(`Alias "${current}" not found.`);
+                }
+                if (visited.size >= MAX_ALIAS_CHAIN_DEPTH) {
+                    throw new Error(`Alias inheritance chain exceeded maximum depth of ${MAX_ALIAS_CHAIN_DEPTH}.`);
+                }
+                if (visited.has(current)) {
+                    throw new Error(`Circular alias dependency: ${[...visited, current].join(' -> ')}`);
+                }
+                visited.add(current);
+                aliasChain.push(current);
+                current = alias.extends;
+            }
+            // Root-to-Leaf chain for merging and level assignment.
+            const reversedChain = [...aliasChain].reverse();
+            let resolvedConfig = {};
+            for (const aliasName of reversedChain) {
+                const alias = allAliases[aliasName];
+                resolvedConfig = ModelConfigService.merge(resolvedConfig, alias.modelConfig);
+            }
+            return {
+                aliasChain: reversedChain,
+                baseModel: resolvedConfig.model,
+                resolvedConfig: resolvedConfig.generateContentConfig ?? {},
+            };
+        }
+        return {
+            aliasChain: [requestedModel],
+            baseModel: requestedModel,
+            resolvedConfig: {},
         };
-        // Step 2: Override Application
-        const matches = overrides
+    }
+    buildModelLevelMap(aliasChain, baseModel) {
+        const modelToLevel = new Map();
+        // Global and Model name are both level 0.
+        if (baseModel) {
+            modelToLevel.set(baseModel, 0);
+        }
+        // Alias chain starts at level 1.
+        aliasChain.forEach((name, i) => modelToLevel.set(name, i + 1));
+        return modelToLevel;
+    }
+    findMatchingOverrides(overrides, context, modelToLevel) {
+        return overrides
             .map((override, index) => {
             const matchEntries = Object.entries(override.match);
-            if (matchEntries.length === 0) {
+            if (matchEntries.length === 0)
                 return null;
-            }
+            let matchedLevel = 0; // Default to Global
             const isMatch = matchEntries.every(([key, value]) => {
                 if (key === 'model') {
-                    return value === context.model || value === finalContext.model;
+                    const level = modelToLevel.get(value);
+                    if (level === undefined)
+                        return false;
+                    matchedLevel = level;
+                    return true;
                 }
                 if (key === 'overrideScope' && value === 'core') {
-                    // The 'core' overrideScope is special. It should match if the
-                    // overrideScope is explicitly 'core' or if the overrideScope
-                    // is not specified.
                     return context.overrideScope === 'core' || !context.overrideScope;
                 }
-                return finalContext[key] === value;
+                return context[key] === value;
             });
-            if (isMatch) {
-                return {
+            return isMatch
+                ? {
                     specificity: matchEntries.length,
+                    level: matchedLevel,
                     modelConfig: override.modelConfig,
                     index,
-                };
-            }
-            return null;
+                }
+                : null;
         })
-            .filter((match) => match !== null);
-        // The override application logic is designed to be both simple and powerful.
-        // By first sorting all matching overrides by specificity (and then by their
-        // original order as a tie-breaker), we ensure that as we merge the `config`
-        // objects, the settings from the most specific rules are applied last,
-        // correctly overwriting any values from broader, less-specific rules.
-        // This achieves a per-property override effect without complex per-property logic.
+            .filter((m) => m !== null);
+    }
+    sortOverrides(matches) {
         matches.sort((a, b) => {
+            if (a.level !== b.level) {
+                return a.level - b.level;
+            }
             if (a.specificity !== b.specificity) {
                 return a.specificity - b.specificity;
             }
             return a.index - b.index;
         });
-        // Apply matching overrides
-        for (const match of matches) {
-            if (match.modelConfig.model) {
-                baseModel = match.modelConfig.model;
-            }
-            if (match.modelConfig.generateContentConfig) {
-                resolvedConfig = this.deepMerge(resolvedConfig, match.modelConfig.generateContentConfig);
-            }
-        }
-        return {
-            model: baseModel,
-            generateContentConfig: resolvedConfig,
-        };
     }
     getResolvedConfig(context) {
         const resolved = this.internalGetResolvedConfig(context);
@@ -122,13 +170,24 @@ export class ModelConfigService {
             generateContentConfig: resolved.generateContentConfig,
         };
     }
-    isObject(item) {
+    static isObject(item) {
         return !!item && typeof item === 'object' && !Array.isArray(item);
     }
-    deepMerge(config1, config2) {
-        return this.genericDeepMerge(config1, config2);
+    /**
+     * Merges an override `ModelConfig` into a base `ModelConfig`.
+     * The override's model name takes precedence if provided.
+     * The `generateContentConfig` properties are deeply merged.
+     */
+    static merge(base, override) {
+        return {
+            model: override.model ?? base.model,
+            generateContentConfig: ModelConfigService.deepMerge(base.generateContentConfig, override.generateContentConfig),
+        };
+    }
+    static deepMerge(config1, config2) {
+        return ModelConfigService.genericDeepMerge(config1, config2);
     }
-    genericDeepMerge(...objects) {
+    static genericDeepMerge(...objects) {
         return objects.reduce((acc, obj) => {
             if (!obj) {
                 return acc;
@@ -141,8 +200,9 @@ export class ModelConfigService {
                 // override the base array.
                 // TODO(joshualitt): Consider knobs here, i.e. opt-in to deep merging
                 // arrays on a case-by-case basis.
-                if (this.isObject(accValue) && this.isObject(objValue)) {
-                    acc[key] = this.deepMerge(accValue, objValue);
+                if (ModelConfigService.isObject(accValue) &&
+                    ModelConfigService.isObject(objValue)) {
+                    acc[key] = ModelConfigService.genericDeepMerge(accValue, objValue);
                 }
                 else {
                     acc[key] = objValue;

package/dist/src/services/modelConfigService.js.map

@@ -1 +1 @@
-{"version":3,"file":"modelConfigService.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modelConfigService.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.ts"],"names":[],"mappings":"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"}

package/dist/src/services/modelConfigService.test.js

@@ -429,6 +429,18 @@ describe('ModelConfigService', () => {
             const service = new ModelConfigService(config);
             expect(() => service.getResolvedConfig({ model: 'bad-alias' })).toThrow('Alias "non-existent" not found.');
         });
+        it('should throw an error if the alias chain is too deep', () => {
+            const aliases = {};
+            for (let i = 0; i < 101; i++) {
+                aliases[`alias-${i}`] = {
+                    extends: i === 100 ? undefined : `alias-${i + 1}`,
+                    modelConfig: i === 100 ? { model: 'gemini-pro' } : {},
+                };
+            }
+            const config = { aliases };
+            const service = new ModelConfigService(config);
+            expect(() => service.getResolvedConfig({ model: 'alias-0' })).toThrow('Alias inheritance chain exceeded maximum depth of 100.');
+        });
     });
     describe('deep merging', () => {
         it('should deep merge nested config objects from aliases and overrides', () => {
@@ -527,6 +539,68 @@ describe('ModelConfigService', () => {
             });
         });
     });
+    describe('runtime overrides', () => {
+        it('should resolve a simple runtime-registered override', () => {
+            const config = {
+                aliases: {},
+                overrides: [],
+            };
+            const service = new ModelConfigService(config);
+            service.registerRuntimeModelOverride({
+                match: { model: 'gemini-pro' },
+                modelConfig: {
+                    generateContentConfig: {
+                        temperature: 0.99,
+                    },
+                },
+            });
+            const resolved = service.getResolvedConfig({ model: 'gemini-pro' });
+            expect(resolved.model).toBe('gemini-pro');
+            expect(resolved.generateContentConfig.temperature).toBe(0.99);
+        });
+        it('should prioritize runtime overrides over default overrides when they have the same specificity', () => {
+            const config = {
+                aliases: {},
+                overrides: [
+                    {
+                        match: { model: 'gemini-pro' },
+                        modelConfig: { generateContentConfig: { temperature: 0.1 } },
+                    },
+                ],
+            };
+            const service = new ModelConfigService(config);
+            service.registerRuntimeModelOverride({
+                match: { model: 'gemini-pro' },
+                modelConfig: { generateContentConfig: { temperature: 0.9 } },
+            });
+            const resolved = service.getResolvedConfig({ model: 'gemini-pro' });
+            // Runtime overrides are appended after overrides/customOverrides, so they should win.
+            expect(resolved.generateContentConfig.temperature).toBe(0.9);
+        });
+        it('should still respect specificity with runtime overrides', () => {
+            const config = {
+                aliases: {},
+                overrides: [],
+            };
+            const service = new ModelConfigService(config);
+            // Register a more specific runtime override
+            service.registerRuntimeModelOverride({
+                match: { model: 'gemini-pro', overrideScope: 'my-agent' },
+                modelConfig: { generateContentConfig: { temperature: 0.1 } },
+            });
+            // Register a less specific runtime override later
+            service.registerRuntimeModelOverride({
+                match: { model: 'gemini-pro' },
+                modelConfig: { generateContentConfig: { temperature: 0.9 } },
+            });
+            const resolved = service.getResolvedConfig({
+                model: 'gemini-pro',
+                overrideScope: 'my-agent',
+            });
+            // Specificity should win over order
+            expect(resolved.generateContentConfig.temperature).toBe(0.1);
+        });
+    });
     describe('custom aliases', () => {
         it('should resolve a custom alias', () => {
             const config = {
@@ -638,5 +712,157 @@ describe('ModelConfigService', () => {
             });
         });
     });
+    describe('custom overrides', () => {
+        it('should apply custom overrides on top of defaults', () => {
+            const config = {
+                aliases: {
+                    'test-alias': {
+                        modelConfig: {
+                            model: 'gemini-test',
+                            generateContentConfig: { temperature: 0.5 },
+                        },
+                    },
+                },
+                overrides: [
+                    {
+                        match: { model: 'test-alias' },
+                        modelConfig: { generateContentConfig: { temperature: 0.6 } },
+                    },
+                ],
+                customOverrides: [
+                    {
+                        match: { model: 'test-alias' },
+                        modelConfig: { generateContentConfig: { temperature: 0.7 } },
+                    },
+                ],
+            };
+            const service = new ModelConfigService(config);
+            const resolved = service.getResolvedConfig({ model: 'test-alias' });
+            // Custom overrides should be appended to overrides, so they win
+            expect(resolved.generateContentConfig.temperature).toBe(0.7);
+        });
+    });
+    describe('retry behavior', () => {
+        it('should apply retry-specific overrides when isRetry is true', () => {
+            const config = {
+                aliases: {
+                    'test-model': {
+                        modelConfig: {
+                            model: 'gemini-test',
+                            generateContentConfig: {
+                                temperature: 0.5,
+                            },
+                        },
+                    },
+                },
+                overrides: [
+                    {
+                        match: { model: 'test-model', isRetry: true },
+                        modelConfig: {
+                            generateContentConfig: {
+                                temperature: 1.0,
+                            },
+                        },
+                    },
+                ],
+            };
+            const service = new ModelConfigService(config);
+            // Normal request
+            const normal = service.getResolvedConfig({ model: 'test-model' });
+            expect(normal.generateContentConfig.temperature).toBe(0.5);
+            // Retry request
+            const retry = service.getResolvedConfig({
+                model: 'test-model',
+                isRetry: true,
+            });
+            expect(retry.generateContentConfig.temperature).toBe(1.0);
+        });
+        it('should prioritize retry overrides over generic overrides', () => {
+            const config = {
+                aliases: {
+                    'test-model': {
+                        modelConfig: {
+                            model: 'gemini-test',
+                            generateContentConfig: {
+                                temperature: 0.5,
+                            },
+                        },
+                    },
+                },
+                overrides: [
+                    // Generic override for this model
+                    {
+                        match: { model: 'test-model' },
+                        modelConfig: {
+                            generateContentConfig: {
+                                temperature: 0.7,
+                            },
+                        },
+                    },
+                    // Retry-specific override
+                    {
+                        match: { model: 'test-model', isRetry: true },
+                        modelConfig: {
+                            generateContentConfig: {
+                                temperature: 1.0,
+                            },
+                        },
+                    },
+                ],
+            };
+            const service = new ModelConfigService(config);
+            // Normal request - hits generic override
+            const normal = service.getResolvedConfig({ model: 'test-model' });
+            expect(normal.generateContentConfig.temperature).toBe(0.7);
+            // Retry request - hits retry override (more specific)
+            const retry = service.getResolvedConfig({
+                model: 'test-model',
+                isRetry: true,
+            });
+            expect(retry.generateContentConfig.temperature).toBe(1.0);
+        });
+        it('should apply overrides to parents in the alias hierarchy', () => {
+            const config = {
+                aliases: {
+                    'base-alias': {
+                        modelConfig: {
+                            model: 'gemini-test',
+                            generateContentConfig: {
+                                temperature: 0.5,
+                            },
+                        },
+                    },
+                    'child-alias': {
+                        extends: 'base-alias',
+                        modelConfig: {
+                            generateContentConfig: {
+                                topP: 0.9,
+                            },
+                        },
+                    },
+                },
+                overrides: [
+                    {
+                        match: { model: 'base-alias', isRetry: true },
+                        modelConfig: {
+                            generateContentConfig: {
+                                temperature: 1.0,
+                            },
+                        },
+                    },
+                ],
+            };
+            const service = new ModelConfigService(config);
+            // Normal request
+            const normal = service.getResolvedConfig({ model: 'child-alias' });
+            expect(normal.generateContentConfig.temperature).toBe(0.5);
+            // Retry request - should match override on parent
+            const retry = service.getResolvedConfig({
+                model: 'child-alias',
+                isRetry: true,
+            });
+            expect(retry.generateContentConfig.temperature).toBe(1.0);
+        });
+    });
 });
 //# sourceMappingURL=modelConfigService.test.js.map