@machina.ai/cell-cli-core 1.13.0-rc5 → 1.16.0-rc2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +2 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/src/agents/codebase-investigator.test.d.ts +6 -0
- package/dist/src/agents/codebase-investigator.test.js +35 -0
- package/dist/src/agents/codebase-investigator.test.js.map +1 -0
- package/dist/src/agents/executor.d.ts +3 -0
- package/dist/src/agents/executor.js +21 -0
- package/dist/src/agents/executor.js.map +1 -1
- package/dist/src/agents/executor.test.js +358 -3
- package/dist/src/agents/executor.test.js.map +1 -1
- package/dist/src/code_assist/codeAssist.test.d.ts +6 -0
- package/dist/src/code_assist/codeAssist.test.js +99 -0
- package/dist/src/code_assist/codeAssist.test.js.map +1 -0
- package/dist/src/code_assist/experiments/client_metadata.js +2 -1
- package/dist/src/code_assist/experiments/client_metadata.js.map +1 -1
- package/dist/src/code_assist/experiments/client_metadata.test.d.ts +6 -0
- package/dist/src/code_assist/experiments/client_metadata.test.js +99 -0
- package/dist/src/code_assist/experiments/client_metadata.test.js.map +1 -0
- package/dist/src/code_assist/experiments/experiments.js +2 -2
- package/dist/src/code_assist/experiments/experiments.js.map +1 -1
- package/dist/src/code_assist/experiments/experiments.test.d.ts +6 -0
- package/dist/src/code_assist/experiments/experiments.test.js +92 -0
- package/dist/src/code_assist/experiments/experiments.test.js.map +1 -0
- package/dist/src/code_assist/experiments/flagNames.d.ts +13 -0
- package/dist/src/code_assist/experiments/flagNames.js +13 -0
- package/dist/src/code_assist/experiments/flagNames.js.map +1 -0
- package/dist/src/code_assist/experiments/types.d.ts +1 -1
- package/dist/src/code_assist/oauth-credential-storage.test.js +49 -0
- package/dist/src/code_assist/oauth-credential-storage.test.js.map +1 -1
- package/dist/src/code_assist/server.js +5 -8
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +109 -28
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/config/config.d.ts +34 -2
- package/dist/src/config/config.js +147 -26
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +436 -19
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.d.ts +7 -0
- package/dist/src/config/defaultModelConfigs.js +158 -0
- package/dist/src/config/defaultModelConfigs.js.map +1 -0
- package/dist/src/config/models.d.ts +22 -1
- package/dist/src/config/models.js +49 -6
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +71 -10
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/confirmation-bus/message-bus.d.ts +1 -1
- package/dist/src/confirmation-bus/message-bus.js +2 -2
- package/dist/src/confirmation-bus/message-bus.js.map +1 -1
- package/dist/src/confirmation-bus/message-bus.test.js +30 -24
- package/dist/src/confirmation-bus/message-bus.test.js.map +1 -1
- package/dist/src/confirmation-bus/types.d.ts +1 -0
- package/dist/src/core/baseLlmClient.d.ts +4 -8
- package/dist/src/core/baseLlmClient.js +3 -8
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +22 -27
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.d.ts +6 -5
- package/dist/src/core/client.js +33 -33
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +40 -22
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.js +7 -1
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +151 -357
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +6 -4
- package/dist/src/core/geminiChat.js +106 -29
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +317 -16
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.d.ts +7 -2
- package/dist/src/core/logger.js +15 -9
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +31 -16
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.test.d.ts +6 -0
- package/dist/src/core/loggingContentGenerator.test.js +180 -0
- package/dist/src/core/loggingContentGenerator.test.js.map +1 -0
- package/dist/src/core/nonInteractiveToolExecutor.test.js +1 -0
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +8 -11
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/tokenLimits.test.d.ts +6 -0
- package/dist/src/core/tokenLimits.test.js +26 -0
- package/dist/src/core/tokenLimits.test.js.map +1 -0
- package/dist/src/fallback/handler.js +52 -7
- package/dist/src/fallback/handler.js.map +1 -1
- package/dist/src/fallback/handler.test.js +69 -16
- package/dist/src/fallback/handler.test.js.map +1 -1
- package/dist/src/fallback/types.d.ts +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/hooks/hookAggregator.d.ts +68 -0
- package/dist/src/hooks/hookAggregator.js +262 -0
- package/dist/src/hooks/hookAggregator.js.map +1 -0
- package/dist/src/hooks/hookAggregator.test.d.ts +6 -0
- package/dist/src/hooks/hookAggregator.test.js +387 -0
- package/dist/src/hooks/hookAggregator.test.js.map +1 -0
- package/dist/src/hooks/hookRunner.d.ts +42 -0
- package/dist/src/hooks/hookRunner.js +272 -0
- package/dist/src/hooks/hookRunner.js.map +1 -0
- package/dist/src/hooks/hookRunner.test.d.ts +6 -0
- package/dist/src/hooks/hookRunner.test.js +468 -0
- package/dist/src/hooks/hookRunner.test.js.map +1 -0
- package/dist/src/hooks/hookTranslator.d.ts +3 -3
- package/dist/src/hooks/types.js +1 -1
- package/dist/src/hooks/types.js.map +1 -1
- package/dist/src/hooks/types.test.js +280 -2
- package/dist/src/hooks/types.test.js.map +1 -1
- package/dist/src/ide/detect-ide.d.ts +4 -0
- package/dist/src/ide/detect-ide.js +6 -1
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +5 -0
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-client.d.ts +3 -1
- package/dist/src/ide/ide-client.js +66 -59
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-client.test.js +159 -0
- package/dist/src/ide/ide-client.test.js.map +1 -1
- package/dist/src/ide/ide-installer.js +71 -21
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +42 -1
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/ide/process-utils.js +16 -0
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/ide/process-utils.test.js +3 -3
- package/dist/src/ide/process-utils.test.js.map +1 -1
- package/dist/src/ide/types.d.ts +1 -1
- package/dist/src/ide/types.js +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.js +2 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/google-auth-provider.js +1 -1
- package/dist/src/mcp/google-auth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.js +2 -2
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +177 -0
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/mcp/sa-impersonation-provider.js +1 -1
- package/dist/src/mcp/sa-impersonation-provider.js.map +1 -1
- package/dist/src/policy/config.js +3 -1
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/config.test.js +135 -1
- package/dist/src/policy/config.test.js.map +1 -1
- package/dist/src/policy/policies/discovered.toml +8 -0
- package/dist/src/policy/policies/write.toml +10 -0
- package/dist/src/policy/policy-engine.d.ts +12 -3
- package/dist/src/policy/policy-engine.js +71 -9
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +460 -76
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/toml-loader.d.ts +2 -1
- package/dist/src/policy/toml-loader.js +103 -6
- package/dist/src/policy/toml-loader.js.map +1 -1
- package/dist/src/policy/toml-loader.test.js +222 -368
- package/dist/src/policy/toml-loader.test.js.map +1 -1
- package/dist/src/policy/types.d.ts +65 -0
- package/dist/src/policy/types.js +4 -0
- package/dist/src/policy/types.js.map +1 -1
- package/dist/src/prompts/mcp-prompts.test.d.ts +6 -0
- package/dist/src/prompts/mcp-prompts.test.js +40 -0
- package/dist/src/prompts/mcp-prompts.test.js.map +1 -0
- package/dist/src/prompts/prompt-registry.test.d.ts +6 -0
- package/dist/src/prompts/prompt-registry.test.js +111 -0
- package/dist/src/prompts/prompt-registry.test.js.map +1 -0
- package/dist/src/routing/modelRouterService.js +15 -0
- package/dist/src/routing/modelRouterService.js.map +1 -1
- package/dist/src/routing/modelRouterService.test.js +62 -0
- package/dist/src/routing/modelRouterService.test.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.d.ts +1 -1
- package/dist/src/routing/strategies/classifierStrategy.js +6 -14
- package/dist/src/routing/strategies/classifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.test.js +13 -10
- package/dist/src/routing/strategies/classifierStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.test.js +4 -0
- package/dist/src/routing/strategies/fallbackStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js +2 -2
- package/dist/src/routing/strategies/overrideStrategy.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.test.js +3 -0
- package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -1
- package/dist/src/safety/built-in.d.ts +21 -0
- package/dist/src/safety/built-in.js +106 -0
- package/dist/src/safety/built-in.js.map +1 -0
- package/dist/src/safety/built-in.test.d.ts +6 -0
- package/dist/src/safety/built-in.test.js +199 -0
- package/dist/src/safety/built-in.test.js.map +1 -0
- package/dist/src/safety/checker-runner.d.ts +48 -0
- package/dist/src/safety/checker-runner.js +208 -0
- package/dist/src/safety/checker-runner.js.map +1 -0
- package/dist/src/safety/checker-runner.test.d.ts +6 -0
- package/dist/src/safety/checker-runner.test.js +238 -0
- package/dist/src/safety/checker-runner.test.js.map +1 -0
- package/dist/src/safety/context-builder.d.ts +23 -0
- package/dist/src/safety/context-builder.js +47 -0
- package/dist/src/safety/context-builder.js.map +1 -0
- package/dist/src/safety/context-builder.test.d.ts +6 -0
- package/dist/src/safety/context-builder.test.js +49 -0
- package/dist/src/safety/context-builder.test.js.map +1 -0
- package/dist/src/safety/protocol.d.ts +88 -0
- package/dist/src/safety/protocol.js +15 -0
- package/dist/src/safety/protocol.js.map +1 -0
- package/dist/src/safety/registry.d.ts +26 -0
- package/dist/src/safety/registry.js +65 -0
- package/dist/src/safety/registry.js.map +1 -0
- package/dist/src/safety/registry.test.d.ts +6 -0
- package/dist/src/safety/registry.test.js +31 -0
- package/dist/src/safety/registry.test.js.map +1 -0
- package/dist/src/services/chatCompressionService.test.js +1 -0
- package/dist/src/services/chatCompressionService.test.js.map +1 -1
- package/dist/src/services/gitService.js +1 -1
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +1 -1
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/loopDetectionService.d.ts +3 -0
- package/dist/src/services/loopDetectionService.js +81 -42
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/loopDetectionService.test.js +101 -1
- package/dist/src/services/loopDetectionService.test.js.map +1 -1
- package/dist/src/services/modelConfig.golden.test.d.ts +6 -0
- package/dist/src/services/modelConfig.golden.test.js +42 -0
- package/dist/src/services/modelConfig.golden.test.js.map +1 -0
- package/dist/src/services/modelConfig.integration.test.d.ts +6 -0
- package/dist/src/services/modelConfig.integration.test.js +213 -0
- package/dist/src/services/modelConfig.integration.test.js.map +1 -0
- package/dist/src/services/modelConfigService.d.ts +46 -0
- package/dist/src/services/modelConfigService.js +146 -0
- package/dist/src/services/modelConfigService.js.map +1 -0
- package/dist/src/services/modelConfigService.test.d.ts +6 -0
- package/dist/src/services/modelConfigService.test.js +509 -0
- package/dist/src/services/modelConfigService.test.js.map +1 -0
- package/dist/src/services/test-data/resolved-aliases.golden.json +169 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +11 -9
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +174 -150
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.d.ts +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +76 -20
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +6 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +18 -5
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +2 -2
- package/dist/src/telemetry/index.js +2 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +7 -7
- package/dist/src/telemetry/loggers.js +23 -23
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.circular.js +0 -1
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +72 -18
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +8 -4
- package/dist/src/telemetry/metrics.js +10 -4
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +42 -0
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/telemetryAttributes.js +1 -0
- package/dist/src/telemetry/telemetryAttributes.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +17 -11
- package/dist/src/telemetry/types.js +53 -28
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/tools/base-tool-invocation.test.d.ts +6 -0
- package/dist/src/tools/base-tool-invocation.test.js +85 -0
- package/dist/src/tools/base-tool-invocation.test.js.map +1 -0
- package/dist/src/tools/edit.d.ts +1 -1
- package/dist/src/tools/edit.js +31 -33
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +31 -20
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +1 -1
- package/dist/src/tools/glob.js +7 -7
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +20 -17
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.d.ts +1 -1
- package/dist/src/tools/grep.js +9 -9
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +15 -12
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.d.ts +1 -1
- package/dist/src/tools/ls.js +14 -15
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.js +32 -33
- package/dist/src/tools/ls.test.js.map +1 -1
- package/dist/src/tools/mcp-client.js +24 -52
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +18 -0
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +1 -0
- package/dist/src/tools/mcp-tool.js +5 -2
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/memoryTool.js +1 -1
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +1 -1
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/modifiable-tool.d.ts +5 -1
- package/dist/src/tools/modifiable-tool.js +34 -13
- package/dist/src/tools/modifiable-tool.js.map +1 -1
- package/dist/src/tools/modifiable-tool.test.js +56 -22
- package/dist/src/tools/modifiable-tool.test.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +2 -2
- package/dist/src/tools/read-file.js +20 -24
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +63 -51
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +2 -9
- package/dist/src/tools/read-many-files.js +10 -21
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +37 -35
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/ripGrep.d.ts +25 -8
- package/dist/src/tools/ripGrep.js +148 -176
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +383 -58
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +1 -1
- package/dist/src/tools/shell.js +17 -15
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +66 -36
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/smart-edit.d.ts +6 -1
- package/dist/src/tools/smart-edit.js +18 -17
- package/dist/src/tools/smart-edit.js.map +1 -1
- package/dist/src/tools/smart-edit.test.js +49 -24
- package/dist/src/tools/smart-edit.test.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +29 -4
- package/dist/src/tools/tool-registry.js +108 -29
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +134 -4
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +2 -1
- package/dist/src/tools/tools.js +5 -2
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js +2 -4
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +11 -4
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.js +1 -2
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/web-search.test.js +11 -5
- package/dist/src/tools/web-search.test.js.map +1 -1
- package/dist/src/tools/write-file.js +31 -31
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +24 -5
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/tools/write-todos.d.ts +29 -0
- package/dist/src/tools/write-todos.js +34 -1
- package/dist/src/tools/write-todos.js.map +1 -1
- package/dist/src/utils/editCorrector.js +4 -15
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +16 -0
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/editor.d.ts +3 -1
- package/dist/src/utils/editor.js +18 -1
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +11 -0
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/environmentContext.js +3 -1
- package/dist/src/utils/environmentContext.js.map +1 -1
- package/dist/src/utils/environmentContext.test.js +6 -0
- package/dist/src/utils/environmentContext.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +14 -11
- package/dist/src/utils/events.js +1 -14
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/extensionLoader.d.ts +8 -0
- package/dist/src/utils/extensionLoader.js +61 -15
- package/dist/src/utils/extensionLoader.js.map +1 -1
- package/dist/src/utils/extensionLoader.test.js +83 -19
- package/dist/src/utils/extensionLoader.test.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +75 -60
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/flashFallback.test.js +2 -2
- package/dist/src/utils/flashFallback.test.js.map +1 -1
- package/dist/src/utils/googleQuotaErrors.d.ts +2 -1
- package/dist/src/utils/googleQuotaErrors.js +20 -12
- package/dist/src/utils/googleQuotaErrors.js.map +1 -1
- package/dist/src/utils/httpErrors.d.ts +18 -0
- package/dist/src/utils/httpErrors.js +36 -0
- package/dist/src/utils/httpErrors.js.map +1 -0
- package/dist/src/utils/llm-edit-fixer.js +1 -2
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +16 -1
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.d.ts +8 -0
- package/dist/src/utils/memoryDiscovery.js +24 -0
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +43 -1
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +1 -2
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.test.js +10 -4
- package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
- package/dist/src/utils/pathReader.js +4 -4
- package/dist/src/utils/pathReader.js.map +1 -1
- package/dist/src/utils/pathReader.test.js +44 -1
- package/dist/src/utils/pathReader.test.js.map +1 -1
- package/dist/src/utils/paths.d.ts +1 -1
- package/dist/src/utils/paths.js +5 -3
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/retry.d.ts +0 -9
- package/dist/src/utils/retry.js +24 -28
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +51 -0
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/shell-utils.js +5 -3
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +9 -9
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/summarizer.d.ts +4 -2
- package/dist/src/utils/summarizer.js +6 -8
- package/dist/src/utils/summarizer.js.map +1 -1
- package/dist/src/utils/summarizer.test.js +32 -11
- package/dist/src/utils/summarizer.test.js.map +1 -1
- package/dist/src/utils/workspaceContext.d.ts +4 -3
- package/dist/src/utils/workspaceContext.js +10 -11
- package/dist/src/utils/workspaceContext.js.map +1 -1
- package/dist/src/utils/workspaceContext.test.js +1 -1
- package/dist/src/utils/workspaceContext.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
export class ModelConfigService {
|
|
7
|
+
config;
|
|
8
|
+
// TODO(12597): Process config to build a typed alias hierarchy.
|
|
9
|
+
constructor(config) {
|
|
10
|
+
this.config = config;
|
|
11
|
+
}
|
|
12
|
+
resolveAlias(aliasName, aliases, visited = new Set()) {
|
|
13
|
+
if (visited.has(aliasName)) {
|
|
14
|
+
throw new Error(`Circular alias dependency: ${[...visited, aliasName].join(' -> ')}`);
|
|
15
|
+
}
|
|
16
|
+
visited.add(aliasName);
|
|
17
|
+
const alias = aliases[aliasName];
|
|
18
|
+
if (!alias) {
|
|
19
|
+
throw new Error(`Alias "${aliasName}" not found.`);
|
|
20
|
+
}
|
|
21
|
+
if (!alias.extends) {
|
|
22
|
+
return alias;
|
|
23
|
+
}
|
|
24
|
+
const baseAlias = this.resolveAlias(alias.extends, aliases, visited);
|
|
25
|
+
return {
|
|
26
|
+
modelConfig: {
|
|
27
|
+
model: alias.modelConfig.model ?? baseAlias.modelConfig.model,
|
|
28
|
+
generateContentConfig: this.deepMerge(baseAlias.modelConfig.generateContentConfig, alias.modelConfig.generateContentConfig),
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
internalGetResolvedConfig(context) {
|
|
33
|
+
const config = this.config || {};
|
|
34
|
+
const { aliases = {}, overrides = [] } = config;
|
|
35
|
+
let baseModel = context.model;
|
|
36
|
+
let resolvedConfig = {};
|
|
37
|
+
// Step 1: Alias Resolution
|
|
38
|
+
if (aliases[context.model]) {
|
|
39
|
+
const resolvedAlias = this.resolveAlias(context.model, aliases);
|
|
40
|
+
baseModel = resolvedAlias.modelConfig.model; // This can now be undefined
|
|
41
|
+
resolvedConfig = this.deepMerge(resolvedConfig, resolvedAlias.modelConfig.generateContentConfig);
|
|
42
|
+
}
|
|
43
|
+
// If an alias was used but didn't resolve to a model, `baseModel` is undefined.
|
|
44
|
+
// We still need a model for matching overrides. We'll use the original alias name
|
|
45
|
+
// for matching if no model is resolved yet.
|
|
46
|
+
const modelForMatching = baseModel ?? context.model;
|
|
47
|
+
const finalContext = {
|
|
48
|
+
...context,
|
|
49
|
+
model: modelForMatching,
|
|
50
|
+
};
|
|
51
|
+
// Step 2: Override Application
|
|
52
|
+
const matches = overrides
|
|
53
|
+
.map((override, index) => {
|
|
54
|
+
const matchEntries = Object.entries(override.match);
|
|
55
|
+
if (matchEntries.length === 0) {
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
const isMatch = matchEntries.every(([key, value]) => {
|
|
59
|
+
if (key === 'model') {
|
|
60
|
+
return value === context.model || value === finalContext.model;
|
|
61
|
+
}
|
|
62
|
+
if (key === 'overrideScope' && value === 'core') {
|
|
63
|
+
// The 'core' overrideScope is special. It should match if the
|
|
64
|
+
// overrideScope is explicitly 'core' or if the overrideScope
|
|
65
|
+
// is not specified.
|
|
66
|
+
return context.overrideScope === 'core' || !context.overrideScope;
|
|
67
|
+
}
|
|
68
|
+
return finalContext[key] === value;
|
|
69
|
+
});
|
|
70
|
+
if (isMatch) {
|
|
71
|
+
return {
|
|
72
|
+
specificity: matchEntries.length,
|
|
73
|
+
modelConfig: override.modelConfig,
|
|
74
|
+
index,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
return null;
|
|
78
|
+
})
|
|
79
|
+
.filter((match) => match !== null);
|
|
80
|
+
// The override application logic is designed to be both simple and powerful.
|
|
81
|
+
// By first sorting all matching overrides by specificity (and then by their
|
|
82
|
+
// original order as a tie-breaker), we ensure that as we merge the `config`
|
|
83
|
+
// objects, the settings from the most specific rules are applied last,
|
|
84
|
+
// correctly overwriting any values from broader, less-specific rules.
|
|
85
|
+
// This achieves a per-property override effect without complex per-property logic.
|
|
86
|
+
matches.sort((a, b) => {
|
|
87
|
+
if (a.specificity !== b.specificity) {
|
|
88
|
+
return a.specificity - b.specificity;
|
|
89
|
+
}
|
|
90
|
+
return a.index - b.index;
|
|
91
|
+
});
|
|
92
|
+
// Apply matching overrides
|
|
93
|
+
for (const match of matches) {
|
|
94
|
+
if (match.modelConfig.model) {
|
|
95
|
+
baseModel = match.modelConfig.model;
|
|
96
|
+
}
|
|
97
|
+
if (match.modelConfig.generateContentConfig) {
|
|
98
|
+
resolvedConfig = this.deepMerge(resolvedConfig, match.modelConfig.generateContentConfig);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return {
|
|
102
|
+
model: baseModel,
|
|
103
|
+
generateContentConfig: resolvedConfig,
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
getResolvedConfig(context) {
|
|
107
|
+
const resolved = this.internalGetResolvedConfig(context);
|
|
108
|
+
if (!resolved.model) {
|
|
109
|
+
throw new Error(`Could not resolve a model name for alias "${context.model}". Please ensure the alias chain or a matching override specifies a model.`);
|
|
110
|
+
}
|
|
111
|
+
return {
|
|
112
|
+
model: resolved.model,
|
|
113
|
+
generateContentConfig: resolved.generateContentConfig,
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
isObject(item) {
|
|
117
|
+
return !!item && typeof item === 'object' && !Array.isArray(item);
|
|
118
|
+
}
|
|
119
|
+
deepMerge(config1, config2) {
|
|
120
|
+
return this.genericDeepMerge(config1, config2);
|
|
121
|
+
}
|
|
122
|
+
genericDeepMerge(...objects) {
|
|
123
|
+
return objects.reduce((acc, obj) => {
|
|
124
|
+
if (!obj) {
|
|
125
|
+
return acc;
|
|
126
|
+
}
|
|
127
|
+
Object.keys(obj).forEach((key) => {
|
|
128
|
+
const accValue = acc[key];
|
|
129
|
+
const objValue = obj[key];
|
|
130
|
+
// For now, we only deep merge objects, and not arrays. This is because
|
|
131
|
+
// If we deep merge arrays, there is no way for the user to completely
|
|
132
|
+
// override the base array.
|
|
133
|
+
// TODO(joshualitt): Consider knobs here, i.e. opt-in to deep merging
|
|
134
|
+
// arrays on a case-by-case basis.
|
|
135
|
+
if (this.isObject(accValue) && this.isObject(objValue)) {
|
|
136
|
+
acc[key] = this.deepMerge(accValue, objValue);
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
acc[key] = objValue;
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
return acc;
|
|
143
|
+
}, {});
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=modelConfigService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modelConfigService.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,509 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from 'vitest';
|
|
7
|
+
import { ModelConfigService } from './modelConfigService.js';
|
|
8
|
+
describe('ModelConfigService', () => {
|
|
9
|
+
it('should resolve a basic alias to its model and settings', () => {
|
|
10
|
+
const config = {
|
|
11
|
+
aliases: {
|
|
12
|
+
classifier: {
|
|
13
|
+
modelConfig: {
|
|
14
|
+
model: 'gemini-1.5-flash-latest',
|
|
15
|
+
generateContentConfig: {
|
|
16
|
+
temperature: 0,
|
|
17
|
+
topP: 0.9,
|
|
18
|
+
},
|
|
19
|
+
},
|
|
20
|
+
},
|
|
21
|
+
},
|
|
22
|
+
overrides: [],
|
|
23
|
+
};
|
|
24
|
+
const service = new ModelConfigService(config);
|
|
25
|
+
const resolved = service.getResolvedConfig({ model: 'classifier' });
|
|
26
|
+
expect(resolved.model).toBe('gemini-1.5-flash-latest');
|
|
27
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
28
|
+
temperature: 0,
|
|
29
|
+
topP: 0.9,
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
it('should apply a simple override on top of an alias', () => {
|
|
33
|
+
const config = {
|
|
34
|
+
aliases: {
|
|
35
|
+
classifier: {
|
|
36
|
+
modelConfig: {
|
|
37
|
+
model: 'gemini-1.5-flash-latest',
|
|
38
|
+
generateContentConfig: {
|
|
39
|
+
temperature: 0,
|
|
40
|
+
topP: 0.9,
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
},
|
|
44
|
+
},
|
|
45
|
+
overrides: [
|
|
46
|
+
{
|
|
47
|
+
match: { model: 'classifier' },
|
|
48
|
+
modelConfig: {
|
|
49
|
+
generateContentConfig: {
|
|
50
|
+
temperature: 0.5,
|
|
51
|
+
maxOutputTokens: 1000,
|
|
52
|
+
},
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
],
|
|
56
|
+
};
|
|
57
|
+
const service = new ModelConfigService(config);
|
|
58
|
+
const resolved = service.getResolvedConfig({ model: 'classifier' });
|
|
59
|
+
expect(resolved.model).toBe('gemini-1.5-flash-latest');
|
|
60
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
61
|
+
temperature: 0.5,
|
|
62
|
+
topP: 0.9,
|
|
63
|
+
maxOutputTokens: 1000,
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
it('should apply the most specific override rule', () => {
|
|
67
|
+
const config = {
|
|
68
|
+
aliases: {},
|
|
69
|
+
overrides: [
|
|
70
|
+
{
|
|
71
|
+
match: { model: 'gemini-pro' },
|
|
72
|
+
modelConfig: { generateContentConfig: { temperature: 0.5 } },
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
match: { model: 'gemini-pro', overrideScope: 'my-agent' },
|
|
76
|
+
modelConfig: { generateContentConfig: { temperature: 0.1 } },
|
|
77
|
+
},
|
|
78
|
+
],
|
|
79
|
+
};
|
|
80
|
+
const service = new ModelConfigService(config);
|
|
81
|
+
const resolved = service.getResolvedConfig({
|
|
82
|
+
model: 'gemini-pro',
|
|
83
|
+
overrideScope: 'my-agent',
|
|
84
|
+
});
|
|
85
|
+
expect(resolved.model).toBe('gemini-pro');
|
|
86
|
+
expect(resolved.generateContentConfig).toEqual({ temperature: 0.1 });
|
|
87
|
+
});
|
|
88
|
+
it('should use the last override in case of a tie in specificity', () => {
|
|
89
|
+
const config = {
|
|
90
|
+
aliases: {},
|
|
91
|
+
overrides: [
|
|
92
|
+
{
|
|
93
|
+
match: { model: 'gemini-pro' },
|
|
94
|
+
modelConfig: {
|
|
95
|
+
generateContentConfig: { temperature: 0.5, topP: 0.8 },
|
|
96
|
+
},
|
|
97
|
+
},
|
|
98
|
+
{
|
|
99
|
+
match: { model: 'gemini-pro' },
|
|
100
|
+
modelConfig: { generateContentConfig: { temperature: 0.1 } },
|
|
101
|
+
},
|
|
102
|
+
],
|
|
103
|
+
};
|
|
104
|
+
const service = new ModelConfigService(config);
|
|
105
|
+
const resolved = service.getResolvedConfig({ model: 'gemini-pro' });
|
|
106
|
+
expect(resolved.model).toBe('gemini-pro');
|
|
107
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
108
|
+
temperature: 0.1,
|
|
109
|
+
topP: 0.8,
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
it('should correctly pass through generation config from an alias', () => {
|
|
113
|
+
const config = {
|
|
114
|
+
aliases: {
|
|
115
|
+
'thinking-alias': {
|
|
116
|
+
modelConfig: {
|
|
117
|
+
model: 'gemini-pro',
|
|
118
|
+
generateContentConfig: {
|
|
119
|
+
candidateCount: 500,
|
|
120
|
+
},
|
|
121
|
+
},
|
|
122
|
+
},
|
|
123
|
+
},
|
|
124
|
+
overrides: [],
|
|
125
|
+
};
|
|
126
|
+
const service = new ModelConfigService(config);
|
|
127
|
+
const resolved = service.getResolvedConfig({ model: 'thinking-alias' });
|
|
128
|
+
expect(resolved.generateContentConfig).toEqual({ candidateCount: 500 });
|
|
129
|
+
});
|
|
130
|
+
it('should let an override generation config win over an alias config', () => {
|
|
131
|
+
const config = {
|
|
132
|
+
aliases: {
|
|
133
|
+
'thinking-alias': {
|
|
134
|
+
modelConfig: {
|
|
135
|
+
model: 'gemini-pro',
|
|
136
|
+
generateContentConfig: {
|
|
137
|
+
candidateCount: 500,
|
|
138
|
+
},
|
|
139
|
+
},
|
|
140
|
+
},
|
|
141
|
+
},
|
|
142
|
+
overrides: [
|
|
143
|
+
{
|
|
144
|
+
match: { model: 'thinking-alias' },
|
|
145
|
+
modelConfig: {
|
|
146
|
+
generateContentConfig: {
|
|
147
|
+
candidateCount: 1000,
|
|
148
|
+
},
|
|
149
|
+
},
|
|
150
|
+
},
|
|
151
|
+
],
|
|
152
|
+
};
|
|
153
|
+
const service = new ModelConfigService(config);
|
|
154
|
+
const resolved = service.getResolvedConfig({ model: 'thinking-alias' });
|
|
155
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
156
|
+
candidateCount: 1000,
|
|
157
|
+
});
|
|
158
|
+
});
|
|
159
|
+
it('should merge settings from global, alias, and multiple matching overrides', () => {
|
|
160
|
+
const config = {
|
|
161
|
+
aliases: {
|
|
162
|
+
'test-alias': {
|
|
163
|
+
modelConfig: {
|
|
164
|
+
model: 'gemini-test-model',
|
|
165
|
+
generateContentConfig: {
|
|
166
|
+
topP: 0.9,
|
|
167
|
+
topK: 50,
|
|
168
|
+
},
|
|
169
|
+
},
|
|
170
|
+
},
|
|
171
|
+
},
|
|
172
|
+
overrides: [
|
|
173
|
+
{
|
|
174
|
+
match: { model: 'gemini-test-model' },
|
|
175
|
+
modelConfig: {
|
|
176
|
+
generateContentConfig: {
|
|
177
|
+
topK: 40,
|
|
178
|
+
maxOutputTokens: 2048,
|
|
179
|
+
},
|
|
180
|
+
},
|
|
181
|
+
},
|
|
182
|
+
{
|
|
183
|
+
match: { overrideScope: 'test-agent' },
|
|
184
|
+
modelConfig: {
|
|
185
|
+
generateContentConfig: {
|
|
186
|
+
maxOutputTokens: 4096,
|
|
187
|
+
},
|
|
188
|
+
},
|
|
189
|
+
},
|
|
190
|
+
{
|
|
191
|
+
match: { model: 'gemini-test-model', overrideScope: 'test-agent' },
|
|
192
|
+
modelConfig: {
|
|
193
|
+
generateContentConfig: {
|
|
194
|
+
temperature: 0.2,
|
|
195
|
+
},
|
|
196
|
+
},
|
|
197
|
+
},
|
|
198
|
+
],
|
|
199
|
+
};
|
|
200
|
+
const service = new ModelConfigService(config);
|
|
201
|
+
const resolved = service.getResolvedConfig({
|
|
202
|
+
model: 'test-alias',
|
|
203
|
+
overrideScope: 'test-agent',
|
|
204
|
+
});
|
|
205
|
+
expect(resolved.model).toBe('gemini-test-model');
|
|
206
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
207
|
+
// From global, overridden by most specific override
|
|
208
|
+
temperature: 0.2,
|
|
209
|
+
// From alias, not overridden
|
|
210
|
+
topP: 0.9,
|
|
211
|
+
// From alias, overridden by less specific override
|
|
212
|
+
topK: 40,
|
|
213
|
+
// From first matching override, overridden by second matching override
|
|
214
|
+
maxOutputTokens: 4096,
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
it('should match an agent:core override when agent is undefined', () => {
|
|
218
|
+
const config = {
|
|
219
|
+
aliases: {},
|
|
220
|
+
overrides: [
|
|
221
|
+
{
|
|
222
|
+
match: { overrideScope: 'core' },
|
|
223
|
+
modelConfig: {
|
|
224
|
+
generateContentConfig: {
|
|
225
|
+
temperature: 0.1,
|
|
226
|
+
},
|
|
227
|
+
},
|
|
228
|
+
},
|
|
229
|
+
],
|
|
230
|
+
};
|
|
231
|
+
const service = new ModelConfigService(config);
|
|
232
|
+
const resolved = service.getResolvedConfig({
|
|
233
|
+
model: 'gemini-pro',
|
|
234
|
+
overrideScope: undefined, // Explicitly undefined
|
|
235
|
+
});
|
|
236
|
+
expect(resolved.model).toBe('gemini-pro');
|
|
237
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
238
|
+
temperature: 0.1,
|
|
239
|
+
});
|
|
240
|
+
});
|
|
241
|
+
describe('alias inheritance', () => {
|
|
242
|
+
it('should resolve a simple "extends" chain', () => {
|
|
243
|
+
const config = {
|
|
244
|
+
aliases: {
|
|
245
|
+
base: {
|
|
246
|
+
modelConfig: {
|
|
247
|
+
model: 'gemini-1.5-pro-latest',
|
|
248
|
+
generateContentConfig: {
|
|
249
|
+
temperature: 0.7,
|
|
250
|
+
topP: 0.9,
|
|
251
|
+
},
|
|
252
|
+
},
|
|
253
|
+
},
|
|
254
|
+
'flash-variant': {
|
|
255
|
+
extends: 'base',
|
|
256
|
+
modelConfig: {
|
|
257
|
+
model: 'gemini-1.5-flash-latest',
|
|
258
|
+
},
|
|
259
|
+
},
|
|
260
|
+
},
|
|
261
|
+
};
|
|
262
|
+
const service = new ModelConfigService(config);
|
|
263
|
+
const resolved = service.getResolvedConfig({ model: 'flash-variant' });
|
|
264
|
+
expect(resolved.model).toBe('gemini-1.5-flash-latest');
|
|
265
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
266
|
+
temperature: 0.7,
|
|
267
|
+
topP: 0.9,
|
|
268
|
+
});
|
|
269
|
+
});
|
|
270
|
+
it('should override parent properties from child alias', () => {
|
|
271
|
+
const config = {
|
|
272
|
+
aliases: {
|
|
273
|
+
base: {
|
|
274
|
+
modelConfig: {
|
|
275
|
+
model: 'gemini-1.5-pro-latest',
|
|
276
|
+
generateContentConfig: {
|
|
277
|
+
temperature: 0.7,
|
|
278
|
+
topP: 0.9,
|
|
279
|
+
},
|
|
280
|
+
},
|
|
281
|
+
},
|
|
282
|
+
'flash-variant': {
|
|
283
|
+
extends: 'base',
|
|
284
|
+
modelConfig: {
|
|
285
|
+
model: 'gemini-1.5-flash-latest',
|
|
286
|
+
generateContentConfig: {
|
|
287
|
+
temperature: 0.2,
|
|
288
|
+
},
|
|
289
|
+
},
|
|
290
|
+
},
|
|
291
|
+
},
|
|
292
|
+
};
|
|
293
|
+
const service = new ModelConfigService(config);
|
|
294
|
+
const resolved = service.getResolvedConfig({ model: 'flash-variant' });
|
|
295
|
+
expect(resolved.model).toBe('gemini-1.5-flash-latest');
|
|
296
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
297
|
+
temperature: 0.2,
|
|
298
|
+
topP: 0.9,
|
|
299
|
+
});
|
|
300
|
+
});
|
|
301
|
+
it('should resolve a multi-level "extends" chain', () => {
|
|
302
|
+
const config = {
|
|
303
|
+
aliases: {
|
|
304
|
+
base: {
|
|
305
|
+
modelConfig: {
|
|
306
|
+
model: 'gemini-1.5-pro-latest',
|
|
307
|
+
generateContentConfig: {
|
|
308
|
+
temperature: 0.7,
|
|
309
|
+
topP: 0.9,
|
|
310
|
+
},
|
|
311
|
+
},
|
|
312
|
+
},
|
|
313
|
+
'base-flash': {
|
|
314
|
+
extends: 'base',
|
|
315
|
+
modelConfig: {
|
|
316
|
+
model: 'gemini-1.5-flash-latest',
|
|
317
|
+
},
|
|
318
|
+
},
|
|
319
|
+
'classifier-flash': {
|
|
320
|
+
extends: 'base-flash',
|
|
321
|
+
modelConfig: {
|
|
322
|
+
generateContentConfig: {
|
|
323
|
+
temperature: 0,
|
|
324
|
+
},
|
|
325
|
+
},
|
|
326
|
+
},
|
|
327
|
+
},
|
|
328
|
+
};
|
|
329
|
+
const service = new ModelConfigService(config);
|
|
330
|
+
const resolved = service.getResolvedConfig({
|
|
331
|
+
model: 'classifier-flash',
|
|
332
|
+
});
|
|
333
|
+
expect(resolved.model).toBe('gemini-1.5-flash-latest');
|
|
334
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
335
|
+
temperature: 0,
|
|
336
|
+
topP: 0.9,
|
|
337
|
+
});
|
|
338
|
+
});
|
|
339
|
+
it('should throw an error for circular dependencies', () => {
|
|
340
|
+
const config = {
|
|
341
|
+
aliases: {
|
|
342
|
+
a: { extends: 'b', modelConfig: {} },
|
|
343
|
+
b: { extends: 'a', modelConfig: {} },
|
|
344
|
+
},
|
|
345
|
+
};
|
|
346
|
+
const service = new ModelConfigService(config);
|
|
347
|
+
expect(() => service.getResolvedConfig({ model: 'a' })).toThrow('Circular alias dependency: a -> b -> a');
|
|
348
|
+
});
|
|
349
|
+
describe('abstract aliases', () => {
|
|
350
|
+
it('should allow an alias to extend an abstract alias without a model', () => {
|
|
351
|
+
const config = {
|
|
352
|
+
aliases: {
|
|
353
|
+
'abstract-base': {
|
|
354
|
+
modelConfig: {
|
|
355
|
+
generateContentConfig: {
|
|
356
|
+
temperature: 0.1,
|
|
357
|
+
},
|
|
358
|
+
},
|
|
359
|
+
},
|
|
360
|
+
'concrete-child': {
|
|
361
|
+
extends: 'abstract-base',
|
|
362
|
+
modelConfig: {
|
|
363
|
+
model: 'gemini-1.5-pro-latest',
|
|
364
|
+
generateContentConfig: {
|
|
365
|
+
topP: 0.9,
|
|
366
|
+
},
|
|
367
|
+
},
|
|
368
|
+
},
|
|
369
|
+
},
|
|
370
|
+
};
|
|
371
|
+
const service = new ModelConfigService(config);
|
|
372
|
+
const resolved = service.getResolvedConfig({ model: 'concrete-child' });
|
|
373
|
+
expect(resolved.model).toBe('gemini-1.5-pro-latest');
|
|
374
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
375
|
+
temperature: 0.1,
|
|
376
|
+
topP: 0.9,
|
|
377
|
+
});
|
|
378
|
+
});
|
|
379
|
+
it('should throw an error if a resolved alias chain has no model', () => {
|
|
380
|
+
const config = {
|
|
381
|
+
aliases: {
|
|
382
|
+
'abstract-base': {
|
|
383
|
+
modelConfig: {
|
|
384
|
+
generateContentConfig: { temperature: 0.7 },
|
|
385
|
+
},
|
|
386
|
+
},
|
|
387
|
+
},
|
|
388
|
+
};
|
|
389
|
+
const service = new ModelConfigService(config);
|
|
390
|
+
expect(() => service.getResolvedConfig({ model: 'abstract-base' })).toThrow('Could not resolve a model name for alias "abstract-base". Please ensure the alias chain or a matching override specifies a model.');
|
|
391
|
+
});
|
|
392
|
+
it('should resolve an abstract alias if an override provides the model', () => {
|
|
393
|
+
const config = {
|
|
394
|
+
aliases: {
|
|
395
|
+
'abstract-base': {
|
|
396
|
+
modelConfig: {
|
|
397
|
+
generateContentConfig: {
|
|
398
|
+
temperature: 0.1,
|
|
399
|
+
},
|
|
400
|
+
},
|
|
401
|
+
},
|
|
402
|
+
},
|
|
403
|
+
overrides: [
|
|
404
|
+
{
|
|
405
|
+
match: { model: 'abstract-base' },
|
|
406
|
+
modelConfig: {
|
|
407
|
+
model: 'gemini-1.5-flash-latest',
|
|
408
|
+
},
|
|
409
|
+
},
|
|
410
|
+
],
|
|
411
|
+
};
|
|
412
|
+
const service = new ModelConfigService(config);
|
|
413
|
+
const resolved = service.getResolvedConfig({ model: 'abstract-base' });
|
|
414
|
+
expect(resolved.model).toBe('gemini-1.5-flash-latest');
|
|
415
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
416
|
+
temperature: 0.1,
|
|
417
|
+
});
|
|
418
|
+
});
|
|
419
|
+
});
|
|
420
|
+
it('should throw an error if an extended alias does not exist', () => {
|
|
421
|
+
const config = {
|
|
422
|
+
aliases: {
|
|
423
|
+
'bad-alias': {
|
|
424
|
+
extends: 'non-existent',
|
|
425
|
+
modelConfig: {},
|
|
426
|
+
},
|
|
427
|
+
},
|
|
428
|
+
};
|
|
429
|
+
const service = new ModelConfigService(config);
|
|
430
|
+
expect(() => service.getResolvedConfig({ model: 'bad-alias' })).toThrow('Alias "non-existent" not found.');
|
|
431
|
+
});
|
|
432
|
+
});
|
|
433
|
+
describe('deep merging', () => {
|
|
434
|
+
it('should deep merge nested config objects from aliases and overrides', () => {
|
|
435
|
+
const config = {
|
|
436
|
+
aliases: {
|
|
437
|
+
'base-safe': {
|
|
438
|
+
modelConfig: {
|
|
439
|
+
model: 'gemini-pro',
|
|
440
|
+
generateContentConfig: {
|
|
441
|
+
safetySettings: {
|
|
442
|
+
HARM_CATEGORY_HARASSMENT: 'BLOCK_ONLY_HIGH',
|
|
443
|
+
HARM_CATEGORY_HATE_SPEECH: 'BLOCK_ONLY_HIGH',
|
|
444
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
445
|
+
},
|
|
446
|
+
},
|
|
447
|
+
},
|
|
448
|
+
},
|
|
449
|
+
},
|
|
450
|
+
overrides: [
|
|
451
|
+
{
|
|
452
|
+
match: { model: 'base-safe' },
|
|
453
|
+
modelConfig: {
|
|
454
|
+
generateContentConfig: {
|
|
455
|
+
safetySettings: {
|
|
456
|
+
HARM_CATEGORY_HATE_SPEECH: 'BLOCK_NONE',
|
|
457
|
+
HARM_CATEGORY_SEXUALLY_EXPLICIT: 'BLOCK_MEDIUM_AND_ABOVE',
|
|
458
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
459
|
+
},
|
|
460
|
+
},
|
|
461
|
+
},
|
|
462
|
+
},
|
|
463
|
+
],
|
|
464
|
+
};
|
|
465
|
+
const service = new ModelConfigService(config);
|
|
466
|
+
const resolved = service.getResolvedConfig({ model: 'base-safe' });
|
|
467
|
+
expect(resolved.model).toBe('gemini-pro');
|
|
468
|
+
expect(resolved.generateContentConfig.safetySettings).toEqual({
|
|
469
|
+
// From alias
|
|
470
|
+
HARM_CATEGORY_HARASSMENT: 'BLOCK_ONLY_HIGH',
|
|
471
|
+
// From alias, overridden by override
|
|
472
|
+
HARM_CATEGORY_HATE_SPEECH: 'BLOCK_NONE',
|
|
473
|
+
// From override
|
|
474
|
+
HARM_CATEGORY_SEXUALLY_EXPLICIT: 'BLOCK_MEDIUM_AND_ABOVE',
|
|
475
|
+
});
|
|
476
|
+
});
|
|
477
|
+
it('should not deeply merge merge arrays from aliases and overrides', () => {
|
|
478
|
+
const config = {
|
|
479
|
+
aliases: {
|
|
480
|
+
base: {
|
|
481
|
+
modelConfig: {
|
|
482
|
+
model: 'gemini-pro',
|
|
483
|
+
generateContentConfig: {
|
|
484
|
+
stopSequences: ['foo'],
|
|
485
|
+
},
|
|
486
|
+
},
|
|
487
|
+
},
|
|
488
|
+
},
|
|
489
|
+
overrides: [
|
|
490
|
+
{
|
|
491
|
+
match: { model: 'base' },
|
|
492
|
+
modelConfig: {
|
|
493
|
+
generateContentConfig: {
|
|
494
|
+
stopSequences: ['overrideFoo'],
|
|
495
|
+
},
|
|
496
|
+
},
|
|
497
|
+
},
|
|
498
|
+
],
|
|
499
|
+
};
|
|
500
|
+
const service = new ModelConfigService(config);
|
|
501
|
+
const resolved = service.getResolvedConfig({ model: 'base' });
|
|
502
|
+
expect(resolved.model).toBe('gemini-pro');
|
|
503
|
+
expect(resolved.generateContentConfig.stopSequences).toEqual([
|
|
504
|
+
'overrideFoo',
|
|
505
|
+
]);
|
|
506
|
+
});
|
|
507
|
+
});
|
|
508
|
+
});
|
|
509
|
+
//# sourceMappingURL=modelConfigService.test.js.map
|