@machina.ai/cell-cli 1.11.0-rc1 → 1.13.0-rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +12 -10
- package/dist/src/commands/extensions/disable.d.ts +1 -1
- package/dist/src/commands/extensions/disable.js +15 -7
- package/dist/src/commands/extensions/disable.js.map +1 -1
- package/dist/src/commands/extensions/enable.d.ts +1 -1
- package/dist/src/commands/extensions/enable.js +15 -7
- package/dist/src/commands/extensions/enable.js.map +1 -1
- package/dist/src/commands/extensions/install.js +14 -3
- package/dist/src/commands/extensions/install.js.map +1 -1
- package/dist/src/commands/extensions/install.test.js +39 -19
- package/dist/src/commands/extensions/install.test.js.map +1 -1
- package/dist/src/commands/extensions/link.js +14 -3
- package/dist/src/commands/extensions/link.js.map +1 -1
- package/dist/src/commands/extensions/list.js +13 -4
- package/dist/src/commands/extensions/list.js.map +1 -1
- package/dist/src/commands/extensions/uninstall.js +13 -2
- package/dist/src/commands/extensions/uninstall.js.map +1 -1
- package/dist/src/commands/extensions/update.js +18 -13
- package/dist/src/commands/extensions/update.js.map +1 -1
- package/dist/src/commands/extensions/validate.d.ts +12 -0
- package/dist/src/commands/extensions/validate.js +83 -0
- package/dist/src/commands/extensions/validate.js.map +1 -0
- package/dist/src/commands/extensions/validate.test.js +93 -0
- package/dist/src/commands/extensions/validate.test.js.map +1 -0
- package/dist/src/commands/extensions.js +3 -0
- package/dist/src/commands/extensions.js.map +1 -1
- package/dist/src/commands/mcp/add.test.js +3 -0
- package/dist/src/commands/mcp/add.test.js.map +1 -1
- package/dist/src/commands/mcp/list.js +10 -3
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/commands/mcp/list.test.js +37 -27
- package/dist/src/commands/mcp/list.test.js.map +1 -1
- package/dist/src/config/auth.js +0 -5
- package/dist/src/config/auth.js.map +1 -1
- package/dist/src/config/config.d.ts +6 -3
- package/dist/src/config/config.js +65 -80
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +235 -212
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager.d.ts +63 -0
- package/dist/src/config/extension-manager.js +450 -0
- package/dist/src/config/extension-manager.js.map +1 -0
- package/dist/src/config/extension.d.ts +4 -51
- package/dist/src/config/extension.js +1 -535
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/extension.test.js +525 -201
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/consent.d.ts +38 -0
- package/dist/src/config/extensions/consent.js +123 -0
- package/dist/src/config/extensions/consent.js.map +1 -0
- package/dist/src/config/extensions/extensionEnablement.d.ts +1 -1
- package/dist/src/config/extensions/extensionEnablement.js +4 -3
- package/dist/src/config/extensions/extensionEnablement.js.map +1 -1
- package/dist/src/config/extensions/extensionEnablement.test.js +10 -10
- package/dist/src/config/extensions/extensionEnablement.test.js.map +1 -1
- package/dist/src/config/extensions/extensionSettings.d.ts +15 -0
- package/dist/src/config/extensions/extensionSettings.js +113 -0
- package/dist/src/config/extensions/extensionSettings.js.map +1 -0
- package/dist/src/config/extensions/extensionSettings.test.d.ts +6 -0
- package/dist/src/config/extensions/extensionSettings.test.js +254 -0
- package/dist/src/config/extensions/extensionSettings.test.js.map +1 -0
- package/dist/src/config/extensions/github.d.ts +2 -2
- package/dist/src/config/extensions/github.js +5 -10
- package/dist/src/config/extensions/github.js.map +1 -1
- package/dist/src/config/extensions/github.test.js +153 -167
- package/dist/src/config/extensions/github.test.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.d.ts +1 -1
- package/dist/src/config/extensions/github_fetch.js +13 -1
- package/dist/src/config/extensions/github_fetch.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.test.d.ts +6 -0
- package/dist/src/config/extensions/github_fetch.test.js +169 -0
- package/dist/src/config/extensions/github_fetch.test.js.map +1 -0
- package/dist/src/config/extensions/storage.d.ts +14 -0
- package/dist/src/config/extensions/storage.js +32 -0
- package/dist/src/config/extensions/storage.js.map +1 -0
- package/dist/src/config/extensions/update.d.ts +4 -4
- package/dist/src/config/extensions/update.js +39 -39
- package/dist/src/config/extensions/update.js.map +1 -1
- package/dist/src/config/extensions/update.test.js +72 -74
- package/dist/src/config/extensions/update.test.js.map +1 -1
- package/dist/src/config/extensions/variableSchema.d.ts +0 -6
- package/dist/src/config/extensions/variableSchema.js.map +1 -1
- package/dist/src/config/extensions/variables.d.ts +4 -0
- package/dist/src/config/extensions/variables.js +6 -0
- package/dist/src/config/extensions/variables.js.map +1 -1
- package/dist/src/config/keyBindings.d.ts +3 -0
- package/dist/src/config/keyBindings.js +30 -8
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/keyBindings.test.js +17 -0
- package/dist/src/config/keyBindings.test.js.map +1 -1
- package/dist/src/config/policies/read-only.toml +56 -0
- package/dist/src/config/policies/write.toml +63 -0
- package/dist/src/config/policies/yolo.toml +31 -0
- package/dist/src/config/policy-engine.integration.test.js +41 -38
- package/dist/src/config/policy-engine.integration.test.js.map +1 -1
- package/dist/src/config/policy.d.ts +2 -2
- package/dist/src/config/policy.js +10 -148
- package/dist/src/config/policy.js.map +1 -1
- package/dist/src/config/sandboxConfig.d.ts +1 -1
- package/dist/src/config/sandboxConfig.js +6 -3
- package/dist/src/config/sandboxConfig.js.map +1 -1
- package/dist/src/config/settings.d.ts +2 -1
- package/dist/src/config/settings.js +58 -18
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +128 -69
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +170 -28
- package/dist/src/config/settingsSchema.js +418 -27
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settingsSchema.test.js +42 -1
- package/dist/src/config/settingsSchema.test.js.map +1 -1
- package/dist/src/config/trustedFolders.d.ts +1 -1
- package/dist/src/config/trustedFolders.js +4 -2
- package/dist/src/config/trustedFolders.js.map +1 -1
- package/dist/src/core/initializer.js +2 -1
- package/dist/src/core/initializer.js.map +1 -1
- package/dist/src/gemini.d.ts +1 -1
- package/dist/src/gemini.js +46 -16
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +88 -30
- 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/nonInteractiveCli.d.ts +9 -1
- package/dist/src/nonInteractiveCli.js +114 -7
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +355 -112
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +4 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +22 -0
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/services/FeedbackService.js +2 -2
- package/dist/src/services/FeedbackService.js.map +1 -1
- package/dist/src/services/McpPromptLoader.js +2 -2
- package/dist/src/services/McpPromptLoader.js.map +1 -1
- package/dist/src/services/McpPromptLoader.test.js +4 -2
- package/dist/src/services/McpPromptLoader.test.js.map +1 -1
- package/dist/src/test-utils/async.d.ts +9 -0
- package/dist/src/test-utils/async.js +29 -0
- package/dist/src/test-utils/async.js.map +1 -0
- package/dist/src/test-utils/createExtension.d.ts +3 -1
- package/dist/src/test-utils/createExtension.js +3 -3
- package/dist/src/test-utils/createExtension.js.map +1 -1
- package/dist/src/test-utils/render.d.ts +16 -2
- package/dist/src/test-utils/render.js +66 -4
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/test-utils/render.test.d.ts +6 -0
- package/dist/src/test-utils/render.test.js +79 -0
- package/dist/src/test-utils/render.test.js.map +1 -0
- package/dist/src/ui/App.test.js +1 -1
- package/dist/src/ui/App.test.js.map +1 -1
- package/dist/src/ui/AppContainer.js +181 -65
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +505 -147
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/IdeIntegrationNudge.js +1 -1
- package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
- package/dist/src/ui/auth/ApiAuthDialog.d.ts +14 -0
- package/dist/src/ui/auth/ApiAuthDialog.js +26 -0
- package/dist/src/ui/auth/ApiAuthDialog.js.map +1 -0
- package/dist/src/ui/auth/ApiAuthDialog.test.d.ts +6 -0
- package/dist/src/ui/auth/ApiAuthDialog.test.js +91 -0
- package/dist/src/ui/auth/ApiAuthDialog.test.js.map +1 -0
- package/dist/src/ui/auth/AuthDialog.js +7 -3
- package/dist/src/ui/auth/AuthDialog.js.map +1 -1
- package/dist/src/ui/auth/useAuth.d.ts +2 -0
- package/dist/src/ui/auth/useAuth.js +31 -2
- package/dist/src/ui/auth/useAuth.js.map +1 -1
- package/dist/src/ui/colors.js +3 -0
- package/dist/src/ui/colors.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.js +1 -1
- package/dist/src/ui/commands/directoryCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.js +64 -11
- package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
- package/dist/src/ui/commands/extensionsCommand.test.js +72 -1
- package/dist/src/ui/commands/extensionsCommand.test.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.js +14 -14
- package/dist/src/ui/commands/mcpCommand.js.map +1 -1
- package/dist/src/ui/commands/mcpCommand.test.js +4 -0
- package/dist/src/ui/commands/mcpCommand.test.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.js +1 -1
- package/dist/src/ui/commands/memoryCommand.js.map +1 -1
- package/dist/src/ui/commands/memoryCommand.test.js +3 -1
- package/dist/src/ui/commands/memoryCommand.test.js.map +1 -1
- package/dist/src/ui/commands/policiesCommand.d.ts +7 -0
- package/dist/src/ui/commands/policiesCommand.js +59 -0
- package/dist/src/ui/commands/policiesCommand.js.map +1 -0
- package/dist/src/ui/commands/policiesCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/policiesCommand.test.js +83 -0
- package/dist/src/ui/commands/policiesCommand.test.js.map +1 -0
- package/dist/src/ui/components/AnsiOutput.test.js +1 -1
- package/dist/src/ui/components/AnsiOutput.test.js.map +1 -1
- package/dist/src/ui/components/AsciiArt.d.ts +3 -3
- package/dist/src/ui/components/AsciiArt.js +3 -3
- package/dist/src/ui/components/Composer.js +1 -1
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +5 -2
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/ConfigInitDisplay.js +4 -6
- package/dist/src/ui/components/ConfigInitDisplay.js.map +1 -1
- package/dist/src/ui/components/ConsentPrompt.test.js +18 -8
- package/dist/src/ui/components/ConsentPrompt.test.js.map +1 -1
- package/dist/src/ui/components/ConsoleSummaryDisplay.js +1 -1
- package/dist/src/ui/components/ConsoleSummaryDisplay.js.map +1 -1
- package/dist/src/ui/components/ContextSummaryDisplay.test.js +11 -6
- package/dist/src/ui/components/ContextSummaryDisplay.test.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +4 -0
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js +2 -1
- package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/Footer.js +4 -3
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Footer.test.js +83 -0
- package/dist/src/ui/components/Footer.test.js.map +1 -1
- package/dist/src/ui/components/Header.test.js +13 -5
- package/dist/src/ui/components/Header.test.js.map +1 -1
- package/dist/src/ui/components/Help.test.js +5 -4
- package/dist/src/ui/components/Help.test.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +27 -8
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +776 -727
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.js +2 -2
- package/dist/src/ui/components/LoadingIndicator.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.test.js +28 -15
- package/dist/src/ui/components/LoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/components/LoopDetectionConfirmation.js +1 -1
- package/dist/src/ui/components/LoopDetectionConfirmation.js.map +1 -1
- package/dist/src/ui/components/LoopDetectionConfirmation.test.js +2 -2
- package/dist/src/ui/components/LoopDetectionConfirmation.test.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +15 -4
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +1 -1
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.test.js +23 -13
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
- package/dist/src/ui/components/ModelStatsDisplay.test.js +1 -1
- package/dist/src/ui/components/ModelStatsDisplay.test.js.map +1 -1
- package/dist/src/ui/components/Notifications.js +38 -5
- package/dist/src/ui/components/Notifications.js.map +1 -1
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js +2 -2
- package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js.map +1 -1
- package/dist/src/ui/components/PrepareLabel.test.js +14 -8
- package/dist/src/ui/components/PrepareLabel.test.js.map +1 -1
- package/dist/src/ui/components/ProQuotaDialog.test.js +14 -6
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
- package/dist/src/ui/components/QueuedMessageDisplay.test.js +11 -6
- package/dist/src/ui/components/QueuedMessageDisplay.test.js.map +1 -1
- package/dist/src/ui/components/SessionSummaryDisplay.test.js +1 -1
- package/dist/src/ui/components/SessionSummaryDisplay.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +32 -25
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +428 -532
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.js +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.js.map +1 -1
- package/dist/src/ui/components/ShellConfirmationDialog.test.js +2 -2
- package/dist/src/ui/components/ShellConfirmationDialog.test.js.map +1 -1
- package/dist/src/ui/components/StatsDisplay.test.js +1 -1
- package/dist/src/ui/components/StatsDisplay.test.js.map +1 -1
- package/dist/src/ui/components/SuggestionsDisplay.js +1 -1
- package/dist/src/ui/components/SuggestionsDisplay.js.map +1 -1
- package/dist/src/ui/components/ThemeDialog.test.js +2 -2
- package/dist/src/ui/components/ThemeDialog.test.js.map +1 -1
- package/dist/src/ui/components/ToolStatsDisplay.test.js +1 -1
- package/dist/src/ui/components/ToolStatsDisplay.test.js.map +1 -1
- package/dist/src/ui/components/messages/CompressionMessage.test.js +25 -17
- package/dist/src/ui/components/messages/CompressionMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.test.js +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.test.js.map +1 -1
- package/dist/src/ui/components/messages/InfoMessage.js +1 -1
- package/dist/src/ui/components/messages/InfoMessage.js.map +1 -1
- package/dist/src/ui/components/messages/Todo.js +27 -5
- package/dist/src/ui/components/messages/Todo.js.map +1 -1
- package/dist/src/ui/components/messages/Todo.test.js +20 -8
- package/dist/src/ui/components/messages/Todo.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js +29 -15
- package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/WarningMessage.js +2 -2
- package/dist/src/ui/components/messages/WarningMessage.js.map +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.test.js +1 -1
- package/dist/src/ui/components/shared/BaseSelectionList.test.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.test.js +43 -22
- package/dist/src/ui/components/shared/MaxSizedBox.test.js.map +1 -1
- package/dist/src/ui/components/shared/TextInput.d.ts +15 -0
- package/dist/src/ui/components/shared/TextInput.js +38 -0
- package/dist/src/ui/components/shared/TextInput.js.map +1 -0
- package/dist/src/ui/components/shared/TextInput.test.d.ts +6 -0
- package/dist/src/ui/components/shared/TextInput.test.js +242 -0
- package/dist/src/ui/components/shared/TextInput.test.js.map +1 -0
- package/dist/src/ui/components/shared/text-buffer.d.ts +9 -2
- package/dist/src/ui/components/shared/text-buffer.js +51 -13
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.test.js +385 -202
- package/dist/src/ui/components/shared/text-buffer.test.js.map +1 -1
- package/dist/src/ui/components/views/ChatList.test.js +7 -4
- package/dist/src/ui/components/views/ChatList.test.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionsList.d.ts +7 -1
- package/dist/src/ui/components/views/ExtensionsList.js +9 -11
- package/dist/src/ui/components/views/ExtensionsList.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionsList.test.js +43 -22
- package/dist/src/ui/components/views/ExtensionsList.test.js.map +1 -1
- package/dist/src/ui/components/views/McpStatus.test.js +23 -12
- package/dist/src/ui/components/views/McpStatus.test.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.d.ts +3 -2
- package/dist/src/ui/contexts/KeypressContext.js +610 -540
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +438 -718
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/MouseContext.d.ts +21 -0
- package/dist/src/ui/contexts/MouseContext.js +89 -0
- package/dist/src/ui/contexts/MouseContext.js.map +1 -0
- package/dist/src/ui/contexts/MouseContext.test.d.ts +6 -0
- package/dist/src/ui/contexts/MouseContext.test.js +164 -0
- package/dist/src/ui/contexts/MouseContext.test.js.map +1 -0
- package/dist/src/ui/contexts/SessionContext.test.js +35 -17
- package/dist/src/ui/contexts/SessionContext.test.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +2 -0
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +2 -0
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +31 -9
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.js +163 -64
- package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/shellCommandProcessor.test.js +64 -35
- package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +193 -165
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useAtCompletion.test.js +16 -5
- package/dist/src/ui/hooks/useAtCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js +10 -0
- package/dist/src/ui/hooks/useAutoAcceptIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js +32 -1
- package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/useCommandCompletion.test.js +66 -64
- package/dist/src/ui/hooks/useCommandCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useConsoleMessages.test.js +26 -9
- package/dist/src/ui/hooks/useConsoleMessages.test.js.map +1 -1
- package/dist/src/ui/hooks/useEditorSettings.test.js +40 -34
- package/dist/src/ui/hooks/useEditorSettings.test.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.d.ts +14 -5
- package/dist/src/ui/hooks/useExtensionUpdates.js +18 -13
- package/dist/src/ui/hooks/useExtensionUpdates.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.test.js +49 -44
- package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
- package/dist/src/ui/hooks/useFlickerDetector.test.js +9 -5
- package/dist/src/ui/hooks/useFlickerDetector.test.js.map +1 -1
- package/dist/src/ui/hooks/useFocus.test.js +25 -9
- package/dist/src/ui/hooks/useFocus.test.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.test.js +46 -22
- package/dist/src/ui/hooks/useFolderTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +56 -19
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +260 -411
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useGitBranchName.js +4 -0
- package/dist/src/ui/hooks/useGitBranchName.js.map +1 -1
- package/dist/src/ui/hooks/useGitBranchName.test.js +46 -34
- package/dist/src/ui/hooks/useGitBranchName.test.js.map +1 -1
- package/dist/src/ui/hooks/useHistoryManager.test.js +2 -1
- package/dist/src/ui/hooks/useHistoryManager.test.js.map +1 -1
- package/dist/src/ui/hooks/useIdeTrustListener.test.js +40 -9
- package/dist/src/ui/hooks/useIdeTrustListener.test.js.map +1 -1
- package/dist/src/ui/hooks/useInputHistory.test.js +2 -1
- package/dist/src/ui/hooks/useInputHistory.test.js.map +1 -1
- package/dist/src/ui/hooks/useInputHistoryStore.test.js +2 -1
- package/dist/src/ui/hooks/useInputHistoryStore.test.js.map +1 -1
- package/dist/src/ui/hooks/useKeypress.test.js +103 -114
- package/dist/src/ui/hooks/useKeypress.test.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +24 -6
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/useMemoryMonitor.test.js +10 -5
- package/dist/src/ui/hooks/useMemoryMonitor.test.js.map +1 -1
- package/dist/src/ui/hooks/useMessageQueue.test.js +62 -45
- package/dist/src/ui/hooks/useMessageQueue.test.js.map +1 -1
- package/dist/src/ui/hooks/useModelCommand.test.js +21 -11
- package/dist/src/ui/hooks/useModelCommand.test.js.map +1 -1
- package/dist/src/ui/hooks/useMouse.d.ts +17 -0
- package/dist/src/ui/hooks/useMouse.js +27 -0
- package/dist/src/ui/hooks/useMouse.js.map +1 -0
- package/dist/src/ui/hooks/useMouse.test.d.ts +6 -0
- package/dist/src/ui/hooks/useMouse.test.js +57 -0
- package/dist/src/ui/hooks/useMouse.test.js.map +1 -0
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js +2 -2
- package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.js +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.test.js +109 -106
- package/dist/src/ui/hooks/usePhraseCycler.test.js.map +1 -1
- package/dist/src/ui/hooks/usePrivacySettings.test.js +26 -6
- package/dist/src/ui/hooks/usePrivacySettings.test.js.map +1 -1
- package/dist/src/ui/hooks/usePromptCompletion.js +2 -2
- package/dist/src/ui/hooks/usePromptCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js +13 -14
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +55 -48
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.d.ts +8 -1
- package/dist/src/ui/hooks/useReactToolScheduler.js +59 -34
- package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
- package/dist/src/ui/hooks/useReactToolScheduler.test.d.ts +6 -0
- package/dist/src/ui/hooks/useReactToolScheduler.test.js +65 -0
- package/dist/src/ui/hooks/useReactToolScheduler.test.js.map +1 -0
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js +2 -2
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.js +5 -4
- package/dist/src/ui/hooks/useSelectionList.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.test.js +272 -183
- package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
- package/dist/src/ui/hooks/useShellHistory.test.js +52 -20
- package/dist/src/ui/hooks/useShellHistory.test.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.js +18 -7
- package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.js +275 -137
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useTimer.test.js +43 -14
- package/dist/src/ui/hooks/useTimer.test.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +226 -242
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/hooks/vim.test.js +235 -355
- package/dist/src/ui/hooks/vim.test.js.map +1 -1
- package/dist/src/ui/keyMatchers.test.js +30 -3
- package/dist/src/ui/keyMatchers.test.js.map +1 -1
- package/dist/src/ui/state/extensions.d.ts +1 -0
- package/dist/src/ui/state/extensions.js +1 -0
- package/dist/src/ui/state/extensions.js.map +1 -1
- package/dist/src/ui/themes/ansi-light.js +1 -0
- package/dist/src/ui/themes/ansi-light.js.map +1 -1
- package/dist/src/ui/themes/ansi.js +1 -0
- package/dist/src/ui/themes/ansi.js.map +1 -1
- package/dist/src/ui/themes/atom-one-dark.js +2 -0
- package/dist/src/ui/themes/atom-one-dark.js.map +1 -1
- package/dist/src/ui/themes/ayu-light.js +2 -0
- package/dist/src/ui/themes/ayu-light.js.map +1 -1
- package/dist/src/ui/themes/ayu.js +2 -0
- package/dist/src/ui/themes/ayu.js.map +1 -1
- package/dist/src/ui/themes/color-utils.d.ts +1 -0
- package/dist/src/ui/themes/color-utils.js +6 -0
- package/dist/src/ui/themes/color-utils.js.map +1 -1
- package/dist/src/ui/themes/color-utils.test.js +13 -1
- package/dist/src/ui/themes/color-utils.test.js.map +1 -1
- package/dist/src/ui/themes/dracula.js +2 -0
- package/dist/src/ui/themes/dracula.js.map +1 -1
- package/dist/src/ui/themes/github-dark.js +2 -0
- package/dist/src/ui/themes/github-dark.js.map +1 -1
- package/dist/src/ui/themes/github-light.js +2 -0
- package/dist/src/ui/themes/github-light.js.map +1 -1
- package/dist/src/ui/themes/googlecode.js +2 -0
- package/dist/src/ui/themes/googlecode.js.map +1 -1
- package/dist/src/ui/themes/no-color.js +3 -0
- package/dist/src/ui/themes/no-color.js.map +1 -1
- package/dist/src/ui/themes/semantic-tokens.d.ts +2 -0
- package/dist/src/ui/themes/semantic-tokens.js +6 -0
- package/dist/src/ui/themes/semantic-tokens.js.map +1 -1
- package/dist/src/ui/themes/shades-of-purple.js +2 -0
- package/dist/src/ui/themes/shades-of-purple.js.map +1 -1
- package/dist/src/ui/themes/theme.d.ts +3 -0
- package/dist/src/ui/themes/theme.js +14 -3
- package/dist/src/ui/themes/theme.js.map +1 -1
- package/dist/src/ui/themes/theme.test.js +67 -1
- package/dist/src/ui/themes/theme.test.js.map +1 -1
- package/dist/src/ui/themes/xcode.js +2 -0
- package/dist/src/ui/themes/xcode.js.map +1 -1
- package/dist/src/ui/types.d.ts +3 -1
- package/dist/src/ui/types.js +2 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.js +2 -1
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/InlineMarkdownRenderer.d.ts +1 -0
- package/dist/src/ui/utils/InlineMarkdownRenderer.js +11 -10
- package/dist/src/ui/utils/InlineMarkdownRenderer.js.map +1 -1
- package/dist/src/ui/utils/MarkdownDisplay.js +11 -9
- package/dist/src/ui/utils/MarkdownDisplay.js.map +1 -1
- package/dist/src/ui/utils/clipboardUtils.js +2 -2
- package/dist/src/ui/utils/clipboardUtils.js.map +1 -1
- package/dist/src/ui/utils/input.d.ts +17 -0
- package/dist/src/ui/utils/input.js +51 -0
- package/dist/src/ui/utils/input.js.map +1 -0
- package/dist/src/ui/utils/input.test.d.ts +6 -0
- package/dist/src/ui/utils/input.test.js +44 -0
- package/dist/src/ui/utils/input.test.js.map +1 -0
- package/dist/src/ui/utils/kittyProtocolDetector.js +13 -4
- package/dist/src/ui/utils/kittyProtocolDetector.js.map +1 -1
- package/dist/src/ui/utils/mouse.d.ts +31 -0
- package/dist/src/ui/utils/mouse.js +164 -0
- package/dist/src/ui/utils/mouse.js.map +1 -0
- package/dist/src/ui/utils/mouse.test.d.ts +6 -0
- package/dist/src/ui/utils/mouse.test.js +131 -0
- package/dist/src/ui/utils/mouse.test.js.map +1 -0
- package/dist/src/ui/utils/textOutput.d.ts +25 -0
- package/dist/src/ui/utils/textOutput.js +49 -0
- package/dist/src/ui/utils/textOutput.js.map +1 -0
- package/dist/src/ui/utils/textOutput.test.d.ts +6 -0
- package/dist/src/ui/utils/textOutput.test.js +79 -0
- package/dist/src/ui/utils/textOutput.test.js.map +1 -0
- package/dist/src/ui/utils/updateCheck.d.ts +7 -1
- package/dist/src/ui/utils/updateCheck.js +33 -29
- package/dist/src/ui/utils/updateCheck.js.map +1 -1
- package/dist/src/ui/utils/updateCheck.test.js +24 -50
- package/dist/src/ui/utils/updateCheck.test.js.map +1 -1
- package/dist/src/utils/commentJson.js +2 -2
- package/dist/src/utils/commentJson.js.map +1 -1
- package/dist/src/utils/commentJson.test.js +7 -6
- package/dist/src/utils/commentJson.test.js.map +1 -1
- package/dist/src/utils/envVarResolver.d.ts +2 -2
- package/dist/src/utils/envVarResolver.js +10 -7
- package/dist/src/utils/envVarResolver.js.map +1 -1
- package/dist/src/utils/events.d.ts +11 -2
- package/dist/src/utils/events.js +1 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.js +9 -3
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/src/utils/sandbox.js +16 -18
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/version.js +6 -2
- package/dist/src/utils/version.js.map +1 -1
- package/dist/src/zed-integration/acp.js +2 -1
- package/dist/src/zed-integration/acp.js.map +1 -1
- package/dist/src/zed-integration/schema.d.ts +4 -4
- package/dist/src/zed-integration/zedIntegration.d.ts +2 -2
- package/dist/src/zed-integration/zedIntegration.js +12 -19
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +14 -14
- package/dist/src/config/policy.test.js +0 -360
- package/dist/src/config/policy.test.js.map +0 -1
- package/dist/src/utils/package.d.ts +0 -12
- package/dist/src/utils/package.js +0 -24
- package/dist/src/utils/package.js.map +0 -1
- /package/dist/src/{config/policy.test.d.ts → commands/extensions/validate.test.d.ts} +0 -0
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
export type MouseEventName = 'left-press' | 'left-release' | 'right-press' | 'right-release' | 'middle-press' | 'middle-release' | 'scroll-up' | 'scroll-down' | 'scroll-left' | 'scroll-right' | 'move';
|
|
7
|
+
export interface MouseEvent {
|
|
8
|
+
name: MouseEventName;
|
|
9
|
+
col: number;
|
|
10
|
+
row: number;
|
|
11
|
+
shift: boolean;
|
|
12
|
+
meta: boolean;
|
|
13
|
+
ctrl: boolean;
|
|
14
|
+
}
|
|
15
|
+
export type MouseHandler = (event: MouseEvent) => void;
|
|
16
|
+
export declare function getMouseEventName(buttonCode: number, isRelease: boolean): MouseEventName | null;
|
|
17
|
+
export declare function parseSGRMouseEvent(buffer: string): {
|
|
18
|
+
event: MouseEvent;
|
|
19
|
+
length: number;
|
|
20
|
+
} | null;
|
|
21
|
+
export declare function parseX11MouseEvent(buffer: string): {
|
|
22
|
+
event: MouseEvent;
|
|
23
|
+
length: number;
|
|
24
|
+
} | null;
|
|
25
|
+
export declare function parseMouseEvent(buffer: string): {
|
|
26
|
+
event: MouseEvent;
|
|
27
|
+
length: number;
|
|
28
|
+
} | null;
|
|
29
|
+
export declare function isIncompleteMouseSequence(buffer: string): boolean;
|
|
30
|
+
export declare function enableMouseEvents(): void;
|
|
31
|
+
export declare function disableMouseEvents(): void;
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import process from 'node:process';
|
|
7
|
+
import { SGR_MOUSE_REGEX, X11_MOUSE_REGEX, SGR_EVENT_PREFIX, X11_EVENT_PREFIX, couldBeMouseSequence as inputCouldBeMouseSequence, } from './input.js';
|
|
8
|
+
export function getMouseEventName(buttonCode, isRelease) {
|
|
9
|
+
const isMove = (buttonCode & 32) !== 0;
|
|
10
|
+
if (buttonCode === 66) {
|
|
11
|
+
return 'scroll-left';
|
|
12
|
+
}
|
|
13
|
+
else if (buttonCode === 67) {
|
|
14
|
+
return 'scroll-right';
|
|
15
|
+
}
|
|
16
|
+
else if ((buttonCode & 64) === 64) {
|
|
17
|
+
if ((buttonCode & 1) === 0) {
|
|
18
|
+
return 'scroll-up';
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
return 'scroll-down';
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
else if (isMove) {
|
|
25
|
+
return 'move';
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
const button = buttonCode & 3;
|
|
29
|
+
const type = isRelease ? 'release' : 'press';
|
|
30
|
+
switch (button) {
|
|
31
|
+
case 0:
|
|
32
|
+
return `left-${type}`;
|
|
33
|
+
case 1:
|
|
34
|
+
return `middle-${type}`;
|
|
35
|
+
case 2:
|
|
36
|
+
return `right-${type}`;
|
|
37
|
+
default:
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
export function parseSGRMouseEvent(buffer) {
|
|
43
|
+
const match = buffer.match(SGR_MOUSE_REGEX);
|
|
44
|
+
if (match) {
|
|
45
|
+
const buttonCode = parseInt(match[1], 10);
|
|
46
|
+
const col = parseInt(match[2], 10);
|
|
47
|
+
const row = parseInt(match[3], 10);
|
|
48
|
+
const action = match[4];
|
|
49
|
+
const isRelease = action === 'm';
|
|
50
|
+
const shift = (buttonCode & 4) !== 0;
|
|
51
|
+
const meta = (buttonCode & 8) !== 0;
|
|
52
|
+
const ctrl = (buttonCode & 16) !== 0;
|
|
53
|
+
const name = getMouseEventName(buttonCode, isRelease);
|
|
54
|
+
if (name) {
|
|
55
|
+
return {
|
|
56
|
+
event: {
|
|
57
|
+
name,
|
|
58
|
+
ctrl,
|
|
59
|
+
meta,
|
|
60
|
+
shift,
|
|
61
|
+
col,
|
|
62
|
+
row,
|
|
63
|
+
},
|
|
64
|
+
length: match[0].length,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
return null;
|
|
68
|
+
}
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
export function parseX11MouseEvent(buffer) {
|
|
72
|
+
const match = buffer.match(X11_MOUSE_REGEX);
|
|
73
|
+
if (!match)
|
|
74
|
+
return null;
|
|
75
|
+
// The 3 bytes are in match[1]
|
|
76
|
+
const b = match[1].charCodeAt(0) - 32;
|
|
77
|
+
const col = match[1].charCodeAt(1) - 32;
|
|
78
|
+
const row = match[1].charCodeAt(2) - 32;
|
|
79
|
+
const shift = (b & 4) !== 0;
|
|
80
|
+
const meta = (b & 8) !== 0;
|
|
81
|
+
const ctrl = (b & 16) !== 0;
|
|
82
|
+
const isMove = (b & 32) !== 0;
|
|
83
|
+
const isWheel = (b & 64) !== 0;
|
|
84
|
+
let name = null;
|
|
85
|
+
if (isWheel) {
|
|
86
|
+
const button = b & 3;
|
|
87
|
+
switch (button) {
|
|
88
|
+
case 0:
|
|
89
|
+
name = 'scroll-up';
|
|
90
|
+
break;
|
|
91
|
+
case 1:
|
|
92
|
+
name = 'scroll-down';
|
|
93
|
+
break;
|
|
94
|
+
default:
|
|
95
|
+
break;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
else if (isMove) {
|
|
99
|
+
name = 'move';
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
const button = b & 3;
|
|
103
|
+
if (button === 3) {
|
|
104
|
+
// X11 reports 'release' (3) for all button releases without specifying which one.
|
|
105
|
+
// We'll default to 'left-release' as a best-effort guess if we don't track state.
|
|
106
|
+
name = 'left-release';
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
switch (button) {
|
|
110
|
+
case 0:
|
|
111
|
+
name = 'left-press';
|
|
112
|
+
break;
|
|
113
|
+
case 1:
|
|
114
|
+
name = 'middle-press';
|
|
115
|
+
break;
|
|
116
|
+
case 2:
|
|
117
|
+
name = 'right-press';
|
|
118
|
+
break;
|
|
119
|
+
default:
|
|
120
|
+
break;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
if (name) {
|
|
125
|
+
return {
|
|
126
|
+
event: { name, ctrl, meta, shift, col, row },
|
|
127
|
+
length: match[0].length,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
return null;
|
|
131
|
+
}
|
|
132
|
+
export function parseMouseEvent(buffer) {
|
|
133
|
+
return parseSGRMouseEvent(buffer) || parseX11MouseEvent(buffer);
|
|
134
|
+
}
|
|
135
|
+
export function isIncompleteMouseSequence(buffer) {
|
|
136
|
+
if (!inputCouldBeMouseSequence(buffer))
|
|
137
|
+
return false;
|
|
138
|
+
// If it matches a complete sequence, it's not incomplete.
|
|
139
|
+
if (parseMouseEvent(buffer))
|
|
140
|
+
return false;
|
|
141
|
+
if (buffer.startsWith(X11_EVENT_PREFIX)) {
|
|
142
|
+
// X11 needs exactly 3 bytes after prefix.
|
|
143
|
+
return buffer.length < X11_EVENT_PREFIX.length + 3;
|
|
144
|
+
}
|
|
145
|
+
if (buffer.startsWith(SGR_EVENT_PREFIX)) {
|
|
146
|
+
// SGR sequences end with 'm' or 'M'.
|
|
147
|
+
// If it doesn't have it yet, it's incomplete.
|
|
148
|
+
// Add a reasonable max length check to fail early on garbage.
|
|
149
|
+
return !/[mM]/.test(buffer) && buffer.length < 50;
|
|
150
|
+
}
|
|
151
|
+
// It's a prefix of the prefix (e.g. "ESC" or "ESC [")
|
|
152
|
+
return true;
|
|
153
|
+
}
|
|
154
|
+
export function enableMouseEvents() {
|
|
155
|
+
// Enable mouse tracking with SGR format
|
|
156
|
+
// ?1002h = button event tracking (clicks + drags + scroll wheel)
|
|
157
|
+
// ?1006h = SGR extended mouse mode (better coordinate handling)
|
|
158
|
+
process.stdout.write('\u001b[?1002h\u001b[?1006h');
|
|
159
|
+
}
|
|
160
|
+
export function disableMouseEvents() {
|
|
161
|
+
// Disable mouse tracking with SGR format
|
|
162
|
+
process.stdout.write('\u001b[?1006l\u001b[?1002l');
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=mouse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mouse.js","sourceRoot":"","sources":["../../../../src/ui/utils/mouse.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from 'vitest';
|
|
7
|
+
import { parseSGRMouseEvent, parseX11MouseEvent, isIncompleteMouseSequence, parseMouseEvent, } from './mouse.js';
|
|
8
|
+
import { ESC } from './input.js';
|
|
9
|
+
describe('mouse utils', () => {
|
|
10
|
+
describe('parseSGRMouseEvent', () => {
|
|
11
|
+
it('parses a valid SGR mouse press', () => {
|
|
12
|
+
// Button 0 (left), col 37, row 25, press (M)
|
|
13
|
+
const input = `${ESC}[<0;37;25M`;
|
|
14
|
+
const result = parseSGRMouseEvent(input);
|
|
15
|
+
expect(result).not.toBeNull();
|
|
16
|
+
expect(result.event).toEqual({
|
|
17
|
+
name: 'left-press',
|
|
18
|
+
col: 37,
|
|
19
|
+
row: 25,
|
|
20
|
+
shift: false,
|
|
21
|
+
meta: false,
|
|
22
|
+
ctrl: false,
|
|
23
|
+
});
|
|
24
|
+
expect(result.length).toBe(input.length);
|
|
25
|
+
});
|
|
26
|
+
it('parses a valid SGR mouse release', () => {
|
|
27
|
+
// Button 0 (left), col 37, row 25, release (m)
|
|
28
|
+
const input = `${ESC}[<0;37;25m`;
|
|
29
|
+
const result = parseSGRMouseEvent(input);
|
|
30
|
+
expect(result).not.toBeNull();
|
|
31
|
+
expect(result.event).toEqual({
|
|
32
|
+
name: 'left-release',
|
|
33
|
+
col: 37,
|
|
34
|
+
row: 25,
|
|
35
|
+
shift: false,
|
|
36
|
+
meta: false,
|
|
37
|
+
ctrl: false,
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
it('parses SGR with modifiers', () => {
|
|
41
|
+
// Button 0 + Shift(4) + Meta(8) + Ctrl(16) = 0 + 4 + 8 + 16 = 28
|
|
42
|
+
const input = `${ESC}[<28;10;20M`;
|
|
43
|
+
const result = parseSGRMouseEvent(input);
|
|
44
|
+
expect(result).not.toBeNull();
|
|
45
|
+
expect(result.event).toEqual({
|
|
46
|
+
name: 'left-press',
|
|
47
|
+
col: 10,
|
|
48
|
+
row: 20,
|
|
49
|
+
shift: true,
|
|
50
|
+
meta: true,
|
|
51
|
+
ctrl: true,
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
it('parses SGR move event', () => {
|
|
55
|
+
// Button 0 + Move(32) = 32
|
|
56
|
+
const input = `${ESC}[<32;10;20M`;
|
|
57
|
+
const result = parseSGRMouseEvent(input);
|
|
58
|
+
expect(result).not.toBeNull();
|
|
59
|
+
expect(result.event.name).toBe('move');
|
|
60
|
+
});
|
|
61
|
+
it('parses SGR scroll events', () => {
|
|
62
|
+
expect(parseSGRMouseEvent(`${ESC}[<64;1;1M`).event.name).toBe('scroll-up');
|
|
63
|
+
expect(parseSGRMouseEvent(`${ESC}[<65;1;1M`).event.name).toBe('scroll-down');
|
|
64
|
+
});
|
|
65
|
+
it('returns null for invalid SGR', () => {
|
|
66
|
+
expect(parseSGRMouseEvent(`${ESC}[<;1;1M`)).toBeNull();
|
|
67
|
+
expect(parseSGRMouseEvent(`${ESC}[<0;1;M`)).toBeNull();
|
|
68
|
+
expect(parseSGRMouseEvent(`not sgr`)).toBeNull();
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
describe('parseX11MouseEvent', () => {
|
|
72
|
+
it('parses a valid X11 mouse press', () => {
|
|
73
|
+
// Button 0 (left) + 32 = ' ' (space)
|
|
74
|
+
// Col 1 + 32 = '!'
|
|
75
|
+
// Row 1 + 32 = '!'
|
|
76
|
+
const input = `${ESC}[M !!`;
|
|
77
|
+
const result = parseX11MouseEvent(input);
|
|
78
|
+
expect(result).not.toBeNull();
|
|
79
|
+
expect(result.event).toEqual({
|
|
80
|
+
name: 'left-press',
|
|
81
|
+
col: 1,
|
|
82
|
+
row: 1,
|
|
83
|
+
shift: false,
|
|
84
|
+
meta: false,
|
|
85
|
+
ctrl: false,
|
|
86
|
+
});
|
|
87
|
+
expect(result.length).toBe(6);
|
|
88
|
+
});
|
|
89
|
+
it('returns null for incomplete X11', () => {
|
|
90
|
+
expect(parseX11MouseEvent(`${ESC}[M !`)).toBeNull();
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
describe('isIncompleteMouseSequence', () => {
|
|
94
|
+
it('returns true for prefixes', () => {
|
|
95
|
+
expect(isIncompleteMouseSequence(ESC)).toBe(true);
|
|
96
|
+
expect(isIncompleteMouseSequence(`${ESC}[`)).toBe(true);
|
|
97
|
+
expect(isIncompleteMouseSequence(`${ESC}[<`)).toBe(true);
|
|
98
|
+
expect(isIncompleteMouseSequence(`${ESC}[M`)).toBe(true);
|
|
99
|
+
});
|
|
100
|
+
it('returns true for partial SGR', () => {
|
|
101
|
+
expect(isIncompleteMouseSequence(`${ESC}[<0;10;20`)).toBe(true);
|
|
102
|
+
});
|
|
103
|
+
it('returns true for partial X11', () => {
|
|
104
|
+
expect(isIncompleteMouseSequence(`${ESC}[M `)).toBe(true);
|
|
105
|
+
expect(isIncompleteMouseSequence(`${ESC}[M !`)).toBe(true);
|
|
106
|
+
});
|
|
107
|
+
it('returns false for complete SGR', () => {
|
|
108
|
+
expect(isIncompleteMouseSequence(`${ESC}[<0;10;20M`)).toBe(false);
|
|
109
|
+
});
|
|
110
|
+
it('returns false for complete X11', () => {
|
|
111
|
+
expect(isIncompleteMouseSequence(`${ESC}[M !!!`)).toBe(false);
|
|
112
|
+
});
|
|
113
|
+
it('returns false for non-mouse sequences', () => {
|
|
114
|
+
expect(isIncompleteMouseSequence('a')).toBe(false);
|
|
115
|
+
expect(isIncompleteMouseSequence(`${ESC}[A`)).toBe(false); // Arrow up
|
|
116
|
+
});
|
|
117
|
+
it('returns false for garbage that started like a mouse sequence but got too long (SGR)', () => {
|
|
118
|
+
const longGarbage = `${ESC}[<` + '0'.repeat(100);
|
|
119
|
+
expect(isIncompleteMouseSequence(longGarbage)).toBe(false);
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
describe('parseMouseEvent', () => {
|
|
123
|
+
it('parses SGR', () => {
|
|
124
|
+
expect(parseMouseEvent(`${ESC}[<0;1;1M`)).not.toBeNull();
|
|
125
|
+
});
|
|
126
|
+
it('parses X11', () => {
|
|
127
|
+
expect(parseMouseEvent(`${ESC}[M !!!`)).not.toBeNull();
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
});
|
|
131
|
+
//# sourceMappingURL=mouse.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mouse.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/mouse.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
export declare class TextOutput {
|
|
7
|
+
private atStartOfLine;
|
|
8
|
+
/**
|
|
9
|
+
* Writes a string to stdout.
|
|
10
|
+
* @param str The string to write.
|
|
11
|
+
*/
|
|
12
|
+
write(str: string): void;
|
|
13
|
+
/**
|
|
14
|
+
* Writes a string to stdout, ensuring it starts on a new line.
|
|
15
|
+
* If the previous output did not end with a newline, one will be added.
|
|
16
|
+
* This prevents adding extra blank lines if a newline already exists.
|
|
17
|
+
* @param str The string to write.
|
|
18
|
+
*/
|
|
19
|
+
writeOnNewLine(str: string): void;
|
|
20
|
+
/**
|
|
21
|
+
* Ensures that the output ends with a newline. If the last character
|
|
22
|
+
* written was not a newline, one will be added.
|
|
23
|
+
*/
|
|
24
|
+
ensureTrailingNewline(): void;
|
|
25
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* A utility to manage writing text to stdout, ensuring that newlines
|
|
8
|
+
* are handled consistently and robustly across the application.
|
|
9
|
+
*/
|
|
10
|
+
import stripAnsi from 'strip-ansi';
|
|
11
|
+
export class TextOutput {
|
|
12
|
+
atStartOfLine = true;
|
|
13
|
+
/**
|
|
14
|
+
* Writes a string to stdout.
|
|
15
|
+
* @param str The string to write.
|
|
16
|
+
*/
|
|
17
|
+
write(str) {
|
|
18
|
+
if (str.length === 0) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
process.stdout.write(str);
|
|
22
|
+
const strippedStr = stripAnsi(str);
|
|
23
|
+
if (strippedStr.length > 0) {
|
|
24
|
+
this.atStartOfLine = strippedStr.endsWith('\n');
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Writes a string to stdout, ensuring it starts on a new line.
|
|
29
|
+
* If the previous output did not end with a newline, one will be added.
|
|
30
|
+
* This prevents adding extra blank lines if a newline already exists.
|
|
31
|
+
* @param str The string to write.
|
|
32
|
+
*/
|
|
33
|
+
writeOnNewLine(str) {
|
|
34
|
+
if (!this.atStartOfLine) {
|
|
35
|
+
this.write('\n');
|
|
36
|
+
}
|
|
37
|
+
this.write(str);
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Ensures that the output ends with a newline. If the last character
|
|
41
|
+
* written was not a newline, one will be added.
|
|
42
|
+
*/
|
|
43
|
+
ensureTrailingNewline() {
|
|
44
|
+
if (!this.atStartOfLine) {
|
|
45
|
+
this.write('\n');
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=textOutput.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"textOutput.js","sourceRoot":"","sources":["../../../../src/ui/utils/textOutput.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;GAGG;AAEH,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,MAAM,OAAO,UAAU;IACb,aAAa,GAAG,IAAI,CAAC;IAE7B;;;OAGG;IACH,KAAK,CAAC,GAAW;QACf,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,GAAW;QACxB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,qBAAqB;QACnB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { vi } from 'vitest';
|
|
7
|
+
import { TextOutput } from './textOutput.js';
|
|
8
|
+
describe('TextOutput', () => {
|
|
9
|
+
let stdoutSpy;
|
|
10
|
+
let textOutput;
|
|
11
|
+
beforeEach(() => {
|
|
12
|
+
stdoutSpy = vi
|
|
13
|
+
.spyOn(process.stdout, 'write')
|
|
14
|
+
.mockImplementation(() => true);
|
|
15
|
+
textOutput = new TextOutput();
|
|
16
|
+
});
|
|
17
|
+
afterEach(() => {
|
|
18
|
+
stdoutSpy.mockRestore();
|
|
19
|
+
});
|
|
20
|
+
const getWrittenOutput = () => stdoutSpy.mock.calls.map((c) => c[0]).join('');
|
|
21
|
+
it('write() should call process.stdout.write', () => {
|
|
22
|
+
textOutput.write('hello');
|
|
23
|
+
expect(stdoutSpy).toHaveBeenCalledWith('hello');
|
|
24
|
+
});
|
|
25
|
+
it('write() should not call process.stdout.write for empty strings', () => {
|
|
26
|
+
textOutput.write('');
|
|
27
|
+
expect(stdoutSpy).not.toHaveBeenCalled();
|
|
28
|
+
});
|
|
29
|
+
it('writeOnNewLine() should not add a newline if the last char was a newline', () => {
|
|
30
|
+
// Default state starts at the beginning of a line
|
|
31
|
+
textOutput.writeOnNewLine('hello');
|
|
32
|
+
expect(getWrittenOutput()).toBe('hello');
|
|
33
|
+
});
|
|
34
|
+
it('writeOnNewLine() should add a newline if the last char was not a newline', () => {
|
|
35
|
+
textOutput.write('previous');
|
|
36
|
+
textOutput.writeOnNewLine('hello');
|
|
37
|
+
expect(getWrittenOutput()).toBe('previous\nhello');
|
|
38
|
+
});
|
|
39
|
+
it('ensureTrailingNewline() should add a newline if one is missing', () => {
|
|
40
|
+
textOutput.write('hello');
|
|
41
|
+
textOutput.ensureTrailingNewline();
|
|
42
|
+
expect(getWrittenOutput()).toBe('hello\n');
|
|
43
|
+
});
|
|
44
|
+
it('ensureTrailingNewline() should not add a newline if one already exists', () => {
|
|
45
|
+
textOutput.write('hello\n');
|
|
46
|
+
textOutput.ensureTrailingNewline();
|
|
47
|
+
expect(getWrittenOutput()).toBe('hello\n');
|
|
48
|
+
});
|
|
49
|
+
it('should handle a sequence of calls correctly', () => {
|
|
50
|
+
textOutput.write('first');
|
|
51
|
+
textOutput.writeOnNewLine('second');
|
|
52
|
+
textOutput.write(' part');
|
|
53
|
+
textOutput.ensureTrailingNewline();
|
|
54
|
+
textOutput.ensureTrailingNewline(); // second call should do nothing
|
|
55
|
+
textOutput.write('third');
|
|
56
|
+
expect(getWrittenOutput()).toMatchSnapshot();
|
|
57
|
+
});
|
|
58
|
+
it('should correctly handle ANSI escape codes when determining line breaks', () => {
|
|
59
|
+
const blue = (s) => `\u001b[34m${s}\u001b[39m`;
|
|
60
|
+
const bold = (s) => `\u001b[1m${s}\u001b[22m`;
|
|
61
|
+
textOutput.write(blue('hello'));
|
|
62
|
+
textOutput.writeOnNewLine(bold('world'));
|
|
63
|
+
textOutput.write(blue('\n'));
|
|
64
|
+
textOutput.writeOnNewLine('next');
|
|
65
|
+
expect(getWrittenOutput()).toMatchSnapshot();
|
|
66
|
+
});
|
|
67
|
+
it('should handle empty strings with ANSI codes', () => {
|
|
68
|
+
textOutput.write('hello');
|
|
69
|
+
textOutput.write('\u001b[34m\u001b[39m'); // Empty blue string
|
|
70
|
+
textOutput.writeOnNewLine('world');
|
|
71
|
+
expect(getWrittenOutput()).toMatchSnapshot();
|
|
72
|
+
});
|
|
73
|
+
it('should handle ANSI codes that do not end with a newline', () => {
|
|
74
|
+
textOutput.write('hello\u001b[34m');
|
|
75
|
+
textOutput.writeOnNewLine('world');
|
|
76
|
+
expect(getWrittenOutput()).toMatchSnapshot();
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
//# sourceMappingURL=textOutput.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"textOutput.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/textOutput.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,15 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import
|
|
6
|
+
import semver from 'semver';
|
|
7
7
|
import type { LoadedSettings } from '../../config/settings.js';
|
|
8
8
|
export declare const FETCH_TIMEOUT_MS = 2000;
|
|
9
|
+
export interface UpdateInfo {
|
|
10
|
+
latest: string;
|
|
11
|
+
current: string;
|
|
12
|
+
name: string;
|
|
13
|
+
type?: semver.ReleaseType;
|
|
14
|
+
}
|
|
9
15
|
export interface UpdateObject {
|
|
10
16
|
message: string;
|
|
11
17
|
update: UpdateInfo;
|
|
@@ -3,13 +3,16 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import
|
|
6
|
+
import latestVersion from 'latest-version';
|
|
7
7
|
import semver from 'semver';
|
|
8
|
-
import { getPackageJson } from '
|
|
9
|
-
import {
|
|
8
|
+
import { getPackageJson, debugLogger } from '@google/gemini-cli-core';
|
|
9
|
+
import { fileURLToPath } from 'node:url';
|
|
10
|
+
import path from 'node:path';
|
|
11
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
12
|
+
const __dirname = path.dirname(__filename);
|
|
10
13
|
export const FETCH_TIMEOUT_MS = 2000;
|
|
11
14
|
/**
|
|
12
|
-
* From a nightly and stable
|
|
15
|
+
* From a nightly and stable version, determines which is the "best" one to offer.
|
|
13
16
|
* The rule is to always prefer nightly if the base versions are the same.
|
|
14
17
|
*/
|
|
15
18
|
function getBestAvailableUpdate(nightly, stable) {
|
|
@@ -17,12 +20,10 @@ function getBestAvailableUpdate(nightly, stable) {
|
|
|
17
20
|
return stable || null;
|
|
18
21
|
if (!stable)
|
|
19
22
|
return nightly || null;
|
|
20
|
-
|
|
21
|
-
const stableVer = stable.latest;
|
|
22
|
-
if (semver.coerce(stableVer)?.version === semver.coerce(nightlyVer)?.version) {
|
|
23
|
+
if (semver.coerce(stable)?.version === semver.coerce(nightly)?.version) {
|
|
23
24
|
return nightly;
|
|
24
25
|
}
|
|
25
|
-
return semver.gt(
|
|
26
|
+
return semver.gt(stable, nightly) ? stable : nightly;
|
|
26
27
|
}
|
|
27
28
|
export async function checkForUpdates(settings) {
|
|
28
29
|
try {
|
|
@@ -33,42 +34,45 @@ export async function checkForUpdates(settings) {
|
|
|
33
34
|
if (process.env['DEV'] === 'true') {
|
|
34
35
|
return null;
|
|
35
36
|
}
|
|
36
|
-
const packageJson = await getPackageJson();
|
|
37
|
+
const packageJson = await getPackageJson(__dirname);
|
|
37
38
|
if (!packageJson || !packageJson.name || !packageJson.version) {
|
|
38
39
|
return null;
|
|
39
40
|
}
|
|
40
41
|
const { name, version: currentVersion } = packageJson;
|
|
41
42
|
const isNightly = currentVersion.includes('nightly');
|
|
42
|
-
const createNotifier = (distTag) => updateNotifier({
|
|
43
|
-
pkg: {
|
|
44
|
-
name,
|
|
45
|
-
version: currentVersion,
|
|
46
|
-
},
|
|
47
|
-
updateCheckInterval: 0,
|
|
48
|
-
shouldNotifyInNpmScript: true,
|
|
49
|
-
distTag,
|
|
50
|
-
});
|
|
51
43
|
if (isNightly) {
|
|
52
|
-
const [
|
|
53
|
-
|
|
54
|
-
|
|
44
|
+
const [nightlyUpdate, latestUpdate] = await Promise.all([
|
|
45
|
+
latestVersion(name, { version: 'nightly' }),
|
|
46
|
+
latestVersion(name),
|
|
55
47
|
]);
|
|
56
|
-
const bestUpdate = getBestAvailableUpdate(
|
|
57
|
-
if (bestUpdate && semver.gt(bestUpdate
|
|
58
|
-
const message = `A new version of cell-cli is available! ${currentVersion} → ${bestUpdate
|
|
48
|
+
const bestUpdate = getBestAvailableUpdate(nightlyUpdate, latestUpdate);
|
|
49
|
+
if (bestUpdate && semver.gt(bestUpdate, currentVersion)) {
|
|
50
|
+
const message = `A new version of cell-cli is available! ${currentVersion} → ${bestUpdate}`;
|
|
51
|
+
const type = semver.diff(bestUpdate, currentVersion) || undefined;
|
|
59
52
|
return {
|
|
60
53
|
message,
|
|
61
|
-
update: {
|
|
54
|
+
update: {
|
|
55
|
+
latest: bestUpdate,
|
|
56
|
+
current: currentVersion,
|
|
57
|
+
name,
|
|
58
|
+
type,
|
|
59
|
+
},
|
|
62
60
|
};
|
|
63
61
|
}
|
|
64
62
|
}
|
|
65
63
|
else {
|
|
66
|
-
const
|
|
67
|
-
if (
|
|
68
|
-
const message = `Cell CLI update available! ${currentVersion} → ${
|
|
64
|
+
const latestUpdate = await latestVersion(name);
|
|
65
|
+
if (latestUpdate && semver.gt(latestUpdate, currentVersion)) {
|
|
66
|
+
const message = `Cell CLI update available! ${currentVersion} → ${latestUpdate}`;
|
|
67
|
+
const type = semver.diff(latestUpdate, currentVersion) || undefined;
|
|
69
68
|
return {
|
|
70
69
|
message,
|
|
71
|
-
update: {
|
|
70
|
+
update: {
|
|
71
|
+
latest: latestUpdate,
|
|
72
|
+
current: currentVersion,
|
|
73
|
+
name,
|
|
74
|
+
type,
|
|
75
|
+
},
|
|
72
76
|
};
|
|
73
77
|
}
|
|
74
78
|
}
|