@google/gemini-cli-core 0.37.0-preview.1 → 0.38.0-preview.0
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/README.md +58 -50
- package/dist/docs/changelogs/index.md +25 -0
- package/dist/docs/changelogs/latest.md +353 -362
- package/dist/docs/changelogs/preview.md +399 -366
- package/dist/docs/cli/plan-mode.md +1 -0
- package/dist/docs/cli/sandbox.md +52 -0
- package/dist/docs/cli/settings.md +49 -46
- package/dist/docs/core/remote-agents.md +14 -18
- package/dist/docs/core/subagents.md +63 -27
- package/dist/docs/get-started/authentication.md +2 -2
- package/dist/docs/get-started/installation.md +7 -0
- package/dist/docs/hooks/index.md +6 -6
- package/dist/docs/reference/configuration.md +43 -13
- package/dist/docs/reference/keyboard-shortcuts.md +14 -9
- package/dist/docs/reference/tools.md +4 -4
- package/dist/docs/release-confidence.md +0 -6
- package/dist/docs/releases.md +4 -0
- package/dist/docs/tools/mcp-server.md +3 -3
- package/dist/docs/tools/web-fetch.md +3 -0
- package/dist/src/agent/agent-session.test.js +14 -6
- package/dist/src/agent/agent-session.test.js.map +1 -1
- package/dist/src/agent/event-translator.js +2 -1
- package/dist/src/agent/event-translator.js.map +1 -1
- package/dist/src/agent/event-translator.test.js +1 -0
- package/dist/src/agent/event-translator.test.js.map +1 -1
- package/dist/src/agent/legacy-agent-session.d.ts +47 -4
- package/dist/src/agent/legacy-agent-session.js +38 -15
- package/dist/src/agent/legacy-agent-session.js.map +1 -1
- package/dist/src/agent/legacy-agent-session.test.js +60 -73
- package/dist/src/agent/legacy-agent-session.test.js.map +1 -1
- package/dist/src/agent/mock.js +7 -1
- package/dist/src/agent/mock.js.map +1 -1
- package/dist/src/agent/mock.test.js +1 -1
- package/dist/src/agent/mock.test.js.map +1 -1
- package/dist/src/agent/types.d.ts +34 -1
- package/dist/src/agents/agent-scheduler.js +6 -1
- package/dist/src/agents/agent-scheduler.js.map +1 -1
- package/dist/src/agents/agent-scheduler.test.js +38 -0
- package/dist/src/agents/agent-scheduler.test.js.map +1 -1
- package/dist/src/agents/auth-provider/api-key-provider.test.js +18 -2
- package/dist/src/agents/auth-provider/api-key-provider.test.js.map +1 -1
- package/dist/src/agents/auth-provider/value-resolver.test.js +30 -0
- package/dist/src/agents/auth-provider/value-resolver.test.js.map +1 -1
- package/dist/src/agents/browser/analyzeScreenshot.js +36 -6
- package/dist/src/agents/browser/analyzeScreenshot.js.map +1 -1
- package/dist/src/agents/browser/analyzeScreenshot.test.js +35 -3
- package/dist/src/agents/browser/analyzeScreenshot.test.js.map +1 -1
- package/dist/src/agents/browser/browserAgentFactory.d.ts +8 -0
- package/dist/src/agents/browser/browserAgentFactory.js +174 -118
- package/dist/src/agents/browser/browserAgentFactory.js.map +1 -1
- package/dist/src/agents/browser/browserAgentFactory.test.js +70 -1
- package/dist/src/agents/browser/browserAgentFactory.test.js.map +1 -1
- package/dist/src/agents/browser/browserAgentInvocation.js +29 -2
- package/dist/src/agents/browser/browserAgentInvocation.js.map +1 -1
- package/dist/src/agents/browser/browserAgentInvocation.test.js +51 -5
- package/dist/src/agents/browser/browserAgentInvocation.test.js.map +1 -1
- package/dist/src/agents/browser/browserManager.d.ts +38 -0
- package/dist/src/agents/browser/browserManager.js +117 -6
- package/dist/src/agents/browser/browserManager.js.map +1 -1
- package/dist/src/agents/browser/browserManager.test.js +156 -2
- package/dist/src/agents/browser/browserManager.test.js.map +1 -1
- package/dist/src/agents/browser/modelAvailability.d.ts +5 -0
- package/dist/src/agents/browser/modelAvailability.js +12 -0
- package/dist/src/agents/browser/modelAvailability.js.map +1 -1
- package/dist/src/agents/local-executor.d.ts +5 -0
- package/dist/src/agents/local-executor.js +98 -181
- package/dist/src/agents/local-executor.js.map +1 -1
- package/dist/src/agents/local-executor.test.js +386 -101
- package/dist/src/agents/local-executor.test.js.map +1 -1
- package/dist/src/agents/memory-manager-agent.js +1 -0
- package/dist/src/agents/memory-manager-agent.js.map +1 -1
- package/dist/src/agents/memory-manager-agent.test.js +6 -0
- package/dist/src/agents/memory-manager-agent.test.js.map +1 -1
- package/dist/src/agents/registry.js +3 -10
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/skill-extraction-agent.d.ts +24 -0
- package/dist/src/agents/skill-extraction-agent.js +269 -0
- package/dist/src/agents/skill-extraction-agent.js.map +1 -0
- package/dist/src/agents/types.d.ts +11 -0
- package/dist/src/code_assist/admin/admin_controls.js +1 -1
- package/dist/src/code_assist/admin/admin_controls.js.map +1 -1
- package/dist/src/code_assist/experiments/flagNames.d.ts +1 -0
- package/dist/src/code_assist/experiments/flagNames.js +1 -0
- package/dist/src/code_assist/experiments/flagNames.js.map +1 -1
- package/dist/src/code_assist/server.js +1 -1
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/commands/memory.js +1 -1
- package/dist/src/commands/memory.js.map +1 -1
- package/dist/src/config/config.d.ts +34 -31
- package/dist/src/config/config.js +101 -38
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +102 -15
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extensions/integrity.js +1 -1
- package/dist/src/config/extensions/integrity.js.map +1 -1
- package/dist/src/config/projectRegistry.js +5 -3
- package/dist/src/config/projectRegistry.js.map +1 -1
- package/dist/src/config/scoped-config.d.ts +30 -0
- package/dist/src/config/scoped-config.js +69 -0
- package/dist/src/config/scoped-config.js.map +1 -0
- package/dist/src/config/scoped-config.test.d.ts +6 -0
- package/dist/src/config/scoped-config.test.js +161 -0
- package/dist/src/config/scoped-config.test.js.map +1 -0
- package/dist/src/config/storage.d.ts +2 -0
- package/dist/src/config/storage.js +7 -2
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/config/storage.test.js +7 -7
- package/dist/src/config/storage.test.js.map +1 -1
- package/dist/src/confirmation-bus/types.d.ts +2 -2
- package/dist/src/context/agentHistoryProvider.d.ts +1 -1
- package/dist/src/context/agentHistoryProvider.js +1 -5
- package/dist/src/context/agentHistoryProvider.js.map +1 -1
- package/dist/src/context/agentHistoryProvider.test.js +2 -39
- package/dist/src/context/agentHistoryProvider.test.js.map +1 -1
- package/dist/src/context/contextCompressionService.d.ts +30 -0
- package/dist/src/context/contextCompressionService.js +405 -0
- package/dist/src/context/contextCompressionService.js.map +1 -0
- package/dist/src/context/contextCompressionService.test.d.ts +1 -0
- package/dist/src/context/contextCompressionService.test.js +253 -0
- package/dist/src/context/contextCompressionService.test.js.map +1 -0
- package/dist/src/context/{contextManager.d.ts → memoryContextManager.d.ts} +1 -1
- package/dist/src/context/{contextManager.js → memoryContextManager.js} +2 -2
- package/dist/src/context/memoryContextManager.js.map +1 -0
- package/dist/src/context/{contextManager.test.js → memoryContextManager.test.js} +22 -28
- package/dist/src/context/memoryContextManager.test.js.map +1 -0
- package/dist/src/context/profiles.d.ts +7 -0
- package/dist/src/context/profiles.js +21 -0
- package/dist/src/context/profiles.js.map +1 -0
- package/dist/src/context/toolDistillationService.test.js +3 -0
- package/dist/src/context/toolDistillationService.test.js.map +1 -1
- package/dist/src/context/types.d.ts +36 -0
- package/dist/src/context/types.js.map +1 -0
- package/dist/src/core/baseLlmClient.js +1 -1
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +1 -0
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.js +1 -1
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +7 -6
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +8 -0
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +1 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/geminiChat_network_retry.test.js +1 -0
- package/dist/src/core/geminiChat_network_retry.test.js.map +1 -1
- package/dist/src/core/logger.js +4 -4
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +1 -1
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.js +1 -1
- package/dist/src/core/loggingContentGenerator.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/hooks/hookEventHandler.js +8 -0
- package/dist/src/hooks/hookEventHandler.js.map +1 -1
- package/dist/src/hooks/hookRunner.js +9 -5
- package/dist/src/hooks/hookRunner.js.map +1 -1
- package/dist/src/hooks/hookRunner.test.js +20 -3
- package/dist/src/hooks/hookRunner.test.js.map +1 -1
- package/dist/src/hooks/hookSystem.d.ts +2 -0
- package/dist/src/hooks/hookSystem.js +1 -0
- package/dist/src/hooks/hookSystem.js.map +1 -1
- package/dist/src/hooks/hookTranslator.js +20 -13
- package/dist/src/hooks/hookTranslator.js.map +1 -1
- package/dist/src/hooks/hookTranslator.test.js +36 -0
- package/dist/src/hooks/hookTranslator.test.js.map +1 -1
- package/dist/src/hooks/types.d.ts +2 -0
- package/dist/src/ide/ide-client.js +3 -3
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-connection-utils.js +1 -1
- package/dist/src/ide/ide-connection-utils.js.map +1 -1
- package/dist/src/ide/ide-installer.js +3 -3
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/process-utils.js +3 -3
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/index.d.ts +4 -1
- package/dist/src/index.js +5 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/output/json-formatter.js +2 -1
- package/dist/src/output/json-formatter.js.map +1 -1
- package/dist/src/policy/config.test.js +21 -20
- package/dist/src/policy/config.test.js.map +1 -1
- package/dist/src/policy/policies/memory-manager.toml +11 -1
- package/dist/src/policy/policies/plan.toml +4 -3
- package/dist/src/policy/policies/read-only.toml +6 -0
- package/dist/src/policy/policies/sandbox-default.toml +2 -3
- package/dist/src/policy/policy-engine.js +23 -0
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +129 -1
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/sandboxPolicyManager.d.ts +26 -1
- package/dist/src/policy/sandboxPolicyManager.js +41 -12
- package/dist/src/policy/sandboxPolicyManager.js.map +1 -1
- package/dist/src/policy/sandboxPolicyManager.test.d.ts +6 -0
- package/dist/src/policy/sandboxPolicyManager.test.js +61 -0
- package/dist/src/policy/sandboxPolicyManager.test.js.map +1 -0
- package/dist/src/policy/workspace-policy.test.js +18 -15
- package/dist/src/policy/workspace-policy.test.js.map +1 -1
- package/dist/src/prompts/snippets.js +6 -3
- package/dist/src/prompts/snippets.js.map +1 -1
- package/dist/src/prompts/snippets.legacy.js +6 -2
- package/dist/src/prompts/snippets.legacy.js.map +1 -1
- package/dist/src/prompts/utils.test.js +7 -5
- package/dist/src/prompts/utils.test.js.map +1 -1
- package/dist/src/safety/built-in.js +1 -1
- package/dist/src/safety/built-in.js.map +1 -1
- package/dist/src/sandbox/linux/LinuxSandboxManager.d.ts +4 -4
- package/dist/src/sandbox/linux/LinuxSandboxManager.js +47 -191
- package/dist/src/sandbox/linux/LinuxSandboxManager.js.map +1 -1
- package/dist/src/sandbox/linux/LinuxSandboxManager.test.js +33 -395
- package/dist/src/sandbox/linux/LinuxSandboxManager.test.js.map +1 -1
- package/dist/src/sandbox/linux/bwrapArgsBuilder.d.ts +24 -0
- package/dist/src/sandbox/linux/bwrapArgsBuilder.js +200 -0
- package/dist/src/sandbox/linux/bwrapArgsBuilder.js.map +1 -0
- package/dist/src/sandbox/linux/bwrapArgsBuilder.test.d.ts +6 -0
- package/dist/src/sandbox/linux/bwrapArgsBuilder.test.js +247 -0
- package/dist/src/sandbox/linux/bwrapArgsBuilder.test.js.map +1 -0
- package/dist/src/sandbox/macos/MacOsSandboxManager.d.ts +3 -0
- package/dist/src/sandbox/macos/MacOsSandboxManager.js +12 -5
- package/dist/src/sandbox/macos/MacOsSandboxManager.js.map +1 -1
- package/dist/src/sandbox/macos/MacOsSandboxManager.test.js +20 -0
- package/dist/src/sandbox/macos/MacOsSandboxManager.test.js.map +1 -1
- package/dist/src/sandbox/macos/baseProfile.d.ts +1 -1
- package/dist/src/sandbox/macos/baseProfile.js +28 -4
- package/dist/src/sandbox/macos/baseProfile.js.map +1 -1
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.js +1 -1
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.js.map +1 -1
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.test.js +2 -1
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.test.js.map +1 -1
- package/dist/src/sandbox/utils/fsUtils.js +8 -6
- package/dist/src/sandbox/utils/fsUtils.js.map +1 -1
- package/dist/src/sandbox/utils/fsUtils.test.d.ts +6 -0
- package/dist/src/sandbox/utils/fsUtils.test.js +43 -0
- package/dist/src/sandbox/utils/fsUtils.test.js.map +1 -0
- package/dist/src/sandbox/utils/proactivePermissions.d.ts +19 -0
- package/dist/src/sandbox/utils/proactivePermissions.js +163 -0
- package/dist/src/sandbox/utils/proactivePermissions.js.map +1 -0
- package/dist/src/sandbox/utils/proactivePermissions.test.d.ts +6 -0
- package/dist/src/sandbox/utils/proactivePermissions.test.js +145 -0
- package/dist/src/sandbox/utils/proactivePermissions.test.js.map +1 -0
- package/dist/src/sandbox/utils/sandboxDenialUtils.d.ts +16 -1
- package/dist/src/sandbox/utils/sandboxDenialUtils.js +98 -24
- package/dist/src/sandbox/utils/sandboxDenialUtils.js.map +1 -1
- package/dist/src/sandbox/utils/sandboxDenialUtils.test.js +152 -1
- package/dist/src/sandbox/utils/sandboxDenialUtils.test.js.map +1 -1
- package/dist/src/sandbox/utils/sandboxReadWriteUtils.js +4 -0
- package/dist/src/sandbox/utils/sandboxReadWriteUtils.js.map +1 -1
- package/dist/src/sandbox/windows/GeminiSandbox.cs +90 -42
- package/dist/src/sandbox/windows/WindowsSandboxManager.d.ts +4 -0
- package/dist/src/sandbox/windows/WindowsSandboxManager.js +65 -60
- package/dist/src/sandbox/windows/WindowsSandboxManager.js.map +1 -1
- package/dist/src/sandbox/windows/WindowsSandboxManager.test.js +99 -54
- package/dist/src/sandbox/windows/WindowsSandboxManager.test.js.map +1 -1
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.d.ts +2 -1
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.js +19 -18
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.js.map +1 -1
- package/dist/src/scheduler/scheduler.js +1 -1
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/scheduler/scheduler_hooks.test.js +1 -1
- package/dist/src/scheduler/scheduler_hooks.test.js.map +1 -1
- package/dist/src/scheduler/tool-executor.js +1 -1
- package/dist/src/scheduler/tool-executor.js.map +1 -1
- package/dist/src/scheduler/tool-executor.test.js +1 -1
- package/dist/src/scheduler/tool-executor.test.js.map +1 -1
- package/dist/src/services/executionLifecycleService.d.ts +1 -0
- package/dist/src/services/executionLifecycleService.js +3 -0
- package/dist/src/services/executionLifecycleService.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/memoryService.d.ts +65 -0
- package/dist/src/services/memoryService.js +511 -0
- package/dist/src/services/memoryService.js.map +1 -0
- package/dist/src/services/memoryService.test.d.ts +6 -0
- package/dist/src/services/memoryService.test.js +563 -0
- package/dist/src/services/memoryService.test.js.map +1 -0
- package/dist/src/services/sandboxManager.d.ts +17 -0
- package/dist/src/services/sandboxManager.integration.test.js +18 -11
- package/dist/src/services/sandboxManager.integration.test.js.map +1 -1
- package/dist/src/services/sandboxManager.js +20 -0
- package/dist/src/services/sandboxManager.js.map +1 -1
- package/dist/src/services/sandboxManager.test.js +84 -56
- package/dist/src/services/sandboxManager.test.js.map +1 -1
- package/dist/src/services/sandboxManagerFactory.js +2 -5
- package/dist/src/services/sandboxManagerFactory.js.map +1 -1
- package/dist/src/services/sandboxedFileSystemService.js +14 -3
- package/dist/src/services/sandboxedFileSystemService.js.map +1 -1
- package/dist/src/services/sandboxedFileSystemService.test.js +29 -14
- package/dist/src/services/sandboxedFileSystemService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +16 -1
- package/dist/src/services/shellExecutionService.js +70 -10
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +65 -4
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/services/worktreeService.test.js +7 -7
- package/dist/src/services/worktreeService.test.js.map +1 -1
- package/dist/src/skills/skillLoader.d.ts +8 -0
- package/dist/src/skills/skillLoader.js +1 -1
- package/dist/src/skills/skillLoader.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +29 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +101 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +167 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +9 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +20 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +22 -0
- package/dist/src/telemetry/loggers.js +40 -1
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +108 -0
- package/dist/src/telemetry/metrics.js +177 -0
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +254 -0
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/tools/complete-task.d.ts +29 -0
- package/dist/src/tools/complete-task.js +123 -0
- package/dist/src/tools/complete-task.js.map +1 -0
- package/dist/src/tools/complete-task.test.d.ts +6 -0
- package/dist/src/tools/complete-task.test.js +114 -0
- package/dist/src/tools/complete-task.test.js.map +1 -0
- package/dist/src/tools/definitions/base-declarations.d.ts +2 -0
- package/dist/src/tools/definitions/base-declarations.js +3 -0
- package/dist/src/tools/definitions/base-declarations.js.map +1 -1
- package/dist/src/tools/definitions/coreTools.d.ts +1 -1
- package/dist/src/tools/definitions/coreTools.js +1 -1
- package/dist/src/tools/definitions/coreTools.js.map +1 -1
- package/dist/src/tools/definitions/dynamic-declaration-helpers.js +4 -0
- package/dist/src/tools/definitions/dynamic-declaration-helpers.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js +3 -3
- 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 +3 -3
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js.map +1 -1
- package/dist/src/tools/grep.test.js +2 -2
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/jit-context.js +3 -3
- package/dist/src/tools/jit-context.js.map +1 -1
- package/dist/src/tools/jit-context.test.js +15 -13
- package/dist/src/tools/jit-context.test.js.map +1 -1
- package/dist/src/tools/mcp-client.js +1 -1
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +1 -1
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +1 -1
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +7 -4
- package/dist/src/tools/shell.js +255 -37
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +182 -8
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/shellBackgroundTools.d.ts +38 -0
- package/dist/src/tools/shellBackgroundTools.integration.test.d.ts +6 -0
- package/dist/src/tools/shellBackgroundTools.integration.test.js +86 -0
- package/dist/src/tools/shellBackgroundTools.integration.test.js.map +1 -0
- package/dist/src/tools/shellBackgroundTools.js +186 -0
- package/dist/src/tools/shellBackgroundTools.js.map +1 -0
- package/dist/src/tools/shellBackgroundTools.test.d.ts +6 -0
- package/dist/src/tools/shellBackgroundTools.test.js +230 -0
- package/dist/src/tools/shellBackgroundTools.test.js.map +1 -0
- package/dist/src/tools/shell_proactive.test.d.ts +6 -0
- package/dist/src/tools/shell_proactive.test.js +122 -0
- package/dist/src/tools/shell_proactive.test.js.map +1 -0
- package/dist/src/tools/tool-names.d.ts +3 -3
- package/dist/src/tools/tool-names.js +3 -2
- package/dist/src/tools/tool-names.js.map +1 -1
- package/dist/src/tools/tools.js +1 -1
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js +8 -8
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +5 -5
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/xcode-mcp-fix-transport.js +1 -1
- package/dist/src/tools/xcode-mcp-fix-transport.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.js +3 -6
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/checkpointUtils.js +11 -8
- package/dist/src/utils/checkpointUtils.js.map +1 -1
- package/dist/src/utils/compatibility.js +0 -7
- package/dist/src/utils/compatibility.js.map +1 -1
- package/dist/src/utils/compatibility.test.js +0 -9
- package/dist/src/utils/compatibility.test.js.map +1 -1
- package/dist/src/utils/editor.js +3 -0
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/errorParsing.js +2 -2
- package/dist/src/utils/errorParsing.js.map +1 -1
- package/dist/src/utils/events.d.ts +12 -0
- package/dist/src/utils/events.js +7 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/fetch.d.ts +1 -0
- package/dist/src/utils/fetch.js +22 -6
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/fetch.test.js +26 -1
- package/dist/src/utils/fetch.test.js.map +1 -1
- package/dist/src/utils/fileUtils.js +1 -1
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/filesearch/crawler.js +1 -1
- package/dist/src/utils/filesearch/crawler.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.test.js +7 -2
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
- package/dist/src/utils/getPty.js +2 -2
- package/dist/src/utils/getPty.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.js +2 -2
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/gitUtils.js +2 -2
- package/dist/src/utils/gitUtils.js.map +1 -1
- package/dist/src/utils/googleErrors.js +5 -5
- package/dist/src/utils/googleErrors.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/memoryDiscovery.js +3 -7
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/paths.d.ts +8 -0
- package/dist/src/utils/paths.js +37 -6
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.js +61 -3
- package/dist/src/utils/paths.test.js.map +1 -1
- package/dist/src/utils/process-utils.js +2 -2
- package/dist/src/utils/process-utils.js.map +1 -1
- package/dist/src/utils/retry.js +7 -0
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +41 -0
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/secure-browser-launcher.js +1 -1
- package/dist/src/utils/secure-browser-launcher.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +9 -0
- package/dist/src/utils/shell-utils.integration.test.js +1 -1
- package/dist/src/utils/shell-utils.integration.test.js.map +1 -1
- package/dist/src/utils/shell-utils.js +43 -4
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +13 -1
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/systemEncoding.js +1 -1
- package/dist/src/utils/systemEncoding.js.map +1 -1
- package/dist/src/utils/terminalSerializer.d.ts +1 -0
- package/dist/src/utils/terminalSerializer.js +31 -8
- package/dist/src/utils/terminalSerializer.js.map +1 -1
- package/dist/src/utils/terminalSerializer.test.js +3 -2
- package/dist/src/utils/terminalSerializer.test.js.map +1 -1
- package/dist/src/utils/workspaceContext.js +2 -2
- package/dist/src/utils/workspaceContext.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/google-gemini-cli-core-0.37.0-preview.0.tgz +0 -0
- package/dist/src/context/contextManager.js.map +0 -1
- package/dist/src/context/contextManager.test.js.map +0 -1
- package/dist/src/services/types.d.ts +0 -14
- package/dist/src/services/types.js.map +0 -1
- /package/dist/src/context/{contextManager.test.d.ts → memoryContextManager.test.d.ts} +0 -0
- /package/dist/src/{services → context}/types.js +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value-resolver.test.js","sourceRoot":"","sources":["../../../../src/agents/auth-provider/value-resolver.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"value-resolver.test.js","sourceRoot":"","sources":["../../../../src/agents/auth-provider/value-resolver.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,8 @@
|
|
|
16
16
|
* to the browser agent, which retains full control of subsequent actions.
|
|
17
17
|
*/
|
|
18
18
|
import { DeclarativeTool, BaseToolInvocation, Kind, } from '../../tools/tools.js';
|
|
19
|
-
import {
|
|
19
|
+
import { Environment } from '@google/genai';
|
|
20
|
+
import { getVisualAgentModel, isComputerUseModel, } from './modelAvailability.js';
|
|
20
21
|
import { debugLogger } from '../../utils/debugLogger.js';
|
|
21
22
|
import { LlmRole } from '../../telemetry/llmRole.js';
|
|
22
23
|
/**
|
|
@@ -87,6 +88,26 @@ class AnalyzeScreenshotInvocation extends BaseToolInvocation {
|
|
|
87
88
|
// Make a single generateContent call with the visual model
|
|
88
89
|
const visualModel = getVisualAgentModel(this.config);
|
|
89
90
|
const contentGenerator = this.config.getContentGenerator();
|
|
91
|
+
// Computer-use models require the computerUse tool declaration in every
|
|
92
|
+
// request. We exclude all predefined action functions so the model
|
|
93
|
+
// provides text analysis rather than issuing actions.
|
|
94
|
+
// Non-computer-use models (e.g., gemini-2.0-flash) do plain text
|
|
95
|
+
// analysis natively and don't need this declaration.
|
|
96
|
+
const tools = isComputerUseModel(visualModel)
|
|
97
|
+
? [
|
|
98
|
+
{
|
|
99
|
+
computerUse: {
|
|
100
|
+
environment: Environment.ENVIRONMENT_BROWSER,
|
|
101
|
+
excludedPredefinedFunctions: [
|
|
102
|
+
'open_web_browser',
|
|
103
|
+
'click_at',
|
|
104
|
+
'key_combination',
|
|
105
|
+
'drag_and_drop',
|
|
106
|
+
],
|
|
107
|
+
},
|
|
108
|
+
},
|
|
109
|
+
]
|
|
110
|
+
: undefined;
|
|
90
111
|
const response = await contentGenerator.generateContent({
|
|
91
112
|
model: visualModel,
|
|
92
113
|
config: {
|
|
@@ -94,6 +115,7 @@ class AnalyzeScreenshotInvocation extends BaseToolInvocation {
|
|
|
94
115
|
topP: 0.95,
|
|
95
116
|
systemInstruction: VISUAL_SYSTEM_PROMPT,
|
|
96
117
|
abortSignal: signal,
|
|
118
|
+
...(tools ? { tools } : {}),
|
|
97
119
|
},
|
|
98
120
|
contents: [
|
|
99
121
|
{
|
|
@@ -112,11 +134,19 @@ class AnalyzeScreenshotInvocation extends BaseToolInvocation {
|
|
|
112
134
|
},
|
|
113
135
|
],
|
|
114
136
|
}, 'visual-analysis', LlmRole.UTILITY_TOOL);
|
|
115
|
-
// Extract
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
137
|
+
// Extract response content. Computer-use models may still return
|
|
138
|
+
// functionCall parts even with exclusions, so we handle both text
|
|
139
|
+
// and functionCall parts defensively.
|
|
140
|
+
const parts = response.candidates?.[0]?.content?.parts ?? [];
|
|
141
|
+
const textParts = parts.filter((p) => p.text).map((p) => p.text);
|
|
142
|
+
const functionCallParts = parts
|
|
143
|
+
.filter((p) => p.functionCall)
|
|
144
|
+
.map((p) => {
|
|
145
|
+
const fc = p.functionCall;
|
|
146
|
+
const argsStr = fc.args ? JSON.stringify(fc.args) : '';
|
|
147
|
+
return `Action: ${fc.name}${argsStr ? ` with args ${argsStr}` : ''}`;
|
|
148
|
+
});
|
|
149
|
+
const responseText = [...textParts, ...functionCallParts].join('\n');
|
|
120
150
|
if (!responseText) {
|
|
121
151
|
return {
|
|
122
152
|
llmContent: 'Visual model returned no analysis. Use accessibility tree elements instead.',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeScreenshot.js","sourceRoot":"","sources":["../../../../src/agents/browser/analyzeScreenshot.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;;;;GAWG;AAEH,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,IAAI,GAGL,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"analyzeScreenshot.js","sourceRoot":"","sources":["../../../../src/agents/browser/analyzeScreenshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
7
7
|
import { createAnalyzeScreenshotTool } from './analyzeScreenshot.js';
|
|
8
|
+
import { Environment } from '@google/genai';
|
|
8
9
|
const mockMessageBus = {
|
|
9
10
|
waitForConfirmation: vi.fn().mockResolvedValue({ approved: true }),
|
|
10
11
|
};
|
|
@@ -22,7 +23,7 @@ function createMockBrowserManager(callToolResult) {
|
|
|
22
23
|
}),
|
|
23
24
|
};
|
|
24
25
|
}
|
|
25
|
-
function createMockConfig(generateContentResult, generateContentError) {
|
|
26
|
+
function createMockConfig(generateContentResult, generateContentError, modelName = 'gemini-2.5-computer-use-preview-10-2025') {
|
|
26
27
|
const generateContent = generateContentError
|
|
27
28
|
? vi.fn().mockRejectedValue(generateContentError)
|
|
28
29
|
: vi.fn().mockResolvedValue(generateContentResult ?? {
|
|
@@ -40,7 +41,7 @@ function createMockConfig(generateContentResult, generateContentError) {
|
|
|
40
41
|
});
|
|
41
42
|
return {
|
|
42
43
|
getBrowserAgentConfig: vi.fn().mockReturnValue({
|
|
43
|
-
customConfig: { visualModel:
|
|
44
|
+
customConfig: { visualModel: modelName },
|
|
44
45
|
}),
|
|
45
46
|
getContentGenerator: vi.fn().mockReturnValue({
|
|
46
47
|
generateContent,
|
|
@@ -73,7 +74,22 @@ describe('analyzeScreenshot', () => {
|
|
|
73
74
|
// Verify the visual model was called
|
|
74
75
|
const contentGenerator = config.getContentGenerator();
|
|
75
76
|
expect(contentGenerator.generateContent).toHaveBeenCalledWith(expect.objectContaining({
|
|
76
|
-
model: '
|
|
77
|
+
model: 'gemini-2.5-computer-use-preview-10-2025',
|
|
78
|
+
config: expect.objectContaining({
|
|
79
|
+
tools: [
|
|
80
|
+
{
|
|
81
|
+
computerUse: {
|
|
82
|
+
environment: Environment.ENVIRONMENT_BROWSER,
|
|
83
|
+
excludedPredefinedFunctions: [
|
|
84
|
+
'open_web_browser',
|
|
85
|
+
'click_at',
|
|
86
|
+
'key_combination',
|
|
87
|
+
'drag_and_drop',
|
|
88
|
+
],
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
],
|
|
92
|
+
}),
|
|
77
93
|
contents: expect.arrayContaining([
|
|
78
94
|
expect.objectContaining({
|
|
79
95
|
role: 'user',
|
|
@@ -93,6 +109,22 @@ describe('analyzeScreenshot', () => {
|
|
|
93
109
|
expect(result.llmContent).toContain('The blue submit button is at coordinates (250, 400).');
|
|
94
110
|
expect(result.error).toBeUndefined();
|
|
95
111
|
});
|
|
112
|
+
it('omits computerUse tools for non-computer-use models', async () => {
|
|
113
|
+
const browserManager = createMockBrowserManager();
|
|
114
|
+
const config = createMockConfig(undefined, undefined, 'gemini-2.0-flash');
|
|
115
|
+
const tool = createAnalyzeScreenshotTool(browserManager, config, mockMessageBus);
|
|
116
|
+
const invocation = tool.build({
|
|
117
|
+
instruction: 'Find the search bar',
|
|
118
|
+
});
|
|
119
|
+
await invocation.execute(new AbortController().signal);
|
|
120
|
+
const contentGenerator = config.getContentGenerator();
|
|
121
|
+
expect(contentGenerator.generateContent).toHaveBeenCalledWith(expect.objectContaining({
|
|
122
|
+
model: 'gemini-2.0-flash',
|
|
123
|
+
config: expect.not.objectContaining({
|
|
124
|
+
tools: expect.anything(),
|
|
125
|
+
}),
|
|
126
|
+
}), 'visual-analysis', 'utility_tool');
|
|
127
|
+
});
|
|
96
128
|
it('returns an error when screenshot capture fails (no image)', async () => {
|
|
97
129
|
const browserManager = createMockBrowserManager({
|
|
98
130
|
content: [{ type: 'text', text: 'No screenshot available' }],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeScreenshot.test.js","sourceRoot":"","sources":["../../../../src/agents/browser/analyzeScreenshot.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"analyzeScreenshot.test.js","sourceRoot":"","sources":["../../../../src/agents/browser/analyzeScreenshot.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,10 +33,18 @@ import { type BrowserTaskResultSchema } from './browserAgentDefinition.js';
|
|
|
33
33
|
export declare function createBrowserAgentDefinition(config: Config, messageBus: MessageBus, _printOutput?: (msg: string) => void): Promise<{
|
|
34
34
|
definition: LocalAgentDefinition<typeof BrowserTaskResultSchema>;
|
|
35
35
|
browserManager: BrowserManager;
|
|
36
|
+
visionEnabled: boolean;
|
|
37
|
+
sessionMode: 'persistent' | 'isolated' | 'existing';
|
|
36
38
|
}>;
|
|
37
39
|
/**
|
|
38
40
|
* Closes all persistent browser sessions and cleans up resources.
|
|
39
41
|
*
|
|
42
|
+
* @param browserManager The browser manager to clean up
|
|
43
|
+
* @param config Runtime configuration
|
|
44
|
+
* @param sessionMode The browser session mode
|
|
45
|
+
*/
|
|
46
|
+
export declare function cleanupBrowserAgent(browserManager: BrowserManager, config: Config, sessionMode: 'persistent' | 'isolated' | 'existing'): Promise<void>;
|
|
47
|
+
/**
|
|
40
48
|
* Call this on /clear commands and CLI exit to reset browser state.
|
|
41
49
|
*/
|
|
42
50
|
export declare function resetBrowserSession(): Promise<void>;
|
|
@@ -13,6 +13,8 @@ import { createAnalyzeScreenshotTool } from './analyzeScreenshot.js';
|
|
|
13
13
|
import { injectAutomationOverlay } from './automationOverlay.js';
|
|
14
14
|
import { injectInputBlocker } from './inputBlocker.js';
|
|
15
15
|
import { debugLogger } from '../../utils/debugLogger.js';
|
|
16
|
+
import { recordBrowserAgentToolDiscovery } from '../../telemetry/metrics.js';
|
|
17
|
+
import { logBrowserAgentVisionStatus, logBrowserAgentCleanup, } from '../../telemetry/loggers.js';
|
|
16
18
|
import { PolicyDecision, PRIORITY_SUBAGENT_TOOL, } from '../../policy/types.js';
|
|
17
19
|
/**
|
|
18
20
|
* Creates a browser agent definition with MCP tools configured.
|
|
@@ -30,140 +32,194 @@ export async function createBrowserAgentDefinition(config, messageBus, _printOut
|
|
|
30
32
|
debugLogger.log('Creating browser agent definition with isolated MCP tools...');
|
|
31
33
|
// Get or create browser manager singleton for this session mode/profile
|
|
32
34
|
const browserManager = BrowserManager.getInstance(config);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
// Create declarative tools from dynamically discovered MCP tools
|
|
48
|
-
// These tools dispatch to browserManager's isolated client
|
|
49
|
-
const mcpTools = await createMcpDeclarativeTools(browserManager, messageBus, shouldDisableInput, browserConfig.customConfig.blockFileUploads);
|
|
50
|
-
const availableToolNames = mcpTools.map((t) => t.name);
|
|
51
|
-
// Register high-priority policy rules for sensitive actions which is not
|
|
52
|
-
// able to be overwrite by YOLO mode.
|
|
53
|
-
const policyEngine = config.getPolicyEngine();
|
|
54
|
-
if (policyEngine) {
|
|
55
|
-
const existingRules = policyEngine.getRules();
|
|
56
|
-
const restrictedTools = ['fill', 'fill_form'];
|
|
57
|
-
// ASK_USER for upload_file and evaluate_script when sensitive action
|
|
58
|
-
// need confirmation.
|
|
59
|
-
if (browserConfig.customConfig.confirmSensitiveActions) {
|
|
60
|
-
restrictedTools.push('upload_file', 'evaluate_script');
|
|
61
|
-
}
|
|
62
|
-
for (const toolName of restrictedTools) {
|
|
63
|
-
const rule = generateAskUserRules(toolName);
|
|
64
|
-
if (!existingRules.some((r) => isRuleEqual(r, rule))) {
|
|
65
|
-
policyEngine.addRule(rule);
|
|
35
|
+
browserManager.acquire();
|
|
36
|
+
try {
|
|
37
|
+
await browserManager.ensureConnection();
|
|
38
|
+
debugLogger.log('Browser connected with isolated MCP client.');
|
|
39
|
+
// Determine if input blocker should be active (non-headless + enabled)
|
|
40
|
+
const shouldDisableInput = config.shouldDisableBrowserUserInput();
|
|
41
|
+
// Inject automation overlay and input blocker if not in headless mode
|
|
42
|
+
const browserConfig = config.getBrowserAgentConfig();
|
|
43
|
+
if (!browserConfig?.customConfig?.headless) {
|
|
44
|
+
debugLogger.log('Injecting automation overlay...');
|
|
45
|
+
await injectAutomationOverlay(browserManager);
|
|
46
|
+
if (shouldDisableInput) {
|
|
47
|
+
debugLogger.log('Injecting input blocker...');
|
|
48
|
+
await injectInputBlocker(browserManager);
|
|
66
49
|
}
|
|
67
50
|
}
|
|
68
|
-
//
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
51
|
+
// Create declarative tools from dynamically discovered MCP tools
|
|
52
|
+
// These tools dispatch to browserManager's isolated client
|
|
53
|
+
const mcpTools = await createMcpDeclarativeTools(browserManager, messageBus, shouldDisableInput, browserConfig.customConfig.blockFileUploads);
|
|
54
|
+
const availableToolNames = mcpTools.map((t) => t.name);
|
|
55
|
+
// Register high-priority policy rules for sensitive actions which is not
|
|
56
|
+
// able to be overwrite by YOLO mode.
|
|
57
|
+
const policyEngine = config.getPolicyEngine();
|
|
58
|
+
if (policyEngine) {
|
|
59
|
+
const existingRules = policyEngine.getRules();
|
|
60
|
+
const restrictedTools = ['fill', 'fill_form'];
|
|
61
|
+
// ASK_USER for upload_file and evaluate_script when sensitive action
|
|
62
|
+
// need confirmation.
|
|
63
|
+
if (browserConfig.customConfig.confirmSensitiveActions) {
|
|
64
|
+
restrictedTools.push('upload_file', 'evaluate_script');
|
|
65
|
+
}
|
|
66
|
+
for (const toolName of restrictedTools) {
|
|
67
|
+
const rule = generateAskUserRules(toolName);
|
|
76
68
|
if (!existingRules.some((r) => isRuleEqual(r, rule))) {
|
|
77
69
|
policyEngine.addRule(rule);
|
|
78
70
|
}
|
|
79
71
|
}
|
|
72
|
+
// Reduce noise for read-only tools in default mode
|
|
73
|
+
const readOnlyTools = (await browserManager.getDiscoveredTools())
|
|
74
|
+
.filter((t) => !!t.annotations?.readOnlyHint)
|
|
75
|
+
.map((t) => t.name);
|
|
76
|
+
const allowlistedReadonlyTools = ['take_snapshot', 'take_screenshot'];
|
|
77
|
+
for (const toolName of [...readOnlyTools, ...allowlistedReadonlyTools]) {
|
|
78
|
+
if (availableToolNames.includes(toolName)) {
|
|
79
|
+
const rule = generateAllowRules(toolName);
|
|
80
|
+
if (!existingRules.some((r) => isRuleEqual(r, rule))) {
|
|
81
|
+
policyEngine.addRule(rule);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
80
85
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
};
|
|
90
|
-
}
|
|
91
|
-
function generateAllowRules(toolName) {
|
|
92
|
-
return {
|
|
93
|
-
toolName: `${MCP_TOOL_PREFIX}${BROWSER_AGENT_NAME}_${toolName}`,
|
|
94
|
-
decision: PolicyDecision.ALLOW,
|
|
95
|
-
priority: PRIORITY_SUBAGENT_TOOL,
|
|
96
|
-
source: 'BrowserAgent (Read-Only)',
|
|
97
|
-
mcpName: BROWSER_AGENT_NAME,
|
|
98
|
-
};
|
|
99
|
-
}
|
|
100
|
-
// Check if policy rule the same in all the attributes that we care about
|
|
101
|
-
function isRuleEqual(rule1, rule2) {
|
|
102
|
-
return (rule1.toolName === rule2.toolName &&
|
|
103
|
-
rule1.decision === rule2.decision &&
|
|
104
|
-
rule1.priority === rule2.priority &&
|
|
105
|
-
rule1.mcpName === rule2.mcpName);
|
|
106
|
-
}
|
|
107
|
-
// Validate required semantic tools are available
|
|
108
|
-
const requiredSemanticTools = [
|
|
109
|
-
'click',
|
|
110
|
-
'fill',
|
|
111
|
-
'navigate_page',
|
|
112
|
-
'take_snapshot',
|
|
113
|
-
];
|
|
114
|
-
const missingSemanticTools = requiredSemanticTools.filter((t) => !availableToolNames.includes(t));
|
|
115
|
-
if (missingSemanticTools.length > 0) {
|
|
116
|
-
debugLogger.warn(`Semantic tools missing (${missingSemanticTools.join(', ')}). ` +
|
|
117
|
-
'Some browser interactions may not work correctly.');
|
|
118
|
-
}
|
|
119
|
-
// Only click_at is strictly required — text input can use press_key or fill.
|
|
120
|
-
const requiredVisualTools = ['click_at'];
|
|
121
|
-
const missingVisualTools = requiredVisualTools.filter((t) => !availableToolNames.includes(t));
|
|
122
|
-
// Check whether vision can be enabled; returns undefined if all gates pass.
|
|
123
|
-
function getVisionDisabledReason() {
|
|
124
|
-
const browserConfig = config.getBrowserAgentConfig();
|
|
125
|
-
if (!browserConfig.customConfig.visualModel) {
|
|
126
|
-
return 'No visualModel configured.';
|
|
86
|
+
function generateAskUserRules(toolName) {
|
|
87
|
+
return {
|
|
88
|
+
toolName: `${MCP_TOOL_PREFIX}${BROWSER_AGENT_NAME}_${toolName}`,
|
|
89
|
+
decision: PolicyDecision.ASK_USER,
|
|
90
|
+
priority: 999,
|
|
91
|
+
source: 'BrowserAgent (Sensitive Actions)',
|
|
92
|
+
mcpName: BROWSER_AGENT_NAME,
|
|
93
|
+
};
|
|
127
94
|
}
|
|
128
|
-
|
|
129
|
-
return
|
|
130
|
-
|
|
95
|
+
function generateAllowRules(toolName) {
|
|
96
|
+
return {
|
|
97
|
+
toolName: `${MCP_TOOL_PREFIX}${BROWSER_AGENT_NAME}_${toolName}`,
|
|
98
|
+
decision: PolicyDecision.ALLOW,
|
|
99
|
+
priority: PRIORITY_SUBAGENT_TOOL,
|
|
100
|
+
source: 'BrowserAgent (Read-Only)',
|
|
101
|
+
mcpName: BROWSER_AGENT_NAME,
|
|
102
|
+
};
|
|
131
103
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
if (authType && blockedAuthTypes.has(authType)) {
|
|
139
|
-
return 'Visual agent model not available for current auth type.';
|
|
104
|
+
// Check if policy rule the same in all the attributes that we care about
|
|
105
|
+
function isRuleEqual(rule1, rule2) {
|
|
106
|
+
return (rule1.toolName === rule2.toolName &&
|
|
107
|
+
rule1.decision === rule2.decision &&
|
|
108
|
+
rule1.priority === rule2.priority &&
|
|
109
|
+
rule1.mcpName === rule2.mcpName);
|
|
140
110
|
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
111
|
+
// Validate required semantic tools are available
|
|
112
|
+
const requiredSemanticTools = [
|
|
113
|
+
'click',
|
|
114
|
+
'fill',
|
|
115
|
+
'navigate_page',
|
|
116
|
+
'take_snapshot',
|
|
117
|
+
];
|
|
118
|
+
const missingSemanticTools = requiredSemanticTools.filter((t) => !availableToolNames.includes(t));
|
|
119
|
+
const rawSessionMode = browserConfig?.customConfig?.sessionMode;
|
|
120
|
+
const sessionMode = rawSessionMode === 'isolated' || rawSessionMode === 'existing'
|
|
121
|
+
? rawSessionMode
|
|
122
|
+
: 'persistent';
|
|
123
|
+
recordBrowserAgentToolDiscovery(config, mcpTools.length, missingSemanticTools, sessionMode);
|
|
124
|
+
if (missingSemanticTools.length > 0) {
|
|
125
|
+
debugLogger.warn(`Semantic tools missing (${missingSemanticTools.join(', ')}). ` +
|
|
126
|
+
'Some browser interactions may not work correctly.');
|
|
127
|
+
}
|
|
128
|
+
// Only click_at is strictly required — text input can use press_key or fill.
|
|
129
|
+
const requiredVisualTools = ['click_at'];
|
|
130
|
+
const missingVisualTools = requiredVisualTools.filter((t) => !availableToolNames.includes(t));
|
|
131
|
+
// Check whether vision can be enabled; returns structured type with code and message.
|
|
132
|
+
function getVisionDisabledReason() {
|
|
133
|
+
const browserConfig = config.getBrowserAgentConfig();
|
|
134
|
+
if (!browserConfig.customConfig.visualModel) {
|
|
135
|
+
return {
|
|
136
|
+
code: 'no_visual_model',
|
|
137
|
+
message: 'No visualModel configured.',
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
if (missingVisualTools.length > 0) {
|
|
141
|
+
return {
|
|
142
|
+
code: 'missing_visual_tools',
|
|
143
|
+
message: `Visual tools missing (${missingVisualTools.join(', ')}). ` +
|
|
144
|
+
`The installed chrome-devtools-mcp version may be too old.`,
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
const authType = config.getContentGeneratorConfig()?.authType;
|
|
148
|
+
const blockedAuthTypes = new Set([
|
|
149
|
+
AuthType.LOGIN_WITH_GOOGLE,
|
|
150
|
+
AuthType.LEGACY_CLOUD_SHELL,
|
|
151
|
+
AuthType.COMPUTE_ADC,
|
|
152
|
+
]);
|
|
153
|
+
if (authType && blockedAuthTypes.has(authType)) {
|
|
154
|
+
return {
|
|
155
|
+
code: 'blocked_auth_type',
|
|
156
|
+
message: 'Visual agent model not available for current auth type.',
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
return undefined;
|
|
160
|
+
}
|
|
161
|
+
const allTools = [...mcpTools];
|
|
162
|
+
const visionDisabledReason = getVisionDisabledReason();
|
|
163
|
+
logBrowserAgentVisionStatus(config, {
|
|
164
|
+
enabled: !visionDisabledReason,
|
|
165
|
+
disabled_reason: visionDisabledReason?.code,
|
|
166
|
+
});
|
|
167
|
+
if (visionDisabledReason) {
|
|
168
|
+
debugLogger.log(`Vision disabled: ${visionDisabledReason.message}`);
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
allTools.push(createAnalyzeScreenshotTool(browserManager, config, messageBus));
|
|
172
|
+
}
|
|
173
|
+
debugLogger.log(`Created ${allTools.length} tools for browser agent: ` +
|
|
174
|
+
allTools.map((t) => t.name).join(', '));
|
|
175
|
+
// Create configured definition with tools
|
|
176
|
+
// BrowserAgentDefinition is a factory function - call it with config
|
|
177
|
+
const baseDefinition = BrowserAgentDefinition(config, !visionDisabledReason);
|
|
178
|
+
const definition = {
|
|
179
|
+
...baseDefinition,
|
|
180
|
+
toolConfig: {
|
|
181
|
+
tools: allTools,
|
|
182
|
+
},
|
|
183
|
+
};
|
|
184
|
+
return {
|
|
185
|
+
definition,
|
|
186
|
+
browserManager,
|
|
187
|
+
visionEnabled: !visionDisabledReason,
|
|
188
|
+
sessionMode,
|
|
189
|
+
};
|
|
147
190
|
}
|
|
148
|
-
|
|
149
|
-
|
|
191
|
+
catch (error) {
|
|
192
|
+
// Release the browser manager if setup fails, so concurrent tasks can try again.
|
|
193
|
+
browserManager.release();
|
|
194
|
+
throw error;
|
|
150
195
|
}
|
|
151
|
-
debugLogger.log(`Created ${allTools.length} tools for browser agent: ` +
|
|
152
|
-
allTools.map((t) => t.name).join(', '));
|
|
153
|
-
// Create configured definition with tools
|
|
154
|
-
// BrowserAgentDefinition is a factory function - call it with config
|
|
155
|
-
const baseDefinition = BrowserAgentDefinition(config, !visionDisabledReason);
|
|
156
|
-
const definition = {
|
|
157
|
-
...baseDefinition,
|
|
158
|
-
toolConfig: {
|
|
159
|
-
tools: allTools,
|
|
160
|
-
},
|
|
161
|
-
};
|
|
162
|
-
return { definition, browserManager };
|
|
163
196
|
}
|
|
164
197
|
/**
|
|
165
198
|
* Closes all persistent browser sessions and cleans up resources.
|
|
166
199
|
*
|
|
200
|
+
* @param browserManager The browser manager to clean up
|
|
201
|
+
* @param config Runtime configuration
|
|
202
|
+
* @param sessionMode The browser session mode
|
|
203
|
+
*/
|
|
204
|
+
export async function cleanupBrowserAgent(browserManager, config, sessionMode) {
|
|
205
|
+
const startMs = Date.now();
|
|
206
|
+
try {
|
|
207
|
+
await browserManager.close();
|
|
208
|
+
logBrowserAgentCleanup(config, Date.now() - startMs, {
|
|
209
|
+
session_mode: sessionMode,
|
|
210
|
+
success: true,
|
|
211
|
+
});
|
|
212
|
+
debugLogger.log('Browser agent cleanup complete');
|
|
213
|
+
}
|
|
214
|
+
catch (error) {
|
|
215
|
+
logBrowserAgentCleanup(config, Date.now() - startMs, {
|
|
216
|
+
session_mode: sessionMode,
|
|
217
|
+
success: false,
|
|
218
|
+
});
|
|
219
|
+
debugLogger.error(`Error during browser cleanup: ${error instanceof Error ? error.message : String(error)}`);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
/**
|
|
167
223
|
* Call this on /clear commands and CLI exit to reset browser state.
|
|
168
224
|
*/
|
|
169
225
|
export async function resetBrowserSession() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserAgentFactory.js","sourceRoot":"","sources":["../../../../src/agents/browser/browserAgentFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAcH,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAI1D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EACL,sBAAsB,GAEvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EACL,cAAc,EACd,sBAAsB,GAEvB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"browserAgentFactory.js","sourceRoot":"","sources":["../../../../src/agents/browser/browserAgentFactory.ts"],"names":[],"mappings":"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"}
|