@google/gemini-cli-core 0.42.0 → 0.43.0-preview.1
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/docs/changelogs/index.md +14 -0
- package/dist/docs/changelogs/latest.md +108 -166
- package/dist/docs/changelogs/preview.md +227 -103
- package/dist/docs/cli/auto-memory.md +60 -38
- package/dist/docs/cli/settings.md +1 -1
- package/dist/docs/cli/tutorials/memory-management.md +1 -1
- package/dist/docs/extensions/releasing.md +58 -24
- package/dist/docs/reference/configuration.md +14 -1
- package/dist/docs/reference/keyboard-shortcuts.md +23 -0
- package/dist/google-gemini-cli-core-0.43.0-preview.0.tgz +0 -0
- package/dist/src/agent/content-utils.js +2 -0
- package/dist/src/agent/content-utils.js.map +1 -1
- package/dist/src/agent/content-utils.test.js +5 -1
- package/dist/src/agent/content-utils.test.js.map +1 -1
- package/dist/src/agent/event-translator.js +7 -6
- package/dist/src/agent/event-translator.js.map +1 -1
- package/dist/src/agent/legacy-agent-session.js +4 -0
- package/dist/src/agent/legacy-agent-session.js.map +1 -1
- package/dist/src/agent/legacy-agent-session.test.js +9 -1
- package/dist/src/agent/legacy-agent-session.test.js.map +1 -1
- package/dist/src/agent/tool-display-utils.d.ts +3 -2
- package/dist/src/agent/tool-display-utils.js +3 -2
- package/dist/src/agent/tool-display-utils.js.map +1 -1
- package/dist/src/agent/types.d.ts +33 -3
- package/dist/src/agents/a2aUtils.d.ts +1 -1
- package/dist/src/agents/a2aUtils.js +4 -3
- package/dist/src/agents/a2aUtils.js.map +1 -1
- package/dist/src/agents/agentLoader.d.ts +2 -2
- package/dist/src/agents/browser/browserAgentInvocation.js +24 -19
- package/dist/src/agents/browser/browserAgentInvocation.js.map +1 -1
- package/dist/src/agents/local-executor.d.ts +1 -0
- package/dist/src/agents/local-executor.js +46 -32
- package/dist/src/agents/local-executor.js.map +1 -1
- package/dist/src/agents/local-executor.test.js +127 -0
- package/dist/src/agents/local-executor.test.js.map +1 -1
- package/dist/src/agents/local-invocation.js +24 -20
- package/dist/src/agents/local-invocation.js.map +1 -1
- package/dist/src/agents/local-invocation.test.js +9 -9
- package/dist/src/agents/local-invocation.test.js.map +1 -1
- package/dist/src/agents/local-subagent-protocol.d.ts +18 -0
- package/dist/src/agents/local-subagent-protocol.js +357 -0
- package/dist/src/agents/local-subagent-protocol.js.map +1 -0
- package/dist/src/agents/local-subagent-protocol.test.d.ts +6 -0
- package/dist/src/agents/local-subagent-protocol.test.js +676 -0
- package/dist/src/agents/local-subagent-protocol.test.js.map +1 -0
- package/dist/src/agents/remote-invocation.js +6 -6
- package/dist/src/agents/remote-invocation.js.map +1 -1
- package/dist/src/agents/remote-invocation.test.js +23 -12
- package/dist/src/agents/remote-invocation.test.js.map +1 -1
- package/dist/src/agents/remote-subagent-protocol.d.ts +31 -0
- package/dist/src/agents/remote-subagent-protocol.js +330 -0
- package/dist/src/agents/remote-subagent-protocol.js.map +1 -0
- package/dist/src/agents/remote-subagent-protocol.test.d.ts +6 -0
- package/dist/src/agents/remote-subagent-protocol.test.js +652 -0
- package/dist/src/agents/remote-subagent-protocol.test.js.map +1 -0
- package/dist/src/agents/skill-extraction-agent.js +1 -0
- package/dist/src/agents/skill-extraction-agent.js.map +1 -1
- package/dist/src/agents/skill-extraction-agent.test.js +1 -0
- package/dist/src/agents/skill-extraction-agent.test.js.map +1 -1
- package/dist/src/agents/types.d.ts +13 -2
- package/dist/src/agents/types.js +7 -0
- package/dist/src/agents/types.js.map +1 -1
- package/dist/src/availability/modelAvailabilityService.d.ts +6 -6
- package/dist/src/availability/modelAvailabilityService.js +14 -7
- package/dist/src/availability/modelAvailabilityService.js.map +1 -1
- package/dist/src/availability/modelAvailabilityService.test.js +34 -0
- package/dist/src/availability/modelAvailabilityService.test.js.map +1 -1
- package/dist/src/availability/policyHelpers.js +24 -12
- package/dist/src/availability/policyHelpers.js.map +1 -1
- package/dist/src/availability/policyHelpers.test.js +3 -2
- package/dist/src/availability/policyHelpers.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +3 -0
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/setup.d.ts +3 -0
- package/dist/src/code_assist/setup.js +9 -0
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +9 -1
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/commands/memory.d.ts +5 -14
- package/dist/src/commands/memory.js +19 -141
- package/dist/src/commands/memory.js.map +1 -1
- package/dist/src/commands/memory.test.js +62 -0
- package/dist/src/commands/memory.test.js.map +1 -1
- package/dist/src/config/config.d.ts +6 -2
- package/dist/src/config/config.js +63 -8
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +48 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +13 -0
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/models.js +1 -1
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/projectRegistry.d.ts +1 -0
- package/dist/src/config/projectRegistry.js +13 -2
- package/dist/src/config/projectRegistry.js.map +1 -1
- package/dist/src/config/projectRegistry.test.js +43 -0
- package/dist/src/config/projectRegistry.test.js.map +1 -1
- package/dist/src/context/config/profiles.js +4 -0
- package/dist/src/context/config/profiles.js.map +1 -1
- package/dist/src/context/contextManager.barrier.test.js +4 -3
- package/dist/src/context/contextManager.barrier.test.js.map +1 -1
- package/dist/src/context/contextManager.d.ts +9 -2
- package/dist/src/context/contextManager.hotstart.test.d.ts +6 -0
- package/dist/src/context/contextManager.hotstart.test.js +61 -0
- package/dist/src/context/contextManager.hotstart.test.js.map +1 -0
- package/dist/src/context/contextManager.js +96 -21
- package/dist/src/context/contextManager.js.map +1 -1
- package/dist/src/context/eventBus.d.ts +6 -0
- package/dist/src/context/eventBus.js +6 -0
- package/dist/src/context/eventBus.js.map +1 -1
- package/dist/src/context/graph/render.d.ts +3 -1
- package/dist/src/context/graph/render.js +33 -9
- package/dist/src/context/graph/render.js.map +1 -1
- package/dist/src/context/graph/render.test.d.ts +6 -0
- package/dist/src/context/graph/render.test.js +203 -0
- package/dist/src/context/graph/render.test.js.map +1 -0
- package/dist/src/context/graph/toGraph.js +3 -3
- package/dist/src/context/graph/toGraph.js.map +1 -1
- package/dist/src/context/graph/toGraph.test.d.ts +6 -0
- package/dist/src/context/graph/toGraph.test.js +35 -0
- package/dist/src/context/graph/toGraph.test.js.map +1 -0
- package/dist/src/context/initializer.js +11 -2
- package/dist/src/context/initializer.js.map +1 -1
- package/dist/src/context/pipeline/contextWorkingBuffer.d.ts +5 -7
- package/dist/src/context/pipeline/contextWorkingBuffer.js +105 -29
- package/dist/src/context/pipeline/contextWorkingBuffer.js.map +1 -1
- package/dist/src/context/pipeline/contextWorkingBuffer.test.js +67 -0
- package/dist/src/context/pipeline/contextWorkingBuffer.test.js.map +1 -1
- package/dist/src/context/pipeline/environment.d.ts +4 -0
- package/dist/src/context/pipeline/environmentImpl.d.ts +6 -5
- package/dist/src/context/pipeline/environmentImpl.js +6 -8
- package/dist/src/context/pipeline/environmentImpl.js.map +1 -1
- package/dist/src/context/pipeline/environmentImpl.test.js +5 -1
- package/dist/src/context/pipeline/environmentImpl.test.js.map +1 -1
- package/dist/src/context/pipeline/orchestrator.d.ts +1 -0
- package/dist/src/context/pipeline/orchestrator.js +59 -24
- package/dist/src/context/pipeline/orchestrator.js.map +1 -1
- package/dist/src/context/processors/blobDegradationProcessor.test.js +2 -2
- package/dist/src/context/processors/rollingSummaryProcessor.js +2 -15
- package/dist/src/context/processors/rollingSummaryProcessor.js.map +1 -1
- package/dist/src/context/processors/stateSnapshotAsyncProcessor.d.ts +7 -0
- package/dist/src/context/processors/stateSnapshotAsyncProcessor.js +33 -21
- package/dist/src/context/processors/stateSnapshotAsyncProcessor.js.map +1 -1
- package/dist/src/context/processors/stateSnapshotAsyncProcessor.test.js +31 -7
- package/dist/src/context/processors/stateSnapshotAsyncProcessor.test.js.map +1 -1
- package/dist/src/context/processors/stateSnapshotProcessor.d.ts +2 -0
- package/dist/src/context/processors/stateSnapshotProcessor.js +28 -4
- package/dist/src/context/processors/stateSnapshotProcessor.js.map +1 -1
- package/dist/src/context/processors/stateSnapshotProcessor.test.js +40 -1
- package/dist/src/context/processors/stateSnapshotProcessor.test.js.map +1 -1
- package/dist/src/context/system-tests/hysteresis.test.d.ts +6 -0
- package/dist/src/context/system-tests/hysteresis.test.js +98 -0
- package/dist/src/context/system-tests/hysteresis.test.js.map +1 -0
- package/dist/src/context/system-tests/lifecycle.golden.test.js +90 -69
- package/dist/src/context/system-tests/lifecycle.golden.test.js.map +1 -1
- package/dist/src/context/system-tests/simulationHarness.d.ts +1 -4
- package/dist/src/context/system-tests/simulationHarness.js +16 -30
- package/dist/src/context/system-tests/simulationHarness.js.map +1 -1
- package/dist/src/context/testing/contextTestUtils.d.ts +1 -0
- package/dist/src/context/testing/contextTestUtils.js +48 -25
- package/dist/src/context/testing/contextTestUtils.js.map +1 -1
- package/dist/src/context/utils/adaptiveTokenCalculator.d.ts +61 -0
- package/dist/src/context/utils/adaptiveTokenCalculator.js +116 -0
- package/dist/src/context/utils/adaptiveTokenCalculator.js.map +1 -0
- package/dist/src/context/utils/adaptiveTokenCalculator.test.d.ts +6 -0
- package/dist/src/context/utils/adaptiveTokenCalculator.test.js +85 -0
- package/dist/src/context/utils/adaptiveTokenCalculator.test.js.map +1 -0
- package/dist/src/context/utils/contextTokenCalculator.d.ts +47 -1
- package/dist/src/context/utils/contextTokenCalculator.js +20 -3
- package/dist/src/context/utils/contextTokenCalculator.js.map +1 -1
- package/dist/src/context/utils/contextTokenCalculator.test.js +8 -8
- package/dist/src/context/utils/contextTokenCalculator.test.js.map +1 -1
- package/dist/src/context/utils/formatNodesForLlm.d.ts +21 -0
- package/dist/src/context/utils/formatNodesForLlm.js +69 -0
- package/dist/src/context/utils/formatNodesForLlm.js.map +1 -0
- package/dist/src/context/utils/formatNodesForLlm.test.d.ts +6 -0
- package/dist/src/context/utils/formatNodesForLlm.test.js +110 -0
- package/dist/src/context/utils/formatNodesForLlm.test.js.map +1 -0
- package/dist/src/context/utils/snapshotGenerator.d.ts +23 -1
- package/dist/src/context/utils/snapshotGenerator.js +249 -31
- package/dist/src/context/utils/snapshotGenerator.js.map +1 -1
- package/dist/src/context/utils/snapshotGenerator.test.d.ts +6 -0
- package/dist/src/context/utils/snapshotGenerator.test.js +255 -0
- package/dist/src/context/utils/snapshotGenerator.test.js.map +1 -0
- package/dist/src/context/utils/tokenCalibration.d.ts +9 -0
- package/dist/src/context/utils/tokenCalibration.js +30 -0
- package/dist/src/context/utils/tokenCalibration.js.map +1 -0
- package/dist/src/core/baseLlmClient.d.ts +8 -0
- package/dist/src/core/baseLlmClient.js +14 -0
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/client.js +12 -1
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +4 -4
- package/dist/src/core/contentGenerator.js +12 -10
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +2 -0
- package/dist/src/core/geminiChat.js +60 -5
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +195 -2
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/turn.js +30 -2
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +13 -8
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.js +3 -2
- package/dist/src/hooks/hookEventHandler.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.test.js +80 -0
- package/dist/src/hooks/hookEventHandler.test.js.map +1 -1
- package/dist/src/index.d.ts +2 -1
- package/dist/src/index.js +2 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/prompts/snippets.js +1 -1
- package/dist/src/prompts/snippets.js.map +1 -1
- package/dist/src/routing/strategies/approvalModeStrategy.js +5 -3
- package/dist/src/routing/strategies/approvalModeStrategy.js.map +1 -1
- package/dist/src/routing/strategies/approvalModeStrategy.test.js +2 -0
- package/dist/src/routing/strategies/approvalModeStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.js +8 -1
- package/dist/src/routing/strategies/classifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.test.js +4 -0
- package/dist/src/routing/strategies/classifierStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/gemmaClassifierStrategy.js +7 -1
- package/dist/src/routing/strategies/gemmaClassifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/gemmaClassifierStrategy.test.js +4 -0
- package/dist/src/routing/strategies/gemmaClassifierStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.d.ts +1 -0
- package/dist/src/routing/strategies/numericalClassifierStrategy.js +22 -3
- package/dist/src/routing/strategies/numericalClassifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.test.js +168 -23
- package/dist/src/routing/strategies/numericalClassifierStrategy.test.js.map +1 -1
- package/dist/src/scheduler/scheduler.js +11 -0
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/scheduler/scheduler.test.js +1 -1
- package/dist/src/scheduler/scheduler.test.js.map +1 -1
- package/dist/src/scheduler/state-manager.js +5 -1
- package/dist/src/scheduler/state-manager.js.map +1 -1
- package/dist/src/scheduler/tool-executor.js +7 -4
- package/dist/src/scheduler/tool-executor.js.map +1 -1
- package/dist/src/scheduler/types.d.ts +5 -1
- package/dist/src/scheduler/types.js.map +1 -1
- package/dist/src/services/fileDiscoveryService.js +2 -1
- package/dist/src/services/fileDiscoveryService.js.map +1 -1
- package/dist/src/services/fileDiscoveryService.test.js +36 -0
- package/dist/src/services/fileDiscoveryService.test.js.map +1 -1
- package/dist/src/services/gitService.js +8 -1
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +104 -0
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/keychainService.js +14 -5
- package/dist/src/services/keychainService.js.map +1 -1
- package/dist/src/services/memoryPatchUtils.d.ts +66 -4
- package/dist/src/services/memoryPatchUtils.js +267 -5
- package/dist/src/services/memoryPatchUtils.js.map +1 -1
- package/dist/src/services/memoryService.js +25 -1
- package/dist/src/services/memoryService.js.map +1 -1
- package/dist/src/services/memoryService.test.js +61 -1
- package/dist/src/services/memoryService.test.js.map +1 -1
- package/dist/src/services/test-data/resolved-aliases-retry.golden.json +11 -0
- package/dist/src/services/test-data/resolved-aliases.golden.json +11 -0
- package/dist/src/telemetry/gcp-exporters.d.ts +2 -0
- package/dist/src/telemetry/gcp-exporters.js +69 -5
- package/dist/src/telemetry/gcp-exporters.js.map +1 -1
- package/dist/src/telemetry/gcp-exporters.test.js +52 -0
- package/dist/src/telemetry/gcp-exporters.test.js.map +1 -1
- package/dist/src/telemetry/metrics.js +13 -2
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +61 -1
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js +5 -2
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js +7 -4
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js.map +1 -1
- package/dist/src/tools/edit.js +19 -0
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +9 -0
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/grep.js +13 -1
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/ls.js +5 -0
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client.js +17 -3
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +24 -0
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/read-file.js +11 -6
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +20 -8
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/ripGrep.js +13 -1
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/shell.js +14 -0
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +5 -0
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +6 -0
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/topicTool.js +5 -0
- package/dist/src/tools/topicTool.js.map +1 -1
- package/dist/src/tools/write-file.js +13 -0
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +8 -0
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/errors.js +3 -8
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/filesearch/ignore.js +4 -1
- package/dist/src/utils/filesearch/ignore.js.map +1 -1
- package/dist/src/utils/ignoreFileParser.js +1 -1
- package/dist/src/utils/ignoreFileParser.js.map +1 -1
- package/dist/src/utils/ignorePatterns.js +2 -0
- package/dist/src/utils/ignorePatterns.js.map +1 -1
- package/dist/src/utils/ignorePatterns.test.js +1 -0
- package/dist/src/utils/ignorePatterns.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.js +55 -40
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +77 -9
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/modelUtils.d.ts +14 -0
- package/dist/src/utils/modelUtils.js +17 -0
- package/dist/src/utils/modelUtils.js.map +1 -0
- package/dist/src/utils/modelUtils.test.d.ts +6 -0
- package/dist/src/utils/modelUtils.test.js +23 -0
- package/dist/src/utils/modelUtils.test.js.map +1 -0
- package/dist/src/utils/paths.d.ts +15 -1
- package/dist/src/utils/paths.js +22 -7
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.js +25 -1
- package/dist/src/utils/paths.test.js.map +1 -1
- package/dist/src/utils/quotaErrorDetection.js +23 -12
- package/dist/src/utils/quotaErrorDetection.js.map +1 -1
- package/dist/src/utils/shell-utils.js +9 -1
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +7 -3
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/tokenCalculation.js +2 -1
- package/dist/src/utils/tokenCalculation.js.map +1 -1
- package/dist/src/utils/tokenCalculation.test.js +15 -0
- package/dist/src/utils/tokenCalculation.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -59,15 +59,6 @@ function validateBaseUrl(baseUrl) {
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
export async function createContentGeneratorConfig(config, authType, apiKey, baseUrl, customHeaders, vertexAiRouting) {
|
|
62
|
-
const geminiApiKey = apiKey ||
|
|
63
|
-
process.env['GEMINI_API_KEY'] ||
|
|
64
|
-
(await loadApiKey()) ||
|
|
65
|
-
undefined;
|
|
66
|
-
const googleApiKey = process.env['GOOGLE_API_KEY'] || undefined;
|
|
67
|
-
const googleCloudProject = process.env['GOOGLE_CLOUD_PROJECT'] ||
|
|
68
|
-
process.env['GOOGLE_CLOUD_PROJECT_ID'] ||
|
|
69
|
-
undefined;
|
|
70
|
-
const googleCloudLocation = process.env['GOOGLE_CLOUD_LOCATION'] || undefined;
|
|
71
62
|
const contentGeneratorConfig = {
|
|
72
63
|
authType,
|
|
73
64
|
proxy: config?.getProxy(),
|
|
@@ -75,11 +66,22 @@ export async function createContentGeneratorConfig(config, authType, apiKey, bas
|
|
|
75
66
|
customHeaders,
|
|
76
67
|
vertexAiRouting,
|
|
77
68
|
};
|
|
78
|
-
// If we are using Google auth or we are in Cloud Shell, there is nothing else to validate for now
|
|
69
|
+
// If we are using Google auth or we are in Cloud Shell, there is nothing else to validate for now.
|
|
70
|
+
// Return before touching the API-key keychain: on Linux without a Secret Service
|
|
71
|
+
// (WSL/SSH/Docker/CI) keytar can block indefinitely on its functional probe.
|
|
79
72
|
if (authType === AuthType.LOGIN_WITH_GOOGLE ||
|
|
80
73
|
authType === AuthType.COMPUTE_ADC) {
|
|
81
74
|
return contentGeneratorConfig;
|
|
82
75
|
}
|
|
76
|
+
const geminiApiKey = apiKey ||
|
|
77
|
+
process.env['GEMINI_API_KEY'] ||
|
|
78
|
+
(await loadApiKey()) ||
|
|
79
|
+
undefined;
|
|
80
|
+
const googleApiKey = process.env['GOOGLE_API_KEY'] || undefined;
|
|
81
|
+
const googleCloudProject = process.env['GOOGLE_CLOUD_PROJECT'] ||
|
|
82
|
+
process.env['GOOGLE_CLOUD_PROJECT_ID'] ||
|
|
83
|
+
undefined;
|
|
84
|
+
const googleCloudLocation = process.env['GOOGLE_CLOUD_LOCATION'] || undefined;
|
|
83
85
|
if (authType === AuthType.USE_GEMINI && geminiApiKey) {
|
|
84
86
|
contentGeneratorConfig.apiKey = geminiApiKey;
|
|
85
87
|
contentGeneratorConfig.vertexai = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contentGenerator.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,WAAW,GAOZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AA8B1D,MAAM,CAAN,IAAY,QAOX;AAPD,WAAY,QAAQ;IAClB,gDAAoC,CAAA;IACpC,yCAA6B,CAAA;IAC7B,uCAA2B,CAAA;IAC3B,8CAAkC,CAAA;IAClC,uDAA2C,CAAA;IAC3C,+BAAmB,CAAA;AACrB,CAAC,EAPW,QAAQ,KAAR,QAAQ,QAOnB;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB;IAChC,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,MAAM,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAC,iBAAiB,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,KAAK,MAAM,EAAE,CAAC;QACxD,OAAO,QAAQ,CAAC,aAAa,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,IACE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,MAAM;QACrC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,KAAK,MAAM,EACpD,CAAC;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAC9B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAoBD,MAAM,6BAA6B,GAAG,8BAA8B,CAAC;AACrE,MAAM,oCAAoC,GACxC,qCAAqC,CAAC;AAExC,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,MAAc,EACd,QAA8B,EAC9B,MAAe,EACf,OAAgB,EAChB,aAAsC,EACtC,eAAuC;IAEvC,MAAM,YAAY,GAChB,MAAM;QACN,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAC7B,CAAC,MAAM,UAAU,EAAE,CAAC;QACpB,SAAS,CAAC;IACZ,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,SAAS,CAAC;IAChE,MAAM,kBAAkB,GACtB,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;QACtC,SAAS,CAAC;IACZ,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,SAAS,CAAC;IAE9E,
|
|
1
|
+
{"version":3,"file":"contentGenerator.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,7 @@ export declare class GeminiChat {
|
|
|
77
77
|
private callCounter;
|
|
78
78
|
agentHistory: AgentChatHistory;
|
|
79
79
|
constructor(context: AgentLoopContext, systemInstruction?: string, tools?: Tool[], history?: Content[], resumedSessionData?: ResumedSessionData, onModelChanged?: ((modelId: string) => Promise<Tool[]>) | undefined);
|
|
80
|
+
get loopContext(): AgentLoopContext;
|
|
80
81
|
initialize(resumedSessionData?: ResumedSessionData, kind?: 'main' | 'subagent'): Promise<void>;
|
|
81
82
|
setSystemInstruction(sysInstr: string): void;
|
|
82
83
|
/**
|
|
@@ -166,3 +167,4 @@ export declare class GeminiChat {
|
|
|
166
167
|
/** Visible for Testing */
|
|
167
168
|
export declare function isSchemaDepthError(errorMessage: string): boolean;
|
|
168
169
|
export declare function isInvalidArgumentError(errorMessage: string): boolean;
|
|
170
|
+
export declare function stripToolCallIdPrefixes(contents: Content[]): Content[];
|
|
@@ -196,6 +196,9 @@ export class GeminiChat {
|
|
|
196
196
|
this.chatRecordingService = new ChatRecordingService(context);
|
|
197
197
|
this.lastPromptTokenCount = estimateTokenCountSync(this.agentHistory.flatMap((c) => c.parts || []));
|
|
198
198
|
}
|
|
199
|
+
get loopContext() {
|
|
200
|
+
return this.context;
|
|
201
|
+
}
|
|
199
202
|
async initialize(resumedSessionData, kind = 'main') {
|
|
200
203
|
await this.chatRecordingService.initialize(resumedSessionData, kind);
|
|
201
204
|
}
|
|
@@ -499,9 +502,10 @@ export class GeminiChat {
|
|
|
499
502
|
lastModelToUse = modelToUse;
|
|
500
503
|
lastConfig = config;
|
|
501
504
|
lastContentsToUse = contentsToUse;
|
|
505
|
+
const finalContents = stripToolCallIdPrefixes(contentsToUse);
|
|
502
506
|
return this.context.config.getContentGenerator().generateContentStream({
|
|
503
507
|
model: modelToUse,
|
|
504
|
-
contents:
|
|
508
|
+
contents: finalContents,
|
|
505
509
|
config,
|
|
506
510
|
}, prompt_id, role);
|
|
507
511
|
};
|
|
@@ -686,7 +690,9 @@ export class GeminiChat {
|
|
|
686
690
|
const legacyFunctionCalls = [];
|
|
687
691
|
// Map to track synthetic IDs assigned to each call index across chunks
|
|
688
692
|
const callIndexToId = new Map();
|
|
693
|
+
let runningFunctionCallCounter = 0;
|
|
689
694
|
for await (const chunk of streamResponse) {
|
|
695
|
+
const currentChunkStartCounter = runningFunctionCallCounter;
|
|
690
696
|
const candidateWithReason = chunk?.candidates?.find((candidate) => candidate.finishReason);
|
|
691
697
|
if (candidateWithReason) {
|
|
692
698
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
|
|
@@ -696,19 +702,31 @@ export class GeminiChat {
|
|
|
696
702
|
if (this.context.config.isContextManagementEnabled()) {
|
|
697
703
|
for (let i = 0; i < chunk.functionCalls.length; i++) {
|
|
698
704
|
const fnCall = chunk.functionCalls[i];
|
|
705
|
+
const globalIndex = currentChunkStartCounter + i;
|
|
699
706
|
if (!fnCall.id) {
|
|
700
|
-
let id = callIndexToId.get(
|
|
707
|
+
let id = callIndexToId.get(globalIndex);
|
|
701
708
|
if (!id) {
|
|
702
709
|
id = `synth_${this.context.promptId}_${Date.now()}_${this.callCounter++}`;
|
|
703
|
-
callIndexToId.set(
|
|
704
|
-
debugLogger.log(`[GeminiChat] Assigned synthetic ID: ${id} to tool at index ${
|
|
710
|
+
callIndexToId.set(globalIndex, id);
|
|
711
|
+
debugLogger.log(`[GeminiChat] Assigned synthetic ID: ${id} to tool at index ${globalIndex}: ${fnCall.name}`);
|
|
705
712
|
}
|
|
706
713
|
fnCall.id = id;
|
|
707
714
|
}
|
|
715
|
+
const name = fnCall.name?.trim() || 'generic_tool';
|
|
716
|
+
if (fnCall.id && !fnCall.id.startsWith(`${name}__`)) {
|
|
717
|
+
fnCall.id = `${name}__${fnCall.id}`;
|
|
718
|
+
}
|
|
708
719
|
finalFunctionCallsMap.set(fnCall.id, fnCall);
|
|
709
720
|
}
|
|
721
|
+
runningFunctionCallCounter += chunk.functionCalls.length;
|
|
710
722
|
}
|
|
711
723
|
else {
|
|
724
|
+
for (const fnCall of chunk.functionCalls) {
|
|
725
|
+
const name = fnCall.name?.trim() || 'generic_tool';
|
|
726
|
+
if (fnCall.id && !fnCall.id.startsWith(`${name}__`)) {
|
|
727
|
+
fnCall.id = `${name}__${fnCall.id}`;
|
|
728
|
+
}
|
|
729
|
+
}
|
|
712
730
|
legacyFunctionCalls.push(...chunk.functionCalls);
|
|
713
731
|
}
|
|
714
732
|
}
|
|
@@ -723,15 +741,21 @@ export class GeminiChat {
|
|
|
723
741
|
if (content.parts.some((part) => part.functionCall)) {
|
|
724
742
|
hasToolCall = true;
|
|
725
743
|
}
|
|
744
|
+
let localFunctionCallCounter = 0;
|
|
726
745
|
modelResponseParts.push(...content.parts
|
|
727
746
|
.filter((part) => !part.thought)
|
|
728
747
|
.map((part) => {
|
|
729
748
|
if (!this.context.config.isContextManagementEnabled()) {
|
|
730
749
|
return part;
|
|
731
750
|
}
|
|
751
|
+
let callIndex;
|
|
752
|
+
if (part.functionCall) {
|
|
753
|
+
callIndex =
|
|
754
|
+
currentChunkStartCounter + localFunctionCallCounter++;
|
|
755
|
+
}
|
|
732
756
|
return {
|
|
733
757
|
...part,
|
|
734
|
-
callIndex
|
|
758
|
+
callIndex,
|
|
735
759
|
};
|
|
736
760
|
}));
|
|
737
761
|
}
|
|
@@ -917,4 +941,35 @@ export function isSchemaDepthError(errorMessage) {
|
|
|
917
941
|
export function isInvalidArgumentError(errorMessage) {
|
|
918
942
|
return errorMessage.includes('Request contains an invalid argument');
|
|
919
943
|
}
|
|
944
|
+
export function stripToolCallIdPrefixes(contents) {
|
|
945
|
+
return contents.map((content) => ({
|
|
946
|
+
...content,
|
|
947
|
+
parts: (content.parts || []).map((part) => {
|
|
948
|
+
const newPart = { ...part };
|
|
949
|
+
if (newPart.functionCall) {
|
|
950
|
+
const fc = newPart.functionCall;
|
|
951
|
+
const name = fc.name?.trim() || 'generic_tool';
|
|
952
|
+
if (fc.id && fc.id.startsWith(`${name}__`)) {
|
|
953
|
+
newPart.functionCall = {
|
|
954
|
+
name: fc.name,
|
|
955
|
+
args: fc.args,
|
|
956
|
+
id: fc.id.substring(name.length + 2),
|
|
957
|
+
};
|
|
958
|
+
}
|
|
959
|
+
}
|
|
960
|
+
if (newPart.functionResponse) {
|
|
961
|
+
const fr = newPart.functionResponse;
|
|
962
|
+
const name = fr.name?.trim() || 'generic_tool';
|
|
963
|
+
if (fr.id && fr.id.startsWith(`${name}__`)) {
|
|
964
|
+
newPart.functionResponse = {
|
|
965
|
+
name: fr.name,
|
|
966
|
+
response: fr.response,
|
|
967
|
+
id: fr.id.substring(name.length + 2),
|
|
968
|
+
};
|
|
969
|
+
}
|
|
970
|
+
}
|
|
971
|
+
return newPart;
|
|
972
|
+
}),
|
|
973
|
+
}));
|
|
974
|
+
}
|
|
920
975
|
//# sourceMappingURL=geminiChat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geminiChat.js","sourceRoot":"","sources":["../../../src/core/geminiChat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"geminiChat.js","sourceRoot":"","sources":["../../../src/core/geminiChat.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
7
7
|
import { ApiError, ThinkingLevel, } from '@google/genai';
|
|
8
|
-
import { GeminiChat, InvalidStreamError, StreamEventType, SYNTHETIC_THOUGHT_SIGNATURE, } from './geminiChat.js';
|
|
8
|
+
import { GeminiChat, InvalidStreamError, StreamEventType, SYNTHETIC_THOUGHT_SIGNATURE, stripToolCallIdPrefixes, } from './geminiChat.js';
|
|
9
9
|
import { CoreToolCallStatus, } from '../scheduler/types.js';
|
|
10
10
|
import { MockTool } from '../test-utils/mock-tool.js';
|
|
11
11
|
import { setSimulate429 } from '../utils/testUtils.js';
|
|
@@ -200,7 +200,7 @@ describe('GeminiChat', () => {
|
|
|
200
200
|
// 'Hello': 5 chars * 0.25 = 1.25
|
|
201
201
|
// 'Hi there': 8 chars * 0.25 = 2.0
|
|
202
202
|
// Total: 3.25 -> floor(3.25) = 3
|
|
203
|
-
expect(chatWithHistory.getLastPromptTokenCount()).toBe(
|
|
203
|
+
expect(chatWithHistory.getLastPromptTokenCount()).toBe(3);
|
|
204
204
|
});
|
|
205
205
|
it('should initialize lastPromptTokenCount for empty history', () => {
|
|
206
206
|
const chatEmpty = new GeminiChat(mockConfig);
|
|
@@ -431,6 +431,86 @@ describe('GeminiChat', () => {
|
|
|
431
431
|
expect(modelTurn.parts[1].functionCall).toBeDefined();
|
|
432
432
|
expect(modelTurn.parts[2].text).toBe('This is the second part.');
|
|
433
433
|
});
|
|
434
|
+
it('repro: should not overwrite parallel tool calls when they arrive in separate streaming chunks', async () => {
|
|
435
|
+
vi.mocked(mockConfig.isContextManagementEnabled).mockReturnValue(true);
|
|
436
|
+
// 1. Mock the API to return parallel tool calls in separate chunks.
|
|
437
|
+
const parallelCallsStream = (async function* () {
|
|
438
|
+
yield {
|
|
439
|
+
candidates: [
|
|
440
|
+
{
|
|
441
|
+
content: {
|
|
442
|
+
role: 'model',
|
|
443
|
+
parts: [{ functionCall: { name: 'tool_A' } }],
|
|
444
|
+
},
|
|
445
|
+
},
|
|
446
|
+
],
|
|
447
|
+
functionCalls: [{ name: 'tool_A' }],
|
|
448
|
+
};
|
|
449
|
+
yield {
|
|
450
|
+
candidates: [
|
|
451
|
+
{
|
|
452
|
+
content: {
|
|
453
|
+
role: 'model',
|
|
454
|
+
parts: [{ functionCall: { name: 'tool_B' } }],
|
|
455
|
+
},
|
|
456
|
+
finishReason: 'STOP',
|
|
457
|
+
},
|
|
458
|
+
],
|
|
459
|
+
functionCalls: [{ name: 'tool_B' }],
|
|
460
|
+
};
|
|
461
|
+
})();
|
|
462
|
+
vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(parallelCallsStream);
|
|
463
|
+
// 2. Action: Send a message and consume the stream to trigger history recording.
|
|
464
|
+
const stream = await chat.sendMessageStream({ model: 'test-model' }, 'test parallel tools', 'prompt-parallel-tools', new AbortController().signal, LlmRole.MAIN);
|
|
465
|
+
for await (const _ of stream) {
|
|
466
|
+
// Consume
|
|
467
|
+
}
|
|
468
|
+
// 3. Assert: Check that the final history contains both function calls.
|
|
469
|
+
const history = chat.getHistory();
|
|
470
|
+
expect(history.length).toBe(2);
|
|
471
|
+
const modelTurn = history[1];
|
|
472
|
+
expect(modelTurn.role).toBe('model');
|
|
473
|
+
expect(modelTurn.parts?.length).toBe(2);
|
|
474
|
+
expect(modelTurn.parts[0].functionCall?.name).toBe('tool_A');
|
|
475
|
+
expect(modelTurn.parts[1].functionCall?.name).toBe('tool_B');
|
|
476
|
+
});
|
|
477
|
+
it('repro: should not collide when multiple tool calls with the same name arrive in the same chunk', async () => {
|
|
478
|
+
vi.mocked(mockConfig.isContextManagementEnabled).mockReturnValue(true);
|
|
479
|
+
const sameNameStream = (async function* () {
|
|
480
|
+
yield {
|
|
481
|
+
candidates: [
|
|
482
|
+
{
|
|
483
|
+
content: {
|
|
484
|
+
role: 'model',
|
|
485
|
+
parts: [
|
|
486
|
+
{ functionCall: { name: 'tool_X', args: { id: 1 } } },
|
|
487
|
+
{ functionCall: { name: 'tool_X', args: { id: 2 } } },
|
|
488
|
+
],
|
|
489
|
+
},
|
|
490
|
+
finishReason: 'STOP',
|
|
491
|
+
},
|
|
492
|
+
],
|
|
493
|
+
functionCalls: [
|
|
494
|
+
{ name: 'tool_X', args: { id: 1 } },
|
|
495
|
+
{ name: 'tool_X', args: { id: 2 } },
|
|
496
|
+
],
|
|
497
|
+
};
|
|
498
|
+
})();
|
|
499
|
+
vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(sameNameStream);
|
|
500
|
+
const stream = await chat.sendMessageStream({ model: 'test-model' }, 'test same name tools', 'prompt-same-name', new AbortController().signal, LlmRole.MAIN);
|
|
501
|
+
for await (const _ of stream) {
|
|
502
|
+
// Consume the stream to trigger history recording
|
|
503
|
+
}
|
|
504
|
+
const history = chat.getHistory();
|
|
505
|
+
const modelTurn = history[1];
|
|
506
|
+
expect(modelTurn.parts?.length).toBe(2);
|
|
507
|
+
expect(modelTurn.parts[0].functionCall?.name).toBe('tool_X');
|
|
508
|
+
expect(modelTurn.parts[0].functionCall?.args).toEqual({ id: 1 });
|
|
509
|
+
expect(modelTurn.parts[1].functionCall?.name).toBe('tool_X');
|
|
510
|
+
expect(modelTurn.parts[1].functionCall?.args).toEqual({ id: 2 });
|
|
511
|
+
// If findIndex was used, both would likely point to index 0, and the second one might overwrite the first if consolidated incorrectly,
|
|
512
|
+
// or they both might end up with the same callIndex and thus the same args in final assembly.
|
|
513
|
+
});
|
|
434
514
|
it('should preserve text parts that stream in the same chunk as a thought', async () => {
|
|
435
515
|
// 1. Mock the API to return a single chunk containing both a thought and visible text.
|
|
436
516
|
const mixedContentStream = (async function* () {
|
|
@@ -2015,5 +2095,118 @@ describe('GeminiChat', () => {
|
|
|
2015
2095
|
]);
|
|
2016
2096
|
});
|
|
2017
2097
|
});
|
|
2098
|
+
describe('stripToolCallIdPrefixes', () => {
|
|
2099
|
+
it('should strip tool name prefix matching the tool name', () => {
|
|
2100
|
+
const contents = [
|
|
2101
|
+
{
|
|
2102
|
+
role: 'model',
|
|
2103
|
+
parts: [
|
|
2104
|
+
{
|
|
2105
|
+
functionCall: {
|
|
2106
|
+
id: 'my_tool__call_123',
|
|
2107
|
+
name: 'my_tool',
|
|
2108
|
+
args: {},
|
|
2109
|
+
},
|
|
2110
|
+
},
|
|
2111
|
+
],
|
|
2112
|
+
},
|
|
2113
|
+
{
|
|
2114
|
+
role: 'user',
|
|
2115
|
+
parts: [
|
|
2116
|
+
{
|
|
2117
|
+
functionResponse: {
|
|
2118
|
+
id: 'my_tool__call_123',
|
|
2119
|
+
name: 'my_tool',
|
|
2120
|
+
response: { result: 'success' },
|
|
2121
|
+
},
|
|
2122
|
+
},
|
|
2123
|
+
],
|
|
2124
|
+
},
|
|
2125
|
+
];
|
|
2126
|
+
const stripped = stripToolCallIdPrefixes(contents);
|
|
2127
|
+
expect(stripped[0].parts[0].functionCall.id).toBe('call_123');
|
|
2128
|
+
expect(stripped[1].parts[0].functionResponse.id).toBe('call_123');
|
|
2129
|
+
});
|
|
2130
|
+
it('should correctly handle tool names that contain double underscores', () => {
|
|
2131
|
+
const contents = [
|
|
2132
|
+
{
|
|
2133
|
+
role: 'model',
|
|
2134
|
+
parts: [
|
|
2135
|
+
{
|
|
2136
|
+
functionCall: {
|
|
2137
|
+
id: 'my__custom__tool__call_abc',
|
|
2138
|
+
name: 'my__custom__tool',
|
|
2139
|
+
args: {},
|
|
2140
|
+
},
|
|
2141
|
+
},
|
|
2142
|
+
],
|
|
2143
|
+
},
|
|
2144
|
+
{
|
|
2145
|
+
role: 'user',
|
|
2146
|
+
parts: [
|
|
2147
|
+
{
|
|
2148
|
+
functionResponse: {
|
|
2149
|
+
id: 'my__custom__tool__call_abc',
|
|
2150
|
+
name: 'my__custom__tool',
|
|
2151
|
+
response: { result: 'success' },
|
|
2152
|
+
},
|
|
2153
|
+
},
|
|
2154
|
+
],
|
|
2155
|
+
},
|
|
2156
|
+
];
|
|
2157
|
+
const stripped = stripToolCallIdPrefixes(contents);
|
|
2158
|
+
expect(stripped[0].parts[0].functionCall.id).toBe('call_abc');
|
|
2159
|
+
expect(stripped[1].parts[0].functionResponse.id).toBe('call_abc');
|
|
2160
|
+
});
|
|
2161
|
+
it('should not strip if prefix does not match the tool name', () => {
|
|
2162
|
+
const contents = [
|
|
2163
|
+
{
|
|
2164
|
+
role: 'model',
|
|
2165
|
+
parts: [
|
|
2166
|
+
{
|
|
2167
|
+
functionCall: {
|
|
2168
|
+
id: 'other_tool__call_123',
|
|
2169
|
+
name: 'my_tool',
|
|
2170
|
+
args: {},
|
|
2171
|
+
},
|
|
2172
|
+
},
|
|
2173
|
+
],
|
|
2174
|
+
},
|
|
2175
|
+
];
|
|
2176
|
+
const stripped = stripToolCallIdPrefixes(contents);
|
|
2177
|
+
expect(stripped[0].parts[0].functionCall.id).toBe('other_tool__call_123');
|
|
2178
|
+
});
|
|
2179
|
+
it('should correctly handle fallback to generic_tool when name is missing or has whitespace', () => {
|
|
2180
|
+
const contents = [
|
|
2181
|
+
{
|
|
2182
|
+
role: 'model',
|
|
2183
|
+
parts: [
|
|
2184
|
+
{
|
|
2185
|
+
functionCall: {
|
|
2186
|
+
id: 'generic_tool__call_123',
|
|
2187
|
+
name: ' ',
|
|
2188
|
+
args: {},
|
|
2189
|
+
},
|
|
2190
|
+
},
|
|
2191
|
+
],
|
|
2192
|
+
},
|
|
2193
|
+
{
|
|
2194
|
+
role: 'user',
|
|
2195
|
+
parts: [
|
|
2196
|
+
{
|
|
2197
|
+
functionResponse: {
|
|
2198
|
+
id: 'generic_tool__call_123',
|
|
2199
|
+
name: undefined,
|
|
2200
|
+
response: { result: 'success' },
|
|
2201
|
+
},
|
|
2202
|
+
},
|
|
2203
|
+
],
|
|
2204
|
+
},
|
|
2205
|
+
];
|
|
2206
|
+
const stripped = stripToolCallIdPrefixes(contents);
|
|
2207
|
+
expect(stripped[0].parts[0].functionCall.id).toBe('call_123');
|
|
2208
|
+
expect(stripped[1].parts[0].functionResponse.id).toBe('call_123');
|
|
2209
|
+
});
|
|
2210
|
+
});
|
|
2018
2211
|
});
|
|
2019
2212
|
//# sourceMappingURL=geminiChat.test.js.map
|