feat(routing): honor models.for via metadata modelFor
This commit is contained in:
@@ -51,28 +51,96 @@ describe('daemon agent routing integration', () => {
|
||||
expect(router.resolve('telegram', '123')).toBeUndefined();
|
||||
});
|
||||
|
||||
it('model tier precedence: metadata > agent config > global default', () => {
|
||||
it('model tier precedence: metadata > metadata modelFor > agent config > global default', () => {
|
||||
// This test documents the tier resolution precedence used by createMessageRouter.
|
||||
// The actual resolution logic: tierFromMetadata ?? agentConfig?.modelTier ?? primary_tier ?? 'default'
|
||||
// The actual resolution logic:
|
||||
// tierFromMetadata ?? tierFromMetadataModelFor ?? agentConfig?.modelTier ?? primary_tier ?? 'default'
|
||||
function resolveTier(
|
||||
metadataTier: ModelTier | undefined,
|
||||
metadataForTier: ModelTier | undefined,
|
||||
agentTier: ModelTier | undefined,
|
||||
globalTier: ModelTier | undefined,
|
||||
): ModelTier {
|
||||
return metadataTier ?? agentTier ?? globalTier ?? 'default';
|
||||
return metadataTier ?? metadataForTier ?? agentTier ?? globalTier ?? 'default';
|
||||
}
|
||||
|
||||
// With all three set, metadata wins
|
||||
expect(resolveTier('fast', 'complex', 'default')).toBe('fast');
|
||||
expect(resolveTier('fast', 'default', 'complex', 'default')).toBe('fast');
|
||||
|
||||
// Without explicit metadata tier, modelFor-resolved tier wins
|
||||
expect(resolveTier(undefined, 'complex', 'default', 'fast')).toBe('complex');
|
||||
|
||||
// Without metadata, agent config wins
|
||||
expect(resolveTier(undefined, 'complex', 'default')).toBe('complex');
|
||||
expect(resolveTier(undefined, undefined, 'complex', 'default')).toBe('complex');
|
||||
|
||||
// Without metadata or agent config, global wins
|
||||
expect(resolveTier(undefined, undefined, 'default')).toBe('default');
|
||||
expect(resolveTier(undefined, undefined, undefined, 'default')).toBe('default');
|
||||
|
||||
// Without anything, falls back to 'default'
|
||||
expect(resolveTier(undefined, undefined, undefined)).toBe('default');
|
||||
expect(resolveTier(undefined, undefined, undefined, undefined)).toBe('default');
|
||||
});
|
||||
|
||||
it('uses metadata.modelFor tags to select tier', async () => {
|
||||
const processSpy = vi.spyOn(AgentOrchestrator.prototype, 'process').mockResolvedValue('ok');
|
||||
const session = {
|
||||
id: 'telegram:model-for',
|
||||
addMessage: vi.fn(),
|
||||
getHistory: vi.fn(() => []),
|
||||
clear: vi.fn(),
|
||||
replaceHistory: vi.fn(),
|
||||
getConfig: vi.fn(() => undefined),
|
||||
setConfig: vi.fn(),
|
||||
deleteConfig: vi.fn(),
|
||||
};
|
||||
|
||||
const router = createMessageRouter({
|
||||
sessionManager: {
|
||||
getSession: vi.fn(() => session),
|
||||
} as unknown as MessageRouterDeps['sessionManager'],
|
||||
modelRouter: {
|
||||
getAvailableTiers: () => ['fast', 'default', 'complex', 'local'],
|
||||
getAllLabels: () => ({ fast: 'fast', default: 'default', complex: 'complex', local: 'local' }),
|
||||
getLabel: (tier: string) => tier,
|
||||
} as unknown as MessageRouterDeps['modelRouter'],
|
||||
systemPrompt: 'test prompt',
|
||||
toolRegistry: {
|
||||
clone() { return this; },
|
||||
register: vi.fn(),
|
||||
} as unknown as MessageRouterDeps['toolRegistry'],
|
||||
toolExecutor: {} as unknown as MessageRouterDeps['toolExecutor'],
|
||||
config: {
|
||||
agents: {
|
||||
primary_tier: 'default',
|
||||
delegation: {
|
||||
compaction: 'fast',
|
||||
memory_extraction: 'fast',
|
||||
classification: 'fast',
|
||||
tool_summarisation: 'fast',
|
||||
complex_reasoning: 'complex',
|
||||
},
|
||||
max_delegation_depth: 3,
|
||||
max_iterations: 10,
|
||||
},
|
||||
compaction: { enabled: false },
|
||||
models: {
|
||||
default: { provider: 'anthropic', model: 'claude', for: ['chat'] },
|
||||
fast: { provider: 'anthropic', model: 'haiku', for: ['search'] },
|
||||
},
|
||||
} as unknown as MessageRouterDeps['config'],
|
||||
});
|
||||
|
||||
await router.handler({
|
||||
id: 'm-model-for',
|
||||
channel: 'telegram',
|
||||
senderId: 'model-for',
|
||||
text: 'find this quickly',
|
||||
timestamp: Date.now(),
|
||||
metadata: { modelFor: 'search' },
|
||||
} as MessageRouterInput, vi.fn(async () => {}));
|
||||
|
||||
const keys = Array.from(router.agents.keys());
|
||||
expect(keys.some((key) => key.endsWith(':fast'))).toBe(true);
|
||||
expect(processSpy).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user