@google/gemini-cli 0.5.0-nightly.20250908.4693137b → 0.5.0-preview
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/install.js +5 -12
- package/dist/src/commands/extensions/install.js.map +1 -1
- package/dist/src/commands/extensions/install.test.js +1 -16
- package/dist/src/commands/extensions/install.test.js.map +1 -1
- package/dist/src/config/config.js +1 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension.d.ts +1 -0
- package/dist/src/config/extension.js +70 -46
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/settings.js +2 -2
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +31 -6
- package/dist/src/config/settingsSchema.js +24 -3
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +62 -55
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/gemini.js +4 -37
- package/dist/src/gemini.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 +75 -73
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/ui/AppContainer.js +40 -136
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +199 -16
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/components/AppHeader.js +5 -2
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/Composer.js +2 -1
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/ConfigInitDisplay.d.ts +6 -0
- package/dist/src/ui/components/ConfigInitDisplay.js +37 -0
- package/dist/src/ui/components/ConfigInitDisplay.js.map +1 -0
- package/dist/src/ui/components/DialogManager.js +2 -3
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.d.ts +5 -0
- package/dist/src/ui/components/GeminiRespondingSpinner.js +5 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.d.ts +2 -2
- package/dist/src/ui/components/ProQuotaDialog.js +2 -2
- package/dist/src/ui/components/ProQuotaDialog.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.test.js +3 -3
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +20 -5
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +144 -79
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.js +10 -27
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.test.d.ts +6 -0
- package/dist/src/ui/components/ThemeDialog.test.js +65 -0
- package/dist/src/ui/components/ThemeDialog.test.js.map +1 -0
- package/dist/src/ui/components/shared/EnumSelector.d.ts +18 -0
- package/dist/src/ui/components/shared/EnumSelector.js +44 -0
- package/dist/src/ui/components/shared/EnumSelector.js.map +1 -0
- package/dist/src/ui/components/shared/EnumSelector.test.d.ts +6 -0
- package/dist/src/ui/components/shared/EnumSelector.test.js +70 -0
- package/dist/src/ui/components/shared/EnumSelector.test.js.map +1 -0
- package/dist/src/ui/components/shared/ScopeSelector.d.ts +19 -0
- package/dist/src/ui/components/shared/ScopeSelector.js +11 -0
- package/dist/src/ui/components/shared/ScopeSelector.js.map +1 -0
- package/dist/src/ui/contexts/UIStateContext.d.ts +8 -2
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.d.ts +1 -2
- package/dist/src/ui/hooks/useFolderTrust.js +21 -8
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +36 -34
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useMessageQueue.d.ts +2 -1
- package/dist/src/ui/hooks/useMessageQueue.js +5 -3
- package/dist/src/ui/hooks/useMessageQueue.js.map +1 -1
- package/dist/src/ui/hooks/useMessageQueue.test.js +9 -0
- package/dist/src/ui/hooks/useMessageQueue.test.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.d.ts +21 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.js +122 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.test.d.ts +6 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +269 -0
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -0
- package/dist/src/utils/settingsUtils.d.ts +16 -6
- package/dist/src/utils/settingsUtils.js +35 -25
- package/dist/src/utils/settingsUtils.js.map +1 -1
- package/dist/src/utils/settingsUtils.test.js +418 -156
- package/dist/src/utils/settingsUtils.test.js.map +1 -1
- package/dist/src/zed-integration/schema.d.ts +4 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/google-gemini-cli-0.3.4.tgz +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThemeDialog.js","sourceRoot":"","sources":["../../../../src/ui/components/ThemeDialog.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"ThemeDialog.js","sourceRoot":"","sources":["../../../../src/ui/components/ThemeDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { render } from 'ink-testing-library';
|
|
8
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
9
|
+
import { ThemeDialog } from './ThemeDialog.js';
|
|
10
|
+
import { LoadedSettings } from '../../config/settings.js';
|
|
11
|
+
import { KeypressProvider } from '../contexts/KeypressContext.js';
|
|
12
|
+
import { SettingsContext } from '../contexts/SettingsContext.js';
|
|
13
|
+
import { DEFAULT_THEME, themeManager } from '../themes/theme-manager.js';
|
|
14
|
+
import { act } from 'react';
|
|
15
|
+
const createMockSettings = (userSettings = {}, workspaceSettings = {}, systemSettings = {}) => new LoadedSettings({
|
|
16
|
+
settings: { ui: { customThemes: {} }, ...systemSettings },
|
|
17
|
+
path: '/system/settings.json',
|
|
18
|
+
}, {
|
|
19
|
+
settings: {},
|
|
20
|
+
path: '/system/system-defaults.json',
|
|
21
|
+
}, {
|
|
22
|
+
settings: {
|
|
23
|
+
ui: { customThemes: {} },
|
|
24
|
+
...userSettings,
|
|
25
|
+
},
|
|
26
|
+
path: '/user/settings.json',
|
|
27
|
+
}, {
|
|
28
|
+
settings: {
|
|
29
|
+
ui: { customThemes: {} },
|
|
30
|
+
...workspaceSettings,
|
|
31
|
+
},
|
|
32
|
+
path: '/workspace/settings.json',
|
|
33
|
+
}, true, new Set());
|
|
34
|
+
describe('ThemeDialog Snapshots', () => {
|
|
35
|
+
const baseProps = {
|
|
36
|
+
onSelect: vi.fn(),
|
|
37
|
+
onHighlight: vi.fn(),
|
|
38
|
+
availableTerminalHeight: 40,
|
|
39
|
+
terminalWidth: 120,
|
|
40
|
+
};
|
|
41
|
+
beforeEach(() => {
|
|
42
|
+
// Reset theme manager to a known state
|
|
43
|
+
themeManager.setActiveTheme(DEFAULT_THEME.name);
|
|
44
|
+
});
|
|
45
|
+
afterEach(() => {
|
|
46
|
+
vi.restoreAllMocks();
|
|
47
|
+
});
|
|
48
|
+
it('should render correctly in theme selection mode', () => {
|
|
49
|
+
const settings = createMockSettings();
|
|
50
|
+
const { lastFrame } = render(_jsx(SettingsContext.Provider, { value: settings, children: _jsx(KeypressProvider, { kittyProtocolEnabled: false, children: _jsx(ThemeDialog, { ...baseProps, settings: settings }) }) }));
|
|
51
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
52
|
+
});
|
|
53
|
+
it('should render correctly in scope selector mode', async () => {
|
|
54
|
+
const settings = createMockSettings();
|
|
55
|
+
const { lastFrame, stdin } = render(_jsx(SettingsContext.Provider, { value: settings, children: _jsx(KeypressProvider, { kittyProtocolEnabled: false, children: _jsx(ThemeDialog, { ...baseProps, settings: settings }) }) }));
|
|
56
|
+
// Press Tab to switch to scope selector mode
|
|
57
|
+
act(() => {
|
|
58
|
+
stdin.write('\t');
|
|
59
|
+
});
|
|
60
|
+
// Need to wait for the state update to propagate
|
|
61
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
62
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
//# sourceMappingURL=ThemeDialog.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ThemeDialog.test.js","sourceRoot":"","sources":["../../../../src/ui/components/ThemeDialog.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type React from 'react';
|
|
7
|
+
import type { SettingEnumOption } from '../../../config/settingsSchema.js';
|
|
8
|
+
interface EnumSelectorProps {
|
|
9
|
+
options: readonly SettingEnumOption[];
|
|
10
|
+
currentValue: string | number;
|
|
11
|
+
isActive: boolean;
|
|
12
|
+
onValueChange: (value: string | number) => void;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* A left-right scrolling selector for enum values
|
|
16
|
+
*/
|
|
17
|
+
export declare function EnumSelector({ options, currentValue, isActive, onValueChange: _onValueChange, }: EnumSelectorProps): React.JSX.Element;
|
|
18
|
+
export type { EnumSelectorProps };
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { useState, useEffect } from 'react';
|
|
8
|
+
import { Box, Text } from 'ink';
|
|
9
|
+
import { Colors } from '../../colors.js';
|
|
10
|
+
/**
|
|
11
|
+
* A left-right scrolling selector for enum values
|
|
12
|
+
*/
|
|
13
|
+
export function EnumSelector({ options, currentValue, isActive, onValueChange: _onValueChange, }) {
|
|
14
|
+
const [currentIndex, setCurrentIndex] = useState(() => {
|
|
15
|
+
// Guard against empty options array
|
|
16
|
+
if (!options || options.length === 0) {
|
|
17
|
+
return 0;
|
|
18
|
+
}
|
|
19
|
+
const index = options.findIndex((option) => option.value === currentValue);
|
|
20
|
+
return index >= 0 ? index : 0;
|
|
21
|
+
});
|
|
22
|
+
// Update index when currentValue changes externally
|
|
23
|
+
useEffect(() => {
|
|
24
|
+
// Guard against empty options array
|
|
25
|
+
if (!options || options.length === 0) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const index = options.findIndex((option) => option.value === currentValue);
|
|
29
|
+
// Always update index, defaulting to 0 if value not found
|
|
30
|
+
setCurrentIndex(index >= 0 ? index : 0);
|
|
31
|
+
}, [currentValue, options]);
|
|
32
|
+
// Guard against empty options array
|
|
33
|
+
if (!options || options.length === 0) {
|
|
34
|
+
return _jsx(Box, {});
|
|
35
|
+
}
|
|
36
|
+
// Left/right navigation is handled by parent component
|
|
37
|
+
// This component is purely for display
|
|
38
|
+
// onValueChange is kept for interface compatibility but not used internally
|
|
39
|
+
const currentOption = options[currentIndex] || options[0];
|
|
40
|
+
const canScrollLeft = options.length > 1;
|
|
41
|
+
const canScrollRight = options.length > 1;
|
|
42
|
+
return (_jsxs(Box, { flexDirection: "row", alignItems: "center", children: [_jsx(Text, { color: isActive && canScrollLeft ? Colors.AccentGreen : Colors.Gray, children: canScrollLeft ? '←' : ' ' }), _jsx(Text, { children: " " }), _jsx(Text, { color: isActive ? Colors.AccentGreen : Colors.Foreground, bold: isActive, children: currentOption.label }), _jsx(Text, { children: " " }), _jsx(Text, { color: isActive && canScrollRight ? Colors.AccentGreen : Colors.Gray, children: canScrollRight ? '→' : ' ' })] }));
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=EnumSelector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EnumSelector.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/EnumSelector.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAUzC;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,EAC3B,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,aAAa,EAAE,cAAc,GACX;IAClB,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE;QACpD,oCAAoC;QACpC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,YAAY,CAAC,CAAC;QAC3E,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,oDAAoD;IACpD,SAAS,CAAC,GAAG,EAAE;QACb,oCAAoC;QACpC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,YAAY,CAAC,CAAC;QAC3E,0DAA0D;QAC1D,eAAe,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5B,oCAAoC;IACpC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO,KAAC,GAAG,KAAG,CAAC;IACjB,CAAC;IAED,uDAAuD;IACvD,uCAAuC;IACvC,4EAA4E;IAE5E,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1D,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IACzC,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAE1C,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,UAAU,EAAC,QAAQ,aAC1C,KAAC,IAAI,IACH,KAAK,EAAE,QAAQ,IAAI,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,YAElE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GACrB,EACP,KAAC,IAAI,oBAAS,EACd,KAAC,IAAI,IACH,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EACxD,IAAI,EAAE,QAAQ,YAEb,aAAa,CAAC,KAAK,GACf,EACP,KAAC,IAAI,oBAAS,EACd,KAAC,IAAI,IACH,KAAK,EAAE,QAAQ,IAAI,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,YAEnE,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GACtB,IACH,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright 2025 Google LLC
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { renderWithProviders } from '../../../test-utils/render.js';
|
|
8
|
+
import { EnumSelector } from './EnumSelector.js';
|
|
9
|
+
import { describe, it, expect } from 'vitest';
|
|
10
|
+
const LANGUAGE_OPTIONS = [
|
|
11
|
+
{ label: 'English', value: 'en' },
|
|
12
|
+
{ label: '中文 (简体)', value: 'zh' },
|
|
13
|
+
{ label: 'Español', value: 'es' },
|
|
14
|
+
{ label: 'Français', value: 'fr' },
|
|
15
|
+
];
|
|
16
|
+
const NUMERIC_OPTIONS = [
|
|
17
|
+
{ label: 'Low', value: 1 },
|
|
18
|
+
{ label: 'Medium', value: 2 },
|
|
19
|
+
{ label: 'High', value: 3 },
|
|
20
|
+
];
|
|
21
|
+
describe('<EnumSelector />', () => {
|
|
22
|
+
it('renders with string options and matches snapshot', () => {
|
|
23
|
+
const { lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: LANGUAGE_OPTIONS, currentValue: "en", isActive: true, onValueChange: () => { } }));
|
|
24
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
25
|
+
});
|
|
26
|
+
it('renders with numeric options and matches snapshot', () => {
|
|
27
|
+
const { lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: NUMERIC_OPTIONS, currentValue: 2, isActive: true, onValueChange: () => { } }));
|
|
28
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
29
|
+
});
|
|
30
|
+
it('renders inactive state and matches snapshot', () => {
|
|
31
|
+
const { lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: LANGUAGE_OPTIONS, currentValue: "zh", isActive: false, onValueChange: () => { } }));
|
|
32
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
33
|
+
});
|
|
34
|
+
it('renders with single option and matches snapshot', () => {
|
|
35
|
+
const singleOption = [
|
|
36
|
+
{ label: 'Only Option', value: 'only' },
|
|
37
|
+
];
|
|
38
|
+
const { lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: singleOption, currentValue: "only", isActive: true, onValueChange: () => { } }));
|
|
39
|
+
expect(lastFrame()).toMatchSnapshot();
|
|
40
|
+
});
|
|
41
|
+
it('renders nothing when no options are provided', () => {
|
|
42
|
+
const { lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: [], currentValue: "", isActive: true, onValueChange: () => { } }));
|
|
43
|
+
expect(lastFrame()).toBe('');
|
|
44
|
+
});
|
|
45
|
+
it('handles currentValue not found in options', () => {
|
|
46
|
+
const { lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: LANGUAGE_OPTIONS, currentValue: "invalid", isActive: true, onValueChange: () => { } }));
|
|
47
|
+
// Should default to first option
|
|
48
|
+
expect(lastFrame()).toContain('English');
|
|
49
|
+
});
|
|
50
|
+
it('updates when currentValue changes externally', () => {
|
|
51
|
+
const { rerender, lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: LANGUAGE_OPTIONS, currentValue: "en", isActive: true, onValueChange: () => { } }));
|
|
52
|
+
expect(lastFrame()).toContain('English');
|
|
53
|
+
rerender(_jsx(EnumSelector, { options: LANGUAGE_OPTIONS, currentValue: "zh", isActive: true, onValueChange: () => { } }));
|
|
54
|
+
expect(lastFrame()).toContain('中文 (简体)');
|
|
55
|
+
});
|
|
56
|
+
it('shows navigation arrows when multiple options available', () => {
|
|
57
|
+
const { lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: LANGUAGE_OPTIONS, currentValue: "en", isActive: true, onValueChange: () => { } }));
|
|
58
|
+
expect(lastFrame()).toContain('←');
|
|
59
|
+
expect(lastFrame()).toContain('→');
|
|
60
|
+
});
|
|
61
|
+
it('hides navigation arrows when single option available', () => {
|
|
62
|
+
const singleOption = [
|
|
63
|
+
{ label: 'Only Option', value: 'only' },
|
|
64
|
+
];
|
|
65
|
+
const { lastFrame } = renderWithProviders(_jsx(EnumSelector, { options: singleOption, currentValue: "only", isActive: true, onValueChange: () => { } }));
|
|
66
|
+
expect(lastFrame()).not.toContain('←');
|
|
67
|
+
expect(lastFrame()).not.toContain('→');
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
//# sourceMappingURL=EnumSelector.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EnumSelector.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/EnumSelector.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type React from 'react';
|
|
7
|
+
import type { SettingScope } from '../../../config/settings.js';
|
|
8
|
+
interface ScopeSelectorProps {
|
|
9
|
+
/** Callback function when a scope is selected */
|
|
10
|
+
onSelect: (scope: SettingScope) => void;
|
|
11
|
+
/** Callback function when a scope is highlighted */
|
|
12
|
+
onHighlight: (scope: SettingScope) => void;
|
|
13
|
+
/** Whether the component is focused */
|
|
14
|
+
isFocused: boolean;
|
|
15
|
+
/** The initial scope to select */
|
|
16
|
+
initialScope: SettingScope;
|
|
17
|
+
}
|
|
18
|
+
export declare function ScopeSelector({ onSelect, onHighlight, isFocused, initialScope, }: ScopeSelectorProps): React.JSX.Element;
|
|
19
|
+
export {};
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { Box, Text } from 'ink';
|
|
3
|
+
import { getScopeItems } from '../../../utils/dialogScopeUtils.js';
|
|
4
|
+
import { RadioButtonSelect } from './RadioButtonSelect.js';
|
|
5
|
+
export function ScopeSelector({ onSelect, onHighlight, isFocused, initialScope, }) {
|
|
6
|
+
const scopeItems = getScopeItems();
|
|
7
|
+
const initialIndex = scopeItems.findIndex((item) => item.value === initialScope);
|
|
8
|
+
const safeInitialIndex = initialIndex >= 0 ? initialIndex : 0;
|
|
9
|
+
return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: isFocused, wrap: "truncate", children: [isFocused ? '> ' : ' ', "Apply To"] }), _jsx(RadioButtonSelect, { items: scopeItems, initialIndex: safeInitialIndex, onSelect: onSelect, onHighlight: onHighlight, isFocused: isFocused, showNumbers: isFocused })] }));
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=ScopeSelector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ScopeSelector.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/ScopeSelector.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAa3D,MAAM,UAAU,aAAa,CAAC,EAC5B,QAAQ,EACR,WAAW,EACX,SAAS,EACT,YAAY,GACO;IACnB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CACvC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,YAAY,CACtC,CAAC;IACF,MAAM,gBAAgB,GAAG,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,MAAC,IAAI,IAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAC,UAAU,aACnC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,gBACnB,EACP,KAAC,iBAAiB,IAChB,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,GACtB,IACE,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -6,15 +6,21 @@
|
|
|
6
6
|
import type { HistoryItem, ThoughtSummary, ConsoleMessageItem, ShellConfirmationRequest, ConfirmationRequest, HistoryItemWithoutId, StreamingState } from '../types.js';
|
|
7
7
|
import type { CommandContext, SlashCommand } from '../commands/types.js';
|
|
8
8
|
import type { TextBuffer } from '../components/shared/text-buffer.js';
|
|
9
|
-
import type { IdeContext, ApprovalMode, UserTierId, DetectedIde } from '@google/gemini-cli-core';
|
|
9
|
+
import type { IdeContext, ApprovalMode, UserTierId, DetectedIde, FallbackIntent } from '@google/gemini-cli-core';
|
|
10
10
|
import type { DOMElement } from 'ink';
|
|
11
11
|
import type { SessionStatsState } from '../contexts/SessionContext.js';
|
|
12
12
|
import type { UpdateObject } from '../utils/updateCheck.js';
|
|
13
|
+
export interface ProQuotaDialogRequest {
|
|
14
|
+
failedModel: string;
|
|
15
|
+
fallbackModel: string;
|
|
16
|
+
resolve: (intent: FallbackIntent) => void;
|
|
17
|
+
}
|
|
13
18
|
export interface UIState {
|
|
14
19
|
history: HistoryItem[];
|
|
15
20
|
isThemeDialogOpen: boolean;
|
|
16
21
|
themeError: string | null;
|
|
17
22
|
isAuthenticating: boolean;
|
|
23
|
+
isConfigInitialized: boolean;
|
|
18
24
|
authError: string | null;
|
|
19
25
|
isAuthDialogOpen: boolean;
|
|
20
26
|
editorError: string | null;
|
|
@@ -60,7 +66,7 @@ export interface UIState {
|
|
|
60
66
|
showWorkspaceMigrationDialog: boolean;
|
|
61
67
|
workspaceExtensions: any[];
|
|
62
68
|
userTier: UserTierId | undefined;
|
|
63
|
-
|
|
69
|
+
proQuotaRequest: ProQuotaDialogRequest | null;
|
|
64
70
|
currentModel: string;
|
|
65
71
|
contextFileNames: string[];
|
|
66
72
|
errorCount: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UIStateContext.js","sourceRoot":"","sources":["../../../../src/ui/contexts/UIStateContext.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"UIStateContext.js","sourceRoot":"","sources":["../../../../src/ui/contexts/UIStateContext.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAwGlD,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,CAAiB,IAAI,CAAC,CAAC;AAElE,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE;IAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
|
|
@@ -3,10 +3,9 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { type Config } from '@google/gemini-cli-core';
|
|
7
6
|
import type { LoadedSettings } from '../../config/settings.js';
|
|
8
7
|
import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
|
|
9
|
-
export declare const useFolderTrust: (settings: LoadedSettings,
|
|
8
|
+
export declare const useFolderTrust: (settings: LoadedSettings, onTrustChange: (isTrusted: boolean | undefined) => void, refreshStatic: () => void) => {
|
|
10
9
|
isTrusted: boolean | undefined;
|
|
11
10
|
isFolderTrustDialogOpen: boolean;
|
|
12
11
|
handleFolderTrustSelect: (choice: FolderTrustChoice) => void;
|
|
@@ -4,14 +4,13 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { useState, useCallback, useEffect } from 'react';
|
|
7
|
-
import {} from '@google/gemini-cli-core';
|
|
8
7
|
import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
|
|
9
8
|
import { loadTrustedFolders, TrustLevel, isWorkspaceTrusted, } from '../../config/trustedFolders.js';
|
|
10
9
|
import * as process from 'node:process';
|
|
11
|
-
export const useFolderTrust = (settings,
|
|
10
|
+
export const useFolderTrust = (settings, onTrustChange, refreshStatic) => {
|
|
12
11
|
const [isTrusted, setIsTrusted] = useState(undefined);
|
|
13
12
|
const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = useState(false);
|
|
14
|
-
const [isRestarting] = useState(false);
|
|
13
|
+
const [isRestarting, setIsRestarting] = useState(false);
|
|
15
14
|
const folderTrust = settings.merged.security?.folderTrust?.enabled;
|
|
16
15
|
useEffect(() => {
|
|
17
16
|
const trusted = isWorkspaceTrusted(settings.merged);
|
|
@@ -19,10 +18,16 @@ export const useFolderTrust = (settings, config, onTrustChange) => {
|
|
|
19
18
|
setIsFolderTrustDialogOpen(trusted === undefined);
|
|
20
19
|
onTrustChange(trusted);
|
|
21
20
|
}, [folderTrust, onTrustChange, settings.merged]);
|
|
21
|
+
useEffect(() => {
|
|
22
|
+
// When the folder trust dialog is about to open/close, we need to force a refresh
|
|
23
|
+
// of the static content to ensure the Tips are hidden/shown correctly.
|
|
24
|
+
refreshStatic();
|
|
25
|
+
}, [isFolderTrustDialogOpen, refreshStatic]);
|
|
22
26
|
const handleFolderTrustSelect = useCallback((choice) => {
|
|
23
27
|
const trustedFolders = loadTrustedFolders();
|
|
24
28
|
const cwd = process.cwd();
|
|
25
29
|
let trustLevel;
|
|
30
|
+
const wasTrusted = isTrusted ?? true;
|
|
26
31
|
switch (choice) {
|
|
27
32
|
case FolderTrustChoice.TRUST_FOLDER:
|
|
28
33
|
trustLevel = TrustLevel.TRUST_FOLDER;
|
|
@@ -37,11 +42,19 @@ export const useFolderTrust = (settings, config, onTrustChange) => {
|
|
|
37
42
|
return;
|
|
38
43
|
}
|
|
39
44
|
trustedFolders.setValue(cwd, trustLevel);
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
onTrustChange(
|
|
44
|
-
|
|
45
|
+
const currentIsTrusted = trustLevel === TrustLevel.TRUST_FOLDER ||
|
|
46
|
+
trustLevel === TrustLevel.TRUST_PARENT;
|
|
47
|
+
setIsTrusted(currentIsTrusted);
|
|
48
|
+
onTrustChange(currentIsTrusted);
|
|
49
|
+
const needsRestart = wasTrusted !== currentIsTrusted;
|
|
50
|
+
if (needsRestart) {
|
|
51
|
+
setIsRestarting(true);
|
|
52
|
+
setIsFolderTrustDialogOpen(true);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
setIsFolderTrustDialogOpen(false);
|
|
56
|
+
}
|
|
57
|
+
}, [onTrustChange, isTrusted]);
|
|
45
58
|
return {
|
|
46
59
|
isTrusted,
|
|
47
60
|
isFolderTrustDialogOpen,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAwB,EACxB,aAAuD,EACvD,aAAyB,EACzB,EAAE;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAsB,SAAS,CAAC,CAAC;IAC3E,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC;IAEnE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,0BAA0B,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;QAClD,aAAa,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,SAAS,CAAC,GAAG,EAAE;QACb,kFAAkF;QAClF,uEAAuE;QACvE,aAAa,EAAE,CAAC;IAClB,CAAC,EAAE,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAAC,CAAC;IAE7C,MAAM,uBAAuB,GAAG,WAAW,CACzC,CAAC,MAAyB,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,kBAAkB,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,UAAsB,CAAC;QAE3B,MAAM,UAAU,GAAG,SAAS,IAAI,IAAI,CAAC;QAErC,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR;gBACE,OAAO;QACX,CAAC;QAED,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACzC,MAAM,gBAAgB,GACpB,UAAU,KAAK,UAAU,CAAC,YAAY;YACtC,UAAU,KAAK,UAAU,CAAC,YAAY,CAAC;QACzC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC/B,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAEhC,MAAM,YAAY,GAAG,UAAU,KAAK,gBAAgB,CAAC;QACrD,IAAI,YAAY,EAAE,CAAC;YACjB,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,EACD,CAAC,aAAa,EAAE,SAAS,CAAC,CAC3B,CAAC;IAEF,OAAO;QACL,SAAS;QACT,uBAAuB;QACvB,uBAAuB;QACvB,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
|
|
7
|
-
import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, MessageSenderType, logUserPrompt, GitService, UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, getCodeAssistServer, UserTierId, } from '@google/gemini-cli-core';
|
|
7
|
+
import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, MessageSenderType, logUserPrompt, GitService, UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, getCodeAssistServer, UserTierId, promptIdContext, } from '@google/gemini-cli-core';
|
|
8
8
|
import { FinishReason } from '@google/genai';
|
|
9
9
|
import { StreamingState, MessageType, ToolCallStatus } from '../types.js';
|
|
10
10
|
import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js';
|
|
@@ -440,45 +440,47 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
|
|
|
440
440
|
if (!prompt_id) {
|
|
441
441
|
prompt_id = config.getSessionId() + '########' + getPromptCount();
|
|
442
442
|
}
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
}
|
|
447
|
-
if (!options?.isContinuation) {
|
|
448
|
-
startNewPrompt();
|
|
449
|
-
setThought(null); // Reset thought when starting a new prompt
|
|
450
|
-
}
|
|
451
|
-
setIsResponding(true);
|
|
452
|
-
setInitError(null);
|
|
453
|
-
try {
|
|
454
|
-
const stream = geminiClient.sendMessageStream(queryToSend, abortSignal, prompt_id);
|
|
455
|
-
const processingStatus = await processGeminiStreamEvents(stream, userMessageTimestamp, abortSignal);
|
|
456
|
-
if (processingStatus === StreamProcessingStatus.UserCancelled) {
|
|
443
|
+
return promptIdContext.run(prompt_id, async () => {
|
|
444
|
+
const { queryToSend, shouldProceed } = await prepareQueryForGemini(query, userMessageTimestamp, abortSignal, prompt_id);
|
|
445
|
+
if (!shouldProceed || queryToSend === null) {
|
|
457
446
|
return;
|
|
458
447
|
}
|
|
459
|
-
if (
|
|
460
|
-
|
|
461
|
-
|
|
448
|
+
if (!options?.isContinuation) {
|
|
449
|
+
startNewPrompt();
|
|
450
|
+
setThought(null); // Reset thought when starting a new prompt
|
|
462
451
|
}
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
452
|
+
setIsResponding(true);
|
|
453
|
+
setInitError(null);
|
|
454
|
+
try {
|
|
455
|
+
const stream = geminiClient.sendMessageStream(queryToSend, abortSignal, prompt_id);
|
|
456
|
+
const processingStatus = await processGeminiStreamEvents(stream, userMessageTimestamp, abortSignal);
|
|
457
|
+
if (processingStatus === StreamProcessingStatus.UserCancelled) {
|
|
458
|
+
return;
|
|
459
|
+
}
|
|
460
|
+
if (pendingHistoryItemRef.current) {
|
|
461
|
+
addItem(pendingHistoryItemRef.current, userMessageTimestamp);
|
|
462
|
+
setPendingHistoryItem(null);
|
|
463
|
+
}
|
|
464
|
+
if (loopDetectedRef.current) {
|
|
465
|
+
loopDetectedRef.current = false;
|
|
466
|
+
handleLoopDetectedEvent();
|
|
467
|
+
}
|
|
466
468
|
}
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
469
|
+
catch (error) {
|
|
470
|
+
if (error instanceof UnauthorizedError) {
|
|
471
|
+
onAuthError('Session expired or is unauthorized.');
|
|
472
|
+
}
|
|
473
|
+
else if (!isNodeError(error) || error.name !== 'AbortError') {
|
|
474
|
+
addItem({
|
|
475
|
+
type: MessageType.ERROR,
|
|
476
|
+
text: parseAndFormatApiError(getErrorMessage(error) || 'Unknown error', config.getContentGeneratorConfig()?.authType, undefined, config.getModel(), DEFAULT_GEMINI_FLASH_MODEL),
|
|
477
|
+
}, userMessageTimestamp);
|
|
478
|
+
}
|
|
471
479
|
}
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
type: MessageType.ERROR,
|
|
475
|
-
text: parseAndFormatApiError(getErrorMessage(error) || 'Unknown error', config.getContentGeneratorConfig()?.authType, undefined, config.getModel(), DEFAULT_GEMINI_FLASH_MODEL),
|
|
476
|
-
}, userMessageTimestamp);
|
|
480
|
+
finally {
|
|
481
|
+
setIsResponding(false);
|
|
477
482
|
}
|
|
478
|
-
}
|
|
479
|
-
finally {
|
|
480
|
-
setIsResponding(false);
|
|
481
|
-
}
|
|
483
|
+
});
|
|
482
484
|
}, [
|
|
483
485
|
streamingState,
|
|
484
486
|
setModelSwitchedFromQuotaError,
|