@google/gemini-cli 0.25.0-preview.0 → 0.26.0-nightly.20260119.20580d754
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/google-gemini-cli-0.26.0-nightly.20260115.6cb3ae4e0.tgz +0 -0
- package/dist/package.json +4 -3
- package/dist/src/commands/extensions/configure.js +8 -1
- package/dist/src/commands/extensions/configure.js.map +1 -1
- package/dist/src/commands/hooks/migrate.js +1 -1
- package/dist/src/commands/hooks/migrate.js.map +1 -1
- package/dist/src/commands/mcp/list.js +2 -2
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/commands/mcp/list.test.js +25 -8
- package/dist/src/commands/mcp/list.test.js.map +1 -1
- package/dist/src/commands/skills/disable.js +6 -4
- package/dist/src/commands/skills/disable.js.map +1 -1
- package/dist/src/commands/skills/disable.test.js +16 -0
- package/dist/src/commands/skills/disable.test.js.map +1 -1
- package/dist/src/commands/skills/enable.test.js +3 -3
- package/dist/src/commands/skills/enable.test.js.map +1 -1
- package/dist/src/commands/skills/install.d.ts +1 -0
- package/dist/src/commands/skills/install.js +17 -2
- package/dist/src/commands/skills/install.js.map +1 -1
- package/dist/src/commands/skills/install.test.js +43 -5
- package/dist/src/commands/skills/install.test.js.map +1 -1
- package/dist/src/config/config.d.ts +3 -3
- package/dist/src/config/config.integration.test.js +3 -2
- package/dist/src/config/config.integration.test.js.map +1 -1
- package/dist/src/config/config.js +37 -26
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +361 -280
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager-agents.test.js +3 -4
- package/dist/src/config/extension-manager-agents.test.js.map +1 -1
- package/dist/src/config/extension-manager-scope.test.js +13 -15
- package/dist/src/config/extension-manager-scope.test.js.map +1 -1
- package/dist/src/config/extension-manager-skills.test.js +5 -7
- package/dist/src/config/extension-manager-skills.test.js.map +1 -1
- package/dist/src/config/extension-manager.d.ts +2 -2
- package/dist/src/config/extension-manager.js +16 -11
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension.test.js +13 -21
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/consent.d.ts +4 -0
- package/dist/src/config/extensions/consent.js +40 -16
- package/dist/src/config/extensions/consent.js.map +1 -1
- package/dist/src/config/extensions/consent.test.js +31 -7
- package/dist/src/config/extensions/consent.test.js.map +1 -1
- package/dist/src/config/extensions/extensionUpdates.test.js +5 -2
- package/dist/src/config/extensions/extensionUpdates.test.js.map +1 -1
- package/dist/src/config/keyBindings.d.ts +58 -59
- package/dist/src/config/keyBindings.js +131 -135
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/keyBindings.test.js +3 -8
- package/dist/src/config/keyBindings.test.js.map +1 -1
- package/dist/src/config/policy-engine.integration.test.js +15 -0
- package/dist/src/config/policy-engine.integration.test.js.map +1 -1
- package/dist/src/config/settings.d.ts +24 -6
- package/dist/src/config/settings.js +150 -6
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +258 -3
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +53 -20
- package/dist/src/config/settingsSchema.js +48 -22
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +22 -2
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/skills-backward-compatibility.test.js +99 -0
- package/dist/src/config/skills-backward-compatibility.test.js.map +1 -0
- package/dist/src/core/initializer.js +2 -2
- package/dist/src/core/initializer.js.map +1 -1
- package/dist/src/core/initializer.test.js.map +1 -1
- package/dist/src/core/theme.js +1 -1
- package/dist/src/core/theme.js.map +1 -1
- package/dist/src/core/theme.test.js.map +1 -1
- package/dist/src/gemini.js +51 -19
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +48 -61
- package/dist/src/gemini.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/generated/git-commit.js.map +1 -1
- package/dist/src/nonInteractiveCli.d.ts +1 -2
- package/dist/src/nonInteractiveCli.js +1 -16
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +0 -39
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/test-utils/mockCommandContext.js +7 -1
- package/dist/src/test-utils/mockCommandContext.js.map +1 -1
- package/dist/src/test-utils/render.js +2 -0
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/App.test.js +2 -2
- package/dist/src/ui/App.test.js.map +1 -1
- package/dist/src/ui/AppContainer.js +41 -35
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +33 -22
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/ApiAuthDialog.test.js +0 -1
- package/dist/src/ui/auth/ApiAuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.js +5 -5
- package/dist/src/ui/auth/AuthDialog.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js +0 -2
- package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js.map +1 -1
- package/dist/src/ui/auth/useAuth.js +3 -3
- package/dist/src/ui/auth/useAuth.js.map +1 -1
- package/dist/src/ui/commands/aboutCommand.js +1 -1
- package/dist/src/ui/commands/aboutCommand.js.map +1 -1
- package/dist/src/ui/commands/agentsCommand.js +158 -1
- package/dist/src/ui/commands/agentsCommand.js.map +1 -1
- package/dist/src/ui/commands/agentsCommand.test.js +140 -1
- package/dist/src/ui/commands/agentsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.js +23 -23
- package/dist/src/ui/commands/hooksCommand.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.test.js +12 -15
- package/dist/src/ui/commands/hooksCommand.test.js.map +1 -1
- package/dist/src/ui/commands/policiesCommand.js +3 -0
- package/dist/src/ui/commands/policiesCommand.js.map +1 -1
- package/dist/src/ui/commands/policiesCommand.test.js +2 -1
- package/dist/src/ui/commands/policiesCommand.test.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.test.js +14 -7
- package/dist/src/ui/commands/skillsCommand.test.js.map +1 -1
- package/dist/src/ui/components/AdminSettingsChangedDialog.d.ts +6 -0
- package/dist/src/ui/components/AdminSettingsChangedDialog.js +22 -0
- package/dist/src/ui/components/AdminSettingsChangedDialog.js.map +1 -0
- package/dist/src/ui/components/AdminSettingsChangedDialog.test.d.ts +6 -0
- package/dist/src/ui/components/AdminSettingsChangedDialog.test.js +43 -0
- package/dist/src/ui/components/AdminSettingsChangedDialog.test.js.map +1 -0
- package/dist/src/ui/components/AppHeader.js +1 -1
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/Composer.js +4 -6
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +17 -9
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +4 -4
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/DialogManager.test.js +0 -14
- package/dist/src/ui/components/DialogManager.test.js.map +1 -1
- package/dist/src/ui/components/EditorSettingsDialog.js +3 -3
- package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
- package/dist/src/ui/components/Footer.js +5 -5
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Help.js +2 -1
- package/dist/src/ui/components/Help.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +1 -0
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +6 -9
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +8 -14
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.test.js +0 -1
- package/dist/src/ui/components/MultiFolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/RewindConfirmation.d.ts +21 -0
- package/dist/src/ui/components/RewindConfirmation.js +63 -0
- package/dist/src/ui/components/RewindConfirmation.js.map +1 -0
- package/dist/src/ui/components/RewindConfirmation.test.d.ts +6 -0
- package/dist/src/ui/components/RewindConfirmation.test.js +53 -0
- package/dist/src/ui/components/RewindConfirmation.test.js.map +1 -0
- package/dist/src/ui/components/RewindViewer.d.ts +15 -0
- package/dist/src/ui/components/RewindViewer.js +79 -0
- package/dist/src/ui/components/RewindViewer.js.map +1 -0
- package/dist/src/ui/components/RewindViewer.test.d.ts +6 -0
- package/dist/src/ui/components/RewindViewer.test.js +239 -0
- package/dist/src/ui/components/RewindViewer.test.js.map +1 -0
- package/dist/src/ui/components/SessionBrowser.test.js +0 -1
- package/dist/src/ui/components/SessionBrowser.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +4 -4
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +14 -14
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/StatusDisplay.js +3 -4
- package/dist/src/ui/components/StatusDisplay.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.js +2 -2
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +8 -3
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +18 -0
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
- package/dist/src/ui/components/shared/TextInput.test.js +0 -8
- package/dist/src/ui/components/shared/TextInput.test.js.map +1 -1
- package/dist/src/ui/components/shared/performance.test.d.ts +1 -0
- package/dist/src/ui/components/shared/performance.test.js +67 -0
- package/dist/src/ui/components/shared/performance.test.js.map +1 -0
- package/dist/src/ui/components/shared/text-buffer.d.ts +1 -0
- package/dist/src/ui/components/shared/text-buffer.js +80 -54
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.test.js +97 -21
- package/dist/src/ui/components/shared/text-buffer.test.js.map +1 -1
- package/dist/src/ui/constants/tips.js +150 -150
- package/dist/src/ui/constants/tips.js.map +1 -1
- package/dist/src/ui/constants/wittyPhrases.js +118 -118
- package/dist/src/ui/constants/wittyPhrases.js.map +1 -1
- package/dist/src/ui/constants.d.ts +2 -0
- package/dist/src/ui/constants.js +2 -0
- package/dist/src/ui/constants.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.d.ts +0 -1
- package/dist/src/ui/contexts/KeypressContext.js +2 -6
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +2 -10
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +1 -0
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +2 -2
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/contexts/VimModeContext.js +3 -3
- package/dist/src/ui/contexts/VimModeContext.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +0 -5
- package/dist/src/ui/hooks/slashCommandProcessor.js +42 -11
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +1 -144
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.js +1 -1
- package/dist/src/ui/hooks/useAlternateBuffer.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion.js +21 -1
- package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion.test.js +4 -4
- package/dist/src/ui/hooks/useAtCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion_agents.test.js +2 -0
- package/dist/src/ui/hooks/useAtCompletion_agents.test.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.js +1 -1
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +17 -5
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +103 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useKeypress.test.js +11 -13
- package/dist/src/ui/hooks/useKeypress.test.js.map +1 -1
- package/dist/src/ui/hooks/usePermissionsModifyTrust.js +1 -1
- package/dist/src/ui/hooks/usePermissionsModifyTrust.js.map +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.d.ts +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.js +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.test.js +0 -3
- package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
- package/dist/src/ui/hooks/useShowMemoryCommand.js +1 -1
- package/dist/src/ui/hooks/useShowMemoryCommand.js.map +1 -1
- package/dist/src/ui/hooks/useThemeCommand.js +4 -4
- package/dist/src/ui/hooks/useThemeCommand.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +62 -46
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/hooks/vim.js +0 -1
- package/dist/src/ui/hooks/vim.js.map +1 -1
- package/dist/src/ui/hooks/vim.test.js +0 -1
- package/dist/src/ui/hooks/vim.test.js.map +1 -1
- package/dist/src/ui/keyMatchers.js +1 -16
- package/dist/src/ui/keyMatchers.js.map +1 -1
- package/dist/src/ui/keyMatchers.test.js +2 -14
- package/dist/src/ui/keyMatchers.test.js.map +1 -1
- package/dist/src/ui/types.d.ts +1 -5
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.js +1 -1
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.js +31 -6
- package/dist/src/ui/utils/commandUtils.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.test.js +71 -10
- package/dist/src/ui/utils/commandUtils.test.js.map +1 -1
- package/dist/src/ui/utils/formatters.d.ts +9 -0
- package/dist/src/ui/utils/formatters.js +26 -0
- package/dist/src/ui/utils/formatters.js.map +1 -1
- package/dist/src/ui/utils/formatters.test.js +70 -2
- package/dist/src/ui/utils/formatters.test.js.map +1 -1
- package/dist/src/ui/utils/highlight.js +18 -1
- package/dist/src/ui/utils/highlight.js.map +1 -1
- package/dist/src/ui/utils/highlight.test.js +2 -2
- package/dist/src/ui/utils/highlight.test.js.map +1 -1
- package/dist/src/ui/utils/textUtils.d.ts +0 -1
- package/dist/src/ui/utils/textUtils.js +17 -12
- package/dist/src/ui/utils/textUtils.js.map +1 -1
- package/dist/src/ui/utils/textUtils.test.js +1 -0
- package/dist/src/ui/utils/textUtils.test.js.map +1 -1
- package/dist/src/ui/utils/ui-sizing.js +1 -1
- package/dist/src/ui/utils/ui-sizing.js.map +1 -1
- package/dist/src/ui/utils/updateCheck.js +1 -1
- package/dist/src/ui/utils/updateCheck.js.map +1 -1
- package/dist/src/ui/utils/updateCheck.test.js +3 -3
- package/dist/src/ui/utils/updateCheck.test.js.map +1 -1
- package/dist/src/utils/agentSettings.d.ts +31 -0
- package/dist/src/utils/agentSettings.js +103 -0
- package/dist/src/utils/agentSettings.js.map +1 -0
- package/dist/src/utils/agentUtils.d.ts +15 -0
- package/dist/src/utils/agentUtils.js +50 -0
- package/dist/src/utils/agentUtils.js.map +1 -0
- package/dist/src/utils/agentUtils.test.d.ts +6 -0
- package/dist/src/utils/agentUtils.test.js +121 -0
- package/dist/src/utils/agentUtils.test.js.map +1 -0
- package/dist/src/utils/handleAutoUpdate.js +4 -4
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +8 -4
- package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
- package/dist/src/utils/installationInfo.d.ts +1 -1
- package/dist/src/utils/installationInfo.js +13 -13
- package/dist/src/utils/installationInfo.js.map +1 -1
- package/dist/src/utils/installationInfo.test.js +28 -20
- package/dist/src/utils/installationInfo.test.js.map +1 -1
- package/dist/src/utils/relaunch.d.ts +2 -1
- package/dist/src/utils/relaunch.js +6 -3
- package/dist/src/utils/relaunch.js.map +1 -1
- package/dist/src/utils/settingsUtils.d.ts +7 -0
- package/dist/src/utils/settingsUtils.js +17 -0
- package/dist/src/utils/settingsUtils.js.map +1 -1
- package/dist/src/utils/settingsUtils.test.js +33 -33
- package/dist/src/utils/settingsUtils.test.js.map +1 -1
- package/dist/src/utils/skillUtils.d.ts +2 -1
- package/dist/src/utils/skillUtils.js +58 -56
- package/dist/src/utils/skillUtils.js.map +1 -1
- package/dist/src/utils/skillUtils.test.js +13 -0
- package/dist/src/utils/skillUtils.test.js.map +1 -1
- package/dist/src/utils/terminalTheme.js +4 -4
- package/dist/src/utils/terminalTheme.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.js +1 -1
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.test.js +2 -4
- package/dist/src/validateNonInterActiveAuth.test.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.js +8 -3
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -4
- package/dist/src/ui/components/ShellConfirmationDialog.d.ts +0 -15
- package/dist/src/ui/components/ShellConfirmationDialog.js +0 -49
- package/dist/src/ui/components/ShellConfirmationDialog.js.map +0 -1
- package/dist/src/ui/components/ShellConfirmationDialog.test.js +0 -40
- package/dist/src/ui/components/ShellConfirmationDialog.test.js.map +0 -1
- /package/dist/src/{ui/components/ShellConfirmationDialog.test.d.ts → config/skills-backward-compatibility.test.d.ts} +0 -0
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
7
|
+
import { loadCliConfig, parseArguments } from './config.js';
|
|
8
|
+
import * as trustedFolders from './trustedFolders.js';
|
|
9
|
+
import { loadServerHierarchicalMemory } from '@google/gemini-cli-core';
|
|
10
|
+
import { createTestMergedSettings } from './settings.js';
|
|
11
|
+
vi.mock('./trustedFolders.js');
|
|
12
|
+
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
13
|
+
const actual = await importOriginal();
|
|
14
|
+
return {
|
|
15
|
+
...actual,
|
|
16
|
+
loadServerHierarchicalMemory: vi.fn(),
|
|
17
|
+
getPty: vi.fn().mockResolvedValue({ name: 'test-pty' }),
|
|
18
|
+
getVersion: vi.fn().mockResolvedValue('0.0.0-test'),
|
|
19
|
+
};
|
|
20
|
+
});
|
|
21
|
+
describe('Agent Skills Backward Compatibility', () => {
|
|
22
|
+
const originalArgv = process.argv;
|
|
23
|
+
beforeEach(() => {
|
|
24
|
+
vi.resetAllMocks();
|
|
25
|
+
vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
|
|
26
|
+
isTrusted: true,
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
afterEach(() => {
|
|
30
|
+
process.argv = originalArgv;
|
|
31
|
+
});
|
|
32
|
+
describe('loadCliConfig', () => {
|
|
33
|
+
it('should default skillsSupport to true when no settings are present', async () => {
|
|
34
|
+
vi.mocked(loadServerHierarchicalMemory).mockResolvedValue({
|
|
35
|
+
memoryContent: '',
|
|
36
|
+
fileCount: 0,
|
|
37
|
+
filePaths: [],
|
|
38
|
+
});
|
|
39
|
+
process.argv = ['node', 'gemini'];
|
|
40
|
+
const settings = createTestMergedSettings({});
|
|
41
|
+
const config = await loadCliConfig(settings, 'test-session', await parseArguments(settings));
|
|
42
|
+
expect(config.isSkillsSupportEnabled()).toBe(true);
|
|
43
|
+
});
|
|
44
|
+
it('should prioritize skills.enabled=false from settings', async () => {
|
|
45
|
+
vi.mocked(loadServerHierarchicalMemory).mockResolvedValue({
|
|
46
|
+
memoryContent: '',
|
|
47
|
+
fileCount: 0,
|
|
48
|
+
filePaths: [],
|
|
49
|
+
});
|
|
50
|
+
const settings = createTestMergedSettings({
|
|
51
|
+
skills: { enabled: false },
|
|
52
|
+
});
|
|
53
|
+
process.argv = ['node', 'gemini'];
|
|
54
|
+
const config = await loadCliConfig(settings, 'test-session', await parseArguments(settings));
|
|
55
|
+
expect(config.isSkillsSupportEnabled()).toBe(false);
|
|
56
|
+
});
|
|
57
|
+
it('should support legacy experimental.skills=true from settings', async () => {
|
|
58
|
+
vi.mocked(loadServerHierarchicalMemory).mockResolvedValue({
|
|
59
|
+
memoryContent: '',
|
|
60
|
+
fileCount: 0,
|
|
61
|
+
filePaths: [],
|
|
62
|
+
});
|
|
63
|
+
const settings = createTestMergedSettings({
|
|
64
|
+
experimental: { skills: true },
|
|
65
|
+
});
|
|
66
|
+
process.argv = ['node', 'gemini'];
|
|
67
|
+
const config = await loadCliConfig(settings, 'test-session', await parseArguments(settings));
|
|
68
|
+
expect(config.isSkillsSupportEnabled()).toBe(true);
|
|
69
|
+
});
|
|
70
|
+
it('should prioritize legacy experimental.skills=true over new skills.enabled=false', async () => {
|
|
71
|
+
vi.mocked(loadServerHierarchicalMemory).mockResolvedValue({
|
|
72
|
+
memoryContent: '',
|
|
73
|
+
fileCount: 0,
|
|
74
|
+
filePaths: [],
|
|
75
|
+
});
|
|
76
|
+
const settings = createTestMergedSettings({
|
|
77
|
+
skills: { enabled: false },
|
|
78
|
+
experimental: { skills: true },
|
|
79
|
+
});
|
|
80
|
+
process.argv = ['node', 'gemini'];
|
|
81
|
+
const config = await loadCliConfig(settings, 'test-session', await parseArguments(settings));
|
|
82
|
+
expect(config.isSkillsSupportEnabled()).toBe(true);
|
|
83
|
+
});
|
|
84
|
+
it('should still be enabled by default if legacy experimental.skills is false (since new default is true)', async () => {
|
|
85
|
+
vi.mocked(loadServerHierarchicalMemory).mockResolvedValue({
|
|
86
|
+
memoryContent: '',
|
|
87
|
+
fileCount: 0,
|
|
88
|
+
filePaths: [],
|
|
89
|
+
});
|
|
90
|
+
const settings = createTestMergedSettings({
|
|
91
|
+
experimental: { skills: false },
|
|
92
|
+
});
|
|
93
|
+
process.argv = ['node', 'gemini'];
|
|
94
|
+
const config = await loadCliConfig(settings, 'test-session', await parseArguments(settings));
|
|
95
|
+
expect(config.isSkillsSupportEnabled()).toBe(true);
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
//# sourceMappingURL=skills-backward-compatibility.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skills-backward-compatibility.test.js","sourceRoot":"","sources":["../../../src/config/skills-backward-compatibility.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,10 @@ import { validateTheme } from './theme.js';
|
|
|
16
16
|
*/
|
|
17
17
|
export async function initializeApp(config, settings) {
|
|
18
18
|
const authHandle = startupProfiler.start('authenticate');
|
|
19
|
-
const authError = await performInitialAuth(config, settings.merged.security
|
|
19
|
+
const authError = await performInitialAuth(config, settings.merged.security.auth.selectedType);
|
|
20
20
|
authHandle?.end();
|
|
21
21
|
const themeError = validateTheme(settings);
|
|
22
|
-
const shouldOpenAuthDialog = settings.merged.security
|
|
22
|
+
const shouldOpenAuthDialog = settings.merged.security.auth.selectedType === undefined || !!authError;
|
|
23
23
|
logCliConfiguration(config, new StartSessionEvent(config, config.getToolRegistry()));
|
|
24
24
|
if (config.getIdeMode()) {
|
|
25
25
|
const ideClient = await IdeClient.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../../src/core/initializer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,GAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAS3C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,QAAwB;IAExB,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,MAAM,kBAAkB,CACxC,MAAM,EACN,QAAQ,CAAC,MAAM,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../../src/core/initializer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,GAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAS3C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,QAAwB;IAExB,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,MAAM,kBAAkB,CACxC,MAAM,EACN,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAC3C,CAAC;IACF,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,oBAAoB,GACxB,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC;IAE1E,mBAAmB,CACjB,MAAM,EACN,IAAI,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CACxD,CAAC;IAEF,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1B,gBAAgB,CAAC,MAAM,EAAE,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO;QACL,SAAS;QACT,UAAU;QACV,oBAAoB;QACpB,iBAAiB,EAAE,MAAM,CAAC,oBAAoB,EAAE;KACjD,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializer.test.js","sourceRoot":"","sources":["../../../src/core/initializer.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"initializer.test.js","sourceRoot":"","sources":["../../../src/core/initializer.test.ts"],"names":[],"mappings":"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"}
|
package/dist/src/core/theme.js
CHANGED
|
@@ -11,7 +11,7 @@ import {} from '../config/settings.js';
|
|
|
11
11
|
* @returns An error message if the theme is not found, otherwise null.
|
|
12
12
|
*/
|
|
13
13
|
export function validateTheme(settings) {
|
|
14
|
-
const effectiveTheme = settings.merged.ui
|
|
14
|
+
const effectiveTheme = settings.merged.ui.theme;
|
|
15
15
|
if (effectiveTheme && !themeManager.findThemeByName(effectiveTheme)) {
|
|
16
16
|
return `Theme "${effectiveTheme}" not found.`;
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../../src/core/theme.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAE5D;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,QAAwB;IACpD,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../../src/core/theme.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAE5D;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,QAAwB;IACpD,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC;IAChD,IAAI,cAAc,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC;QACpE,OAAO,UAAU,cAAc,cAAc,CAAC;IAChD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.test.js","sourceRoot":"","sources":["../../../src/core/theme.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAE5D,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9C,YAAY,EAAE;QACZ,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;KACzB;CACF,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,IAAI,YAA4B,CAAC;IAEjC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,YAAY,GAAG;YACb,MAAM,EAAE;gBACN,EAAE,EAAE;oBACF,KAAK,EAAE,YAAY;iBACpB;aACF;SAC2B,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,eAAe,CACrD,EAAgE,CACjE,CAAC;QACF,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1B,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACrD,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,YAAY,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"theme.test.js","sourceRoot":"","sources":["../../../src/core/theme.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAE5D,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9C,YAAY,EAAE;QACZ,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;KACzB;CACF,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,IAAI,YAA4B,CAAC;IAEjC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,YAAY,GAAG;YACb,MAAM,EAAE;gBACN,EAAE,EAAE;oBACF,KAAK,EAAE,YAAY;iBACpB;aACF;SAC2B,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,eAAe,CACrD,EAAgE,CACjE,CAAC;QACF,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1B,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACrD,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,GAAG,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1B,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/src/gemini.js
CHANGED
|
@@ -127,7 +127,7 @@ export async function startInteractiveUI(config, settings, startupWarnings, work
|
|
|
127
127
|
// Create wrapper component to use hooks inside render
|
|
128
128
|
const AppWrapper = () => {
|
|
129
129
|
useKittyKeyboardProtocol();
|
|
130
|
-
return (_jsx(SettingsContext.Provider, { value: settings, children: _jsx(KeypressProvider, { config: config, debugKeystrokeLogging: settings.merged.general
|
|
130
|
+
return (_jsx(SettingsContext.Provider, { value: settings, children: _jsx(KeypressProvider, { config: config, debugKeystrokeLogging: settings.merged.general.debugKeystrokeLogging, children: _jsx(MouseProvider, { mouseEventsEnabled: mouseEventsEnabled, debugKeystrokeLogging: settings.merged.general.debugKeystrokeLogging, children: _jsx(ScrollProvider, { children: _jsx(SessionStatsProvider, { children: _jsx(VimModeProvider, { settings: settings, children: _jsx(AppContainer, { config: config, startupWarnings: startupWarnings, version: version, resumedSessionData: resumedSessionData, initializationResult: initializationResult }) }) }) }) }) }) }));
|
|
131
131
|
};
|
|
132
132
|
const instance = render(process.env['DEBUG'] ? (_jsx(React.StrictMode, { children: _jsx(AppWrapper, {}) })) : (_jsx(AppWrapper, {})), {
|
|
133
133
|
stdout: inkStdout,
|
|
@@ -143,8 +143,7 @@ export async function startInteractiveUI(config, settings, startupWarnings, work
|
|
|
143
143
|
},
|
|
144
144
|
patchConsole: false,
|
|
145
145
|
alternateBuffer: useAlternateBuffer,
|
|
146
|
-
incrementalRendering: settings.merged.ui
|
|
147
|
-
useAlternateBuffer,
|
|
146
|
+
incrementalRendering: settings.merged.ui.incrementalRendering !== false && useAlternateBuffer,
|
|
148
147
|
});
|
|
149
148
|
checkForUpdates(settings)
|
|
150
149
|
.then((info) => {
|
|
@@ -160,6 +159,12 @@ export async function startInteractiveUI(config, settings, startupWarnings, work
|
|
|
160
159
|
}
|
|
161
160
|
export async function main() {
|
|
162
161
|
const cliStartupHandle = startupProfiler.start('cli_startup');
|
|
162
|
+
// Listen for admin controls from parent process (IPC) in non-sandbox mode. In
|
|
163
|
+
// sandbox mode, we re-fetch the admin controls from the server once we enter
|
|
164
|
+
// the sandbox.
|
|
165
|
+
// TODO: Cache settings in sandbox mode as well.
|
|
166
|
+
const adminControlsListner = setupAdminControlsListener();
|
|
167
|
+
registerCleanup(adminControlsListner.cleanup);
|
|
163
168
|
const cleanupStdio = patchStdio();
|
|
164
169
|
registerSyncCleanup(() => {
|
|
165
170
|
// This is needed to ensure we don't lose any buffered output.
|
|
@@ -198,10 +203,10 @@ export async function main() {
|
|
|
198
203
|
});
|
|
199
204
|
consolePatcher.patch();
|
|
200
205
|
registerCleanup(consolePatcher.cleanup);
|
|
201
|
-
dns.setDefaultResultOrder(validateDnsResolutionOrder(settings.merged.advanced
|
|
206
|
+
dns.setDefaultResultOrder(validateDnsResolutionOrder(settings.merged.advanced.dnsResolutionOrder));
|
|
202
207
|
// Set a default auth type if one isn't set or is set to a legacy type
|
|
203
|
-
if (!settings.merged.security
|
|
204
|
-
settings.merged.security
|
|
208
|
+
if (!settings.merged.security.auth.selectedType ||
|
|
209
|
+
settings.merged.security.auth.selectedType === AuthType.LEGACY_CLOUD_SHELL) {
|
|
205
210
|
if (process.env['CLOUD_SHELL'] === 'true' ||
|
|
206
211
|
process.env['GEMINI_CLI_USE_COMPUTE_ADC'] === 'true') {
|
|
207
212
|
settings.setValue(SettingScope.User, 'selectedAuthType', AuthType.COMPUTE_ADC);
|
|
@@ -210,11 +215,12 @@ export async function main() {
|
|
|
210
215
|
const partialConfig = await loadCliConfig(settings.merged, sessionId, argv, {
|
|
211
216
|
projectHooks: settings.workspace.settings.hooks,
|
|
212
217
|
});
|
|
218
|
+
adminControlsListner.setConfig(partialConfig);
|
|
213
219
|
// Refresh auth to fetch remote admin settings from CCPA and before entering
|
|
214
220
|
// the sandbox because the sandbox will interfere with the Oauth2 web
|
|
215
221
|
// redirect.
|
|
216
|
-
if (settings.merged.security
|
|
217
|
-
!settings.merged.security
|
|
222
|
+
if (settings.merged.security.auth.selectedType &&
|
|
223
|
+
!settings.merged.security.auth.useExternal) {
|
|
218
224
|
try {
|
|
219
225
|
if (partialConfig.isInteractive()) {
|
|
220
226
|
const err = validateAuthMethod(settings.merged.security.auth.selectedType);
|
|
@@ -224,7 +230,7 @@ export async function main() {
|
|
|
224
230
|
await partialConfig.refreshAuth(settings.merged.security.auth.selectedType);
|
|
225
231
|
}
|
|
226
232
|
else {
|
|
227
|
-
const authType = await validateNonInteractiveAuth(settings.merged.security
|
|
233
|
+
const authType = await validateNonInteractiveAuth(settings.merged.security.auth.selectedType, settings.merged.security.auth.useExternal, partialConfig, settings);
|
|
228
234
|
await partialConfig.refreshAuth(authType);
|
|
229
235
|
}
|
|
230
236
|
}
|
|
@@ -241,7 +247,7 @@ export async function main() {
|
|
|
241
247
|
}
|
|
242
248
|
// hop into sandbox if we are outside and sandboxing is enabled
|
|
243
249
|
if (!process.env['SANDBOX']) {
|
|
244
|
-
const memoryArgs = settings.merged.advanced
|
|
250
|
+
const memoryArgs = settings.merged.advanced.autoConfigureMemory
|
|
245
251
|
? getNodeMemoryArgs(isDebugMode)
|
|
246
252
|
: [];
|
|
247
253
|
const sandboxConfig = await loadSandboxConfig(settings.merged, argv);
|
|
@@ -281,7 +287,7 @@ export async function main() {
|
|
|
281
287
|
else {
|
|
282
288
|
// Relaunch app so we always have a child process that can be internally
|
|
283
289
|
// restarted if needed.
|
|
284
|
-
await relaunchAppInChildProcess(memoryArgs, []);
|
|
290
|
+
await relaunchAppInChildProcess(memoryArgs, [], remoteAdminSettings);
|
|
285
291
|
}
|
|
286
292
|
}
|
|
287
293
|
// We are now past the logic handling potentially launching a child process
|
|
@@ -293,6 +299,7 @@ export async function main() {
|
|
|
293
299
|
projectHooks: settings.workspace.settings.hooks,
|
|
294
300
|
});
|
|
295
301
|
loadConfigHandle?.end();
|
|
302
|
+
adminControlsListner.setConfig(config);
|
|
296
303
|
if (config.isInteractive() && config.storage && config.getDebugMode()) {
|
|
297
304
|
const { registerActivityLogger } = await import('./utils/activityLogger.js');
|
|
298
305
|
registerActivityLogger(config);
|
|
@@ -326,7 +333,7 @@ export async function main() {
|
|
|
326
333
|
// Handle --list-sessions flag
|
|
327
334
|
if (config.getListSessions()) {
|
|
328
335
|
// Attempt auth for summary generation (gracefully skips if not configured)
|
|
329
|
-
const authType = settings.merged.security
|
|
336
|
+
const authType = settings.merged.security.auth.selectedType;
|
|
330
337
|
if (authType) {
|
|
331
338
|
try {
|
|
332
339
|
await config.refreshAuth(authType);
|
|
@@ -369,7 +376,7 @@ export async function main() {
|
|
|
369
376
|
const initAppHandle = startupProfiler.start('initialize_app');
|
|
370
377
|
const initializationResult = await initializeApp(config, settings);
|
|
371
378
|
initAppHandle?.end();
|
|
372
|
-
if (settings.merged.security
|
|
379
|
+
if (settings.merged.security.auth.selectedType ===
|
|
373
380
|
AuthType.LOGIN_WITH_GOOGLE &&
|
|
374
381
|
config.isBrowserLaunchSuppressed()) {
|
|
375
382
|
// Do oauth before app renders to make copying the link possible.
|
|
@@ -448,19 +455,17 @@ export async function main() {
|
|
|
448
455
|
}
|
|
449
456
|
const prompt_id = Math.random().toString(16).slice(2);
|
|
450
457
|
logUserPrompt(config, new UserPromptEvent(input.length, prompt_id, config.getContentGeneratorConfig()?.authType, input));
|
|
451
|
-
const authType = await validateNonInteractiveAuth(settings.merged.security
|
|
458
|
+
const authType = await validateNonInteractiveAuth(settings.merged.security.auth.selectedType, settings.merged.security.auth.useExternal, config, settings);
|
|
452
459
|
await config.refreshAuth(authType);
|
|
453
460
|
if (config.getDebugMode()) {
|
|
454
461
|
debugLogger.log('Session ID: %s', sessionId);
|
|
455
462
|
}
|
|
456
|
-
const hasDeprecatedPromptArg = process.argv.some((arg) => arg.startsWith('--prompt'));
|
|
457
463
|
initializeOutputListenersAndFlush();
|
|
458
464
|
await runNonInteractive({
|
|
459
465
|
config,
|
|
460
466
|
settings,
|
|
461
467
|
input,
|
|
462
468
|
prompt_id,
|
|
463
|
-
hasDeprecatedPromptArg,
|
|
464
469
|
resumedSessionData,
|
|
465
470
|
});
|
|
466
471
|
// Call cleanup before process.exit, which causes cleanup to not run
|
|
@@ -469,14 +474,14 @@ export async function main() {
|
|
|
469
474
|
}
|
|
470
475
|
}
|
|
471
476
|
function setWindowTitle(title, settings) {
|
|
472
|
-
if (!settings.merged.ui
|
|
477
|
+
if (!settings.merged.ui.hideWindowTitle) {
|
|
473
478
|
// Initial state before React loop starts
|
|
474
479
|
const windowTitle = computeTerminalTitle({
|
|
475
480
|
streamingState: StreamingState.Idle,
|
|
476
481
|
isConfirming: false,
|
|
477
482
|
folderName: title,
|
|
478
|
-
showThoughts: !!settings.merged.ui
|
|
479
|
-
useDynamicTitle: settings.merged.ui
|
|
483
|
+
showThoughts: !!settings.merged.ui.showStatusInTitle,
|
|
484
|
+
useDynamicTitle: settings.merged.ui.dynamicWindowTitle,
|
|
480
485
|
});
|
|
481
486
|
writeToStdout(`\x1b]0;${windowTitle}\x07`);
|
|
482
487
|
process.on('exit', () => {
|
|
@@ -520,4 +525,31 @@ export function initializeOutputListenersAndFlush() {
|
|
|
520
525
|
}
|
|
521
526
|
coreEvents.drainBacklogs();
|
|
522
527
|
}
|
|
528
|
+
function setupAdminControlsListener() {
|
|
529
|
+
let pendingSettings;
|
|
530
|
+
let config;
|
|
531
|
+
const messageHandler = (msg) => {
|
|
532
|
+
const message = msg;
|
|
533
|
+
if (message?.type === 'admin-settings' && message.settings) {
|
|
534
|
+
if (config) {
|
|
535
|
+
config.setRemoteAdminSettings(message.settings);
|
|
536
|
+
}
|
|
537
|
+
else {
|
|
538
|
+
pendingSettings = message.settings;
|
|
539
|
+
}
|
|
540
|
+
}
|
|
541
|
+
};
|
|
542
|
+
process.on('message', messageHandler);
|
|
543
|
+
return {
|
|
544
|
+
setConfig: (newConfig) => {
|
|
545
|
+
config = newConfig;
|
|
546
|
+
if (pendingSettings) {
|
|
547
|
+
config.setRemoteAdminSettings(pendingSettings);
|
|
548
|
+
}
|
|
549
|
+
},
|
|
550
|
+
cleanup: () => {
|
|
551
|
+
process.off('message', messageHandler);
|
|
552
|
+
},
|
|
553
|
+
};
|
|
554
|
+
}
|
|
523
555
|
//# sourceMappingURL=gemini.js.map
|
package/dist/src/gemini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/gemini.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/gemini.tsx"],"names":[],"mappings":"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"}
|