diff --git a/src/renderer/src/app-shell/app-command-handlers.ts b/src/renderer/src/app-shell/app-command-handlers.ts index 5761fd34574..448d742fa04 100644 --- a/src/renderer/src/app-shell/app-command-handlers.ts +++ b/src/renderer/src/app-shell/app-command-handlers.ts @@ -1,7 +1,7 @@ import { canShowRightSidebarForView } from '@/components/right-sidebar/visibility/right-sidebar-visibility' import { runBuiltInOrReplacement } from '@/lib/plugins/commands/plugin-command-replacements' import { isFloatingWorkspacePanelFocused } from '@/components/floating-terminal/floating-workspace-terminal-actions' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { requestScrollToCurrentWorkspaceRevealAndRename } from '@/lib/workspace/navigation/scroll-to-current-workspace-status' import { requestVirtualizedScrollAnchorRecord } from '@/hooks/requestVirtualizedScrollAnchorRecord' import { showTerminalShortcutCaptureNotification } from '@/lib/notifications/terminal-shortcut-capture-notification' diff --git a/src/renderer/src/attention/unread/unread-badge-count-selector.ts b/src/renderer/src/attention/unread/unread-badge-count-selector.ts index 57849f62608..571a8a4264b 100644 --- a/src/renderer/src/attention/unread/unread-badge-count-selector.ts +++ b/src/renderer/src/attention/unread/unread-badge-count-selector.ts @@ -4,7 +4,7 @@ import { getIndexedRepoMap } from '@/store/repos/repository-catalog-index' import type { AppState } from '@/store/types' import { getSettingsFocusedExecutionHostId } from '../../../../shared/execution-host' import type { Worktree } from '../../../../shared/worktree/types' -import { sameBucketRecords } from '../../lib/bucket-record-equality' +import { sameBucketRecords } from './unread-bucket-record-equality' import { getUnreadBadgeCount } from './unread-badge-count' import { hasLiveTabMarker } from '@/store/slices/workspace-attention/workspace-live-markers' import { folderWorkspaceKey } from '../../../../shared/workspace-scope' diff --git a/src/renderer/src/lib/bucket-record-equality.ts b/src/renderer/src/attention/unread/unread-bucket-record-equality.ts similarity index 100% rename from src/renderer/src/lib/bucket-record-equality.ts rename to src/renderer/src/attention/unread/unread-bucket-record-equality.ts diff --git a/src/renderer/src/component-fixtures/component-fixture-explorer.tsx b/src/renderer/src/component-fixtures/component-fixture-explorer.tsx index 623b0bde628..19ec1ef4dc5 100644 --- a/src/renderer/src/component-fixtures/component-fixture-explorer.tsx +++ b/src/renderer/src/component-fixtures/component-fixture-explorer.tsx @@ -3,7 +3,7 @@ import '../assets/main.css' import ReactDOM from 'react-dom/client' import { getDefaultSettings } from '../../../shared/constants' import { applyDocumentTheme } from '../app-shell/appearance/document-theme' -import { installBodyOverlayAttributes } from '../lib/body-overlay-attributes' +import { installBodyOverlayAttributes } from '../lib/overlay-interaction/body-overlay-attributes' import { useAppStore } from '../store/index' import { installWebPreloadApi } from '../web/web-preload-api' import type { ComponentFixtureTheme } from './component-fixture' diff --git a/src/renderer/src/components/automations/use-automations-page-escape.ts b/src/renderer/src/components/automations/use-automations-page-escape.ts index 36656ad6fe7..1b9427d0b89 100644 --- a/src/renderer/src/components/automations/use-automations-page-escape.ts +++ b/src/renderer/src/components/automations/use-automations-page-escape.ts @@ -1,5 +1,5 @@ import { useEffect } from 'react' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import type { AutomationsPageLocalState } from './use-automations-page-local-state' import type { AutomationsPageStoreState } from './use-automations-page-store-state' import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router' diff --git a/src/renderer/src/components/browser-extension-install-dialog.tsx b/src/renderer/src/components/browser-extension-install-dialog.tsx index 58263ef5c67..afe0fd3e51c 100644 --- a/src/renderer/src/components/browser-extension-install-dialog.tsx +++ b/src/renderer/src/components/browser-extension-install-dialog.tsx @@ -12,7 +12,7 @@ import { } from '@/components/ui/dialog' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' -import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label' +import { translateBrowserSessionProfileLabel } from '@/lib/browser/profiles/browser-session-profile-label' import { useAppStore } from '@/store' import type { BrowserExtensionInstallPromptRequest } from '../../../shared/browser/extensions/browser-extension-webstore' import { diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-profile-sub.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-profile-sub.tsx index 405048faa49..2bb7177bd55 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-profile-sub.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-profile-sub.tsx @@ -11,7 +11,7 @@ import { import { BrowserCookieImportDisclosure } from '@/components/BrowserCookieImportDisclosure' import { BrowserCookieImportMachineNotice } from '@/components/BrowserCookieImportMachineNotice' import { useTranslate } from '@/i18n/use-translate' -import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label' +import { translateBrowserSessionProfileLabel } from '@/lib/browser/profiles/browser-session-profile-label' import { BROWSER_FAMILY_LABELS } from '../../../../../shared/browser/browser-family-labels' import type { BrowserSessionProfile } from '../../../../../shared/browser-workspace-types' diff --git a/src/renderer/src/components/browser-pane/devtools-dock/use-browser-devtools-dock-bounds.ts b/src/renderer/src/components/browser-pane/devtools-dock/use-browser-devtools-dock-bounds.ts index e6b0c20ea0a..7b6aa11af21 100644 --- a/src/renderer/src/components/browser-pane/devtools-dock/use-browser-devtools-dock-bounds.ts +++ b/src/renderer/src/components/browser-pane/devtools-dock/use-browser-devtools-dock-bounds.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { hasVisibleOverlayOver } from '@/lib/visible-overlay' +import { hasVisibleOverlayOver } from '@/lib/overlay-interaction/visible-overlay' import { registerBrowserClientPagePositionSync } from '../browser-client-page-position-driver' import { isWebviewDragPassthroughActive, diff --git a/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.tsx b/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.tsx index 87ee6953377..8c31e3f9804 100644 --- a/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.tsx +++ b/src/renderer/src/components/contextual-tours/ContextualTourOverlaySurface.tsx @@ -29,7 +29,7 @@ import { } from './contextual-tour-floating-position' import { useTranslate } from '@/i18n/use-translate' import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { getMeasurableContextualTourTarget } from './contextual-tour-gate' const FOCUSABLE_SELECTOR = diff --git a/src/renderer/src/components/contextual-tours/use-contextual-tour-focus.ts b/src/renderer/src/components/contextual-tours/use-contextual-tour-focus.ts index 8c6b07700c2..79a6b4fbb5e 100644 --- a/src/renderer/src/components/contextual-tours/use-contextual-tour-focus.ts +++ b/src/renderer/src/components/contextual-tours/use-contextual-tour-focus.ts @@ -1,4 +1,4 @@ -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { hasContextualTourActionStep } from '../../../../shared/contextual-tour-action-steps' import { useEffect, useRef, type RefObject } from 'react' import { getContextualTour, type ContextualTourId } from '../../../../shared/contextual-tours' diff --git a/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts b/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts index 7faa4d64b0c..2b4da0c4987 100644 --- a/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts +++ b/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts @@ -8,7 +8,7 @@ import { } from '@/hooks/skills/discovery/useInstalledAgentSkills' import { useMountedRef } from '@/hooks/useMountedRef' import { translate } from '@/i18n/i18n' -import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy' +import { formatCliUserFacingDetail } from '@/lib/cli/cli-user-facing-detail' // Why: Orca terminals already provide the `orca` command, so agent control only needs the skill. export function useMobileEmulatorAgentSetupState(enabled = true): { diff --git a/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx b/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx index fd7531cd7ac..3a4894a899a 100644 --- a/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx +++ b/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx @@ -27,7 +27,7 @@ import { import { useMountedRef } from '@/hooks/useMountedRef' import { isWebClientLocation } from '@/app-shell/platform/web-client-location' import { useTranslate } from '@/i18n/use-translate' -import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy' +import { formatCliUserFacingDetail } from '@/lib/cli/cli-user-facing-detail' import { SessionSearchTipDialog } from './SessionSearchTipDialog' import { useSessionSearchTipSetup } from './use-session-search-tip-setup' import { VoiceDictationTipDialog } from './VoiceDictationTipDialog' diff --git a/src/renderer/src/components/integrations/source-control/bitbucket-credentials-dialog.tsx b/src/renderer/src/components/integrations/source-control/bitbucket-credentials-dialog.tsx index 74b26bd4feb..1a8088651bf 100644 --- a/src/renderer/src/components/integrations/source-control/bitbucket-credentials-dialog.tsx +++ b/src/renderer/src/components/integrations/source-control/bitbucket-credentials-dialog.tsx @@ -17,7 +17,7 @@ import { Label } from '@/components/ui/label' import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group' import { cn } from '@/lib/class-names' import { hasRemoteProviderRuntime } from '@/runtime/hosts/observations/provider-runtime-context' -import { preventOutsideDismissWhenDirty } from '@/lib/outside-dismiss-guard' +import { preventOutsideDismissWhenDirty } from '@/lib/overlay-interaction/outside-dismiss-guard' import { bitbucketConnectErrorText } from '@/lib/source-control/remote/bitbucket-connect-error-copy' import { useTranslate } from '@/i18n/use-translate' import { BitbucketApiTokenScopes } from './bitbucket-api-token-scopes' diff --git a/src/renderer/src/components/jira-connect-dialog.tsx b/src/renderer/src/components/jira-connect-dialog.tsx index 98b4bccb8c6..98bcda574e9 100644 --- a/src/renderer/src/components/jira-connect-dialog.tsx +++ b/src/renderer/src/components/jira-connect-dialog.tsx @@ -24,7 +24,7 @@ import { getProviderRuntimeContextKey, isEnvironmentRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context' -import { preventOutsideDismissWhenDirty } from '@/lib/outside-dismiss-guard' +import { preventOutsideDismissWhenDirty } from '@/lib/overlay-interaction/outside-dismiss-guard' import { useTranslate } from '@/i18n/use-translate' import { JiraConnectCredentialGuide } from './jira-connect-credential-guide' diff --git a/src/renderer/src/components/linear-api-key-dialog.tsx b/src/renderer/src/components/linear-api-key-dialog.tsx index a867c359f9e..58f03195772 100644 --- a/src/renderer/src/components/linear-api-key-dialog.tsx +++ b/src/renderer/src/components/linear-api-key-dialog.tsx @@ -24,7 +24,7 @@ import { import { Input } from '@/components/ui/input' import { Label } from '@/components/ui/label' import { cn } from '@/lib/class-names' -import { preventOutsideDismissWhenDirty } from '@/lib/outside-dismiss-guard' +import { preventOutsideDismissWhenDirty } from '@/lib/overlay-interaction/outside-dismiss-guard' import { createLinearApiKeyDialogState, resolveLinearApiKeyDialogState diff --git a/src/renderer/src/components/native-chat/composer/focus/use-native-chat-root-input-routing.test.tsx b/src/renderer/src/components/native-chat/composer/focus/use-native-chat-root-input-routing.test.tsx index 7be514ad5b6..d76b71e7e31 100644 --- a/src/renderer/src/components/native-chat/composer/focus/use-native-chat-root-input-routing.test.tsx +++ b/src/renderer/src/components/native-chat/composer/focus/use-native-chat-root-input-routing.test.tsx @@ -8,7 +8,9 @@ import type { NativeChatComposerHandle } from '../native-chat-composer-types' import { useNativeChatRootInputRouting } from './use-native-chat-root-input-routing' const overlay = vi.hoisted(() => ({ visible: false })) -vi.mock('@/lib/visible-overlay', () => ({ hasVisibleOverlay: () => overlay.visible })) +vi.mock('@/lib/overlay-interaction/visible-overlay', () => ({ + hasVisibleOverlay: () => overlay.visible +})) const insertTypedText = vi.fn(() => true) const composer: NativeChatComposerHandle = { diff --git a/src/renderer/src/components/native-chat/composer/focus/use-native-chat-root-input-routing.ts b/src/renderer/src/components/native-chat/composer/focus/use-native-chat-root-input-routing.ts index 89d35893093..4c639b019b7 100644 --- a/src/renderer/src/components/native-chat/composer/focus/use-native-chat-root-input-routing.ts +++ b/src/renderer/src/components/native-chat/composer/focus/use-native-chat-root-input-routing.ts @@ -6,7 +6,7 @@ import { type PointerEvent as ReactPointerEvent, type RefObject } from 'react' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { DICTATION_FOCUS_INPUT_EVENT } from '../../../dictation/dictation-control-events' import { routeNativeChatRootKeyToInput } from './native-chat-root-key-routing' import { shouldFocusNativeChatPaneFromPointerTarget } from './native-chat-typing-redirect' diff --git a/src/renderer/src/components/orchestration-crew/OrchestrationCrewPanel.tsx b/src/renderer/src/components/orchestration-crew/OrchestrationCrewPanel.tsx index b81107574b3..16a32066109 100644 --- a/src/renderer/src/components/orchestration-crew/OrchestrationCrewPanel.tsx +++ b/src/renderer/src/components/orchestration-crew/OrchestrationCrewPanel.tsx @@ -14,7 +14,7 @@ import type { RuntimeClientTarget } from '../../../../shared/runtime-client-targ import { useOrchestrationCrew } from './use-orchestration-crew' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { isImeOwnedKeyboardEvent } from '@/lib/text-input/ime/ime-composition-keyboard-event' import { CrewRowView, IconButton } from './CrewRowView' import { diff --git a/src/renderer/src/components/settings/browser/BrowserPane.tsx b/src/renderer/src/components/settings/browser/BrowserPane.tsx index ffa10cebb22..4881058a410 100644 --- a/src/renderer/src/components/settings/browser/BrowserPane.tsx +++ b/src/renderer/src/components/settings/browser/BrowserPane.tsx @@ -41,7 +41,7 @@ import { isMacUserAgent } from '@/app-shell/platform/user-agent-platform' import { isWebClientLocation } from '@/app-shell/platform/web-client-location' import { useTranslate } from '@/i18n/use-translate' import { translateHostDisplayLabel } from '../../sidebar/execution-host-label' -import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label' +import { translateBrowserSessionProfileLabel } from '@/lib/browser/profiles/browser-session-profile-label' import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision' import { resolveAvailableBrowserSessionHostId } from './profiles/browser-session-host-selection' import { getDefaultBrowserProfileForHost } from '@/store/slices/browser/hosts/browser-host-state' diff --git a/src/renderer/src/components/settings/browser/BrowserSitePermissionsSetting.tsx b/src/renderer/src/components/settings/browser/BrowserSitePermissionsSetting.tsx index 34c4c545484..18ec381afeb 100644 --- a/src/renderer/src/components/settings/browser/BrowserSitePermissionsSetting.tsx +++ b/src/renderer/src/components/settings/browser/BrowserSitePermissionsSetting.tsx @@ -19,7 +19,7 @@ import { getBrowserSitePermissionsSearchEntry } from './browser-site-permissions import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' import { useAppStore } from '../../../store/index' import { useTranslate } from '@/i18n/use-translate' -import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label' +import { translateBrowserSessionProfileLabel } from '@/lib/browser/profiles/browser-session-profile-label' function SitePermissionRow({ entry, diff --git a/src/renderer/src/components/settings/browser/profiles/BrowserProfileRow.tsx b/src/renderer/src/components/settings/browser/profiles/BrowserProfileRow.tsx index 2973d71b66e..eff984d8344 100644 --- a/src/renderer/src/components/settings/browser/profiles/BrowserProfileRow.tsx +++ b/src/renderer/src/components/settings/browser/profiles/BrowserProfileRow.tsx @@ -24,7 +24,7 @@ import '../../../../../../shared/constants' import { BROWSER_FAMILY_LABELS } from '../../../../../../shared/browser/browser-family-labels' import { useTranslate } from '@/i18n/use-translate' import { browserCookieImportFailureText } from '@/lib/browser/cookies/browser-cookie-import-error-copy' -import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label' +import { translateBrowserSessionProfileLabel } from '@/lib/browser/profiles/browser-session-profile-label' type DetectedBrowser = { family: string diff --git a/src/renderer/src/components/settings/cli/install/CliSection.tsx b/src/renderer/src/components/settings/cli/install/CliSection.tsx index 23a63357314..c332c64cfe4 100644 --- a/src/renderer/src/components/settings/cli/install/CliSection.tsx +++ b/src/renderer/src/components/settings/cli/install/CliSection.tsx @@ -26,7 +26,7 @@ import { useCliRegistrationActions } from './use-cli-registration-actions' import { useLocalCliSkillFreshnessName } from '../../../../hooks/skills/freshness/use-local-cli-skill-freshness-name' import { translate } from '@/i18n/i18n' import { useTranslate, type Translate } from '@/i18n/use-translate' -import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy' +import { formatCliUserFacingDetail } from '@/lib/cli/cli-user-facing-detail' type CliSectionProps = { currentPlatform: string diff --git a/src/renderer/src/components/settings/cli/install/WslCliRegistration.tsx b/src/renderer/src/components/settings/cli/install/WslCliRegistration.tsx index 478a0ff5e26..d2c7c20d82e 100644 --- a/src/renderer/src/components/settings/cli/install/WslCliRegistration.tsx +++ b/src/renderer/src/components/settings/cli/install/WslCliRegistration.tsx @@ -18,7 +18,7 @@ import { Switch } from '../../../ui/switch' import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../../ui/tooltip' import { translate } from '@/i18n/i18n' import { useTranslate } from '@/i18n/use-translate' -import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy' +import { formatCliUserFacingDetail } from '@/lib/cli/cli-user-facing-detail' type WslCliRegistrationProps = { currentPlatform: string diff --git a/src/renderer/src/components/settings/cli/install/cli-install-failure.ts b/src/renderer/src/components/settings/cli/install/cli-install-failure.ts index 4fcf2c65778..7db9352e797 100644 --- a/src/renderer/src/components/settings/cli/install/cli-install-failure.ts +++ b/src/renderer/src/components/settings/cli/install/cli-install-failure.ts @@ -1,5 +1,5 @@ import type { CliInstallStatus } from '../../../../../../shared/cli-install-types' -import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy' +import { formatCliUserFacingDetail } from '@/lib/cli/cli-user-facing-detail' // Why: Electron re-wraps a rejected `ipcMain.handle` as // `Error invoking remote method '': Error: `, so the installer's diff --git a/src/renderer/src/components/settings/page/use-settings-page-effects.ts b/src/renderer/src/components/settings/page/use-settings-page-effects.ts index 2a33b748e82..8b352bbd355 100644 --- a/src/renderer/src/components/settings/page/use-settings-page-effects.ts +++ b/src/renderer/src/components/settings/page/use-settings-page-effects.ts @@ -7,7 +7,7 @@ import { resolveAppearanceAccordionDeepLink } from '../appearance/appearance-usa import { registerWindowCloseGuard } from '../../window-close-request-coordinator' import { isIntentionalAppRestartInProgress } from '@/app-shell/updates/updater-beforeunload' import { getShortcutPlatform } from '@/lib/keyboard/shortcut-platform' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { translate } from '@/i18n/i18n' import { getSettingsTargetHostSelection, diff --git a/src/renderer/src/components/settings/repository/RepositoryPane.tsx b/src/renderer/src/components/settings/repository/RepositoryPane.tsx index 7d2b6f25915..5f2581efffc 100644 --- a/src/renderer/src/components/settings/repository/RepositoryPane.tsx +++ b/src/renderer/src/components/settings/repository/RepositoryPane.tsx @@ -5,7 +5,7 @@ import type { Project, ProjectUpdateArgs } from '../../../../../shared/project-t import type { Repo } from '../../../../../shared/repo-types' import type { SourceControlAiSettingsPatch } from '../../../../../shared/source-control/ai/settings/source-control-ai-settings-types' import { getRepoKindLabel, isFolderRepo } from '../../../../../shared/repo-kind' -import { useFolderSetupSupport } from '@/lib/use-folder-setup-supported' +import { useFolderSetupSupport } from '@/lib/workspace/creation/setup/folder-setup-support' import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host' import { Label } from '../../ui/label' import { useShallow } from 'zustand/react/shallow' diff --git a/src/renderer/src/components/settings/ssh/targets/SshTargetForm.tsx b/src/renderer/src/components/settings/ssh/targets/SshTargetForm.tsx index 6c41c12e54b..4e6ab2691aa 100644 --- a/src/renderer/src/components/settings/ssh/targets/SshTargetForm.tsx +++ b/src/renderer/src/components/settings/ssh/targets/SshTargetForm.tsx @@ -19,7 +19,7 @@ import { type EditingTarget } from '../../../ssh-host-form/ssh-target-draft' import { useTranslate } from '@/i18n/use-translate' -import { preventOutsideDismissWhenDirty } from '@/lib/outside-dismiss-guard' +import { preventOutsideDismissWhenDirty } from '@/lib/overlay-interaction/outside-dismiss-guard' type SshTargetFormProps = { open: boolean diff --git a/src/renderer/src/components/settings/ssh/targets/use-ssh-target-selection.ts b/src/renderer/src/components/settings/ssh/targets/use-ssh-target-selection.ts index 5ce6de5d6a2..16419edd8e2 100644 --- a/src/renderer/src/components/settings/ssh/targets/use-ssh-target-selection.ts +++ b/src/renderer/src/components/settings/ssh/targets/use-ssh-target-selection.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { applySshTargetSelectionClick } from './ssh-target-list-model' export type SshTargetSelection = { diff --git a/src/renderer/src/components/sidebar/project-admission/dialog/AddRepoDialogChrome.tsx b/src/renderer/src/components/sidebar/project-admission/dialog/AddRepoDialogChrome.tsx index f9fe036da0e..00035221caf 100644 --- a/src/renderer/src/components/sidebar/project-admission/dialog/AddRepoDialogChrome.tsx +++ b/src/renderer/src/components/sidebar/project-admission/dialog/AddRepoDialogChrome.tsx @@ -1,6 +1,6 @@ import type { ReactNode } from 'react' import { Dialog, DialogContent } from '@/components/ui/dialog' -import { preventOutsideDismissWhenDirty } from '@/lib/outside-dismiss-guard' +import { preventOutsideDismissWhenDirty } from '@/lib/overlay-interaction/outside-dismiss-guard' import type { AddRepoDialogStep } from './add-repo-dialog-types' import { AddRepoStepIndicator } from './AddRepoStepIndicator' diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/active-workspace-delete.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/active-workspace-delete.ts index 19a91803eef..fa9f0065da5 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/active-workspace-delete.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/active-workspace-delete.ts @@ -3,7 +3,7 @@ import { useAppStore } from '@/store' import { resolveQualifiedWorktreeExecutionOwner } from '@/lib/workspace/ownership/qualified-worktree-execution-owner' import { resolveQualifiedIndexedFolderWorkspace } from '@/store/folder-workspaces/folder-workspace-record-index' import { selectWorktreeCreationSurfaceShown } from '@/lib/workspace/creation/worktree-creation-surface' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import type { AppState } from '@/store/types' import { isEditableTarget, isNativeChatPromptTarget } from '@/lib/text-input/focus/editable-target' import { composeWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' diff --git a/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-shortcut.ts b/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-shortcut.ts index 501b872b888..c89953626d8 100644 --- a/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-shortcut.ts +++ b/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-shortcut.ts @@ -3,7 +3,7 @@ import { useAppStore } from '@/store/index' import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router' import { textFieldClaimsActionKey } from '@/lib/keyboard/text-field-shortcut-policy' import { getShortcutPlatform } from '@/lib/keyboard/shortcut-platform' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { showTerminalShortcutCaptureNotification } from '@/lib/notifications/terminal-shortcut-capture-notification' import { keybindingMatchesAction } from '../../../../../../shared/keybindings' import { diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts index be88dd5c0e3..11a51b8d5f4 100644 --- a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts +++ b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.ts @@ -4,7 +4,7 @@ import type React from 'react' import { useAppStore } from '@/store' import { activateWorktreeFromSidebar } from '@/lib/workspace/activation/sidebar-worktree-activation' import { focusRuntimeTerminalSurface } from '@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import type { ExecutionHostId } from '../../../../../../shared/execution-host' import { getShortcutPlatform } from '@/lib/keyboard/shortcut-platform' import { keybindingMatchesAction } from '../../../../../../shared/keybindings' diff --git a/src/renderer/src/components/skills/catalog/use-skills-page-keyboard-navigation.ts b/src/renderer/src/components/skills/catalog/use-skills-page-keyboard-navigation.ts index ad9841b8fa8..6071408ff2a 100644 --- a/src/renderer/src/components/skills/catalog/use-skills-page-keyboard-navigation.ts +++ b/src/renderer/src/components/skills/catalog/use-skills-page-keyboard-navigation.ts @@ -1,6 +1,6 @@ import { useEffect } from 'react' import type { SkillsPageView } from './skills-page-view' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router' type UseSkillsPageKeyboardNavigationOptions = { diff --git a/src/renderer/src/components/status-bar/usage-error-copy.ts b/src/renderer/src/components/status-bar/usage-error-copy.ts index 31ddf5d971b..c386e2115f9 100644 --- a/src/renderer/src/components/status-bar/usage-error-copy.ts +++ b/src/renderer/src/components/status-bar/usage-error-copy.ts @@ -1,7 +1,7 @@ import type { ProviderRateLimits } from '../../../../shared/rate-limit-types' import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' -import { formatRateLimitUserFacingError } from '@/lib/rate-limit-user-facing-error' +import { formatRateLimitUserFacingError } from '@/components/status-bar/usage-errors/rate-limit-user-facing-error' import { getProviderDisplayName } from '../../../../shared/usage-provider-windows' import { describeOwnerNotSetUp, getOwnerNotSetUpLabel } from './owner-not-set-up-copy' diff --git a/src/renderer/src/lib/rate-limit-user-facing-error-catalog-a.ts b/src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error-catalog-a.ts similarity index 100% rename from src/renderer/src/lib/rate-limit-user-facing-error-catalog-a.ts rename to src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error-catalog-a.ts diff --git a/src/renderer/src/lib/rate-limit-user-facing-error-catalog-b.ts b/src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error-catalog-b.ts similarity index 100% rename from src/renderer/src/lib/rate-limit-user-facing-error-catalog-b.ts rename to src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error-catalog-b.ts diff --git a/src/renderer/src/lib/rate-limit-user-facing-error-catalog.ts b/src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error-catalog.ts similarity index 100% rename from src/renderer/src/lib/rate-limit-user-facing-error-catalog.ts rename to src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error-catalog.ts diff --git a/src/renderer/src/lib/rate-limit-user-facing-error-types.ts b/src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error-types.ts similarity index 100% rename from src/renderer/src/lib/rate-limit-user-facing-error-types.ts rename to src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error-types.ts diff --git a/src/renderer/src/lib/rate-limit-user-facing-error.ts b/src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error.ts similarity index 100% rename from src/renderer/src/lib/rate-limit-user-facing-error.ts rename to src/renderer/src/components/status-bar/usage-errors/rate-limit-user-facing-error.ts diff --git a/src/renderer/src/components/tab-bar/use-tab-rename-return-focus.ts b/src/renderer/src/components/tab-bar/use-tab-rename-return-focus.ts index de5f06b6f7c..191aa57d88b 100644 --- a/src/renderer/src/components/tab-bar/use-tab-rename-return-focus.ts +++ b/src/renderer/src/components/tab-bar/use-tab-rename-return-focus.ts @@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, type KeyboardEvent } from 'react' import { isImeCompositionKeyDown } from '@/lib/text-input/ime/ime-composition-keyboard-event' import { requestNativeChatComposerFocus } from '@/components/native-chat/composer/focus/native-chat-composer-focus-intent' import { focusTerminalTabSurface } from '@/components/terminal-pane/input/focus/focus-terminal-tab-surface' -import { hasVisibleOverlay } from '@/lib/visible-overlay' +import { hasVisibleOverlay } from '@/lib/overlay-interaction/visible-overlay' import { useAppStore } from '@/store' export function useTabRenameReturnFocus({ diff --git a/src/renderer/src/components/terminal-pane/errors/terminal-error-accumulation.ts b/src/renderer/src/components/terminal-pane/errors/terminal-error-accumulation.ts index 98f00e837f9..efa45911967 100644 --- a/src/renderer/src/components/terminal-pane/errors/terminal-error-accumulation.ts +++ b/src/renderer/src/components/terminal-pane/errors/terminal-error-accumulation.ts @@ -1,4 +1,4 @@ -import { flattenRetainedSlice } from '../../../lib/flatten-retained-slice' +import { flattenRetainedSlice } from '../../../lib/terminal/output/flatten-retained-slice' import { isTerminalResourceLimitError } from '../../../../../shared/terminal/pty/lifecycle/terminal-spawn-resource-error' // Legacy tab messages render as newline-joined text and need whole-run dedup; pane errors stay separate until render. diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/deferred-reattach-live-data-queue.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/deferred-reattach-live-data-queue.ts index bee3161f235..1f445169731 100644 --- a/src/renderer/src/components/terminal-pane/pty-connection/output/deferred-reattach-live-data-queue.ts +++ b/src/renderer/src/components/terminal-pane/pty-connection/output/deferred-reattach-live-data-queue.ts @@ -1,5 +1,5 @@ import type { PtyDataMeta } from '../../pty-transport/delivery/pty-dispatcher' -import { flattenRetainedSlice } from '../../../../lib/flatten-retained-slice' +import { flattenRetainedSlice } from '../../../../lib/terminal/output/flatten-retained-slice' import { keptSuffixMeta, markedAfterEviction diff --git a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-eager-buffer-clamp.ts b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-eager-buffer-clamp.ts index 7e0febff9ad..db5f6beb9eb 100644 --- a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-eager-buffer-clamp.ts +++ b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-eager-buffer-clamp.ts @@ -1,5 +1,5 @@ import { clampUtf8TextTail } from '../../../../../../shared/utf8-byte-limits' -import { flattenRetainedSlice } from '../../../../lib/flatten-retained-slice' +import { flattenRetainedSlice } from '../../../../lib/terminal/output/flatten-retained-slice' export type EagerBufferChunk = { data: string diff --git a/src/renderer/src/components/ui/sonner.tsx b/src/renderer/src/components/ui/sonner.tsx index d2d792d2bbe..dd4addc3a79 100644 --- a/src/renderer/src/components/ui/sonner.tsx +++ b/src/renderer/src/components/ui/sonner.tsx @@ -8,7 +8,7 @@ import { import { useRef, type SyntheticEvent } from 'react' import { Toaster as Sonner, type ToasterProps } from 'sonner' import { useAppStore } from '@/store/index' -import { MODAL_OVERLAY_CHILD_SELECTOR } from '@/lib/body-overlay-attributes' +import { MODAL_OVERLAY_CHILD_SELECTOR } from '@/lib/overlay-interaction/body-overlay-attributes' import { NOTIFICATION_CARD_STACK_BOTTOM, NOTIFICATION_CARD_STACK_HEIGHT_VAR diff --git a/src/renderer/src/components/use-google-cookie-clear.ts b/src/renderer/src/components/use-google-cookie-clear.ts index c3bba586225..12fbb867327 100644 --- a/src/renderer/src/components/use-google-cookie-clear.ts +++ b/src/renderer/src/components/use-google-cookie-clear.ts @@ -9,7 +9,7 @@ import { confirmAndClearGoogleCookies } from '@/lib/browser/cookies/browser-google-cookie-clear' import { useTranslate } from '@/i18n/use-translate' -import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label' +import { translateBrowserSessionProfileLabel } from '@/lib/browser/profiles/browser-session-profile-label' import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' export function useGoogleCookieClear(hostId: ExecutionHostId, profileId: string, label?: string) { diff --git a/src/renderer/src/hooks/composer-state/derived-composer-state.ts b/src/renderer/src/hooks/composer-state/derived-composer-state.ts index e527ee04afd..5abdb1d1083 100644 --- a/src/renderer/src/hooks/composer-state/derived-composer-state.ts +++ b/src/renderer/src/hooks/composer-state/derived-composer-state.ts @@ -1,4 +1,4 @@ -import { useFolderSetupSupport } from '@/lib/use-folder-setup-supported' +import { useFolderSetupSupport } from '@/lib/workspace/creation/setup/folder-setup-support' import type { DerivedComposerStateInput } from './composer-target-input-contracts' import { useMemo } from 'react' diff --git a/src/renderer/src/hooks/composer-state/derived-model.ts b/src/renderer/src/hooks/composer-state/derived-model.ts index f223d746d05..a3162e5030e 100644 --- a/src/renderer/src/hooks/composer-state/derived-model.ts +++ b/src/renderer/src/hooks/composer-state/derived-model.ts @@ -1,4 +1,4 @@ -import type { FolderSetupSupport } from '@/lib/use-folder-setup-supported' +import type { FolderSetupSupport } from '@/lib/workspace/creation/setup/folder-setup-support' import type { GitHubWorkItem } from '../../../../shared/github/work-item-types' import type { OrcaHooks, SetupRunPolicy } from '../../../../shared/orca-yaml-hook-types' import type { SparsePreset } from '../../../../shared/worktree/create-types' diff --git a/src/renderer/src/hooks/composer-state/quick-submit-preparation.ts b/src/renderer/src/hooks/composer-state/quick-submit-preparation.ts index be2cf931346..1f4b196a37b 100644 --- a/src/renderer/src/hooks/composer-state/quick-submit-preparation.ts +++ b/src/renderer/src/hooks/composer-state/quick-submit-preparation.ts @@ -13,7 +13,7 @@ import { import type { SetupDecision } from '../../../../shared/worktree/create-types' import type { WorktreeCreationRequest } from '@/lib/workspace/creation/pending-worktree-creation' import { resolveComposerBranchNameOverrideForCreate } from '../composer-branch-selection' -import { resolveFolderSetupSupported } from '@/lib/use-folder-setup-supported' +import { resolveFolderSetupSupported } from '@/lib/workspace/creation/setup/folder-setup-support' import { translate } from '@/i18n/i18n' import { resolveWorktreeCreateBaseBranch } from '@/runtime/source-control/worktree-creation/worktree-create-base' import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent' diff --git a/src/renderer/src/lib/browser/cookies/browser-google-cookie-clear.ts b/src/renderer/src/lib/browser/cookies/browser-google-cookie-clear.ts index cb3c2708001..afbb9474135 100644 --- a/src/renderer/src/lib/browser/cookies/browser-google-cookie-clear.ts +++ b/src/renderer/src/lib/browser/cookies/browser-google-cookie-clear.ts @@ -9,7 +9,7 @@ import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call' import { useAppStore } from '@/store/index' import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host' import { translate } from '@/i18n/i18n' -import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label' +import { translateBrowserSessionProfileLabel } from '@/lib/browser/profiles/browser-session-profile-label' import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision' function remoteGoogleCookieClearAvailable(environmentId: string): boolean { diff --git a/src/renderer/src/lib/browser-session-profile-label.ts b/src/renderer/src/lib/browser/profiles/browser-session-profile-label.ts similarity index 100% rename from src/renderer/src/lib/browser-session-profile-label.ts rename to src/renderer/src/lib/browser/profiles/browser-session-profile-label.ts diff --git a/src/renderer/src/lib/cli-emulator-user-facing-copy.ts b/src/renderer/src/lib/cli/cli-user-facing-detail.ts similarity index 81% rename from src/renderer/src/lib/cli-emulator-user-facing-copy.ts rename to src/renderer/src/lib/cli/cli-user-facing-detail.ts index b491c2ee15a..3d879fe7bf8 100644 --- a/src/renderer/src/lib/cli-emulator-user-facing-copy.ts +++ b/src/renderer/src/lib/cli/cli-user-facing-detail.ts @@ -132,23 +132,6 @@ const KNOWN_CLI_DETAILS: { } ] -const KNOWN_ANDROID_MESSAGES: { test: string; key: string; fallback: string }[] = [ - { - test: 'Android SDK not found. Install Android Studio and set ANDROID_HOME.', - key: 'auto.lib.emulator.androidSdkNotFound', - fallback: 'Android SDK not found. Install Android Studio and set ANDROID_HOME.' - } -] - -const KNOWN_IOS_MESSAGES: { test: string; key: string; fallback: string }[] = [ - { - test: 'Xcode Simulator tools are unavailable. Install full Xcode, open it once, then select it with `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`.', - key: 'auto.lib.emulator.xcodeSimulatorToolsUnavailable', - fallback: - 'Xcode Simulator tools are unavailable. Install full Xcode, open it once, then select it with `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`.' - } -] - function stripElectronInvokePrefix(raw: string): string { const match = raw.match(/Error invoking remote method '[^']+': Error:\s*(.+)$/s) return match?.[1]?.trim() || raw @@ -214,33 +197,3 @@ export function formatCliUserFacingDetail(raw: string | null | undefined): strin } return normalized } - -export function formatEmulatorAvailabilityUserFacingMessage( - raw: string | null | undefined -): string { - if (!raw?.trim()) { - return '' - } - for (const known of KNOWN_IOS_MESSAGES) { - if (raw === known.test || raw.includes(known.test)) { - return translate(known.key, known.fallback) - } - } - const android = formatAndroidSdkUserFacingMessage(raw) - if (android !== raw) { - return android - } - return formatCliUserFacingDetail(raw) -} - -export function formatAndroidSdkUserFacingMessage(raw: string | null | undefined): string { - if (!raw?.trim()) { - return '' - } - for (const known of KNOWN_ANDROID_MESSAGES) { - if (raw === known.test || raw.includes(known.test)) { - return translate(known.key, known.fallback) - } - } - return raw -} diff --git a/src/renderer/src/lib/body-overlay-attributes.ts b/src/renderer/src/lib/overlay-interaction/body-overlay-attributes.ts similarity index 100% rename from src/renderer/src/lib/body-overlay-attributes.ts rename to src/renderer/src/lib/overlay-interaction/body-overlay-attributes.ts diff --git a/src/renderer/src/lib/outside-dismiss-guard.ts b/src/renderer/src/lib/overlay-interaction/outside-dismiss-guard.ts similarity index 100% rename from src/renderer/src/lib/outside-dismiss-guard.ts rename to src/renderer/src/lib/overlay-interaction/outside-dismiss-guard.ts diff --git a/src/renderer/src/lib/overlay-interaction/overlay-focus-ownership.ts b/src/renderer/src/lib/overlay-interaction/overlay-focus-ownership.ts index 8adb55d7f71..05b1f02454f 100644 --- a/src/renderer/src/lib/overlay-interaction/overlay-focus-ownership.ts +++ b/src/renderer/src/lib/overlay-interaction/overlay-focus-ownership.ts @@ -1,4 +1,4 @@ -import { getVisibleOverlays, isVisibleOverlay } from '../visible-overlay' +import { getVisibleOverlays, isVisibleOverlay } from './visible-overlay' const NON_OWNING_SURFACES = '[data-focus-behavior="page"], [data-focus-behavior="composer-suggestions"]' diff --git a/src/renderer/src/lib/visible-overlay.ts b/src/renderer/src/lib/overlay-interaction/visible-overlay.ts similarity index 100% rename from src/renderer/src/lib/visible-overlay.ts rename to src/renderer/src/lib/overlay-interaction/visible-overlay.ts diff --git a/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.ts index 2edb5149141..378c037f0bd 100644 --- a/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.ts +++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.ts @@ -1,4 +1,4 @@ -import { flattenRetainedSlice } from '@/lib/flatten-retained-slice' +import { flattenRetainedSlice } from '@/lib/terminal/output/flatten-retained-slice' import { resolveSynchronizedOutputSafeSplit } from '../../../../../shared/terminal/protocol/escape/terminal-synchronized-output-scan' import type { QueueEntry, diff --git a/src/renderer/src/lib/simulator/emulator-availability-copy.ts b/src/renderer/src/lib/simulator/emulator-availability-copy.ts new file mode 100644 index 00000000000..eeeb8ebf68c --- /dev/null +++ b/src/renderer/src/lib/simulator/emulator-availability-copy.ts @@ -0,0 +1,49 @@ +import { translate } from '@/i18n/i18n' +import { formatCliUserFacingDetail } from '../cli/cli-user-facing-detail' + +const KNOWN_ANDROID_MESSAGES: { test: string; key: string; fallback: string }[] = [ + { + test: 'Android SDK not found. Install Android Studio and set ANDROID_HOME.', + key: 'auto.lib.emulator.androidSdkNotFound', + fallback: 'Android SDK not found. Install Android Studio and set ANDROID_HOME.' + } +] + +const KNOWN_IOS_MESSAGES: { test: string; key: string; fallback: string }[] = [ + { + test: 'Xcode Simulator tools are unavailable. Install full Xcode, open it once, then select it with `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`.', + key: 'auto.lib.emulator.xcodeSimulatorToolsUnavailable', + fallback: + 'Xcode Simulator tools are unavailable. Install full Xcode, open it once, then select it with `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`.' + } +] + +export function formatEmulatorAvailabilityUserFacingMessage( + raw: string | null | undefined +): string { + if (!raw?.trim()) { + return '' + } + for (const known of KNOWN_IOS_MESSAGES) { + if (raw === known.test || raw.includes(known.test)) { + return translate(known.key, known.fallback) + } + } + const android = formatAndroidSdkUserFacingMessage(raw) + if (android !== raw) { + return android + } + return formatCliUserFacingDetail(raw) +} + +export function formatAndroidSdkUserFacingMessage(raw: string | null | undefined): string { + if (!raw?.trim()) { + return '' + } + for (const known of KNOWN_ANDROID_MESSAGES) { + if (raw === known.test || raw.includes(known.test)) { + return translate(known.key, known.fallback) + } + } + return raw +} diff --git a/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts b/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts index 9292238bb95..97462ca2798 100644 --- a/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts +++ b/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts @@ -1,7 +1,7 @@ import { toast } from 'sonner' import type { CliInstallStatus } from '../../../../../shared/cli-install-types' import { translate } from '@/i18n/i18n' -import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy' +import { formatCliUserFacingDetail } from '@/lib/cli/cli-user-facing-detail' type EnsureOrcaCliAvailableOptions = { onStatusChange?: (status: CliInstallStatus) => void diff --git a/src/renderer/src/lib/flatten-retained-slice.ts b/src/renderer/src/lib/terminal/output/flatten-retained-slice.ts similarity index 100% rename from src/renderer/src/lib/flatten-retained-slice.ts rename to src/renderer/src/lib/terminal/output/flatten-retained-slice.ts diff --git a/src/renderer/src/lib/use-folder-setup-supported.ts b/src/renderer/src/lib/workspace/creation/setup/folder-setup-support.ts similarity index 93% rename from src/renderer/src/lib/use-folder-setup-supported.ts rename to src/renderer/src/lib/workspace/creation/setup/folder-setup-support.ts index 4015f887b8d..6acd82434fe 100644 --- a/src/renderer/src/lib/use-folder-setup-supported.ts +++ b/src/renderer/src/lib/workspace/creation/setup/folder-setup-support.ts @@ -1,8 +1,11 @@ import { useCallback, useEffect, useSyncExternalStore } from 'react' -import { getRepoExecutionHostId, parseExecutionHostId } from '../../../shared/execution-host' -import { isFolderRepo } from '../../../shared/repo-kind' -import type { Repo } from '../../../shared/repo-types' -import { WORKTREE_FOLDER_SETUP_RUNTIME_CAPABILITY } from '../../../shared/worktree-runtime-capabilities' +import { + getRepoExecutionHostId, + parseExecutionHostId +} from '../../../../../../shared/execution-host' +import { isFolderRepo } from '../../../../../../shared/repo-kind' +import type { Repo } from '../../../../../../shared/repo-types' +import { WORKTREE_FOLDER_SETUP_RUNTIME_CAPABILITY } from '../../../../../../shared/worktree-runtime-capabilities' import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof' export type FolderSetupSupport = 'supported' | 'unsupported' | 'pending' diff --git a/src/renderer/src/main.tsx b/src/renderer/src/main.tsx index 8d927a269cd..2fe08872af0 100644 --- a/src/renderer/src/main.tsx +++ b/src/renderer/src/main.tsx @@ -28,7 +28,7 @@ import { installBrowserClientPageRenderer } from './components/browser-pane/brow import { registerBrowserClientPageGuestMessageHandler } from './components/browser-pane/browser-client-page-retained-elements' import { handleGuestWindowCloseMessage } from './components/browser-pane/host-guest/browser-page-window-close' import { installOsFileDropCancellationGuard } from './lib/files/drop/os-file-drop-cancellation-guard' -import { installBodyOverlayAttributes } from './lib/body-overlay-attributes' +import { installBodyOverlayAttributes } from './lib/overlay-interaction/body-overlay-attributes' import { applyWindowMaterialToDocument } from './app-shell/appearance/window-material-runtime' const disposeOsFileDropGuard = installOsFileDropCancellationGuard() diff --git a/src/renderer/src/popout.tsx b/src/renderer/src/popout.tsx index f08bb764375..078feb77d04 100644 --- a/src/renderer/src/popout.tsx +++ b/src/renderer/src/popout.tsx @@ -19,7 +19,7 @@ import type { GlobalSettings } from '../../shared/global-settings-types' import { getOrCreateRendererRoot } from './app-shell/startup/react-renderer-root' import { setReactCommitCascadeRendererSurface } from './diagnostics/react-commits/react-commit-cascade-telemetry' import { installOsFileDropCancellationGuard } from './lib/files/drop/os-file-drop-cancellation-guard' -import { installBodyOverlayAttributes } from './lib/body-overlay-attributes' +import { installBodyOverlayAttributes } from './lib/overlay-interaction/body-overlay-attributes' import { useReduceVisualEffects } from './hooks/use-reduce-visual-effects' const disposeOsFileDropGuard = installOsFileDropCancellationGuard() diff --git a/src/renderer/src/space.tsx b/src/renderer/src/space.tsx index a10354a6eb2..25ffc273e3a 100644 --- a/src/renderer/src/space.tsx +++ b/src/renderer/src/space.tsx @@ -18,7 +18,7 @@ import { buildAppFontFamily } from './app-shell/appearance/app-font-family' import { getOrCreateRendererRoot } from './app-shell/startup/react-renderer-root' import { I18nProvider } from './i18n/I18nProvider' import { useAppStore } from './store/index' -import { installBodyOverlayAttributes } from './lib/body-overlay-attributes' +import { installBodyOverlayAttributes } from './lib/overlay-interaction/body-overlay-attributes' import { useReduceVisualEffects } from './hooks/use-reduce-visual-effects' const disposeBodyOverlayAttributes = installBodyOverlayAttributes() diff --git a/src/renderer/src/web/main.tsx b/src/renderer/src/web/main.tsx index ff1d2044546..214a749d5c1 100644 --- a/src/renderer/src/web/main.tsx +++ b/src/renderer/src/web/main.tsx @@ -22,7 +22,7 @@ import { WebPairingSecurityNotice } from './WebPairingSecurityNotice' import { I18nProvider } from '../i18n/I18nProvider' import { useTranslate } from '@/i18n/use-translate' import { installOsFileDropCancellationGuard } from '../lib/files/drop/os-file-drop-cancellation-guard' -import { installBodyOverlayAttributes } from '../lib/body-overlay-attributes' +import { installBodyOverlayAttributes } from '../lib/overlay-interaction/body-overlay-attributes' import { installAppKeyboardRouter } from '../lib/keyboard/app-keyboard-router' const disposeOsFileDropGuard = installOsFileDropCancellationGuard()