@google/gemini-cli-core 0.31.0-preview.2 → 0.32.0-preview.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/docs/changelogs/index.md +22 -0
- package/dist/docs/changelogs/latest.md +307 -352
- package/dist/docs/changelogs/preview.md +391 -293
- package/dist/docs/cli/plan-mode.md +29 -7
- package/dist/docs/cli/settings.md +15 -6
- package/dist/docs/cli/telemetry.md +39 -11
- package/dist/docs/extensions/reference.md +36 -0
- package/dist/docs/get-started/installation.md +1 -1
- package/dist/docs/local-development.md +49 -43
- package/dist/docs/reference/configuration.md +32 -0
- package/dist/docs/reference/keyboard-shortcuts.md +6 -6
- package/dist/docs/reference/policy-engine.md +4 -3
- package/dist/docs/resources/faq.md +13 -0
- package/dist/docs/resources/tos-privacy.md +6 -0
- package/dist/docs/resources/uninstall.md +1 -10
- package/dist/docs/tools/mcp-server.md +22 -0
- package/dist/src/agents/a2a-client-manager.d.ts +7 -6
- package/dist/src/agents/a2a-client-manager.js +8 -9
- package/dist/src/agents/a2a-client-manager.js.map +1 -1
- package/dist/src/agents/a2a-client-manager.test.js +45 -31
- package/dist/src/agents/a2a-client-manager.test.js.map +1 -1
- package/dist/src/agents/a2aUtils.d.ts +25 -7
- package/dist/src/agents/a2aUtils.js +165 -58
- package/dist/src/agents/a2aUtils.js.map +1 -1
- package/dist/src/agents/a2aUtils.test.js +170 -27
- package/dist/src/agents/a2aUtils.test.js.map +1 -1
- package/dist/src/agents/generalist-agent.js +1 -2
- package/dist/src/agents/generalist-agent.js.map +1 -1
- package/dist/src/agents/registry.test.js +4 -2
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/agents/remote-invocation.d.ts +2 -1
- package/dist/src/agents/remote-invocation.js +41 -22
- package/dist/src/agents/remote-invocation.js.map +1 -1
- package/dist/src/agents/remote-invocation.test.js +196 -56
- package/dist/src/agents/remote-invocation.test.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.js +1 -1
- package/dist/src/agents/subagent-tool-wrapper.test.js +1 -1
- package/dist/src/agents/subagent-tool.js +15 -2
- package/dist/src/agents/subagent-tool.js.map +1 -1
- package/dist/src/agents/subagent-tool.test.js +31 -0
- package/dist/src/agents/subagent-tool.test.js.map +1 -1
- package/dist/src/billing/billing.d.ts +80 -0
- package/dist/src/billing/billing.js +127 -0
- package/dist/src/billing/billing.js.map +1 -0
- package/dist/src/billing/billing.test.d.ts +6 -0
- package/dist/src/billing/billing.test.js +182 -0
- package/dist/src/billing/billing.test.js.map +1 -0
- package/dist/src/billing/index.d.ts +6 -0
- package/dist/src/billing/index.js +7 -0
- package/dist/src/billing/index.js.map +1 -0
- package/dist/src/code_assist/codeAssist.js +1 -1
- package/dist/src/code_assist/codeAssist.js.map +1 -1
- package/dist/src/code_assist/codeAssist.test.js +2 -2
- package/dist/src/code_assist/codeAssist.test.js.map +1 -1
- package/dist/src/code_assist/converter.d.ts +9 -4
- package/dist/src/code_assist/converter.js +17 -2
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/converter.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +6 -3
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +1 -0
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +9 -4
- package/dist/src/code_assist/server.js +86 -5
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +11 -0
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.d.ts +2 -1
- package/dist/src/code_assist/setup.js +15 -4
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +33 -10
- package/dist/src/code_assist/types.js.map +1 -1
- package/dist/src/config/config.d.ts +50 -4
- package/dist/src/config/config.js +77 -3
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +151 -1
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/storage.d.ts +1 -0
- package/dist/src/config/storage.js +4 -1
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +3 -2
- package/dist/src/core/contentGenerator.js +9 -2
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/coreToolScheduler.js +2 -1
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +21 -2
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/fakeContentGenerator.d.ts +2 -1
- package/dist/src/core/fakeContentGenerator.js +1 -0
- package/dist/src/core/fakeContentGenerator.js.map +1 -1
- package/dist/src/core/geminiChat.js +6 -2
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +34 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/localLiteRtLmClient.d.ts +24 -0
- package/dist/src/core/localLiteRtLmClient.js +77 -0
- package/dist/src/core/localLiteRtLmClient.js.map +1 -0
- package/dist/src/core/localLiteRtLmClient.test.d.ts +6 -0
- package/dist/src/core/localLiteRtLmClient.test.js +87 -0
- package/dist/src/core/localLiteRtLmClient.test.js.map +1 -0
- package/dist/src/core/loggingContentGenerator.d.ts +2 -1
- package/dist/src/core/loggingContentGenerator.js +39 -17
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.test.js +122 -5
- package/dist/src/core/loggingContentGenerator.test.js.map +1 -1
- package/dist/src/core/prompts.test.js +1 -1
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/fallback/handler.js +2 -0
- package/dist/src/fallback/handler.js.map +1 -1
- package/dist/src/fallback/types.d.ts +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/index.d.ts +5 -0
- package/dist/src/index.js +5 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/policy/config.d.ts +18 -6
- package/dist/src/policy/config.js +51 -14
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/config.test.js +26 -26
- package/dist/src/policy/config.test.js.map +1 -1
- package/dist/src/policy/persistence.test.js +9 -14
- package/dist/src/policy/persistence.test.js.map +1 -1
- package/dist/src/policy/policies/plan.toml +1 -1
- package/dist/src/policy/policy-engine.d.ts +8 -0
- package/dist/src/policy/policy-engine.js +12 -0
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +93 -0
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/policy-updater.test.js +1 -1
- package/dist/src/policy/policy-updater.test.js.map +1 -1
- package/dist/src/policy/toml-loader.d.ts +1 -1
- package/dist/src/policy/toml-loader.js +4 -2
- package/dist/src/policy/toml-loader.js.map +1 -1
- package/dist/src/policy/toml-loader.test.js +15 -12
- package/dist/src/policy/toml-loader.test.js.map +1 -1
- package/dist/src/policy/workspace-policy.test.js +10 -10
- package/dist/src/prompts/snippets.js +43 -27
- package/dist/src/prompts/snippets.js.map +1 -1
- package/dist/src/routing/modelRouterService.js +19 -11
- package/dist/src/routing/modelRouterService.js.map +1 -1
- package/dist/src/routing/modelRouterService.test.js +38 -1
- package/dist/src/routing/modelRouterService.test.js.map +1 -1
- package/dist/src/routing/routingStrategy.d.ts +3 -2
- package/dist/src/routing/strategies/classifierStrategy.d.ts +2 -1
- 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 +15 -13
- package/dist/src/routing/strategies/classifierStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/compositeStrategy.d.ts +2 -1
- package/dist/src/routing/strategies/compositeStrategy.js +3 -3
- package/dist/src/routing/strategies/compositeStrategy.js.map +1 -1
- package/dist/src/routing/strategies/compositeStrategy.test.js +10 -8
- package/dist/src/routing/strategies/compositeStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.d.ts +2 -1
- package/dist/src/routing/strategies/defaultStrategy.js +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.test.js +8 -4
- package/dist/src/routing/strategies/defaultStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.d.ts +2 -1
- package/dist/src/routing/strategies/fallbackStrategy.js +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.test.js +6 -5
- package/dist/src/routing/strategies/fallbackStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/gemmaClassifierStrategy.d.ts +14 -0
- package/dist/src/routing/strategies/gemmaClassifierStrategy.js +182 -0
- package/dist/src/routing/strategies/gemmaClassifierStrategy.js.map +1 -0
- package/dist/src/routing/strategies/gemmaClassifierStrategy.test.d.ts +6 -0
- package/dist/src/routing/strategies/gemmaClassifierStrategy.test.js +218 -0
- package/dist/src/routing/strategies/gemmaClassifierStrategy.test.js.map +1 -0
- package/dist/src/routing/strategies/numericalClassifierStrategy.d.ts +2 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.js +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.test.js +24 -22
- package/dist/src/routing/strategies/numericalClassifierStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.d.ts +2 -1
- package/dist/src/routing/strategies/overrideStrategy.js +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.test.js +5 -4
- package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -1
- package/dist/src/scheduler/scheduler.d.ts +1 -0
- package/dist/src/scheduler/scheduler.js +18 -7
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/scheduler/scheduler.test.js +19 -1
- package/dist/src/scheduler/scheduler.test.js.map +1 -1
- package/dist/src/scheduler/scheduler_parallel.test.js +94 -3
- package/dist/src/scheduler/scheduler_parallel.test.js.map +1 -1
- package/dist/src/scheduler/tool-executor.js +21 -12
- package/dist/src/scheduler/tool-executor.js.map +1 -1
- package/dist/src/scheduler/tool-executor.test.js +54 -0
- package/dist/src/scheduler/tool-executor.test.js.map +1 -1
- package/dist/src/services/trackerService.d.ts +49 -0
- package/dist/src/services/trackerService.js +172 -0
- package/dist/src/services/trackerService.js.map +1 -0
- package/dist/src/services/trackerService.test.d.ts +6 -0
- package/dist/src/services/trackerService.test.js +117 -0
- package/dist/src/services/trackerService.test.js.map +1 -0
- package/dist/src/services/trackerTypes.d.ts +51 -0
- package/dist/src/services/trackerTypes.js +33 -0
- package/dist/src/services/trackerTypes.js.map +1 -0
- package/dist/src/telemetry/billingEvents.d.ts +75 -0
- package/dist/src/telemetry/billingEvents.js +181 -0
- package/dist/src/telemetry/billingEvents.js.map +1 -0
- package/dist/src/telemetry/billingEvents.test.d.ts +6 -0
- package/dist/src/telemetry/billingEvents.test.js +139 -0
- package/dist/src/telemetry/billingEvents.test.js.map +1 -0
- package/dist/src/telemetry/conseca-logger.test.js +1 -0
- package/dist/src/telemetry/conseca-logger.test.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +25 -0
- package/dist/src/telemetry/constants.js +29 -0
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +3 -1
- package/dist/src/telemetry/index.js +5 -1
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +2 -0
- package/dist/src/telemetry/loggers.js +10 -0
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +16 -0
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +28 -0
- package/dist/src/telemetry/metrics.js +40 -0
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/sanitize.test.js +1 -0
- package/dist/src/telemetry/sanitize.test.js.map +1 -1
- package/dist/src/telemetry/sdk.test.js +1 -0
- package/dist/src/telemetry/sdk.test.js.map +1 -1
- package/dist/src/telemetry/telemetryAttributes.js +2 -0
- package/dist/src/telemetry/telemetryAttributes.js.map +1 -1
- package/dist/src/telemetry/trace.d.ts +2 -1
- package/dist/src/telemetry/trace.js +13 -18
- package/dist/src/telemetry/trace.js.map +1 -1
- package/dist/src/telemetry/trace.test.d.ts +6 -0
- package/dist/src/telemetry/trace.test.js +116 -0
- package/dist/src/telemetry/trace.test.js.map +1 -0
- package/dist/src/tools/confirmation-policy.test.js +1 -0
- package/dist/src/tools/confirmation-policy.test.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js +2 -2
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js +3 -3
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js.map +1 -1
- package/dist/src/tools/grep-utils.d.ts +1 -1
- package/dist/src/tools/grep-utils.js +4 -4
- package/dist/src/tools/grep-utils.js.map +1 -1
- package/dist/src/tools/grep.d.ts +1 -1
- package/dist/src/tools/grep.js +9 -9
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +8 -5
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/line-endings.test.js +3 -11
- package/dist/src/tools/line-endings.test.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.d.ts +25 -0
- package/dist/src/tools/mcp-client-manager.js +66 -3
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +47 -0
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +20 -9
- package/dist/src/tools/mcp-client.js +50 -46
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +96 -84
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +3 -3
- package/dist/src/tools/mcp-tool.js +1 -0
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/ripGrep.d.ts +1 -1
- package/dist/src/tools/ripGrep.js +7 -7
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +10 -7
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +1 -0
- package/dist/src/tools/tools.js +1 -0
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/write-file.js +4 -17
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +29 -83
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/editCorrector.d.ts +1 -42
- package/dist/src/utils/editCorrector.js +9 -461
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +17 -421
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/envExpansion.js.map +1 -1
- package/dist/src/utils/errors.js +7 -0
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/errors_timeout.test.d.ts +6 -0
- package/dist/src/utils/errors_timeout.test.js +40 -0
- package/dist/src/utils/errors_timeout.test.js.map +1 -0
- package/dist/src/utils/extensionLoader.js +35 -0
- package/dist/src/utils/extensionLoader.js.map +1 -1
- package/dist/src/utils/extensionLoader.test.js +36 -0
- package/dist/src/utils/extensionLoader.test.js.map +1 -1
- package/dist/src/utils/fetch.js +13 -2
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/fileUtils.js +0 -1
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +0 -1
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/flashFallback.test.js +24 -0
- package/dist/src/utils/flashFallback.test.js.map +1 -1
- package/dist/src/utils/googleErrors.d.ts +2 -2
- package/dist/src/utils/googleQuotaErrors.d.ts +3 -1
- package/dist/src/utils/googleQuotaErrors.js +22 -12
- package/dist/src/utils/googleQuotaErrors.js.map +1 -1
- package/dist/src/utils/googleQuotaErrors.test.js +33 -1
- package/dist/src/utils/googleQuotaErrors.test.js.map +1 -1
- package/dist/src/utils/retry.js +4 -2
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +20 -0
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/schemaValidator.js +0 -1
- package/dist/src/utils/schemaValidator.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/google-gemini-cli-core-0.31.0-preview.1.tgz +0 -0
|
@@ -4,64 +4,13 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { vi, describe, it, expect, beforeEach } from 'vitest';
|
|
7
|
-
import * as fs from 'node:fs';
|
|
8
|
-
import { EDIT_TOOL_NAME } from '../tools/tool-names.js';
|
|
9
7
|
// MOCKS
|
|
10
8
|
let callCount = 0;
|
|
11
9
|
const mockResponses = [];
|
|
12
10
|
let mockGenerateJson;
|
|
13
|
-
let mockStartChat;
|
|
14
|
-
let mockSendMessageStream;
|
|
15
|
-
vi.mock('fs', () => ({
|
|
16
|
-
statSync: vi.fn(),
|
|
17
|
-
mkdirSync: vi.fn(),
|
|
18
|
-
createWriteStream: vi.fn(() => ({
|
|
19
|
-
write: vi.fn(),
|
|
20
|
-
on: vi.fn(),
|
|
21
|
-
})),
|
|
22
|
-
}));
|
|
23
|
-
vi.mock('../core/client.js', () => ({
|
|
24
|
-
GeminiClient: vi.fn().mockImplementation(function (_config) {
|
|
25
|
-
this.startChat = (...params) => mockStartChat(...params);
|
|
26
|
-
this.sendMessageStream = (...params) => mockSendMessageStream(...params);
|
|
27
|
-
return this;
|
|
28
|
-
}),
|
|
29
|
-
}));
|
|
30
11
|
// END MOCKS
|
|
31
|
-
import {
|
|
32
|
-
import { GeminiClient } from '../core/client.js';
|
|
33
|
-
import { ToolRegistry } from '../tools/tool-registry.js';
|
|
34
|
-
vi.mock('../tools/tool-registry.js');
|
|
12
|
+
import { ensureCorrectFileContent, unescapeStringForGeminiBug, resetEditCorrectorCaches_TEST_ONLY, } from './editCorrector.js';
|
|
35
13
|
describe('editCorrector', () => {
|
|
36
|
-
describe('countOccurrences', () => {
|
|
37
|
-
it('should return 0 for empty string', () => {
|
|
38
|
-
expect(countOccurrences('', 'a')).toBe(0);
|
|
39
|
-
});
|
|
40
|
-
it('should return 0 for empty substring', () => {
|
|
41
|
-
expect(countOccurrences('abc', '')).toBe(0);
|
|
42
|
-
});
|
|
43
|
-
it('should return 0 if substring is not found', () => {
|
|
44
|
-
expect(countOccurrences('abc', 'd')).toBe(0);
|
|
45
|
-
});
|
|
46
|
-
it('should return 1 if substring is found once', () => {
|
|
47
|
-
expect(countOccurrences('abc', 'b')).toBe(1);
|
|
48
|
-
});
|
|
49
|
-
it('should return correct count for multiple occurrences', () => {
|
|
50
|
-
expect(countOccurrences('ababa', 'a')).toBe(3);
|
|
51
|
-
expect(countOccurrences('ababab', 'ab')).toBe(3);
|
|
52
|
-
});
|
|
53
|
-
it('should count non-overlapping occurrences', () => {
|
|
54
|
-
expect(countOccurrences('aaaaa', 'aa')).toBe(2);
|
|
55
|
-
expect(countOccurrences('ababab', 'aba')).toBe(1);
|
|
56
|
-
});
|
|
57
|
-
it('should correctly count occurrences when substring is longer', () => {
|
|
58
|
-
expect(countOccurrences('abc', 'abcdef')).toBe(0);
|
|
59
|
-
});
|
|
60
|
-
it('should be case-sensitive', () => {
|
|
61
|
-
expect(countOccurrences('abcABC', 'a')).toBe(1);
|
|
62
|
-
expect(countOccurrences('abcABC', 'A')).toBe(1);
|
|
63
|
-
});
|
|
64
|
-
});
|
|
65
14
|
describe('unescapeStringForGeminiBug', () => {
|
|
66
15
|
it('should unescape common sequences', () => {
|
|
67
16
|
expect(unescapeStringForGeminiBug('\\n')).toBe('\n');
|
|
@@ -112,375 +61,6 @@ describe('editCorrector', () => {
|
|
|
112
61
|
expect(unescapeStringForGeminiBug('quote\\\\"text\\\\nline')).toBe('quote"text\nline');
|
|
113
62
|
});
|
|
114
63
|
});
|
|
115
|
-
describe('ensureCorrectEdit', () => {
|
|
116
|
-
let mockGeminiClientInstance;
|
|
117
|
-
let mockBaseLlmClientInstance;
|
|
118
|
-
let mockToolRegistry;
|
|
119
|
-
let mockConfigInstance;
|
|
120
|
-
const abortSignal = new AbortController().signal;
|
|
121
|
-
beforeEach(() => {
|
|
122
|
-
mockToolRegistry = new ToolRegistry({}, {});
|
|
123
|
-
const configParams = {
|
|
124
|
-
apiKey: 'test-api-key',
|
|
125
|
-
model: 'test-model',
|
|
126
|
-
sandbox: false,
|
|
127
|
-
targetDir: '/test',
|
|
128
|
-
debugMode: false,
|
|
129
|
-
question: undefined,
|
|
130
|
-
coreTools: undefined,
|
|
131
|
-
toolDiscoveryCommand: undefined,
|
|
132
|
-
toolCallCommand: undefined,
|
|
133
|
-
mcpServerCommand: undefined,
|
|
134
|
-
mcpServers: undefined,
|
|
135
|
-
userAgent: 'test-agent',
|
|
136
|
-
userMemory: '',
|
|
137
|
-
geminiMdFileCount: 0,
|
|
138
|
-
alwaysSkipModificationConfirmation: false,
|
|
139
|
-
};
|
|
140
|
-
mockConfigInstance = {
|
|
141
|
-
...configParams,
|
|
142
|
-
getApiKey: vi.fn(() => configParams.apiKey),
|
|
143
|
-
getModel: vi.fn(() => configParams.model),
|
|
144
|
-
getSandbox: vi.fn(() => configParams.sandbox),
|
|
145
|
-
getTargetDir: vi.fn(() => configParams.targetDir),
|
|
146
|
-
getToolRegistry: vi.fn(() => mockToolRegistry),
|
|
147
|
-
getDebugMode: vi.fn(() => configParams.debugMode),
|
|
148
|
-
getQuestion: vi.fn(() => configParams.question),
|
|
149
|
-
getCoreTools: vi.fn(() => configParams.coreTools),
|
|
150
|
-
getToolDiscoveryCommand: vi.fn(() => configParams.toolDiscoveryCommand),
|
|
151
|
-
getToolCallCommand: vi.fn(() => configParams.toolCallCommand),
|
|
152
|
-
getMcpServerCommand: vi.fn(() => configParams.mcpServerCommand),
|
|
153
|
-
getMcpServers: vi.fn(() => configParams.mcpServers),
|
|
154
|
-
getUserAgent: vi.fn(() => configParams.userAgent),
|
|
155
|
-
getUserMemory: vi.fn(() => configParams.userMemory),
|
|
156
|
-
setUserMemory: vi.fn((mem) => {
|
|
157
|
-
configParams.userMemory = mem;
|
|
158
|
-
}),
|
|
159
|
-
getGeminiMdFileCount: vi.fn(() => configParams.geminiMdFileCount),
|
|
160
|
-
setGeminiMdFileCount: vi.fn((count) => {
|
|
161
|
-
configParams.geminiMdFileCount = count;
|
|
162
|
-
}),
|
|
163
|
-
getAlwaysSkipModificationConfirmation: vi.fn(() => configParams.alwaysSkipModificationConfirmation),
|
|
164
|
-
setAlwaysSkipModificationConfirmation: vi.fn((skip) => {
|
|
165
|
-
configParams.alwaysSkipModificationConfirmation = skip;
|
|
166
|
-
}),
|
|
167
|
-
getQuotaErrorOccurred: vi.fn().mockReturnValue(false),
|
|
168
|
-
setQuotaErrorOccurred: vi.fn(),
|
|
169
|
-
};
|
|
170
|
-
callCount = 0;
|
|
171
|
-
mockResponses.length = 0;
|
|
172
|
-
mockGenerateJson = vi
|
|
173
|
-
.fn()
|
|
174
|
-
.mockImplementation((_contents, _schema, signal) => {
|
|
175
|
-
// Check if the signal is aborted. If so, throw an error or return a specific response.
|
|
176
|
-
if (signal && signal.aborted) {
|
|
177
|
-
return Promise.reject(new Error('Aborted')); // Or some other specific error/response
|
|
178
|
-
}
|
|
179
|
-
const response = mockResponses[callCount];
|
|
180
|
-
callCount++;
|
|
181
|
-
if (response === undefined)
|
|
182
|
-
return Promise.resolve({});
|
|
183
|
-
return Promise.resolve(response);
|
|
184
|
-
});
|
|
185
|
-
mockStartChat = vi.fn();
|
|
186
|
-
mockSendMessageStream = vi.fn();
|
|
187
|
-
mockGeminiClientInstance = new GeminiClient(mockConfigInstance);
|
|
188
|
-
mockGeminiClientInstance.getHistory = vi.fn().mockReturnValue([]);
|
|
189
|
-
mockBaseLlmClientInstance = {
|
|
190
|
-
generateJson: mockGenerateJson,
|
|
191
|
-
config: {
|
|
192
|
-
generationConfigService: {
|
|
193
|
-
getResolvedConfig: vi.fn().mockReturnValue({
|
|
194
|
-
model: 'edit-corrector',
|
|
195
|
-
generateContentConfig: {},
|
|
196
|
-
}),
|
|
197
|
-
},
|
|
198
|
-
},
|
|
199
|
-
};
|
|
200
|
-
resetEditCorrectorCaches_TEST_ONLY();
|
|
201
|
-
});
|
|
202
|
-
describe('Scenario Group 1: originalParams.old_string matches currentContent directly', () => {
|
|
203
|
-
it('Test 1.1: old_string (no literal \\), new_string (escaped by Gemini) -> new_string unescaped', async () => {
|
|
204
|
-
const currentContent = 'This is a test string to find me.';
|
|
205
|
-
const originalParams = {
|
|
206
|
-
file_path: '/test/file.txt',
|
|
207
|
-
old_string: 'find me',
|
|
208
|
-
new_string: 'replace with \\"this\\"',
|
|
209
|
-
};
|
|
210
|
-
mockResponses.push({
|
|
211
|
-
corrected_new_string_escaping: 'replace with "this"',
|
|
212
|
-
});
|
|
213
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
214
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(1);
|
|
215
|
-
expect(result.params.new_string).toBe('replace with "this"');
|
|
216
|
-
expect(result.params.old_string).toBe('find me');
|
|
217
|
-
expect(result.occurrences).toBe(1);
|
|
218
|
-
});
|
|
219
|
-
it('Test 1.2: old_string (no literal \\), new_string (correctly formatted) -> new_string unchanged', async () => {
|
|
220
|
-
const currentContent = 'This is a test string to find me.';
|
|
221
|
-
const originalParams = {
|
|
222
|
-
file_path: '/test/file.txt',
|
|
223
|
-
old_string: 'find me',
|
|
224
|
-
new_string: 'replace with this',
|
|
225
|
-
};
|
|
226
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
227
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(0);
|
|
228
|
-
expect(result.params.new_string).toBe('replace with this');
|
|
229
|
-
expect(result.params.old_string).toBe('find me');
|
|
230
|
-
expect(result.occurrences).toBe(1);
|
|
231
|
-
});
|
|
232
|
-
it('Test 1.3: old_string (with literal \\), new_string (escaped by Gemini) -> new_string unchanged (still escaped)', async () => {
|
|
233
|
-
const currentContent = 'This is a test string to find\\me.';
|
|
234
|
-
const originalParams = {
|
|
235
|
-
file_path: '/test/file.txt',
|
|
236
|
-
old_string: 'find\\me',
|
|
237
|
-
new_string: 'replace with \\"this\\"',
|
|
238
|
-
};
|
|
239
|
-
mockResponses.push({
|
|
240
|
-
corrected_new_string_escaping: 'replace with "this"',
|
|
241
|
-
});
|
|
242
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
243
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(1);
|
|
244
|
-
expect(result.params.new_string).toBe('replace with "this"');
|
|
245
|
-
expect(result.params.old_string).toBe('find\\me');
|
|
246
|
-
expect(result.occurrences).toBe(1);
|
|
247
|
-
});
|
|
248
|
-
it('Test 1.4: old_string (with literal \\), new_string (correctly formatted) -> new_string unchanged', async () => {
|
|
249
|
-
const currentContent = 'This is a test string to find\\me.';
|
|
250
|
-
const originalParams = {
|
|
251
|
-
file_path: '/test/file.txt',
|
|
252
|
-
old_string: 'find\\me',
|
|
253
|
-
new_string: 'replace with this',
|
|
254
|
-
};
|
|
255
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
256
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(0);
|
|
257
|
-
expect(result.params.new_string).toBe('replace with this');
|
|
258
|
-
expect(result.params.old_string).toBe('find\\me');
|
|
259
|
-
expect(result.occurrences).toBe(1);
|
|
260
|
-
});
|
|
261
|
-
});
|
|
262
|
-
describe('Scenario Group 2: originalParams.old_string does NOT match, but unescapeStringForGeminiBug(originalParams.old_string) DOES match', () => {
|
|
263
|
-
it('Test 2.1: old_string (over-escaped, no intended literal \\), new_string (escaped by Gemini) -> new_string unescaped', async () => {
|
|
264
|
-
const currentContent = 'This is a test string to find "me".';
|
|
265
|
-
const originalParams = {
|
|
266
|
-
file_path: '/test/file.txt',
|
|
267
|
-
old_string: 'find \\"me\\"',
|
|
268
|
-
new_string: 'replace with \\"this\\"',
|
|
269
|
-
};
|
|
270
|
-
mockResponses.push({ corrected_new_string: 'replace with "this"' });
|
|
271
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
272
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(1);
|
|
273
|
-
expect(result.params.new_string).toBe('replace with "this"');
|
|
274
|
-
expect(result.params.old_string).toBe('find "me"');
|
|
275
|
-
expect(result.occurrences).toBe(1);
|
|
276
|
-
});
|
|
277
|
-
it('Test 2.2: old_string (over-escaped, no intended literal \\), new_string (correctly formatted) -> new_string unescaped (harmlessly)', async () => {
|
|
278
|
-
const currentContent = 'This is a test string to find "me".';
|
|
279
|
-
const originalParams = {
|
|
280
|
-
file_path: '/test/file.txt',
|
|
281
|
-
old_string: 'find \\"me\\"',
|
|
282
|
-
new_string: 'replace with this',
|
|
283
|
-
};
|
|
284
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
285
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(0);
|
|
286
|
-
expect(result.params.new_string).toBe('replace with this');
|
|
287
|
-
expect(result.params.old_string).toBe('find "me"');
|
|
288
|
-
expect(result.occurrences).toBe(1);
|
|
289
|
-
});
|
|
290
|
-
it('Test 2.3: old_string (over-escaped, with intended literal \\), new_string (simple) -> new_string corrected', async () => {
|
|
291
|
-
const currentContent = 'This is a test string to find \\me.';
|
|
292
|
-
const originalParams = {
|
|
293
|
-
file_path: '/test/file.txt',
|
|
294
|
-
old_string: 'find \\\\me',
|
|
295
|
-
new_string: 'replace with foobar',
|
|
296
|
-
};
|
|
297
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
298
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(0);
|
|
299
|
-
expect(result.params.new_string).toBe('replace with foobar');
|
|
300
|
-
expect(result.params.old_string).toBe('find \\me');
|
|
301
|
-
expect(result.occurrences).toBe(1);
|
|
302
|
-
});
|
|
303
|
-
});
|
|
304
|
-
describe('Scenario Group 3: LLM Correction Path', () => {
|
|
305
|
-
it('Test 3.1: old_string (no literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is double unescaped', async () => {
|
|
306
|
-
const currentContent = 'This is a test string to corrected find me.';
|
|
307
|
-
const originalParams = {
|
|
308
|
-
file_path: '/test/file.txt',
|
|
309
|
-
old_string: 'find me',
|
|
310
|
-
new_string: 'replace with \\\\"this\\\\"',
|
|
311
|
-
};
|
|
312
|
-
const llmNewString = 'LLM says replace with "that"';
|
|
313
|
-
mockResponses.push({ corrected_new_string_escaping: llmNewString });
|
|
314
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
315
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(1);
|
|
316
|
-
expect(result.params.new_string).toBe(llmNewString);
|
|
317
|
-
expect(result.params.old_string).toBe('find me');
|
|
318
|
-
expect(result.occurrences).toBe(1);
|
|
319
|
-
});
|
|
320
|
-
it('Test 3.2: old_string (with literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is unescaped once', async () => {
|
|
321
|
-
const currentContent = 'This is a test string to corrected find me.';
|
|
322
|
-
const originalParams = {
|
|
323
|
-
file_path: '/test/file.txt',
|
|
324
|
-
old_string: 'find\\me',
|
|
325
|
-
new_string: 'replace with \\\\"this\\\\"',
|
|
326
|
-
};
|
|
327
|
-
const llmCorrectedOldString = 'corrected find me';
|
|
328
|
-
const llmNewString = 'LLM says replace with "that"';
|
|
329
|
-
mockResponses.push({ corrected_target_snippet: llmCorrectedOldString });
|
|
330
|
-
mockResponses.push({ corrected_new_string: llmNewString });
|
|
331
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
332
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(2);
|
|
333
|
-
expect(result.params.new_string).toBe(llmNewString);
|
|
334
|
-
expect(result.params.old_string).toBe(llmCorrectedOldString);
|
|
335
|
-
expect(result.occurrences).toBe(1);
|
|
336
|
-
});
|
|
337
|
-
it('Test 3.3: old_string needs LLM, new_string is fine -> old_string corrected, new_string original', async () => {
|
|
338
|
-
const currentContent = 'This is a test string to be corrected.';
|
|
339
|
-
const originalParams = {
|
|
340
|
-
file_path: '/test/file.txt',
|
|
341
|
-
old_string: 'fiiind me',
|
|
342
|
-
new_string: 'replace with "this"',
|
|
343
|
-
};
|
|
344
|
-
const llmCorrectedOldString = 'to be corrected';
|
|
345
|
-
mockResponses.push({ corrected_target_snippet: llmCorrectedOldString });
|
|
346
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
347
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(1);
|
|
348
|
-
expect(result.params.new_string).toBe('replace with "this"');
|
|
349
|
-
expect(result.params.old_string).toBe(llmCorrectedOldString);
|
|
350
|
-
expect(result.occurrences).toBe(1);
|
|
351
|
-
});
|
|
352
|
-
it('Test 3.4: LLM correction path, correctNewString returns the originalNewString it was passed (which was unescaped) -> final new_string is unescaped', async () => {
|
|
353
|
-
const currentContent = 'This is a test string to corrected find me.';
|
|
354
|
-
const originalParams = {
|
|
355
|
-
file_path: '/test/file.txt',
|
|
356
|
-
old_string: 'find me',
|
|
357
|
-
new_string: 'replace with \\\\"this\\\\"',
|
|
358
|
-
};
|
|
359
|
-
const newStringForLLMAndReturnedByLLM = 'replace with "this"';
|
|
360
|
-
mockResponses.push({
|
|
361
|
-
corrected_new_string_escaping: newStringForLLMAndReturnedByLLM,
|
|
362
|
-
});
|
|
363
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
364
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(1);
|
|
365
|
-
expect(result.params.new_string).toBe(newStringForLLMAndReturnedByLLM);
|
|
366
|
-
expect(result.occurrences).toBe(1);
|
|
367
|
-
});
|
|
368
|
-
});
|
|
369
|
-
describe('Scenario Group 4: No Match Found / Multiple Matches', () => {
|
|
370
|
-
it('Test 4.1: No version of old_string (original, unescaped, LLM-corrected) matches -> returns original params, 0 occurrences', async () => {
|
|
371
|
-
const currentContent = 'This content has nothing to find.';
|
|
372
|
-
const originalParams = {
|
|
373
|
-
file_path: '/test/file.txt',
|
|
374
|
-
old_string: 'nonexistent string',
|
|
375
|
-
new_string: 'some new string',
|
|
376
|
-
};
|
|
377
|
-
mockResponses.push({ corrected_target_snippet: 'still nonexistent' });
|
|
378
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
379
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(1);
|
|
380
|
-
expect(result.params).toEqual(originalParams);
|
|
381
|
-
expect(result.occurrences).toBe(0);
|
|
382
|
-
});
|
|
383
|
-
it('Test 4.2: unescapedOldStringAttempt results in >1 occurrences -> returns original params, count occurrences', async () => {
|
|
384
|
-
const currentContent = 'This content has find "me" and also find "me" again.';
|
|
385
|
-
const originalParams = {
|
|
386
|
-
file_path: '/test/file.txt',
|
|
387
|
-
old_string: 'find "me"',
|
|
388
|
-
new_string: 'some new string',
|
|
389
|
-
};
|
|
390
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
391
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(0);
|
|
392
|
-
expect(result.params).toEqual(originalParams);
|
|
393
|
-
expect(result.occurrences).toBe(2);
|
|
394
|
-
});
|
|
395
|
-
});
|
|
396
|
-
describe('Scenario Group 5: Specific unescapeStringForGeminiBug checks (integrated into ensureCorrectEdit)', () => {
|
|
397
|
-
it('Test 5.1: old_string needs LLM to become currentContent, new_string also needs correction', async () => {
|
|
398
|
-
const currentContent = 'const x = "a\nbc\\"def\\"';
|
|
399
|
-
const originalParams = {
|
|
400
|
-
file_path: '/test/file.txt',
|
|
401
|
-
old_string: 'const x = \\"a\\nbc\\\\"def\\\\"',
|
|
402
|
-
new_string: 'const y = \\"new\\nval\\\\"content\\\\"',
|
|
403
|
-
};
|
|
404
|
-
const expectedFinalNewString = 'const y = "new\nval\\"content\\"';
|
|
405
|
-
mockResponses.push({ corrected_target_snippet: currentContent });
|
|
406
|
-
mockResponses.push({ corrected_new_string: expectedFinalNewString });
|
|
407
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
408
|
-
expect(mockGenerateJson).toHaveBeenCalledTimes(2);
|
|
409
|
-
expect(result.params.old_string).toBe(currentContent);
|
|
410
|
-
expect(result.params.new_string).toBe(expectedFinalNewString);
|
|
411
|
-
expect(result.occurrences).toBe(1);
|
|
412
|
-
});
|
|
413
|
-
});
|
|
414
|
-
describe('Scenario Group 6: Concurrent Edits', () => {
|
|
415
|
-
it('Test 6.1: should return early if file was modified by another process', async () => {
|
|
416
|
-
const filePath = '/test/file.txt';
|
|
417
|
-
const currentContent = 'This content has been modified by someone else.';
|
|
418
|
-
const originalParams = {
|
|
419
|
-
file_path: filePath,
|
|
420
|
-
old_string: 'nonexistent string',
|
|
421
|
-
new_string: 'some new string',
|
|
422
|
-
};
|
|
423
|
-
const now = Date.now();
|
|
424
|
-
const lastEditTime = now - 5000; // 5 seconds ago
|
|
425
|
-
// Mock the file's modification time to be recent
|
|
426
|
-
vi.spyOn(fs, 'statSync').mockReturnValue({
|
|
427
|
-
mtimeMs: now,
|
|
428
|
-
});
|
|
429
|
-
// Mock the last edit timestamp from our history to be in the past
|
|
430
|
-
const history = [
|
|
431
|
-
{
|
|
432
|
-
role: 'model',
|
|
433
|
-
parts: [
|
|
434
|
-
{
|
|
435
|
-
functionResponse: {
|
|
436
|
-
name: EDIT_TOOL_NAME,
|
|
437
|
-
id: `${EDIT_TOOL_NAME}-${lastEditTime}-123`,
|
|
438
|
-
response: {
|
|
439
|
-
output: {
|
|
440
|
-
llmContent: `Successfully modified file: ${filePath}`,
|
|
441
|
-
},
|
|
442
|
-
},
|
|
443
|
-
},
|
|
444
|
-
},
|
|
445
|
-
],
|
|
446
|
-
},
|
|
447
|
-
];
|
|
448
|
-
mockGeminiClientInstance.getHistory.mockReturnValue(history);
|
|
449
|
-
const result = await ensureCorrectEdit(filePath, currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
450
|
-
expect(result.occurrences).toBe(0);
|
|
451
|
-
expect(result.params).toEqual(originalParams);
|
|
452
|
-
});
|
|
453
|
-
});
|
|
454
|
-
describe('Scenario Group 7: Trimming with Newline Preservation', () => {
|
|
455
|
-
it('Test 7.1: should preserve trailing newlines in new_string when trimming is applied', async () => {
|
|
456
|
-
const currentContent = ' find me'; // Matches old_string initially
|
|
457
|
-
const originalParams = {
|
|
458
|
-
file_path: '/test/file.txt',
|
|
459
|
-
old_string: ' find me', // Matches, but has whitespace to trim
|
|
460
|
-
new_string: ' replaced\n\n', // Needs trimming but preserve newlines
|
|
461
|
-
};
|
|
462
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
463
|
-
// old_string should be trimmed to 'find me' because 'find me' also exists uniquely in ' find me'
|
|
464
|
-
expect(result.params.old_string).toBe('find me');
|
|
465
|
-
// new_string should be trimmed of spaces but keep ALL newlines
|
|
466
|
-
expect(result.params.new_string).toBe('replaced\n\n');
|
|
467
|
-
expect(result.occurrences).toBe(1);
|
|
468
|
-
});
|
|
469
|
-
it('Test 7.2: should handle trailing newlines separated by spaces (regression fix)', async () => {
|
|
470
|
-
const currentContent = 'find me '; // Matches old_string initially
|
|
471
|
-
const originalParams = {
|
|
472
|
-
file_path: '/test/file.txt',
|
|
473
|
-
old_string: 'find me ', // Trailing space
|
|
474
|
-
new_string: 'replaced \n \n', // Trailing newlines with spaces
|
|
475
|
-
};
|
|
476
|
-
const result = await ensureCorrectEdit('/test/file.txt', currentContent, originalParams, mockGeminiClientInstance, mockBaseLlmClientInstance, abortSignal, false);
|
|
477
|
-
expect(result.params.old_string).toBe('find me');
|
|
478
|
-
// Should capture both newlines and join them, stripping the space between
|
|
479
|
-
expect(result.params.new_string).toBe('replaced\n\n');
|
|
480
|
-
expect(result.occurrences).toBe(1);
|
|
481
|
-
});
|
|
482
|
-
});
|
|
483
|
-
});
|
|
484
64
|
describe('ensureCorrectFileContent', () => {
|
|
485
65
|
let mockBaseLlmClientInstance;
|
|
486
66
|
const abortSignal = new AbortController().signal;
|
|
@@ -557,6 +137,22 @@ describe('editCorrector', () => {
|
|
|
557
137
|
const result = await ensureCorrectFileContent(content, mockBaseLlmClientInstance, abortSignal, false);
|
|
558
138
|
expect(result).toBe(correctedContent);
|
|
559
139
|
});
|
|
140
|
+
it('should return unescaped content when LLM is disabled and aggressiveUnescape is true', async () => {
|
|
141
|
+
const content = 'LaTeX command \\\\title{Example}';
|
|
142
|
+
// unescapeStringForGeminiBug would change \\\\title to \title (literal tab and "itle")
|
|
143
|
+
const expected = 'LaTeX command \title{Example}';
|
|
144
|
+
const result = await ensureCorrectFileContent(content, mockBaseLlmClientInstance, abortSignal, true, // disableLLMCorrection
|
|
145
|
+
true);
|
|
146
|
+
expect(result).toBe(expected);
|
|
147
|
+
expect(mockGenerateJson).not.toHaveBeenCalled();
|
|
148
|
+
});
|
|
149
|
+
it('should return original content when LLM is disabled and aggressiveUnescape is false', async () => {
|
|
150
|
+
const content = 'LaTeX command \\\\title{Example}';
|
|
151
|
+
const result = await ensureCorrectFileContent(content, mockBaseLlmClientInstance, abortSignal, true, // disableLLMCorrection
|
|
152
|
+
false);
|
|
153
|
+
expect(result).toBe(content);
|
|
154
|
+
expect(mockGenerateJson).not.toHaveBeenCalled();
|
|
155
|
+
});
|
|
560
156
|
});
|
|
561
157
|
});
|
|
562
158
|
//# sourceMappingURL=editCorrector.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editCorrector.test.js","sourceRoot":"","sources":["../../../src/utils/editCorrector.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"editCorrector.test.js","sourceRoot":"","sources":["../../../src/utils/editCorrector.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envExpansion.js","sourceRoot":"","sources":["../../../src/utils/envExpansion.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"envExpansion.js","sourceRoot":"","sources":["../../../src/utils/envExpansion.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAA2B,MAAM,eAAe,CAAC;AAEhE;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,aAAa,CAC3B,GAAW,EACX,GAAuC;IAEvC,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IAErB,gGAAgG;IAChG,sFAAsF;IACtF,iFAAiF;IACjF,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;IAC/C,MAAM,YAAY,GAAG,SAAS;QAC5B,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACvD,CAAC,CAAC,GAAG,CAAC;IAER,6DAA6D;IAC7D,wFAAwF;IACxF,2EAA2E;IAC3E,MAAM,QAAQ,GAAG,wBAAwB,CAAC;IAE1C,uFAAuF;IACvF,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAuB,MAAM,CAAC;QACxC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE;QACpC,UAAU;KACX,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzC,CAAC"}
|
package/dist/src/utils/errors.js
CHANGED
|
@@ -19,6 +19,13 @@ export function getErrorMessage(error) {
|
|
|
19
19
|
if (friendlyError instanceof Error) {
|
|
20
20
|
return friendlyError.message;
|
|
21
21
|
}
|
|
22
|
+
if (typeof friendlyError === 'object' &&
|
|
23
|
+
friendlyError !== null &&
|
|
24
|
+
'message' in friendlyError &&
|
|
25
|
+
typeof friendlyError.message === 'string') {
|
|
26
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
|
|
27
|
+
return friendlyError.message;
|
|
28
|
+
}
|
|
22
29
|
try {
|
|
23
30
|
return String(friendlyError);
|
|
24
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from 'vitest';
|
|
7
|
+
import { getErrorMessage } from './errors.js';
|
|
8
|
+
import {} from './httpErrors.js';
|
|
9
|
+
describe('getErrorMessage with timeout errors', () => {
|
|
10
|
+
it('should handle undici HeadersTimeoutError correctly', () => {
|
|
11
|
+
// Simulate what undici might throw if it's not a proper Error instance
|
|
12
|
+
// or has a specific code.
|
|
13
|
+
const timeoutError = {
|
|
14
|
+
name: 'HeadersTimeoutError',
|
|
15
|
+
code: 'UND_ERR_HEADERS_TIMEOUT',
|
|
16
|
+
message: 'Headers timeout error',
|
|
17
|
+
};
|
|
18
|
+
// If it's a plain object, getErrorMessage might struggle if it expects an Error
|
|
19
|
+
const message = getErrorMessage(timeoutError);
|
|
20
|
+
// Based on existing implementation:
|
|
21
|
+
// friendlyError = toFriendlyError(timeoutError) -> returns timeoutError
|
|
22
|
+
// if (friendlyError instanceof Error) -> false
|
|
23
|
+
// return String(friendlyError) -> "[object Object]"
|
|
24
|
+
expect(message).toBe('Headers timeout error');
|
|
25
|
+
});
|
|
26
|
+
it('should handle undici HeadersTimeoutError as an Error instance', () => {
|
|
27
|
+
const error = new Error('Headers timeout error');
|
|
28
|
+
error.name = 'HeadersTimeoutError';
|
|
29
|
+
error.status = 504; // simulate status for test
|
|
30
|
+
error.code = 'UND_ERR_HEADERS_TIMEOUT';
|
|
31
|
+
const message = getErrorMessage(error);
|
|
32
|
+
expect(message).toBe('Headers timeout error');
|
|
33
|
+
});
|
|
34
|
+
it('should return String representation for objects without a message property', () => {
|
|
35
|
+
const error = { some: 'other', object: 123 };
|
|
36
|
+
const message = getErrorMessage(error);
|
|
37
|
+
expect(message).toBe('[object Object]');
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
//# sourceMappingURL=errors_timeout.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors_timeout.test.js","sourceRoot":"","sources":["../../../src/utils/errors_timeout.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAkB,MAAM,iBAAiB,CAAC;AAEjD,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACnD,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,uEAAuE;QACvE,0BAA0B;QAC1B,MAAM,YAAY,GAAG;YACnB,IAAI,EAAE,qBAAqB;YAC3B,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE,uBAAuB;SACjC,CAAC;QAEF,gFAAgF;QAChF,MAAM,OAAO,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;QAC9C,oCAAoC;QACpC,wEAAwE;QACxE,+CAA+C;QAC/C,oDAAoD;QAEpD,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAChD,KAAmB,CAAC,IAAI,GAAG,qBAAqB,CAAC;QACjD,KAAmB,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,2BAA2B;QAC7D,KAAuC,CAAC,IAAI,GAAG,yBAAyB,CAAC;QAE1E,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|