@machina.ai/cell-cli-core 1.0.13-rc9 → 1.0.21-rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +3 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/package.json +12 -4
- package/dist/src/code_assist/converter.d.ts +6 -3
- package/dist/src/code_assist/converter.js +4 -2
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/converter.test.js +61 -11
- package/dist/src/code_assist/converter.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.d.ts +1 -0
- package/dist/src/code_assist/oauth2.js +43 -18
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +142 -9
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +2 -2
- package/dist/src/code_assist/server.js +5 -5
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +13 -10
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.js +49 -18
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +115 -9
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/config/config.d.ts +71 -13
- package/dist/src/config/config.js +154 -41
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +206 -21
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/flashFallback.test.js +19 -47
- package/dist/src/config/flashFallback.test.js.map +1 -1
- package/dist/src/config/models.d.ts +1 -0
- package/dist/src/config/models.js +1 -0
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/core/client.d.ts +15 -16
- package/dist/src/core/client.js +247 -104
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +798 -49
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +2 -2
- package/dist/src/core/contentGenerator.js +23 -21
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +30 -126
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +23 -10
- package/dist/src/core/coreToolScheduler.js +201 -77
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +322 -94
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +8 -6
- package/dist/src/core/geminiChat.js +49 -51
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +2 -2
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/geminiRequest.js +2 -37
- package/dist/src/core/geminiRequest.js.map +1 -1
- package/dist/src/core/logger.d.ts +24 -1
- package/dist/src/core/logger.js +128 -4
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +157 -11
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.d.ts +25 -0
- package/dist/src/core/loggingContentGenerator.js +95 -0
- package/dist/src/core/loggingContentGenerator.js.map +1 -0
- package/dist/src/core/nonInteractiveToolExecutor.js +39 -4
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +85 -62
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +43 -19
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +118 -1
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/subagent.d.ts +230 -0
- package/dist/src/core/subagent.js +447 -0
- package/dist/src/core/subagent.js.map +1 -0
- package/dist/src/core/subagent.test.js +515 -0
- package/dist/src/core/subagent.test.js.map +1 -0
- package/dist/src/core/tokenLimits.js +1 -0
- package/dist/src/core/tokenLimits.js.map +1 -1
- package/dist/src/core/turn.d.ts +3 -0
- package/dist/src/core/turn.js +4 -0
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +4 -0
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +7 -0
- package/dist/src/generated/git-commit.js +10 -0
- package/dist/src/generated/git-commit.js.map +1 -0
- package/dist/src/ide/constants.d.ts +6 -0
- package/dist/src/ide/constants.js +7 -0
- package/dist/src/ide/constants.js.map +1 -0
- package/dist/src/ide/detect-ide.d.ts +20 -0
- package/dist/src/ide/detect-ide.js +86 -0
- package/dist/src/ide/detect-ide.js.map +1 -0
- package/dist/src/ide/detect-ide.test.js +65 -0
- package/dist/src/ide/detect-ide.test.js.map +1 -0
- package/dist/src/ide/ide-client.d.ts +63 -0
- package/dist/src/ide/ide-client.js +320 -0
- package/dist/src/ide/ide-client.js.map +1 -0
- package/dist/src/ide/ide-client.test.d.ts +6 -0
- package/dist/src/ide/ide-client.test.js +43 -0
- package/dist/src/ide/ide-client.test.js.map +1 -0
- package/dist/src/ide/ide-installer.d.ts +14 -0
- package/dist/src/ide/ide-installer.js +98 -0
- package/dist/src/ide/ide-installer.js.map +1 -0
- package/dist/src/ide/ide-installer.test.d.ts +6 -0
- package/dist/src/ide/ide-installer.test.js +53 -0
- package/dist/src/ide/ide-installer.test.js.map +1 -0
- package/dist/src/ide/ideContext.d.ts +374 -0
- package/dist/src/ide/ideContext.js +147 -0
- package/dist/src/ide/ideContext.js.map +1 -0
- package/dist/src/ide/ideContext.test.d.ts +6 -0
- package/dist/src/ide/ideContext.test.js +265 -0
- package/dist/src/ide/ideContext.test.js.map +1 -0
- package/dist/src/ide/process-utils.d.ts +14 -0
- package/dist/src/ide/process-utils.js +57 -0
- package/dist/src/ide/process-utils.js.map +1 -0
- package/dist/src/index.d.ts +17 -1
- package/dist/src/index.js +20 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/google-auth-provider.d.ts +23 -0
- package/dist/src/mcp/google-auth-provider.js +72 -0
- package/dist/src/mcp/google-auth-provider.js.map +1 -0
- package/dist/src/mcp/google-auth-provider.test.d.ts +6 -0
- package/dist/src/mcp/google-auth-provider.test.js +89 -0
- package/dist/src/mcp/google-auth-provider.test.js.map +1 -0
- package/dist/src/mcp/oauth-provider.d.ts +6 -2
- package/dist/src/mcp/oauth-provider.js +208 -53
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +222 -70
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/mcp/oauth-token-storage.d.ts +3 -1
- package/dist/src/mcp/oauth-token-storage.js +3 -1
- package/dist/src/mcp/oauth-token-storage.js.map +1 -1
- package/dist/src/mcp/oauth-utils.d.ts +3 -1
- package/dist/src/mcp/oauth-utils.js +52 -14
- package/dist/src/mcp/oauth-utils.js.map +1 -1
- package/dist/src/mcp/oauth-utils.test.js +18 -3
- package/dist/src/mcp/oauth-utils.test.js.map +1 -1
- package/dist/src/mocks/msw.d.ts +6 -0
- package/dist/src/mocks/msw.js +8 -0
- package/dist/src/mocks/msw.js.map +1 -0
- package/dist/src/prompts/mcp-prompts.d.ts +8 -0
- package/dist/src/prompts/mcp-prompts.js +13 -0
- package/dist/src/prompts/mcp-prompts.js.map +1 -0
- package/dist/src/prompts/prompt-registry.d.ts +34 -0
- package/dist/src/prompts/prompt-registry.js +63 -0
- package/dist/src/prompts/prompt-registry.js.map +1 -0
- package/dist/src/services/chatRecordingService.d.ts +150 -0
- package/dist/src/services/chatRecordingService.js +318 -0
- package/dist/src/services/chatRecordingService.js.map +1 -0
- package/dist/src/services/chatRecordingService.test.d.ts +6 -0
- package/dist/src/services/chatRecordingService.test.js +288 -0
- package/dist/src/services/chatRecordingService.test.js.map +1 -0
- package/dist/src/services/fileDiscoveryService.test.js +101 -60
- package/dist/src/services/fileDiscoveryService.test.js.map +1 -1
- package/dist/src/services/fileSystemService.d.ts +31 -0
- package/dist/src/services/fileSystemService.js +18 -0
- package/dist/src/services/fileSystemService.js.map +1 -0
- package/dist/src/services/fileSystemService.test.d.ts +6 -0
- package/dist/src/services/fileSystemService.test.js +41 -0
- package/dist/src/services/fileSystemService.test.js.map +1 -0
- package/dist/src/services/gitService.test.js +67 -86
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/loopDetectionService.d.ts +51 -5
- package/dist/src/services/loopDetectionService.js +152 -45
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/loopDetectionService.test.js +286 -89
- package/dist/src/services/loopDetectionService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +70 -0
- package/dist/src/services/shellExecutionService.js +175 -0
- package/dist/src/services/shellExecutionService.js.map +1 -0
- package/dist/src/services/shellExecutionService.test.d.ts +6 -0
- package/dist/src/services/shellExecutionService.test.js +282 -0
- package/dist/src/services/shellExecutionService.test.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +81 -9
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +356 -182
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.d.ts +17 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +342 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +19 -2
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +51 -9
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +4 -0
- package/dist/src/telemetry/constants.js +4 -0
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/file-exporters.d.ts +28 -0
- package/dist/src/telemetry/file-exporters.js +62 -0
- package/dist/src/telemetry/file-exporters.js.map +1 -0
- package/dist/src/telemetry/index.d.ts +2 -2
- package/dist/src/telemetry/index.js +2 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/integration.test.circular.js +1 -0
- package/dist/src/telemetry/integration.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +6 -1
- package/dist/src/telemetry/loggers.js +87 -6
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.circular.js +9 -2
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +51 -11
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +7 -2
- package/dist/src/telemetry/metrics.js +26 -6
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +81 -1
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/sdk.d.ts +1 -1
- package/dist/src/telemetry/sdk.js +77 -30
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/sdk.test.d.ts +6 -0
- package/dist/src/telemetry/sdk.test.js +82 -0
- package/dist/src/telemetry/sdk.test.js.map +1 -0
- package/dist/src/telemetry/telemetry.test.js +2 -2
- package/dist/src/telemetry/telemetry.test.js.map +1 -1
- package/dist/src/telemetry/tool-call-decision.d.ts +13 -0
- package/dist/src/telemetry/tool-call-decision.js +29 -0
- package/dist/src/telemetry/tool-call-decision.js.map +1 -0
- package/dist/src/telemetry/types.d.ts +74 -18
- package/dist/src/telemetry/types.js +110 -32
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +8 -1
- package/dist/src/telemetry/uiTelemetry.js +17 -2
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +60 -10
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/config.d.ts +16 -0
- package/dist/src/test-utils/config.js +32 -0
- package/dist/src/test-utils/config.js.map +1 -0
- package/dist/src/test-utils/mockWorkspaceContext.d.ts +13 -0
- package/dist/src/test-utils/mockWorkspaceContext.js +24 -0
- package/dist/src/test-utils/mockWorkspaceContext.js.map +1 -0
- package/dist/src/test-utils/tools.d.ts +44 -0
- package/dist/src/test-utils/tools.js +105 -0
- package/dist/src/test-utils/tools.js.map +1 -0
- package/dist/src/tools/diffOptions.d.ts +2 -0
- package/dist/src/tools/diffOptions.js +28 -0
- package/dist/src/tools/diffOptions.js.map +1 -1
- package/dist/src/tools/diffOptions.test.d.ts +6 -0
- package/dist/src/tools/diffOptions.test.js +119 -0
- package/dist/src/tools/diffOptions.test.js.map +1 -0
- package/dist/src/tools/edit.d.ts +10 -34
- package/dist/src/tools/edit.js +171 -131
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +220 -43
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +4 -11
- package/dist/src/tools/glob.js +129 -97
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +73 -17
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.d.ts +5 -37
- package/dist/src/tools/grep.js +175 -100
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +112 -28
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.d.ts +4 -23
- package/dist/src/tools/ls.js +77 -78
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.d.ts +6 -0
- package/dist/src/tools/ls.test.js +384 -0
- package/dist/src/tools/ls.test.js.map +1 -0
- package/dist/src/tools/mcp-client-manager.d.ts +38 -0
- package/dist/src/tools/mcp-client-manager.js +74 -0
- package/dist/src/tools/mcp-client-manager.js.map +1 -0
- package/dist/src/tools/mcp-client-manager.test.d.ts +6 -0
- package/dist/src/tools/mcp-client-manager.test.js +39 -0
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -0
- package/dist/src/tools/mcp-client.d.ts +86 -4
- package/dist/src/tools/mcp-client.js +730 -59
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +295 -22
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +6 -13
- package/dist/src/tools/mcp-tool.js +163 -76
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +400 -29
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +14 -3
- package/dist/src/tools/memoryTool.js +159 -40
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +116 -11
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/modifiable-tool.d.ts +9 -6
- package/dist/src/tools/modifiable-tool.js +6 -3
- package/dist/src/tools/modifiable-tool.js.map +1 -1
- package/dist/src/tools/modifiable-tool.test.js +63 -74
- package/dist/src/tools/modifiable-tool.test.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +4 -6
- package/dist/src/tools/read-file.js +100 -53
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +238 -111
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +3 -6
- package/dist/src/tools/read-many-files.js +232 -157
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +231 -34
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +6 -28
- package/dist/src/tools/shell.js +249 -366
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +305 -384
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +27 -0
- package/dist/src/tools/tool-error.js +32 -0
- package/dist/src/tools/tool-error.js.map +1 -0
- package/dist/src/tools/tool-registry.d.ts +38 -23
- package/dist/src/tools/tool-registry.js +127 -99
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +37 -212
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +145 -92
- package/dist/src/tools/tools.js +188 -61
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/tools.test.d.ts +6 -0
- package/dist/src/tools/tools.test.js +206 -0
- package/dist/src/tools/tools.test.js.map +1 -0
- package/dist/src/tools/web-fetch.d.ts +4 -7
- package/dist/src/tools/web-fetch.js +58 -64
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +8 -4
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +4 -5
- package/dist/src/tools/web-search.js +47 -51
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/web-search.test.d.ts +6 -0
- package/dist/src/tools/web-search.test.js +139 -0
- package/dist/src/tools/web-search.test.js.map +1 -0
- package/dist/src/tools/write-file.d.ts +20 -11
- package/dist/src/tools/write-file.js +198 -141
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +190 -76
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.js +51 -27
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.test.js +137 -136
- package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
- package/dist/src/utils/browser.js +4 -3
- package/dist/src/utils/browser.js.map +1 -1
- package/dist/src/utils/editCorrector.js +23 -24
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editor.d.ts +2 -2
- package/dist/src/utils/editor.js +23 -6
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +67 -15
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/environmentContext.d.ts +21 -0
- package/dist/src/utils/environmentContext.js +90 -0
- package/dist/src/utils/environmentContext.js.map +1 -0
- package/dist/src/utils/environmentContext.test.d.ts +6 -0
- package/dist/src/utils/environmentContext.test.js +140 -0
- package/dist/src/utils/environmentContext.test.js.map +1 -0
- package/dist/src/utils/errorParsing.d.ts +8 -0
- package/dist/src/utils/errorParsing.js +93 -0
- package/dist/src/utils/errorParsing.js.map +1 -0
- package/dist/src/utils/errorParsing.test.d.ts +6 -0
- package/dist/src/utils/errorParsing.test.js +172 -0
- package/dist/src/utils/errorParsing.test.js.map +1 -0
- package/dist/src/utils/errorReporting.d.ts +1 -1
- package/dist/src/utils/errorReporting.js +2 -2
- package/dist/src/utils/errorReporting.js.map +1 -1
- package/dist/src/utils/errorReporting.test.js +44 -38
- package/dist/src/utils/errorReporting.test.js.map +1 -1
- package/dist/src/utils/fileUtils.d.ts +9 -1
- package/dist/src/utils/fileUtils.js +27 -13
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +61 -18
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/filesearch/crawlCache.d.ts +25 -0
- package/dist/src/utils/filesearch/crawlCache.js +57 -0
- package/dist/src/utils/filesearch/crawlCache.js.map +1 -0
- package/dist/src/utils/filesearch/crawlCache.test.d.ts +6 -0
- package/dist/src/utils/filesearch/crawlCache.test.js +103 -0
- package/dist/src/utils/filesearch/crawlCache.test.js.map +1 -0
- package/dist/src/utils/filesearch/crawler.d.ts +15 -0
- package/dist/src/utils/filesearch/crawler.js +50 -0
- package/dist/src/utils/filesearch/crawler.js.map +1 -0
- package/dist/src/utils/filesearch/crawler.test.d.ts +6 -0
- package/dist/src/utils/filesearch/crawler.test.js +468 -0
- package/dist/src/utils/filesearch/crawler.test.js.map +1 -0
- package/dist/src/utils/filesearch/fileSearch.d.ts +37 -0
- package/dist/src/utils/filesearch/fileSearch.js +186 -0
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -0
- package/dist/src/utils/filesearch/fileSearch.test.d.ts +6 -0
- package/dist/src/utils/filesearch/fileSearch.test.js +552 -0
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -0
- package/dist/src/utils/filesearch/ignore.d.ts +42 -0
- package/dist/src/utils/filesearch/ignore.js +106 -0
- package/dist/src/utils/filesearch/ignore.js.map +1 -0
- package/dist/src/utils/filesearch/ignore.test.d.ts +6 -0
- package/dist/src/utils/filesearch/ignore.test.js +144 -0
- package/dist/src/utils/filesearch/ignore.test.js.map +1 -0
- package/dist/src/utils/filesearch/result-cache.d.ts +33 -0
- package/dist/src/utils/filesearch/result-cache.js +59 -0
- package/dist/src/utils/filesearch/result-cache.js.map +1 -0
- package/dist/src/utils/filesearch/result-cache.test.d.ts +6 -0
- package/dist/src/utils/filesearch/result-cache.test.js +46 -0
- package/dist/src/utils/filesearch/result-cache.test.js.map +1 -0
- package/dist/src/utils/flashFallback.integration.test.js +6 -0
- package/dist/src/utils/flashFallback.integration.test.js.map +1 -1
- package/dist/src/utils/formatters.d.ts +6 -0
- package/dist/src/utils/formatters.js +16 -0
- package/dist/src/utils/formatters.js.map +1 -0
- package/dist/src/utils/getFolderStructure.test.js +11 -13
- package/dist/src/utils/getFolderStructure.test.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.js +5 -11
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.test.js +58 -61
- package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.d.ts +1 -1
- package/dist/src/utils/memoryDiscovery.js +76 -83
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +122 -372
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.d.ts +19 -12
- package/dist/src/utils/memoryImportProcessor.js +240 -85
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.test.js +593 -51
- package/dist/src/utils/memoryImportProcessor.test.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +4 -25
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/partUtils.d.ts +14 -0
- package/dist/src/utils/partUtils.js +65 -0
- package/dist/src/utils/partUtils.js.map +1 -0
- package/dist/src/utils/partUtils.test.d.ts +6 -0
- package/dist/src/utils/partUtils.test.js +130 -0
- package/dist/src/utils/partUtils.test.js.map +1 -0
- package/dist/src/utils/paths.d.ts +18 -2
- package/dist/src/utils/paths.js +39 -7
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.d.ts +6 -0
- package/dist/src/utils/paths.test.js +225 -0
- package/dist/src/utils/paths.test.js.map +1 -0
- package/dist/src/utils/quotaErrorDetection.d.ts +1 -5
- package/dist/src/utils/quotaErrorDetection.js.map +1 -1
- package/dist/src/utils/retry.d.ts +3 -0
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/schemaValidator.d.ts +1 -8
- package/dist/src/utils/schemaValidator.js +1 -32
- package/dist/src/utils/schemaValidator.js.map +1 -1
- package/dist/src/utils/secure-browser-launcher.d.ts +23 -0
- package/dist/src/utils/secure-browser-launcher.js +165 -0
- package/dist/src/utils/secure-browser-launcher.js.map +1 -0
- package/dist/src/utils/secure-browser-launcher.test.d.ts +6 -0
- package/dist/src/utils/secure-browser-launcher.test.js +149 -0
- package/dist/src/utils/secure-browser-launcher.test.js.map +1 -0
- package/dist/src/utils/shell-utils.d.ts +117 -0
- package/dist/src/utils/shell-utils.js +376 -0
- package/dist/src/utils/shell-utils.js.map +1 -0
- package/dist/src/utils/shell-utils.test.d.ts +6 -0
- package/dist/src/utils/shell-utils.test.js +328 -0
- package/dist/src/utils/shell-utils.test.js.map +1 -0
- package/dist/src/utils/summarizer.js +3 -32
- package/dist/src/utils/summarizer.js.map +1 -1
- package/dist/src/utils/systemEncoding.js +1 -1
- package/dist/src/utils/systemEncoding.js.map +1 -1
- package/dist/src/utils/systemEncoding.test.js +23 -23
- package/dist/src/utils/systemEncoding.test.js.map +1 -1
- package/dist/src/utils/textUtils.d.ts +13 -0
- package/dist/src/utils/textUtils.js +28 -0
- package/dist/src/utils/textUtils.js.map +1 -0
- package/dist/src/utils/user_account.js +58 -48
- package/dist/src/utils/user_account.js.map +1 -1
- package/dist/src/utils/user_account.test.js +76 -9
- package/dist/src/utils/user_account.test.js.map +1 -1
- package/dist/src/utils/workspaceContext.d.ts +66 -0
- package/dist/src/utils/workspaceContext.js +165 -0
- package/dist/src/utils/workspaceContext.js.map +1 -0
- package/dist/src/utils/workspaceContext.test.d.ts +6 -0
- package/dist/src/utils/workspaceContext.test.js +293 -0
- package/dist/src/utils/workspaceContext.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +14 -3
- package/dist/src/core/geminiRequest.test.js +0 -72
- package/dist/src/core/geminiRequest.test.js.map +0 -1
- package/dist/src/core/modelCheck.d.ts +0 -14
- package/dist/src/core/modelCheck.js +0 -62
- package/dist/src/core/modelCheck.js.map +0 -1
- package/dist/src/services/ideContext.d.ts +0 -178
- package/dist/src/services/ideContext.js +0 -105
- package/dist/src/services/ideContext.js.map +0 -1
- package/dist/src/services/ideContext.test.js +0 -111
- package/dist/src/services/ideContext.test.js.map +0 -1
- /package/dist/src/core/{geminiRequest.test.d.ts → subagent.test.d.ts} +0 -0
- /package/dist/src/{services/ideContext.test.d.ts → ide/detect-ide.test.d.ts} +0 -0
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { vi, describe, it, expect, beforeEach, afterEach
|
|
7
|
-
import { modifyWithEditor,
|
|
6
|
+
import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
7
|
+
import { modifyWithEditor, isModifiableDeclarativeTool, } from './modifiable-tool.js';
|
|
8
8
|
import fs from 'fs';
|
|
9
|
+
import fsp from 'fs/promises';
|
|
9
10
|
import os from 'os';
|
|
10
11
|
import * as path from 'path';
|
|
11
12
|
// Mock dependencies
|
|
@@ -17,25 +18,23 @@ vi.mock('../utils/editor.js', () => ({
|
|
|
17
18
|
vi.mock('diff', () => ({
|
|
18
19
|
createPatch: mockCreatePatch,
|
|
19
20
|
}));
|
|
20
|
-
vi.mock('fs');
|
|
21
|
-
vi.mock('os');
|
|
22
21
|
describe('modifyWithEditor', () => {
|
|
23
|
-
let
|
|
22
|
+
let testProjectDir;
|
|
24
23
|
let mockModifyContext;
|
|
25
24
|
let mockParams;
|
|
26
25
|
let currentContent;
|
|
27
26
|
let proposedContent;
|
|
28
27
|
let modifiedContent;
|
|
29
28
|
let abortSignal;
|
|
30
|
-
beforeEach(() => {
|
|
29
|
+
beforeEach(async () => {
|
|
31
30
|
vi.resetAllMocks();
|
|
32
|
-
|
|
31
|
+
testProjectDir = await fsp.mkdtemp(path.join(os.tmpdir(), 'modifiable-tool-test-'));
|
|
33
32
|
abortSignal = new AbortController().signal;
|
|
34
33
|
currentContent = 'original content\nline 2\nline 3';
|
|
35
34
|
proposedContent = 'modified content\nline 2\nline 3';
|
|
36
35
|
modifiedContent = 'user modified content\nline 2\nline 3\nnew line';
|
|
37
36
|
mockParams = {
|
|
38
|
-
filePath: path.join(
|
|
37
|
+
filePath: path.join(testProjectDir, 'test.txt'),
|
|
39
38
|
someOtherParam: 'value',
|
|
40
39
|
};
|
|
41
40
|
mockModifyContext = {
|
|
@@ -50,43 +49,33 @@ describe('modifyWithEditor', () => {
|
|
|
50
49
|
oldContent,
|
|
51
50
|
})),
|
|
52
51
|
};
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
fs.mkdirSync.mockImplementation(() => undefined);
|
|
56
|
-
fs.writeFileSync.mockImplementation(() => { });
|
|
57
|
-
fs.unlinkSync.mockImplementation(() => { });
|
|
58
|
-
fs.readFileSync.mockImplementation((filePath) => {
|
|
59
|
-
if (filePath.includes('-new-')) {
|
|
60
|
-
return modifiedContent;
|
|
61
|
-
}
|
|
62
|
-
return currentContent;
|
|
52
|
+
mockOpenDiff.mockImplementation(async (_oldPath, newPath) => {
|
|
53
|
+
await fsp.writeFile(newPath, modifiedContent, 'utf8');
|
|
63
54
|
});
|
|
64
55
|
mockCreatePatch.mockReturnValue('mock diff content');
|
|
65
|
-
mockOpenDiff.mockResolvedValue(undefined);
|
|
66
56
|
});
|
|
67
|
-
afterEach(() => {
|
|
57
|
+
afterEach(async () => {
|
|
68
58
|
vi.restoreAllMocks();
|
|
59
|
+
await fsp.rm(testProjectDir, { recursive: true, force: true });
|
|
60
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
61
|
+
await fsp.rm(diffDir, { recursive: true, force: true });
|
|
69
62
|
});
|
|
70
63
|
describe('successful modification', () => {
|
|
71
64
|
it('should successfully modify content with VSCode editor', async () => {
|
|
72
|
-
const result = await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
65
|
+
const result = await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn());
|
|
73
66
|
expect(mockModifyContext.getCurrentContent).toHaveBeenCalledWith(mockParams);
|
|
74
67
|
expect(mockModifyContext.getProposedContent).toHaveBeenCalledWith(mockParams);
|
|
75
68
|
expect(mockModifyContext.getFilePath).toHaveBeenCalledWith(mockParams);
|
|
76
|
-
expect(
|
|
77
|
-
|
|
78
|
-
expect(fs.writeFileSync).toHaveBeenNthCalledWith(2, expect.stringContaining(path.join(tempDir, 'gemini-cli-tool-modify-diffs')), proposedContent, 'utf8');
|
|
79
|
-
expect(mockOpenDiff).toHaveBeenCalledWith(expect.stringContaining('-old-'), expect.stringContaining('-new-'), 'vscode');
|
|
80
|
-
expect(fs.readFileSync).toHaveBeenCalledWith(expect.stringContaining('-old-'), 'utf8');
|
|
81
|
-
expect(fs.readFileSync).toHaveBeenCalledWith(expect.stringContaining('-new-'), 'utf8');
|
|
69
|
+
expect(mockOpenDiff).toHaveBeenCalledOnce();
|
|
70
|
+
const [oldFilePath, newFilePath] = mockOpenDiff.mock.calls[0];
|
|
82
71
|
expect(mockModifyContext.createUpdatedParams).toHaveBeenCalledWith(currentContent, modifiedContent, mockParams);
|
|
83
72
|
expect(mockCreatePatch).toHaveBeenCalledWith(path.basename(mockParams.filePath), currentContent, modifiedContent, 'Current', 'Proposed', expect.objectContaining({
|
|
84
73
|
context: 3,
|
|
85
74
|
ignoreWhitespace: true,
|
|
86
75
|
}));
|
|
87
|
-
|
|
88
|
-
expect(
|
|
89
|
-
expect(
|
|
76
|
+
// Check that temp files are deleted.
|
|
77
|
+
await expect(fsp.access(oldFilePath)).rejects.toThrow();
|
|
78
|
+
await expect(fsp.access(newFilePath)).rejects.toThrow();
|
|
90
79
|
expect(result).toEqual({
|
|
91
80
|
updatedParams: {
|
|
92
81
|
...mockParams,
|
|
@@ -97,26 +86,27 @@ describe('modifyWithEditor', () => {
|
|
|
97
86
|
});
|
|
98
87
|
});
|
|
99
88
|
it('should create temp directory if it does not exist', async () => {
|
|
100
|
-
|
|
101
|
-
await
|
|
102
|
-
|
|
89
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
90
|
+
await fsp.rm(diffDir, { recursive: true, force: true }).catch(() => { });
|
|
91
|
+
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn());
|
|
92
|
+
const stats = await fsp.stat(diffDir);
|
|
93
|
+
expect(stats.isDirectory()).toBe(true);
|
|
103
94
|
});
|
|
104
95
|
it('should not create temp directory if it already exists', async () => {
|
|
105
|
-
|
|
106
|
-
await
|
|
107
|
-
|
|
96
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
97
|
+
await fsp.mkdir(diffDir, { recursive: true });
|
|
98
|
+
const mkdirSpy = vi.spyOn(fs, 'mkdirSync');
|
|
99
|
+
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn());
|
|
100
|
+
expect(mkdirSpy).not.toHaveBeenCalled();
|
|
101
|
+
mkdirSpy.mockRestore();
|
|
108
102
|
});
|
|
109
103
|
});
|
|
110
104
|
it('should handle missing old temp file gracefully', async () => {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
error.code = 'ENOENT';
|
|
115
|
-
throw error;
|
|
116
|
-
}
|
|
117
|
-
return modifiedContent;
|
|
105
|
+
mockOpenDiff.mockImplementation(async (oldPath, newPath) => {
|
|
106
|
+
await fsp.writeFile(newPath, modifiedContent, 'utf8');
|
|
107
|
+
await fsp.unlink(oldPath);
|
|
118
108
|
});
|
|
119
|
-
const result = await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
109
|
+
const result = await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn());
|
|
120
110
|
expect(mockCreatePatch).toHaveBeenCalledWith(path.basename(mockParams.filePath), '', modifiedContent, 'Current', 'Proposed', expect.objectContaining({
|
|
121
111
|
context: 3,
|
|
122
112
|
ignoreWhitespace: true,
|
|
@@ -125,15 +115,10 @@ describe('modifyWithEditor', () => {
|
|
|
125
115
|
expect(result.updatedDiff).toBe('mock diff content');
|
|
126
116
|
});
|
|
127
117
|
it('should handle missing new temp file gracefully', async () => {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
const error = new Error('ENOENT: no such file or directory');
|
|
131
|
-
error.code = 'ENOENT';
|
|
132
|
-
throw error;
|
|
133
|
-
}
|
|
134
|
-
return currentContent;
|
|
118
|
+
mockOpenDiff.mockImplementation(async (_oldPath, newPath) => {
|
|
119
|
+
await fsp.unlink(newPath);
|
|
135
120
|
});
|
|
136
|
-
const result = await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
121
|
+
const result = await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn());
|
|
137
122
|
expect(mockCreatePatch).toHaveBeenCalledWith(path.basename(mockParams.filePath), currentContent, '', 'Current', 'Proposed', expect.objectContaining({
|
|
138
123
|
context: 3,
|
|
139
124
|
ignoreWhitespace: true,
|
|
@@ -144,46 +129,50 @@ describe('modifyWithEditor', () => {
|
|
|
144
129
|
it('should clean up temp files even if editor fails', async () => {
|
|
145
130
|
const editorError = new Error('Editor failed to open');
|
|
146
131
|
mockOpenDiff.mockRejectedValue(editorError);
|
|
147
|
-
|
|
148
|
-
expect(
|
|
132
|
+
const writeSpy = vi.spyOn(fs, 'writeFileSync');
|
|
133
|
+
await expect(modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn())).rejects.toThrow('Editor failed to open');
|
|
134
|
+
expect(writeSpy).toHaveBeenCalledTimes(2);
|
|
135
|
+
const oldFilePath = writeSpy.mock.calls[0][0];
|
|
136
|
+
const newFilePath = writeSpy.mock.calls[1][0];
|
|
137
|
+
await expect(fsp.access(oldFilePath)).rejects.toThrow();
|
|
138
|
+
await expect(fsp.access(newFilePath)).rejects.toThrow();
|
|
139
|
+
writeSpy.mockRestore();
|
|
149
140
|
});
|
|
150
141
|
it('should handle temp file cleanup errors gracefully', async () => {
|
|
151
142
|
const consoleErrorSpy = vi
|
|
152
143
|
.spyOn(console, 'error')
|
|
153
144
|
.mockImplementation(() => { });
|
|
154
|
-
fs
|
|
145
|
+
vi.spyOn(fs, 'unlinkSync').mockImplementation(() => {
|
|
155
146
|
throw new Error('Failed to delete file');
|
|
156
147
|
});
|
|
157
|
-
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
148
|
+
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn());
|
|
158
149
|
expect(consoleErrorSpy).toHaveBeenCalledTimes(2);
|
|
159
150
|
expect(consoleErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Error deleting temp diff file:'));
|
|
160
151
|
consoleErrorSpy.mockRestore();
|
|
161
152
|
});
|
|
162
153
|
it('should create temp files with correct naming with extension', async () => {
|
|
163
|
-
const testFilePath = path.join(
|
|
154
|
+
const testFilePath = path.join(testProjectDir, 'subfolder', 'test-file.txt');
|
|
164
155
|
mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
|
|
165
|
-
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
const oldFilePath = writeFileCalls[0][0];
|
|
169
|
-
const newFilePath = writeFileCalls[1][0];
|
|
156
|
+
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn());
|
|
157
|
+
expect(mockOpenDiff).toHaveBeenCalledOnce();
|
|
158
|
+
const [oldFilePath, newFilePath] = mockOpenDiff.mock.calls[0];
|
|
170
159
|
expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+\.txt$/);
|
|
171
160
|
expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+\.txt$/);
|
|
172
|
-
|
|
173
|
-
expect(
|
|
161
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
162
|
+
expect(path.dirname(oldFilePath)).toBe(diffDir);
|
|
163
|
+
expect(path.dirname(newFilePath)).toBe(diffDir);
|
|
174
164
|
});
|
|
175
165
|
it('should create temp files with correct naming without extension', async () => {
|
|
176
|
-
const testFilePath = path.join(
|
|
166
|
+
const testFilePath = path.join(testProjectDir, 'subfolder', 'test-file');
|
|
177
167
|
mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
|
|
178
|
-
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal);
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
const oldFilePath = writeFileCalls[0][0];
|
|
182
|
-
const newFilePath = writeFileCalls[1][0];
|
|
168
|
+
await modifyWithEditor(mockParams, mockModifyContext, 'vscode', abortSignal, vi.fn());
|
|
169
|
+
expect(mockOpenDiff).toHaveBeenCalledOnce();
|
|
170
|
+
const [oldFilePath, newFilePath] = mockOpenDiff.mock.calls[0];
|
|
183
171
|
expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+$/);
|
|
184
172
|
expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+$/);
|
|
185
|
-
|
|
186
|
-
expect(
|
|
173
|
+
const diffDir = path.join(os.tmpdir(), 'gemini-cli-tool-modify-diffs');
|
|
174
|
+
expect(path.dirname(oldFilePath)).toBe(diffDir);
|
|
175
|
+
expect(path.dirname(newFilePath)).toBe(diffDir);
|
|
187
176
|
});
|
|
188
177
|
});
|
|
189
178
|
describe('isModifiableTool', () => {
|
|
@@ -192,13 +181,13 @@ describe('isModifiableTool', () => {
|
|
|
192
181
|
name: 'test-tool',
|
|
193
182
|
getModifyContext: vi.fn(),
|
|
194
183
|
};
|
|
195
|
-
expect(
|
|
184
|
+
expect(isModifiableDeclarativeTool(mockTool)).toBe(true);
|
|
196
185
|
});
|
|
197
186
|
it('should return false for objects without getModifyContext method', () => {
|
|
198
187
|
const mockTool = {
|
|
199
188
|
name: 'test-tool',
|
|
200
189
|
};
|
|
201
|
-
expect(
|
|
190
|
+
expect(isModifiableDeclarativeTool(mockTool)).toBe(false);
|
|
202
191
|
});
|
|
203
192
|
});
|
|
204
193
|
//# sourceMappingURL=modifiable-tool.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifiable-tool.test.js","sourceRoot":"","sources":["../../../src/tools/modifiable-tool.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"modifiable-tool.test.js","sourceRoot":"","sources":["../../../src/tools/modifiable-tool.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import {
|
|
6
|
+
import { BaseDeclarativeTool, ToolInvocation, ToolResult } from './tools.js';
|
|
7
7
|
import { Config } from '../config/config.js';
|
|
8
8
|
/**
|
|
9
9
|
* Parameters for the ReadFile tool
|
|
@@ -25,12 +25,10 @@ export interface ReadFileToolParams {
|
|
|
25
25
|
/**
|
|
26
26
|
* Implementation of the ReadFile tool logic
|
|
27
27
|
*/
|
|
28
|
-
export declare class ReadFileTool extends
|
|
28
|
+
export declare class ReadFileTool extends BaseDeclarativeTool<ReadFileToolParams, ToolResult> {
|
|
29
29
|
private config;
|
|
30
30
|
static readonly Name: string;
|
|
31
31
|
constructor(config: Config);
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
toolLocations(params: ReadFileToolParams): ToolLocation[];
|
|
35
|
-
execute(params: ReadFileToolParams, _signal: AbortSignal): Promise<ToolResult>;
|
|
32
|
+
protected validateToolParamValues(params: ReadFileToolParams): string | null;
|
|
33
|
+
protected createInvocation(params: ReadFileToolParams): ToolInvocation<ReadFileToolParams, ToolResult>;
|
|
36
34
|
}
|
|
@@ -4,50 +4,131 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import path from 'path';
|
|
7
|
-
import { SchemaValidator } from '../utils/schemaValidator.js';
|
|
8
7
|
import { makeRelative, shortenPath } from '../utils/paths.js';
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
8
|
+
import { BaseDeclarativeTool, BaseToolInvocation, Kind, } from './tools.js';
|
|
9
|
+
import { ToolErrorType } from './tool-error.js';
|
|
10
|
+
import { processSingleFileContent, getSpecificMimeType, } from '../utils/fileUtils.js';
|
|
12
11
|
import { recordFileOperationMetric, FileOperation, } from '../telemetry/metrics.js';
|
|
12
|
+
class ReadFileToolInvocation extends BaseToolInvocation {
|
|
13
|
+
config;
|
|
14
|
+
constructor(config, params) {
|
|
15
|
+
super(params);
|
|
16
|
+
this.config = config;
|
|
17
|
+
}
|
|
18
|
+
getDescription() {
|
|
19
|
+
const relativePath = makeRelative(this.params.absolute_path, this.config.getTargetDir());
|
|
20
|
+
return shortenPath(relativePath);
|
|
21
|
+
}
|
|
22
|
+
toolLocations() {
|
|
23
|
+
return [{ path: this.params.absolute_path, line: this.params.offset }];
|
|
24
|
+
}
|
|
25
|
+
async execute() {
|
|
26
|
+
const result = await processSingleFileContent(this.params.absolute_path, this.config.getTargetDir(), this.config.getFileSystemService(), this.params.offset, this.params.limit);
|
|
27
|
+
if (result.error) {
|
|
28
|
+
// Map error messages to ToolErrorType
|
|
29
|
+
let errorType;
|
|
30
|
+
let llmContent;
|
|
31
|
+
// Check error message patterns to determine error type
|
|
32
|
+
if (result.error.includes('File not found') ||
|
|
33
|
+
result.error.includes('does not exist') ||
|
|
34
|
+
result.error.includes('ENOENT')) {
|
|
35
|
+
errorType = ToolErrorType.FILE_NOT_FOUND;
|
|
36
|
+
llmContent =
|
|
37
|
+
'Could not read file because no file was found at the specified path.';
|
|
38
|
+
}
|
|
39
|
+
else if (result.error.includes('is a directory') ||
|
|
40
|
+
result.error.includes('EISDIR')) {
|
|
41
|
+
errorType = ToolErrorType.INVALID_TOOL_PARAMS;
|
|
42
|
+
llmContent =
|
|
43
|
+
'Could not read file because the provided path is a directory, not a file.';
|
|
44
|
+
}
|
|
45
|
+
else if (result.error.includes('too large') ||
|
|
46
|
+
result.error.includes('File size exceeds')) {
|
|
47
|
+
errorType = ToolErrorType.FILE_TOO_LARGE;
|
|
48
|
+
llmContent = `Could not read file. ${result.error}`;
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
// Other read errors map to READ_CONTENT_FAILURE
|
|
52
|
+
errorType = ToolErrorType.READ_CONTENT_FAILURE;
|
|
53
|
+
llmContent = `Could not read file. ${result.error}`;
|
|
54
|
+
}
|
|
55
|
+
return {
|
|
56
|
+
llmContent,
|
|
57
|
+
returnDisplay: result.returnDisplay || 'Error reading file',
|
|
58
|
+
error: {
|
|
59
|
+
message: result.error,
|
|
60
|
+
type: errorType,
|
|
61
|
+
},
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
let llmContent;
|
|
65
|
+
if (result.isTruncated) {
|
|
66
|
+
const [start, end] = result.linesShown;
|
|
67
|
+
const total = result.originalLineCount;
|
|
68
|
+
const nextOffset = this.params.offset
|
|
69
|
+
? this.params.offset + end - start + 1
|
|
70
|
+
: end;
|
|
71
|
+
llmContent = `
|
|
72
|
+
IMPORTANT: The file content has been truncated.
|
|
73
|
+
Status: Showing lines ${start}-${end} of ${total} total lines.
|
|
74
|
+
Action: To read more of the file, you can use the 'offset' and 'limit' parameters in a subsequent 'read_file' call. For example, to read the next section of the file, use offset: ${nextOffset}.
|
|
75
|
+
|
|
76
|
+
--- FILE CONTENT (truncated) ---
|
|
77
|
+
${result.llmContent}`;
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
llmContent = result.llmContent || '';
|
|
81
|
+
}
|
|
82
|
+
const lines = typeof result.llmContent === 'string'
|
|
83
|
+
? result.llmContent.split('\n').length
|
|
84
|
+
: undefined;
|
|
85
|
+
const mimetype = getSpecificMimeType(this.params.absolute_path);
|
|
86
|
+
recordFileOperationMetric(this.config, FileOperation.READ, lines, mimetype, path.extname(this.params.absolute_path));
|
|
87
|
+
return {
|
|
88
|
+
llmContent,
|
|
89
|
+
returnDisplay: result.returnDisplay || '',
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
}
|
|
13
93
|
/**
|
|
14
94
|
* Implementation of the ReadFile tool logic
|
|
15
95
|
*/
|
|
16
|
-
export class ReadFileTool extends
|
|
96
|
+
export class ReadFileTool extends BaseDeclarativeTool {
|
|
17
97
|
config;
|
|
18
98
|
static Name = 'read_file';
|
|
19
99
|
constructor(config) {
|
|
20
|
-
super(ReadFileTool.Name, 'ReadFile',
|
|
100
|
+
super(ReadFileTool.Name, 'ReadFile', `Reads and returns the content of a specified file. If the file is large, the content will be truncated. The tool's response will clearly indicate if truncation has occurred and will provide details on how to read more of the file using the 'offset' and 'limit' parameters. Handles text, images (PNG, JPG, GIF, WEBP, SVG, BMP), and PDF files. For text files, it can read specific line ranges.`, Kind.Read, {
|
|
21
101
|
properties: {
|
|
22
102
|
absolute_path: {
|
|
23
103
|
description: "The absolute path to the file to read (e.g., '/home/user/project/file.txt'). Relative paths are not supported. You must provide an absolute path.",
|
|
24
|
-
type:
|
|
104
|
+
type: 'string',
|
|
25
105
|
},
|
|
26
106
|
offset: {
|
|
27
107
|
description: "Optional: For text files, the 0-based line number to start reading from. Requires 'limit' to be set. Use for paginating through large files.",
|
|
28
|
-
type:
|
|
108
|
+
type: 'number',
|
|
29
109
|
},
|
|
30
110
|
limit: {
|
|
31
111
|
description: "Optional: For text files, maximum number of lines to read. Use with 'offset' to paginate through large files. If omitted, reads the entire file (if feasible, up to a default limit).",
|
|
32
|
-
type:
|
|
112
|
+
type: 'number',
|
|
33
113
|
},
|
|
34
114
|
},
|
|
35
115
|
required: ['absolute_path'],
|
|
36
|
-
type:
|
|
116
|
+
type: 'object',
|
|
37
117
|
});
|
|
38
118
|
this.config = config;
|
|
39
119
|
}
|
|
40
|
-
|
|
41
|
-
const errors = SchemaValidator.validate(this.schema.parameters, params);
|
|
42
|
-
if (errors) {
|
|
43
|
-
return errors;
|
|
44
|
-
}
|
|
120
|
+
validateToolParamValues(params) {
|
|
45
121
|
const filePath = params.absolute_path;
|
|
122
|
+
if (params.absolute_path.trim() === '') {
|
|
123
|
+
return "The 'absolute_path' parameter must be non-empty.";
|
|
124
|
+
}
|
|
46
125
|
if (!path.isAbsolute(filePath)) {
|
|
47
126
|
return `File path must be absolute, but was relative: ${filePath}. You must provide an absolute path.`;
|
|
48
127
|
}
|
|
49
|
-
|
|
50
|
-
|
|
128
|
+
const workspaceContext = this.config.getWorkspaceContext();
|
|
129
|
+
if (!workspaceContext.isPathWithinWorkspace(filePath)) {
|
|
130
|
+
const directories = workspaceContext.getDirectories();
|
|
131
|
+
return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
|
|
51
132
|
}
|
|
52
133
|
if (params.offset !== undefined && params.offset < 0) {
|
|
53
134
|
return 'Offset must be a non-negative number';
|
|
@@ -61,42 +142,8 @@ export class ReadFileTool extends BaseTool {
|
|
|
61
142
|
}
|
|
62
143
|
return null;
|
|
63
144
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
typeof params.absolute_path !== 'string' ||
|
|
67
|
-
params.absolute_path.trim() === '') {
|
|
68
|
-
return `Path unavailable`;
|
|
69
|
-
}
|
|
70
|
-
const relativePath = makeRelative(params.absolute_path, this.config.getTargetDir());
|
|
71
|
-
return shortenPath(relativePath);
|
|
72
|
-
}
|
|
73
|
-
toolLocations(params) {
|
|
74
|
-
return [{ path: params.absolute_path, line: params.offset }];
|
|
75
|
-
}
|
|
76
|
-
async execute(params, _signal) {
|
|
77
|
-
const validationError = this.validateToolParams(params);
|
|
78
|
-
if (validationError) {
|
|
79
|
-
return {
|
|
80
|
-
llmContent: `Error: Invalid parameters provided. Reason: ${validationError}`,
|
|
81
|
-
returnDisplay: validationError,
|
|
82
|
-
};
|
|
83
|
-
}
|
|
84
|
-
const result = await processSingleFileContent(params.absolute_path, this.config.getTargetDir(), params.offset, params.limit);
|
|
85
|
-
if (result.error) {
|
|
86
|
-
return {
|
|
87
|
-
llmContent: result.error, // The detailed error for LLM
|
|
88
|
-
returnDisplay: result.returnDisplay, // User-friendly error
|
|
89
|
-
};
|
|
90
|
-
}
|
|
91
|
-
const lines = typeof result.llmContent === 'string'
|
|
92
|
-
? result.llmContent.split('\n').length
|
|
93
|
-
: undefined;
|
|
94
|
-
const mimetype = getSpecificMimeType(params.absolute_path);
|
|
95
|
-
recordFileOperationMetric(this.config, FileOperation.READ, lines, mimetype, path.extname(params.absolute_path));
|
|
96
|
-
return {
|
|
97
|
-
llmContent: result.llmContent,
|
|
98
|
-
returnDisplay: result.returnDisplay,
|
|
99
|
-
};
|
|
145
|
+
createInvocation(params) {
|
|
146
|
+
return new ReadFileToolInvocation(this.config, params);
|
|
100
147
|
}
|
|
101
148
|
}
|
|
102
149
|
//# sourceMappingURL=read-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"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"}
|