@google/gemini-cli 0.16.0-preview.4 → 0.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (99) hide show
  1. package/dist/package.json +2 -2
  2. package/dist/src/config/config.js +1 -0
  3. package/dist/src/config/config.js.map +1 -1
  4. package/dist/src/config/settingsSchema.d.ts +10 -0
  5. package/dist/src/config/settingsSchema.js +10 -0
  6. package/dist/src/config/settingsSchema.js.map +1 -1
  7. package/dist/src/config/settingsSchema.test.js +9 -0
  8. package/dist/src/config/settingsSchema.test.js.map +1 -1
  9. package/dist/src/generated/git-commit.d.ts +2 -2
  10. package/dist/src/generated/git-commit.js +2 -2
  11. package/dist/src/generated/git-commit.js.map +1 -1
  12. package/dist/src/ui/App.test.js +4 -0
  13. package/dist/src/ui/App.test.js.map +1 -1
  14. package/dist/src/ui/AppContainer.js +38 -1
  15. package/dist/src/ui/AppContainer.js.map +1 -1
  16. package/dist/src/ui/AppContainer.test.js +18 -1
  17. package/dist/src/ui/AppContainer.test.js.map +1 -1
  18. package/dist/src/ui/commands/ideCommand.js +6 -4
  19. package/dist/src/ui/commands/ideCommand.js.map +1 -1
  20. package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js +12 -0
  21. package/dist/src/ui/components/AlternateBufferQuittingDisplay.test.js.map +1 -1
  22. package/dist/src/ui/components/AppHeader.js +25 -3
  23. package/dist/src/ui/components/AppHeader.js.map +1 -1
  24. package/dist/src/ui/components/AppHeader.test.d.ts +6 -0
  25. package/dist/src/ui/components/AppHeader.test.js +138 -0
  26. package/dist/src/ui/components/AppHeader.test.js.map +1 -0
  27. package/dist/src/ui/components/Banner.d.ts +12 -0
  28. package/dist/src/ui/components/Banner.js +14 -0
  29. package/dist/src/ui/components/Banner.js.map +1 -0
  30. package/dist/src/ui/components/Composer.js +1 -1
  31. package/dist/src/ui/components/Composer.js.map +1 -1
  32. package/dist/src/ui/components/DialogManager.js +1 -1
  33. package/dist/src/ui/components/DialogManager.js.map +1 -1
  34. package/dist/src/ui/components/EditorSettingsDialog.d.ts +1 -1
  35. package/dist/src/ui/components/EditorSettingsDialog.js +2 -2
  36. package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
  37. package/dist/src/ui/components/Footer.js +2 -2
  38. package/dist/src/ui/components/Footer.js.map +1 -1
  39. package/dist/src/ui/components/GradientRegression.test.d.ts +6 -0
  40. package/dist/src/ui/components/GradientRegression.test.js +84 -0
  41. package/dist/src/ui/components/GradientRegression.test.js.map +1 -0
  42. package/dist/src/ui/components/Header.js +2 -13
  43. package/dist/src/ui/components/Header.js.map +1 -1
  44. package/dist/src/ui/components/InputPrompt.d.ts +1 -0
  45. package/dist/src/ui/components/InputPrompt.js +3 -1
  46. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  47. package/dist/src/ui/components/InputPrompt.test.js +11 -0
  48. package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
  49. package/dist/src/ui/components/ModelDialog.js +38 -29
  50. package/dist/src/ui/components/ModelDialog.js.map +1 -1
  51. package/dist/src/ui/components/ModelDialog.test.js +19 -11
  52. package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
  53. package/dist/src/ui/components/ProQuotaDialog.d.ts +8 -2
  54. package/dist/src/ui/components/ProQuotaDialog.js +79 -14
  55. package/dist/src/ui/components/ProQuotaDialog.js.map +1 -1
  56. package/dist/src/ui/components/ProQuotaDialog.test.js +146 -40
  57. package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
  58. package/dist/src/ui/components/SettingsDialog.test.js +7 -7
  59. package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
  60. package/dist/src/ui/components/StatsDisplay.js +2 -2
  61. package/dist/src/ui/components/StatsDisplay.js.map +1 -1
  62. package/dist/src/ui/components/ThemedGradient.d.ts +8 -0
  63. package/dist/src/ui/components/ThemedGradient.js +15 -0
  64. package/dist/src/ui/components/ThemedGradient.js.map +1 -0
  65. package/dist/src/ui/contexts/UIActionsContext.d.ts +2 -1
  66. package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
  67. package/dist/src/ui/contexts/UIStateContext.d.ts +8 -0
  68. package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
  69. package/dist/src/ui/editors/editorSettingsManager.d.ts +0 -1
  70. package/dist/src/ui/editors/editorSettingsManager.js +1 -11
  71. package/dist/src/ui/editors/editorSettingsManager.js.map +1 -1
  72. package/dist/src/ui/hooks/slashCommandProcessor.d.ts +1 -1
  73. package/dist/src/ui/hooks/slashCommandProcessor.js +3 -1
  74. package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
  75. package/dist/src/ui/hooks/slashCommandProcessor.test.js +2 -1
  76. package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
  77. package/dist/src/ui/hooks/useAnimatedScrollbar.js +5 -2
  78. package/dist/src/ui/hooks/useAnimatedScrollbar.js.map +1 -1
  79. package/dist/src/ui/hooks/useAnimatedScrollbar.test.js +22 -0
  80. package/dist/src/ui/hooks/useAnimatedScrollbar.test.js.map +1 -1
  81. package/dist/src/ui/hooks/useEditorSettings.js +2 -2
  82. package/dist/src/ui/hooks/useEditorSettings.js.map +1 -1
  83. package/dist/src/ui/hooks/useEditorSettings.test.js +8 -3
  84. package/dist/src/ui/hooks/useEditorSettings.test.js.map +1 -1
  85. package/dist/src/ui/hooks/useQuotaAndFallback.d.ts +1 -1
  86. package/dist/src/ui/hooks/useQuotaAndFallback.js +44 -31
  87. package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
  88. package/dist/src/ui/hooks/useQuotaAndFallback.test.js +106 -101
  89. package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
  90. package/dist/src/ui/themes/color-utils.js +9 -0
  91. package/dist/src/ui/themes/color-utils.js.map +1 -1
  92. package/dist/src/ui/themes/color-utils.test.js +17 -0
  93. package/dist/src/ui/themes/color-utils.test.js.map +1 -1
  94. package/dist/src/utils/persistentState.d.ts +19 -0
  95. package/dist/src/utils/persistentState.js +65 -0
  96. package/dist/src/utils/persistentState.js.map +1 -0
  97. package/dist/tsconfig.tsbuildinfo +1 -1
  98. package/package.json +3 -3
  99. package/dist/google-gemini-cli-0.16.0-preview.3.tgz +0 -0
