@google/gemini-cli 0.21.0-nightly.20251216.bb0c0d8ee → 0.21.0-nightly.20251217.db643e916

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.
Files changed (69) hide show
  1. package/dist/google-gemini-cli-0.21.0-nightly.20251216.bb0c0d8ee.tgz +0 -0
  2. package/dist/package.json +3 -2
  3. package/dist/src/config/settings.js +11 -1
  4. package/dist/src/config/settings.js.map +1 -1
  5. package/dist/src/config/settings.test.js +23 -0
  6. package/dist/src/config/settings.test.js.map +1 -1
  7. package/dist/src/config/settings_repro.test.js +162 -0
  8. package/dist/src/config/settings_repro.test.js.map +1 -0
  9. package/dist/src/generated/git-commit.d.ts +2 -2
  10. package/dist/src/generated/git-commit.js +2 -2
  11. package/dist/src/ui/components/ModelStatsDisplay.js +1 -1
  12. package/dist/src/ui/components/ModelStatsDisplay.js.map +1 -1
  13. package/dist/src/ui/components/ModelStatsDisplay.test.js +7 -0
  14. package/dist/src/ui/components/ModelStatsDisplay.test.js.map +1 -1
  15. package/dist/src/ui/components/SessionSummaryDisplay.test.js +1 -0
  16. package/dist/src/ui/components/SessionSummaryDisplay.test.js.map +1 -1
  17. package/dist/src/ui/components/StatsDisplay.js +4 -7
  18. package/dist/src/ui/components/StatsDisplay.js.map +1 -1
  19. package/dist/src/ui/components/StatsDisplay.test.js +5 -0
  20. package/dist/src/ui/components/StatsDisplay.test.js.map +1 -1
  21. package/dist/src/ui/contexts/SessionContext.d.ts +1 -0
  22. package/dist/src/ui/contexts/SessionContext.js +2 -1
  23. package/dist/src/ui/contexts/SessionContext.js.map +1 -1
  24. package/dist/src/ui/contexts/SessionContext.test.js +3 -0
  25. package/dist/src/ui/contexts/SessionContext.test.js.map +1 -1
  26. package/dist/src/ui/themes/ansi-light.js +1 -1
  27. package/dist/src/ui/themes/ansi-light.js.map +1 -1
  28. package/dist/src/ui/themes/ansi.js +1 -1
  29. package/dist/src/ui/themes/ansi.js.map +1 -1
  30. package/dist/src/ui/themes/theme.js +3 -3
  31. package/dist/src/ui/themes/theme.js.map +1 -1
  32. package/dist/src/ui/utils/computeStats.js +2 -0
  33. package/dist/src/ui/utils/computeStats.js.map +1 -1
  34. package/dist/src/ui/utils/computeStats.test.js +9 -0
  35. package/dist/src/ui/utils/computeStats.test.js.map +1 -1
  36. package/dist/src/utils/deepMerge.js +7 -2
  37. package/dist/src/utils/deepMerge.js.map +1 -1
  38. package/dist/src/utils/deepMerge.test.js +21 -0
  39. package/dist/src/utils/deepMerge.test.js.map +1 -1
  40. package/dist/src/utils/errors.test.js +9 -1
  41. package/dist/src/utils/errors.test.js.map +1 -1
  42. package/dist/src/zed-integration/fileSystemService.d.ts +3 -3
  43. package/dist/src/zed-integration/fileSystemService.js +5 -7
  44. package/dist/src/zed-integration/fileSystemService.js.map +1 -1
  45. package/dist/src/zed-integration/fileSystemService.test.js +11 -13
  46. package/dist/src/zed-integration/fileSystemService.test.js.map +1 -1
  47. package/dist/src/zed-integration/zedIntegration.d.ts +5 -5
  48. package/dist/src/zed-integration/zedIntegration.js +37 -17
  49. package/dist/src/zed-integration/zedIntegration.js.map +1 -1
  50. package/dist/src/zed-integration/zedIntegration.test.js +16 -16
  51. package/dist/src/zed-integration/zedIntegration.test.js.map +1 -1
  52. package/dist/tsconfig.tsbuildinfo +1 -1
  53. package/package.json +4 -3
  54. package/dist/google-gemini-cli-0.21.0-nightly.20251213.977248e09.tgz +0 -0
  55. package/dist/src/zed-integration/acp.d.ts +0 -41
  56. package/dist/src/zed-integration/acp.js +0 -72
  57. package/dist/src/zed-integration/acp.js.map +0 -1
  58. package/dist/src/zed-integration/acp.test.js +0 -214
  59. package/dist/src/zed-integration/acp.test.js.map +0 -1
  60. package/dist/src/zed-integration/connection.d.ts +0 -28
  61. package/dist/src/zed-integration/connection.js +0 -165
  62. package/dist/src/zed-integration/connection.js.map +0 -1
  63. package/dist/src/zed-integration/connection.test.d.ts +0 -6
  64. package/dist/src/zed-integration/connection.test.js +0 -175
  65. package/dist/src/zed-integration/connection.test.js.map +0 -1
  66. package/dist/src/zed-integration/schema.d.ts +0 -11792
  67. package/dist/src/zed-integration/schema.js +0 -311
  68. package/dist/src/zed-integration/schema.js.map +0 -1
  69. /package/dist/src/{zed-integration/acp.test.d.ts → config/settings_repro.test.d.ts} +0 -0
@@ -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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"}