@google/gemini-cli 0.9.0-nightly.20251003.2ab61dd1 → 0.9.0-nightly.20251005.7f8537a1
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 +2 -2
- package/dist/src/commands/extensions/update.js +2 -6
- package/dist/src/commands/extensions/update.js.map +1 -1
- package/dist/src/config/extensions/github.d.ts +1 -1
- package/dist/src/config/extensions/github.js +15 -30
- package/dist/src/config/extensions/github.js.map +1 -1
- package/dist/src/config/extensions/github.test.js +5 -10
- package/dist/src/config/extensions/github.test.js.map +1 -1
- package/dist/src/config/extensions/update.d.ts +1 -1
- package/dist/src/config/extensions/update.js +12 -7
- package/dist/src/config/extensions/update.js.map +1 -1
- package/dist/src/config/extensions/update.test.js +5 -5
- package/dist/src/config/extensions/update.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/ui/commands/extensionsCommand.js +30 -32
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.js +68 -18
- package/dist/src/ui/hooks/useExtensionUpdates.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.test.js +4 -4
- package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js +3 -17
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +13 -43
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
- package/dist/src/ui/state/extensions.d.ts +22 -3
- package/dist/src/ui/state/extensions.js +26 -4
- package/dist/src/ui/state/extensions.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.js +1 -5
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -3,10 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { requestConsentInteractive } from '../../config/extension.js';
|
|
7
|
-
import { updateAllUpdatableExtensions, updateExtension, checkForAllExtensionUpdates, } from '../../config/extensions/update.js';
|
|
8
6
|
import { getErrorMessage } from '../../utils/errors.js';
|
|
9
|
-
import { ExtensionUpdateState } from '../state/extensions.js';
|
|
10
7
|
import { MessageType } from '../types.js';
|
|
11
8
|
import { CommandKind, } from './types.js';
|
|
12
9
|
async function listAction(context) {
|
|
@@ -14,30 +11,46 @@ async function listAction(context) {
|
|
|
14
11
|
type: MessageType.EXTENSIONS_LIST,
|
|
15
12
|
}, Date.now());
|
|
16
13
|
}
|
|
17
|
-
|
|
14
|
+
function updateAction(context, args) {
|
|
18
15
|
const updateArgs = args.split(' ').filter((value) => value.length > 0);
|
|
19
16
|
const all = updateArgs.length === 1 && updateArgs[0] === '--all';
|
|
20
|
-
const names = all ?
|
|
21
|
-
let updateInfos = [];
|
|
17
|
+
const names = all ? null : updateArgs;
|
|
22
18
|
if (!all && names?.length === 0) {
|
|
23
19
|
context.ui.addItem({
|
|
24
20
|
type: MessageType.ERROR,
|
|
25
21
|
text: 'Usage: /extensions update <extension-names>|--all',
|
|
26
22
|
}, Date.now());
|
|
27
|
-
return;
|
|
23
|
+
return Promise.resolve();
|
|
28
24
|
}
|
|
25
|
+
let resolveUpdateComplete;
|
|
26
|
+
const updateComplete = new Promise((resolve) => (resolveUpdateComplete = resolve));
|
|
27
|
+
updateComplete.then((updateInfos) => {
|
|
28
|
+
if (updateInfos.length === 0) {
|
|
29
|
+
context.ui.addItem({
|
|
30
|
+
type: MessageType.INFO,
|
|
31
|
+
text: 'No extensions to update.',
|
|
32
|
+
}, Date.now());
|
|
33
|
+
}
|
|
34
|
+
context.ui.addItem({
|
|
35
|
+
type: MessageType.EXTENSIONS_LIST,
|
|
36
|
+
}, Date.now());
|
|
37
|
+
context.ui.setPendingItem(null);
|
|
38
|
+
});
|
|
29
39
|
try {
|
|
30
|
-
await checkForAllExtensionUpdates(context.services.config.getExtensions(), context.ui.dispatchExtensionStateUpdate);
|
|
31
40
|
context.ui.setPendingItem({
|
|
32
41
|
type: MessageType.EXTENSIONS_LIST,
|
|
33
42
|
});
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
context.ui.dispatchExtensionStateUpdate({
|
|
44
|
+
type: 'SCHEDULE_UPDATE',
|
|
45
|
+
payload: {
|
|
46
|
+
all,
|
|
47
|
+
names,
|
|
48
|
+
onComplete: (updateInfos) => {
|
|
49
|
+
resolveUpdateComplete(updateInfos);
|
|
50
|
+
},
|
|
51
|
+
},
|
|
52
|
+
});
|
|
53
|
+
if (names?.length) {
|
|
41
54
|
const extensions = context.services.config.getExtensions();
|
|
42
55
|
for (const name of names) {
|
|
43
56
|
const extension = extensions.find((extension) => extension.name === name);
|
|
@@ -48,32 +61,17 @@ async function updateAction(context, args) {
|
|
|
48
61
|
}, Date.now());
|
|
49
62
|
continue;
|
|
50
63
|
}
|
|
51
|
-
const updateInfo = await updateExtension(extension, workingDir, (description) => requestConsentInteractive(description, context.ui.addConfirmUpdateExtensionRequest), context.ui.extensionsUpdateState.get(extension.name)?.status ??
|
|
52
|
-
ExtensionUpdateState.UNKNOWN, context.ui.dispatchExtensionStateUpdate);
|
|
53
|
-
if (updateInfo)
|
|
54
|
-
updateInfos.push(updateInfo);
|
|
55
64
|
}
|
|
56
65
|
}
|
|
57
|
-
if (updateInfos.length === 0) {
|
|
58
|
-
context.ui.addItem({
|
|
59
|
-
type: MessageType.INFO,
|
|
60
|
-
text: 'No extensions to update.',
|
|
61
|
-
}, Date.now());
|
|
62
|
-
return;
|
|
63
|
-
}
|
|
64
66
|
}
|
|
65
67
|
catch (error) {
|
|
68
|
+
resolveUpdateComplete([]);
|
|
66
69
|
context.ui.addItem({
|
|
67
70
|
type: MessageType.ERROR,
|
|
68
71
|
text: getErrorMessage(error),
|
|
69
72
|
}, Date.now());
|
|
70
73
|
}
|
|
71
|
-
|
|
72
|
-
context.ui.addItem({
|
|
73
|
-
type: MessageType.EXTENSIONS_LIST,
|
|
74
|
-
}, Date.now());
|
|
75
|
-
context.ui.setPendingItem(null);
|
|
76
|
-
}
|
|
74
|
+
return updateComplete.then((_) => { });
|
|
77
75
|
}
|
|
78
76
|
const listExtensionsCommand = {
|
|
79
77
|
name: 'list',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensionsCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/extensionsCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"extensionsCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/extensionsCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAGL,WAAW,GACZ,MAAM,YAAY,CAAC;AAEpB,KAAK,UAAU,UAAU,CAAC,OAAuB;IAC/C,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;QACE,IAAI,EAAE,WAAW,CAAC,eAAe;KAClC,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,OAAuB,EAAE,IAAY;IACzD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvE,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;IACjE,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;IAEtC,IAAI,CAAC,GAAG,IAAI,KAAK,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;YACE,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,IAAI,EAAE,mDAAmD;SAC1D,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,qBAAkE,CAAC;IACvE,MAAM,cAAc,GAAG,IAAI,OAAO,CAChC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,qBAAqB,GAAG,OAAO,CAAC,CAC/C,CAAC;IACF,cAAc,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;QAClC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,0BAA0B;aACjC,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;YACE,IAAI,EAAE,WAAW,CAAC,eAAe;SAClC,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QACF,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC;YACxB,IAAI,EAAE,WAAW,CAAC,eAAe;SAClC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,4BAA4B,CAAC;YACtC,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE;gBACP,GAAG;gBACH,KAAK;gBACL,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE;oBAC1B,qBAAqB,CAAC,WAAW,CAAC,CAAC;gBACrC,CAAC;aACF;SACF,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,EAAE,CAAC;YAClB,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAO,CAAC,aAAa,EAAE,CAAC;YAC5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CACvC,CAAC;gBACF,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;wBACE,IAAI,EAAE,WAAW,CAAC,KAAK;wBACvB,IAAI,EAAE,aAAa,IAAI,aAAa;qBACrC,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;oBACF,SAAS;gBACX,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,qBAAsB,CAAC,EAAE,CAAC,CAAC;QAC3B,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;YACE,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC;SAC7B,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;IACJ,CAAC;IACD,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,qBAAqB,GAAiB;IAC1C,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,wBAAwB;IACrC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,UAAU;CACnB,CAAC;AAEF,MAAM,uBAAuB,GAAiB;IAC5C,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,0DAA0D;IACvE,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,YAAY;IACpB,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;QACxC,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAClE,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACjD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAC5B,CAAC;QAEF,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACnE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAiB;IAC7C,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,mBAAmB;IAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,WAAW,EAAE,CAAC,qBAAqB,EAAE,uBAAuB,CAAC;IAC7D,MAAM,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IACxB,+CAA+C;IAC/C,qBAAqB,CAAC,MAAO,CAAC,OAAO,EAAE,IAAI,CAAC;CAC/C,CAAC"}
|
|
@@ -8,7 +8,7 @@ import { ExtensionUpdateState, extensionUpdatesReducer, initialExtensionUpdatesS
|
|
|
8
8
|
import { useCallback, useEffect, useMemo, useReducer } from 'react';
|
|
9
9
|
import { MessageType } from '../types.js';
|
|
10
10
|
import { checkForAllExtensionUpdates, updateExtension, } from '../../config/extensions/update.js';
|
|
11
|
-
import { requestConsentInteractive } from '../../config/extension.js';
|
|
11
|
+
import { requestConsentInteractive, } from '../../config/extension.js';
|
|
12
12
|
import { checkExhaustive } from '../../utils/checks.js';
|
|
13
13
|
function confirmationRequestsReducer(state, action) {
|
|
14
14
|
switch (action.type) {
|
|
@@ -18,7 +18,6 @@ function confirmationRequestsReducer(state, action) {
|
|
|
18
18
|
return state.filter((r) => r !== action.request);
|
|
19
19
|
default:
|
|
20
20
|
checkExhaustive(action);
|
|
21
|
-
return state;
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
23
|
export const useExtensionUpdates = (extensions, addItem, cwd) => {
|
|
@@ -42,29 +41,70 @@ export const useExtensionUpdates = (extensions, addItem, cwd) => {
|
|
|
42
41
|
});
|
|
43
42
|
}, [dispatchConfirmUpdateExtensionRequests]);
|
|
44
43
|
useEffect(() => {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
44
|
+
const extensionsToCheck = extensions.filter((extension) => {
|
|
45
|
+
const currentStatus = extensionsUpdateState.extensionStatuses.get(extension.name);
|
|
46
|
+
if (!currentStatus)
|
|
47
|
+
return true;
|
|
48
|
+
const currentState = currentStatus.status;
|
|
49
|
+
return !currentState || currentState === ExtensionUpdateState.UNKNOWN;
|
|
50
|
+
});
|
|
51
|
+
if (extensionsToCheck.length === 0)
|
|
52
|
+
return;
|
|
53
|
+
checkForAllExtensionUpdates(extensionsToCheck, dispatchExtensionStateUpdate, cwd);
|
|
54
|
+
}, [
|
|
55
|
+
extensions,
|
|
56
|
+
extensionsUpdateState.extensionStatuses,
|
|
57
|
+
cwd,
|
|
58
|
+
dispatchExtensionStateUpdate,
|
|
59
|
+
]);
|
|
49
60
|
useEffect(() => {
|
|
50
61
|
if (extensionsUpdateState.batchChecksInProgress > 0) {
|
|
51
62
|
return;
|
|
52
63
|
}
|
|
64
|
+
const scheduledUpdate = extensionsUpdateState.scheduledUpdate;
|
|
65
|
+
if (scheduledUpdate) {
|
|
66
|
+
dispatchExtensionStateUpdate({
|
|
67
|
+
type: 'CLEAR_SCHEDULED_UPDATE',
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
function shouldDoUpdate(extension) {
|
|
71
|
+
if (scheduledUpdate) {
|
|
72
|
+
if (scheduledUpdate.all) {
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
return scheduledUpdate.names?.includes(extension.name) === true;
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
return extension.installMetadata?.autoUpdate === true;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
53
81
|
let extensionsWithUpdatesCount = 0;
|
|
82
|
+
// We only notify if we have unprocessed extensions in the UPDATE_AVAILABLE
|
|
83
|
+
// state.
|
|
84
|
+
let shouldNotifyOfUpdates = false;
|
|
85
|
+
const updatePromises = [];
|
|
54
86
|
for (const extension of extensions) {
|
|
55
87
|
const currentState = extensionsUpdateState.extensionStatuses.get(extension.name);
|
|
56
88
|
if (!currentState ||
|
|
57
|
-
currentState.processed ||
|
|
58
89
|
currentState.status !== ExtensionUpdateState.UPDATE_AVAILABLE) {
|
|
59
90
|
continue;
|
|
60
91
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
92
|
+
const shouldUpdate = shouldDoUpdate(extension);
|
|
93
|
+
if (!shouldUpdate) {
|
|
94
|
+
extensionsWithUpdatesCount++;
|
|
95
|
+
if (!currentState.notified) {
|
|
96
|
+
// Mark as processed immediately to avoid re-triggering.
|
|
97
|
+
dispatchExtensionStateUpdate({
|
|
98
|
+
type: 'SET_NOTIFIED',
|
|
99
|
+
payload: { name: extension.name, notified: true },
|
|
100
|
+
});
|
|
101
|
+
shouldNotifyOfUpdates = true;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
const updatePromise = updateExtension(extension, cwd, (description) => requestConsentInteractive(description, addConfirmUpdateExtensionRequest), currentState.status, dispatchExtensionStateUpdate);
|
|
106
|
+
updatePromises.push(updatePromise);
|
|
107
|
+
updatePromise
|
|
68
108
|
.then((result) => {
|
|
69
109
|
if (!result)
|
|
70
110
|
return;
|
|
@@ -80,17 +120,27 @@ export const useExtensionUpdates = (extensions, addItem, cwd) => {
|
|
|
80
120
|
}, Date.now());
|
|
81
121
|
});
|
|
82
122
|
}
|
|
83
|
-
else {
|
|
84
|
-
extensionsWithUpdatesCount++;
|
|
85
|
-
}
|
|
86
123
|
}
|
|
87
|
-
if (
|
|
124
|
+
if (shouldNotifyOfUpdates) {
|
|
88
125
|
const s = extensionsWithUpdatesCount > 1 ? 's' : '';
|
|
89
126
|
addItem({
|
|
90
127
|
type: MessageType.INFO,
|
|
91
128
|
text: `You have ${extensionsWithUpdatesCount} extension${s} with an update available, run "/extensions list" for more information.`,
|
|
92
129
|
}, Date.now());
|
|
93
130
|
}
|
|
131
|
+
if (scheduledUpdate) {
|
|
132
|
+
Promise.all(updatePromises).then((results) => {
|
|
133
|
+
const nonNullResults = results.filter((result) => result != null);
|
|
134
|
+
scheduledUpdate.onCompleteCallbacks.forEach((callback) => {
|
|
135
|
+
try {
|
|
136
|
+
callback(nonNullResults);
|
|
137
|
+
}
|
|
138
|
+
catch (e) {
|
|
139
|
+
console.error(getErrorMessage(e));
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
});
|
|
143
|
+
}
|
|
94
144
|
}, [
|
|
95
145
|
extensions,
|
|
96
146
|
extensionsUpdateState,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExtensionUpdates.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEpE,OAAO,EAAE,WAAW,EAA4B,MAAM,aAAa,CAAC;AACpE,OAAO,EACL,2BAA2B,EAC3B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"useExtensionUpdates.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEpE,OAAO,EAAE,WAAW,EAA4B,MAAM,aAAa,CAAC;AACpE,OAAO,EACL,2BAA2B,EAC3B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,yBAAyB,GAE1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAWxD,SAAS,2BAA2B,CAClC,KAAmC,EACnC,MAAiC;IAEjC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,KAAK;YACR,OAAO,CAAC,GAAG,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACpC,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,OAAO,CAAC,CAAC;QACnD;YACE,eAAe,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,UAAgC,EAChC,OAA2C,EAC3C,GAAW,EACX,EAAE;IACF,MAAM,CAAC,qBAAqB,EAAE,4BAA4B,CAAC,GAAG,UAAU,CACtE,uBAAuB,EACvB,4BAA4B,CAC7B,CAAC;IACF,MAAM,CACJ,8BAA8B,EAC9B,sCAAsC,EACvC,GAAG,UAAU,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;IAChD,MAAM,gCAAgC,GAAG,WAAW,CAClD,CAAC,QAA6B,EAAE,EAAE;QAChC,MAAM,cAAc,GAAG;YACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,SAAS,EAAE,CAAC,SAAkB,EAAE,EAAE;gBAChC,+DAA+D;gBAC/D,sCAAsC,CAAC;oBACrC,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,cAAc;iBACxB,CAAC,CAAC;gBACH,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC;SACF,CAAC;QACF,sCAAsC,CAAC;YACrC,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;IACL,CAAC,EACD,CAAC,sCAAsC,CAAC,CACzC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;YACxD,MAAM,aAAa,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,GAAG,CAC/D,SAAS,CAAC,IAAI,CACf,CAAC;YACF,IAAI,CAAC,aAAa;gBAAE,OAAO,IAAI,CAAC;YAChC,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC;YAC1C,OAAO,CAAC,YAAY,IAAI,YAAY,KAAK,oBAAoB,CAAC,OAAO,CAAC;QACxE,CAAC,CAAC,CAAC;QACH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC3C,2BAA2B,CACzB,iBAAiB,EACjB,4BAA4B,EAC5B,GAAG,CACJ,CAAC;IACJ,CAAC,EAAE;QACD,UAAU;QACV,qBAAqB,CAAC,iBAAiB;QACvC,GAAG;QACH,4BAA4B;KAC7B,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,qBAAqB,CAAC,qBAAqB,GAAG,CAAC,EAAE,CAAC;YACpD,OAAO;QACT,CAAC;QACD,MAAM,eAAe,GAAG,qBAAqB,CAAC,eAAe,CAAC;QAC9D,IAAI,eAAe,EAAE,CAAC;YACpB,4BAA4B,CAAC;gBAC3B,IAAI,EAAE,wBAAwB;aAC/B,CAAC,CAAC;QACL,CAAC;QAED,SAAS,cAAc,CAAC,SAA6B;YACnD,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,eAAe,CAAC,GAAG,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,OAAO,SAAS,CAAC,eAAe,EAAE,UAAU,KAAK,IAAI,CAAC;YACxD,CAAC;QACH,CAAC;QAED,IAAI,0BAA0B,GAAG,CAAC,CAAC;QACnC,2EAA2E;QAC3E,SAAS;QACT,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAClC,MAAM,cAAc,GAAoD,EAAE,CAAC;QAC3E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,YAAY,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,GAAG,CAC9D,SAAS,CAAC,IAAI,CACf,CAAC;YACF,IACE,CAAC,YAAY;gBACb,YAAY,CAAC,MAAM,KAAK,oBAAoB,CAAC,gBAAgB,EAC7D,CAAC;gBACD,SAAS;YACX,CAAC;YACD,MAAM,YAAY,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;YAC/C,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,0BAA0B,EAAE,CAAC;gBAC7B,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC3B,wDAAwD;oBACxD,4BAA4B,CAAC;wBAC3B,IAAI,EAAE,cAAc;wBACpB,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;qBAClD,CAAC,CAAC;oBACH,qBAAqB,GAAG,IAAI,CAAC;gBAC/B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,aAAa,GAAG,eAAe,CACnC,SAAS,EACT,GAAG,EACH,CAAC,WAAW,EAAE,EAAE,CACd,yBAAyB,CACvB,WAAW,EACX,gCAAgC,CACjC,EACH,YAAY,CAAC,MAAM,EACnB,4BAA4B,CAC7B,CAAC;gBACF,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBACnC,aAAa;qBACV,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;oBACf,IAAI,CAAC,MAAM;wBAAE,OAAO;oBACpB,OAAO,CACL;wBACE,IAAI,EAAE,WAAW,CAAC,IAAI;wBACtB,IAAI,EAAE,cAAc,SAAS,CAAC,IAAI,2BAA2B,MAAM,CAAC,eAAe,MAAM,MAAM,CAAC,cAAc,GAAG;qBAClH,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;gBACJ,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,OAAO,CACL;wBACE,IAAI,EAAE,WAAW,CAAC,KAAK;wBACvB,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC;qBAC7B,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;gBACJ,CAAC,CAAC,CAAC;YACP,CAAC;QACH,CAAC;QACD,IAAI,qBAAqB,EAAE,CAAC;YAC1B,MAAM,CAAC,GAAG,0BAA0B,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,OAAO,CACL;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,YAAY,0BAA0B,aAAa,CAAC,yEAAyE;aACpI,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QACJ,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3C,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC;gBAClE,eAAe,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACvD,IAAI,CAAC;wBACH,QAAQ,CAAC,cAAc,CAAC,CAAC;oBAC3B,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EAAE;QACD,UAAU;QACV,qBAAqB;QACrB,gCAAgC;QAChC,OAAO;QACP,GAAG;KACJ,CAAC,CAAC;IAEH,MAAM,6BAA6B,GAAG,OAAO,CAAC,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAgC,CAAC;QACvD,KAAK,MAAM,CACT,GAAG,EACH,KAAK,EACN,IAAI,qBAAqB,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAE5B,OAAO;QACL,qBAAqB,EAAE,6BAA6B;QACpD,6BAA6B,EAAE,qBAAqB,CAAC,iBAAiB;QACtE,4BAA4B;QAC5B,8BAA8B;QAC9B,gCAAgC;KACjC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -58,7 +58,7 @@ describe('useExtensionUpdates', () => {
|
|
|
58
58
|
];
|
|
59
59
|
const addItem = vi.fn();
|
|
60
60
|
const cwd = '/test/cwd';
|
|
61
|
-
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (
|
|
61
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
|
|
62
62
|
dispatch({
|
|
63
63
|
type: 'SET_STATE',
|
|
64
64
|
payload: {
|
|
@@ -88,7 +88,7 @@ describe('useExtensionUpdates', () => {
|
|
|
88
88
|
});
|
|
89
89
|
const extension = annotateActiveExtensions([loadExtension({ extensionDir, workspaceDir: tempHomeDir })], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()))[0];
|
|
90
90
|
const addItem = vi.fn();
|
|
91
|
-
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (
|
|
91
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
|
|
92
92
|
dispatch({
|
|
93
93
|
type: 'SET_STATE',
|
|
94
94
|
payload: {
|
|
@@ -142,7 +142,7 @@ describe('useExtensionUpdates', () => {
|
|
|
142
142
|
}),
|
|
143
143
|
], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()));
|
|
144
144
|
const addItem = vi.fn();
|
|
145
|
-
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (
|
|
145
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
|
|
146
146
|
dispatch({
|
|
147
147
|
type: 'SET_STATE',
|
|
148
148
|
payload: {
|
|
@@ -211,7 +211,7 @@ describe('useExtensionUpdates', () => {
|
|
|
211
211
|
];
|
|
212
212
|
const addItem = vi.fn();
|
|
213
213
|
const cwd = '/test/cwd';
|
|
214
|
-
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (
|
|
214
|
+
vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (_extensions, dispatch, _cwd) => {
|
|
215
215
|
dispatch({ type: 'BATCH_CHECK_START' });
|
|
216
216
|
dispatch({
|
|
217
217
|
type: 'SET_STATE',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { AuthType,
|
|
6
|
+
import { AuthType, TerminalQuotaError, UserTierId, } from '@google/gemini-cli-core';
|
|
7
7
|
import { useCallback, useEffect, useRef, useState } from 'react';
|
|
8
8
|
import {} from './useHistoryManager.js';
|
|
9
9
|
import { AuthState, MessageType } from '../types.js';
|
|
@@ -26,7 +26,7 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setAuthS
|
|
|
26
26
|
// Use actual user tier if available; otherwise, default to FREE tier behavior (safe default)
|
|
27
27
|
const isPaidTier = userTier === UserTierId.LEGACY || userTier === UserTierId.STANDARD;
|
|
28
28
|
let message;
|
|
29
|
-
if (error
|
|
29
|
+
if (error instanceof TerminalQuotaError) {
|
|
30
30
|
// Pro Quota specific messages (Interactive)
|
|
31
31
|
if (isPaidTier) {
|
|
32
32
|
message = `⚡ You have reached your daily ${failedModel} quota limit.
|
|
@@ -38,20 +38,6 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setAuthS
|
|
|
38
38
|
⚡ You can choose to authenticate with a paid API key or continue with the fallback model.
|
|
39
39
|
⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
|
|
40
40
|
⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
|
|
41
|
-
⚡ You can switch authentication methods by typing /auth`;
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
else if (error && isGenericQuotaExceededError(error)) {
|
|
45
|
-
// Generic Quota (Automatic fallback)
|
|
46
|
-
const actionMessage = `⚡ You have reached your daily quota limit.\n⚡ Automatically switching from ${failedModel} to ${fallbackModel} for the remainder of this session.`;
|
|
47
|
-
if (isPaidTier) {
|
|
48
|
-
message = `${actionMessage}
|
|
49
|
-
⚡ To continue accessing the ${failedModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
|
|
50
|
-
}
|
|
51
|
-
else {
|
|
52
|
-
message = `${actionMessage}
|
|
53
|
-
⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
|
|
54
|
-
⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
|
|
55
41
|
⚡ You can switch authentication methods by typing /auth`;
|
|
56
42
|
}
|
|
57
43
|
}
|
|
@@ -79,7 +65,7 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setAuthS
|
|
|
79
65
|
setModelSwitchedFromQuotaError(true);
|
|
80
66
|
config.setQuotaErrorOccurred(true);
|
|
81
67
|
// Interactive Fallback for Pro quota
|
|
82
|
-
if (error
|
|
68
|
+
if (error instanceof TerminalQuotaError) {
|
|
83
69
|
if (isDialogPending.current) {
|
|
84
70
|
return 'stop'; // A dialog is already active, so just stop this request.
|
|
85
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuotaAndFallback.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EAIR,
|
|
1
|
+
{"version":3,"file":"useQuotaAndFallback.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,28 +5,23 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
|
|
7
7
|
import { act, renderHook } from '@testing-library/react';
|
|
8
|
-
import { UserTierId, AuthType,
|
|
8
|
+
import { UserTierId, AuthType, TerminalQuotaError, makeFakeConfig, } from '@google/gemini-cli-core';
|
|
9
9
|
import { useQuotaAndFallback } from './useQuotaAndFallback.js';
|
|
10
10
|
import { AuthState, MessageType } from '../types.js';
|
|
11
|
-
// Mock the error checking functions from the core package to control test scenarios
|
|
12
|
-
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
13
|
-
const original = await importOriginal();
|
|
14
|
-
return {
|
|
15
|
-
...original,
|
|
16
|
-
isGenericQuotaExceededError: vi.fn(),
|
|
17
|
-
isProQuotaExceededError: vi.fn(),
|
|
18
|
-
};
|
|
19
|
-
});
|
|
20
11
|
describe('useQuotaAndFallback', () => {
|
|
21
12
|
let mockConfig;
|
|
22
13
|
let mockHistoryManager;
|
|
23
14
|
let mockSetAuthState;
|
|
24
15
|
let mockSetModelSwitchedFromQuotaError;
|
|
25
16
|
let setFallbackHandlerSpy;
|
|
26
|
-
|
|
27
|
-
const mockedIsProQuotaExceededError = isProQuotaExceededError;
|
|
17
|
+
let mockGoogleApiError;
|
|
28
18
|
beforeEach(() => {
|
|
29
19
|
mockConfig = makeFakeConfig();
|
|
20
|
+
mockGoogleApiError = {
|
|
21
|
+
code: 429,
|
|
22
|
+
message: 'mock error',
|
|
23
|
+
details: [],
|
|
24
|
+
};
|
|
30
25
|
// Spy on the method that requires the private field and mock its return.
|
|
31
26
|
// This is cleaner than modifying the config class for tests.
|
|
32
27
|
vi.spyOn(mockConfig, 'getContentGeneratorConfig').mockReturnValue({
|
|
@@ -43,8 +38,6 @@ describe('useQuotaAndFallback', () => {
|
|
|
43
38
|
mockSetModelSwitchedFromQuotaError = vi.fn();
|
|
44
39
|
setFallbackHandlerSpy = vi.spyOn(mockConfig, 'setFallbackModelHandler');
|
|
45
40
|
vi.spyOn(mockConfig, 'setQuotaErrorOccurred');
|
|
46
|
-
mockedIsGenericQuotaExceededError.mockReturnValue(false);
|
|
47
|
-
mockedIsProQuotaExceededError.mockReturnValue(false);
|
|
48
41
|
});
|
|
49
42
|
afterEach(() => {
|
|
50
43
|
vi.clearAllMocks();
|
|
@@ -91,22 +84,6 @@ describe('useQuotaAndFallback', () => {
|
|
|
91
84
|
});
|
|
92
85
|
describe('Automatic Fallback Scenarios', () => {
|
|
93
86
|
const testCases = [
|
|
94
|
-
{
|
|
95
|
-
errorType: 'generic',
|
|
96
|
-
tier: UserTierId.FREE,
|
|
97
|
-
expectedMessageSnippets: [
|
|
98
|
-
'Automatically switching from model-A to model-B',
|
|
99
|
-
'upgrade to a Gemini Code Assist Standard or Enterprise plan',
|
|
100
|
-
],
|
|
101
|
-
},
|
|
102
|
-
{
|
|
103
|
-
errorType: 'generic',
|
|
104
|
-
tier: UserTierId.STANDARD, // Paid tier
|
|
105
|
-
expectedMessageSnippets: [
|
|
106
|
-
'Automatically switching from model-A to model-B',
|
|
107
|
-
'switch to using a paid API key from AI Studio',
|
|
108
|
-
],
|
|
109
|
-
},
|
|
110
87
|
{
|
|
111
88
|
errorType: 'other',
|
|
112
89
|
tier: UserTierId.FREE,
|
|
@@ -126,9 +103,8 @@ describe('useQuotaAndFallback', () => {
|
|
|
126
103
|
];
|
|
127
104
|
for (const { errorType, tier, expectedMessageSnippets } of testCases) {
|
|
128
105
|
it(`should handle ${errorType} error for ${tier} tier correctly`, async () => {
|
|
129
|
-
mockedIsGenericQuotaExceededError.mockReturnValue(errorType === 'generic');
|
|
130
106
|
const handler = getRegisteredHandler(tier);
|
|
131
|
-
const result = await handler('model-A', 'model-B', new Error('
|
|
107
|
+
const result = await handler('model-A', 'model-B', new Error('some error'));
|
|
132
108
|
// Automatic fallbacks should return 'stop'
|
|
133
109
|
expect(result).toBe('stop');
|
|
134
110
|
expect(mockHistoryManager.addItem).toHaveBeenCalledWith(expect.objectContaining({ type: MessageType.INFO }), expect.any(Number));
|
|
@@ -143,9 +119,6 @@ describe('useQuotaAndFallback', () => {
|
|
|
143
119
|
}
|
|
144
120
|
});
|
|
145
121
|
describe('Interactive Fallback (Pro Quota Error)', () => {
|
|
146
|
-
beforeEach(() => {
|
|
147
|
-
mockedIsProQuotaExceededError.mockReturnValue(true);
|
|
148
|
-
});
|
|
149
122
|
it('should set an interactive request and wait for user choice', async () => {
|
|
150
123
|
const { result } = renderHook(() => useQuotaAndFallback({
|
|
151
124
|
config: mockConfig,
|
|
@@ -157,7 +130,7 @@ describe('useQuotaAndFallback', () => {
|
|
|
157
130
|
const handler = setFallbackHandlerSpy.mock
|
|
158
131
|
.calls[0][0];
|
|
159
132
|
// Call the handler but do not await it, to check the intermediate state
|
|
160
|
-
const promise = handler('gemini-pro', 'gemini-flash', new
|
|
133
|
+
const promise = handler('gemini-pro', 'gemini-flash', new TerminalQuotaError('pro quota', mockGoogleApiError));
|
|
161
134
|
await act(async () => { });
|
|
162
135
|
// The hook should now have a pending request for the UI to handle
|
|
163
136
|
expect(result.current.proQuotaRequest).not.toBeNull();
|
|
@@ -182,11 +155,11 @@ describe('useQuotaAndFallback', () => {
|
|
|
182
155
|
}));
|
|
183
156
|
const handler = setFallbackHandlerSpy.mock
|
|
184
157
|
.calls[0][0];
|
|
185
|
-
const promise1 = handler('gemini-pro', 'gemini-flash', new
|
|
158
|
+
const promise1 = handler('gemini-pro', 'gemini-flash', new TerminalQuotaError('pro quota 1', mockGoogleApiError));
|
|
186
159
|
await act(async () => { });
|
|
187
160
|
const firstRequest = result.current.proQuotaRequest;
|
|
188
161
|
expect(firstRequest).not.toBeNull();
|
|
189
|
-
const result2 = await handler('gemini-pro', 'gemini-flash', new
|
|
162
|
+
const result2 = await handler('gemini-pro', 'gemini-flash', new TerminalQuotaError('pro quota 2', mockGoogleApiError));
|
|
190
163
|
// The lock should have stopped the second request
|
|
191
164
|
expect(result2).toBe('stop');
|
|
192
165
|
expect(result.current.proQuotaRequest).toBe(firstRequest);
|
|
@@ -200,9 +173,6 @@ describe('useQuotaAndFallback', () => {
|
|
|
200
173
|
});
|
|
201
174
|
});
|
|
202
175
|
describe('handleProQuotaChoice', () => {
|
|
203
|
-
beforeEach(() => {
|
|
204
|
-
mockedIsProQuotaExceededError.mockReturnValue(true);
|
|
205
|
-
});
|
|
206
176
|
it('should do nothing if there is no pending pro quota request', () => {
|
|
207
177
|
const { result } = renderHook(() => useQuotaAndFallback({
|
|
208
178
|
config: mockConfig,
|
|
@@ -227,7 +197,7 @@ describe('useQuotaAndFallback', () => {
|
|
|
227
197
|
}));
|
|
228
198
|
const handler = setFallbackHandlerSpy.mock
|
|
229
199
|
.calls[0][0];
|
|
230
|
-
const promise = handler('gemini-pro', 'gemini-flash', new
|
|
200
|
+
const promise = handler('gemini-pro', 'gemini-flash', new TerminalQuotaError('pro quota', mockGoogleApiError));
|
|
231
201
|
await act(async () => { }); // Allow state to update
|
|
232
202
|
act(() => {
|
|
233
203
|
result.current.handleProQuotaChoice('auth');
|
|
@@ -248,7 +218,7 @@ describe('useQuotaAndFallback', () => {
|
|
|
248
218
|
const handler = setFallbackHandlerSpy.mock
|
|
249
219
|
.calls[0][0];
|
|
250
220
|
// The first `addItem` call is for the initial quota error message
|
|
251
|
-
const promise = handler('gemini-pro', 'gemini-flash', new
|
|
221
|
+
const promise = handler('gemini-pro', 'gemini-flash', new TerminalQuotaError('pro quota', mockGoogleApiError));
|
|
252
222
|
await act(async () => { }); // Allow state to update
|
|
253
223
|
act(() => {
|
|
254
224
|
result.current.handleProQuotaChoice('continue');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuotaAndFallback.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,EAAE,EACF,QAAQ,EACR,EAAE,EACF,MAAM,EACN,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAGL,UAAU,EACV,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"useQuotaAndFallback.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.test.ts"],"names":[],"mappings":"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"}
|