@google/gemini-cli 0.22.0 → 0.23.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/package.json +3 -2
- package/dist/src/commands/extensions/disable.test.js.map +1 -1
- package/dist/src/commands/extensions/enable.test.js.map +1 -1
- package/dist/src/commands/extensions/link.test.js.map +1 -1
- package/dist/src/commands/extensions/settings.js +2 -2
- package/dist/src/commands/extensions/settings.js.map +1 -1
- package/dist/src/commands/extensions/uninstall.test.js.map +1 -1
- package/dist/src/commands/extensions/validate.js +1 -1
- package/dist/src/commands/extensions/validate.js.map +1 -1
- package/dist/src/commands/mcp/add.test.js +1 -1
- package/dist/src/commands/mcp/add.test.js.map +1 -1
- package/dist/src/config/config.js +12 -3
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension-manager.d.ts +1 -2
- package/dist/src/config/extension-manager.js +6 -6
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension.test.js +4 -4
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/github.js +1 -1
- package/dist/src/config/extensions/github.js.map +1 -1
- package/dist/src/config/extensions/github.test.js +2 -2
- package/dist/src/config/extensions/github.test.js.map +1 -1
- package/dist/src/config/extensions/update.js +1 -1
- package/dist/src/config/extensions/update.js.map +1 -1
- package/dist/src/config/extensions/update.test.js +8 -8
- package/dist/src/config/extensions/update.test.js.map +1 -1
- package/dist/src/config/keyBindings.js +4 -1
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +30 -15
- package/dist/src/config/settingsSchema.js +38 -10
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +11 -11
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/trustedFolders.d.ts +1 -0
- package/dist/src/config/trustedFolders.js +17 -2
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/config/trustedFolders.test.js +38 -0
- package/dist/src/config/trustedFolders.test.js.map +1 -1
- package/dist/src/gemini.js +2 -13
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +20 -8
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/gemini_cleanup.test.js +1 -0
- package/dist/src/gemini_cleanup.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/nonInteractiveCli.js +2 -1
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/test-utils/render.js +1 -0
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/AppContainer.js +4 -2
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/commands/authCommand.js +30 -3
- package/dist/src/ui/commands/authCommand.js.map +1 -1
- package/dist/src/ui/commands/authCommand.test.js +72 -4
- package/dist/src/ui/commands/authCommand.test.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.js +9 -0
- package/dist/src/ui/commands/bugCommand.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.test.js +13 -0
- package/dist/src/ui/commands/bugCommand.test.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.js +11 -19
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.test.js +4 -5
- package/dist/src/ui/commands/chatCommand.test.js.map +1 -1
- package/dist/src/ui/commands/copyCommand.js +1 -1
- package/dist/src/ui/commands/copyCommand.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.js +1 -1
- package/dist/src/ui/commands/hooksCommand.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.test.js +8 -0
- package/dist/src/ui/commands/hooksCommand.test.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +1 -1
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.test.js +1 -1
- package/dist/src/ui/commands/mcpCommand.test.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.js +13 -2
- package/dist/src/ui/commands/memoryCommand.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.test.js +27 -1
- package/dist/src/ui/commands/memoryCommand.test.js.map +1 -1
- package/dist/src/ui/commands/restoreCommand.js +1 -1
- package/dist/src/ui/commands/restoreCommand.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +8 -1
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/Composer.js +3 -1
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.js +1 -1
- package/dist/src/ui/components/FolderTrustDialog.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +4 -1
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +49 -0
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/LogoutConfirmationDialog.d.ts +15 -0
- package/dist/src/ui/components/LogoutConfirmationDialog.js +37 -0
- package/dist/src/ui/components/LogoutConfirmationDialog.js.map +1 -0
- package/dist/src/ui/components/LogoutConfirmationDialog.test.js +59 -0
- package/dist/src/ui/components/LogoutConfirmationDialog.test.js.map +1 -0
- package/dist/src/ui/components/ModelStatsDisplay.js +68 -14
- package/dist/src/ui/components/ModelStatsDisplay.js.map +1 -1
- package/dist/src/ui/components/ModelStatsDisplay.test.js +53 -2
- package/dist/src/ui/components/ModelStatsDisplay.test.js.map +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.js +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.js.map +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.test.js +7 -7
- package/dist/src/ui/components/MultiFolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.js +4 -4
- package/dist/src/ui/components/ShellConfirmationDialog.js.map +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.test.js +4 -4
- package/dist/src/ui/components/ShellConfirmationDialog.test.js.map +1 -1
- package/dist/src/ui/components/Table.d.ts +21 -0
- package/dist/src/ui/components/Table.js +7 -0
- package/dist/src/ui/components/Table.js.map +1 -0
- package/dist/src/ui/components/Table.test.js +53 -0
- package/dist/src/ui/components/Table.test.js.map +1 -0
- package/dist/src/ui/components/ThemeDialog.js +63 -17
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.test.js +65 -0
- package/dist/src/ui/components/ThemeDialog.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +51 -39
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +40 -4
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +45 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.d.ts +4 -1
- package/dist/src/ui/components/shared/RadioButtonSelect.js +11 -10
- package/dist/src/ui/components/shared/RadioButtonSelect.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.js +0 -2
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/views/HooksList.d.ts +2 -0
- package/dist/src/ui/components/views/HooksList.js +5 -3
- package/dist/src/ui/components/views/HooksList.js.map +1 -1
- package/dist/src/ui/constants/tips.js +0 -2
- package/dist/src/ui/constants/tips.js.map +1 -1
- package/dist/src/ui/constants.d.ts +0 -3
- package/dist/src/ui/constants.js +0 -6
- package/dist/src/ui/constants.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +2 -0
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/contexts/VimModeContext.js +1 -1
- package/dist/src/ui/contexts/VimModeContext.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +18 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.test.js +1 -1
- package/dist/src/ui/hooks/useFolderTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +2 -2
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useKittyKeyboardProtocol.js +2 -2
- package/dist/src/ui/hooks/useKittyKeyboardProtocol.js.map +1 -1
- package/dist/src/ui/hooks/usePromptCompletion.js +0 -2
- package/dist/src/ui/hooks/usePromptCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +16 -16
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.js +22 -10
- package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.js +115 -5
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
- package/dist/src/ui/themes/ansi-light.js +1 -1
- package/dist/src/ui/themes/ansi-light.js.map +1 -1
- package/dist/src/ui/themes/ansi.js +1 -1
- package/dist/src/ui/themes/ansi.js.map +1 -1
- package/dist/src/ui/themes/color-utils.d.ts +1 -0
- package/dist/src/ui/themes/color-utils.js +13 -0
- package/dist/src/ui/themes/color-utils.js.map +1 -1
- package/dist/src/ui/themes/color-utils.test.js +20 -1
- package/dist/src/ui/themes/color-utils.test.js.map +1 -1
- package/dist/src/ui/themes/shades-of-purple.js +1 -1
- package/dist/src/ui/themes/shades-of-purple.js.map +1 -1
- package/dist/src/ui/themes/theme-manager.d.ts +5 -0
- package/dist/src/ui/themes/theme-manager.js +7 -0
- package/dist/src/ui/themes/theme-manager.js.map +1 -1
- package/dist/src/ui/themes/theme.d.ts +12 -0
- package/dist/src/ui/themes/theme.js +34 -4
- package/dist/src/ui/themes/theme.js.map +1 -1
- package/dist/src/ui/themes/theme.test.js +23 -0
- package/dist/src/ui/themes/theme.test.js.map +1 -1
- package/dist/src/ui/utils/clipboardUtils.d.ts +2 -2
- package/dist/src/ui/utils/clipboardUtils.js +50 -4
- package/dist/src/ui/utils/clipboardUtils.js.map +1 -1
- package/dist/src/ui/utils/clipboardUtils.test.js +12 -12
- package/dist/src/ui/utils/clipboardUtils.test.js.map +1 -1
- package/dist/src/ui/utils/clipboardUtils.windows.test.js +52 -0
- package/dist/src/ui/utils/clipboardUtils.windows.test.js.map +1 -0
- package/dist/src/ui/utils/terminalCapabilityManager.d.ts +38 -0
- package/dist/src/ui/utils/terminalCapabilityManager.js +190 -0
- package/dist/src/ui/utils/terminalCapabilityManager.js.map +1 -0
- package/dist/src/ui/utils/terminalCapabilityManager.test.d.ts +6 -0
- package/dist/src/ui/utils/terminalCapabilityManager.test.js +136 -0
- package/dist/src/ui/utils/terminalCapabilityManager.test.js.map +1 -0
- package/dist/src/ui/utils/terminalSetup.js +2 -2
- package/dist/src/ui/utils/terminalSetup.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.test.js +4 -2
- package/dist/src/ui/utils/terminalSetup.test.js.map +1 -1
- package/dist/src/utils/processUtils.d.ts +1 -1
- package/dist/src/utils/processUtils.js +1 -1
- package/dist/src/utils/processUtils.js.map +1 -1
- package/dist/src/utils/terminalTheme.d.ts +15 -0
- package/dist/src/utils/terminalTheme.js +50 -0
- package/dist/src/utils/terminalTheme.js.map +1 -0
- package/dist/src/zed-integration/fileSystemService.d.ts +3 -3
- package/dist/src/zed-integration/fileSystemService.js +5 -7
- package/dist/src/zed-integration/fileSystemService.js.map +1 -1
- package/dist/src/zed-integration/fileSystemService.test.js +11 -13
- package/dist/src/zed-integration/fileSystemService.test.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.d.ts +5 -5
- package/dist/src/zed-integration/zedIntegration.js +37 -17
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.test.js +16 -17
- package/dist/src/zed-integration/zedIntegration.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -3
- package/dist/src/ui/utils/kittyProtocolDetector.d.ts +0 -17
- package/dist/src/ui/utils/kittyProtocolDetector.js +0 -111
- package/dist/src/ui/utils/kittyProtocolDetector.js.map +0 -1
- package/dist/src/ui/utils/kittyProtocolDetector.test.js +0 -113
- package/dist/src/ui/utils/kittyProtocolDetector.test.js.map +0 -1
- package/dist/src/zed-integration/acp.d.ts +0 -41
- package/dist/src/zed-integration/acp.js +0 -72
- package/dist/src/zed-integration/acp.js.map +0 -1
- package/dist/src/zed-integration/acp.test.js +0 -214
- package/dist/src/zed-integration/acp.test.js.map +0 -1
- package/dist/src/zed-integration/connection.d.ts +0 -28
- package/dist/src/zed-integration/connection.js +0 -165
- package/dist/src/zed-integration/connection.js.map +0 -1
- package/dist/src/zed-integration/connection.test.js +0 -175
- package/dist/src/zed-integration/connection.test.js.map +0 -1
- package/dist/src/zed-integration/schema.d.ts +0 -11792
- package/dist/src/zed-integration/schema.js +0 -311
- package/dist/src/zed-integration/schema.js.map +0 -1
- /package/dist/src/ui/{utils/kittyProtocolDetector.test.d.ts → components/LogoutConfirmationDialog.test.d.ts} +0 -0
- /package/dist/src/{zed-integration/acp.test.d.ts → ui/components/Table.test.d.ts} +0 -0
- /package/dist/src/{zed-integration/connection.test.d.ts → ui/utils/clipboardUtils.windows.test.d.ts} +0 -0
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright 2025 Google LLC
|
|
4
|
-
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
-
*/
|
|
6
|
-
import { type Result } from './schema.js';
|
|
7
|
-
import type { WritableStream, ReadableStream } from 'node:stream/web';
|
|
8
|
-
export declare class RequestError extends Error {
|
|
9
|
-
code: number;
|
|
10
|
-
data?: {
|
|
11
|
-
details?: string;
|
|
12
|
-
};
|
|
13
|
-
constructor(code: number, message: string, details?: string);
|
|
14
|
-
static parseError(details?: string): RequestError;
|
|
15
|
-
static invalidRequest(details?: string): RequestError;
|
|
16
|
-
static methodNotFound(details?: string): RequestError;
|
|
17
|
-
static invalidParams(details?: string): RequestError;
|
|
18
|
-
static internalError(details?: string): RequestError;
|
|
19
|
-
static authRequired(details?: string): RequestError;
|
|
20
|
-
toResult<T>(): Result<T>;
|
|
21
|
-
}
|
|
22
|
-
export type MethodHandler = (method: string, params: unknown) => Promise<unknown>;
|
|
23
|
-
export declare class Connection {
|
|
24
|
-
#private;
|
|
25
|
-
constructor(handler: MethodHandler, peerInput: WritableStream<Uint8Array>, peerOutput: ReadableStream<Uint8Array>);
|
|
26
|
-
sendRequest<Req, Resp>(method: string, params?: Req): Promise<Resp>;
|
|
27
|
-
sendNotification<N>(method: string, params?: N): Promise<void>;
|
|
28
|
-
}
|
|
@@ -1,165 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright 2025 Google LLC
|
|
4
|
-
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
-
*/
|
|
6
|
-
import { z } from 'zod';
|
|
7
|
-
import { coreEvents } from '@google/gemini-cli-core';
|
|
8
|
-
import {} from './schema.js';
|
|
9
|
-
export class RequestError extends Error {
|
|
10
|
-
code;
|
|
11
|
-
data;
|
|
12
|
-
constructor(code, message, details) {
|
|
13
|
-
super(message);
|
|
14
|
-
this.code = code;
|
|
15
|
-
this.name = 'RequestError';
|
|
16
|
-
if (details) {
|
|
17
|
-
this.data = { details };
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
static parseError(details) {
|
|
21
|
-
return new RequestError(-32700, 'Parse error', details);
|
|
22
|
-
}
|
|
23
|
-
static invalidRequest(details) {
|
|
24
|
-
return new RequestError(-32600, 'Invalid request', details);
|
|
25
|
-
}
|
|
26
|
-
static methodNotFound(details) {
|
|
27
|
-
return new RequestError(-32601, 'Method not found', details);
|
|
28
|
-
}
|
|
29
|
-
static invalidParams(details) {
|
|
30
|
-
return new RequestError(-32602, 'Invalid params', details);
|
|
31
|
-
}
|
|
32
|
-
static internalError(details) {
|
|
33
|
-
return new RequestError(-32603, 'Internal error', details);
|
|
34
|
-
}
|
|
35
|
-
static authRequired(details) {
|
|
36
|
-
return new RequestError(-32000, 'Authentication required', details);
|
|
37
|
-
}
|
|
38
|
-
toResult() {
|
|
39
|
-
return {
|
|
40
|
-
error: {
|
|
41
|
-
code: this.code,
|
|
42
|
-
message: this.message,
|
|
43
|
-
data: this.data,
|
|
44
|
-
},
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
export class Connection {
|
|
49
|
-
#pendingResponses = new Map();
|
|
50
|
-
#nextRequestId = 0;
|
|
51
|
-
#handler;
|
|
52
|
-
#peerInput;
|
|
53
|
-
#writeQueue = Promise.resolve();
|
|
54
|
-
#textEncoder;
|
|
55
|
-
constructor(handler, peerInput, peerOutput) {
|
|
56
|
-
this.#handler = handler;
|
|
57
|
-
this.#peerInput = peerInput;
|
|
58
|
-
this.#textEncoder = new TextEncoder();
|
|
59
|
-
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
60
|
-
this.#receive(peerOutput);
|
|
61
|
-
}
|
|
62
|
-
async #receive(output) {
|
|
63
|
-
let content = '';
|
|
64
|
-
const decoder = new TextDecoder();
|
|
65
|
-
for await (const chunk of output) {
|
|
66
|
-
content += decoder.decode(chunk, { stream: true });
|
|
67
|
-
const lines = content.split('\n');
|
|
68
|
-
content = lines.pop() || '';
|
|
69
|
-
for (const line of lines) {
|
|
70
|
-
const trimmedLine = line.trim();
|
|
71
|
-
if (trimmedLine) {
|
|
72
|
-
const message = JSON.parse(trimmedLine);
|
|
73
|
-
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
74
|
-
this.#processMessage(message);
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
async #processMessage(message) {
|
|
80
|
-
if ('method' in message && 'id' in message) {
|
|
81
|
-
// It's a request
|
|
82
|
-
const response = await this.#tryCallHandler(message.method, message.params);
|
|
83
|
-
await this.#sendMessage({
|
|
84
|
-
jsonrpc: '2.0',
|
|
85
|
-
id: message.id,
|
|
86
|
-
...response,
|
|
87
|
-
});
|
|
88
|
-
}
|
|
89
|
-
else if ('method' in message) {
|
|
90
|
-
// It's a notification
|
|
91
|
-
await this.#tryCallHandler(message.method, message.params);
|
|
92
|
-
}
|
|
93
|
-
else if ('id' in message) {
|
|
94
|
-
// It's a response
|
|
95
|
-
this.#handleResponse(message);
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
async #tryCallHandler(method, params) {
|
|
99
|
-
try {
|
|
100
|
-
const result = await this.#handler(method, params);
|
|
101
|
-
return { result: result ?? null };
|
|
102
|
-
}
|
|
103
|
-
catch (error) {
|
|
104
|
-
if (error instanceof RequestError) {
|
|
105
|
-
return error.toResult();
|
|
106
|
-
}
|
|
107
|
-
if (error instanceof z.ZodError) {
|
|
108
|
-
return RequestError.invalidParams(JSON.stringify(error.format(), undefined, 2)).toResult();
|
|
109
|
-
}
|
|
110
|
-
let details;
|
|
111
|
-
if (error instanceof Error) {
|
|
112
|
-
details = error.message;
|
|
113
|
-
}
|
|
114
|
-
else if (typeof error === 'object' &&
|
|
115
|
-
error != null &&
|
|
116
|
-
'message' in error &&
|
|
117
|
-
typeof error.message === 'string') {
|
|
118
|
-
details = error.message;
|
|
119
|
-
}
|
|
120
|
-
return RequestError.internalError(details).toResult();
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
#handleResponse(response) {
|
|
124
|
-
const pendingResponse = this.#pendingResponses.get(response.id);
|
|
125
|
-
if (pendingResponse) {
|
|
126
|
-
if ('result' in response) {
|
|
127
|
-
pendingResponse.resolve(response.result);
|
|
128
|
-
}
|
|
129
|
-
else if ('error' in response) {
|
|
130
|
-
pendingResponse.reject(response.error);
|
|
131
|
-
}
|
|
132
|
-
this.#pendingResponses.delete(response.id);
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
async sendRequest(method, params) {
|
|
136
|
-
const id = this.#nextRequestId++;
|
|
137
|
-
const responsePromise = new Promise((resolve, reject) => {
|
|
138
|
-
this.#pendingResponses.set(id, { resolve, reject });
|
|
139
|
-
});
|
|
140
|
-
await this.#sendMessage({ jsonrpc: '2.0', id, method, params });
|
|
141
|
-
return responsePromise;
|
|
142
|
-
}
|
|
143
|
-
async sendNotification(method, params) {
|
|
144
|
-
await this.#sendMessage({ jsonrpc: '2.0', method, params });
|
|
145
|
-
}
|
|
146
|
-
async #sendMessage(json) {
|
|
147
|
-
const content = JSON.stringify(json) + '\n';
|
|
148
|
-
this.#writeQueue = this.#writeQueue
|
|
149
|
-
.then(async () => {
|
|
150
|
-
const writer = this.#peerInput.getWriter();
|
|
151
|
-
try {
|
|
152
|
-
await writer.write(this.#textEncoder.encode(content));
|
|
153
|
-
}
|
|
154
|
-
finally {
|
|
155
|
-
writer.releaseLock();
|
|
156
|
-
}
|
|
157
|
-
})
|
|
158
|
-
.catch((error) => {
|
|
159
|
-
// Continue processing writes on error
|
|
160
|
-
coreEvents.emitFeedback('error', 'ACP write error.', error);
|
|
161
|
-
});
|
|
162
|
-
return this.#writeQueue;
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
//# sourceMappingURL=connection.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/zed-integration/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,175 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright 2025 Google LLC
|
|
4
|
-
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
-
*/
|
|
6
|
-
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
7
|
-
import { Connection, RequestError } from './connection.js';
|
|
8
|
-
import { ReadableStream, WritableStream } from 'node:stream/web';
|
|
9
|
-
describe('Connection', () => {
|
|
10
|
-
let toPeer;
|
|
11
|
-
let fromPeer;
|
|
12
|
-
let peerController;
|
|
13
|
-
let receivedChunks = [];
|
|
14
|
-
let connection;
|
|
15
|
-
let handler;
|
|
16
|
-
beforeEach(() => {
|
|
17
|
-
receivedChunks = [];
|
|
18
|
-
toPeer = new WritableStream({
|
|
19
|
-
write(chunk) {
|
|
20
|
-
const str = new TextDecoder().decode(chunk);
|
|
21
|
-
receivedChunks.push(str);
|
|
22
|
-
},
|
|
23
|
-
});
|
|
24
|
-
fromPeer = new ReadableStream({
|
|
25
|
-
start(controller) {
|
|
26
|
-
peerController = controller;
|
|
27
|
-
},
|
|
28
|
-
});
|
|
29
|
-
handler = vi.fn();
|
|
30
|
-
connection = new Connection(handler, toPeer, fromPeer);
|
|
31
|
-
});
|
|
32
|
-
afterEach(() => {
|
|
33
|
-
vi.clearAllMocks();
|
|
34
|
-
});
|
|
35
|
-
it('should send a request and receive a response', async () => {
|
|
36
|
-
const responsePromise = connection.sendRequest('testMethod', {
|
|
37
|
-
key: 'value',
|
|
38
|
-
});
|
|
39
|
-
// Verify request was sent
|
|
40
|
-
await vi.waitFor(() => {
|
|
41
|
-
expect(receivedChunks.length).toBeGreaterThan(0);
|
|
42
|
-
});
|
|
43
|
-
const request = JSON.parse(receivedChunks[0]);
|
|
44
|
-
expect(request).toMatchObject({
|
|
45
|
-
jsonrpc: '2.0',
|
|
46
|
-
method: 'testMethod',
|
|
47
|
-
params: { key: 'value' },
|
|
48
|
-
});
|
|
49
|
-
expect(request.id).toBeDefined();
|
|
50
|
-
// Simulate response
|
|
51
|
-
const response = {
|
|
52
|
-
jsonrpc: '2.0',
|
|
53
|
-
id: request.id,
|
|
54
|
-
result: { success: true },
|
|
55
|
-
};
|
|
56
|
-
peerController.enqueue(new TextEncoder().encode(JSON.stringify(response) + '\n'));
|
|
57
|
-
const result = await responsePromise;
|
|
58
|
-
expect(result).toEqual({ success: true });
|
|
59
|
-
});
|
|
60
|
-
it('should send a notification', async () => {
|
|
61
|
-
await connection.sendNotification('notifyMethod', { key: 'value' });
|
|
62
|
-
await vi.waitFor(() => {
|
|
63
|
-
expect(receivedChunks.length).toBeGreaterThan(0);
|
|
64
|
-
});
|
|
65
|
-
const notification = JSON.parse(receivedChunks[0]);
|
|
66
|
-
expect(notification).toMatchObject({
|
|
67
|
-
jsonrpc: '2.0',
|
|
68
|
-
method: 'notifyMethod',
|
|
69
|
-
params: { key: 'value' },
|
|
70
|
-
});
|
|
71
|
-
expect(notification.id).toBeUndefined();
|
|
72
|
-
});
|
|
73
|
-
it('should handle incoming requests', async () => {
|
|
74
|
-
handler.mockResolvedValue({ result: 'ok' });
|
|
75
|
-
const request = {
|
|
76
|
-
jsonrpc: '2.0',
|
|
77
|
-
id: 1,
|
|
78
|
-
method: 'incomingMethod',
|
|
79
|
-
params: { foo: 'bar' },
|
|
80
|
-
};
|
|
81
|
-
peerController.enqueue(new TextEncoder().encode(JSON.stringify(request) + '\n'));
|
|
82
|
-
// Wait for handler to be called and response to be written
|
|
83
|
-
await vi.waitFor(() => {
|
|
84
|
-
expect(handler).toHaveBeenCalledWith('incomingMethod', { foo: 'bar' });
|
|
85
|
-
expect(receivedChunks.length).toBeGreaterThan(0);
|
|
86
|
-
});
|
|
87
|
-
const response = JSON.parse(receivedChunks[receivedChunks.length - 1]);
|
|
88
|
-
expect(response).toMatchObject({
|
|
89
|
-
jsonrpc: '2.0',
|
|
90
|
-
id: 1,
|
|
91
|
-
result: { result: 'ok' },
|
|
92
|
-
});
|
|
93
|
-
});
|
|
94
|
-
it('should handle incoming notifications', async () => {
|
|
95
|
-
const notification = {
|
|
96
|
-
jsonrpc: '2.0',
|
|
97
|
-
method: 'incomingNotify',
|
|
98
|
-
params: { foo: 'bar' },
|
|
99
|
-
};
|
|
100
|
-
peerController.enqueue(new TextEncoder().encode(JSON.stringify(notification) + '\n'));
|
|
101
|
-
// Wait for handler to be called
|
|
102
|
-
await vi.waitFor(() => {
|
|
103
|
-
expect(handler).toHaveBeenCalledWith('incomingNotify', { foo: 'bar' });
|
|
104
|
-
});
|
|
105
|
-
// Notifications don't send responses
|
|
106
|
-
expect(receivedChunks.length).toBe(0);
|
|
107
|
-
});
|
|
108
|
-
it('should handle request errors from handler', async () => {
|
|
109
|
-
handler.mockRejectedValue(new Error('Handler failed'));
|
|
110
|
-
const request = {
|
|
111
|
-
jsonrpc: '2.0',
|
|
112
|
-
id: 2,
|
|
113
|
-
method: 'failMethod',
|
|
114
|
-
};
|
|
115
|
-
peerController.enqueue(new TextEncoder().encode(JSON.stringify(request) + '\n'));
|
|
116
|
-
await vi.waitFor(() => {
|
|
117
|
-
expect(receivedChunks.length).toBeGreaterThan(0);
|
|
118
|
-
});
|
|
119
|
-
const response = JSON.parse(receivedChunks[receivedChunks.length - 1]);
|
|
120
|
-
expect(response).toMatchObject({
|
|
121
|
-
jsonrpc: '2.0',
|
|
122
|
-
id: 2,
|
|
123
|
-
error: {
|
|
124
|
-
code: -32603,
|
|
125
|
-
message: 'Internal error',
|
|
126
|
-
data: { details: 'Handler failed' },
|
|
127
|
-
},
|
|
128
|
-
});
|
|
129
|
-
});
|
|
130
|
-
it('should handle RequestError from handler', async () => {
|
|
131
|
-
handler.mockRejectedValue(RequestError.methodNotFound('Unknown method'));
|
|
132
|
-
const request = {
|
|
133
|
-
jsonrpc: '2.0',
|
|
134
|
-
id: 3,
|
|
135
|
-
method: 'unknown',
|
|
136
|
-
};
|
|
137
|
-
peerController.enqueue(new TextEncoder().encode(JSON.stringify(request) + '\n'));
|
|
138
|
-
await vi.waitFor(() => {
|
|
139
|
-
expect(receivedChunks.length).toBeGreaterThan(0);
|
|
140
|
-
});
|
|
141
|
-
const response = JSON.parse(receivedChunks[receivedChunks.length - 1]);
|
|
142
|
-
expect(response).toMatchObject({
|
|
143
|
-
jsonrpc: '2.0',
|
|
144
|
-
id: 3,
|
|
145
|
-
error: {
|
|
146
|
-
code: -32601,
|
|
147
|
-
message: 'Method not found',
|
|
148
|
-
data: { details: 'Unknown method' },
|
|
149
|
-
},
|
|
150
|
-
});
|
|
151
|
-
});
|
|
152
|
-
it('should handle response errors', async () => {
|
|
153
|
-
const responsePromise = connection.sendRequest('testMethod');
|
|
154
|
-
// Verify request was sent
|
|
155
|
-
await vi.waitFor(() => {
|
|
156
|
-
expect(receivedChunks.length).toBeGreaterThan(0);
|
|
157
|
-
});
|
|
158
|
-
const request = JSON.parse(receivedChunks[0]);
|
|
159
|
-
// Simulate error response
|
|
160
|
-
const response = {
|
|
161
|
-
jsonrpc: '2.0',
|
|
162
|
-
id: request.id,
|
|
163
|
-
error: {
|
|
164
|
-
code: -32000,
|
|
165
|
-
message: 'Custom error',
|
|
166
|
-
},
|
|
167
|
-
};
|
|
168
|
-
peerController.enqueue(new TextEncoder().encode(JSON.stringify(response) + '\n'));
|
|
169
|
-
await expect(responsePromise).rejects.toMatchObject({
|
|
170
|
-
code: -32000,
|
|
171
|
-
message: 'Custom error',
|
|
172
|
-
});
|
|
173
|
-
});
|
|
174
|
-
});
|
|
175
|
-
//# sourceMappingURL=connection.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"connection.test.js","sourceRoot":"","sources":["../../../src/zed-integration/connection.test.ts"],"names":[],"mappings":"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"}
|