@google/gemini-cli-core 0.36.0 → 0.37.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/CONTRIBUTING.md +10 -7
- package/dist/docs/assets/theme-tokyonight-dark.png +0 -0
- package/dist/docs/changelogs/index.md +24 -0
- package/dist/docs/changelogs/latest.md +366 -459
- package/dist/docs/changelogs/preview.md +362 -356
- package/dist/docs/cli/acp-mode.md +126 -0
- package/dist/docs/cli/cli-reference.md +1 -1
- package/dist/docs/cli/notifications.md +5 -5
- package/dist/docs/cli/plan-mode.md +22 -11
- package/dist/docs/cli/sandbox.md +1 -1
- package/dist/docs/cli/settings.md +14 -13
- package/dist/docs/cli/themes.md +5 -0
- package/dist/docs/core/index.md +2 -2
- package/dist/docs/core/subagents.md +134 -23
- package/dist/docs/get-started/gemini-3.md +1 -1
- package/dist/docs/get-started/index.md +127 -1
- package/dist/docs/ide-integration/index.md +99 -24
- package/dist/docs/index.md +0 -2
- package/dist/docs/redirects.json +1 -0
- package/dist/docs/reference/commands.md +1 -3
- package/dist/docs/reference/configuration.md +182 -91
- package/dist/docs/reference/keyboard-shortcuts.md +14 -6
- package/dist/docs/reference/policy-engine.md +36 -31
- package/dist/docs/reference/tools.md +56 -23
- package/dist/docs/resources/quota-and-pricing.md +23 -9
- package/dist/docs/sidebar.json +11 -4
- package/dist/docs/tools/planning.md +6 -4
- package/dist/google-gemini-cli-core-0.37.0-preview.0.tgz +0 -0
- package/dist/src/agents/agentLoader.d.ts +12 -12
- package/dist/src/agents/agentLoader.js +1 -0
- package/dist/src/agents/agentLoader.js.map +1 -1
- package/dist/src/agents/browser/automationOverlay.js +2 -10
- package/dist/src/agents/browser/automationOverlay.js.map +1 -1
- package/dist/src/agents/browser/browserAgentDefinition.js +10 -3
- package/dist/src/agents/browser/browserAgentDefinition.js.map +1 -1
- package/dist/src/agents/browser/browserAgentFactory.d.ts +4 -4
- package/dist/src/agents/browser/browserAgentFactory.js +15 -29
- package/dist/src/agents/browser/browserAgentFactory.js.map +1 -1
- package/dist/src/agents/browser/browserAgentFactory.test.js +41 -24
- package/dist/src/agents/browser/browserAgentFactory.test.js.map +1 -1
- package/dist/src/agents/browser/browserAgentInvocation.d.ts +1 -0
- package/dist/src/agents/browser/browserAgentInvocation.js +60 -27
- package/dist/src/agents/browser/browserAgentInvocation.js.map +1 -1
- package/dist/src/agents/browser/browserAgentInvocation.test.js +59 -5
- package/dist/src/agents/browser/browserAgentInvocation.test.js.map +1 -1
- package/dist/src/agents/browser/browserManager.d.ts +51 -8
- package/dist/src/agents/browser/browserManager.js +242 -70
- package/dist/src/agents/browser/browserManager.js.map +1 -1
- package/dist/src/agents/browser/browserManager.test.js +384 -17
- package/dist/src/agents/browser/browserManager.test.js.map +1 -1
- package/dist/src/agents/browser/inputBlocker.d.ts +4 -4
- package/dist/src/agents/browser/inputBlocker.js +8 -18
- package/dist/src/agents/browser/inputBlocker.js.map +1 -1
- package/dist/src/agents/browser/inputBlocker.test.js +31 -3
- package/dist/src/agents/browser/inputBlocker.test.js.map +1 -1
- package/dist/src/agents/browser/mcpToolWrapper.d.ts +1 -1
- package/dist/src/agents/browser/mcpToolWrapper.js +9 -6
- package/dist/src/agents/browser/mcpToolWrapper.js.map +1 -1
- package/dist/src/agents/browser/mcpToolWrapper.test.js +2 -2
- package/dist/src/agents/browser/mcpToolWrapper.test.js.map +1 -1
- package/dist/src/agents/browser/snapshotSuperseder.d.ts +31 -0
- package/dist/src/agents/browser/snapshotSuperseder.js +101 -0
- package/dist/src/agents/browser/snapshotSuperseder.js.map +1 -0
- package/dist/src/agents/browser/snapshotSuperseder.test.js +158 -0
- package/dist/src/agents/browser/snapshotSuperseder.test.js.map +1 -0
- package/dist/src/agents/local-executor.d.ts +4 -0
- package/dist/src/agents/local-executor.js +46 -19
- package/dist/src/agents/local-executor.js.map +1 -1
- package/dist/src/agents/local-executor.test.js +118 -18
- package/dist/src/agents/local-executor.test.js.map +1 -1
- package/dist/src/agents/local-invocation.d.ts +1 -0
- package/dist/src/agents/local-invocation.js +19 -9
- package/dist/src/agents/local-invocation.js.map +1 -1
- package/dist/src/agents/local-invocation.test.js +24 -0
- package/dist/src/agents/local-invocation.test.js.map +1 -1
- package/dist/src/agents/registry.js +16 -1
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +67 -0
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/agents/types.d.ts +9 -0
- package/dist/src/agents/types.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +8 -3
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +57 -0
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/setup.js +5 -2
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +27 -1
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +80 -80
- package/dist/src/config/agent-loop-context.d.ts +2 -0
- package/dist/src/config/config.d.ts +81 -16
- package/dist/src/config/config.js +146 -50
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +89 -2
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +9 -0
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/memory.d.ts +1 -0
- package/dist/src/config/memory.js +6 -0
- package/dist/src/config/memory.js.map +1 -1
- package/dist/src/config/storage.d.ts +1 -0
- package/dist/src/config/storage.js +4 -0
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/config/storage.test.js +5 -0
- package/dist/src/config/storage.test.js.map +1 -1
- package/dist/src/config/topicState.d.ts +21 -0
- package/dist/src/config/topicState.js +41 -0
- package/dist/src/config/topicState.js.map +1 -0
- package/dist/src/confirmation-bus/types.d.ts +11 -2
- package/dist/src/confirmation-bus/types.js +2 -0
- package/dist/src/confirmation-bus/types.js.map +1 -1
- package/dist/src/context/agentHistoryProvider.d.ts +45 -0
- package/dist/src/context/agentHistoryProvider.js +298 -0
- package/dist/src/context/agentHistoryProvider.js.map +1 -0
- package/dist/src/context/agentHistoryProvider.test.d.ts +6 -0
- package/dist/src/context/agentHistoryProvider.test.js +394 -0
- package/dist/src/context/agentHistoryProvider.test.js.map +1 -0
- package/dist/src/context/chatCompressionService.js.map +1 -0
- package/dist/src/context/chatCompressionService.test.js.map +1 -0
- package/dist/src/{services → context}/contextManager.d.ts +2 -0
- package/dist/src/{services → context}/contextManager.js +18 -9
- package/dist/src/context/contextManager.js.map +1 -0
- package/dist/src/{services → context}/contextManager.test.js +21 -6
- package/dist/src/context/contextManager.test.js.map +1 -0
- package/dist/src/context/toolDistillationService.d.ts +38 -0
- package/dist/src/context/toolDistillationService.js +170 -0
- package/dist/src/context/toolDistillationService.js.map +1 -0
- package/dist/src/context/toolDistillationService.test.d.ts +6 -0
- package/dist/src/context/toolDistillationService.test.js +83 -0
- package/dist/src/context/toolDistillationService.test.js.map +1 -0
- package/dist/src/{services → context}/toolOutputMaskingService.d.ts +2 -2
- package/dist/src/{services → context}/toolOutputMaskingService.js +7 -7
- package/dist/src/context/toolOutputMaskingService.js.map +1 -0
- package/dist/src/context/toolOutputMaskingService.test.d.ts +6 -0
- package/dist/src/{services → context}/toolOutputMaskingService.test.js +4 -5
- package/dist/src/context/toolOutputMaskingService.test.js.map +1 -0
- package/dist/src/context/truncation.d.ts +26 -0
- package/dist/src/context/truncation.js +102 -0
- package/dist/src/context/truncation.js.map +1 -0
- package/dist/src/core/client.d.ts +3 -1
- package/dist/src/core/client.js +23 -13
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +29 -34
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +0 -1
- package/dist/src/core/contentGenerator.js +2 -28
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +1 -101
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +4 -5
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +71 -18
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/prompts-substitution.test.js +5 -0
- package/dist/src/core/prompts-substitution.test.js.map +1 -1
- package/dist/src/core/prompts.test.js +3 -0
- package/dist/src/core/prompts.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/index.d.ts +7 -3
- package/dist/src/index.js +9 -5
- package/dist/src/index.js.map +1 -1
- package/dist/src/policy/config.d.ts +1 -1
- package/dist/src/policy/config.js +61 -24
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/persistence.test.js +42 -0
- package/dist/src/policy/persistence.test.js.map +1 -1
- package/dist/src/policy/policies/discovered.toml +7 -0
- package/dist/src/policy/policies/non-interactive.toml +7 -0
- package/dist/src/policy/policies/plan.toml +25 -0
- package/dist/src/policy/policies/read-only.toml +6 -0
- package/dist/src/policy/policies/sandbox-default.toml +3 -2
- package/dist/src/policy/policies/write.toml +21 -0
- package/dist/src/policy/policies/yolo.toml +1 -1
- package/dist/src/policy/policy-engine.d.ts +2 -4
- package/dist/src/policy/policy-engine.js +24 -37
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +107 -29
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/topic-policy.test.d.ts +6 -0
- package/dist/src/policy/topic-policy.test.js +48 -0
- package/dist/src/policy/topic-policy.test.js.map +1 -0
- package/dist/src/policy/types.d.ts +9 -6
- package/dist/src/policy/types.js +11 -0
- package/dist/src/policy/types.js.map +1 -1
- package/dist/src/prompts/promptProvider.js +20 -4
- package/dist/src/prompts/promptProvider.js.map +1 -1
- package/dist/src/prompts/promptProvider.test.js +84 -1
- package/dist/src/prompts/promptProvider.test.js.map +1 -1
- package/dist/src/prompts/snippets-memory-manager.test.js +1 -1
- package/dist/src/prompts/snippets-memory-manager.test.js.map +1 -1
- package/dist/src/prompts/snippets.d.ts +3 -4
- package/dist/src/prompts/snippets.js +33 -51
- package/dist/src/prompts/snippets.js.map +1 -1
- package/dist/src/prompts/snippets.legacy.d.ts +6 -4
- package/dist/src/prompts/snippets.legacy.js +32 -7
- package/dist/src/prompts/snippets.legacy.js.map +1 -1
- package/dist/src/sandbox/linux/LinuxSandboxManager.d.ts +11 -1
- package/dist/src/sandbox/linux/LinuxSandboxManager.js +261 -27
- package/dist/src/sandbox/linux/LinuxSandboxManager.js.map +1 -1
- package/dist/src/sandbox/linux/LinuxSandboxManager.test.js +430 -125
- package/dist/src/sandbox/linux/LinuxSandboxManager.test.js.map +1 -1
- package/dist/src/sandbox/macos/MacOsSandboxManager.d.ts +7 -22
- package/dist/src/sandbox/macos/MacOsSandboxManager.js +58 -57
- package/dist/src/sandbox/macos/MacOsSandboxManager.js.map +1 -1
- package/dist/src/sandbox/macos/MacOsSandboxManager.test.js +148 -103
- 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 +0 -6
- package/dist/src/sandbox/macos/baseProfile.js.map +1 -1
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.d.ts +10 -10
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.js +80 -92
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.js.map +1 -1
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.test.js +135 -99
- package/dist/src/sandbox/macos/seatbeltArgsBuilder.test.js.map +1 -1
- package/dist/src/sandbox/{macos → utils}/commandSafety.d.ts +11 -0
- package/dist/src/sandbox/{macos → utils}/commandSafety.js +47 -14
- package/dist/src/sandbox/utils/commandSafety.js.map +1 -0
- package/dist/src/sandbox/utils/commandUtils.d.ts +9 -0
- package/dist/src/sandbox/utils/commandUtils.js +57 -0
- package/dist/src/sandbox/utils/commandUtils.js.map +1 -0
- package/dist/src/sandbox/utils/fsUtils.d.ts +11 -0
- package/dist/src/sandbox/utils/fsUtils.js +82 -0
- package/dist/src/sandbox/utils/fsUtils.js.map +1 -0
- package/dist/src/sandbox/utils/sandboxDenialUtils.d.ts +12 -0
- package/dist/src/sandbox/utils/sandboxDenialUtils.js +68 -0
- package/dist/src/sandbox/utils/sandboxDenialUtils.js.map +1 -0
- package/dist/src/sandbox/utils/sandboxDenialUtils.test.d.ts +6 -0
- package/dist/src/sandbox/utils/sandboxDenialUtils.test.js +37 -0
- package/dist/src/sandbox/utils/sandboxDenialUtils.test.js.map +1 -0
- package/dist/src/sandbox/utils/sandboxReadWriteUtils.d.ts +5 -0
- package/dist/src/sandbox/utils/sandboxReadWriteUtils.js +60 -0
- package/dist/src/sandbox/utils/sandboxReadWriteUtils.js.map +1 -0
- package/dist/src/sandbox/windows/GeminiSandbox.cs +257 -216
- package/dist/src/sandbox/windows/WindowsSandboxManager.d.ts +12 -2
- package/dist/src/sandbox/windows/WindowsSandboxManager.js +250 -38
- package/dist/src/sandbox/windows/WindowsSandboxManager.js.map +1 -1
- package/dist/src/sandbox/windows/WindowsSandboxManager.test.js +326 -9
- package/dist/src/sandbox/windows/WindowsSandboxManager.test.js.map +1 -1
- package/dist/src/sandbox/windows/commandSafety.d.ts +19 -0
- package/dist/src/sandbox/windows/commandSafety.js +128 -0
- package/dist/src/sandbox/windows/commandSafety.js.map +1 -0
- package/dist/src/sandbox/windows/commandSafety.test.d.ts +6 -0
- package/dist/src/sandbox/windows/commandSafety.test.js +42 -0
- package/dist/src/sandbox/windows/commandSafety.test.js.map +1 -0
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.d.ts +12 -0
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.js +68 -0
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.js.map +1 -0
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.test.d.ts +6 -0
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.test.js +68 -0
- package/dist/src/sandbox/windows/windowsSandboxDenialUtils.test.js.map +1 -0
- package/dist/src/scheduler/policy.js +20 -5
- package/dist/src/scheduler/policy.js.map +1 -1
- package/dist/src/scheduler/policy.test.js +80 -0
- package/dist/src/scheduler/policy.test.js.map +1 -1
- package/dist/src/scheduler/scheduler.js +12 -2
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/scheduler/scheduler.test.js +52 -0
- package/dist/src/scheduler/scheduler.test.js.map +1 -1
- package/dist/src/scheduler/scheduler_hooks.test.js +1 -0
- package/dist/src/scheduler/scheduler_hooks.test.js.map +1 -1
- package/dist/src/scheduler/state-manager.js +1 -1
- package/dist/src/scheduler/state-manager.js.map +1 -1
- package/dist/src/scheduler/state-manager.test.js +10 -0
- package/dist/src/scheduler/state-manager.test.js.map +1 -1
- package/dist/src/scheduler/tool-executor.js +7 -2
- package/dist/src/scheduler/tool-executor.js.map +1 -1
- package/dist/src/scheduler/tool-executor.test.js +38 -0
- package/dist/src/scheduler/tool-executor.test.js.map +1 -1
- package/dist/src/scheduler/types.d.ts +4 -2
- package/dist/src/services/chatRecordingService.d.ts +1 -13
- package/dist/src/services/chatRecordingService.js +45 -46
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/chatRecordingService.test.js +79 -10
- package/dist/src/services/chatRecordingService.test.js.map +1 -1
- package/dist/src/services/executionLifecycleService.d.ts +43 -6
- package/dist/src/services/executionLifecycleService.js +49 -12
- package/dist/src/services/executionLifecycleService.js.map +1 -1
- package/dist/src/services/executionLifecycleService.test.js +157 -3
- package/dist/src/services/executionLifecycleService.test.js.map +1 -1
- package/dist/src/services/fileDiscoveryService.d.ts +17 -2
- package/dist/src/services/fileDiscoveryService.js +84 -20
- package/dist/src/services/fileDiscoveryService.js.map +1 -1
- package/dist/src/services/fileDiscoveryService.test.js +67 -1
- package/dist/src/services/fileDiscoveryService.test.js.map +1 -1
- package/dist/src/services/modelConfigService.d.ts +11 -0
- package/dist/src/services/modelConfigService.js +67 -0
- package/dist/src/services/modelConfigService.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +30 -0
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/sandboxManager.d.ts +90 -8
- package/dist/src/services/sandboxManager.integration.test.js +438 -0
- package/dist/src/services/sandboxManager.integration.test.js.map +1 -0
- package/dist/src/services/sandboxManager.js +156 -13
- package/dist/src/services/sandboxManager.js.map +1 -1
- package/dist/src/services/sandboxManager.test.js +373 -117
- package/dist/src/services/sandboxManager.test.js.map +1 -1
- package/dist/src/services/sandboxManagerFactory.d.ts +2 -3
- package/dist/src/services/sandboxManagerFactory.js +10 -17
- package/dist/src/services/sandboxManagerFactory.js.map +1 -1
- package/dist/src/services/sandboxedFileSystemService.d.ts +1 -0
- package/dist/src/services/sandboxedFileSystemService.js +32 -3
- package/dist/src/services/sandboxedFileSystemService.js.map +1 -1
- package/dist/src/services/sandboxedFileSystemService.test.js +83 -12
- package/dist/src/services/sandboxedFileSystemService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +2 -0
- package/dist/src/services/shellExecutionService.js +45 -16
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +5 -4
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/services/test-data/resolved-aliases-retry.golden.json +4 -0
- package/dist/src/services/test-data/resolved-aliases.golden.json +4 -0
- package/dist/src/services/types.d.ts +14 -0
- package/dist/src/services/types.js +7 -0
- package/dist/src/services/types.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +6 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +5 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +2 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +3 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/loggers.js +1 -1
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +8 -3
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +10 -1
- package/dist/src/telemetry/metrics.js +19 -4
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +44 -0
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +3 -3
- package/dist/src/telemetry/types.js +9 -4
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/test-utils/mock-message-bus.d.ts +1 -1
- package/dist/src/test-utils/mock-message-bus.js +1 -1
- package/dist/src/test-utils/mock-message-bus.js.map +1 -1
- package/dist/src/tools/definitions/base-declarations.d.ts +6 -0
- package/dist/src/tools/definitions/base-declarations.js +7 -0
- package/dist/src/tools/definitions/base-declarations.js.map +1 -1
- package/dist/src/tools/definitions/coreTools.d.ts +2 -1
- package/dist/src/tools/definitions/coreTools.js +9 -3
- package/dist/src/tools/definitions/coreTools.js.map +1 -1
- package/dist/src/tools/definitions/dynamic-declaration-helpers.d.ts +4 -0
- package/dist/src/tools/definitions/dynamic-declaration-helpers.js +29 -2
- package/dist/src/tools/definitions/dynamic-declaration-helpers.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js +11 -6
- 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 +10 -4
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js.map +1 -1
- package/dist/src/tools/definitions/trackerTools.js +3 -3
- package/dist/src/tools/definitions/trackerTools.js.map +1 -1
- package/dist/src/tools/definitions/types.d.ts +1 -0
- package/dist/src/tools/enter-plan-mode.js +15 -0
- package/dist/src/tools/enter-plan-mode.js.map +1 -1
- package/dist/src/tools/enter-plan-mode.test.js +25 -0
- package/dist/src/tools/enter-plan-mode.test.js.map +1 -1
- package/dist/src/tools/grep-utils.d.ts +2 -1
- package/dist/src/tools/grep-utils.js +22 -3
- package/dist/src/tools/grep-utils.js.map +1 -1
- package/dist/src/tools/grep.js +16 -3
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +34 -6
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.js +6 -4
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.js +22 -7
- package/dist/src/tools/ls.test.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.js +6 -3
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +35 -0
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +9 -2
- package/dist/src/tools/memoryTool.js +39 -15
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +61 -2
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/read-many-files.js +12 -4
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +17 -17
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/ripGrep.js +14 -1
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +9 -9
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +10 -0
- package/dist/src/tools/shell.js +97 -124
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +22 -3
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +4 -4
- package/dist/src/tools/tool-names.js +5 -3
- package/dist/src/tools/tool-names.js.map +1 -1
- package/dist/src/tools/tool-registry.js +11 -1
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +43 -1
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +12 -1
- package/dist/src/tools/tools.js +15 -0
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/tools.test.js +42 -1
- package/dist/src/tools/tools.test.js.map +1 -1
- package/dist/src/tools/topicTool.d.ts +29 -0
- package/dist/src/tools/topicTool.js +72 -0
- package/dist/src/tools/topicTool.js.map +1 -0
- package/dist/src/tools/topicTool.test.d.ts +6 -0
- package/dist/src/tools/topicTool.test.js +105 -0
- package/dist/src/tools/topicTool.test.js.map +1 -0
- package/dist/src/tools/web-fetch.js +38 -20
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +28 -0
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/utils/checkpointUtils.d.ts +4 -4
- package/dist/src/utils/errors.d.ts +3 -0
- package/dist/src/utils/errors.js +28 -6
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/errors.test.js +23 -0
- package/dist/src/utils/errors.test.js.map +1 -1
- package/dist/src/utils/getFolderStructure.js +1 -1
- package/dist/src/utils/getFolderStructure.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.d.ts +2 -2
- package/dist/src/utils/gitIgnoreParser.js +28 -50
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.test.js +51 -185
- package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
- package/dist/src/utils/ignoreFileParser.d.ts +2 -2
- package/dist/src/utils/ignoreFileParser.js +6 -17
- package/dist/src/utils/ignoreFileParser.js.map +1 -1
- package/dist/src/utils/ignoreFileParser.test.js +40 -132
- package/dist/src/utils/ignoreFileParser.test.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.d.ts +11 -0
- package/dist/src/utils/ignorePathUtils.js +39 -0
- package/dist/src/utils/ignorePathUtils.js.map +1 -0
- package/dist/src/utils/ignorePathUtils.test.d.ts +6 -0
- package/dist/src/utils/ignorePathUtils.test.js +70 -0
- package/dist/src/utils/ignorePathUtils.test.js.map +1 -0
- package/dist/src/utils/memoryDiscovery.d.ts +6 -4
- package/dist/src/utils/memoryDiscovery.js +66 -41
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +40 -0
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.d.ts +1 -1
- package/dist/src/utils/memoryImportProcessor.js +24 -15
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/sessionOperations.d.ts +19 -0
- package/dist/src/utils/sessionOperations.js +101 -0
- package/dist/src/utils/sessionOperations.js.map +1 -0
- package/dist/src/utils/sessionOperations.test.d.ts +6 -0
- package/dist/src/utils/sessionOperations.test.js +92 -0
- package/dist/src/utils/sessionOperations.test.js.map +1 -0
- package/dist/src/utils/shell-utils.d.ts +15 -0
- package/dist/src/utils/shell-utils.js +43 -2
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/textUtils.d.ts +8 -0
- package/dist/src/utils/textUtils.js +16 -0
- package/dist/src/utils/textUtils.js.map +1 -1
- package/dist/src/utils/tokenCalculation.d.ts +2 -0
- package/dist/src/utils/tokenCalculation.js +2 -2
- package/dist/src/utils/tokenCalculation.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/docs/get-started/examples.md +0 -141
- package/dist/src/sandbox/macos/MacOsSandboxManager.integration.test.js +0 -164
- package/dist/src/sandbox/macos/MacOsSandboxManager.integration.test.js.map +0 -1
- package/dist/src/sandbox/macos/commandSafety.js.map +0 -1
- package/dist/src/services/chatCompressionService.js.map +0 -1
- package/dist/src/services/chatCompressionService.test.js.map +0 -1
- package/dist/src/services/contextManager.js.map +0 -1
- package/dist/src/services/contextManager.test.js.map +0 -1
- package/dist/src/services/toolOutputMaskingService.js.map +0 -1
- package/dist/src/services/toolOutputMaskingService.test.js.map +0 -1
- /package/dist/src/{services/toolOutputMaskingService.test.d.ts → agents/browser/snapshotSuperseder.test.d.ts} +0 -0
- /package/dist/src/{services → context}/chatCompressionService.d.ts +0 -0
- /package/dist/src/{services → context}/chatCompressionService.js +0 -0
- /package/dist/src/{services → context}/chatCompressionService.test.d.ts +0 -0
- /package/dist/src/{services → context}/chatCompressionService.test.js +0 -0
- /package/dist/src/{services → context}/contextManager.test.d.ts +0 -0
- /package/dist/src/{sandbox/macos/MacOsSandboxManager.integration.test.d.ts → services/sandboxManager.integration.test.d.ts} +0 -0
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import {} from '../../services/sandboxManager.js';
|
|
7
|
+
/**
|
|
8
|
+
* Windows-specific sandbox denial detection.
|
|
9
|
+
* Extracts paths from "Access is denied" and related errors.
|
|
10
|
+
*/
|
|
11
|
+
export function parseWindowsSandboxDenials(result) {
|
|
12
|
+
const output = result.output || '';
|
|
13
|
+
const errorOutput = result.error?.message;
|
|
14
|
+
const combined = (output + ' ' + (errorOutput || '')).toLowerCase();
|
|
15
|
+
const isFileDenial = [
|
|
16
|
+
'access is denied',
|
|
17
|
+
'access to the path',
|
|
18
|
+
'unauthorizedaccessexception',
|
|
19
|
+
'0x80070005',
|
|
20
|
+
'eperm: operation not permitted',
|
|
21
|
+
].some((keyword) => combined.includes(keyword));
|
|
22
|
+
const isNetworkDenial = [
|
|
23
|
+
'eacces: permission denied',
|
|
24
|
+
'an attempt was made to access a socket in a way forbidden by its access permissions',
|
|
25
|
+
// 10013 is WSAEACCES
|
|
26
|
+
'10013',
|
|
27
|
+
].some((keyword) => combined.includes(keyword));
|
|
28
|
+
if (!isFileDenial && !isNetworkDenial) {
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
const filePaths = new Set();
|
|
32
|
+
// Regex for Windows absolute paths (e.g., C:\Path or \\?\C:\Path)
|
|
33
|
+
// Handles drive letters and potentially quoted paths.
|
|
34
|
+
// We use two passes: one for quoted paths (which can contain spaces)
|
|
35
|
+
// and one for unquoted paths (which end at common separators).
|
|
36
|
+
// 1. Quoted paths: 'C:\Foo Bar' or "C:\Foo Bar"
|
|
37
|
+
const quotedRegex = /['"]((?:\\\\(?:\?|\.)\\)?[a-zA-Z]:[\\/][^'"]+)['"]/g;
|
|
38
|
+
for (const match of output.matchAll(quotedRegex)) {
|
|
39
|
+
filePaths.add(match[1]);
|
|
40
|
+
}
|
|
41
|
+
if (errorOutput) {
|
|
42
|
+
for (const match of errorOutput.matchAll(quotedRegex)) {
|
|
43
|
+
filePaths.add(match[1]);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
// 2. Unquoted paths or paths in PowerShell error format: PermissionDenied: (C:\path:String)
|
|
47
|
+
const generalRegex = /(?:^|[\s(])((?:\\\\(?:\?|\.)\\)?[a-zA-Z]:[\\/][^"'\s()<>|?*]+)/g;
|
|
48
|
+
for (const match of output.matchAll(generalRegex)) {
|
|
49
|
+
// Clean up trailing colon which might be part of the error message rather than the path
|
|
50
|
+
let p = match[1];
|
|
51
|
+
if (p.endsWith(':'))
|
|
52
|
+
p = p.slice(0, -1);
|
|
53
|
+
filePaths.add(p);
|
|
54
|
+
}
|
|
55
|
+
if (errorOutput) {
|
|
56
|
+
for (const match of errorOutput.matchAll(generalRegex)) {
|
|
57
|
+
let p = match[1];
|
|
58
|
+
if (p.endsWith(':'))
|
|
59
|
+
p = p.slice(0, -1);
|
|
60
|
+
filePaths.add(p);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return {
|
|
64
|
+
network: isNetworkDenial || undefined,
|
|
65
|
+
filePaths: filePaths.size > 0 ? Array.from(filePaths) : undefined,
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=windowsSandboxDenialUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"windowsSandboxDenialUtils.js","sourceRoot":"","sources":["../../../../src/sandbox/windows/windowsSandboxDenialUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAA4B,MAAM,kCAAkC,CAAC;AAG5E;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACxC,MAA4B;IAE5B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IACnC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC;IAC1C,MAAM,QAAQ,GAAG,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAEpE,MAAM,YAAY,GAAG;QACnB,kBAAkB;QAClB,oBAAoB;QACpB,6BAA6B;QAC7B,YAAY;QACZ,gCAAgC;KACjC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhD,MAAM,eAAe,GAAG;QACtB,2BAA2B;QAC3B,qFAAqF;QACrF,qBAAqB;QACrB,OAAO;KACR,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhD,IAAI,CAAC,YAAY,IAAI,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,kEAAkE;IAClE,sDAAsD;IACtD,qEAAqE;IACrE,+DAA+D;IAE/D,gDAAgD;IAChD,MAAM,WAAW,GAAG,qDAAqD,CAAC;IAC1E,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACjD,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACtD,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,4FAA4F;IAC5F,MAAM,YAAY,GAChB,iEAAiE,CAAC;IACpE,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAClD,wFAAwF;QACxF,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACxC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACxC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,OAAO;QACL,OAAO,EAAE,eAAe,IAAI,SAAS;QACrC,SAAS,EAAE,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;KAClE,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from 'vitest';
|
|
7
|
+
import { parseWindowsSandboxDenials } from './windowsSandboxDenialUtils.js';
|
|
8
|
+
describe('parseWindowsSandboxDenials', () => {
|
|
9
|
+
it('should detect CMD "Access is denied" and extract paths', () => {
|
|
10
|
+
const parsed = parseWindowsSandboxDenials({
|
|
11
|
+
output: 'Access is denied.\r\n',
|
|
12
|
+
error: new Error('Command failed: dir C:\\Windows\\System32\\config'),
|
|
13
|
+
});
|
|
14
|
+
expect(parsed).toBeDefined();
|
|
15
|
+
expect(parsed?.filePaths).toContain('C:\\Windows\\System32\\config');
|
|
16
|
+
});
|
|
17
|
+
it('should detect PowerShell "Access to the path is denied"', () => {
|
|
18
|
+
const parsed = parseWindowsSandboxDenials({
|
|
19
|
+
output: "Set-Content : Access to the path 'C:\\test.txt' is denied.\r\nAt line:1 char:1\r\n",
|
|
20
|
+
});
|
|
21
|
+
expect(parsed).toBeDefined();
|
|
22
|
+
expect(parsed?.filePaths).toContain('C:\\test.txt');
|
|
23
|
+
});
|
|
24
|
+
it('should detect Node.js EPERM on Windows', () => {
|
|
25
|
+
const parsed = parseWindowsSandboxDenials({
|
|
26
|
+
error: {
|
|
27
|
+
message: "Error: EPERM: operation not permitted, open 'D:\\project\\file.ts'",
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
expect(parsed).toBeDefined();
|
|
31
|
+
expect(parsed?.filePaths).toContain('D:\\project\\file.ts');
|
|
32
|
+
});
|
|
33
|
+
it('should detect network denial (EACCES)', () => {
|
|
34
|
+
const parsed = parseWindowsSandboxDenials({
|
|
35
|
+
output: 'Error: listen EACCES: permission denied 0.0.0.0:3000',
|
|
36
|
+
});
|
|
37
|
+
expect(parsed).toBeDefined();
|
|
38
|
+
expect(parsed?.network).toBe(true);
|
|
39
|
+
});
|
|
40
|
+
it('should detect native Windows error code 0x80070005', () => {
|
|
41
|
+
const parsed = parseWindowsSandboxDenials({
|
|
42
|
+
output: 'HRESULT: 0x80070005',
|
|
43
|
+
});
|
|
44
|
+
expect(parsed).toBeDefined();
|
|
45
|
+
// No path in output, but recognized as denial
|
|
46
|
+
});
|
|
47
|
+
it('should handle extended-length paths', () => {
|
|
48
|
+
const parsed = parseWindowsSandboxDenials({
|
|
49
|
+
output: 'Access is denied to \\\\?\\C:\\Very\\Long\\Path\\file.txt',
|
|
50
|
+
});
|
|
51
|
+
expect(parsed).toBeDefined();
|
|
52
|
+
expect(parsed?.filePaths).toContain('\\\\?\\C:\\Very\\Long\\Path\\file.txt');
|
|
53
|
+
});
|
|
54
|
+
it('should detect Windows paths with forward slashes', () => {
|
|
55
|
+
const parsed = parseWindowsSandboxDenials({
|
|
56
|
+
output: "Error: EPERM: operation not permitted, open 'C:/project/file.ts'",
|
|
57
|
+
});
|
|
58
|
+
expect(parsed).toBeDefined();
|
|
59
|
+
expect(parsed?.filePaths).toContain('C:/project/file.ts');
|
|
60
|
+
});
|
|
61
|
+
it('should return undefined if no denial detected', () => {
|
|
62
|
+
const parsed = parseWindowsSandboxDenials({
|
|
63
|
+
output: 'Directory of C:\\Users\r\n03/26/2026 11:40 AM <DIR> .',
|
|
64
|
+
});
|
|
65
|
+
expect(parsed).toBeUndefined();
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
//# sourceMappingURL=windowsSandboxDenialUtils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"windowsSandboxDenialUtils.test.js","sourceRoot":"","sources":["../../../../src/sandbox/windows/windowsSandboxDenialUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { ToolErrorType } from '../tools/tool-error.js';
|
|
7
|
-
import { ApprovalMode, PolicyDecision, } from '../policy/types.js';
|
|
7
|
+
import { ApprovalMode, MODES_BY_PERMISSIVENESS, PolicyDecision, } from '../policy/types.js';
|
|
8
8
|
import { MessageBusType, } from '../confirmation-bus/types.js';
|
|
9
9
|
import { ToolConfirmationOutcome, } from '../tools/tools.js';
|
|
10
10
|
import { buildFilePathArgsPattern } from '../policy/utils.js';
|
|
@@ -72,6 +72,19 @@ export async function updatePolicy(tool, outcome, confirmationDetails, context,
|
|
|
72
72
|
}
|
|
73
73
|
// Determine persist scope if we are persisting.
|
|
74
74
|
let persistScope;
|
|
75
|
+
let modes;
|
|
76
|
+
const currentMode = context.config.getApprovalMode();
|
|
77
|
+
// If this is an 'Always Allow' selection, we restrict it to the current mode
|
|
78
|
+
// and more permissive modes.
|
|
79
|
+
if (outcome === ToolConfirmationOutcome.ProceedAlways ||
|
|
80
|
+
outcome === ToolConfirmationOutcome.ProceedAlwaysTool ||
|
|
81
|
+
outcome === ToolConfirmationOutcome.ProceedAlwaysServer ||
|
|
82
|
+
outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
|
|
83
|
+
const modeIndex = MODES_BY_PERMISSIVENESS.indexOf(currentMode);
|
|
84
|
+
if (modeIndex !== -1) {
|
|
85
|
+
modes = MODES_BY_PERMISSIVENESS.slice(modeIndex);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
75
88
|
if (outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
|
|
76
89
|
// If folder is trusted and workspace policies are enabled, we prefer workspace scope.
|
|
77
90
|
if (context.config &&
|
|
@@ -85,11 +98,11 @@ export async function updatePolicy(tool, outcome, confirmationDetails, context,
|
|
|
85
98
|
}
|
|
86
99
|
// Specialized Tools (MCP)
|
|
87
100
|
if (confirmationDetails?.type === 'mcp') {
|
|
88
|
-
await handleMcpPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope);
|
|
101
|
+
await handleMcpPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, modes);
|
|
89
102
|
return;
|
|
90
103
|
}
|
|
91
104
|
// Generic Fallback (Shell, Info, etc.)
|
|
92
|
-
await handleStandardPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, toolInvocation, context.config);
|
|
105
|
+
await handleStandardPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, toolInvocation, context.config, modes);
|
|
93
106
|
}
|
|
94
107
|
/**
|
|
95
108
|
* Returns true if the user's 'Always Allow' selection for a specific tool
|
|
@@ -106,7 +119,7 @@ function isAutoEditTransition(tool, outcome) {
|
|
|
106
119
|
* Handles policy updates for standard tools (Shell, Info, etc.), including
|
|
107
120
|
* session-level and persistent approvals.
|
|
108
121
|
*/
|
|
109
|
-
async function handleStandardPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, toolInvocation, config) {
|
|
122
|
+
async function handleStandardPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, toolInvocation, config, modes) {
|
|
110
123
|
if (outcome === ToolConfirmationOutcome.ProceedAlways ||
|
|
111
124
|
outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
|
|
112
125
|
const options = toolInvocation?.getPolicyUpdateOptions?.(outcome) || {};
|
|
@@ -124,6 +137,7 @@ async function handleStandardPolicyUpdate(tool, outcome, confirmationDetails, me
|
|
|
124
137
|
toolName: tool.name,
|
|
125
138
|
persist: outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave,
|
|
126
139
|
persistScope,
|
|
140
|
+
modes,
|
|
127
141
|
...options,
|
|
128
142
|
});
|
|
129
143
|
}
|
|
@@ -132,7 +146,7 @@ async function handleStandardPolicyUpdate(tool, outcome, confirmationDetails, me
|
|
|
132
146
|
* Handles policy updates specifically for MCP tools, including session-level
|
|
133
147
|
* and persistent approvals.
|
|
134
148
|
*/
|
|
135
|
-
async function handleMcpPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope) {
|
|
149
|
+
async function handleMcpPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, modes) {
|
|
136
150
|
const isMcpAlways = outcome === ToolConfirmationOutcome.ProceedAlways ||
|
|
137
151
|
outcome === ToolConfirmationOutcome.ProceedAlwaysTool ||
|
|
138
152
|
outcome === ToolConfirmationOutcome.ProceedAlwaysServer ||
|
|
@@ -152,6 +166,7 @@ async function handleMcpPolicyUpdate(tool, outcome, confirmationDetails, message
|
|
|
152
166
|
mcpName: confirmationDetails.serverName,
|
|
153
167
|
persist,
|
|
154
168
|
persistScope,
|
|
169
|
+
modes,
|
|
155
170
|
});
|
|
156
171
|
}
|
|
157
172
|
//# sourceMappingURL=policy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/scheduler/policy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/scheduler/policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ describe('policy.ts', () => {
|
|
|
20
20
|
check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ALLOW }),
|
|
21
21
|
};
|
|
22
22
|
const mockConfig = {
|
|
23
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
23
24
|
getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
|
|
24
25
|
};
|
|
25
26
|
mockConfig.config =
|
|
@@ -37,6 +38,7 @@ describe('policy.ts', () => {
|
|
|
37
38
|
check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ALLOW }),
|
|
38
39
|
};
|
|
39
40
|
const mockConfig = {
|
|
41
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
40
42
|
getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
|
|
41
43
|
};
|
|
42
44
|
mockConfig.config =
|
|
@@ -56,6 +58,7 @@ describe('policy.ts', () => {
|
|
|
56
58
|
check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ALLOW }),
|
|
57
59
|
};
|
|
58
60
|
const mockConfig = {
|
|
61
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
59
62
|
getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
|
|
60
63
|
getDisableAlwaysAllow: vi.fn().mockReturnValue(true),
|
|
61
64
|
};
|
|
@@ -77,6 +80,7 @@ describe('policy.ts', () => {
|
|
|
77
80
|
check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ASK_USER }),
|
|
78
81
|
};
|
|
79
82
|
const mockConfig = {
|
|
83
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
80
84
|
getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
|
|
81
85
|
isInteractive: vi.fn().mockReturnValue(false),
|
|
82
86
|
};
|
|
@@ -93,6 +97,7 @@ describe('policy.ts', () => {
|
|
|
93
97
|
check: vi.fn().mockResolvedValue({ decision: PolicyDecision.DENY }),
|
|
94
98
|
};
|
|
95
99
|
const mockConfig = {
|
|
100
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
96
101
|
getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
|
|
97
102
|
};
|
|
98
103
|
mockConfig.config =
|
|
@@ -109,6 +114,7 @@ describe('policy.ts', () => {
|
|
|
109
114
|
check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ASK_USER }),
|
|
110
115
|
};
|
|
111
116
|
const mockConfig = {
|
|
117
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
112
118
|
getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
|
|
113
119
|
isInteractive: vi.fn().mockReturnValue(true),
|
|
114
120
|
};
|
|
@@ -126,6 +132,7 @@ describe('policy.ts', () => {
|
|
|
126
132
|
check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ASK_USER }),
|
|
127
133
|
};
|
|
128
134
|
const mockConfig = {
|
|
135
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
129
136
|
getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
|
|
130
137
|
isInteractive: vi.fn().mockReturnValue(true),
|
|
131
138
|
};
|
|
@@ -141,6 +148,7 @@ describe('policy.ts', () => {
|
|
|
141
148
|
check: vi.fn().mockResolvedValue({ decision: PolicyDecision.DENY }),
|
|
142
149
|
};
|
|
143
150
|
const mockConfig = {
|
|
151
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
144
152
|
getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
|
|
145
153
|
};
|
|
146
154
|
const toolCall = {
|
|
@@ -154,6 +162,7 @@ describe('policy.ts', () => {
|
|
|
154
162
|
describe('updatePolicy', () => {
|
|
155
163
|
it('should set AUTO_EDIT mode for auto-edit transition tools', async () => {
|
|
156
164
|
const mockConfig = {
|
|
165
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
157
166
|
setApprovalMode: vi.fn(),
|
|
158
167
|
};
|
|
159
168
|
mockConfig.config =
|
|
@@ -170,6 +179,7 @@ describe('policy.ts', () => {
|
|
|
170
179
|
});
|
|
171
180
|
it('should handle standard policy updates (persist=false)', async () => {
|
|
172
181
|
const mockConfig = {
|
|
182
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
173
183
|
setApprovalMode: vi.fn(),
|
|
174
184
|
};
|
|
175
185
|
mockConfig.config =
|
|
@@ -189,6 +199,7 @@ describe('policy.ts', () => {
|
|
|
189
199
|
});
|
|
190
200
|
it('should handle standard policy updates with persistence', async () => {
|
|
191
201
|
const mockConfig = {
|
|
202
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
192
203
|
isTrustedFolder: vi.fn().mockReturnValue(false),
|
|
193
204
|
getWorkspacePoliciesDir: vi.fn().mockReturnValue(undefined),
|
|
194
205
|
setApprovalMode: vi.fn(),
|
|
@@ -210,6 +221,7 @@ describe('policy.ts', () => {
|
|
|
210
221
|
});
|
|
211
222
|
it('should handle shell command prefixes', async () => {
|
|
212
223
|
const mockConfig = {
|
|
224
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
213
225
|
setApprovalMode: vi.fn(),
|
|
214
226
|
};
|
|
215
227
|
mockConfig.config =
|
|
@@ -237,6 +249,7 @@ describe('policy.ts', () => {
|
|
|
237
249
|
});
|
|
238
250
|
it('should handle MCP policy updates (server scope)', async () => {
|
|
239
251
|
const mockConfig = {
|
|
252
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
240
253
|
setApprovalMode: vi.fn(),
|
|
241
254
|
};
|
|
242
255
|
mockConfig.config =
|
|
@@ -265,6 +278,7 @@ describe('policy.ts', () => {
|
|
|
265
278
|
});
|
|
266
279
|
it('should NOT publish update for ProceedOnce', async () => {
|
|
267
280
|
const mockConfig = {
|
|
281
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
268
282
|
setApprovalMode: vi.fn(),
|
|
269
283
|
};
|
|
270
284
|
mockConfig.config =
|
|
@@ -281,6 +295,7 @@ describe('policy.ts', () => {
|
|
|
281
295
|
});
|
|
282
296
|
it('should NOT publish update for Cancel', async () => {
|
|
283
297
|
const mockConfig = {
|
|
298
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
284
299
|
setApprovalMode: vi.fn(),
|
|
285
300
|
};
|
|
286
301
|
mockConfig.config =
|
|
@@ -296,6 +311,7 @@ describe('policy.ts', () => {
|
|
|
296
311
|
});
|
|
297
312
|
it('should NOT publish update for ModifyWithEditor', async () => {
|
|
298
313
|
const mockConfig = {
|
|
314
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
299
315
|
setApprovalMode: vi.fn(),
|
|
300
316
|
};
|
|
301
317
|
mockConfig.config =
|
|
@@ -311,6 +327,7 @@ describe('policy.ts', () => {
|
|
|
311
327
|
});
|
|
312
328
|
it('should handle MCP ProceedAlwaysTool (specific tool name)', async () => {
|
|
313
329
|
const mockConfig = {
|
|
330
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
314
331
|
setApprovalMode: vi.fn(),
|
|
315
332
|
};
|
|
316
333
|
mockConfig.config =
|
|
@@ -339,6 +356,7 @@ describe('policy.ts', () => {
|
|
|
339
356
|
});
|
|
340
357
|
it('should handle MCP ProceedAlways (persist: false)', async () => {
|
|
341
358
|
const mockConfig = {
|
|
359
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
342
360
|
setApprovalMode: vi.fn(),
|
|
343
361
|
};
|
|
344
362
|
mockConfig.config =
|
|
@@ -367,6 +385,7 @@ describe('policy.ts', () => {
|
|
|
367
385
|
});
|
|
368
386
|
it('should handle MCP ProceedAlwaysAndSave (persist: true)', async () => {
|
|
369
387
|
const mockConfig = {
|
|
388
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
370
389
|
isTrustedFolder: vi.fn().mockReturnValue(false),
|
|
371
390
|
getWorkspacePoliciesDir: vi.fn().mockReturnValue(undefined),
|
|
372
391
|
setApprovalMode: vi.fn(),
|
|
@@ -397,6 +416,7 @@ describe('policy.ts', () => {
|
|
|
397
416
|
});
|
|
398
417
|
it('should determine persistScope: workspace in trusted folders', async () => {
|
|
399
418
|
const mockConfig = {
|
|
419
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
400
420
|
isTrustedFolder: vi.fn().mockReturnValue(true),
|
|
401
421
|
getWorkspacePoliciesDir: vi
|
|
402
422
|
.fn()
|
|
@@ -416,6 +436,7 @@ describe('policy.ts', () => {
|
|
|
416
436
|
});
|
|
417
437
|
it('should determine persistScope: user in untrusted folders', async () => {
|
|
418
438
|
const mockConfig = {
|
|
439
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
419
440
|
isTrustedFolder: vi.fn().mockReturnValue(false),
|
|
420
441
|
getWorkspacePoliciesDir: vi
|
|
421
442
|
.fn()
|
|
@@ -435,6 +456,7 @@ describe('policy.ts', () => {
|
|
|
435
456
|
});
|
|
436
457
|
it('should narrow edit tools with argsPattern', async () => {
|
|
437
458
|
const mockConfig = {
|
|
459
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
438
460
|
isTrustedFolder: vi.fn().mockReturnValue(false),
|
|
439
461
|
getWorkspacePoliciesDir: vi.fn().mockReturnValue(undefined),
|
|
440
462
|
getTargetDir: vi.fn().mockReturnValue('/mock/dir'),
|
|
@@ -463,6 +485,7 @@ describe('policy.ts', () => {
|
|
|
463
485
|
});
|
|
464
486
|
it('should work when context is created via Object.create (prototype chain)', async () => {
|
|
465
487
|
const mockConfig = {
|
|
488
|
+
getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
|
|
466
489
|
setApprovalMode: vi.fn(),
|
|
467
490
|
};
|
|
468
491
|
const mockMessageBus = {
|
|
@@ -589,5 +612,62 @@ describe('Plan Mode Denial Consistency', () => {
|
|
|
589
612
|
expect(resultMessage).toBe('Tool execution denied by policy.');
|
|
590
613
|
expect(resultErrorType).toBe(ToolErrorType.POLICY_VIOLATION);
|
|
591
614
|
});
|
|
615
|
+
describe('updatePolicy - context-aware modes', () => {
|
|
616
|
+
const testCases = [
|
|
617
|
+
{
|
|
618
|
+
currentMode: ApprovalMode.DEFAULT,
|
|
619
|
+
expectedModes: [
|
|
620
|
+
ApprovalMode.DEFAULT,
|
|
621
|
+
ApprovalMode.AUTO_EDIT,
|
|
622
|
+
ApprovalMode.YOLO,
|
|
623
|
+
],
|
|
624
|
+
description: 'include current and more permissive modes in DEFAULT mode',
|
|
625
|
+
},
|
|
626
|
+
{
|
|
627
|
+
currentMode: ApprovalMode.AUTO_EDIT,
|
|
628
|
+
expectedModes: [ApprovalMode.AUTO_EDIT, ApprovalMode.YOLO],
|
|
629
|
+
description: 'include current and more permissive modes in AUTO_EDIT mode',
|
|
630
|
+
},
|
|
631
|
+
{
|
|
632
|
+
currentMode: ApprovalMode.YOLO,
|
|
633
|
+
expectedModes: [ApprovalMode.YOLO],
|
|
634
|
+
description: 'include current and more permissive modes in YOLO mode',
|
|
635
|
+
},
|
|
636
|
+
{
|
|
637
|
+
currentMode: ApprovalMode.PLAN,
|
|
638
|
+
expectedModes: [
|
|
639
|
+
ApprovalMode.PLAN,
|
|
640
|
+
ApprovalMode.DEFAULT,
|
|
641
|
+
ApprovalMode.AUTO_EDIT,
|
|
642
|
+
ApprovalMode.YOLO,
|
|
643
|
+
],
|
|
644
|
+
description: 'include all modes explicitly when granted in PLAN mode',
|
|
645
|
+
},
|
|
646
|
+
];
|
|
647
|
+
testCases.forEach(({ currentMode, expectedModes, description }) => {
|
|
648
|
+
it(`should ${description}`, async () => {
|
|
649
|
+
const mockConfig = {
|
|
650
|
+
getApprovalMode: vi.fn().mockReturnValue(currentMode),
|
|
651
|
+
isTrustedFolder: vi.fn().mockReturnValue(false),
|
|
652
|
+
getWorkspacePoliciesDir: vi.fn().mockReturnValue(undefined),
|
|
653
|
+
};
|
|
654
|
+
const mockMessageBus = {
|
|
655
|
+
publish: vi.fn(),
|
|
656
|
+
};
|
|
657
|
+
const context = {
|
|
658
|
+
config: mockConfig,
|
|
659
|
+
messageBus: mockMessageBus,
|
|
660
|
+
};
|
|
661
|
+
const tool = { name: 'test-tool' };
|
|
662
|
+
await updatePolicy(tool, ToolConfirmationOutcome.ProceedAlwaysAndSave, undefined, context, mockMessageBus);
|
|
663
|
+
expect(mockMessageBus.publish).toHaveBeenCalledWith(expect.objectContaining({
|
|
664
|
+
type: MessageBusType.UPDATE_POLICY,
|
|
665
|
+
toolName: 'test-tool',
|
|
666
|
+
persist: true,
|
|
667
|
+
modes: expectedModes,
|
|
668
|
+
}));
|
|
669
|
+
});
|
|
670
|
+
});
|
|
671
|
+
});
|
|
592
672
|
});
|
|
593
673
|
//# sourceMappingURL=policy.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.test.js","sourceRoot":"","sources":["../../../src/scheduler/policy.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"policy.test.js","sourceRoot":"","sources":["../../../src/scheduler/policy.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { ToolExecutor } from './tool-executor.js';
|
|
|
11
11
|
import { ToolModificationHandler } from './tool-modifier.js';
|
|
12
12
|
import { CoreToolCallStatus, } from './types.js';
|
|
13
13
|
import { ToolErrorType } from '../tools/tool-error.js';
|
|
14
|
+
import { UPDATE_TOPIC_TOOL_NAME } from '../tools/tool-names.js';
|
|
14
15
|
import { PolicyDecision } from '../policy/types.js';
|
|
15
16
|
import { ToolConfirmationOutcome, } from '../tools/tools.js';
|
|
16
17
|
import { getToolSuggestion } from '../utils/tool-utils.js';
|
|
@@ -28,7 +29,7 @@ const createErrorResponse = (request, error, errorType) => ({
|
|
|
28
29
|
{
|
|
29
30
|
functionResponse: {
|
|
30
31
|
id: request.callId,
|
|
31
|
-
name: request.name,
|
|
32
|
+
name: request.originalRequestName ?? request.name,
|
|
32
33
|
response: { error: error.message },
|
|
33
34
|
},
|
|
34
35
|
},
|
|
@@ -195,9 +196,17 @@ export class Scheduler {
|
|
|
195
196
|
this.isCancelling = false;
|
|
196
197
|
this.state.clearBatch();
|
|
197
198
|
const currentApprovalMode = this.config.getApprovalMode();
|
|
199
|
+
// Sort requests to ensure Topic changes happen before actions in the same batch.
|
|
200
|
+
const sortedRequests = [...requests].sort((a, b) => {
|
|
201
|
+
if (a.name === UPDATE_TOPIC_TOOL_NAME)
|
|
202
|
+
return -1;
|
|
203
|
+
if (b.name === UPDATE_TOPIC_TOOL_NAME)
|
|
204
|
+
return 1;
|
|
205
|
+
return 0;
|
|
206
|
+
});
|
|
198
207
|
try {
|
|
199
208
|
const toolRegistry = this.context.toolRegistry;
|
|
200
|
-
const newCalls =
|
|
209
|
+
const newCalls = sortedRequests.map((request) => {
|
|
201
210
|
const enrichedRequest = {
|
|
202
211
|
...request,
|
|
203
212
|
schedulerId: this.schedulerId,
|
|
@@ -492,6 +501,7 @@ export class Scheduler {
|
|
|
492
501
|
name: tailRequest.name,
|
|
493
502
|
args: tailRequest.args,
|
|
494
503
|
originalRequestName,
|
|
504
|
+
originalRequestArgs: result.request.originalRequestArgs ?? result.request.args,
|
|
495
505
|
isClientInitiated: result.request.isClientInitiated,
|
|
496
506
|
prompt_id: result.request.prompt_id,
|
|
497
507
|
schedulerId: this.schedulerId,
|