@vybestack/llxprt-code-core 0.1.19-gamma → 0.1.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +9 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/src/auth/anthropic-device-flow.d.ts +1 -1
- package/dist/src/auth/anthropic-device-flow.js +4 -2
- package/dist/src/auth/anthropic-device-flow.js.map +1 -1
- package/dist/src/code_assist/converter.d.ts +2 -2
- package/dist/src/code_assist/converter.js +1 -1
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/setup.js +49 -15
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/config/config.d.ts +9 -6
- package/dist/src/config/config.js +28 -22
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/core/client.d.ts +8 -3
- package/dist/src/core/client.js +177 -38
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/contentGenerator.js +0 -2
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +0 -1
- package/dist/src/core/coreToolScheduler.js +0 -3
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/geminiChat.js +57 -5
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.d.ts +5 -0
- package/dist/src/core/loggingContentGenerator.js +9 -1
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.js +158 -3
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/prompts.js +19 -2
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/filters/EmojiFilter.d.ts +122 -0
- package/dist/src/filters/EmojiFilter.js +327 -0
- package/dist/src/filters/EmojiFilter.js.map +1 -0
- package/dist/src/ide/detect-ide.d.ts +12 -2
- package/dist/src/ide/detect-ide.js +64 -5
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/ide-client.js +22 -15
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-installer.js +1 -26
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ideContext.d.ts +6 -6
- package/dist/src/index.d.ts +4 -1
- package/dist/src/index.js +4 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.d.ts +0 -1
- package/dist/src/mcp/oauth-provider.js +2 -3
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/prompt-config/defaults/core-defaults.d.ts +1 -1
- package/dist/src/prompt-config/defaults/core-defaults.js +205 -326
- package/dist/src/prompt-config/defaults/core-defaults.js.map +1 -1
- package/dist/src/prompt-config/defaults/core.md +1 -1
- package/dist/src/prompt-config/defaults/provider-defaults.d.ts +1 -1
- package/dist/src/prompt-config/defaults/provider-defaults.js +172 -19
- package/dist/src/prompt-config/defaults/provider-defaults.js.map +1 -1
- package/dist/src/prompt-config/defaults/providers/anthropic/core.md +81 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/glob.md +34 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/list-directory.md +11 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/read-file.md +14 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/read-many-files.md +31 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/replace.md +41 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/run-shell-command.md +32 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/save-memory.md +35 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/search-file-content.md +44 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/todo-write.md +45 -0
- package/dist/src/prompt-config/defaults/providers/anthropic/tools/write-file.md +11 -0
- package/dist/src/prompt-config/defaults/providers/gemini/models/gemini-2.5-flash/core.md +273 -10
- package/dist/src/prompt-config/defaults/providers/gemini/models/gemini-2.5-flash/gemini-2-5-flash/core.md +278 -0
- package/dist/src/prompt-config/defaults/tool-defaults.d.ts +1 -1
- package/dist/src/prompt-config/defaults/tool-defaults.js +184 -75
- package/dist/src/prompt-config/defaults/tool-defaults.js.map +1 -1
- package/dist/src/prompt-config/defaults/tools/read-file.md +1 -1
- package/dist/src/prompt-config/prompt-service.d.ts +1 -1
- package/dist/src/prompt-config/prompt-service.js +5 -3
- package/dist/src/prompt-config/prompt-service.js.map +1 -1
- package/dist/src/providers/BaseProvider.js +1 -1
- package/dist/src/providers/BaseProvider.js.map +1 -1
- package/dist/src/providers/LoggingProviderWrapper.js +0 -12
- package/dist/src/providers/LoggingProviderWrapper.js.map +1 -1
- package/dist/src/providers/ProviderContentGenerator.d.ts +2 -2
- package/dist/src/providers/ProviderContentGenerator.js +5 -3
- package/dist/src/providers/ProviderContentGenerator.js.map +1 -1
- package/dist/src/providers/adapters/GeminiCompatibleWrapper.js +1 -1
- package/dist/src/providers/adapters/GeminiCompatibleWrapper.js.map +1 -1
- package/dist/src/providers/anthropic/AnthropicProvider.d.ts +1 -1
- package/dist/src/providers/anthropic/AnthropicProvider.js +97 -35
- package/dist/src/providers/anthropic/AnthropicProvider.js.map +1 -1
- package/dist/src/providers/gemini/GeminiProvider.d.ts +4 -5
- package/dist/src/providers/gemini/GeminiProvider.js +21 -26
- package/dist/src/providers/gemini/GeminiProvider.js.map +1 -1
- package/dist/src/providers/openai/OpenAIProvider.js +2 -1
- package/dist/src/providers/openai/OpenAIProvider.js.map +1 -1
- package/dist/src/providers/openai/parseResponsesStream.js +6 -6
- package/dist/src/providers/openai/parseResponsesStream.js.map +1 -1
- package/dist/src/services/loopDetectionService.js +4 -5
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/todo-context-tracker.d.ts +1 -1
- package/dist/src/services/todo-context-tracker.js +5 -3
- package/dist/src/services/todo-context-tracker.js.map +1 -1
- package/dist/src/settings/SettingsService.js.map +1 -1
- package/dist/src/settings/types.d.ts +16 -0
- package/dist/src/telemetry/integration.test.circular.js +2 -40
- package/dist/src/telemetry/integration.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.js +0 -20
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/sdk.d.ts +1 -1
- package/dist/src/telemetry/sdk.js +13 -29
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/test-utils/tools.js +2 -2
- package/dist/src/test-utils/tools.js.map +1 -1
- package/dist/src/tools/edit.js +91 -27
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/glob.js +9 -10
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/grep.js +8 -9
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/ls.d.ts +3 -22
- package/dist/src/tools/ls.js +84 -114
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client.js +2 -2
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +6 -13
- package/dist/src/tools/mcp-tool.js +41 -31
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +9 -13
- package/dist/src/tools/memoryTool.js +127 -121
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/read-file.js +7 -8
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +4 -6
- package/dist/src/tools/read-many-files.js +118 -111
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/shell.d.ts +7 -14
- package/dist/src/tools/shell.js +120 -117
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/todo-pause.js +2 -2
- package/dist/src/tools/todo-pause.js.map +1 -1
- package/dist/src/tools/todo-read.js +8 -8
- package/dist/src/tools/todo-read.js.map +1 -1
- package/dist/src/tools/todo-write.js +2 -2
- package/dist/src/tools/todo-write.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +6 -15
- package/dist/src/tools/tool-registry.js +17 -74
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tools.d.ts +20 -19
- package/dist/src/tools/tools.js +21 -20
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +4 -7
- package/dist/src/tools/web-fetch.js +81 -83
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-search.js +26 -9
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +2 -1
- package/dist/src/tools/write-file.js +89 -29
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/utils/editCorrector.js +8 -9
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/errorParsing.d.ts +8 -0
- package/dist/src/utils/errorParsing.js +109 -0
- package/dist/src/utils/errorParsing.js.map +1 -0
- package/dist/src/utils/filesearch/fileSearch.js +1 -1
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/filesearch/result-cache.d.ts +1 -2
- package/dist/src/utils/filesearch/result-cache.js +1 -3
- package/dist/src/utils/filesearch/result-cache.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +1 -1
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +3 -4
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/quotaErrorDetection.d.ts +1 -5
- package/dist/src/utils/quotaErrorDetection.js.map +1 -1
- package/dist/src/utils/schemaValidator.d.ts +1 -9
- package/dist/src/utils/schemaValidator.js +1 -109
- package/dist/src/utils/schemaValidator.js.map +1 -1
- package/package.json +2 -2
- 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/telemetry/clearcut-logger/clearcut-logger.d.ts +0 -48
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +0 -577
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +0 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +0 -58
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +0 -157
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +0 -1
|
@@ -7,47 +7,9 @@
|
|
|
7
7
|
* Integration test to verify circular reference handling with proxy agents
|
|
8
8
|
*/
|
|
9
9
|
import { describe, it, expect } from 'vitest';
|
|
10
|
-
import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
|
|
11
10
|
describe('Circular Reference Integration Test', () => {
|
|
12
|
-
it('
|
|
13
|
-
|
|
14
|
-
const mockConfig = {
|
|
15
|
-
getTelemetryEnabled: () => true,
|
|
16
|
-
getUsageStatisticsEnabled: () => true,
|
|
17
|
-
getSessionId: () => 'test-session',
|
|
18
|
-
getModel: () => 'test-model',
|
|
19
|
-
getEmbeddingModel: () => 'test-embedding',
|
|
20
|
-
getDebugMode: () => false,
|
|
21
|
-
getProxy: () => 'http://proxy.example.com:8080',
|
|
22
|
-
};
|
|
23
|
-
// Simulate the structure that causes the circular reference error
|
|
24
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
25
|
-
const proxyAgentLike = {
|
|
26
|
-
sockets: {},
|
|
27
|
-
options: { proxy: 'http://proxy.example.com:8080' },
|
|
28
|
-
};
|
|
29
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
30
|
-
const socketLike = {
|
|
31
|
-
_httpMessage: {
|
|
32
|
-
agent: proxyAgentLike,
|
|
33
|
-
socket: null,
|
|
34
|
-
},
|
|
35
|
-
};
|
|
36
|
-
socketLike._httpMessage.socket = socketLike; // Create circular reference
|
|
37
|
-
proxyAgentLike.sockets['cloudcode-pa.googleapis.com:443'] = [socketLike];
|
|
38
|
-
// Create an event that would contain this circular structure
|
|
39
|
-
const problematicEvent = {
|
|
40
|
-
error: new Error('Network error'),
|
|
41
|
-
function_args: {
|
|
42
|
-
filePath: '/test/file.txt',
|
|
43
|
-
httpAgent: proxyAgentLike, // This would cause the circular reference
|
|
44
|
-
},
|
|
45
|
-
};
|
|
46
|
-
// Test that ClearcutLogger can handle this
|
|
47
|
-
const logger = ClearcutLogger.getInstance(mockConfig);
|
|
48
|
-
expect(() => {
|
|
49
|
-
logger?.enqueueLogEvent(problematicEvent);
|
|
50
|
-
}).not.toThrow();
|
|
11
|
+
it('placeholder test for removed ClearcutLogger functionality', () => {
|
|
12
|
+
expect(true).toBe(true);
|
|
51
13
|
});
|
|
52
14
|
});
|
|
53
15
|
//# sourceMappingURL=integration.test.circular.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration.test.circular.js","sourceRoot":"","sources":["../../../src/telemetry/integration.test.circular.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"integration.test.circular.js","sourceRoot":"","sources":["../../../src/telemetry/integration.test.circular.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACnD,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
import { logs } from '@opentelemetry/api-logs';
|
|
7
7
|
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
|
|
8
8
|
import { EVENT_API_ERROR, EVENT_API_REQUEST, EVENT_API_RESPONSE, EVENT_CLI_CONFIG, EVENT_TOOL_CALL, EVENT_USER_PROMPT, EVENT_FLASH_FALLBACK, EVENT_NEXT_SPEAKER_CHECK, SERVICE_NAME, EVENT_SLASH_COMMAND, } from './constants.js';
|
|
9
|
-
import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
|
|
10
9
|
import { recordApiErrorMetrics, recordTokenUsageMetrics, recordApiResponseMetrics, recordToolCallMetrics, } from './metrics.js';
|
|
11
10
|
import { isTelemetrySdkInitialized } from './sdk.js';
|
|
12
11
|
import { uiTelemetryService } from './uiTelemetry.js';
|
|
@@ -18,8 +17,6 @@ function getCommonAttributes(config) {
|
|
|
18
17
|
};
|
|
19
18
|
}
|
|
20
19
|
export function logCliConfiguration(config, event) {
|
|
21
|
-
// TELEMETRY REMOVED: Disabled ClearcutLogger to prevent Google data collection
|
|
22
|
-
// ClearcutLogger.getInstance(config)?.logStartSessionEvent(event);
|
|
23
20
|
if (!isTelemetrySdkInitialized())
|
|
24
21
|
return;
|
|
25
22
|
const attributes = {
|
|
@@ -46,8 +43,6 @@ export function logCliConfiguration(config, event) {
|
|
|
46
43
|
logger.emit(logRecord);
|
|
47
44
|
}
|
|
48
45
|
export function logUserPrompt(config, event) {
|
|
49
|
-
// TELEMETRY REMOVED: Disabled ClearcutLogger to prevent Google data collection
|
|
50
|
-
// ClearcutLogger.getInstance(config)?.logNewPromptEvent(event);
|
|
51
46
|
if (!isTelemetrySdkInitialized())
|
|
52
47
|
return;
|
|
53
48
|
const attributes = {
|
|
@@ -76,8 +71,6 @@ export function logToolCall(config, event) {
|
|
|
76
71
|
'event.timestamp': new Date().toISOString(),
|
|
77
72
|
};
|
|
78
73
|
uiTelemetryService.addEvent(uiEvent);
|
|
79
|
-
// TELEMETRY REMOVED: Disabled ClearcutLogger to prevent Google data collection
|
|
80
|
-
// ClearcutLogger.getInstance(config)?.logToolCallEvent(event);
|
|
81
74
|
if (!isTelemetrySdkInitialized()) {
|
|
82
75
|
if (process.env.VERBOSE === 'true') {
|
|
83
76
|
console.log(`[TELEMETRY] SDK not initialized, skipping log`);
|
|
@@ -114,8 +107,6 @@ export function logToolCall(config, event) {
|
|
|
114
107
|
recordToolCallMetrics(config, event.function_name, event.duration_ms, event.success, event.decision);
|
|
115
108
|
}
|
|
116
109
|
export function logApiRequest(config, event) {
|
|
117
|
-
// TELEMETRY REMOVED: Disabled ClearcutLogger to prevent Google data collection
|
|
118
|
-
// ClearcutLogger.getInstance(config)?.logApiRequestEvent(event);
|
|
119
110
|
if (!isTelemetrySdkInitialized())
|
|
120
111
|
return;
|
|
121
112
|
const attributes = {
|
|
@@ -132,8 +123,6 @@ export function logApiRequest(config, event) {
|
|
|
132
123
|
logger.emit(logRecord);
|
|
133
124
|
}
|
|
134
125
|
export function logFlashFallback(config, event) {
|
|
135
|
-
// TELEMETRY REMOVED: ClearcutLogger disabled
|
|
136
|
-
// ClearcutLogger.getInstance(config)?.logFlashFallbackEvent(event);
|
|
137
126
|
if (!isTelemetrySdkInitialized())
|
|
138
127
|
return;
|
|
139
128
|
const attributes = {
|
|
@@ -156,8 +145,6 @@ export function logApiError(config, event) {
|
|
|
156
145
|
'event.timestamp': new Date().toISOString(),
|
|
157
146
|
};
|
|
158
147
|
uiTelemetryService.addEvent(uiEvent);
|
|
159
|
-
// TELEMETRY REMOVED: Disabled ClearcutLogger to prevent Google data collection
|
|
160
|
-
// ClearcutLogger.getInstance(config)?.logApiErrorEvent(event);
|
|
161
148
|
if (!isTelemetrySdkInitialized())
|
|
162
149
|
return;
|
|
163
150
|
const attributes = {
|
|
@@ -190,8 +177,6 @@ export function logApiResponse(config, event) {
|
|
|
190
177
|
'event.timestamp': new Date().toISOString(),
|
|
191
178
|
};
|
|
192
179
|
uiTelemetryService.addEvent(uiEvent);
|
|
193
|
-
// TELEMETRY REMOVED: Disabled ClearcutLogger to prevent Google data collection
|
|
194
|
-
// ClearcutLogger.getInstance(config)?.logApiResponseEvent(event);
|
|
195
180
|
if (!isTelemetrySdkInitialized())
|
|
196
181
|
return;
|
|
197
182
|
const attributes = {
|
|
@@ -225,8 +210,6 @@ export function logApiResponse(config, event) {
|
|
|
225
210
|
recordTokenUsageMetrics(config, event.model, event.tool_token_count, 'tool');
|
|
226
211
|
}
|
|
227
212
|
export function logLoopDetected(config, event) {
|
|
228
|
-
// TELEMETRY REMOVED: ClearcutLogger disabled
|
|
229
|
-
// ClearcutLogger.getInstance(config)?.logLoopDetectedEvent(event);
|
|
230
213
|
if (!isTelemetrySdkInitialized())
|
|
231
214
|
return;
|
|
232
215
|
const attributes = {
|
|
@@ -241,8 +224,6 @@ export function logLoopDetected(config, event) {
|
|
|
241
224
|
logger.emit(logRecord);
|
|
242
225
|
}
|
|
243
226
|
export function logNextSpeakerCheck(config, event) {
|
|
244
|
-
// TELEMETRY REMOVED: ClearcutLogger disabled
|
|
245
|
-
// ClearcutLogger.getInstance(config)?.logNextSpeakerCheck(event);
|
|
246
227
|
if (!isTelemetrySdkInitialized())
|
|
247
228
|
return;
|
|
248
229
|
const attributes = {
|
|
@@ -258,7 +239,6 @@ export function logNextSpeakerCheck(config, event) {
|
|
|
258
239
|
logger.emit(logRecord);
|
|
259
240
|
}
|
|
260
241
|
export function logSlashCommand(config, event) {
|
|
261
|
-
ClearcutLogger.getInstance(config)?.logSlashCommandEvent(event);
|
|
262
242
|
if (!isTelemetrySdkInitialized())
|
|
263
243
|
return;
|
|
264
244
|
const attributes = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggers.js","sourceRoot":"","sources":["../../../src/telemetry/loggers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"loggers.js","sourceRoot":"","sources":["../../../src/telemetry/loggers.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,4 @@
|
|
|
6
6
|
import { Config } from '../config/config.js';
|
|
7
7
|
export declare function isTelemetrySdkInitialized(): boolean;
|
|
8
8
|
export declare function initializeTelemetry(config: Config): void;
|
|
9
|
-
export declare function shutdownTelemetry(): Promise<void>;
|
|
9
|
+
export declare function shutdownTelemetry(config: Config): Promise<void>;
|
|
@@ -5,11 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
// TELEMETRY: Modified to support local file logging only - no data sent to Google
|
|
7
7
|
import { DiagConsoleLogger, DiagLogLevel, diag } from '@opentelemetry/api';
|
|
8
|
-
// TELEMETRY REMOVED: Network exporters disabled to prevent sending data to Google
|
|
9
|
-
// import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
|
|
10
|
-
// import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc';
|
|
11
|
-
// import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
|
|
12
|
-
// import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base';
|
|
13
8
|
import { NodeSDK } from '@opentelemetry/sdk-node';
|
|
14
9
|
import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
|
|
15
10
|
import { Resource } from '@opentelemetry/resources';
|
|
@@ -19,8 +14,6 @@ import { ConsoleMetricExporter, PeriodicExportingMetricReader, } from '@opentele
|
|
|
19
14
|
import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
|
|
20
15
|
import { SERVICE_NAME } from './constants.js';
|
|
21
16
|
import { initializeMetrics } from './metrics.js';
|
|
22
|
-
// TELEMETRY REMOVED: ClearcutLogger disabled to prevent sending data to Google
|
|
23
|
-
// import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
|
|
24
17
|
import { FileLogExporter, FileMetricExporter, FileSpanExporter, } from './file-exporters.js';
|
|
25
18
|
// For troubleshooting, set the log level to DiagLogLevel.DEBUG
|
|
26
19
|
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
|
|
@@ -29,25 +22,6 @@ let telemetryInitialized = false;
|
|
|
29
22
|
export function isTelemetrySdkInitialized() {
|
|
30
23
|
return telemetryInitialized;
|
|
31
24
|
}
|
|
32
|
-
// TELEMETRY REMOVED: Commented out unused function
|
|
33
|
-
// function parseGrpcEndpoint(
|
|
34
|
-
// otlpEndpointSetting: string | undefined,
|
|
35
|
-
// ): string | undefined {
|
|
36
|
-
// if (!otlpEndpointSetting) {
|
|
37
|
-
// return undefined;
|
|
38
|
-
// }
|
|
39
|
-
// // Trim leading/trailing quotes that might come from env variables
|
|
40
|
-
// const trimmedEndpoint = otlpEndpointSetting.replace(/^["']|["']$/g, '');
|
|
41
|
-
// try {
|
|
42
|
-
// const url = new URL(trimmedEndpoint);
|
|
43
|
-
// // OTLP gRPC exporters expect an endpoint in the format scheme://host:port
|
|
44
|
-
// // The `origin` property provides this, stripping any path, query, or hash.
|
|
45
|
-
// return url.origin;
|
|
46
|
-
// } catch (error) {
|
|
47
|
-
// diag.error('Invalid OTLP endpoint URL provided:', trimmedEndpoint, error);
|
|
48
|
-
// return undefined;
|
|
49
|
-
// }
|
|
50
|
-
// }
|
|
51
25
|
export function initializeTelemetry(config) {
|
|
52
26
|
// TELEMETRY: Modified to ONLY support local file logging - network exporters disabled
|
|
53
27
|
if (telemetryInitialized || !config.getTelemetryEnabled()) {
|
|
@@ -103,16 +77,23 @@ export function initializeTelemetry(config) {
|
|
|
103
77
|
});
|
|
104
78
|
try {
|
|
105
79
|
sdk.start();
|
|
80
|
+
if (config.getDebugMode()) {
|
|
81
|
+
console.log('OpenTelemetry SDK started successfully.');
|
|
82
|
+
}
|
|
106
83
|
telemetryInitialized = true;
|
|
107
84
|
initializeMetrics(config);
|
|
108
85
|
}
|
|
109
86
|
catch (error) {
|
|
110
87
|
console.error('Error starting OpenTelemetry SDK:', error);
|
|
111
88
|
}
|
|
112
|
-
process.on('SIGTERM',
|
|
113
|
-
|
|
89
|
+
process.on('SIGTERM', () => {
|
|
90
|
+
shutdownTelemetry(config);
|
|
91
|
+
});
|
|
92
|
+
process.on('SIGINT', () => {
|
|
93
|
+
shutdownTelemetry(config);
|
|
94
|
+
});
|
|
114
95
|
}
|
|
115
|
-
export async function shutdownTelemetry() {
|
|
96
|
+
export async function shutdownTelemetry(config) {
|
|
116
97
|
// TELEMETRY: Shutdown only affects local file writing
|
|
117
98
|
if (!telemetryInitialized || !sdk) {
|
|
118
99
|
return;
|
|
@@ -120,6 +101,9 @@ export async function shutdownTelemetry() {
|
|
|
120
101
|
try {
|
|
121
102
|
// ClearcutLogger is disabled - no data sent to Google
|
|
122
103
|
await sdk.shutdown();
|
|
104
|
+
if (config.getDebugMode()) {
|
|
105
|
+
console.log('OpenTelemetry SDK shut down successfully.');
|
|
106
|
+
}
|
|
123
107
|
}
|
|
124
108
|
catch (error) {
|
|
125
109
|
console.error('Error shutting down SDK:', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../../src/telemetry/sdk.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,kFAAkF;AAClF,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC3E,
|
|
1
|
+
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../../src/telemetry/sdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { vi } from 'vitest';
|
|
7
|
-
import { BaseTool,
|
|
7
|
+
import { BaseTool, Kind, } from '../tools/tools.js';
|
|
8
8
|
import { Type } from '@google/genai';
|
|
9
9
|
/**
|
|
10
10
|
* A highly configurable mock tool for testing purposes.
|
|
@@ -16,7 +16,7 @@ export class MockTool extends BaseTool {
|
|
|
16
16
|
type: Type.OBJECT,
|
|
17
17
|
properties: { param: { type: Type.STRING } },
|
|
18
18
|
}) {
|
|
19
|
-
super(name, displayName ?? name, description,
|
|
19
|
+
super(name, displayName ?? name, description, Kind.Other, params);
|
|
20
20
|
}
|
|
21
21
|
async execute(params, _abortSignal) {
|
|
22
22
|
const result = this.executeFn(params);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/test-utils/tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,QAAQ,
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/test-utils/tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,QAAQ,EAGR,IAAI,GACL,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAU,IAAI,EAAE,MAAM,eAAe,CAAC;AAE7C;;GAEG;AACH,MAAM,OAAO,QAAS,SAAQ,QAAgD;IAC5E,SAAS,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,aAAa,GAAG,KAAK,CAAC;IAEtB,YACE,IAAI,GAAG,WAAW,EAClB,WAAoB,EACpB,WAAW,GAAG,0BAA0B,EACxC,SAAiB;QACf,IAAI,EAAE,IAAI,CAAC,MAAM;QACjB,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE;KAC7C;QAED,KAAK,CAAC,IAAI,EAAE,WAAW,IAAI,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,OAAO,CACX,MAAkC,EAClC,YAAyB;QAEzB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO,CACL,MAAM,IAAI;YACR,UAAU,EAAE,QAAQ,IAAI,CAAC,IAAI,yBAAyB;YACtD,aAAa,EAAE,QAAQ,IAAI,CAAC,IAAI,yBAAyB;SAC1D,CACF,CAAC;IACJ,CAAC;IAEQ,KAAK,CAAC,oBAAoB,CACjC,OAAmC,EACnC,YAAyB;QAEzB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,OAAO;gBACL,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,WAAW,IAAI,CAAC,WAAW,EAAE;gBACpC,OAAO,EAAE,IAAI,CAAC,IAAI;gBAClB,WAAW,EAAE,IAAI,CAAC,IAAI;gBACtB,SAAS,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;aAC1B,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
|
package/dist/src/tools/edit.js
CHANGED
|
@@ -6,9 +6,8 @@
|
|
|
6
6
|
import * as fs from 'fs';
|
|
7
7
|
import * as path from 'path';
|
|
8
8
|
import * as Diff from 'diff';
|
|
9
|
-
import { BaseDeclarativeTool,
|
|
9
|
+
import { BaseDeclarativeTool, Kind, ToolConfirmationOutcome, } from './tools.js';
|
|
10
10
|
import { ToolErrorType } from './tool-error.js';
|
|
11
|
-
import { Type } from '@google/genai';
|
|
12
11
|
import { SchemaValidator } from '../utils/schemaValidator.js';
|
|
13
12
|
import { makeRelative, shortenPath } from '../utils/paths.js';
|
|
14
13
|
import { isNodeError } from '../utils/errors.js';
|
|
@@ -18,6 +17,26 @@ import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
|
|
|
18
17
|
import { ReadFileTool } from './read-file.js';
|
|
19
18
|
import { IDEConnectionStatus } from '../ide/ide-client.js';
|
|
20
19
|
import { getGitStatsService } from '../services/git-stats-service.js';
|
|
20
|
+
import { EmojiFilter } from '../filters/EmojiFilter.js';
|
|
21
|
+
/**
|
|
22
|
+
* Gets emoji filter instance based on configuration
|
|
23
|
+
*/
|
|
24
|
+
function getEmojiFilter(config) {
|
|
25
|
+
// Get emojifilter from ephemeral settings or default to 'auto'
|
|
26
|
+
const mode = config.getEphemeralSetting('emojifilter') || 'auto';
|
|
27
|
+
// Map auto to warn for file operations (we want warnings when filtering files)
|
|
28
|
+
let filterMode;
|
|
29
|
+
if (mode === 'allowed') {
|
|
30
|
+
filterMode = 'allowed';
|
|
31
|
+
}
|
|
32
|
+
else if (mode === 'auto' || mode === 'warn') {
|
|
33
|
+
filterMode = 'warn';
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
filterMode = 'error';
|
|
37
|
+
}
|
|
38
|
+
return new EmojiFilter({ mode: filterMode });
|
|
39
|
+
}
|
|
21
40
|
export function applyReplacement(currentContent, oldString, newString, isNewFile) {
|
|
22
41
|
if (isNewFile) {
|
|
23
42
|
return newString;
|
|
@@ -49,16 +68,41 @@ class EditToolInvocation {
|
|
|
49
68
|
* @throws File system errors if reading the file fails unexpectedly (e.g., permissions)
|
|
50
69
|
*/
|
|
51
70
|
async calculateEdit(params, abortSignal) {
|
|
52
|
-
|
|
71
|
+
// Apply emoji filtering to edit content
|
|
72
|
+
// NOTE: old_string is NOT filtered because it needs to match existing content exactly
|
|
73
|
+
// Only new_string is filtered to remove emojis from the replacement text
|
|
74
|
+
const filter = getEmojiFilter(this.config);
|
|
75
|
+
const newStringResult = filter.filterFileContent(params.new_string, 'edit');
|
|
76
|
+
// Handle blocking in error mode (only check new_string, not old_string)
|
|
77
|
+
if (newStringResult.blocked) {
|
|
78
|
+
return {
|
|
79
|
+
currentContent: null,
|
|
80
|
+
newContent: '',
|
|
81
|
+
occurrences: 0,
|
|
82
|
+
error: {
|
|
83
|
+
display: 'Cannot edit files with emojis in content',
|
|
84
|
+
raw: 'Emoji filtering blocked the edit operation',
|
|
85
|
+
type: ToolErrorType.INVALID_TOOL_PARAMS,
|
|
86
|
+
},
|
|
87
|
+
isNewFile: false,
|
|
88
|
+
filterResult: newStringResult,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
// Use filtered content for the edit (only filter new_string)
|
|
92
|
+
const filteredParams = {
|
|
93
|
+
...params,
|
|
94
|
+
new_string: newStringResult.filtered,
|
|
95
|
+
};
|
|
96
|
+
const expectedReplacements = filteredParams.expected_replacements ?? 1;
|
|
53
97
|
let currentContent = null;
|
|
54
98
|
let fileExists = false;
|
|
55
99
|
let isNewFile = false;
|
|
56
|
-
let finalNewString =
|
|
57
|
-
let finalOldString =
|
|
100
|
+
let finalNewString = filteredParams.new_string;
|
|
101
|
+
let finalOldString = filteredParams.old_string;
|
|
58
102
|
let occurrences = 0;
|
|
59
103
|
let error = undefined;
|
|
60
104
|
try {
|
|
61
|
-
currentContent = fs.readFileSync(
|
|
105
|
+
currentContent = fs.readFileSync(filteredParams.file_path, 'utf8');
|
|
62
106
|
// Normalize line endings to LF for consistent processing.
|
|
63
107
|
currentContent = currentContent.replace(/\r\n/g, '\n');
|
|
64
108
|
fileExists = true;
|
|
@@ -70,7 +114,7 @@ class EditToolInvocation {
|
|
|
70
114
|
}
|
|
71
115
|
fileExists = false;
|
|
72
116
|
}
|
|
73
|
-
if (
|
|
117
|
+
if (filteredParams.old_string === '' && !fileExists) {
|
|
74
118
|
// Creating a new file
|
|
75
119
|
isNewFile = true;
|
|
76
120
|
}
|
|
@@ -78,28 +122,28 @@ class EditToolInvocation {
|
|
|
78
122
|
// Trying to edit a nonexistent file (and old_string is not empty)
|
|
79
123
|
error = {
|
|
80
124
|
display: `File not found. Cannot apply edit. Use an empty old_string to create a new file.`,
|
|
81
|
-
raw: `File not found: ${
|
|
125
|
+
raw: `File not found: ${filteredParams.file_path}`,
|
|
82
126
|
type: ToolErrorType.FILE_NOT_FOUND,
|
|
83
127
|
};
|
|
84
128
|
}
|
|
85
129
|
else if (currentContent !== null) {
|
|
86
130
|
// Editing an existing file
|
|
87
|
-
const correctedEdit = await ensureCorrectEdit(
|
|
131
|
+
const correctedEdit = await ensureCorrectEdit(filteredParams.file_path, currentContent, filteredParams, this.config.getGeminiClient(), abortSignal);
|
|
88
132
|
finalOldString = correctedEdit.params.old_string;
|
|
89
133
|
finalNewString = correctedEdit.params.new_string;
|
|
90
134
|
occurrences = correctedEdit.occurrences;
|
|
91
|
-
if (
|
|
135
|
+
if (filteredParams.old_string === '') {
|
|
92
136
|
// Error: Trying to create a file that already exists
|
|
93
137
|
error = {
|
|
94
138
|
display: `Failed to edit. Attempted to create a file that already exists.`,
|
|
95
|
-
raw: `File already exists, cannot create: ${
|
|
139
|
+
raw: `File already exists, cannot create: ${filteredParams.file_path}`,
|
|
96
140
|
type: ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE,
|
|
97
141
|
};
|
|
98
142
|
}
|
|
99
143
|
else if (occurrences === 0) {
|
|
100
144
|
error = {
|
|
101
145
|
display: `Failed to edit, could not find the string to replace.`,
|
|
102
|
-
raw: `Failed to edit, 0 occurrences found for old_string in ${
|
|
146
|
+
raw: `Failed to edit, 0 occurrences found for old_string in ${filteredParams.file_path}. No edits made. The exact text in old_string was not found. Ensure you're not escaping content incorrectly and check whitespace, indentation, and context. Use ${ReadFileTool.Name} tool to verify.`,
|
|
103
147
|
type: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
|
|
104
148
|
};
|
|
105
149
|
}
|
|
@@ -107,14 +151,14 @@ class EditToolInvocation {
|
|
|
107
151
|
const occurrenceTerm = expectedReplacements === 1 ? 'occurrence' : 'occurrences';
|
|
108
152
|
error = {
|
|
109
153
|
display: `Failed to edit, expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences}.`,
|
|
110
|
-
raw: `Failed to edit, Expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences} for old_string in file: ${
|
|
154
|
+
raw: `Failed to edit, Expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences} for old_string in file: ${filteredParams.file_path}`,
|
|
111
155
|
type: ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
|
|
112
156
|
};
|
|
113
157
|
}
|
|
114
158
|
else if (finalOldString === finalNewString) {
|
|
115
159
|
error = {
|
|
116
160
|
display: `No changes to apply. The old_string and new_string are identical.`,
|
|
117
|
-
raw: `No changes to apply. The old_string and new_string are identical in file: ${
|
|
161
|
+
raw: `No changes to apply. The old_string and new_string are identical in file: ${filteredParams.file_path}`,
|
|
118
162
|
type: ToolErrorType.EDIT_NO_CHANGE,
|
|
119
163
|
};
|
|
120
164
|
}
|
|
@@ -123,7 +167,7 @@ class EditToolInvocation {
|
|
|
123
167
|
// Should not happen if fileExists and no exception was thrown, but defensively:
|
|
124
168
|
error = {
|
|
125
169
|
display: `Failed to read content of file.`,
|
|
126
|
-
raw: `Failed to read content of existing file: ${
|
|
170
|
+
raw: `Failed to read content of existing file: ${filteredParams.file_path}`,
|
|
127
171
|
type: ToolErrorType.READ_CONTENT_FAILURE,
|
|
128
172
|
};
|
|
129
173
|
}
|
|
@@ -134,6 +178,7 @@ class EditToolInvocation {
|
|
|
134
178
|
occurrences,
|
|
135
179
|
error,
|
|
136
180
|
isNewFile,
|
|
181
|
+
filterResult: newStringResult,
|
|
137
182
|
};
|
|
138
183
|
}
|
|
139
184
|
/**
|
|
@@ -157,13 +202,23 @@ class EditToolInvocation {
|
|
|
157
202
|
if (editData.error) {
|
|
158
203
|
return false;
|
|
159
204
|
}
|
|
205
|
+
// Apply emoji filtering to the newContent for preview
|
|
206
|
+
// NOTE: We only filter new_string, not old_string which must match exactly
|
|
207
|
+
const filter = getEmojiFilter(this.config);
|
|
208
|
+
const filterResult = filter.filterFileContent(editData.newContent, 'edit');
|
|
209
|
+
// If blocked in error mode, return false to prevent confirmation
|
|
210
|
+
if (filterResult.blocked) {
|
|
211
|
+
return false;
|
|
212
|
+
}
|
|
213
|
+
const filteredNewContent = typeof filterResult.filtered === 'string'
|
|
214
|
+
? filterResult.filtered
|
|
215
|
+
: editData.newContent;
|
|
160
216
|
const fileName = path.basename(this.params.file_path);
|
|
161
|
-
const fileDiff = Diff.createPatch(fileName, editData.currentContent ?? '',
|
|
217
|
+
const fileDiff = Diff.createPatch(fileName, editData.currentContent ?? '', filteredNewContent, 'Current', 'Proposed', DEFAULT_DIFF_OPTIONS);
|
|
162
218
|
const ideClient = this.config.getIdeClient();
|
|
163
|
-
const ideConfirmation = this.config.
|
|
164
|
-
this.config.getIdeMode() &&
|
|
219
|
+
const ideConfirmation = this.config.getIdeMode() &&
|
|
165
220
|
ideClient?.getConnectionStatus().status === IDEConnectionStatus.Connected
|
|
166
|
-
? ideClient.openDiff(this.params.file_path,
|
|
221
|
+
? ideClient.openDiff(this.params.file_path, filteredNewContent)
|
|
167
222
|
: undefined;
|
|
168
223
|
const confirmationDetails = {
|
|
169
224
|
type: 'edit',
|
|
@@ -172,7 +227,7 @@ class EditToolInvocation {
|
|
|
172
227
|
filePath: this.params.file_path,
|
|
173
228
|
fileDiff,
|
|
174
229
|
originalContent: editData.currentContent,
|
|
175
|
-
newContent:
|
|
230
|
+
newContent: filteredNewContent,
|
|
176
231
|
onConfirm: async (outcome) => {
|
|
177
232
|
if (outcome === ToolConfirmationOutcome.ProceedAlways) {
|
|
178
233
|
this.config.setApprovalMode(ApprovalMode.AUTO_EDIT);
|
|
@@ -186,6 +241,11 @@ class EditToolInvocation {
|
|
|
186
241
|
this.params.new_string = result.content;
|
|
187
242
|
}
|
|
188
243
|
}
|
|
244
|
+
else {
|
|
245
|
+
// Update params.new_string with the filtered content so execute() uses it
|
|
246
|
+
// Keep old_string unchanged as it needs to match exactly
|
|
247
|
+
this.params.new_string = filteredNewContent;
|
|
248
|
+
}
|
|
189
249
|
},
|
|
190
250
|
ideConfirmation,
|
|
191
251
|
};
|
|
@@ -281,6 +341,10 @@ class EditToolInvocation {
|
|
|
281
341
|
if (this.params.modified_by_user) {
|
|
282
342
|
llmSuccessMessageParts.push(`User modified the \`new_string\` content to be: ${this.params.new_string}.`);
|
|
283
343
|
}
|
|
344
|
+
// Add system feedback for emoji filtering if detected
|
|
345
|
+
if (editData.filterResult?.systemFeedback) {
|
|
346
|
+
llmSuccessMessageParts.push(`\n\n<system-reminder>\n${editData.filterResult.systemFeedback}\n</system-reminder>`);
|
|
347
|
+
}
|
|
284
348
|
const result = {
|
|
285
349
|
llmContent: llmSuccessMessageParts.join(' '),
|
|
286
350
|
returnDisplay: displayResult,
|
|
@@ -333,28 +397,28 @@ Expectation for required parameters:
|
|
|
333
397
|
3. \`new_string\` MUST be the exact literal text to replace \`old_string\` with (also including all whitespace, indentation, newlines, and surrounding code etc.). Ensure the resulting code is correct and idiomatic.
|
|
334
398
|
4. NEVER escape \`old_string\` or \`new_string\`, that would break the exact literal text requirement.
|
|
335
399
|
**Important:** If ANY of the above are not satisfied, the tool will fail. CRITICAL for \`old_string\`: Must uniquely identify the single instance to change. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string matches multiple locations, or does not match exactly, the tool will fail.
|
|
336
|
-
**Multiple replacements:** Set \`expected_replacements\` to the number of occurrences you want to replace. The tool will replace ALL occurrences that match \`old_string\` exactly. Ensure the number of replacements matches your expectation.`,
|
|
400
|
+
**Multiple replacements:** Set \`expected_replacements\` to the number of occurrences you want to replace. The tool will replace ALL occurrences that match \`old_string\` exactly. Ensure the number of replacements matches your expectation.`, Kind.Edit, {
|
|
337
401
|
properties: {
|
|
338
402
|
file_path: {
|
|
339
403
|
description: "The absolute path to the file to modify. Must start with '/'.",
|
|
340
|
-
type:
|
|
404
|
+
type: 'string',
|
|
341
405
|
},
|
|
342
406
|
old_string: {
|
|
343
407
|
description: 'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
|
|
344
|
-
type:
|
|
408
|
+
type: 'string',
|
|
345
409
|
},
|
|
346
410
|
new_string: {
|
|
347
411
|
description: 'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
|
|
348
|
-
type:
|
|
412
|
+
type: 'string',
|
|
349
413
|
},
|
|
350
414
|
expected_replacements: {
|
|
351
|
-
type:
|
|
415
|
+
type: 'number',
|
|
352
416
|
description: 'Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.',
|
|
353
417
|
minimum: 1,
|
|
354
418
|
},
|
|
355
419
|
},
|
|
356
420
|
required: ['file_path', 'old_string', 'new_string'],
|
|
357
|
-
type:
|
|
421
|
+
type: 'object',
|
|
358
422
|
});
|
|
359
423
|
this.config = config;
|
|
360
424
|
}
|
|
@@ -364,7 +428,7 @@ Expectation for required parameters:
|
|
|
364
428
|
* @returns Error message string or null if valid
|
|
365
429
|
*/
|
|
366
430
|
validateToolParams(params) {
|
|
367
|
-
const errors = SchemaValidator.validate(this.schema.
|
|
431
|
+
const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
|
|
368
432
|
if (errors) {
|
|
369
433
|
return errors;
|
|
370
434
|
}
|