@google/gemini-cli 0.19.0-nightly.20251123.dadd606c0 → 0.19.0-nightly.20251125.f6d97d448
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/google-gemini-cli-0.19.0-nightly.20251124.e177314a4.tgz +0 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +0 -1
- package/dist/index.js.map +1 -1
- package/dist/package.json +2 -2
- package/dist/src/commands/extensions.test.d.ts +6 -0
- package/dist/src/commands/extensions.test.js +67 -0
- package/dist/src/commands/extensions.test.js.map +1 -0
- package/dist/src/commands/utils.test.d.ts +6 -0
- package/dist/src/commands/utils.test.js +35 -0
- package/dist/src/commands/utils.test.js.map +1 -0
- package/dist/src/core/auth.test.d.ts +6 -0
- package/dist/src/core/auth.test.js +43 -0
- package/dist/src/core/auth.test.js.map +1 -0
- package/dist/src/core/initializer.test.d.ts +6 -0
- package/dist/src/core/initializer.test.js +101 -0
- package/dist/src/core/initializer.test.js.map +1 -0
- package/dist/src/core/theme.test.d.ts +6 -0
- package/dist/src/core/theme.test.js +46 -0
- package/dist/src/core/theme.test.js.map +1 -0
- package/dist/src/gemini.d.ts +1 -0
- package/dist/src/gemini.js +7 -2
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +621 -1
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/gemini_cleanup.test.d.ts +6 -0
- package/dist/src/gemini_cleanup.test.js +201 -0
- package/dist/src/gemini_cleanup.test.js.map +1 -0
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/nonInteractiveCli.test.js +336 -0
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/ui/App.test.js +28 -14
- package/dist/src/ui/App.test.js.map +1 -1
- package/dist/src/ui/IdeIntegrationNudge.test.d.ts +6 -0
- package/dist/src/ui/IdeIntegrationNudge.test.js +147 -0
- package/dist/src/ui/IdeIntegrationNudge.test.js.map +1 -0
- package/dist/src/ui/auth/ApiAuthDialog.test.js +12 -17
- package/dist/src/ui/auth/ApiAuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +120 -74
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/AuthInProgress.test.d.ts +6 -0
- package/dist/src/ui/auth/AuthInProgress.test.js +71 -0
- package/dist/src/ui/auth/AuthInProgress.test.js.map +1 -0
- package/dist/src/ui/auth/useAuth.test.d.ts +6 -0
- package/dist/src/ui/auth/useAuth.test.js +178 -0
- package/dist/src/ui/auth/useAuth.test.js.map +1 -0
- package/dist/src/ui/commands/extensionsCommand.js +28 -6
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.test.js +32 -0
- package/dist/src/ui/commands/extensionsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/statsCommand.js +27 -16
- package/dist/src/ui/commands/statsCommand.js.map +1 -1
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js +62 -11
- package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js.map +1 -1
- package/dist/src/ui/components/AnsiOutput.test.js +18 -23
- package/dist/src/ui/components/AnsiOutput.test.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.js +4 -4
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +5 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/state/extensions.test.js +208 -51
- package/dist/src/ui/state/extensions.test.js.map +1 -1
- package/dist/src/ui/utils/kittyProtocolDetector.test.d.ts +6 -0
- package/dist/src/ui/utils/kittyProtocolDetector.test.js +113 -0
- package/dist/src/ui/utils/kittyProtocolDetector.test.js.map +1 -0
- package/dist/src/ui/utils/terminalSetup.js +39 -38
- package/dist/src/ui/utils/terminalSetup.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.test.d.ts +6 -0
- package/dist/src/ui/utils/terminalSetup.test.js +131 -0
- package/dist/src/ui/utils/terminalSetup.test.js.map +1 -0
- package/dist/src/ui/utils/ui-sizing.test.d.ts +6 -0
- package/dist/src/ui/utils/ui-sizing.test.js +56 -0
- package/dist/src/ui/utils/ui-sizing.test.js.map +1 -0
- package/dist/src/utils/checks.test.d.ts +6 -0
- package/dist/src/utils/checks.test.js +29 -0
- package/dist/src/utils/checks.test.js.map +1 -0
- package/dist/src/utils/cleanup.test.js +69 -16
- package/dist/src/utils/cleanup.test.js.map +1 -1
- package/dist/src/utils/dialogScopeUtils.test.d.ts +6 -0
- package/dist/src/utils/dialogScopeUtils.test.js +81 -0
- package/dist/src/utils/dialogScopeUtils.test.js.map +1 -0
- package/dist/src/utils/errors.test.js +62 -0
- package/dist/src/utils/errors.test.js.map +1 -1
- package/dist/src/utils/events.test.d.ts +6 -0
- package/dist/src/utils/events.test.js +24 -0
- package/dist/src/utils/events.test.js.map +1 -0
- package/dist/src/utils/handleAutoUpdate.test.js +103 -24
- package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
- package/dist/src/utils/math.test.d.ts +6 -0
- package/dist/src/utils/math.test.js +23 -0
- package/dist/src/utils/math.test.js.map +1 -0
- package/dist/src/utils/persistentState.test.d.ts +6 -0
- package/dist/src/utils/persistentState.test.js +68 -0
- package/dist/src/utils/persistentState.test.js.map +1 -0
- package/dist/src/utils/readStdin.js +1 -0
- package/dist/src/utils/readStdin.js.map +1 -1
- package/dist/src/utils/readStdin.test.js +25 -0
- package/dist/src/utils/readStdin.test.js.map +1 -1
- package/dist/src/utils/resolvePath.test.d.ts +6 -0
- package/dist/src/utils/resolvePath.test.js +31 -0
- package/dist/src/utils/resolvePath.test.js.map +1 -0
- package/dist/src/utils/sandbox.js +6 -137
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/sandbox.test.d.ts +6 -0
- package/dist/src/utils/sandbox.test.js +302 -0
- package/dist/src/utils/sandbox.test.js.map +1 -0
- package/dist/src/utils/sandboxUtils.d.ts +14 -0
- package/dist/src/utils/sandboxUtils.js +120 -0
- package/dist/src/utils/sandboxUtils.js.map +1 -0
- package/dist/src/utils/sandboxUtils.test.d.ts +6 -0
- package/dist/src/utils/sandboxUtils.test.js +119 -0
- package/dist/src/utils/sandboxUtils.test.js.map +1 -0
- package/dist/src/utils/updateEventEmitter.test.d.ts +6 -0
- package/dist/src/utils/updateEventEmitter.test.js +18 -0
- package/dist/src/utils/updateEventEmitter.test.js.map +1 -0
- package/dist/src/utils/version.test.d.ts +6 -0
- package/dist/src/utils/version.test.js +39 -0
- package/dist/src/utils/version.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/google-gemini-cli-0.19.0-nightly.20251122.42c2e1b21.tgz +0 -0
|
@@ -4,59 +4,216 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { describe, it, expect } from 'vitest';
|
|
7
|
-
import { extensionUpdatesReducer, ExtensionUpdateState, } from './extensions.js';
|
|
7
|
+
import { extensionUpdatesReducer, ExtensionUpdateState, initialExtensionUpdatesState, } from './extensions.js';
|
|
8
8
|
describe('extensionUpdatesReducer', () => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
9
|
+
describe('SET_STATE', () => {
|
|
10
|
+
it.each([
|
|
11
|
+
ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
12
|
+
ExtensionUpdateState.UPDATED,
|
|
13
|
+
ExtensionUpdateState.ERROR,
|
|
14
|
+
])('should handle SET_STATE action for state: %s', (state) => {
|
|
15
|
+
const action = {
|
|
16
|
+
type: 'SET_STATE',
|
|
17
|
+
payload: { name: 'ext1', state },
|
|
18
|
+
};
|
|
19
|
+
const newState = extensionUpdatesReducer(initialExtensionUpdatesState, action);
|
|
20
|
+
expect(newState.extensionStatuses.get('ext1')).toEqual({
|
|
21
|
+
status: state,
|
|
22
|
+
notified: false,
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
it('should not update state if SET_STATE payload is identical to existing state', () => {
|
|
26
|
+
const initialState = {
|
|
27
|
+
...initialExtensionUpdatesState,
|
|
28
|
+
extensionStatuses: new Map([
|
|
29
|
+
[
|
|
30
|
+
'ext1',
|
|
31
|
+
{
|
|
32
|
+
status: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
33
|
+
notified: false,
|
|
34
|
+
},
|
|
35
|
+
],
|
|
36
|
+
]),
|
|
37
|
+
};
|
|
38
|
+
const action = {
|
|
39
|
+
type: 'SET_STATE',
|
|
40
|
+
payload: { name: 'ext1', state: ExtensionUpdateState.UPDATE_AVAILABLE },
|
|
41
|
+
};
|
|
42
|
+
const newState = extensionUpdatesReducer(initialState, action);
|
|
43
|
+
expect(newState).toBe(initialState);
|
|
44
|
+
});
|
|
37
45
|
});
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
46
|
+
describe('SET_NOTIFIED', () => {
|
|
47
|
+
it.each([true, false])('should handle SET_NOTIFIED action with notified: %s', (notified) => {
|
|
48
|
+
const initialState = {
|
|
49
|
+
...initialExtensionUpdatesState,
|
|
50
|
+
extensionStatuses: new Map([
|
|
51
|
+
[
|
|
52
|
+
'ext1',
|
|
53
|
+
{
|
|
54
|
+
status: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
55
|
+
notified: !notified,
|
|
56
|
+
},
|
|
57
|
+
],
|
|
58
|
+
]),
|
|
59
|
+
};
|
|
60
|
+
const action = {
|
|
61
|
+
type: 'SET_NOTIFIED',
|
|
62
|
+
payload: { name: 'ext1', notified },
|
|
63
|
+
};
|
|
64
|
+
const newState = extensionUpdatesReducer(initialState, action);
|
|
65
|
+
expect(newState.extensionStatuses.get('ext1')).toEqual({
|
|
66
|
+
status: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
67
|
+
notified,
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
it('should not update state if SET_NOTIFIED payload is identical to existing state', () => {
|
|
71
|
+
const initialState = {
|
|
72
|
+
...initialExtensionUpdatesState,
|
|
73
|
+
extensionStatuses: new Map([
|
|
74
|
+
[
|
|
75
|
+
'ext1',
|
|
76
|
+
{
|
|
77
|
+
status: ExtensionUpdateState.UPDATE_AVAILABLE,
|
|
78
|
+
notified: true,
|
|
79
|
+
},
|
|
80
|
+
],
|
|
81
|
+
]),
|
|
82
|
+
};
|
|
83
|
+
const action = {
|
|
84
|
+
type: 'SET_NOTIFIED',
|
|
85
|
+
payload: { name: 'ext1', notified: true },
|
|
86
|
+
};
|
|
87
|
+
const newState = extensionUpdatesReducer(initialState, action);
|
|
88
|
+
expect(newState).toBe(initialState);
|
|
89
|
+
});
|
|
90
|
+
it('should ignore SET_NOTIFIED if extension does not exist', () => {
|
|
91
|
+
const action = {
|
|
92
|
+
type: 'SET_NOTIFIED',
|
|
93
|
+
payload: { name: 'non-existent', notified: true },
|
|
94
|
+
};
|
|
95
|
+
const newState = extensionUpdatesReducer(initialExtensionUpdatesState, action);
|
|
96
|
+
expect(newState).toBe(initialExtensionUpdatesState);
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
describe('Batch Checks', () => {
|
|
100
|
+
it('should handle BATCH_CHECK_START action', () => {
|
|
101
|
+
const action = { type: 'BATCH_CHECK_START' };
|
|
102
|
+
const newState = extensionUpdatesReducer(initialExtensionUpdatesState, action);
|
|
103
|
+
expect(newState.batchChecksInProgress).toBe(1);
|
|
104
|
+
});
|
|
105
|
+
it('should handle BATCH_CHECK_END action', () => {
|
|
106
|
+
const initialState = {
|
|
107
|
+
...initialExtensionUpdatesState,
|
|
108
|
+
batchChecksInProgress: 1,
|
|
109
|
+
};
|
|
110
|
+
const action = { type: 'BATCH_CHECK_END' };
|
|
111
|
+
const newState = extensionUpdatesReducer(initialState, action);
|
|
112
|
+
expect(newState.batchChecksInProgress).toBe(0);
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
describe('Scheduled Updates', () => {
|
|
116
|
+
it('should handle SCHEDULE_UPDATE action', () => {
|
|
117
|
+
const callback = () => { };
|
|
118
|
+
const action = {
|
|
119
|
+
type: 'SCHEDULE_UPDATE',
|
|
120
|
+
payload: {
|
|
121
|
+
names: ['ext1'],
|
|
122
|
+
all: false,
|
|
123
|
+
onComplete: callback,
|
|
124
|
+
},
|
|
125
|
+
};
|
|
126
|
+
const newState = extensionUpdatesReducer(initialExtensionUpdatesState, action);
|
|
127
|
+
expect(newState.scheduledUpdate).toEqual({
|
|
128
|
+
names: ['ext1'],
|
|
129
|
+
all: false,
|
|
130
|
+
onCompleteCallbacks: [callback],
|
|
131
|
+
});
|
|
132
|
+
});
|
|
133
|
+
it('should merge SCHEDULE_UPDATE with existing scheduled update', () => {
|
|
134
|
+
const callback1 = () => { };
|
|
135
|
+
const callback2 = () => { };
|
|
136
|
+
const initialState = {
|
|
137
|
+
...initialExtensionUpdatesState,
|
|
138
|
+
scheduledUpdate: {
|
|
139
|
+
names: ['ext1'],
|
|
140
|
+
all: false,
|
|
141
|
+
onCompleteCallbacks: [callback1],
|
|
142
|
+
},
|
|
143
|
+
};
|
|
144
|
+
const action = {
|
|
145
|
+
type: 'SCHEDULE_UPDATE',
|
|
146
|
+
payload: {
|
|
147
|
+
names: ['ext2'],
|
|
148
|
+
all: true,
|
|
149
|
+
onComplete: callback2,
|
|
150
|
+
},
|
|
151
|
+
};
|
|
152
|
+
const newState = extensionUpdatesReducer(initialState, action);
|
|
153
|
+
expect(newState.scheduledUpdate).toEqual({
|
|
154
|
+
names: ['ext1', 'ext2'],
|
|
155
|
+
all: true, // Should be true if any update is all: true
|
|
156
|
+
onCompleteCallbacks: [callback1, callback2],
|
|
157
|
+
});
|
|
158
|
+
});
|
|
159
|
+
it('should handle CLEAR_SCHEDULED_UPDATE action', () => {
|
|
160
|
+
const initialState = {
|
|
161
|
+
...initialExtensionUpdatesState,
|
|
162
|
+
scheduledUpdate: {
|
|
163
|
+
names: ['ext1'],
|
|
164
|
+
all: false,
|
|
165
|
+
onCompleteCallbacks: [],
|
|
166
|
+
},
|
|
167
|
+
};
|
|
168
|
+
const action = { type: 'CLEAR_SCHEDULED_UPDATE' };
|
|
169
|
+
const newState = extensionUpdatesReducer(initialState, action);
|
|
170
|
+
expect(newState.scheduledUpdate).toBeNull();
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
describe('RESTARTED', () => {
|
|
174
|
+
it('should handle RESTARTED action', () => {
|
|
175
|
+
const initialState = {
|
|
176
|
+
...initialExtensionUpdatesState,
|
|
177
|
+
extensionStatuses: new Map([
|
|
178
|
+
[
|
|
179
|
+
'ext1',
|
|
180
|
+
{
|
|
181
|
+
status: ExtensionUpdateState.UPDATED_NEEDS_RESTART,
|
|
182
|
+
notified: true,
|
|
183
|
+
},
|
|
184
|
+
],
|
|
185
|
+
]),
|
|
186
|
+
};
|
|
187
|
+
const action = {
|
|
188
|
+
type: 'RESTARTED',
|
|
189
|
+
payload: { name: 'ext1' },
|
|
190
|
+
};
|
|
191
|
+
const newState = extensionUpdatesReducer(initialState, action);
|
|
192
|
+
expect(newState.extensionStatuses.get('ext1')).toEqual({
|
|
193
|
+
status: ExtensionUpdateState.UPDATED,
|
|
194
|
+
notified: true,
|
|
195
|
+
});
|
|
196
|
+
});
|
|
197
|
+
it('should not change state for RESTARTED action if status is not UPDATED_NEEDS_RESTART', () => {
|
|
198
|
+
const initialState = {
|
|
199
|
+
...initialExtensionUpdatesState,
|
|
200
|
+
extensionStatuses: new Map([
|
|
201
|
+
[
|
|
202
|
+
'ext1',
|
|
203
|
+
{
|
|
204
|
+
status: ExtensionUpdateState.UPDATED,
|
|
205
|
+
notified: true,
|
|
206
|
+
},
|
|
207
|
+
],
|
|
208
|
+
]),
|
|
209
|
+
};
|
|
210
|
+
const action = {
|
|
211
|
+
type: 'RESTARTED',
|
|
212
|
+
payload: { name: 'ext1' },
|
|
213
|
+
};
|
|
214
|
+
const newState = extensionUpdatesReducer(initialState, action);
|
|
215
|
+
expect(newState).toBe(initialState);
|
|
216
|
+
});
|
|
60
217
|
});
|
|
61
218
|
});
|
|
62
219
|
//# sourceMappingURL=extensions.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.test.js","sourceRoot":"","sources":["../../../../src/ui/state/extensions.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,uBAAuB,EAEvB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"extensions.test.js","sourceRoot":"","sources":["../../../../src/ui/state/extensions.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,uBAAuB,EAEvB,oBAAoB,EACpB,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,IAAI,CAAC;YACN,oBAAoB,CAAC,gBAAgB;YACrC,oBAAoB,CAAC,OAAO;YAC5B,oBAAoB,CAAC,KAAK;SAC3B,CAAC,CAAC,8CAA8C,EAAE,CAAC,KAAK,EAAE,EAAE;YAC3D,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,WAAoB;gBAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE;aACjC,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CACtC,4BAA4B,EAC5B,MAAM,CACP,CAAC;YAEF,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;gBACrD,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;YACrF,MAAM,YAAY,GAA0B;gBAC1C,GAAG,4BAA4B;gBAC/B,iBAAiB,EAAE,IAAI,GAAG,CAAC;oBACzB;wBACE,MAAM;wBACN;4BACE,MAAM,EAAE,oBAAoB,CAAC,gBAAgB;4BAC7C,QAAQ,EAAE,KAAK;yBAChB;qBACF;iBACF,CAAC;aACH,CAAC;YAEF,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,WAAoB;gBAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,CAAC,gBAAgB,EAAE;aACxE,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE/D,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CACpB,qDAAqD,EACrD,CAAC,QAAQ,EAAE,EAAE;YACX,MAAM,YAAY,GAA0B;gBAC1C,GAAG,4BAA4B;gBAC/B,iBAAiB,EAAE,IAAI,GAAG,CAAC;oBACzB;wBACE,MAAM;wBACN;4BACE,MAAM,EAAE,oBAAoB,CAAC,gBAAgB;4BAC7C,QAAQ,EAAE,CAAC,QAAQ;yBACpB;qBACF;iBACF,CAAC;aACH,CAAC;YAEF,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,cAAuB;gBAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE;aACpC,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE/D,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;gBACrD,MAAM,EAAE,oBAAoB,CAAC,gBAAgB;gBAC7C,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;YACxF,MAAM,YAAY,GAA0B;gBAC1C,GAAG,4BAA4B;gBAC/B,iBAAiB,EAAE,IAAI,GAAG,CAAC;oBACzB;wBACE,MAAM;wBACN;4BACE,MAAM,EAAE,oBAAoB,CAAC,gBAAgB;4BAC7C,QAAQ,EAAE,IAAI;yBACf;qBACF;iBACF,CAAC;aACH,CAAC;YAEF,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,cAAuB;gBAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;aAC1C,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE/D,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;YAChE,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,cAAuB;gBAC7B,OAAO,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE;aAClD,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CACtC,4BAA4B,EAC5B,MAAM,CACP,CAAC;YAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAChD,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,mBAA4B,EAAE,CAAC;YACtD,MAAM,QAAQ,GAAG,uBAAuB,CACtC,4BAA4B,EAC5B,MAAM,CACP,CAAC;YACF,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC9C,MAAM,YAAY,GAAG;gBACnB,GAAG,4BAA4B;gBAC/B,qBAAqB,EAAE,CAAC;aACzB,CAAC;YACF,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,iBAA0B,EAAE,CAAC;YACpD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC/D,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC9C,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YAC1B,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,iBAA0B;gBAChC,OAAO,EAAE;oBACP,KAAK,EAAE,CAAC,MAAM,CAAC;oBACf,GAAG,EAAE,KAAK;oBACV,UAAU,EAAE,QAAQ;iBACrB;aACF,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CACtC,4BAA4B,EAC5B,MAAM,CACP,CAAC;YAEF,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,CAAC,MAAM,CAAC;gBACf,GAAG,EAAE,KAAK;gBACV,mBAAmB,EAAE,CAAC,QAAQ,CAAC;aAChC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACrE,MAAM,SAAS,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YAC3B,MAAM,SAAS,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YAC3B,MAAM,YAAY,GAA0B;gBAC1C,GAAG,4BAA4B;gBAC/B,eAAe,EAAE;oBACf,KAAK,EAAE,CAAC,MAAM,CAAC;oBACf,GAAG,EAAE,KAAK;oBACV,mBAAmB,EAAE,CAAC,SAAS,CAAC;iBACjC;aACF,CAAC;YAEF,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,iBAA0B;gBAChC,OAAO,EAAE;oBACP,KAAK,EAAE,CAAC,MAAM,CAAC;oBACf,GAAG,EAAE,IAAI;oBACT,UAAU,EAAE,SAAS;iBACtB;aACF,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE/D,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gBACvB,GAAG,EAAE,IAAI,EAAE,4CAA4C;gBACvD,mBAAmB,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACrD,MAAM,YAAY,GAA0B;gBAC1C,GAAG,4BAA4B;gBAC/B,eAAe,EAAE;oBACf,KAAK,EAAE,CAAC,MAAM,CAAC;oBACf,GAAG,EAAE,KAAK;oBACV,mBAAmB,EAAE,EAAE;iBACxB;aACF,CAAC;YAEF,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,wBAAiC,EAAE,CAAC;YAC3D,MAAM,QAAQ,GAAG,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE/D,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,YAAY,GAA0B;gBAC1C,GAAG,4BAA4B;gBAC/B,iBAAiB,EAAE,IAAI,GAAG,CAAC;oBACzB;wBACE,MAAM;wBACN;4BACE,MAAM,EAAE,oBAAoB,CAAC,qBAAqB;4BAClD,QAAQ,EAAE,IAAI;yBACf;qBACF;iBACF,CAAC;aACH,CAAC;YAEF,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,WAAoB;gBAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;aAC1B,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE/D,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;gBACrD,MAAM,EAAE,oBAAoB,CAAC,OAAO;gBACpC,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;YAC7F,MAAM,YAAY,GAA0B;gBAC1C,GAAG,4BAA4B;gBAC/B,iBAAiB,EAAE,IAAI,GAAG,CAAC;oBACzB;wBACE,MAAM;wBACN;4BACE,MAAM,EAAE,oBAAoB,CAAC,OAAO;4BACpC,QAAQ,EAAE,IAAI;yBACf;qBACF;iBACF,CAAC;aACH,CAAC;YAEF,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,WAAoB;gBAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;aAC1B,CAAC;YAEF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE/D,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,113 @@
|
|
|
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
|
+
// Mock dependencies
|
|
8
|
+
const mocks = vi.hoisted(() => ({
|
|
9
|
+
writeSync: vi.fn(),
|
|
10
|
+
enableKittyKeyboardProtocol: vi.fn(),
|
|
11
|
+
disableKittyKeyboardProtocol: vi.fn(),
|
|
12
|
+
}));
|
|
13
|
+
vi.mock('node:fs', () => ({
|
|
14
|
+
writeSync: mocks.writeSync,
|
|
15
|
+
}));
|
|
16
|
+
vi.mock('@google/gemini-cli-core', () => ({
|
|
17
|
+
enableKittyKeyboardProtocol: mocks.enableKittyKeyboardProtocol,
|
|
18
|
+
disableKittyKeyboardProtocol: mocks.disableKittyKeyboardProtocol,
|
|
19
|
+
}));
|
|
20
|
+
describe('kittyProtocolDetector', () => {
|
|
21
|
+
let originalStdin;
|
|
22
|
+
let originalStdout;
|
|
23
|
+
let stdinListeners = {};
|
|
24
|
+
// Module functions
|
|
25
|
+
let detectAndEnableKittyProtocol;
|
|
26
|
+
let isKittyProtocolEnabled;
|
|
27
|
+
let enableSupportedProtocol;
|
|
28
|
+
beforeEach(async () => {
|
|
29
|
+
vi.resetModules();
|
|
30
|
+
vi.resetAllMocks();
|
|
31
|
+
vi.useFakeTimers();
|
|
32
|
+
const mod = await import('./kittyProtocolDetector.js');
|
|
33
|
+
detectAndEnableKittyProtocol = mod.detectAndEnableKittyProtocol;
|
|
34
|
+
isKittyProtocolEnabled = mod.isKittyProtocolEnabled;
|
|
35
|
+
enableSupportedProtocol = mod.enableSupportedProtocol;
|
|
36
|
+
// Mock process.stdin and stdout
|
|
37
|
+
originalStdin = process.stdin;
|
|
38
|
+
originalStdout = process.stdout;
|
|
39
|
+
stdinListeners = {};
|
|
40
|
+
Object.defineProperty(process, 'stdin', {
|
|
41
|
+
value: {
|
|
42
|
+
isTTY: true,
|
|
43
|
+
isRaw: false,
|
|
44
|
+
setRawMode: vi.fn(),
|
|
45
|
+
on: vi.fn((event, handler) => {
|
|
46
|
+
stdinListeners[event] = handler;
|
|
47
|
+
}),
|
|
48
|
+
removeListener: vi.fn(),
|
|
49
|
+
},
|
|
50
|
+
configurable: true,
|
|
51
|
+
});
|
|
52
|
+
Object.defineProperty(process, 'stdout', {
|
|
53
|
+
value: {
|
|
54
|
+
isTTY: true,
|
|
55
|
+
fd: 1,
|
|
56
|
+
},
|
|
57
|
+
configurable: true,
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
afterEach(() => {
|
|
61
|
+
Object.defineProperty(process, 'stdin', { value: originalStdin });
|
|
62
|
+
Object.defineProperty(process, 'stdout', { value: originalStdout });
|
|
63
|
+
vi.useRealTimers();
|
|
64
|
+
});
|
|
65
|
+
it('should resolve immediately if not TTY', async () => {
|
|
66
|
+
Object.defineProperty(process.stdin, 'isTTY', { value: false });
|
|
67
|
+
await detectAndEnableKittyProtocol();
|
|
68
|
+
expect(mocks.writeSync).not.toHaveBeenCalled();
|
|
69
|
+
});
|
|
70
|
+
it('should enable protocol if response indicates support', async () => {
|
|
71
|
+
const promise = detectAndEnableKittyProtocol();
|
|
72
|
+
// Simulate response
|
|
73
|
+
expect(stdinListeners['data']).toBeDefined();
|
|
74
|
+
// Send progressive enhancement response
|
|
75
|
+
stdinListeners['data'](Buffer.from('\x1b[?u'));
|
|
76
|
+
// Send device attributes response
|
|
77
|
+
stdinListeners['data'](Buffer.from('\x1b[?c'));
|
|
78
|
+
await promise;
|
|
79
|
+
expect(mocks.enableKittyKeyboardProtocol).toHaveBeenCalled();
|
|
80
|
+
expect(isKittyProtocolEnabled()).toBe(true);
|
|
81
|
+
});
|
|
82
|
+
it('should not enable protocol if timeout occurs', async () => {
|
|
83
|
+
const promise = detectAndEnableKittyProtocol();
|
|
84
|
+
// Fast forward time past timeout
|
|
85
|
+
vi.advanceTimersByTime(300);
|
|
86
|
+
await promise;
|
|
87
|
+
expect(mocks.enableKittyKeyboardProtocol).not.toHaveBeenCalled();
|
|
88
|
+
});
|
|
89
|
+
it('should wait longer if progressive enhancement received but not attributes', async () => {
|
|
90
|
+
const promise = detectAndEnableKittyProtocol();
|
|
91
|
+
// Send progressive enhancement response
|
|
92
|
+
stdinListeners['data'](Buffer.from('\x1b[?u'));
|
|
93
|
+
// Should not resolve yet
|
|
94
|
+
vi.advanceTimersByTime(300); // Original timeout passed
|
|
95
|
+
// Send device attributes response late
|
|
96
|
+
stdinListeners['data'](Buffer.from('\x1b[?c'));
|
|
97
|
+
await promise;
|
|
98
|
+
expect(mocks.enableKittyKeyboardProtocol).toHaveBeenCalled();
|
|
99
|
+
});
|
|
100
|
+
it('should handle re-enabling protocol', async () => {
|
|
101
|
+
// First, simulate successful detection to set kittySupported = true
|
|
102
|
+
const promise = detectAndEnableKittyProtocol();
|
|
103
|
+
stdinListeners['data'](Buffer.from('\x1b[?u'));
|
|
104
|
+
stdinListeners['data'](Buffer.from('\x1b[?c'));
|
|
105
|
+
await promise;
|
|
106
|
+
// Reset mocks to clear previous calls
|
|
107
|
+
mocks.enableKittyKeyboardProtocol.mockClear();
|
|
108
|
+
// Now test re-enabling
|
|
109
|
+
enableSupportedProtocol();
|
|
110
|
+
expect(mocks.enableKittyKeyboardProtocol).toHaveBeenCalled();
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
//# sourceMappingURL=kittyProtocolDetector.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"kittyProtocolDetector.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/kittyProtocolDetector.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEzE,oBAAoB;AACpB,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9B,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;IAClB,2BAA2B,EAAE,EAAE,CAAC,EAAE,EAAE;IACpC,4BAA4B,EAAE,EAAE,CAAC,EAAE,EAAE;CACtC,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IACxB,SAAS,EAAE,KAAK,CAAC,SAAS;CAC3B,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,2BAA2B,EAAE,KAAK,CAAC,2BAA2B;IAC9D,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;CACjE,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,aAAkD,CAAC;IACvD,IAAI,cAAoD,CAAC;IACzD,IAAI,cAAc,GAA2C,EAAE,CAAC;IAEhE,mBAAmB;IACnB,IAAI,4BAAsG,CAAC;IAC3G,IAAI,sBAA0F,CAAC;IAC/F,IAAI,uBAA4F,CAAC;IAEjG,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,EAAE,CAAC,YAAY,EAAE,CAAC;QAClB,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QACvD,4BAA4B,GAAG,GAAG,CAAC,4BAA4B,CAAC;QAChE,sBAAsB,GAAG,GAAG,CAAC,sBAAsB,CAAC;QACpD,uBAAuB,GAAG,GAAG,CAAC,uBAAuB,CAAC;QAEtD,gCAAgC;QAChC,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC;QAC9B,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;QAEhC,cAAc,GAAG,EAAE,CAAC;QAEpB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE;YACtC,KAAK,EAAE;gBACL,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,KAAK;gBACZ,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;gBACnB,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBAC3B,cAAc,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;gBAClC,CAAC,CAAC;gBACF,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;aACxB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE;YACvC,KAAK,EAAE;gBACL,KAAK,EAAE,IAAI;gBACX,EAAE,EAAE,CAAC;aACN;YACD,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;QAClE,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QACpE,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAChE,MAAM,4BAA4B,EAAE,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,MAAM,OAAO,GAAG,4BAA4B,EAAE,CAAC;QAE/C,oBAAoB;QACpB,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAE7C,wCAAwC;QACxC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAE/C,kCAAkC;QAClC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAE/C,MAAM,OAAO,CAAC;QAEd,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC7D,MAAM,CAAC,sBAAsB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,OAAO,GAAG,4BAA4B,EAAE,CAAC;QAE/C,iCAAiC;QACjC,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAE5B,MAAM,OAAO,CAAC;QAEd,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,OAAO,GAAG,4BAA4B,EAAE,CAAC;QAE/C,wCAAwC;QACxC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAE/C,yBAAyB;QACzB,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,0BAA0B;QAEvD,uCAAuC;QACvC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAE/C,MAAM,OAAO,CAAC;QAEd,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,oEAAoE;QACpE,MAAM,OAAO,GAAG,4BAA4B,EAAE,CAAC;QAC/C,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/C,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/C,MAAM,OAAO,CAAC;QAEd,sCAAsC;QACtC,KAAK,CAAC,2BAA2B,CAAC,SAAS,EAAE,CAAC;QAE9C,uBAAuB;QACvB,uBAAuB,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -164,31 +164,6 @@ async function configureVSCodeStyle(terminalName, appName) {
|
|
|
164
164
|
when: 'terminalFocus',
|
|
165
165
|
args: { text: VSCODE_SHIFT_ENTER_SEQUENCE },
|
|
166
166
|
};
|
|
167
|
-
// Check if ANY shift+enter or ctrl+enter bindings already exist
|
|
168
|
-
const existingShiftEnter = keybindings.find((kb) => {
|
|
169
|
-
const binding = kb;
|
|
170
|
-
return binding.key === 'shift+enter';
|
|
171
|
-
});
|
|
172
|
-
const existingCtrlEnter = keybindings.find((kb) => {
|
|
173
|
-
const binding = kb;
|
|
174
|
-
return binding.key === 'ctrl+enter';
|
|
175
|
-
});
|
|
176
|
-
if (existingShiftEnter || existingCtrlEnter) {
|
|
177
|
-
const messages = [];
|
|
178
|
-
if (existingShiftEnter) {
|
|
179
|
-
messages.push(`- Shift+Enter binding already exists`);
|
|
180
|
-
}
|
|
181
|
-
if (existingCtrlEnter) {
|
|
182
|
-
messages.push(`- Ctrl+Enter binding already exists`);
|
|
183
|
-
}
|
|
184
|
-
return {
|
|
185
|
-
success: false,
|
|
186
|
-
message: `Existing keybindings detected. Will not modify to avoid conflicts.\n` +
|
|
187
|
-
messages.join('\n') +
|
|
188
|
-
'\n' +
|
|
189
|
-
`Please check and modify manually if needed: ${keybindingsFile}`,
|
|
190
|
-
};
|
|
191
|
-
}
|
|
192
167
|
// Check if our specific bindings already exist
|
|
193
168
|
const hasOurShiftEnter = keybindings.some((kb) => {
|
|
194
169
|
const binding = kb;
|
|
@@ -202,24 +177,50 @@ async function configureVSCodeStyle(terminalName, appName) {
|
|
|
202
177
|
binding.command === 'workbench.action.terminal.sendSequence' &&
|
|
203
178
|
binding.args?.text === '\\\r\n');
|
|
204
179
|
});
|
|
205
|
-
if (
|
|
206
|
-
if (!hasOurShiftEnter)
|
|
207
|
-
keybindings.unshift(shiftEnterBinding);
|
|
208
|
-
if (!hasOurCtrlEnter)
|
|
209
|
-
keybindings.unshift(ctrlEnterBinding);
|
|
210
|
-
await fs.writeFile(keybindingsFile, JSON.stringify(keybindings, null, 4));
|
|
211
|
-
return {
|
|
212
|
-
success: true,
|
|
213
|
-
message: `Added Shift+Enter and Ctrl+Enter keybindings to ${terminalName}.\nModified: ${keybindingsFile}`,
|
|
214
|
-
requiresRestart: true,
|
|
215
|
-
};
|
|
216
|
-
}
|
|
217
|
-
else {
|
|
180
|
+
if (hasOurShiftEnter && hasOurCtrlEnter) {
|
|
218
181
|
return {
|
|
219
182
|
success: true,
|
|
220
183
|
message: `${terminalName} keybindings already configured.`,
|
|
221
184
|
};
|
|
222
185
|
}
|
|
186
|
+
// Check if ANY shift+enter or ctrl+enter bindings already exist (that are NOT ours)
|
|
187
|
+
const existingShiftEnter = keybindings.find((kb) => {
|
|
188
|
+
const binding = kb;
|
|
189
|
+
return binding.key === 'shift+enter';
|
|
190
|
+
});
|
|
191
|
+
const existingCtrlEnter = keybindings.find((kb) => {
|
|
192
|
+
const binding = kb;
|
|
193
|
+
return binding.key === 'ctrl+enter';
|
|
194
|
+
});
|
|
195
|
+
if (existingShiftEnter || existingCtrlEnter) {
|
|
196
|
+
const messages = [];
|
|
197
|
+
// Only report conflict if it's not our binding (though we checked above, partial matches might exist)
|
|
198
|
+
if (existingShiftEnter && !hasOurShiftEnter) {
|
|
199
|
+
messages.push(`- Shift+Enter binding already exists`);
|
|
200
|
+
}
|
|
201
|
+
if (existingCtrlEnter && !hasOurCtrlEnter) {
|
|
202
|
+
messages.push(`- Ctrl+Enter binding already exists`);
|
|
203
|
+
}
|
|
204
|
+
if (messages.length > 0) {
|
|
205
|
+
return {
|
|
206
|
+
success: false,
|
|
207
|
+
message: `Existing keybindings detected. Will not modify to avoid conflicts.\n` +
|
|
208
|
+
messages.join('\n') +
|
|
209
|
+
'\n' +
|
|
210
|
+
`Please check and modify manually if needed: ${keybindingsFile}`,
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
if (!hasOurShiftEnter)
|
|
215
|
+
keybindings.unshift(shiftEnterBinding);
|
|
216
|
+
if (!hasOurCtrlEnter)
|
|
217
|
+
keybindings.unshift(ctrlEnterBinding);
|
|
218
|
+
await fs.writeFile(keybindingsFile, JSON.stringify(keybindings, null, 4));
|
|
219
|
+
return {
|
|
220
|
+
success: true,
|
|
221
|
+
message: `Added Shift+Enter and Ctrl+Enter keybindings to ${terminalName}.\nModified: ${keybindingsFile}`,
|
|
222
|
+
requiresRestart: true,
|
|
223
|
+
};
|
|
223
224
|
}
|
|
224
225
|
catch (error) {
|
|
225
226
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminalSetup.js","sourceRoot":"","sources":["../../../../src/ui/utils/terminalSetup.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"terminalSetup.js","sourceRoot":"","sources":["../../../../src/ui/utils/terminalSetup.ts"],"names":[],"mappings":"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"}
|