@google/gemini-cli 0.24.0-nightly.20260103.30f5c4af4 → 0.25.0-nightly.20260112.15891721a
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/README.md +1 -1
- package/dist/google-gemini-cli-0.25.0-nightly.20260107.59a18e710.tgz +0 -0
- package/dist/package.json +3 -3
- package/dist/src/commands/extensions/configure.d.ts +13 -0
- package/dist/src/commands/extensions/configure.js +124 -0
- package/dist/src/commands/extensions/configure.js.map +1 -0
- package/dist/src/commands/extensions/configure.test.d.ts +1 -0
- package/dist/src/commands/extensions/configure.test.js +197 -0
- package/dist/src/commands/extensions/configure.test.js.map +1 -0
- package/dist/src/commands/extensions/examples/hooks/gemini-extension.json +4 -0
- package/dist/src/commands/extensions/examples/hooks/hooks/hooks.json +14 -0
- package/dist/src/commands/extensions/examples/hooks/scripts/on-start.js +8 -0
- package/dist/src/commands/extensions/examples/mcp-server/README.md +35 -0
- package/dist/src/commands/extensions/examples/mcp-server/example.js +36 -22
- package/dist/src/commands/extensions/examples/mcp-server/gemini-extension.json +1 -1
- package/dist/src/commands/extensions/examples/mcp-server/package.json +0 -7
- package/dist/src/commands/extensions/examples/skills/gemini-extension.json +4 -0
- package/dist/src/commands/extensions/examples/skills/skills/greeter/SKILL.md +7 -0
- package/dist/src/commands/extensions/utils.d.ts +1 -0
- package/dist/src/commands/extensions/utils.js +5 -1
- package/dist/src/commands/extensions/utils.js.map +1 -1
- package/dist/src/commands/extensions.js +2 -2
- package/dist/src/commands/extensions.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/hooks/migrate.test.js +1 -1
- package/dist/src/commands/hooks/migrate.test.js.map +1 -1
- package/dist/src/commands/skills/disable.d.ts +14 -0
- package/dist/src/commands/skills/disable.js +45 -0
- package/dist/src/commands/skills/disable.js.map +1 -0
- package/dist/src/commands/skills/disable.test.d.ts +6 -0
- package/dist/src/commands/skills/disable.test.js +80 -0
- package/dist/src/commands/skills/disable.test.js.map +1 -0
- package/dist/src/commands/skills/enable.d.ts +12 -0
- package/dist/src/commands/skills/enable.js +35 -0
- package/dist/src/commands/skills/enable.js.map +1 -0
- package/dist/src/commands/skills/enable.test.d.ts +6 -0
- package/dist/src/commands/skills/enable.test.js +107 -0
- package/dist/src/commands/skills/enable.test.js.map +1 -0
- package/dist/src/commands/skills/list.d.ts +10 -0
- package/dist/src/commands/skills/list.js +60 -0
- package/dist/src/commands/skills/list.js.map +1 -0
- package/dist/src/commands/skills/list.test.d.ts +6 -0
- package/dist/src/commands/skills/list.test.js +136 -0
- package/dist/src/commands/skills/list.test.js.map +1 -0
- package/dist/src/commands/{extensions/settings.d.ts → skills.d.ts} +2 -2
- package/dist/src/commands/skills.js +26 -0
- package/dist/src/commands/skills.js.map +1 -0
- package/dist/src/commands/skills.test.d.ts +6 -0
- package/dist/src/commands/skills.test.js +49 -0
- package/dist/src/commands/skills.test.js.map +1 -0
- package/dist/src/config/config.js +61 -23
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +220 -1
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager-scope.test.js +144 -0
- package/dist/src/config/extension-manager-scope.test.js.map +1 -0
- package/dist/src/config/extension-manager-skills.test.js +146 -0
- package/dist/src/config/extension-manager-skills.test.js.map +1 -0
- package/dist/src/config/extension-manager.js +80 -28
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension.test.js +81 -10
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/consent.d.ts +5 -3
- package/dist/src/config/extensions/consent.js +30 -7
- package/dist/src/config/extensions/consent.js.map +1 -1
- package/dist/src/config/extensions/consent.test.js +97 -3
- package/dist/src/config/extensions/consent.test.js.map +1 -1
- package/dist/src/config/extensions/extensionSettings.d.ts +5 -3
- package/dist/src/config/extensions/extensionSettings.js +32 -12
- package/dist/src/config/extensions/extensionSettings.js.map +1 -1
- package/dist/src/config/extensions/extensionSettings.test.js +8 -8
- package/dist/src/config/extensions/extensionSettings.test.js.map +1 -1
- package/dist/src/config/extensions/extensionUpdates.test.d.ts +6 -0
- package/dist/src/config/extensions/extensionUpdates.test.js +227 -0
- package/dist/src/config/extensions/extensionUpdates.test.js.map +1 -0
- package/dist/src/config/extensions/storage.js +2 -2
- package/dist/src/config/extensions/storage.js.map +1 -1
- package/dist/src/config/settings.d.ts +6 -7
- package/dist/src/config/settings.js +61 -238
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +228 -706
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +119 -15
- package/dist/src/config/settingsSchema.js +123 -15
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +8 -0
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/settings_validation_warning.test.js +10 -5
- package/dist/src/config/settings_validation_warning.test.js.map +1 -1
- package/dist/src/config/trustedFolders.js +1 -2
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/config/trustedFolders.test.js +7 -0
- package/dist/src/config/trustedFolders.test.js.map +1 -1
- package/dist/src/gemini.js +67 -60
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +36 -83
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/gemini_cleanup.test.js +2 -0
- package/dist/src/gemini_cleanup.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/nonInteractiveCli.js +24 -0
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +46 -1
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.d.ts +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +45 -6
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +58 -1
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.js +13 -11
- package/dist/src/services/prompt-processors/shellProcessor.js.map +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.test.js +93 -61
- package/dist/src/services/prompt-processors/shellProcessor.test.js.map +1 -1
- package/dist/src/test-utils/render.js +2 -2
- 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 +47 -22
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +16 -0
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/commands/agentsCommand.d.ts +7 -0
- package/dist/src/ui/commands/agentsCommand.js +75 -0
- package/dist/src/ui/commands/agentsCommand.js.map +1 -0
- package/dist/src/ui/commands/agentsCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/agentsCommand.test.js +91 -0
- package/dist/src/ui/commands/agentsCommand.test.js.map +1 -0
- package/dist/src/ui/commands/bugCommand.js +27 -4
- package/dist/src/ui/commands/bugCommand.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.test.js +70 -2
- package/dist/src/ui/commands/bugCommand.test.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.d.ts +1 -2
- package/dist/src/ui/commands/chatCommand.js +38 -30
- package/dist/src/ui/commands/chatCommand.js.map +1 -1
- package/dist/src/ui/commands/chatCommand.test.js +79 -52
- package/dist/src/ui/commands/chatCommand.test.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.js +12 -8
- package/dist/src/ui/commands/clearCommand.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.test.js +4 -0
- package/dist/src/ui/commands/clearCommand.test.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +70 -2
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.test.js +70 -3
- package/dist/src/ui/commands/extensionsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.js +153 -18
- package/dist/src/ui/commands/hooksCommand.js.map +1 -1
- package/dist/src/ui/commands/hooksCommand.test.js +186 -15
- package/dist/src/ui/commands/hooksCommand.test.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.test.js +10 -2
- package/dist/src/ui/commands/mcpCommand.test.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.d.ts +1 -1
- package/dist/src/ui/commands/skillsCommand.js +104 -32
- package/dist/src/ui/commands/skillsCommand.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.test.d.ts +1 -1
- package/dist/src/ui/commands/skillsCommand.test.js +230 -8
- package/dist/src/ui/commands/skillsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +2 -1
- package/dist/src/ui/commands/types.js +1 -0
- package/dist/src/ui/commands/types.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 +13 -0
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/ContextSummaryDisplay.test.js +54 -26
- package/dist/src/ui/components/ContextSummaryDisplay.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +1 -1
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.js +19 -14
- package/dist/src/ui/components/FolderTrustDialog.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js +12 -2
- package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.js +4 -4
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +2 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +21 -0
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/HookStatusDisplay.d.ts +12 -0
- package/dist/src/ui/components/HookStatusDisplay.js +20 -0
- package/dist/src/ui/components/HookStatusDisplay.js.map +1 -0
- package/dist/src/ui/components/HookStatusDisplay.test.d.ts +6 -0
- package/dist/src/ui/components/HookStatusDisplay.test.js +51 -0
- package/dist/src/ui/components/HookStatusDisplay.test.js.map +1 -0
- package/dist/src/ui/components/InputPrompt.js +14 -6
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +19 -2
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +6 -1
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +7 -3
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.test.js +16 -3
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
- package/dist/src/ui/components/Notifications.js +2 -3
- package/dist/src/ui/components/Notifications.js.map +1 -1
- package/dist/src/ui/components/Notifications.test.js +1 -0
- package/dist/src/ui/components/Notifications.test.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.d.ts +1 -3
- package/dist/src/ui/components/ProQuotaDialog.js +8 -21
- package/dist/src/ui/components/ProQuotaDialog.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.test.js +31 -11
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +33 -13
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +15 -1
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/StatusDisplay.d.ts +11 -0
- package/dist/src/ui/components/StatusDisplay.js +40 -0
- package/dist/src/ui/components/StatusDisplay.js.map +1 -0
- package/dist/src/ui/components/StatusDisplay.test.d.ts +6 -0
- package/dist/src/ui/components/StatusDisplay.test.js +144 -0
- package/dist/src/ui/components/StatusDisplay.test.js.map +1 -0
- package/dist/src/ui/components/SuggestionsDisplay.js +7 -2
- package/dist/src/ui/components/SuggestionsDisplay.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.test.js +1 -1
- package/dist/src/ui/components/ThemeDialog.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.test.js +1 -0
- package/dist/src/ui/components/messages/ToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/views/AgentsStatus.d.ts +13 -0
- package/dist/src/ui/components/views/AgentsStatus.js +23 -0
- package/dist/src/ui/components/views/AgentsStatus.js.map +1 -0
- package/dist/src/ui/components/views/ExtensionsList.js +2 -1
- package/dist/src/ui/components/views/ExtensionsList.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionsList.test.js +12 -1
- package/dist/src/ui/components/views/ExtensionsList.test.js.map +1 -1
- package/dist/src/ui/components/views/HooksList.js +25 -16
- package/dist/src/ui/components/views/HooksList.js.map +1 -1
- package/dist/src/ui/components/views/SkillsList.js +9 -7
- package/dist/src/ui/components/views/SkillsList.js.map +1 -1
- package/dist/src/ui/components/views/SkillsList.test.js +37 -4
- package/dist/src/ui/components/views/SkillsList.test.js.map +1 -1
- package/dist/src/ui/constants/tips.js +0 -1
- package/dist/src/ui/constants/tips.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 +1 -0
- package/dist/src/ui/contexts/KeypressContext.js +56 -6
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +99 -8
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +3 -1
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +16 -2
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.js +9 -3
- package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor_agents.test.d.ts +6 -0
- package/dist/src/ui/hooks/atCommandProcessor_agents.test.js +183 -0
- package/dist/src/ui/hooks/atCommandProcessor_agents.test.js.map +1 -0
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +1 -0
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion.js +31 -0
- package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion_agents.test.d.ts +6 -0
- package/dist/src/ui/hooks/useAtCompletion_agents.test.js +85 -0
- package/dist/src/ui/hooks/useAtCompletion_agents.test.js.map +1 -0
- package/dist/src/ui/hooks/useCommandCompletion.js +12 -8
- package/dist/src/ui/hooks/useCommandCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.test.js +81 -0
- package/dist/src/ui/hooks/useCommandCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.test.js +7 -0
- package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.js +14 -19
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.test.js +30 -22
- package/dist/src/ui/hooks/useFolderTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +29 -0
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +82 -0
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useHookDisplayState.d.ts +7 -0
- package/dist/src/ui/hooks/useHookDisplayState.js +83 -0
- package/dist/src/ui/hooks/useHookDisplayState.js.map +1 -0
- package/dist/src/ui/hooks/useHookDisplayState.test.d.ts +6 -0
- package/dist/src/ui/hooks/useHookDisplayState.test.js +180 -0
- package/dist/src/ui/hooks/useHookDisplayState.test.js.map +1 -0
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js +10 -3
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js +15 -10
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +13 -8
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
- package/dist/src/ui/hooks/useRewind.d.ts +14 -0
- package/dist/src/ui/hooks/useRewind.js +31 -0
- package/dist/src/ui/hooks/useRewind.js.map +1 -0
- package/dist/src/ui/hooks/useRewind.test.d.ts +6 -0
- package/dist/src/ui/hooks/useRewind.test.js +100 -0
- package/dist/src/ui/hooks/useRewind.test.js.map +1 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js +11 -2
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/themes/theme-manager.js +2 -3
- package/dist/src/ui/themes/theme-manager.js.map +1 -1
- package/dist/src/ui/themes/theme-manager.test.js +7 -0
- package/dist/src/ui/themes/theme-manager.test.js.map +1 -1
- package/dist/src/ui/types.d.ts +15 -8
- package/dist/src/ui/types.js +1 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.test.js +1 -1
- package/dist/src/ui/utils/CodeColorizer.test.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.test.js +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.test.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.js +12 -7
- package/dist/src/ui/utils/commandUtils.js.map +1 -1
- package/dist/src/ui/utils/commandUtils.test.js +24 -0
- package/dist/src/ui/utils/commandUtils.test.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.js +4 -4
- package/dist/src/ui/utils/directoryUtils.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.test.js +1 -0
- package/dist/src/ui/utils/directoryUtils.test.js.map +1 -1
- package/dist/src/ui/utils/historyExportUtils.d.ts +21 -0
- package/dist/src/ui/utils/historyExportUtils.js +59 -0
- package/dist/src/ui/utils/historyExportUtils.js.map +1 -0
- package/dist/src/ui/utils/rewindFileOps.d.ts +47 -0
- package/dist/src/ui/utils/rewindFileOps.js +190 -0
- package/dist/src/ui/utils/rewindFileOps.js.map +1 -0
- package/dist/src/ui/utils/rewindFileOps.test.d.ts +6 -0
- package/dist/src/ui/utils/rewindFileOps.test.js +375 -0
- package/dist/src/ui/utils/rewindFileOps.test.js.map +1 -0
- package/dist/src/ui/utils/terminalCapabilityManager.d.ts +4 -8
- package/dist/src/ui/utils/terminalCapabilityManager.js +43 -72
- package/dist/src/ui/utils/terminalCapabilityManager.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.test.js +20 -6
- package/dist/src/ui/utils/terminalCapabilityManager.test.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.d.ts +1 -1
- package/dist/src/ui/utils/terminalSetup.js +19 -4
- package/dist/src/ui/utils/terminalSetup.js.map +1 -1
- package/dist/src/ui/utils/terminalSetup.test.js +7 -0
- package/dist/src/ui/utils/terminalSetup.test.js.map +1 -1
- package/dist/src/ui/utils/textUtils.js +9 -1
- package/dist/src/ui/utils/textUtils.js.map +1 -1
- package/dist/src/ui/utils/textUtils.test.js +12 -1
- 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/ui-sizing.test.js +2 -2
- package/dist/src/ui/utils/ui-sizing.test.js.map +1 -1
- package/dist/src/utils/activityLogger.d.ts +47 -0
- package/dist/src/utils/activityLogger.js +297 -0
- package/dist/src/utils/activityLogger.js.map +1 -0
- package/dist/src/utils/cleanup.d.ts +5 -0
- package/dist/src/utils/cleanup.js +17 -0
- package/dist/src/utils/cleanup.js.map +1 -1
- package/dist/src/utils/cleanup.test.js +21 -31
- package/dist/src/utils/cleanup.test.js.map +1 -1
- package/dist/src/utils/resolvePath.js +3 -3
- package/dist/src/utils/resolvePath.js.map +1 -1
- package/dist/src/utils/resolvePath.test.js +3 -0
- package/dist/src/utils/resolvePath.test.js.map +1 -1
- package/dist/src/utils/sandbox.js +17 -10
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/sandbox.test.js +17 -5
- package/dist/src/utils/sandbox.test.js.map +1 -1
- package/dist/src/utils/settingsUtils.js +0 -5
- package/dist/src/utils/settingsUtils.js.map +1 -1
- package/dist/src/utils/skillSettings.d.ts +33 -0
- package/dist/src/utils/skillSettings.js +101 -0
- package/dist/src/utils/skillSettings.js.map +1 -0
- package/dist/src/utils/skillUtils.d.ts +16 -0
- package/dist/src/utils/skillUtils.js +51 -0
- package/dist/src/utils/skillUtils.js.map +1 -0
- package/dist/src/utils/userStartupWarnings.d.ts +2 -1
- package/dist/src/utils/userStartupWarnings.js +17 -7
- package/dist/src/utils/userStartupWarnings.js.map +1 -1
- package/dist/src/utils/userStartupWarnings.test.js +37 -6
- package/dist/src/utils/userStartupWarnings.test.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.js +1 -1
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.test.js +12 -0
- package/dist/src/zed-integration/zedIntegration.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/dist/google-gemini-cli-0.24.0-nightly.20251227.37be16243.tgz +0 -0
- package/dist/src/commands/extensions/examples/mcp-server/example.js.map +0 -1
- package/dist/src/commands/extensions/examples/mcp-server/example.test.js +0 -111
- package/dist/src/commands/extensions/examples/mcp-server/example.test.js.map +0 -1
- package/dist/src/commands/extensions/examples/mcp-server/example.test.ts +0 -135
- package/dist/src/commands/extensions/examples/mcp-server/example.ts +0 -60
- package/dist/src/commands/extensions/examples/mcp-server/tsconfig.json +0 -13
- package/dist/src/commands/extensions/settings.js +0 -111
- package/dist/src/commands/extensions/settings.js.map +0 -1
- package/dist/src/ui/hooks/useBracketedPaste.d.ts +0 -12
- package/dist/src/ui/hooks/useBracketedPaste.js +0 -31
- package/dist/src/ui/hooks/useBracketedPaste.js.map +0 -1
- package/dist/src/ui/utils/bracketedPaste.d.ts +0 -7
- package/dist/src/ui/utils/bracketedPaste.js +0 -15
- package/dist/src/ui/utils/bracketedPaste.js.map +0 -1
- /package/dist/src/{commands/extensions/examples/mcp-server/example.d.ts → config/extension-manager-scope.test.d.ts} +0 -0
- /package/dist/src/{commands/extensions/examples/mcp-server/example.test.d.ts → config/extension-manager-skills.test.d.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/textUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAK9C,OAAO,
|
|
1
|
+
{"version":3,"file":"textUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/textUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ const getMainAreaWidthInternal = (terminalWidth) => {
|
|
|
19
19
|
return Math.round(percentage * terminalWidth * 0.01);
|
|
20
20
|
};
|
|
21
21
|
export const calculateMainAreaWidth = (terminalWidth, settings) => {
|
|
22
|
-
if (settings.merged.ui?.useFullWidth
|
|
22
|
+
if (settings.merged.ui?.useFullWidth) {
|
|
23
23
|
if (isAlternateBufferEnabled(settings)) {
|
|
24
24
|
return terminalWidth - 1;
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-sizing.js","sourceRoot":"","sources":["../../../../src/ui/utils/ui-sizing.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAuB,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,MAAM,wBAAwB,GAAG,CAAC,aAAqB,EAAU,EAAE;IACjE,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,aAAa,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,aAAa,IAAI,GAAG,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,aAAa,CAAC,CAAC;IACzC,CAAC;IAED,uEAAuE;IACvE,MAAM,CAAC,GAAG,CAAC,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAEnC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,aAAqB,EACrB,QAAwB,EAChB,EAAE;IACV,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"ui-sizing.js","sourceRoot":"","sources":["../../../../src/ui/utils/ui-sizing.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAuB,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,MAAM,wBAAwB,GAAG,CAAC,aAAqB,EAAU,EAAE;IACjE,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,aAAa,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,aAAa,IAAI,GAAG,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,aAAa,CAAC,CAAC;IACzC,CAAC;IAED,uEAAuE;IACvE,MAAM,CAAC,GAAG,CAAC,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAEnC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,aAAqB,EACrB,QAAwB,EAChB,EAAE;IACV,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,CAAC;QACrC,IAAI,wBAAwB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,OAAO,aAAa,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,wBAAwB,CAAC,aAAa,CAAC,CAAC;AACjD,CAAC,CAAC"}
|
|
@@ -28,8 +28,8 @@ describe('ui-sizing', () => {
|
|
|
28
28
|
[100, true, false, 100],
|
|
29
29
|
[80, true, true, 79], // -1 for alternate buffer
|
|
30
30
|
[100, true, true, 99],
|
|
31
|
-
// Default behavior (useFullWidth
|
|
32
|
-
[100,
|
|
31
|
+
// Default behavior (useFullWidth true)
|
|
32
|
+
[100, true, false, 100],
|
|
33
33
|
// useFullWidth: false (Smart sizing)
|
|
34
34
|
[80, false, false, 78], // 98% of 80
|
|
35
35
|
[132, false, false, 119], // 90% of 132
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-sizing.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/ui-sizing.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAuB,MAAM,0BAA0B,CAAC;AAE/D,oBAAoB;AACpB,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9B,wBAAwB,EAAE,EAAE,CAAC,EAAE,EAAE;CAClC,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/C,wBAAwB,EAAE,KAAK,CAAC,wBAAwB;CACzD,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,cAAc,GAAG,CAAC,YAAsB,EAAkB,EAAE,CAChE,CAAC;QACC,MAAM,EAAE;YACN,EAAE,EAAE;gBACF,YAAY;aACb;SACF;KACF,CAA8B,CAAC;IAElC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,IAAI,CAAC;YACN,iDAAiD;YACjD,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACrB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC;YACvB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,0BAA0B;YAChD,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;YAErB,
|
|
1
|
+
{"version":3,"file":"ui-sizing.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/ui-sizing.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAuB,MAAM,0BAA0B,CAAC;AAE/D,oBAAoB;AACpB,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9B,wBAAwB,EAAE,EAAE,CAAC,EAAE,EAAE;CAClC,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/C,wBAAwB,EAAE,KAAK,CAAC,wBAAwB;CACzD,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,cAAc,GAAG,CAAC,YAAsB,EAAkB,EAAE,CAChE,CAAC;QACC,MAAM,EAAE;YACN,EAAE,EAAE;gBACF,YAAY;aACb;SACF;KACF,CAA8B,CAAC;IAElC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,IAAI,CAAC;YACN,iDAAiD;YACjD,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACrB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC;YACvB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,0BAA0B;YAChD,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;YAErB,uCAAuC;YACvC,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC;YAEvB,qCAAqC;YACrC,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,YAAY;YACpC,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,aAAa;YACvC,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,sBAAsB;YAEhD,sBAAsB;YACtB,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,gBAAgB;SAC3C,CAAC,CACA,+DAA+D,EAC/D,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;YAC3C,KAAK,CAAC,wBAAwB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAC1D,MAAM,QAAQ,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;YAE9C,MAAM,CAAC,sBAAsB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjE,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,KAAK,CAAC,wBAAwB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAEvC,MAAM,OAAO,GAA2B,EAAE,CAAC;YAC3C,4BAA4B;YAC5B,KAAK,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,OAAO,CAAC,CAAC,CAAC,GAAG,sBAAsB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YACnD,CAAC;YAED,MAAM,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { EventEmitter } from 'node:events';
|
|
7
|
+
import type { Config } from '@google/gemini-cli-core';
|
|
8
|
+
export interface NetworkLog {
|
|
9
|
+
id: string;
|
|
10
|
+
timestamp: number;
|
|
11
|
+
method: string;
|
|
12
|
+
url: string;
|
|
13
|
+
headers: Record<string, string>;
|
|
14
|
+
body?: string;
|
|
15
|
+
pending?: boolean;
|
|
16
|
+
response?: {
|
|
17
|
+
status: number;
|
|
18
|
+
headers: Record<string, string>;
|
|
19
|
+
body?: string;
|
|
20
|
+
durationMs: number;
|
|
21
|
+
};
|
|
22
|
+
error?: string;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Capture utility for session activities (network and console).
|
|
26
|
+
* Provides a stream of events that can be persisted for analysis or inspection.
|
|
27
|
+
*/
|
|
28
|
+
export declare class ActivityLogger extends EventEmitter {
|
|
29
|
+
private static instance;
|
|
30
|
+
private isInterceptionEnabled;
|
|
31
|
+
private requestStartTimes;
|
|
32
|
+
static getInstance(): ActivityLogger;
|
|
33
|
+
private stringifyHeaders;
|
|
34
|
+
private sanitizeNetworkLog;
|
|
35
|
+
private safeEmitNetwork;
|
|
36
|
+
enable(): void;
|
|
37
|
+
private patchGlobalFetch;
|
|
38
|
+
private patchNodeHttp;
|
|
39
|
+
logConsole(payload: unknown): void;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Registers the activity logger if debug mode and interactive session are enabled.
|
|
43
|
+
* Captures network and console logs to a session-specific JSONL file.
|
|
44
|
+
*
|
|
45
|
+
* @param config The CLI configuration
|
|
46
|
+
*/
|
|
47
|
+
export declare function registerActivityLogger(config: Config): void;
|
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
7
|
+
/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
|
|
8
|
+
/* eslint-disable @typescript-eslint/no-this-alias */
|
|
9
|
+
import http from 'node:http';
|
|
10
|
+
import https from 'node:https';
|
|
11
|
+
import zlib from 'node:zlib';
|
|
12
|
+
import fs from 'node:fs';
|
|
13
|
+
import path from 'node:path';
|
|
14
|
+
import { EventEmitter } from 'node:events';
|
|
15
|
+
import { CoreEvent, coreEvents, debugLogger } from '@google/gemini-cli-core';
|
|
16
|
+
const ACTIVITY_ID_HEADER = 'x-activity-request-id';
|
|
17
|
+
/**
|
|
18
|
+
* Capture utility for session activities (network and console).
|
|
19
|
+
* Provides a stream of events that can be persisted for analysis or inspection.
|
|
20
|
+
*/
|
|
21
|
+
export class ActivityLogger extends EventEmitter {
|
|
22
|
+
static instance;
|
|
23
|
+
isInterceptionEnabled = false;
|
|
24
|
+
requestStartTimes = new Map();
|
|
25
|
+
static getInstance() {
|
|
26
|
+
if (!ActivityLogger.instance) {
|
|
27
|
+
ActivityLogger.instance = new ActivityLogger();
|
|
28
|
+
}
|
|
29
|
+
return ActivityLogger.instance;
|
|
30
|
+
}
|
|
31
|
+
stringifyHeaders(headers) {
|
|
32
|
+
const result = {};
|
|
33
|
+
if (!headers)
|
|
34
|
+
return result;
|
|
35
|
+
if (headers instanceof Headers) {
|
|
36
|
+
headers.forEach((v, k) => {
|
|
37
|
+
result[k.toLowerCase()] = v;
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
else if (typeof headers === 'object' && headers !== null) {
|
|
41
|
+
for (const [key, val] of Object.entries(headers)) {
|
|
42
|
+
result[key.toLowerCase()] = Array.isArray(val)
|
|
43
|
+
? val.join(', ')
|
|
44
|
+
: String(val);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return result;
|
|
48
|
+
}
|
|
49
|
+
sanitizeNetworkLog(log) {
|
|
50
|
+
if (!log || typeof log !== 'object')
|
|
51
|
+
return log;
|
|
52
|
+
const sanitized = { ...log };
|
|
53
|
+
// Sanitize request headers
|
|
54
|
+
if (sanitized.headers) {
|
|
55
|
+
const headers = { ...sanitized.headers };
|
|
56
|
+
for (const key of Object.keys(headers)) {
|
|
57
|
+
if (['authorization', 'cookie', 'x-goog-api-key'].includes(key.toLowerCase())) {
|
|
58
|
+
headers[key] = '[REDACTED]';
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
sanitized.headers = headers;
|
|
62
|
+
}
|
|
63
|
+
// Sanitize response headers
|
|
64
|
+
if (sanitized.response?.headers) {
|
|
65
|
+
const resHeaders = { ...sanitized.response.headers };
|
|
66
|
+
for (const key of Object.keys(resHeaders)) {
|
|
67
|
+
if (['set-cookie'].includes(key.toLowerCase())) {
|
|
68
|
+
resHeaders[key] = '[REDACTED]';
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
sanitized.response = { ...sanitized.response, headers: resHeaders };
|
|
72
|
+
}
|
|
73
|
+
return sanitized;
|
|
74
|
+
}
|
|
75
|
+
safeEmitNetwork(payload) {
|
|
76
|
+
this.emit('network', this.sanitizeNetworkLog(payload));
|
|
77
|
+
}
|
|
78
|
+
enable() {
|
|
79
|
+
if (this.isInterceptionEnabled)
|
|
80
|
+
return;
|
|
81
|
+
this.isInterceptionEnabled = true;
|
|
82
|
+
this.patchGlobalFetch();
|
|
83
|
+
this.patchNodeHttp();
|
|
84
|
+
}
|
|
85
|
+
patchGlobalFetch() {
|
|
86
|
+
if (!global.fetch)
|
|
87
|
+
return;
|
|
88
|
+
const originalFetch = global.fetch;
|
|
89
|
+
global.fetch = async (input, init) => {
|
|
90
|
+
const url = typeof input === 'string'
|
|
91
|
+
? input
|
|
92
|
+
: input instanceof URL
|
|
93
|
+
? input.toString()
|
|
94
|
+
: input.url;
|
|
95
|
+
if (url.includes('127.0.0.1'))
|
|
96
|
+
return originalFetch(input, init);
|
|
97
|
+
const id = Math.random().toString(36).substring(7);
|
|
98
|
+
const method = (init?.method || 'GET').toUpperCase();
|
|
99
|
+
const newInit = { ...init };
|
|
100
|
+
const headers = new Headers(init?.headers || {});
|
|
101
|
+
headers.set(ACTIVITY_ID_HEADER, id);
|
|
102
|
+
newInit.headers = headers;
|
|
103
|
+
let reqBody = '';
|
|
104
|
+
if (init?.body) {
|
|
105
|
+
if (typeof init.body === 'string')
|
|
106
|
+
reqBody = init.body;
|
|
107
|
+
else if (init.body instanceof URLSearchParams)
|
|
108
|
+
reqBody = init.body.toString();
|
|
109
|
+
}
|
|
110
|
+
this.requestStartTimes.set(id, Date.now());
|
|
111
|
+
this.safeEmitNetwork({
|
|
112
|
+
id,
|
|
113
|
+
timestamp: Date.now(),
|
|
114
|
+
method,
|
|
115
|
+
url,
|
|
116
|
+
headers: this.stringifyHeaders(newInit.headers),
|
|
117
|
+
body: reqBody,
|
|
118
|
+
pending: true,
|
|
119
|
+
});
|
|
120
|
+
try {
|
|
121
|
+
const response = await originalFetch(input, newInit);
|
|
122
|
+
const clonedRes = response.clone();
|
|
123
|
+
clonedRes
|
|
124
|
+
.text()
|
|
125
|
+
.then((text) => {
|
|
126
|
+
const startTime = this.requestStartTimes.get(id);
|
|
127
|
+
const durationMs = startTime ? Date.now() - startTime : 0;
|
|
128
|
+
this.requestStartTimes.delete(id);
|
|
129
|
+
this.safeEmitNetwork({
|
|
130
|
+
id,
|
|
131
|
+
pending: false,
|
|
132
|
+
response: {
|
|
133
|
+
status: response.status,
|
|
134
|
+
headers: this.stringifyHeaders(response.headers),
|
|
135
|
+
body: text,
|
|
136
|
+
durationMs,
|
|
137
|
+
},
|
|
138
|
+
});
|
|
139
|
+
})
|
|
140
|
+
.catch((err) => {
|
|
141
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
142
|
+
this.safeEmitNetwork({
|
|
143
|
+
id,
|
|
144
|
+
pending: false,
|
|
145
|
+
error: `Failed to read response body: ${message}`,
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
return response;
|
|
149
|
+
}
|
|
150
|
+
catch (err) {
|
|
151
|
+
this.requestStartTimes.delete(id);
|
|
152
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
153
|
+
this.safeEmitNetwork({ id, pending: false, error: message });
|
|
154
|
+
throw err;
|
|
155
|
+
}
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
patchNodeHttp() {
|
|
159
|
+
const self = this;
|
|
160
|
+
const originalRequest = http.request;
|
|
161
|
+
const originalHttpsRequest = https.request;
|
|
162
|
+
const wrapRequest = (originalFn, args, protocol) => {
|
|
163
|
+
const options = args[0];
|
|
164
|
+
const url = typeof options === 'string'
|
|
165
|
+
? options
|
|
166
|
+
: options.href ||
|
|
167
|
+
`${protocol}//${options.hostname || options.host || 'localhost'}${options.path || '/'}`;
|
|
168
|
+
if (url.includes('127.0.0.1'))
|
|
169
|
+
return originalFn.apply(http, args);
|
|
170
|
+
const headers = typeof options === 'object' && typeof options !== 'function'
|
|
171
|
+
? options.headers
|
|
172
|
+
: {};
|
|
173
|
+
if (headers && headers[ACTIVITY_ID_HEADER]) {
|
|
174
|
+
delete headers[ACTIVITY_ID_HEADER];
|
|
175
|
+
return originalFn.apply(http, args);
|
|
176
|
+
}
|
|
177
|
+
const id = Math.random().toString(36).substring(7);
|
|
178
|
+
self.requestStartTimes.set(id, Date.now());
|
|
179
|
+
const req = originalFn.apply(http, args);
|
|
180
|
+
const requestChunks = [];
|
|
181
|
+
const oldWrite = req.write;
|
|
182
|
+
const oldEnd = req.end;
|
|
183
|
+
req.write = function (chunk, ...etc) {
|
|
184
|
+
if (chunk) {
|
|
185
|
+
const encoding = typeof etc[0] === 'string' ? etc[0] : undefined;
|
|
186
|
+
requestChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, encoding));
|
|
187
|
+
}
|
|
188
|
+
return oldWrite.apply(this, [chunk, ...etc]);
|
|
189
|
+
};
|
|
190
|
+
req.end = function (chunk, ...etc) {
|
|
191
|
+
if (chunk && typeof chunk !== 'function') {
|
|
192
|
+
const encoding = typeof etc[0] === 'string' ? etc[0] : undefined;
|
|
193
|
+
requestChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, encoding));
|
|
194
|
+
}
|
|
195
|
+
const body = Buffer.concat(requestChunks).toString('utf8');
|
|
196
|
+
self.safeEmitNetwork({
|
|
197
|
+
id,
|
|
198
|
+
timestamp: Date.now(),
|
|
199
|
+
method: req.method || 'GET',
|
|
200
|
+
url,
|
|
201
|
+
headers: self.stringifyHeaders(req.getHeaders()),
|
|
202
|
+
body,
|
|
203
|
+
pending: true,
|
|
204
|
+
});
|
|
205
|
+
return oldEnd.apply(this, [chunk, ...etc]);
|
|
206
|
+
};
|
|
207
|
+
req.on('response', (res) => {
|
|
208
|
+
const responseChunks = [];
|
|
209
|
+
res.on('data', (chunk) => responseChunks.push(Buffer.from(chunk)));
|
|
210
|
+
res.on('end', () => {
|
|
211
|
+
const buffer = Buffer.concat(responseChunks);
|
|
212
|
+
const encoding = res.headers['content-encoding'];
|
|
213
|
+
const processBuffer = (finalBuffer) => {
|
|
214
|
+
const resBody = finalBuffer.toString('utf8');
|
|
215
|
+
const startTime = self.requestStartTimes.get(id);
|
|
216
|
+
const durationMs = startTime ? Date.now() - startTime : 0;
|
|
217
|
+
self.requestStartTimes.delete(id);
|
|
218
|
+
self.safeEmitNetwork({
|
|
219
|
+
id,
|
|
220
|
+
pending: false,
|
|
221
|
+
response: {
|
|
222
|
+
status: res.statusCode,
|
|
223
|
+
headers: self.stringifyHeaders(res.headers),
|
|
224
|
+
body: resBody,
|
|
225
|
+
durationMs,
|
|
226
|
+
},
|
|
227
|
+
});
|
|
228
|
+
};
|
|
229
|
+
if (encoding === 'gzip') {
|
|
230
|
+
zlib.gunzip(buffer, (err, decompressed) => {
|
|
231
|
+
processBuffer(err ? buffer : decompressed);
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
else if (encoding === 'deflate') {
|
|
235
|
+
zlib.inflate(buffer, (err, decompressed) => {
|
|
236
|
+
processBuffer(err ? buffer : decompressed);
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
else {
|
|
240
|
+
processBuffer(buffer);
|
|
241
|
+
}
|
|
242
|
+
});
|
|
243
|
+
});
|
|
244
|
+
req.on('error', (err) => {
|
|
245
|
+
self.requestStartTimes.delete(id);
|
|
246
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
247
|
+
self.safeEmitNetwork({ id, pending: false, error: message });
|
|
248
|
+
});
|
|
249
|
+
return req;
|
|
250
|
+
};
|
|
251
|
+
http.request = (...args) => wrapRequest(originalRequest, args, 'http:');
|
|
252
|
+
https.request = (...args) => wrapRequest(originalHttpsRequest, args, 'https:');
|
|
253
|
+
}
|
|
254
|
+
logConsole(payload) {
|
|
255
|
+
this.emit('console', payload);
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
/**
|
|
259
|
+
* Registers the activity logger if debug mode and interactive session are enabled.
|
|
260
|
+
* Captures network and console logs to a session-specific JSONL file.
|
|
261
|
+
*
|
|
262
|
+
* @param config The CLI configuration
|
|
263
|
+
*/
|
|
264
|
+
export function registerActivityLogger(config) {
|
|
265
|
+
if (config.isInteractive() && config.storage && config.getDebugMode()) {
|
|
266
|
+
const capture = ActivityLogger.getInstance();
|
|
267
|
+
capture.enable();
|
|
268
|
+
const logsDir = config.storage.getProjectTempLogsDir();
|
|
269
|
+
if (!fs.existsSync(logsDir)) {
|
|
270
|
+
fs.mkdirSync(logsDir, { recursive: true });
|
|
271
|
+
}
|
|
272
|
+
const logFile = path.join(logsDir, `session-${config.getSessionId()}.jsonl`);
|
|
273
|
+
const writeToLog = (type, payload) => {
|
|
274
|
+
try {
|
|
275
|
+
const entry = JSON.stringify({
|
|
276
|
+
type,
|
|
277
|
+
payload,
|
|
278
|
+
timestamp: Date.now(),
|
|
279
|
+
}) + '\n';
|
|
280
|
+
// Use asynchronous fire-and-forget to avoid blocking the event loop
|
|
281
|
+
fs.promises.appendFile(logFile, entry).catch((err) => {
|
|
282
|
+
debugLogger.error('Failed to write to activity log:', err);
|
|
283
|
+
});
|
|
284
|
+
}
|
|
285
|
+
catch (err) {
|
|
286
|
+
debugLogger.error('Failed to prepare activity log entry:', err);
|
|
287
|
+
}
|
|
288
|
+
};
|
|
289
|
+
capture.on('console', (payload) => writeToLog('console', payload));
|
|
290
|
+
capture.on('network', (payload) => writeToLog('network', payload));
|
|
291
|
+
// Bridge CoreEvents to local capture
|
|
292
|
+
coreEvents.on(CoreEvent.ConsoleLog, (payload) => {
|
|
293
|
+
capture.logConsole(payload);
|
|
294
|
+
});
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
//# sourceMappingURL=activityLogger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"activityLogger.js","sourceRoot":"","sources":["../../../src/utils/activityLogger.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,uDAAuD;AACvD,qEAAqE;AACrE,qDAAqD;AAErD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG7E,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AAmBnD;;;GAGG;AACH,MAAM,OAAO,cAAe,SAAQ,YAAY;IACtC,MAAM,CAAC,QAAQ,CAAiB;IAChC,qBAAqB,GAAG,KAAK,CAAC;IAC9B,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEtD,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC7B,cAAc,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;QACjD,CAAC;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEO,gBAAgB,CAAC,OAAgB;QACvC,MAAM,MAAM,GAA2B,EAAE,CAAC;QAC1C,IAAI,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC;QAE5B,IAAI,OAAO,YAAY,OAAO,EAAE,CAAC;YAC/B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACvB,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YAC3D,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjD,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;oBAC5C,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;oBAChB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,kBAAkB,CAAC,GAAQ;QACjC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAC;QAEhD,MAAM,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;QAE7B,2BAA2B;QAC3B,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;YACzC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvC,IACE,CAAC,eAAe,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CACpD,GAAG,CAAC,WAAW,EAAE,CAClB,EACD,CAAC;oBACD,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;gBAC9B,CAAC;YACH,CAAC;YACD,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;QAC9B,CAAC;QAED,4BAA4B;QAC5B,IAAI,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;oBAC/C,UAAU,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;gBACjC,CAAC;YACH,CAAC;YACD,SAAS,CAAC,QAAQ,GAAG,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;QACtE,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,eAAe,CAAC,OAAY;QAClC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,qBAAqB;YAAE,OAAO;QACvC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAElC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAEO,gBAAgB;QACtB,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,OAAO;QAC1B,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;QAEnC,MAAM,CAAC,KAAK,GAAG,KAAK,EAAE,KAAwB,EAAE,IAAkB,EAAE,EAAE;YACpE,MAAM,GAAG,GACP,OAAO,KAAK,KAAK,QAAQ;gBACvB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK,YAAY,GAAG;oBACpB,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE;oBAClB,CAAC,CAAE,KAAa,CAAC,GAAG,CAAC;YAC3B,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAAE,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAEjE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAErD,MAAM,OAAO,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;YACjD,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;YAE1B,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;gBACf,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;oBAAE,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;qBAClD,IAAI,IAAI,CAAC,IAAI,YAAY,eAAe;oBAC3C,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,CAAC;YAED,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3C,IAAI,CAAC,eAAe,CAAC;gBACnB,EAAE;gBACF,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,MAAM;gBACN,GAAG;gBACH,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC/C,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YAEH,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACrD,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAEnC,SAAS;qBACN,IAAI,EAAE;qBACN,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACb,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACjD,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC1D,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAElC,IAAI,CAAC,eAAe,CAAC;wBACnB,EAAE;wBACF,OAAO,EAAE,KAAK;wBACd,QAAQ,EAAE;4BACR,MAAM,EAAE,QAAQ,CAAC,MAAM;4BACvB,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC;4BAChD,IAAI,EAAE,IAAI;4BACV,UAAU;yBACX;qBACF,CAAC,CAAC;gBACL,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACjE,IAAI,CAAC,eAAe,CAAC;wBACnB,EAAE;wBACF,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,iCAAiC,OAAO,EAAE;qBAClD,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEL,OAAO,QAAQ,CAAC;YAClB,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACtB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAClC,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC7D,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAEO,aAAa;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC;QACrC,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC;QAE3C,MAAM,WAAW,GAAG,CAAC,UAAe,EAAE,IAAW,EAAE,QAAgB,EAAE,EAAE;YACrE,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,GAAG,GACP,OAAO,OAAO,KAAK,QAAQ;gBACzB,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,OAAO,CAAC,IAAI;oBACZ,GAAG,QAAQ,KAAK,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,IAAI,WAAW,GAAG,OAAO,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;YAE9F,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAAE,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEnE,MAAM,OAAO,GACX,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,UAAU;gBAC1D,CAAC,CAAE,OAAe,CAAC,OAAO;gBAC1B,CAAC,CAAC,EAAE,CAAC;YACT,IAAI,OAAO,IAAI,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBACnC,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,CAAC;YAED,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACnD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3C,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACzC,MAAM,aAAa,GAAa,EAAE,CAAC;YAEnC,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC;YAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC;YAEvB,GAAG,CAAC,KAAK,GAAG,UAAU,KAAU,EAAE,GAAG,GAAU;gBAC7C,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,QAAQ,GACZ,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,GAAG,CAAC,CAAC,CAAoB,CAAC,CAAC,CAAC,SAAS,CAAC;oBACtE,aAAa,CAAC,IAAI,CAChB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAC9D,CAAC;gBACJ,CAAC;gBACD,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;YAC/C,CAAC,CAAC;YAEF,GAAG,CAAC,GAAG,GAAG,UAAqB,KAAU,EAAE,GAAG,GAAU;gBACtD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;oBACzC,MAAM,QAAQ,GACZ,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,GAAG,CAAC,CAAC,CAAoB,CAAC,CAAC,CAAC,SAAS,CAAC;oBACtE,aAAa,CAAC,IAAI,CAChB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAC9D,CAAC;gBACJ,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAE3D,IAAI,CAAC,eAAe,CAAC;oBACnB,EAAE;oBACF,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;oBACrB,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,KAAK;oBAC3B,GAAG;oBACH,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;oBAChD,IAAI;oBACJ,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;YAC7C,CAAC,CAAC;YAEF,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,GAAQ,EAAE,EAAE;gBAC9B,MAAM,cAAc,GAAa,EAAE,CAAC;gBACpC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAC/B,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACxC,CAAC;gBACF,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACjB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;oBAC7C,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oBAEjD,MAAM,aAAa,GAAG,CAAC,WAAmB,EAAE,EAAE;wBAC5C,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;wBAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACjD,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC1D,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBAElC,IAAI,CAAC,eAAe,CAAC;4BACnB,EAAE;4BACF,OAAO,EAAE,KAAK;4BACd,QAAQ,EAAE;gCACR,MAAM,EAAE,GAAG,CAAC,UAAU;gCACtB,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC;gCAC3C,IAAI,EAAE,OAAO;gCACb,UAAU;6BACX;yBACF,CAAC,CAAC;oBACL,CAAC,CAAC;oBAEF,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;wBACxB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;4BACxC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;wBAC7C,CAAC,CAAC,CAAC;oBACL,CAAC;yBAAM,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;wBAClC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;4BACzC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;wBAC7C,CAAC,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,aAAa,CAAC,MAAM,CAAC,CAAC;oBACxB,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;gBAC3B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAClC,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/D,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAChC,WAAW,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9C,KAAK,CAAC,OAAO,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACjC,WAAW,CAAC,oBAAoB,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,UAAU,CAAC,OAAgB;QACzB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,IAAI,MAAM,CAAC,aAAa,EAAE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC;QACtE,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;QAC7C,OAAO,CAAC,MAAM,EAAE,CAAC;QAEjB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACvD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CACvB,OAAO,EACP,WAAW,MAAM,CAAC,YAAY,EAAE,QAAQ,CACzC,CAAC;QACF,MAAM,UAAU,GAAG,CAAC,IAA2B,EAAE,OAAgB,EAAE,EAAE;YACnE,IAAI,CAAC;gBACH,MAAM,KAAK,GACT,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI;oBACJ,OAAO;oBACP,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,GAAG,IAAI,CAAC;gBAEZ,oEAAoE;gBACpE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACnD,WAAW,CAAC,KAAK,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,WAAW,CAAC,KAAK,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC;YAClE,CAAC;QACH,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;QACnE,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;QAEnE,qCAAqC;QACrC,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,EAAE;YAC9C,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -6,6 +6,11 @@
|
|
|
6
6
|
import type { Config } from '@google/gemini-cli-core';
|
|
7
7
|
export declare function registerCleanup(fn: (() => void) | (() => Promise<void>)): void;
|
|
8
8
|
export declare function registerSyncCleanup(fn: () => void): void;
|
|
9
|
+
/**
|
|
10
|
+
* Resets the internal cleanup state for testing purposes.
|
|
11
|
+
* This allows tests to run in isolation without vi.resetModules().
|
|
12
|
+
*/
|
|
13
|
+
export declare function resetCleanupForTesting(): void;
|
|
9
14
|
export declare function runSyncCleanup(): void;
|
|
10
15
|
/**
|
|
11
16
|
* Register the config instance for telemetry shutdown.
|
|
@@ -15,6 +15,15 @@ export function registerCleanup(fn) {
|
|
|
15
15
|
export function registerSyncCleanup(fn) {
|
|
16
16
|
syncCleanupFunctions.push(fn);
|
|
17
17
|
}
|
|
18
|
+
/**
|
|
19
|
+
* Resets the internal cleanup state for testing purposes.
|
|
20
|
+
* This allows tests to run in isolation without vi.resetModules().
|
|
21
|
+
*/
|
|
22
|
+
export function resetCleanupForTesting() {
|
|
23
|
+
cleanupFunctions.length = 0;
|
|
24
|
+
syncCleanupFunctions.length = 0;
|
|
25
|
+
configForTelemetry = null;
|
|
26
|
+
}
|
|
18
27
|
export function runSyncCleanup() {
|
|
19
28
|
for (const fn of syncCleanupFunctions) {
|
|
20
29
|
try {
|
|
@@ -44,6 +53,14 @@ export async function runExitCleanup() {
|
|
|
44
53
|
}
|
|
45
54
|
}
|
|
46
55
|
cleanupFunctions.length = 0; // Clear the array
|
|
56
|
+
if (configForTelemetry) {
|
|
57
|
+
try {
|
|
58
|
+
await configForTelemetry.dispose();
|
|
59
|
+
}
|
|
60
|
+
catch (_) {
|
|
61
|
+
// Ignore errors during disposal
|
|
62
|
+
}
|
|
63
|
+
}
|
|
47
64
|
// IMPORTANT: Shutdown telemetry AFTER all other cleanup functions have run
|
|
48
65
|
// This ensures SessionEnd hooks and other telemetry are properly flushed
|
|
49
66
|
if (configForTelemetry && isTelemetrySdkInitialized()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/utils/cleanup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,yBAAyB,CAAC;AAGjC,MAAM,gBAAgB,GAAgD,EAAE,CAAC;AACzE,MAAM,oBAAoB,GAAsB,EAAE,CAAC;AACnD,IAAI,kBAAkB,GAAkB,IAAI,CAAC;AAE7C,MAAM,UAAU,eAAe,CAAC,EAAwC;IACtE,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,EAAc;IAChD,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,KAAK,MAAM,EAAE,IAAI,oBAAoB,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,EAAE,EAAE,CAAC;QACP,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IACD,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,kBAAkB,GAAG,MAAM,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,cAAc,EAAE,CAAC;IACjB,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,EAAE,EAAE,CAAC;QACb,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IACD,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,kBAAkB;IAE/C,2EAA2E;IAC3E,yEAAyE;IACzE,IAAI,kBAAkB,IAAI,yBAAyB,EAAE,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,0CAA0C;QAC5C,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;IACrE,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/utils/cleanup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,yBAAyB,CAAC;AAGjC,MAAM,gBAAgB,GAAgD,EAAE,CAAC;AACzE,MAAM,oBAAoB,GAAsB,EAAE,CAAC;AACnD,IAAI,kBAAkB,GAAkB,IAAI,CAAC;AAE7C,MAAM,UAAU,eAAe,CAAC,EAAwC;IACtE,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,EAAc;IAChD,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB;IACpC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;IAChC,kBAAkB,GAAG,IAAI,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,KAAK,MAAM,EAAE,IAAI,oBAAoB,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,EAAE,EAAE,CAAC;QACP,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IACD,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,kBAAkB,GAAG,MAAM,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,cAAc,EAAE,CAAC;IACjB,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,EAAE,EAAE,CAAC;QACb,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IACD,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,kBAAkB;IAE/C,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,kBAAkB,CAAC,OAAO,EAAE,CAAC;QACrC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IAED,2EAA2E;IAC3E,yEAAyE;IACzE,IAAI,kBAAkB,IAAI,yBAAyB,EAAE,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,0CAA0C;QAC5C,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;IACrE,CAAC;AACH,CAAC"}
|
|
@@ -10,92 +10,82 @@ vi.mock('@google/gemini-cli-core', () => ({
|
|
|
10
10
|
Storage: vi.fn().mockImplementation(() => ({
|
|
11
11
|
getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
|
|
12
12
|
})),
|
|
13
|
+
shutdownTelemetry: vi.fn(),
|
|
14
|
+
isTelemetrySdkInitialized: vi.fn().mockReturnValue(false),
|
|
13
15
|
}));
|
|
14
16
|
vi.mock('node:fs', () => ({
|
|
15
17
|
promises: {
|
|
16
18
|
rm: vi.fn(),
|
|
17
19
|
},
|
|
18
20
|
}));
|
|
21
|
+
import { registerCleanup, runExitCleanup, registerSyncCleanup, runSyncCleanup, cleanupCheckpoints, resetCleanupForTesting, } from './cleanup.js';
|
|
19
22
|
describe('cleanup', () => {
|
|
20
23
|
beforeEach(async () => {
|
|
21
|
-
vi.resetModules();
|
|
22
24
|
vi.clearAllMocks();
|
|
23
|
-
|
|
24
|
-
// because we are using vi.resetModules() and re-importing if necessary,
|
|
25
|
-
// but actually, since we are mocking dependencies, we might not need to re-import cleanup.js
|
|
26
|
-
// unless it has internal state that needs resetting. It does (cleanupFunctions array).
|
|
27
|
-
// So we DO need to re-import it to get fresh state.
|
|
25
|
+
resetCleanupForTesting();
|
|
28
26
|
});
|
|
29
27
|
it('should run a registered synchronous function', async () => {
|
|
30
|
-
const cleanupModule = await import('./cleanup.js');
|
|
31
28
|
const cleanupFn = vi.fn();
|
|
32
|
-
|
|
33
|
-
await
|
|
29
|
+
registerCleanup(cleanupFn);
|
|
30
|
+
await runExitCleanup();
|
|
34
31
|
expect(cleanupFn).toHaveBeenCalledTimes(1);
|
|
35
32
|
});
|
|
36
33
|
it('should run a registered asynchronous function', async () => {
|
|
37
|
-
const cleanupModule = await import('./cleanup.js');
|
|
38
34
|
const cleanupFn = vi.fn().mockResolvedValue(undefined);
|
|
39
|
-
|
|
40
|
-
await
|
|
35
|
+
registerCleanup(cleanupFn);
|
|
36
|
+
await runExitCleanup();
|
|
41
37
|
expect(cleanupFn).toHaveBeenCalledTimes(1);
|
|
42
38
|
});
|
|
43
39
|
it('should run multiple registered functions', async () => {
|
|
44
|
-
const cleanupModule = await import('./cleanup.js');
|
|
45
40
|
const syncFn = vi.fn();
|
|
46
41
|
const asyncFn = vi.fn().mockResolvedValue(undefined);
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
await
|
|
42
|
+
registerCleanup(syncFn);
|
|
43
|
+
registerCleanup(asyncFn);
|
|
44
|
+
await runExitCleanup();
|
|
50
45
|
expect(syncFn).toHaveBeenCalledTimes(1);
|
|
51
46
|
expect(asyncFn).toHaveBeenCalledTimes(1);
|
|
52
47
|
});
|
|
53
48
|
it('should continue running cleanup functions even if one throws an error', async () => {
|
|
54
|
-
const cleanupModule = await import('./cleanup.js');
|
|
55
49
|
const errorFn = vi.fn().mockImplementation(() => {
|
|
56
50
|
throw new Error('test error');
|
|
57
51
|
});
|
|
58
52
|
const successFn = vi.fn();
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
await expect(
|
|
53
|
+
registerCleanup(errorFn);
|
|
54
|
+
registerCleanup(successFn);
|
|
55
|
+
await expect(runExitCleanup()).resolves.not.toThrow();
|
|
62
56
|
expect(errorFn).toHaveBeenCalledTimes(1);
|
|
63
57
|
expect(successFn).toHaveBeenCalledTimes(1);
|
|
64
58
|
});
|
|
65
59
|
describe('sync cleanup', () => {
|
|
66
60
|
it('should run registered sync functions', async () => {
|
|
67
|
-
const cleanupModule = await import('./cleanup.js');
|
|
68
61
|
const syncFn = vi.fn();
|
|
69
|
-
|
|
70
|
-
|
|
62
|
+
registerSyncCleanup(syncFn);
|
|
63
|
+
runSyncCleanup();
|
|
71
64
|
expect(syncFn).toHaveBeenCalledTimes(1);
|
|
72
65
|
});
|
|
73
66
|
it('should continue running sync cleanup functions even if one throws', async () => {
|
|
74
|
-
const cleanupModule = await import('./cleanup.js');
|
|
75
67
|
const errorFn = vi.fn().mockImplementation(() => {
|
|
76
68
|
throw new Error('test error');
|
|
77
69
|
});
|
|
78
70
|
const successFn = vi.fn();
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
expect(() =>
|
|
71
|
+
registerSyncCleanup(errorFn);
|
|
72
|
+
registerSyncCleanup(successFn);
|
|
73
|
+
expect(() => runSyncCleanup()).not.toThrow();
|
|
82
74
|
expect(errorFn).toHaveBeenCalledTimes(1);
|
|
83
75
|
expect(successFn).toHaveBeenCalledTimes(1);
|
|
84
76
|
});
|
|
85
77
|
});
|
|
86
78
|
describe('cleanupCheckpoints', () => {
|
|
87
79
|
it('should remove checkpoints directory', async () => {
|
|
88
|
-
|
|
89
|
-
await cleanupModule.cleanupCheckpoints();
|
|
80
|
+
await cleanupCheckpoints();
|
|
90
81
|
expect(fs.rm).toHaveBeenCalledWith(path.join('/tmp/project', 'checkpoints'), {
|
|
91
82
|
recursive: true,
|
|
92
83
|
force: true,
|
|
93
84
|
});
|
|
94
85
|
});
|
|
95
86
|
it('should ignore errors during checkpoint removal', async () => {
|
|
96
|
-
const cleanupModule = await import('./cleanup.js');
|
|
97
87
|
vi.mocked(fs.rm).mockRejectedValue(new Error('Failed to remove'));
|
|
98
|
-
await expect(
|
|
88
|
+
await expect(cleanupCheckpoints()).resolves.not.toThrow();
|
|
99
89
|
});
|
|
100
90
|
});
|
|
101
91
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanup.test.js","sourceRoot":"","sources":["../../../src/utils/cleanup.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QACzC,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC;KAC3D,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cleanup.test.js","sourceRoot":"","sources":["../../../src/utils/cleanup.test.ts"],"names":[],"mappings":"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"}
|