@google/gemini-cli-core 0.24.0-nightly.20260103.30f5c4af4 → 0.25.0-nightly.20260112.15891721a
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 +1 -1
- package/dist/docs/changelogs/index.md +22 -0
- package/dist/docs/changelogs/latest.md +137 -209
- package/dist/docs/changelogs/preview.md +116 -114
- package/dist/docs/changelogs/releases.md +273 -7
- package/dist/docs/cli/model-routing.md +1 -1
- package/dist/docs/cli/model.md +1 -1
- package/dist/docs/cli/settings.md +67 -52
- package/dist/docs/cli/skills.md +156 -0
- package/dist/docs/cli/telemetry.md +3 -3
- package/dist/docs/cli/tutorials/skills-getting-started.md +124 -0
- package/dist/docs/cli/tutorials.md +4 -0
- package/dist/docs/core/policy-engine.md +3 -2
- package/dist/docs/extensions/index.md +57 -7
- package/dist/docs/get-started/configuration.md +44 -11
- package/dist/docs/get-started/gemini-3.md +2 -17
- package/dist/docs/hooks/best-practices.md +1 -1
- package/dist/docs/hooks/index.md +47 -11
- package/dist/docs/hooks/reference.md +19 -9
- package/dist/docs/hooks/writing-hooks.md +19 -1
- package/dist/docs/sidebar.json +4 -0
- package/dist/docs/troubleshooting.md +9 -3
- package/dist/google-gemini-cli-core-0.25.0-nightly.20260107.59a18e710.tgz +0 -0
- package/dist/src/agents/a2a-client-manager.d.ts +9 -0
- package/dist/src/agents/a2a-client-manager.js +130 -0
- package/dist/src/agents/a2a-client-manager.js.map +1 -1
- package/dist/src/agents/a2a-client-manager.test.js +71 -1
- package/dist/src/agents/a2a-client-manager.test.js.map +1 -1
- package/dist/src/agents/a2aUtils.d.ts +28 -0
- package/dist/src/agents/a2aUtils.js +111 -0
- package/dist/src/agents/a2aUtils.js.map +1 -0
- package/dist/src/agents/a2aUtils.test.js +147 -0
- package/dist/src/agents/a2aUtils.test.js.map +1 -0
- package/dist/src/agents/agentLoader.d.ts +68 -0
- package/dist/src/agents/{toml-loader.js → agentLoader.js} +83 -78
- package/dist/src/agents/agentLoader.js.map +1 -0
- package/dist/src/agents/agentLoader.test.js +283 -0
- package/dist/src/agents/agentLoader.test.js.map +1 -0
- package/dist/src/agents/{introspection-agent.d.ts → cli-help-agent.d.ts} +3 -2
- package/dist/src/agents/{introspection-agent.js → cli-help-agent.js} +17 -11
- package/dist/src/agents/cli-help-agent.js.map +1 -0
- package/dist/src/agents/{introspection-agent.test.js → cli-help-agent.test.js} +26 -8
- package/dist/src/agents/cli-help-agent.test.js.map +1 -0
- package/dist/src/agents/delegate-to-agent-tool.d.ts +2 -2
- package/dist/src/agents/delegate-to-agent-tool.js +23 -16
- package/dist/src/agents/delegate-to-agent-tool.js.map +1 -1
- package/dist/src/agents/delegate-to-agent-tool.test.js +88 -16
- package/dist/src/agents/delegate-to-agent-tool.test.js.map +1 -1
- package/dist/src/agents/local-executor.js +36 -2
- package/dist/src/agents/local-executor.js.map +1 -1
- package/dist/src/agents/local-executor.test.js +55 -2
- package/dist/src/agents/local-executor.test.js.map +1 -1
- package/dist/src/agents/local-invocation.d.ts +2 -2
- package/dist/src/agents/local-invocation.js +3 -3
- package/dist/src/agents/local-invocation.js.map +1 -1
- package/dist/src/agents/local-invocation.test.js +7 -5
- package/dist/src/agents/local-invocation.test.js.map +1 -1
- package/dist/src/agents/registry.d.ts +10 -0
- package/dist/src/agents/registry.js +61 -26
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +66 -11
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/agents/remote-invocation.d.ts +17 -3
- package/dist/src/agents/remote-invocation.js +106 -6
- package/dist/src/agents/remote-invocation.js.map +1 -1
- package/dist/src/agents/remote-invocation.test.js +184 -18
- package/dist/src/agents/remote-invocation.test.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.d.ts +2 -2
- package/dist/src/agents/subagent-tool-wrapper.js +6 -5
- package/dist/src/agents/subagent-tool-wrapper.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.test.js +17 -10
- package/dist/src/agents/subagent-tool-wrapper.test.js.map +1 -1
- package/dist/src/agents/types.d.ts +6 -0
- package/dist/src/availability/fallbackIntegration.test.js +58 -0
- package/dist/src/availability/fallbackIntegration.test.js.map +1 -0
- package/dist/src/code_assist/experiments/experiments.d.ts +1 -1
- package/dist/src/code_assist/experiments/experiments.js +21 -0
- package/dist/src/code_assist/experiments/experiments.js.map +1 -1
- package/dist/src/code_assist/experiments/experiments_local.test.js +110 -0
- package/dist/src/code_assist/experiments/experiments_local.test.js.map +1 -0
- package/dist/src/code_assist/oauth-credential-storage.js +3 -4
- package/dist/src/code_assist/oauth-credential-storage.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +31 -1
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +105 -8
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +5 -0
- package/dist/src/code_assist/server.js +19 -4
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +19 -0
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.js +6 -4
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +63 -0
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/code_assist/telemetry.js +2 -1
- package/dist/src/code_assist/telemetry.js.map +1 -1
- package/dist/src/code_assist/telemetry.test.js +2 -1
- package/dist/src/code_assist/telemetry.test.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +25 -0
- package/dist/src/code_assist/types.js +7 -0
- package/dist/src/code_assist/types.js.map +1 -1
- package/dist/src/config/config.d.ts +45 -9
- package/dist/src/config/config.js +128 -62
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +94 -7
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/models.d.ts +7 -0
- package/dist/src/config/models.js +17 -4
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +37 -1
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/config/storage.d.ts +1 -0
- package/dist/src/config/storage.js +5 -2
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/core/client.js +66 -15
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +171 -22
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +1 -1
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +1 -1
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolHookTriggers.d.ts +8 -4
- package/dist/src/core/coreToolHookTriggers.js +43 -5
- package/dist/src/core/coreToolHookTriggers.js.map +1 -1
- package/dist/src/core/coreToolHookTriggers.test.js +11 -9
- package/dist/src/core/coreToolHookTriggers.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +2 -8
- package/dist/src/core/coreToolScheduler.js +84 -166
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +51 -29
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +26 -1
- package/dist/src/core/geminiChat.js +74 -8
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +109 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/geminiChatHookTriggers.d.ts +8 -4
- package/dist/src/core/geminiChatHookTriggers.js +31 -9
- package/dist/src/core/geminiChatHookTriggers.js.map +1 -1
- package/dist/src/core/geminiChatHookTriggers.test.d.ts +6 -0
- package/dist/src/core/geminiChatHookTriggers.test.js +153 -0
- package/dist/src/core/geminiChatHookTriggers.test.js.map +1 -0
- package/dist/src/core/loggingContentGenerator.js +19 -2
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.test.js +30 -0
- package/dist/src/core/loggingContentGenerator.test.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +4 -2
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +9 -9
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +4 -2
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/tokenLimits.js +6 -12
- package/dist/src/core/tokenLimits.js.map +1 -1
- package/dist/src/core/tokenLimits.test.js +8 -4
- package/dist/src/core/tokenLimits.test.js.map +1 -1
- package/dist/src/core/turn.d.ts +18 -2
- package/dist/src/core/turn.js +16 -0
- package/dist/src/core/turn.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.d.ts +9 -5
- package/dist/src/hooks/hookEventHandler.js +51 -11
- package/dist/src/hooks/hookEventHandler.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.test.js +176 -8
- package/dist/src/hooks/hookEventHandler.test.js.map +1 -1
- package/dist/src/hooks/hookRunner.d.ts +2 -2
- package/dist/src/hooks/hookRunner.js +12 -4
- package/dist/src/hooks/hookRunner.js.map +1 -1
- package/dist/src/hooks/hookRunner.test.js +33 -0
- package/dist/src/hooks/hookRunner.test.js.map +1 -1
- package/dist/src/hooks/hookSystem.d.ts +12 -0
- package/dist/src/hooks/hookSystem.js +36 -0
- package/dist/src/hooks/hookSystem.js.map +1 -1
- package/dist/src/hooks/hookTranslator.js +2 -1
- package/dist/src/hooks/hookTranslator.js.map +1 -1
- package/dist/src/hooks/index.d.ts +0 -1
- package/dist/src/hooks/index.js +0 -2
- package/dist/src/hooks/index.js.map +1 -1
- package/dist/src/hooks/types.d.ts +21 -0
- package/dist/src/hooks/types.js +0 -15
- package/dist/src/hooks/types.js.map +1 -1
- package/dist/src/hooks/types.test.js +4 -28
- package/dist/src/hooks/types.test.js.map +1 -1
- package/dist/src/ide/detect-ide.d.ts +4 -0
- package/dist/src/ide/detect-ide.js +7 -2
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +10 -0
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-installer.js +2 -2
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +11 -2
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/index.d.ts +11 -2
- package/dist/src/index.js +13 -3
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/token-storage/file-token-storage.js +2 -2
- package/dist/src/mcp/token-storage/file-token-storage.js.map +1 -1
- package/dist/src/policy/config.js +60 -22
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/config.test.js +21 -0
- package/dist/src/policy/config.test.js.map +1 -1
- package/dist/src/policy/persistence.test.js +1 -1
- package/dist/src/policy/persistence.test.js.map +1 -1
- package/dist/src/policy/policies/agent.toml +1 -1
- package/dist/src/policy/policies/yolo.toml +1 -0
- package/dist/src/policy/policy-engine.js +22 -6
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +206 -1
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/policy-updater.test.js +3 -3
- package/dist/src/policy/policy-updater.test.js.map +1 -1
- package/dist/src/policy/toml-loader.d.ts +0 -8
- package/dist/src/policy/toml-loader.js +7 -70
- package/dist/src/policy/toml-loader.js.map +1 -1
- package/dist/src/policy/toml-loader.test.js +16 -6
- package/dist/src/policy/toml-loader.test.js.map +1 -1
- package/dist/src/policy/utils.d.ts +21 -0
- package/dist/src/policy/utils.js +45 -0
- package/dist/src/policy/utils.js.map +1 -0
- package/dist/src/policy/utils.test.d.ts +6 -0
- package/dist/src/policy/utils.test.js +92 -0
- package/dist/src/policy/utils.test.js.map +1 -0
- package/dist/src/routing/routingStrategy.d.ts +2 -0
- package/dist/src/routing/strategies/classifierStrategy.js +1 -1
- package/dist/src/routing/strategies/classifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.test.js +16 -0
- package/dist/src/routing/strategies/classifierStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.d.ts +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js +2 -2
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.test.js +13 -0
- package/dist/src/routing/strategies/fallbackStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.d.ts +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js +5 -5
- package/dist/src/routing/strategies/overrideStrategy.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.test.js +14 -0
- package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -1
- package/dist/src/scheduler/tool-executor.d.ts +22 -0
- package/dist/src/scheduler/tool-executor.js +198 -0
- package/dist/src/scheduler/tool-executor.js.map +1 -0
- package/dist/src/scheduler/tool-executor.test.d.ts +6 -0
- package/dist/src/scheduler/tool-executor.test.js +231 -0
- package/dist/src/scheduler/tool-executor.test.js.map +1 -0
- package/dist/src/scheduler/tool-modifier.d.ts +23 -0
- package/dist/src/scheduler/tool-modifier.js +50 -0
- package/dist/src/scheduler/tool-modifier.js.map +1 -0
- package/dist/src/scheduler/tool-modifier.test.d.ts +6 -0
- package/dist/src/scheduler/tool-modifier.test.js +159 -0
- package/dist/src/scheduler/tool-modifier.test.js.map +1 -0
- package/dist/src/services/chatCompressionService.js +3 -10
- package/dist/src/services/chatCompressionService.js.map +1 -1
- package/dist/src/services/chatCompressionService.test.js +1 -0
- package/dist/src/services/chatCompressionService.test.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +7 -1
- package/dist/src/services/chatRecordingService.js +20 -2
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/chatRecordingService.test.js +43 -0
- package/dist/src/services/chatRecordingService.test.js.map +1 -1
- package/dist/src/services/environmentSanitization.js +4 -3
- package/dist/src/services/environmentSanitization.js.map +1 -1
- package/dist/src/services/gitService.test.js +10 -2
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/modelConfig.integration.test.js +2 -2
- package/dist/src/services/modelConfig.integration.test.js.map +1 -1
- package/dist/src/services/modelConfigService.d.ts +29 -1
- package/dist/src/services/modelConfigService.js +116 -69
- package/dist/src/services/modelConfigService.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +116 -0
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +1 -1
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +43 -2
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/skills/skillLoader.d.ts +31 -0
- package/dist/src/skills/skillLoader.js +77 -0
- package/dist/src/skills/skillLoader.js.map +1 -0
- package/dist/src/skills/skillLoader.test.d.ts +6 -0
- package/dist/src/skills/skillLoader.test.js +75 -0
- package/dist/src/skills/skillLoader.test.js.map +1 -0
- package/dist/src/{services → skills}/skillManager.d.ts +18 -19
- package/dist/src/skills/skillManager.js +108 -0
- package/dist/src/skills/skillManager.js.map +1 -0
- package/dist/src/skills/skillManager.test.d.ts +6 -0
- package/dist/src/skills/skillManager.test.js +164 -0
- package/dist/src/skills/skillManager.test.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +9 -6
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +20 -16
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +43 -4
- 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 -2
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +4 -4
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +3 -3
- package/dist/src/telemetry/loggers.js +4 -4
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +7 -5
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +7 -7
- package/dist/src/telemetry/types.js +14 -12
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/test-utils/mock-message-bus.d.ts +1 -0
- package/dist/src/test-utils/mock-message-bus.js +29 -0
- package/dist/src/test-utils/mock-message-bus.js.map +1 -1
- package/dist/src/test-utils/mock-tool.d.ts +5 -3
- package/dist/src/test-utils/mock-tool.js +11 -10
- package/dist/src/test-utils/mock-tool.js.map +1 -1
- package/dist/src/tools/activate-skill.d.ts +2 -2
- package/dist/src/tools/activate-skill.js +28 -10
- package/dist/src/tools/activate-skill.js.map +1 -1
- package/dist/src/tools/activate-skill.test.js +31 -11
- package/dist/src/tools/activate-skill.test.js.map +1 -1
- package/dist/src/tools/confirmation-policy.test.js +2 -12
- package/dist/src/tools/confirmation-policy.test.js.map +1 -1
- package/dist/src/tools/edit.d.ts +27 -5
- package/dist/src/tools/edit.js +446 -137
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +257 -525
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/get-internal-docs.d.ts +2 -2
- package/dist/src/tools/get-internal-docs.js +17 -24
- package/dist/src/tools/get-internal-docs.js.map +1 -1
- package/dist/src/tools/get-internal-docs.test.js +2 -1
- package/dist/src/tools/get-internal-docs.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +2 -2
- package/dist/src/tools/glob.js +1 -1
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +2 -1
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.d.ts +2 -2
- package/dist/src/tools/grep.js +1 -1
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +5 -4
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.d.ts +2 -2
- package/dist/src/tools/ls.js +2 -2
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.js +2 -1
- package/dist/src/tools/ls.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +2 -2
- package/dist/src/tools/mcp-client.js +2 -1
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +20 -5
- package/dist/src/tools/mcp-tool.js +8 -8
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +11 -6
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +3 -3
- package/dist/src/tools/memoryTool.js +2 -2
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +5 -2
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/message-bus-integration.test.js +10 -37
- package/dist/src/tools/message-bus-integration.test.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +2 -2
- package/dist/src/tools/read-file.js +1 -1
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +3 -2
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +2 -2
- package/dist/src/tools/read-many-files.js +2 -3
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +3 -2
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/ripGrep.d.ts +2 -2
- package/dist/src/tools/ripGrep.js +3 -4
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +7 -6
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +3 -4
- package/dist/src/tools/shell.js +9 -35
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +40 -57
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +4 -0
- package/dist/src/tools/tool-error.js +4 -0
- package/dist/src/tools/tool-error.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +11 -6
- package/dist/src/tools/tool-registry.js +13 -8
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +14 -10
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +7 -5
- package/dist/src/tools/tools.js +15 -17
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/tools.test.js +3 -1
- package/dist/src/tools/tools.test.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +2 -2
- package/dist/src/tools/web-fetch.js +4 -4
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +17 -19
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +2 -2
- package/dist/src/tools/web-search.js +3 -4
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/web-search.test.js +2 -1
- package/dist/src/tools/web-search.test.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +2 -2
- package/dist/src/tools/write-file.js +5 -3
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +4 -1
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/tools/write-todos.d.ts +2 -2
- package/dist/src/tools/write-todos.js +5 -4
- package/dist/src/tools/write-todos.js.map +1 -1
- package/dist/src/tools/write-todos.test.js +2 -1
- package/dist/src/tools/write-todos.test.js.map +1 -1
- package/dist/src/utils/apiConversionUtils.d.ts +12 -0
- package/dist/src/utils/apiConversionUtils.js +46 -0
- package/dist/src/utils/apiConversionUtils.js.map +1 -0
- package/dist/src/utils/apiConversionUtils.test.d.ts +6 -0
- package/dist/src/utils/apiConversionUtils.test.js +150 -0
- package/dist/src/utils/apiConversionUtils.test.js.map +1 -0
- package/dist/src/utils/editCorrector.test.js +1 -1
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/editor.d.ts +2 -2
- package/dist/src/utils/editor.js +19 -2
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +27 -4
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +52 -1
- package/dist/src/utils/events.js +28 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/events.test.js +25 -0
- package/dist/src/utils/events.test.js.map +1 -1
- package/dist/src/utils/fileDiffUtils.d.ts +18 -0
- package/dist/src/utils/fileDiffUtils.js +37 -0
- package/dist/src/utils/fileDiffUtils.js.map +1 -0
- package/dist/src/utils/fileDiffUtils.test.d.ts +6 -0
- package/dist/src/utils/fileDiffUtils.test.js +84 -0
- package/dist/src/utils/fileDiffUtils.test.js.map +1 -0
- package/dist/src/utils/gitIgnoreParser.js +9 -10
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/installationManager.test.js +11 -3
- package/dist/src/utils/installationManager.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.js +1 -2
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +9 -0
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/paths.d.ts +10 -0
- package/dist/src/utils/paths.js +20 -1
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/terminal.d.ts +2 -0
- package/dist/src/utils/terminal.js +6 -0
- package/dist/src/utils/terminal.js.map +1 -1
- package/dist/src/utils/tokenCalculation.js +20 -5
- package/dist/src/utils/tokenCalculation.js.map +1 -1
- package/dist/src/utils/tokenCalculation.test.js +11 -2
- package/dist/src/utils/tokenCalculation.test.js.map +1 -1
- package/dist/src/utils/tool-utils.test.js +2 -1
- package/dist/src/utils/tool-utils.test.js.map +1 -1
- package/dist/src/utils/userAccountManager.test.js +5 -5
- package/dist/src/utils/userAccountManager.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -2
- package/dist/docs/cli/configuration.md +0 -780
- package/dist/docs/get-started/deployment.md +0 -143
- package/dist/google-gemini-cli-core-0.24.0-nightly.20251227.37be16243.tgz +0 -0
- package/dist/src/agents/introspection-agent.js.map +0 -1
- package/dist/src/agents/introspection-agent.test.js.map +0 -1
- package/dist/src/agents/toml-loader.d.ts +0 -74
- package/dist/src/agents/toml-loader.js.map +0 -1
- package/dist/src/agents/toml-loader.test.js +0 -309
- package/dist/src/agents/toml-loader.test.js.map +0 -1
- package/dist/src/core/sessionHookTriggers.d.ts +0 -28
- package/dist/src/core/sessionHookTriggers.js +0 -68
- package/dist/src/core/sessionHookTriggers.js.map +0 -1
- package/dist/src/services/skillManager.js +0 -157
- package/dist/src/services/skillManager.js.map +0 -1
- package/dist/src/services/skillManager.test.js +0 -169
- package/dist/src/services/skillManager.test.js.map +0 -1
- package/dist/src/tools/smart-edit.d.ts +0 -78
- package/dist/src/tools/smart-edit.js +0 -722
- package/dist/src/tools/smart-edit.js.map +0 -1
- package/dist/src/tools/smart-edit.test.js +0 -591
- package/dist/src/tools/smart-edit.test.js.map +0 -1
- package/dist/src/utils/shell-permissions.d.ts +0 -52
- package/dist/src/utils/shell-permissions.js +0 -188
- package/dist/src/utils/shell-permissions.js.map +0 -1
- package/dist/src/utils/shell-permissions.test.js +0 -342
- package/dist/src/utils/shell-permissions.test.js.map +0 -1
- /package/dist/src/agents/{introspection-agent.test.d.ts → a2aUtils.test.d.ts} +0 -0
- /package/dist/src/agents/{toml-loader.test.d.ts → agentLoader.test.d.ts} +0 -0
- /package/dist/src/{services/skillManager.test.d.ts → agents/cli-help-agent.test.d.ts} +0 -0
- /package/dist/src/{tools/smart-edit.test.d.ts → availability/fallbackIntegration.test.d.ts} +0 -0
- /package/dist/src/{utils/shell-permissions.test.d.ts → code_assist/experiments/experiments_local.test.d.ts} +0 -0
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"smart-edit.js","sourceRoot":"","sources":["../../../src/tools/smart-edit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,591 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright 2025 Google LLC
|
|
4
|
-
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
-
*/
|
|
6
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
7
|
-
const mockFixLLMEditWithInstruction = vi.hoisted(() => vi.fn());
|
|
8
|
-
const mockGenerateJson = vi.hoisted(() => vi.fn());
|
|
9
|
-
const mockOpenDiff = vi.hoisted(() => vi.fn());
|
|
10
|
-
import { IdeClient } from '../ide/ide-client.js';
|
|
11
|
-
vi.mock('../ide/ide-client.js', () => ({
|
|
12
|
-
IdeClient: {
|
|
13
|
-
getInstance: vi.fn(),
|
|
14
|
-
},
|
|
15
|
-
}));
|
|
16
|
-
vi.mock('../utils/llm-edit-fixer.js', () => ({
|
|
17
|
-
FixLLMEditWithInstruction: mockFixLLMEditWithInstruction,
|
|
18
|
-
}));
|
|
19
|
-
vi.mock('../core/client.js', () => ({
|
|
20
|
-
GeminiClient: vi.fn().mockImplementation(() => ({
|
|
21
|
-
generateJson: mockGenerateJson,
|
|
22
|
-
getHistory: vi.fn().mockResolvedValue([]),
|
|
23
|
-
})),
|
|
24
|
-
}));
|
|
25
|
-
vi.mock('../utils/editor.js', () => ({
|
|
26
|
-
openDiff: mockOpenDiff,
|
|
27
|
-
}));
|
|
28
|
-
import { describe, it, expect, beforeEach, afterEach, vi, } from 'vitest';
|
|
29
|
-
import { SmartEditTool, calculateReplacement, } from './smart-edit.js';
|
|
30
|
-
import { ToolConfirmationOutcome } from './tools.js';
|
|
31
|
-
import { ToolErrorType } from './tool-error.js';
|
|
32
|
-
import path from 'node:path';
|
|
33
|
-
import fs from 'node:fs';
|
|
34
|
-
import os from 'node:os';
|
|
35
|
-
import { ApprovalMode } from '../policy/types.js';
|
|
36
|
-
import {} from '../config/config.js';
|
|
37
|
-
import {} from '@google/genai';
|
|
38
|
-
import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
|
|
39
|
-
import { StandardFileSystemService } from '../services/fileSystemService.js';
|
|
40
|
-
describe('SmartEditTool', () => {
|
|
41
|
-
let tool;
|
|
42
|
-
let tempDir;
|
|
43
|
-
let rootDir;
|
|
44
|
-
let mockConfig;
|
|
45
|
-
let geminiClient;
|
|
46
|
-
let fileSystemService;
|
|
47
|
-
let baseLlmClient;
|
|
48
|
-
beforeEach(() => {
|
|
49
|
-
vi.restoreAllMocks();
|
|
50
|
-
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'smart-edit-tool-test-'));
|
|
51
|
-
rootDir = path.join(tempDir, 'root');
|
|
52
|
-
fs.mkdirSync(rootDir);
|
|
53
|
-
geminiClient = {
|
|
54
|
-
generateJson: mockGenerateJson,
|
|
55
|
-
getHistory: vi.fn().mockResolvedValue([]),
|
|
56
|
-
};
|
|
57
|
-
baseLlmClient = {
|
|
58
|
-
generateJson: mockGenerateJson,
|
|
59
|
-
};
|
|
60
|
-
fileSystemService = new StandardFileSystemService();
|
|
61
|
-
mockConfig = {
|
|
62
|
-
getUsageStatisticsEnabled: vi.fn(() => true),
|
|
63
|
-
getSessionId: vi.fn(() => 'mock-session-id'),
|
|
64
|
-
getContentGeneratorConfig: vi.fn(() => ({ authType: 'mock' })),
|
|
65
|
-
getProxy: vi.fn(() => undefined),
|
|
66
|
-
getGeminiClient: vi.fn().mockReturnValue(geminiClient),
|
|
67
|
-
getBaseLlmClient: vi.fn().mockReturnValue(baseLlmClient),
|
|
68
|
-
getTargetDir: () => rootDir,
|
|
69
|
-
getApprovalMode: vi.fn(),
|
|
70
|
-
setApprovalMode: vi.fn(),
|
|
71
|
-
getWorkspaceContext: () => createMockWorkspaceContext(rootDir),
|
|
72
|
-
getFileSystemService: () => fileSystemService,
|
|
73
|
-
getIdeMode: () => false,
|
|
74
|
-
getApiKey: () => 'test-api-key',
|
|
75
|
-
getModel: () => 'test-model',
|
|
76
|
-
getSandbox: () => false,
|
|
77
|
-
getDebugMode: () => false,
|
|
78
|
-
getQuestion: () => undefined,
|
|
79
|
-
getToolDiscoveryCommand: () => undefined,
|
|
80
|
-
getToolCallCommand: () => undefined,
|
|
81
|
-
getMcpServerCommand: () => undefined,
|
|
82
|
-
getMcpServers: () => undefined,
|
|
83
|
-
getUserAgent: () => 'test-agent',
|
|
84
|
-
getUserMemory: () => '',
|
|
85
|
-
setUserMemory: vi.fn(),
|
|
86
|
-
getGeminiMdFileCount: () => 0,
|
|
87
|
-
setGeminiMdFileCount: vi.fn(),
|
|
88
|
-
getToolRegistry: () => ({}),
|
|
89
|
-
isInteractive: () => false,
|
|
90
|
-
getExperiments: () => { },
|
|
91
|
-
};
|
|
92
|
-
mockConfig.getApprovalMode.mockClear();
|
|
93
|
-
mockConfig.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
|
|
94
|
-
mockFixLLMEditWithInstruction.mockReset();
|
|
95
|
-
mockFixLLMEditWithInstruction.mockResolvedValue({
|
|
96
|
-
noChangesRequired: false,
|
|
97
|
-
search: '',
|
|
98
|
-
replace: '',
|
|
99
|
-
explanation: 'LLM fix failed',
|
|
100
|
-
});
|
|
101
|
-
mockGenerateJson.mockReset();
|
|
102
|
-
mockGenerateJson.mockImplementation(async (contents, schema) => {
|
|
103
|
-
const userContent = contents.find((c) => c.role === 'user');
|
|
104
|
-
let promptText = '';
|
|
105
|
-
if (userContent && userContent.parts) {
|
|
106
|
-
promptText = userContent.parts
|
|
107
|
-
.filter((p) => typeof p.text === 'string')
|
|
108
|
-
.map((p) => p.text)
|
|
109
|
-
.join('\n');
|
|
110
|
-
}
|
|
111
|
-
const snippetMatch = promptText.match(/Problematic target snippet:\n```\n([\s\S]*?)\n```/);
|
|
112
|
-
const problematicSnippet = snippetMatch && snippetMatch[1] ? snippetMatch[1] : '';
|
|
113
|
-
if (schema.properties?.corrected_target_snippet) {
|
|
114
|
-
return Promise.resolve({
|
|
115
|
-
corrected_target_snippet: problematicSnippet,
|
|
116
|
-
});
|
|
117
|
-
}
|
|
118
|
-
if (schema.properties?.corrected_new_string) {
|
|
119
|
-
const originalNewStringMatch = promptText.match(/original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/);
|
|
120
|
-
const originalNewString = originalNewStringMatch && originalNewStringMatch[1]
|
|
121
|
-
? originalNewStringMatch[1]
|
|
122
|
-
: '';
|
|
123
|
-
return Promise.resolve({ corrected_new_string: originalNewString });
|
|
124
|
-
}
|
|
125
|
-
return Promise.resolve({});
|
|
126
|
-
});
|
|
127
|
-
tool = new SmartEditTool(mockConfig);
|
|
128
|
-
});
|
|
129
|
-
afterEach(() => {
|
|
130
|
-
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
131
|
-
});
|
|
132
|
-
describe('calculateReplacement', () => {
|
|
133
|
-
const abortSignal = new AbortController().signal;
|
|
134
|
-
it.each([
|
|
135
|
-
{
|
|
136
|
-
name: 'perform an exact replacement',
|
|
137
|
-
content: 'hello world',
|
|
138
|
-
old_string: 'world',
|
|
139
|
-
new_string: 'moon',
|
|
140
|
-
expected: 'hello moon',
|
|
141
|
-
occurrences: 1,
|
|
142
|
-
},
|
|
143
|
-
{
|
|
144
|
-
name: 'perform a flexible, whitespace-insensitive replacement',
|
|
145
|
-
content: ' hello\n world\n',
|
|
146
|
-
old_string: 'hello\nworld',
|
|
147
|
-
new_string: 'goodbye\nmoon',
|
|
148
|
-
expected: ' goodbye\n moon\n',
|
|
149
|
-
occurrences: 1,
|
|
150
|
-
},
|
|
151
|
-
{
|
|
152
|
-
name: 'return 0 occurrences if no match is found',
|
|
153
|
-
content: 'hello world',
|
|
154
|
-
old_string: 'nomatch',
|
|
155
|
-
new_string: 'moon',
|
|
156
|
-
expected: 'hello world',
|
|
157
|
-
occurrences: 0,
|
|
158
|
-
},
|
|
159
|
-
])('should $name', async ({ content, old_string, new_string, expected, occurrences }) => {
|
|
160
|
-
const result = await calculateReplacement(mockConfig, {
|
|
161
|
-
params: {
|
|
162
|
-
file_path: 'test.txt',
|
|
163
|
-
instruction: 'test',
|
|
164
|
-
old_string,
|
|
165
|
-
new_string,
|
|
166
|
-
},
|
|
167
|
-
currentContent: content,
|
|
168
|
-
abortSignal,
|
|
169
|
-
});
|
|
170
|
-
expect(result.newContent).toBe(expected);
|
|
171
|
-
expect(result.occurrences).toBe(occurrences);
|
|
172
|
-
});
|
|
173
|
-
it('should perform a regex-based replacement for flexible intra-line whitespace', async () => {
|
|
174
|
-
// This case would fail with the previous exact and line-trimming flexible logic
|
|
175
|
-
// because the whitespace *within* the line is different.
|
|
176
|
-
const content = ' function myFunc( a, b ) {\n return a + b;\n }';
|
|
177
|
-
const result = await calculateReplacement(mockConfig, {
|
|
178
|
-
params: {
|
|
179
|
-
file_path: 'test.js',
|
|
180
|
-
instruction: 'test',
|
|
181
|
-
old_string: 'function myFunc(a, b) {', // Note the normalized whitespace
|
|
182
|
-
new_string: 'const yourFunc = (a, b) => {',
|
|
183
|
-
},
|
|
184
|
-
currentContent: content,
|
|
185
|
-
abortSignal,
|
|
186
|
-
});
|
|
187
|
-
// The indentation from the original line should be preserved and applied to the new string.
|
|
188
|
-
const expectedContent = ' const yourFunc = (a, b) => {\n return a + b;\n }';
|
|
189
|
-
expect(result.newContent).toBe(expectedContent);
|
|
190
|
-
expect(result.occurrences).toBe(1);
|
|
191
|
-
});
|
|
192
|
-
});
|
|
193
|
-
describe('validateToolParams', () => {
|
|
194
|
-
it('should return null for valid params', () => {
|
|
195
|
-
const params = {
|
|
196
|
-
file_path: path.join(rootDir, 'test.txt'),
|
|
197
|
-
instruction: 'An instruction',
|
|
198
|
-
old_string: 'old',
|
|
199
|
-
new_string: 'new',
|
|
200
|
-
};
|
|
201
|
-
expect(tool.validateToolParams(params)).toBeNull();
|
|
202
|
-
});
|
|
203
|
-
it('should return an error if path is outside the workspace', () => {
|
|
204
|
-
const params = {
|
|
205
|
-
file_path: path.join(os.tmpdir(), 'outside.txt'),
|
|
206
|
-
instruction: 'An instruction',
|
|
207
|
-
old_string: 'old',
|
|
208
|
-
new_string: 'new',
|
|
209
|
-
};
|
|
210
|
-
expect(tool.validateToolParams(params)).toMatch(/must be within one of the workspace directories/);
|
|
211
|
-
});
|
|
212
|
-
});
|
|
213
|
-
describe('execute', () => {
|
|
214
|
-
const testFile = 'execute_me.txt';
|
|
215
|
-
let filePath;
|
|
216
|
-
beforeEach(() => {
|
|
217
|
-
filePath = path.join(rootDir, testFile);
|
|
218
|
-
});
|
|
219
|
-
it('should reject when calculateEdit fails after an abort signal', async () => {
|
|
220
|
-
const params = {
|
|
221
|
-
file_path: path.join(rootDir, 'abort-execute.txt'),
|
|
222
|
-
instruction: 'Abort during execute',
|
|
223
|
-
old_string: 'old',
|
|
224
|
-
new_string: 'new',
|
|
225
|
-
};
|
|
226
|
-
const invocation = tool.build(params);
|
|
227
|
-
const abortController = new AbortController();
|
|
228
|
-
const abortError = new Error('Abort requested during smart edit execution');
|
|
229
|
-
const calculateSpy = vi
|
|
230
|
-
.spyOn(invocation, 'calculateEdit')
|
|
231
|
-
.mockImplementation(async () => {
|
|
232
|
-
if (!abortController.signal.aborted) {
|
|
233
|
-
abortController.abort();
|
|
234
|
-
}
|
|
235
|
-
throw abortError;
|
|
236
|
-
});
|
|
237
|
-
await expect(invocation.execute(abortController.signal)).rejects.toBe(abortError);
|
|
238
|
-
calculateSpy.mockRestore();
|
|
239
|
-
});
|
|
240
|
-
it('should edit an existing file and return diff with fileName', async () => {
|
|
241
|
-
const initialContent = 'This is some old text.';
|
|
242
|
-
const newContent = 'This is some new text.';
|
|
243
|
-
fs.writeFileSync(filePath, initialContent, 'utf8');
|
|
244
|
-
const params = {
|
|
245
|
-
file_path: filePath,
|
|
246
|
-
instruction: 'Replace old with new',
|
|
247
|
-
old_string: 'old',
|
|
248
|
-
new_string: 'new',
|
|
249
|
-
};
|
|
250
|
-
const invocation = tool.build(params);
|
|
251
|
-
const result = await invocation.execute(new AbortController().signal);
|
|
252
|
-
expect(result.llmContent).toMatch(/Successfully modified file/);
|
|
253
|
-
expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
|
|
254
|
-
const display = result.returnDisplay;
|
|
255
|
-
expect(display.fileDiff).toMatch(initialContent);
|
|
256
|
-
expect(display.fileDiff).toMatch(newContent);
|
|
257
|
-
expect(display.fileName).toBe(testFile);
|
|
258
|
-
});
|
|
259
|
-
it('should return error if old_string is not found in file', async () => {
|
|
260
|
-
fs.writeFileSync(filePath, 'Some content.', 'utf8');
|
|
261
|
-
const params = {
|
|
262
|
-
file_path: filePath,
|
|
263
|
-
instruction: 'Replace non-existent text',
|
|
264
|
-
old_string: 'nonexistent',
|
|
265
|
-
new_string: 'replacement',
|
|
266
|
-
};
|
|
267
|
-
const invocation = tool.build(params);
|
|
268
|
-
const result = await invocation.execute(new AbortController().signal);
|
|
269
|
-
expect(result.llmContent).toMatch(/0 occurrences found for old_string/);
|
|
270
|
-
expect(result.returnDisplay).toMatch(/Failed to edit, could not find the string to replace./);
|
|
271
|
-
expect(mockFixLLMEditWithInstruction).toHaveBeenCalled();
|
|
272
|
-
});
|
|
273
|
-
it('should succeed if FixLLMEditWithInstruction corrects the params', async () => {
|
|
274
|
-
const initialContent = 'This is some original text.';
|
|
275
|
-
const finalContent = 'This is some brand new text.';
|
|
276
|
-
fs.writeFileSync(filePath, initialContent, 'utf8');
|
|
277
|
-
const params = {
|
|
278
|
-
file_path: filePath,
|
|
279
|
-
instruction: 'Replace original with brand new',
|
|
280
|
-
old_string: 'wrong text', // This will fail first
|
|
281
|
-
new_string: 'brand new text',
|
|
282
|
-
};
|
|
283
|
-
mockFixLLMEditWithInstruction.mockResolvedValueOnce({
|
|
284
|
-
noChangesRequired: false,
|
|
285
|
-
search: 'original text', // The corrected search string
|
|
286
|
-
replace: 'brand new text',
|
|
287
|
-
explanation: 'Corrected the search string to match the file content.',
|
|
288
|
-
});
|
|
289
|
-
const invocation = tool.build(params);
|
|
290
|
-
const result = await invocation.execute(new AbortController().signal);
|
|
291
|
-
expect(result.error).toBeUndefined();
|
|
292
|
-
expect(result.llmContent).toMatch(/Successfully modified file/);
|
|
293
|
-
expect(fs.readFileSync(filePath, 'utf8')).toBe(finalContent);
|
|
294
|
-
expect(mockFixLLMEditWithInstruction).toHaveBeenCalledTimes(1);
|
|
295
|
-
});
|
|
296
|
-
it('should preserve CRLF line endings when editing a file', async () => {
|
|
297
|
-
const initialContent = 'line one\r\nline two\r\n';
|
|
298
|
-
const newContent = 'line one\r\nline three\r\n';
|
|
299
|
-
fs.writeFileSync(filePath, initialContent, 'utf8');
|
|
300
|
-
const params = {
|
|
301
|
-
file_path: filePath,
|
|
302
|
-
instruction: 'Replace two with three',
|
|
303
|
-
old_string: 'line two',
|
|
304
|
-
new_string: 'line three',
|
|
305
|
-
};
|
|
306
|
-
const invocation = tool.build(params);
|
|
307
|
-
await invocation.execute(new AbortController().signal);
|
|
308
|
-
const finalContent = fs.readFileSync(filePath, 'utf8');
|
|
309
|
-
expect(finalContent).toBe(newContent);
|
|
310
|
-
});
|
|
311
|
-
it('should create a new file with CRLF line endings if new_string has them', async () => {
|
|
312
|
-
const newContentWithCRLF = 'new line one\r\nnew line two\r\n';
|
|
313
|
-
const params = {
|
|
314
|
-
file_path: filePath,
|
|
315
|
-
instruction: 'Create a new file',
|
|
316
|
-
old_string: '',
|
|
317
|
-
new_string: newContentWithCRLF,
|
|
318
|
-
};
|
|
319
|
-
const invocation = tool.build(params);
|
|
320
|
-
await invocation.execute(new AbortController().signal);
|
|
321
|
-
const finalContent = fs.readFileSync(filePath, 'utf8');
|
|
322
|
-
expect(finalContent).toBe(newContentWithCRLF);
|
|
323
|
-
});
|
|
324
|
-
it('should return NO_CHANGE if FixLLMEditWithInstruction determines no changes are needed', async () => {
|
|
325
|
-
const initialContent = 'The price is $100.';
|
|
326
|
-
fs.writeFileSync(filePath, initialContent, 'utf8');
|
|
327
|
-
const params = {
|
|
328
|
-
file_path: filePath,
|
|
329
|
-
instruction: 'Ensure the price is $100',
|
|
330
|
-
old_string: 'price is $50', // Incorrect old string
|
|
331
|
-
new_string: 'price is $100',
|
|
332
|
-
};
|
|
333
|
-
mockFixLLMEditWithInstruction.mockResolvedValueOnce({
|
|
334
|
-
noChangesRequired: true,
|
|
335
|
-
search: '',
|
|
336
|
-
replace: '',
|
|
337
|
-
explanation: 'The price is already correctly set to $100.',
|
|
338
|
-
});
|
|
339
|
-
const invocation = tool.build(params);
|
|
340
|
-
const result = await invocation.execute(new AbortController().signal);
|
|
341
|
-
expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_CHANGE_LLM_JUDGEMENT);
|
|
342
|
-
expect(result.llmContent).toMatch(/A secondary check by an LLM determined/);
|
|
343
|
-
expect(fs.readFileSync(filePath, 'utf8')).toBe(initialContent); // File is unchanged
|
|
344
|
-
});
|
|
345
|
-
});
|
|
346
|
-
describe('self-correction with content refresh to pull in external edits', () => {
|
|
347
|
-
const testFile = 'test.txt';
|
|
348
|
-
let filePath;
|
|
349
|
-
beforeEach(() => {
|
|
350
|
-
filePath = path.join(rootDir, testFile);
|
|
351
|
-
});
|
|
352
|
-
it('should use refreshed file content for self-correction if file was modified externally', async () => {
|
|
353
|
-
const initialContent = 'This is the original content.';
|
|
354
|
-
const externallyModifiedContent = 'This is the externally modified content.';
|
|
355
|
-
fs.writeFileSync(filePath, initialContent, 'utf8');
|
|
356
|
-
const params = {
|
|
357
|
-
file_path: filePath,
|
|
358
|
-
instruction: 'Replace "externally modified content" with "externally modified string"',
|
|
359
|
-
old_string: 'externally modified content', // This will fail the first attempt, triggering self-correction.
|
|
360
|
-
new_string: 'externally modified string',
|
|
361
|
-
};
|
|
362
|
-
// Spy on `readTextFile` to simulate an external file change between reads.
|
|
363
|
-
const readTextFileSpy = vi
|
|
364
|
-
.spyOn(fileSystemService, 'readTextFile')
|
|
365
|
-
.mockResolvedValueOnce(initialContent) // First call in `calculateEdit`
|
|
366
|
-
.mockResolvedValueOnce(externallyModifiedContent); // Second call in `attemptSelfCorrection`
|
|
367
|
-
const invocation = tool.build(params);
|
|
368
|
-
await invocation.execute(new AbortController().signal);
|
|
369
|
-
// Assert that the file was read twice (initial read, then re-read for hash comparison).
|
|
370
|
-
expect(readTextFileSpy).toHaveBeenCalledTimes(2);
|
|
371
|
-
// Assert that the self-correction LLM was called with the updated content and a specific message.
|
|
372
|
-
expect(mockFixLLMEditWithInstruction).toHaveBeenCalledWith(expect.any(String), // instruction
|
|
373
|
-
params.old_string, params.new_string, expect.stringContaining('However, the file has been modified by either the user or an external process'), // errorForLlmEditFixer
|
|
374
|
-
externallyModifiedContent, // The new content for correction
|
|
375
|
-
expect.any(Object), // baseLlmClient
|
|
376
|
-
expect.any(Object));
|
|
377
|
-
});
|
|
378
|
-
});
|
|
379
|
-
describe('Error Scenarios', () => {
|
|
380
|
-
const testFile = 'error_test.txt';
|
|
381
|
-
let filePath;
|
|
382
|
-
beforeEach(() => {
|
|
383
|
-
filePath = path.join(rootDir, testFile);
|
|
384
|
-
});
|
|
385
|
-
it.each([
|
|
386
|
-
{
|
|
387
|
-
name: 'FILE_NOT_FOUND',
|
|
388
|
-
setup: () => { }, // no file created
|
|
389
|
-
params: { old_string: 'any', new_string: 'new' },
|
|
390
|
-
expectedError: ToolErrorType.FILE_NOT_FOUND,
|
|
391
|
-
},
|
|
392
|
-
{
|
|
393
|
-
name: 'ATTEMPT_TO_CREATE_EXISTING_FILE',
|
|
394
|
-
setup: (fp) => fs.writeFileSync(fp, 'existing content', 'utf8'),
|
|
395
|
-
params: { old_string: '', new_string: 'new content' },
|
|
396
|
-
expectedError: ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE,
|
|
397
|
-
},
|
|
398
|
-
{
|
|
399
|
-
name: 'NO_OCCURRENCE_FOUND',
|
|
400
|
-
setup: (fp) => fs.writeFileSync(fp, 'content', 'utf8'),
|
|
401
|
-
params: { old_string: 'not-found', new_string: 'new' },
|
|
402
|
-
expectedError: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
|
|
403
|
-
},
|
|
404
|
-
{
|
|
405
|
-
name: 'EXPECTED_OCCURRENCE_MISMATCH',
|
|
406
|
-
setup: (fp) => fs.writeFileSync(fp, 'one one two', 'utf8'),
|
|
407
|
-
params: { old_string: 'one', new_string: 'new' },
|
|
408
|
-
expectedError: ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
|
|
409
|
-
},
|
|
410
|
-
])('should return $name error', async ({ setup, params, expectedError }) => {
|
|
411
|
-
setup(filePath);
|
|
412
|
-
const invocation = tool.build({
|
|
413
|
-
file_path: filePath,
|
|
414
|
-
instruction: 'test',
|
|
415
|
-
...params,
|
|
416
|
-
});
|
|
417
|
-
const result = await invocation.execute(new AbortController().signal);
|
|
418
|
-
expect(result.error?.type).toBe(expectedError);
|
|
419
|
-
});
|
|
420
|
-
});
|
|
421
|
-
describe('expected_replacements', () => {
|
|
422
|
-
const testFile = 'replacements_test.txt';
|
|
423
|
-
let filePath;
|
|
424
|
-
beforeEach(() => {
|
|
425
|
-
filePath = path.join(rootDir, testFile);
|
|
426
|
-
});
|
|
427
|
-
it.each([
|
|
428
|
-
{
|
|
429
|
-
name: 'succeed when occurrences match expected_replacements',
|
|
430
|
-
content: 'foo foo foo',
|
|
431
|
-
expected: 3,
|
|
432
|
-
shouldSucceed: true,
|
|
433
|
-
finalContent: 'bar bar bar',
|
|
434
|
-
},
|
|
435
|
-
{
|
|
436
|
-
name: 'fail when occurrences do not match expected_replacements',
|
|
437
|
-
content: 'foo foo foo',
|
|
438
|
-
expected: 2,
|
|
439
|
-
shouldSucceed: false,
|
|
440
|
-
},
|
|
441
|
-
{
|
|
442
|
-
name: 'default to 1 expected replacement if not specified',
|
|
443
|
-
content: 'foo foo',
|
|
444
|
-
expected: undefined,
|
|
445
|
-
shouldSucceed: false,
|
|
446
|
-
},
|
|
447
|
-
])('should $name', async ({ content, expected, shouldSucceed, finalContent }) => {
|
|
448
|
-
fs.writeFileSync(filePath, content, 'utf8');
|
|
449
|
-
const params = {
|
|
450
|
-
file_path: filePath,
|
|
451
|
-
instruction: 'Replace all foo with bar',
|
|
452
|
-
old_string: 'foo',
|
|
453
|
-
new_string: 'bar',
|
|
454
|
-
...(expected !== undefined && { expected_replacements: expected }),
|
|
455
|
-
};
|
|
456
|
-
const invocation = tool.build(params);
|
|
457
|
-
const result = await invocation.execute(new AbortController().signal);
|
|
458
|
-
if (shouldSucceed) {
|
|
459
|
-
expect(result.error).toBeUndefined();
|
|
460
|
-
if (finalContent)
|
|
461
|
-
expect(fs.readFileSync(filePath, 'utf8')).toBe(finalContent);
|
|
462
|
-
}
|
|
463
|
-
else {
|
|
464
|
-
expect(result.error?.type).toBe(ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH);
|
|
465
|
-
}
|
|
466
|
-
});
|
|
467
|
-
});
|
|
468
|
-
describe('IDE mode', () => {
|
|
469
|
-
const testFile = 'edit_me.txt';
|
|
470
|
-
let filePath;
|
|
471
|
-
let ideClient;
|
|
472
|
-
beforeEach(() => {
|
|
473
|
-
filePath = path.join(rootDir, testFile);
|
|
474
|
-
ideClient = {
|
|
475
|
-
openDiff: vi.fn(),
|
|
476
|
-
isDiffingEnabled: vi.fn().mockReturnValue(true),
|
|
477
|
-
};
|
|
478
|
-
vi.mocked(IdeClient.getInstance).mockResolvedValue(ideClient);
|
|
479
|
-
mockConfig.getIdeMode = () => true;
|
|
480
|
-
});
|
|
481
|
-
it('should call ideClient.openDiff and update params on confirmation', async () => {
|
|
482
|
-
const initialContent = 'some old content here';
|
|
483
|
-
const newContent = 'some new content here';
|
|
484
|
-
const modifiedContent = 'some modified content here';
|
|
485
|
-
fs.writeFileSync(filePath, initialContent);
|
|
486
|
-
const params = {
|
|
487
|
-
file_path: filePath,
|
|
488
|
-
instruction: 'test',
|
|
489
|
-
old_string: 'old',
|
|
490
|
-
new_string: 'new',
|
|
491
|
-
};
|
|
492
|
-
ideClient.openDiff.mockResolvedValueOnce({
|
|
493
|
-
status: 'accepted',
|
|
494
|
-
content: modifiedContent,
|
|
495
|
-
});
|
|
496
|
-
const invocation = tool.build(params);
|
|
497
|
-
const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
498
|
-
expect(ideClient.openDiff).toHaveBeenCalledWith(filePath, newContent);
|
|
499
|
-
if (confirmation && 'onConfirm' in confirmation) {
|
|
500
|
-
await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
|
|
501
|
-
}
|
|
502
|
-
expect(params.old_string).toBe(initialContent);
|
|
503
|
-
expect(params.new_string).toBe(modifiedContent);
|
|
504
|
-
});
|
|
505
|
-
});
|
|
506
|
-
describe('shouldConfirmExecute', () => {
|
|
507
|
-
it('should rethrow calculateEdit errors when the abort signal is triggered', async () => {
|
|
508
|
-
const filePath = path.join(rootDir, 'abort-confirmation.txt');
|
|
509
|
-
const params = {
|
|
510
|
-
file_path: filePath,
|
|
511
|
-
instruction: 'Abort during confirmation',
|
|
512
|
-
old_string: 'old',
|
|
513
|
-
new_string: 'new',
|
|
514
|
-
};
|
|
515
|
-
const invocation = tool.build(params);
|
|
516
|
-
const abortController = new AbortController();
|
|
517
|
-
const abortError = new Error('Abort requested during smart edit confirmation');
|
|
518
|
-
const calculateSpy = vi
|
|
519
|
-
.spyOn(invocation, 'calculateEdit')
|
|
520
|
-
.mockImplementation(async () => {
|
|
521
|
-
if (!abortController.signal.aborted) {
|
|
522
|
-
abortController.abort();
|
|
523
|
-
}
|
|
524
|
-
throw abortError;
|
|
525
|
-
});
|
|
526
|
-
await expect(invocation.shouldConfirmExecute(abortController.signal)).rejects.toBe(abortError);
|
|
527
|
-
calculateSpy.mockRestore();
|
|
528
|
-
});
|
|
529
|
-
});
|
|
530
|
-
describe('multiple file edits', () => {
|
|
531
|
-
it('should perform multiple removals and report correct diff stats', async () => {
|
|
532
|
-
const numFiles = 10;
|
|
533
|
-
const files = [];
|
|
534
|
-
const expectedLinesRemoved = [];
|
|
535
|
-
const actualLinesRemoved = [];
|
|
536
|
-
// 1. Create 10 files with 5-10 lines each
|
|
537
|
-
for (let i = 0; i < numFiles; i++) {
|
|
538
|
-
const fileName = `test-file-${i}.txt`;
|
|
539
|
-
const filePath = path.join(rootDir, fileName);
|
|
540
|
-
const numLines = Math.floor(Math.random() * 6) + 5; // 5 to 10 lines
|
|
541
|
-
const lines = Array.from({ length: numLines }, (_, j) => `File ${i}, Line ${j + 1}`);
|
|
542
|
-
const content = lines.join('\n') + '\n';
|
|
543
|
-
// Determine which lines to remove (2 or 3 lines)
|
|
544
|
-
const numLinesToRemove = Math.floor(Math.random() * 2) + 2; // 2 or 3
|
|
545
|
-
expectedLinesRemoved.push(numLinesToRemove);
|
|
546
|
-
const startLineToRemove = 1; // Start removing from the second line
|
|
547
|
-
const linesToRemove = lines.slice(startLineToRemove, startLineToRemove + numLinesToRemove);
|
|
548
|
-
const toRemove = linesToRemove.join('\n') + '\n';
|
|
549
|
-
fs.writeFileSync(filePath, content, 'utf8');
|
|
550
|
-
files.push({
|
|
551
|
-
path: filePath,
|
|
552
|
-
initialContent: content,
|
|
553
|
-
toRemove,
|
|
554
|
-
});
|
|
555
|
-
}
|
|
556
|
-
// 2. Create and execute 10 tool calls for removal
|
|
557
|
-
for (const file of files) {
|
|
558
|
-
const params = {
|
|
559
|
-
file_path: file.path,
|
|
560
|
-
instruction: `Remove lines from the file`,
|
|
561
|
-
old_string: file.toRemove,
|
|
562
|
-
new_string: '', // Removing the content
|
|
563
|
-
ai_proposed_string: '',
|
|
564
|
-
};
|
|
565
|
-
const invocation = tool.build(params);
|
|
566
|
-
const result = await invocation.execute(new AbortController().signal);
|
|
567
|
-
if (result.returnDisplay &&
|
|
568
|
-
typeof result.returnDisplay === 'object' &&
|
|
569
|
-
'diffStat' in result.returnDisplay &&
|
|
570
|
-
result.returnDisplay.diffStat) {
|
|
571
|
-
actualLinesRemoved.push(result.returnDisplay.diffStat?.model_removed_lines);
|
|
572
|
-
}
|
|
573
|
-
else if (result.error) {
|
|
574
|
-
throw result.error;
|
|
575
|
-
}
|
|
576
|
-
}
|
|
577
|
-
// 3. Assert that the content was removed from each file
|
|
578
|
-
for (const file of files) {
|
|
579
|
-
const finalContent = fs.readFileSync(file.path, 'utf8');
|
|
580
|
-
const expectedContent = file.initialContent.replace(file.toRemove, '');
|
|
581
|
-
expect(finalContent).toBe(expectedContent);
|
|
582
|
-
expect(finalContent).not.toContain(file.toRemove);
|
|
583
|
-
}
|
|
584
|
-
// 4. Assert that the total number of removed lines matches the diffStat total
|
|
585
|
-
const totalExpectedRemoved = expectedLinesRemoved.reduce((sum, current) => sum + current, 0);
|
|
586
|
-
const totalActualRemoved = actualLinesRemoved.reduce((sum, current) => sum + current, 0);
|
|
587
|
-
expect(totalActualRemoved).toBe(totalExpectedRemoved);
|
|
588
|
-
});
|
|
589
|
-
});
|
|
590
|
-
});
|
|
591
|
-
//# sourceMappingURL=smart-edit.test.js.map
|