@@ -38,11 +38,14 @@ export function useAnimatedScrollbar(isFocused, scrollBy) {
38
38
  const focusedColor = theme.text.secondary;
39
39
  const unfocusedColor = theme.ui.dark;
40
40
  const startColor = colorRef.current;
41
+ if (!focusedColor || !unfocusedColor) {
42
+ return;
43
+ }
41
44
  // Phase 1: Fade In
42
45
  let start = Date.now();
43
46
  const animateFadeIn = () => {
44
47
  const elapsed = Date.now() - start;
45
- const progress = Math.min(elapsed / fadeInDuration, 1);
48
+ const progress = Math.max(0, Math.min(elapsed / fadeInDuration, 1));
46
49
  setScrollbarColor(interpolateColor(startColor, focusedColor, progress));
47
50
  if (progress === 1) {
48
51
  if (animationFrame.current) {
@@ -55,7 +58,7 @@ export function useAnimatedScrollbar(isFocused, scrollBy) {
55
58
  start = Date.now();
56
59
  const animateFadeOut = () => {
57
60
  const elapsed = Date.now() - start;
58
- const progress = Math.min(elapsed / fadeOutDuration, 1);
61
+ const progress = Math.max(0, Math.min(elapsed / fadeOutDuration, 1));
59
62
  setScrollbarColor(interpolateColor(focusedColor, unfocusedColor, progress));
60
63
  if (progress === 1) {
61
64
  cleanup();
@@ -1 +1 @@
1
- {"version":3,"file":"useAnimatedScrollbar.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAnimatedScrollbar.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useAnimatedScrollbar.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAnimatedScrollbar.ts"],"names":[],"mappings":"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"}
@@ -59,5 +59,27 @@ describe('useAnimatedScrollbar', () => {
59
59
  });
60
60
  expect(debugState.debugNumAnimatedComponents).toBe(0);
61
61
  });
62
+ it('should not crash if Date.now() goes backwards (regression test)', async () => {
63
+ // Only fake timers, keep Date real so we can mock it manually
64
+ vi.useFakeTimers({
65
+ toFake: ['setInterval', 'clearInterval', 'setTimeout', 'clearTimeout'],
66
+ });
67
+ const dateSpy = vi.spyOn(Date, 'now');
68
+ let currentTime = 1000;
69
+ dateSpy.mockImplementation(() => currentTime);
70
+ const { rerender } = render(_jsx(TestComponent, { isFocused: false }));
71
+ // Start animation. This captures start = 1000.
72
+ rerender(_jsx(TestComponent, { isFocused: true }));
73
+ // Simulate time going backwards before the next frame
74
+ currentTime = 900;
75
+ // Trigger the interval (33ms)
76
+ await act(async () => {
77
+ vi.advanceTimersByTime(50);
78
+ });
79
+ // If it didn't crash, we are good.
80
+ // Cleanup
81
+ dateSpy.mockRestore();
82
+ // Reset timers to default full fake for other tests (handled by afterEach/beforeEach usually, but here we overrode it)
83
+ });
62
84
  });
63
85
  //# sourceMappingURL=useAnimatedScrollbar.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useAnimatedScrollbar.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAnimatedScrollbar.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzE,MAAM,aAAa,GAAG,CAAC,EAAE,SAAS,GAAG,KAAK,EAA2B,EAAE,EAAE;IACvE,oBAAoB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,CAAC,0BAA0B,GAAG,CAAC,CAAC;QAC1C,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QAC5C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,GAAG,EAAE;QAC1F,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QACjE,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QACjE,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QAC9C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QAC1E,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC;QACV,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QACjE,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEtD,sFAAsF;QACtF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"useAnimatedScrollbar.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAnimatedScrollbar.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzE,MAAM,aAAa,GAAG,CAAC,EAAE,SAAS,GAAG,KAAK,EAA2B,EAAE,EAAE;IACvE,oBAAoB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,CAAC,0BAA0B,GAAG,CAAC,CAAC;QAC1C,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QAC5C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,GAAG,EAAE;QAC1F,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QACjE,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QACjE,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QAC9C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QAC1E,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC;QACV,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QACjE,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEtD,sFAAsF;QACtF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,8DAA8D;QAC9D,EAAE,CAAC,aAAa,CAAC;YACf,MAAM,EAAE,CAAC,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,CAAC;SACvE,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtC,IAAI,WAAW,GAAG,IAAI,CAAC;QACvB,OAAO,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;QAE9C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,KAAK,GAAI,CAAC,CAAC;QAEjE,+CAA+C;QAC/C,QAAQ,CAAC,KAAC,aAAa,IAAC,SAAS,EAAE,IAAI,GAAI,CAAC,CAAC;QAE7C,sDAAsD;QACtD,WAAW,GAAG,GAAG,CAAC;QAElB,8BAA8B;QAC9B,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,mCAAmC;QACnC,UAAU;QACV,OAAO,CAAC,WAAW,EAAE,CAAC;QACtB,uHAAuH;IACzH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -5,7 +5,7 @@
5
5
  */
6
6
  import { useState, useCallback } from 'react';
7
7
  import { MessageType } from '../types.js';
8
- import { allowEditorTypeInSandbox, checkHasEditorType, } from '@google/gemini-cli-core';
8
+ import { allowEditorTypeInSandbox, checkHasEditorType, getEditorDisplayName, } from '@google/gemini-cli-core';
9
9
  import { SettingPaths } from '../../config/settingPaths.js';
10
10
  export const useEditorSettings = (loadedSettings, setEditorError, addItem) => {
11
11
  const [isEditorDialogOpen, setIsEditorDialogOpen] = useState(false);
@@ -22,7 +22,7 @@ export const useEditorSettings = (loadedSettings, setEditorError, addItem) => {
22
22
  loadedSettings.setValue(scope, SettingPaths.General.PreferredEditor, editorType);
23
23
  addItem({
24
24
  type: MessageType.INFO,
25
- text: `Editor preference ${editorType ? `set to "${editorType}"` : 'cleared'} in ${scope} settings.`,
25
+ text: `Editor preference ${editorType ? `set to "${getEditorDisplayName(editorType)}"` : 'cleared'} in ${scope} settings.`,
26
26
  }, Date.now());
27
27
  setEditorError(null);
28
28
  setIsEditorDialogOpen(false);
@@ -1 +1 @@
1
- {"version":3,"file":"useEditorSettings.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useEditorSettings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAK9C,OAAO,EAAoB,WAAW,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAY5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,cAA8B,EAC9B,cAA8C,EAC9C,OAAmE,EAC1C,EAAE;IAC3B,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEpE,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,UAAkC,EAAE,KAA2B,EAAE,EAAE;QAClE,IACE,UAAU;YACV,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC;gBAC9B,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,EACxC,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,cAAc,CAAC,QAAQ,CACrB,KAAK,EACL,YAAY,CAAC,OAAO,CAAC,eAAe,EACpC,UAAU,CACX,CAAC;YACF,OAAO,CACL;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,qBAAqB,UAAU,CAAC,CAAC,CAAC,WAAW,UAAU,GAAG,CAAC,CAAC,CAAC,SAAS,OAAO,KAAK,YAAY;aACrG,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;YACF,cAAc,CAAC,IAAI,CAAC,CAAC;YACrB,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,cAAc,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,EACD,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,CAAC,CAC1C,CAAC;IAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,kBAAkB;QAClB,gBAAgB;QAChB,kBAAkB;QAClB,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"useEditorSettings.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useEditorSettings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAK9C,OAAO,EAAoB,WAAW,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAY5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,cAA8B,EAC9B,cAA8C,EAC9C,OAAmE,EAC1C,EAAE;IAC3B,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEpE,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,UAAkC,EAAE,KAA2B,EAAE,EAAE;QAClE,IACE,UAAU;YACV,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC;gBAC9B,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,EACxC,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,cAAc,CAAC,QAAQ,CACrB,KAAK,EACL,YAAY,CAAC,OAAO,CAAC,eAAe,EACpC,UAAU,CACX,CAAC;YACF,OAAO,CACL;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,qBAAqB,UAAU,CAAC,CAAC,CAAC,WAAW,oBAAoB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,OAAO,KAAK,YAAY;aAC3H,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;YACF,cAAc,CAAC,IAAI,CAAC,CAAC;YACrB,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,cAAc,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,EACD,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,CAAC,CAC1C,CAAC;IAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,kBAAkB;QAClB,gBAAgB;QAChB,kBAAkB;QAClB,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC"}
@@ -75,7 +75,7 @@ describe('useEditorSettings', () => {
75
75
  expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(scope, SettingPaths.General.PreferredEditor, editorType);
76
76
  expect(mockAddItem).toHaveBeenCalledWith({
77
77
  type: MessageType.INFO,
78
- text: 'Editor preference set to "vscode" in User settings.',
78
+ text: 'Editor preference set to "VS Code" in User settings.',
79
79
  }, expect.any(Number));
80
80
  expect(mockSetEditorError).toHaveBeenCalledWith(null);
81
81
  expect(result.isEditorDialogOpen).toBe(false);
@@ -98,6 +98,11 @@ describe('useEditorSettings', () => {
98
98
  it('should handle different editor types', () => {
99
99
  render(_jsx(TestComponent, {}));
100
100
  const editorTypes = ['cursor', 'windsurf', 'vim'];
101
+ const displayNames = {
102
+ cursor: 'Cursor',
103
+ windsurf: 'Windsurf',
104
+ vim: 'Vim',
105
+ };
101
106
  const scope = SettingScope.User;
102
107
  editorTypes.forEach((editorType) => {
103
108
  act(() => {
@@ -106,7 +111,7 @@ describe('useEditorSettings', () => {
106
111
  expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(scope, SettingPaths.General.PreferredEditor, editorType);
107
112
  expect(mockAddItem).toHaveBeenCalledWith({
108
113
  type: MessageType.INFO,
109
- text: `Editor preference set to "${editorType}" in User settings.`,
114
+ text: `Editor preference set to "${displayNames[editorType]}" in User settings.`,
110
115
  }, expect.any(Number));
111
116
  });
112
117
  });
@@ -124,7 +129,7 @@ describe('useEditorSettings', () => {
124
129
  expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(scope, SettingPaths.General.PreferredEditor, editorType);
125
130
  expect(mockAddItem).toHaveBeenCalledWith({
126
131
  type: MessageType.INFO,
127
- text: `Editor preference set to "vscode" in ${scope} settings.`,
132
+ text: `Editor preference set to "VS Code" in ${scope} settings.`,
128
133
  }, expect.any(Number));
129
134
  });
130
135
  });
@@ -1 +1 @@
1
- {"version":3,"file":"useEditorSettings.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useEditorSettings.test.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useEditorSettings.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useEditorSettings.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EACL,SAAS,EACT,UAAU,EACV,QAAQ,EACR,MAAM,EACN,EAAE,EACF,EAAE,GAEH,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAK3D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAoB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAEL,kBAAkB,EAClB,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;IAC5C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC;IAChE,OAAO;QACL,GAAG,MAAM;QACT,kBAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;QACrC,wBAAwB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;KAC5C,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC7D,MAAM,4BAA4B,GAAG,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEzE,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,kBAAkC,CAAC;IACvC,IAAI,kBAAkE,CAAC;IACvE,IAAI,WAEH,CAAC;IACF,IAAI,MAA4C,CAAC;IAEjD,SAAS,aAAa;QACpB,MAAM,GAAG,iBAAiB,CACxB,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,CACZ,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,kBAAkB,GAAG;YACnB,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;SACW,CAAC;QAE/B,kBAAkB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,WAAW,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAEtB,wCAAwC;QACxC,sBAAsB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7C,4BAA4B,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAC1B,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,MAAM,UAAU,GAAe,QAAQ,CAAC;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC;QAEhC,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACtD,KAAK,EACL,YAAY,CAAC,OAAO,CAAC,eAAe,EACpC,UAAU,CACX,CAAC;QAEF,MAAM,CAAC,WAAW,CAAC,CAAC,oBAAoB,CACtC;YACE,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,sDAAsD;SAC7D,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QAEF,MAAM,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC;QAErC,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACtD,KAAK,EACL,YAAY,CAAC,OAAO,CAAC,eAAe,EACpC,SAAS,CACV,CAAC;QAEF,MAAM,CAAC,WAAW,CAAC,CAAC,oBAAoB,CACtC;YACE,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,kDAAkD;SACzD,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QAEF,MAAM,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,MAAM,WAAW,GAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAChE,MAAM,YAAY,GAA2B;YAC3C,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,UAAU;YACpB,GAAG,EAAE,KAAK;SACX,CAAC;QACF,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC;QAEhC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjC,GAAG,CAAC,GAAG,EAAE;gBACP,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACtD,KAAK,EACL,YAAY,CAAC,OAAO,CAAC,eAAe,EACpC,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,WAAW,CAAC,CAAC,oBAAoB,CACtC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,6BAA6B,YAAY,CAAC,UAAU,CAAC,qBAAqB;aACjF,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,MAAM,UAAU,GAAe,QAAQ,CAAC;QACxC,MAAM,MAAM,GAA2B;YACrC,YAAY,CAAC,IAAI;YACjB,YAAY,CAAC,SAAS;SACvB,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,GAAG,CAAC,GAAG,EAAE;gBACP,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACtD,KAAK,EACL,YAAY,CAAC,OAAO,CAAC,eAAe,EACpC,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,WAAW,CAAC,CAAC,oBAAoB,CACtC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,yCAAyC,KAAK,YAAY;aACjE,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,sBAAsB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE9C,MAAM,UAAU,GAAe,QAAQ,CAAC;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC;QAEhC,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC3D,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,4BAA4B,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAEpD,MAAM,UAAU,GAAe,QAAQ,CAAC;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC;QAEhC,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC3D,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CAAC,KAAC,aAAa,KAAG,CAAC,CAAC;QAE1B,MAAM,YAAY,GAAG,yBAAyB,CAAC;QAE7C,kBAAkB,CAAC,QAGpB,CAAC,kBAAkB,CAAC,GAAG,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAe,QAAQ,CAAC;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC;QAEhC,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAC7C,2CAA2C,YAAY,EAAE,CAC1D,CAAC;QACF,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -3,7 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { type Config, type FallbackIntent, UserTierId } from '@google/gemini-cli-core';
6
+ import { type Config, type FallbackIntent, type UserTierId } from '@google/gemini-cli-core';
7
7
  import { type UseHistoryManagerReturn } from './useHistoryManager.js';
8
8
  import { type ProQuotaDialogRequest } from '../contexts/UIStateContext.js';
9
9
  interface UseQuotaAndFallbackArgs {
@@ -3,7 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { AuthType, TerminalQuotaError, UserTierId, DEFAULT_GEMINI_FLASH_MODEL, } from '@google/gemini-cli-core';
6
+ import { AuthType, TerminalQuotaError, ModelNotFoundError, PREVIEW_GEMINI_MODEL, } from '@google/gemini-cli-core';
7
7
  import { useCallback, useEffect, useRef, useState } from 'react';
8
8
  import {} from './useHistoryManager.js';
9
9
  import { MessageType } from '../types.js';
@@ -20,39 +20,31 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setModel
20
20
  contentGeneratorConfig.authType !== AuthType.LOGIN_WITH_GOOGLE) {
21
21
  return null;
22
22
  }
23
- // Use actual user tier if available; otherwise, default to FREE tier behavior (safe default)
24
- const isPaidTier = userTier === UserTierId.LEGACY || userTier === UserTierId.STANDARD;
25
- const isFallbackModel = failedModel === DEFAULT_GEMINI_FLASH_MODEL;
26
23
  let message;
24
+ let isTerminalQuotaError = false;
25
+ let isModelNotFoundError = false;
27
26
  if (error instanceof TerminalQuotaError) {
27
+ isTerminalQuotaError = true;
28
28
  // Common part of the message for both tiers
29
29
  const messageLines = [
30
- `⚡ You have reached your daily ${failedModel} quota limit.`,
31
- `⚡ You can choose to authenticate with a paid API key${isFallbackModel ? '.' : ' or continue with the fallback model.'}`,
30
+ `Usage limit reached for ${failedModel}.`,
31
+ error.retryDelayMs ? getResetTimeMessage(error.retryDelayMs) : null,
32
+ `/stats for usage details`,
33
+ `/auth to switch to API key.`,
34
+ ].filter(Boolean);
35
+ message = messageLines.join('\n');
36
+ }
37
+ else if (error instanceof ModelNotFoundError) {
38
+ isModelNotFoundError = true;
39
+ const messageLines = [
40
+ `It seems like you don't have access to Gemini 3.`,
41
+ `Learn more at https://goo.gle/enable-preview-features`,
42
+ `To disable Gemini 3, disable "Preview features" in /settings.`,
32
43
  ];
33
- // Tier-specific part
34
- if (isPaidTier) {
35
- messageLines.push(`⚡ Increase your limits by using a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key`, `⚡ You can switch authentication methods by typing /auth`);
36
- }
37
- else {
38
- messageLines.push(`⚡ Increase your limits by `, `⚡ - signing up for a plan with higher limits at https://goo.gle/set-up-gemini-code-assist`, `⚡ - or using a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key`, `⚡ You can switch authentication methods by typing /auth`);
39
- }
40
44
  message = messageLines.join('\n');
41
45
  }
42
46
  else {
43
- // Capacity error
44
- message = [
45
- `🚦Pardon Our Congestion! It looks like ${failedModel} is very popular at the moment.`,
46
- `Please retry again later.`,
47
- ].join('\n');
48
- }
49
- // Add message to UI history
50
- historyManager.addItem({
51
- type: MessageType.INFO,
52
- text: message,
53
- }, Date.now());
54
- if (isFallbackModel) {
55
- return 'stop';
47
+ message = `${failedModel} is currently experiencing high demand. We apologize and appreciate your patience.`;
56
48
  }
57
49
  setModelSwitchedFromQuotaError(true);
58
50
  config.setQuotaErrorOccurred(true);
@@ -65,6 +57,9 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setModel
65
57
  failedModel,
66
58
  fallbackModel,
67
59
  resolve,
60
+ message,
61
+ isTerminalQuotaError,
62
+ isModelNotFoundError,
68
63
  });
69
64
  });
70
65
  return intent;
@@ -78,11 +73,20 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setModel
78
73
  proQuotaRequest.resolve(intent);
79
74
  setProQuotaRequest(null);
80
75
  isDialogPending.current = false; // Reset the flag here
81
- if (choice === 'retry') {
82
- historyManager.addItem({
83
- type: MessageType.INFO,
84
- text: 'Switched to fallback model. Tip: Press Ctrl+P (or Up Arrow) to recall your previous prompt and submit it again if you wish.',
85
- }, Date.now());
76
+ if (choice === 'retry_always') {
77
+ // If we were recovering from a Preview Model failure, show a specific message.
78
+ if (proQuotaRequest.failedModel === PREVIEW_GEMINI_MODEL) {
79
+ historyManager.addItem({
80
+ type: MessageType.INFO,
81
+ text: `Switched to fallback model ${proQuotaRequest.fallbackModel}. ${!proQuotaRequest.isModelNotFoundError ? `We will periodically check if ${PREVIEW_GEMINI_MODEL} is available again.` : ''}`,
82
+ }, Date.now());
83
+ }
84
+ else {
85
+ historyManager.addItem({
86
+ type: MessageType.INFO,
87
+ text: 'Switched to fallback model.',
88
+ }, Date.now());
89
+ }
86
90
  }
87
91
  }, [proQuotaRequest, historyManager]);
88
92
  return {
@@ -90,4 +94,13 @@ export function useQuotaAndFallback({ config, historyManager, userTier, setModel
90
94
  handleProQuotaChoice,
91
95
  };
92
96
  }
97
+ function getResetTimeMessage(delayMs) {
98
+ const resetDate = new Date(Date.now() + delayMs);
99
+ const timeFormatter = new Intl.DateTimeFormat('en-US', {
100
+ hour: 'numeric',
101
+ minute: '2-digit',
102
+ timeZoneName: 'short',
103
+ });
104
+ return `Access resets at ${timeFormatter.format(resetDate)}.`;
105
+ }
93
106
  //# sourceMappingURL=useQuotaAndFallback.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useQuotaAndFallback.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useQuotaAndFallback.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.ts"],"names":[],"mappings":"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"}