@vybestack/llxprt-code-core 0.1.17 → 0.1.18-nightly.250808.f9b79d74
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/src/config/config.alwaysAllow.test.d.ts +6 -0
- package/dist/src/config/config.alwaysAllow.test.js +84 -0
- package/dist/src/config/config.alwaysAllow.test.js.map +1 -0
- package/dist/src/config/config.d.ts +13 -0
- package/dist/src/config/config.js +30 -2
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/core/client.d.ts +9 -4
- package/dist/src/core/client.js +44 -88
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +1 -1
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +1 -1
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +19 -7
- package/dist/src/core/coreToolScheduler.js +124 -19
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +31 -37
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +4 -0
- package/dist/src/core/geminiChat.js +41 -4
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.js +4 -1
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +8 -31
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/subagent.d.ts +230 -0
- package/dist/src/core/subagent.js +453 -0
- package/dist/src/core/subagent.js.map +1 -0
- package/dist/src/core/subagent.test.d.ts +6 -0
- package/dist/src/core/subagent.test.js +519 -0
- package/dist/src/core/subagent.test.js.map +1 -0
- package/dist/src/hooks/tool-render-suppression-hook.d.ts +16 -0
- package/dist/src/hooks/tool-render-suppression-hook.js +26 -0
- package/dist/src/hooks/tool-render-suppression-hook.js.map +1 -0
- package/dist/src/hooks/tool-render-suppression-hook.test.d.ts +6 -0
- package/dist/src/hooks/tool-render-suppression-hook.test.js +59 -0
- package/dist/src/hooks/tool-render-suppression-hook.test.js.map +1 -0
- package/dist/src/ide/ide-client.d.ts +21 -0
- package/dist/src/ide/ide-client.js +107 -1
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ideContext.d.ts +127 -32
- package/dist/src/ide/ideContext.js +45 -0
- package/dist/src/ide/ideContext.js.map +1 -1
- package/dist/src/index.d.ts +4 -0
- package/dist/src/index.js +4 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/integration-tests/todo-system.test.js +38 -602
- package/dist/src/integration-tests/todo-system.test.js.map +1 -1
- package/dist/src/mcp/oauth-provider.d.ts +1 -0
- package/dist/src/mcp/oauth-provider.js +14 -1
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +87 -6
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/prompts/prompt-registry.d.ts +8 -0
- package/dist/src/prompts/prompt-registry.js +16 -0
- package/dist/src/prompts/prompt-registry.js.map +1 -1
- package/dist/src/providers/gemini/GeminiProvider.js +5 -5
- package/dist/src/providers/gemini/GeminiProvider.js.map +1 -1
- package/dist/src/providers/openai/OpenAIProvider.integration.test.js +1 -1
- package/dist/src/providers/openai/OpenAIProvider.integration.test.js.map +1 -1
- package/dist/src/providers/openai/OpenAIProvider.js +8 -1
- package/dist/src/providers/openai/OpenAIProvider.js.map +1 -1
- package/dist/src/providers/openai/OpenAIProvider.test.js +106 -0
- package/dist/src/providers/openai/OpenAIProvider.test.js.map +1 -1
- package/dist/src/providers/types/IProviderConfig.d.ts +5 -0
- package/dist/src/services/loopDetectionService.js +2 -4
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +29 -5
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +8 -0
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/services/todo-context-tracker.d.ts +31 -0
- package/dist/src/services/todo-context-tracker.js +45 -0
- package/dist/src/services/todo-context-tracker.js.map +1 -0
- package/dist/src/services/tool-call-tracker-service.d.ts +52 -0
- package/dist/src/services/tool-call-tracker-service.js +170 -0
- package/dist/src/services/tool-call-tracker-service.js.map +1 -0
- package/dist/src/services/tool-call-tracker-service.test.d.ts +6 -0
- package/dist/src/services/tool-call-tracker-service.test.js +99 -0
- package/dist/src/services/tool-call-tracker-service.test.js.map +1 -0
- package/dist/src/telemetry/loggers.test.circular.js +7 -2
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +5 -1
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +1 -1
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +2 -1
- package/dist/src/telemetry/types.js +3 -1
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +2 -0
- package/dist/src/telemetry/uiTelemetry.js +2 -0
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +11 -1
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/tools.d.ts +23 -0
- package/dist/src/test-utils/tools.js +41 -0
- package/dist/src/test-utils/tools.js.map +1 -0
- package/dist/src/tools/edit.d.ts +2 -2
- package/dist/src/tools/edit.js +18 -0
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +48 -0
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +4 -0
- package/dist/src/tools/glob.js +31 -5
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/grep.d.ts +4 -0
- package/dist/src/tools/grep.js +22 -5
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/ls.d.ts +4 -0
- package/dist/src/tools/ls.js +30 -5
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +10 -0
- package/dist/src/tools/mcp-client.js +59 -0
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +294 -1
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.js +104 -45
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +280 -2
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +2 -2
- package/dist/src/tools/memoryTool.js +1 -0
- package/dist/src/tools/memoryTool.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 +12 -12
- 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 +59 -46
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +201 -126
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.js +8 -2
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +16 -0
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.js +14 -2
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/todo-events.d.ts +22 -0
- package/dist/src/tools/todo-events.js +24 -0
- package/dist/src/tools/todo-events.js.map +1 -0
- package/dist/src/tools/todo-read.js.map +1 -1
- package/dist/src/tools/todo-schemas.d.ts +232 -4
- package/dist/src/tools/todo-schemas.js +13 -0
- package/dist/src/tools/todo-schemas.js.map +1 -1
- package/dist/src/tools/todo-schemas.test.js +190 -1
- package/dist/src/tools/todo-schemas.test.js.map +1 -1
- package/dist/src/tools/todo-store.d.ts +1 -4
- package/dist/src/tools/todo-store.js +41 -40
- package/dist/src/tools/todo-store.js.map +1 -1
- package/dist/src/tools/todo-store.test.js +34 -40
- package/dist/src/tools/todo-store.test.js.map +1 -1
- package/dist/src/tools/todo-write.d.ts +1 -1
- package/dist/src/tools/todo-write.js +84 -47
- package/dist/src/tools/todo-write.js.map +1 -1
- package/dist/src/tools/todo-write.test.js +23 -9
- package/dist/src/tools/todo-write.test.js.map +1 -1
- package/dist/src/tools/tool-context.d.ts +2 -0
- package/dist/src/tools/tool-registry.d.ts +13 -6
- package/dist/src/tools/tool-registry.js +28 -11
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +7 -20
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +122 -39
- package/dist/src/tools/tools.js +165 -10
- 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 +117 -0
- package/dist/src/tools/tools.test.js.map +1 -0
- package/dist/src/tools/write-file.d.ts +2 -2
- package/dist/src/tools/write-file.js +16 -0
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +20 -3
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/types/modelParams.d.ts +2 -0
- package/dist/src/utils/editor.d.ts +1 -1
- package/dist/src/utils/editor.js +13 -5
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +38 -6
- 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 +139 -0
- package/dist/src/utils/environmentContext.test.js.map +1 -0
- package/dist/src/utils/fileUtils.js +7 -14
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +18 -4
- 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/fileSearch.d.ts +80 -0
- package/dist/src/utils/filesearch/fileSearch.js +233 -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 +654 -0
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -0
- package/dist/src/utils/filesearch/ignore.d.ts +35 -0
- package/dist/src/utils/filesearch/ignore.js +81 -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 +57 -0
- package/dist/src/utils/filesearch/ignore.test.js.map +1 -0
- package/dist/src/utils/filesearch/result-cache.d.ts +34 -0
- package/dist/src/utils/filesearch/result-cache.js +61 -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 +47 -0
- package/dist/src/utils/filesearch/result-cache.test.js.map +1 -0
- package/dist/src/utils/memoryDiscovery.d.ts +1 -1
- package/dist/src/utils/memoryDiscovery.js +22 -7
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +30 -71
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/shell-utils.js +14 -2
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.shellReplacement.test.d.ts +6 -0
- package/dist/src/utils/shell-utils.shellReplacement.test.js +149 -0
- package/dist/src/utils/shell-utils.shellReplacement.test.js.map +1 -0
- package/dist/src/utils/toolOutputLimiter.js +5 -1
- package/dist/src/utils/toolOutputLimiter.js.map +1 -1
- package/dist/src/utils/workspaceContext.d.ts +4 -0
- package/dist/src/utils/workspaceContext.js +33 -0
- package/dist/src/utils/workspaceContext.js.map +1 -1
- package/package.json +6 -1
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Vybestack LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
|
7
|
+
import { ToolRenderSuppressionHook } from '../hooks/tool-render-suppression-hook.js';
|
|
8
|
+
import { TodoContextTracker } from '../services/todo-context-tracker.js';
|
|
9
|
+
import { Config } from '../config/config.js';
|
|
10
|
+
// Mock Config class
|
|
11
|
+
vi.mock('../config/config.js', () => ({
|
|
12
|
+
Config: vi.fn().mockImplementation((params) => ({
|
|
13
|
+
getSessionId: vi
|
|
14
|
+
.fn()
|
|
15
|
+
.mockReturnValue(params.sessionId || 'default-session'),
|
|
16
|
+
})),
|
|
17
|
+
}));
|
|
18
|
+
describe('ToolRenderSuppressionHook', () => {
|
|
19
|
+
const sessionId = 'test-session';
|
|
20
|
+
const todoId = 'test-todo';
|
|
21
|
+
beforeEach(() => {
|
|
22
|
+
// Reset the context tracker
|
|
23
|
+
const contextTracker = TodoContextTracker.forSession(sessionId);
|
|
24
|
+
contextTracker.clearActiveTodo();
|
|
25
|
+
});
|
|
26
|
+
it('should suppress rendering when there is an active todo', () => {
|
|
27
|
+
// Set up the context tracker with an active todo
|
|
28
|
+
const contextTracker = TodoContextTracker.forSession(sessionId);
|
|
29
|
+
contextTracker.setActiveTodo(todoId);
|
|
30
|
+
// Create a mock config
|
|
31
|
+
const config = new Config({
|
|
32
|
+
sessionId,
|
|
33
|
+
targetDir: '/test',
|
|
34
|
+
debugMode: false,
|
|
35
|
+
cwd: '/test',
|
|
36
|
+
model: 'test-model',
|
|
37
|
+
});
|
|
38
|
+
// Check if rendering should be suppressed
|
|
39
|
+
const shouldSuppress = ToolRenderSuppressionHook.shouldSuppressToolCallRender(config);
|
|
40
|
+
expect(shouldSuppress).toBe(true);
|
|
41
|
+
});
|
|
42
|
+
it('should not suppress rendering when there is no active todo', () => {
|
|
43
|
+
// Ensure there is no active todo
|
|
44
|
+
const contextTracker = TodoContextTracker.forSession(sessionId);
|
|
45
|
+
contextTracker.clearActiveTodo();
|
|
46
|
+
// Create a mock config
|
|
47
|
+
const config = new Config({
|
|
48
|
+
sessionId,
|
|
49
|
+
targetDir: '/test',
|
|
50
|
+
debugMode: false,
|
|
51
|
+
cwd: '/test',
|
|
52
|
+
model: 'test-model',
|
|
53
|
+
});
|
|
54
|
+
// Check if rendering should be suppressed
|
|
55
|
+
const shouldSuppress = ToolRenderSuppressionHook.shouldSuppressToolCallRender(config);
|
|
56
|
+
expect(shouldSuppress).toBe(false);
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
//# sourceMappingURL=tool-render-suppression-hook.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-render-suppression-hook.test.js","sourceRoot":"","sources":["../../../src/hooks/tool-render-suppression-hook.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAE/D,oBAAoB;AACpB,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,YAAY,EAAE,EAAE;aACb,EAAE,EAAE;aACJ,eAAe,CAAC,MAAM,CAAC,SAAS,IAAI,iBAAiB,CAAC;KAC1D,CAAC,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,MAAM,SAAS,GAAG,cAAc,CAAC;IACjC,MAAM,MAAM,GAAG,WAAW,CAAC;IAE3B,UAAU,CAAC,GAAG,EAAE;QACd,4BAA4B;QAC5B,MAAM,cAAc,GAAG,kBAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChE,cAAc,CAAC,eAAe,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,iDAAiD;QACjD,MAAM,cAAc,GAAG,kBAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChE,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAErC,uBAAuB;QACvB,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;YACxB,SAAS;YACT,SAAS,EAAE,OAAO;YAClB,SAAS,EAAE,KAAK;YAChB,GAAG,EAAE,OAAO;YACZ,KAAK,EAAE,YAAY;SACA,CAAC,CAAC;QAEvB,0CAA0C;QAC1C,MAAM,cAAc,GAClB,yBAAyB,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;QAEjE,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,iCAAiC;QACjC,MAAM,cAAc,GAAG,kBAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAChE,cAAc,CAAC,eAAe,EAAE,CAAC;QAEjC,uBAAuB;QACvB,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;YACxB,SAAS;YACT,SAAS,EAAE,OAAO;YAClB,SAAS,EAAE,KAAK;YAChB,GAAG,EAAE,OAAO;YACZ,KAAK,EAAE,YAAY;SACA,CAAC,CAAC;QAEvB,0CAA0C;QAC1C,MAAM,cAAc,GAClB,yBAAyB,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;QAEjE,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { DetectedIde } from '../ide/detect-ide.js';
|
|
7
|
+
import { DiffUpdateResult } from '../ide/ideContext.js';
|
|
7
8
|
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
8
9
|
export type IDEConnectionState = {
|
|
9
10
|
status: IDEConnectionStatus;
|
|
@@ -23,8 +24,28 @@ export declare class IdeClient {
|
|
|
23
24
|
private static instance;
|
|
24
25
|
private readonly currentIde;
|
|
25
26
|
private readonly currentIdeDisplayName;
|
|
27
|
+
private diffResponses;
|
|
26
28
|
constructor(ideMode: boolean);
|
|
27
29
|
static getInstance(ideMode: boolean): IdeClient;
|
|
30
|
+
connect(): Promise<void>;
|
|
31
|
+
/**
|
|
32
|
+
* A diff is accepted with any modifications if the user performs one of the
|
|
33
|
+
* following actions:
|
|
34
|
+
* - Clicks the checkbox icon in the IDE to accept
|
|
35
|
+
* - Runs `command+shift+p` > "LLxprt Code: Accept Diff in IDE" to accept
|
|
36
|
+
* - Selects "accept" in the CLI UI
|
|
37
|
+
* - Saves the file via `ctrl/command+s`
|
|
38
|
+
*
|
|
39
|
+
* A diff is rejected if the user performs one of the following actions:
|
|
40
|
+
* - Clicks the "x" icon in the IDE
|
|
41
|
+
* - Runs "LLxprt Code: Close Diff in IDE"
|
|
42
|
+
* - Selects "no" in the CLI UI
|
|
43
|
+
* - Closes the file
|
|
44
|
+
*/
|
|
45
|
+
openDiff(filePath: string, newContent?: string): Promise<DiffUpdateResult>;
|
|
46
|
+
closeDiff(filePath: string): Promise<string | undefined>;
|
|
47
|
+
resolveDiffFromCli(filePath: string, outcome: 'accepted' | 'rejected'): Promise<void>;
|
|
48
|
+
disconnect(): void;
|
|
28
49
|
getCurrentIde(): DetectedIde | undefined;
|
|
29
50
|
getConnectionStatus(): IDEConnectionState;
|
|
30
51
|
private setState;
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { detectIde, getIdeDisplayName, } from '../ide/detect-ide.js';
|
|
7
|
-
import { ideContext, IdeContextNotificationSchema } from '../ide/ideContext.js';
|
|
7
|
+
import { ideContext, IdeContextNotificationSchema, IdeDiffAcceptedNotificationSchema, IdeDiffClosedNotificationSchema, CloseDiffResponseSchema, } from '../ide/ideContext.js';
|
|
8
8
|
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
9
9
|
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
10
10
|
const logger = {
|
|
@@ -28,6 +28,7 @@ export class IdeClient {
|
|
|
28
28
|
static instance;
|
|
29
29
|
currentIde;
|
|
30
30
|
currentIdeDisplayName;
|
|
31
|
+
diffResponses = new Map();
|
|
31
32
|
constructor(ideMode) {
|
|
32
33
|
this.currentIde = detectIde();
|
|
33
34
|
if (this.currentIde) {
|
|
@@ -46,6 +47,89 @@ export class IdeClient {
|
|
|
46
47
|
}
|
|
47
48
|
return IdeClient.instance;
|
|
48
49
|
}
|
|
50
|
+
async connect() {
|
|
51
|
+
this.setState(IDEConnectionStatus.Connecting);
|
|
52
|
+
if (!this.currentIde || !this.currentIdeDisplayName) {
|
|
53
|
+
this.setState(IDEConnectionStatus.Disconnected);
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
if (!this.validateWorkspacePath()) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const port = this.getPortFromEnv();
|
|
60
|
+
if (!port) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
await this.establishConnection(port);
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* A diff is accepted with any modifications if the user performs one of the
|
|
67
|
+
* following actions:
|
|
68
|
+
* - Clicks the checkbox icon in the IDE to accept
|
|
69
|
+
* - Runs `command+shift+p` > "LLxprt Code: Accept Diff in IDE" to accept
|
|
70
|
+
* - Selects "accept" in the CLI UI
|
|
71
|
+
* - Saves the file via `ctrl/command+s`
|
|
72
|
+
*
|
|
73
|
+
* A diff is rejected if the user performs one of the following actions:
|
|
74
|
+
* - Clicks the "x" icon in the IDE
|
|
75
|
+
* - Runs "LLxprt Code: Close Diff in IDE"
|
|
76
|
+
* - Selects "no" in the CLI UI
|
|
77
|
+
* - Closes the file
|
|
78
|
+
*/
|
|
79
|
+
async openDiff(filePath, newContent) {
|
|
80
|
+
return new Promise((resolve, reject) => {
|
|
81
|
+
this.diffResponses.set(filePath, resolve);
|
|
82
|
+
this.client
|
|
83
|
+
?.callTool({
|
|
84
|
+
name: `openDiff`,
|
|
85
|
+
arguments: {
|
|
86
|
+
filePath,
|
|
87
|
+
newContent,
|
|
88
|
+
},
|
|
89
|
+
})
|
|
90
|
+
.catch((err) => {
|
|
91
|
+
logger.debug(`callTool for ${filePath} failed:`, err);
|
|
92
|
+
reject(err);
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
async closeDiff(filePath) {
|
|
97
|
+
try {
|
|
98
|
+
const result = await this.client?.callTool({
|
|
99
|
+
name: `closeDiff`,
|
|
100
|
+
arguments: {
|
|
101
|
+
filePath,
|
|
102
|
+
},
|
|
103
|
+
});
|
|
104
|
+
if (result) {
|
|
105
|
+
const parsed = CloseDiffResponseSchema.parse(result);
|
|
106
|
+
return parsed.content;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
catch (err) {
|
|
110
|
+
logger.debug(`callTool for ${filePath} failed:`, err);
|
|
111
|
+
}
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
// Closes the diff. Instead of waiting for a notification,
|
|
115
|
+
// manually resolves the diff resolver as the desired outcome.
|
|
116
|
+
async resolveDiffFromCli(filePath, outcome) {
|
|
117
|
+
const content = await this.closeDiff(filePath);
|
|
118
|
+
const resolver = this.diffResponses.get(filePath);
|
|
119
|
+
if (resolver) {
|
|
120
|
+
if (outcome === 'accepted') {
|
|
121
|
+
resolver({ status: 'accepted', content });
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
resolver({ status: 'rejected', content: undefined });
|
|
125
|
+
}
|
|
126
|
+
this.diffResponses.delete(filePath);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
disconnect() {
|
|
130
|
+
this.setState(IDEConnectionStatus.Disconnected, 'IDE integration disabled. To enable it again, run /ide enable.');
|
|
131
|
+
this.client?.close();
|
|
132
|
+
}
|
|
49
133
|
getCurrentIde() {
|
|
50
134
|
return this.currentIde;
|
|
51
135
|
}
|
|
@@ -92,6 +176,28 @@ export class IdeClient {
|
|
|
92
176
|
this.client.onclose = () => {
|
|
93
177
|
this.setState(IDEConnectionStatus.Disconnected, 'Connection closed.');
|
|
94
178
|
};
|
|
179
|
+
this.client.setNotificationHandler(IdeDiffAcceptedNotificationSchema, (notification) => {
|
|
180
|
+
const { filePath, content } = notification.params;
|
|
181
|
+
const resolver = this.diffResponses.get(filePath);
|
|
182
|
+
if (resolver) {
|
|
183
|
+
resolver({ status: 'accepted', content });
|
|
184
|
+
this.diffResponses.delete(filePath);
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
logger.debug(`No resolver found for ${filePath}`);
|
|
188
|
+
}
|
|
189
|
+
});
|
|
190
|
+
this.client.setNotificationHandler(IdeDiffClosedNotificationSchema, (notification) => {
|
|
191
|
+
const { filePath } = notification.params;
|
|
192
|
+
const resolver = this.diffResponses.get(filePath);
|
|
193
|
+
if (resolver) {
|
|
194
|
+
resolver({ status: 'rejected', content: undefined });
|
|
195
|
+
this.diffResponses.delete(filePath);
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
logger.debug(`No resolver found for ${filePath}`);
|
|
199
|
+
}
|
|
200
|
+
});
|
|
95
201
|
}
|
|
96
202
|
async reconnect(ideMode) {
|
|
97
203
|
IdeClient.instance = new IdeClient(ideMode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ide-client.js","sourceRoot":"","sources":["../../../src/ide/ide-client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,SAAS,EAET,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"ide-client.js","sourceRoot":"","sources":["../../../src/ide/ide-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,21 +25,21 @@ export declare const FileSchema: z.ZodObject<{
|
|
|
25
25
|
}, "strip", z.ZodTypeAny, {
|
|
26
26
|
path: string;
|
|
27
27
|
timestamp: number;
|
|
28
|
+
isActive?: boolean | undefined;
|
|
29
|
+
selectedText?: string | undefined;
|
|
28
30
|
cursor?: {
|
|
29
31
|
line: number;
|
|
30
32
|
character: number;
|
|
31
33
|
} | undefined;
|
|
32
|
-
isActive?: boolean | undefined;
|
|
33
|
-
selectedText?: string | undefined;
|
|
34
34
|
}, {
|
|
35
35
|
path: string;
|
|
36
36
|
timestamp: number;
|
|
37
|
+
isActive?: boolean | undefined;
|
|
38
|
+
selectedText?: string | undefined;
|
|
37
39
|
cursor?: {
|
|
38
40
|
line: number;
|
|
39
41
|
character: number;
|
|
40
42
|
} | undefined;
|
|
41
|
-
isActive?: boolean | undefined;
|
|
42
|
-
selectedText?: string | undefined;
|
|
43
43
|
}>;
|
|
44
44
|
export type File = z.infer<typeof FileSchema>;
|
|
45
45
|
export declare const IdeContextSchema: z.ZodObject<{
|
|
@@ -62,43 +62,43 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
62
62
|
}, "strip", z.ZodTypeAny, {
|
|
63
63
|
path: string;
|
|
64
64
|
timestamp: number;
|
|
65
|
+
isActive?: boolean | undefined;
|
|
66
|
+
selectedText?: string | undefined;
|
|
65
67
|
cursor?: {
|
|
66
68
|
line: number;
|
|
67
69
|
character: number;
|
|
68
70
|
} | undefined;
|
|
69
|
-
isActive?: boolean | undefined;
|
|
70
|
-
selectedText?: string | undefined;
|
|
71
71
|
}, {
|
|
72
72
|
path: string;
|
|
73
73
|
timestamp: number;
|
|
74
|
+
isActive?: boolean | undefined;
|
|
75
|
+
selectedText?: string | undefined;
|
|
74
76
|
cursor?: {
|
|
75
77
|
line: number;
|
|
76
78
|
character: number;
|
|
77
79
|
} | undefined;
|
|
78
|
-
isActive?: boolean | undefined;
|
|
79
|
-
selectedText?: string | undefined;
|
|
80
80
|
}>, "many">>;
|
|
81
81
|
}, "strip", z.ZodTypeAny, {
|
|
82
82
|
openFiles?: {
|
|
83
83
|
path: string;
|
|
84
84
|
timestamp: number;
|
|
85
|
+
isActive?: boolean | undefined;
|
|
86
|
+
selectedText?: string | undefined;
|
|
85
87
|
cursor?: {
|
|
86
88
|
line: number;
|
|
87
89
|
character: number;
|
|
88
90
|
} | undefined;
|
|
89
|
-
isActive?: boolean | undefined;
|
|
90
|
-
selectedText?: string | undefined;
|
|
91
91
|
}[] | undefined;
|
|
92
92
|
}, {
|
|
93
93
|
openFiles?: {
|
|
94
94
|
path: string;
|
|
95
95
|
timestamp: number;
|
|
96
|
+
isActive?: boolean | undefined;
|
|
97
|
+
selectedText?: string | undefined;
|
|
96
98
|
cursor?: {
|
|
97
99
|
line: number;
|
|
98
100
|
character: number;
|
|
99
101
|
} | undefined;
|
|
100
|
-
isActive?: boolean | undefined;
|
|
101
|
-
selectedText?: string | undefined;
|
|
102
102
|
}[] | undefined;
|
|
103
103
|
}>>;
|
|
104
104
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -106,12 +106,12 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
106
106
|
openFiles?: {
|
|
107
107
|
path: string;
|
|
108
108
|
timestamp: number;
|
|
109
|
+
isActive?: boolean | undefined;
|
|
110
|
+
selectedText?: string | undefined;
|
|
109
111
|
cursor?: {
|
|
110
112
|
line: number;
|
|
111
113
|
character: number;
|
|
112
114
|
} | undefined;
|
|
113
|
-
isActive?: boolean | undefined;
|
|
114
|
-
selectedText?: string | undefined;
|
|
115
115
|
}[] | undefined;
|
|
116
116
|
} | undefined;
|
|
117
117
|
}, {
|
|
@@ -119,12 +119,12 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
119
119
|
openFiles?: {
|
|
120
120
|
path: string;
|
|
121
121
|
timestamp: number;
|
|
122
|
+
isActive?: boolean | undefined;
|
|
123
|
+
selectedText?: string | undefined;
|
|
122
124
|
cursor?: {
|
|
123
125
|
line: number;
|
|
124
126
|
character: number;
|
|
125
127
|
} | undefined;
|
|
126
|
-
isActive?: boolean | undefined;
|
|
127
|
-
selectedText?: string | undefined;
|
|
128
128
|
}[] | undefined;
|
|
129
129
|
} | undefined;
|
|
130
130
|
}>;
|
|
@@ -133,6 +133,7 @@ export type IdeContext = z.infer<typeof IdeContextSchema>;
|
|
|
133
133
|
* Zod schema for validating the 'ide/contextUpdate' notification from the IDE.
|
|
134
134
|
*/
|
|
135
135
|
export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
136
|
+
jsonrpc: z.ZodLiteral<"2.0">;
|
|
136
137
|
method: z.ZodLiteral<"ide/contextUpdate">;
|
|
137
138
|
params: z.ZodObject<{
|
|
138
139
|
workspaceState: z.ZodOptional<z.ZodObject<{
|
|
@@ -154,43 +155,43 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
154
155
|
}, "strip", z.ZodTypeAny, {
|
|
155
156
|
path: string;
|
|
156
157
|
timestamp: number;
|
|
158
|
+
isActive?: boolean | undefined;
|
|
159
|
+
selectedText?: string | undefined;
|
|
157
160
|
cursor?: {
|
|
158
161
|
line: number;
|
|
159
162
|
character: number;
|
|
160
163
|
} | undefined;
|
|
161
|
-
isActive?: boolean | undefined;
|
|
162
|
-
selectedText?: string | undefined;
|
|
163
164
|
}, {
|
|
164
165
|
path: string;
|
|
165
166
|
timestamp: number;
|
|
167
|
+
isActive?: boolean | undefined;
|
|
168
|
+
selectedText?: string | undefined;
|
|
166
169
|
cursor?: {
|
|
167
170
|
line: number;
|
|
168
171
|
character: number;
|
|
169
172
|
} | undefined;
|
|
170
|
-
isActive?: boolean | undefined;
|
|
171
|
-
selectedText?: string | undefined;
|
|
172
173
|
}>, "many">>;
|
|
173
174
|
}, "strip", z.ZodTypeAny, {
|
|
174
175
|
openFiles?: {
|
|
175
176
|
path: string;
|
|
176
177
|
timestamp: number;
|
|
178
|
+
isActive?: boolean | undefined;
|
|
179
|
+
selectedText?: string | undefined;
|
|
177
180
|
cursor?: {
|
|
178
181
|
line: number;
|
|
179
182
|
character: number;
|
|
180
183
|
} | undefined;
|
|
181
|
-
isActive?: boolean | undefined;
|
|
182
|
-
selectedText?: string | undefined;
|
|
183
184
|
}[] | undefined;
|
|
184
185
|
}, {
|
|
185
186
|
openFiles?: {
|
|
186
187
|
path: string;
|
|
187
188
|
timestamp: number;
|
|
189
|
+
isActive?: boolean | undefined;
|
|
190
|
+
selectedText?: string | undefined;
|
|
188
191
|
cursor?: {
|
|
189
192
|
line: number;
|
|
190
193
|
character: number;
|
|
191
194
|
} | undefined;
|
|
192
|
-
isActive?: boolean | undefined;
|
|
193
|
-
selectedText?: string | undefined;
|
|
194
195
|
}[] | undefined;
|
|
195
196
|
}>>;
|
|
196
197
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -198,12 +199,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
198
199
|
openFiles?: {
|
|
199
200
|
path: string;
|
|
200
201
|
timestamp: number;
|
|
202
|
+
isActive?: boolean | undefined;
|
|
203
|
+
selectedText?: string | undefined;
|
|
201
204
|
cursor?: {
|
|
202
205
|
line: number;
|
|
203
206
|
character: number;
|
|
204
207
|
} | undefined;
|
|
205
|
-
isActive?: boolean | undefined;
|
|
206
|
-
selectedText?: string | undefined;
|
|
207
208
|
}[] | undefined;
|
|
208
209
|
} | undefined;
|
|
209
210
|
}, {
|
|
@@ -211,12 +212,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
211
212
|
openFiles?: {
|
|
212
213
|
path: string;
|
|
213
214
|
timestamp: number;
|
|
215
|
+
isActive?: boolean | undefined;
|
|
216
|
+
selectedText?: string | undefined;
|
|
214
217
|
cursor?: {
|
|
215
218
|
line: number;
|
|
216
219
|
character: number;
|
|
217
220
|
} | undefined;
|
|
218
|
-
isActive?: boolean | undefined;
|
|
219
|
-
selectedText?: string | undefined;
|
|
220
221
|
}[] | undefined;
|
|
221
222
|
} | undefined;
|
|
222
223
|
}>;
|
|
@@ -227,15 +228,16 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
227
228
|
openFiles?: {
|
|
228
229
|
path: string;
|
|
229
230
|
timestamp: number;
|
|
231
|
+
isActive?: boolean | undefined;
|
|
232
|
+
selectedText?: string | undefined;
|
|
230
233
|
cursor?: {
|
|
231
234
|
line: number;
|
|
232
235
|
character: number;
|
|
233
236
|
} | undefined;
|
|
234
|
-
isActive?: boolean | undefined;
|
|
235
|
-
selectedText?: string | undefined;
|
|
236
237
|
}[] | undefined;
|
|
237
238
|
} | undefined;
|
|
238
239
|
};
|
|
240
|
+
jsonrpc: "2.0";
|
|
239
241
|
}, {
|
|
240
242
|
method: "ide/contextUpdate";
|
|
241
243
|
params: {
|
|
@@ -243,16 +245,109 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
243
245
|
openFiles?: {
|
|
244
246
|
path: string;
|
|
245
247
|
timestamp: number;
|
|
248
|
+
isActive?: boolean | undefined;
|
|
249
|
+
selectedText?: string | undefined;
|
|
246
250
|
cursor?: {
|
|
247
251
|
line: number;
|
|
248
252
|
character: number;
|
|
249
253
|
} | undefined;
|
|
250
|
-
isActive?: boolean | undefined;
|
|
251
|
-
selectedText?: string | undefined;
|
|
252
254
|
}[] | undefined;
|
|
253
255
|
} | undefined;
|
|
254
256
|
};
|
|
257
|
+
jsonrpc: "2.0";
|
|
258
|
+
}>;
|
|
259
|
+
export declare const IdeDiffAcceptedNotificationSchema: z.ZodObject<{
|
|
260
|
+
jsonrpc: z.ZodLiteral<"2.0">;
|
|
261
|
+
method: z.ZodLiteral<"ide/diffAccepted">;
|
|
262
|
+
params: z.ZodObject<{
|
|
263
|
+
filePath: z.ZodString;
|
|
264
|
+
content: z.ZodString;
|
|
265
|
+
}, "strip", z.ZodTypeAny, {
|
|
266
|
+
filePath: string;
|
|
267
|
+
content: string;
|
|
268
|
+
}, {
|
|
269
|
+
filePath: string;
|
|
270
|
+
content: string;
|
|
271
|
+
}>;
|
|
272
|
+
}, "strip", z.ZodTypeAny, {
|
|
273
|
+
method: "ide/diffAccepted";
|
|
274
|
+
params: {
|
|
275
|
+
filePath: string;
|
|
276
|
+
content: string;
|
|
277
|
+
};
|
|
278
|
+
jsonrpc: "2.0";
|
|
279
|
+
}, {
|
|
280
|
+
method: "ide/diffAccepted";
|
|
281
|
+
params: {
|
|
282
|
+
filePath: string;
|
|
283
|
+
content: string;
|
|
284
|
+
};
|
|
285
|
+
jsonrpc: "2.0";
|
|
255
286
|
}>;
|
|
287
|
+
export declare const IdeDiffClosedNotificationSchema: z.ZodObject<{
|
|
288
|
+
jsonrpc: z.ZodLiteral<"2.0">;
|
|
289
|
+
method: z.ZodLiteral<"ide/diffClosed">;
|
|
290
|
+
params: z.ZodObject<{
|
|
291
|
+
filePath: z.ZodString;
|
|
292
|
+
content: z.ZodOptional<z.ZodString>;
|
|
293
|
+
}, "strip", z.ZodTypeAny, {
|
|
294
|
+
filePath: string;
|
|
295
|
+
content?: string | undefined;
|
|
296
|
+
}, {
|
|
297
|
+
filePath: string;
|
|
298
|
+
content?: string | undefined;
|
|
299
|
+
}>;
|
|
300
|
+
}, "strip", z.ZodTypeAny, {
|
|
301
|
+
method: "ide/diffClosed";
|
|
302
|
+
params: {
|
|
303
|
+
filePath: string;
|
|
304
|
+
content?: string | undefined;
|
|
305
|
+
};
|
|
306
|
+
jsonrpc: "2.0";
|
|
307
|
+
}, {
|
|
308
|
+
method: "ide/diffClosed";
|
|
309
|
+
params: {
|
|
310
|
+
filePath: string;
|
|
311
|
+
content?: string | undefined;
|
|
312
|
+
};
|
|
313
|
+
jsonrpc: "2.0";
|
|
314
|
+
}>;
|
|
315
|
+
export declare const CloseDiffResponseSchema: z.ZodEffects<z.ZodObject<{
|
|
316
|
+
content: z.ZodArray<z.ZodObject<{
|
|
317
|
+
text: z.ZodString;
|
|
318
|
+
type: z.ZodLiteral<"text">;
|
|
319
|
+
}, "strip", z.ZodTypeAny, {
|
|
320
|
+
text: string;
|
|
321
|
+
type: "text";
|
|
322
|
+
}, {
|
|
323
|
+
text: string;
|
|
324
|
+
type: "text";
|
|
325
|
+
}>, "many">;
|
|
326
|
+
}, "strip", z.ZodTypeAny, {
|
|
327
|
+
content: {
|
|
328
|
+
text: string;
|
|
329
|
+
type: "text";
|
|
330
|
+
}[];
|
|
331
|
+
}, {
|
|
332
|
+
content: {
|
|
333
|
+
text: string;
|
|
334
|
+
type: "text";
|
|
335
|
+
}[];
|
|
336
|
+
}>, {
|
|
337
|
+
content?: string | undefined;
|
|
338
|
+
}, {
|
|
339
|
+
content: {
|
|
340
|
+
text: string;
|
|
341
|
+
type: "text";
|
|
342
|
+
}[];
|
|
343
|
+
}>;
|
|
344
|
+
export type DiffUpdateResult = {
|
|
345
|
+
status: 'accepted';
|
|
346
|
+
content?: string;
|
|
347
|
+
} | {
|
|
348
|
+
status: 'rejected';
|
|
349
|
+
content: undefined;
|
|
350
|
+
};
|
|
256
351
|
type IdeContextSubscriber = (ideContext: IdeContext | undefined) => void;
|
|
257
352
|
/**
|
|
258
353
|
* Creates a new store for managing the IDE's context.
|
|
@@ -30,9 +30,54 @@ export const IdeContextSchema = z.object({
|
|
|
30
30
|
* Zod schema for validating the 'ide/contextUpdate' notification from the IDE.
|
|
31
31
|
*/
|
|
32
32
|
export const IdeContextNotificationSchema = z.object({
|
|
33
|
+
jsonrpc: z.literal('2.0'),
|
|
33
34
|
method: z.literal('ide/contextUpdate'),
|
|
34
35
|
params: IdeContextSchema,
|
|
35
36
|
});
|
|
37
|
+
export const IdeDiffAcceptedNotificationSchema = z.object({
|
|
38
|
+
jsonrpc: z.literal('2.0'),
|
|
39
|
+
method: z.literal('ide/diffAccepted'),
|
|
40
|
+
params: z.object({
|
|
41
|
+
filePath: z.string(),
|
|
42
|
+
content: z.string(),
|
|
43
|
+
}),
|
|
44
|
+
});
|
|
45
|
+
export const IdeDiffClosedNotificationSchema = z.object({
|
|
46
|
+
jsonrpc: z.literal('2.0'),
|
|
47
|
+
method: z.literal('ide/diffClosed'),
|
|
48
|
+
params: z.object({
|
|
49
|
+
filePath: z.string(),
|
|
50
|
+
content: z.string().optional(),
|
|
51
|
+
}),
|
|
52
|
+
});
|
|
53
|
+
export const CloseDiffResponseSchema = z
|
|
54
|
+
.object({
|
|
55
|
+
content: z
|
|
56
|
+
.array(z.object({
|
|
57
|
+
text: z.string(),
|
|
58
|
+
type: z.literal('text'),
|
|
59
|
+
}))
|
|
60
|
+
.min(1),
|
|
61
|
+
})
|
|
62
|
+
.transform((val, ctx) => {
|
|
63
|
+
try {
|
|
64
|
+
const parsed = JSON.parse(val.content[0].text);
|
|
65
|
+
const innerSchema = z.object({ content: z.string().optional() });
|
|
66
|
+
const validationResult = innerSchema.safeParse(parsed);
|
|
67
|
+
if (!validationResult.success) {
|
|
68
|
+
validationResult.error.issues.forEach((issue) => ctx.addIssue(issue));
|
|
69
|
+
return z.NEVER;
|
|
70
|
+
}
|
|
71
|
+
return validationResult.data;
|
|
72
|
+
}
|
|
73
|
+
catch (_) {
|
|
74
|
+
ctx.addIssue({
|
|
75
|
+
code: z.ZodIssueCode.custom,
|
|
76
|
+
message: 'Invalid JSON in text content',
|
|
77
|
+
});
|
|
78
|
+
return z.NEVER;
|
|
79
|
+
}
|
|
80
|
+
});
|
|
36
81
|
/**
|
|
37
82
|
* Creates a new store for managing the IDE's context.
|
|
38
83
|
* This factory function encapsulates the state and logic, allowing for the creation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ideContext.js","sourceRoot":"","sources":["../../../src/ide/ideContext.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAChC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,MAAM,EAAE,CAAC;SACN,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,cAAc,EAAE,CAAC;SACd,MAAM,CAAC;QACN,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;KAC1C,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CAAC;AAGH;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC,MAAM,CAAC;IACnD,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC;IACtC,MAAM,EAAE,gBAAgB;CACzB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ideContext.js","sourceRoot":"","sources":["../../../src/ide/ideContext.ts"],"names":[],"mappings":"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"}
|