Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
chore(settings): enable biome and format (#4549)
dev-rb2f8f6a42eb79
diff --git a/js/app/biome.jsonc b/js/app/biome.jsoncindex 976b2edd50..fd85ab2545 100644--- a/js/app/biome.jsonc+++ b/js/app/biome.jsonc@@ -142,11 +142,7 @@}},{- "includes": [- "packages/app/component/settings/**",- "packages/animate/**",- "packages/theme/**"- ],+ "includes": ["packages/animate/**", "packages/theme/**"],"formatter": {"enabled": false},diff --git a/js/app/packages/app/component/settings/Account.tsx b/js/app/packages/app/component/settings/Account.tsxindex b4a43c41ff..aec2fadb80 100644--- a/js/app/packages/app/component/settings/Account.tsx+++ b/js/app/packages/app/component/settings/Account.tsx@@ -1,36 +1,50 @@-import { UserIcon } from '@core/component/UserIcon';+import { useAnalytics } from '@app/component/analytics-context';+import { useFeatureFlag } from '@app/lib/analytics/posthog';import { useLogout } from '@core/auth/logout';-import { isNativeMobilePlatform } from '@core/mobile/isNativeMobilePlatform';-import { isMobile } from '@core/mobile/isMobile';import { toast } from '@core/component/Toast/Toast';-import { staticFileIdEndpoint } from '@core/constant/servers';-import { createStaticFile } from '@core/util/create';-import { openFilePicker } from '@core/util/upload';-import { Dialog, Button, Panel, Tooltip, ToggleSwitch, Dropdown, cn } from '@ui';-import { SettingsCard, SettingsPage, SettingsSection } from './primitives';+import { UserIcon } from '@core/component/UserIcon';import {blockNameToFileExtensions,blockNameToMimeTypes,} from '@core/constant/allBlocks';-import { useFeatureFlag } from '@app/lib/analytics/posthog';import {DISABLE_AUTO_UPDATE_UI_FLAG,ENABLE_AUTO_UPDATE_UI_OVERRIDE,ENABLE_PROFILE_PICTURES,} from '@core/constant/featureFlags';+import { staticFileIdEndpoint } from '@core/constant/servers';+import { useEmail, useUserId } from '@core/context/user';+import { isMobile } from '@core/mobile/isMobile';+import { isNativeMobilePlatform } from '@core/mobile/isNativeMobilePlatform';import {type ProfilePictureItem,useProfilePictureUrl,} from '@core/signal/profilePicture';-import IconUpload from '@phosphor-icons/core/regular/upload-simple.svg?component-solid';-import SignOutIcon from '@phosphor-icons/core/regular/sign-out.svg?component-solid';-import PencilIcon from '@phosphor/pencil-simple.svg';-import TrashIcon from '@phosphor/trash.svg';+import { createStaticFile } from '@core/util/create';+import { openFilePicker } from '@core/util/upload';+import { type BundleUpdateStatus, useTauri } from '@macro/tauri';+import {+ type SupportedNotificationSettings,+ useNotificationSettings,+} from '@notifications';import CheckIcon from '@phosphor/check.svg';+import PencilIcon from '@phosphor/pencil-simple.svg';import SpinnerIcon from '@phosphor/spinner-gap.svg';+import TrashIcon from '@phosphor/trash.svg';import WarningCircleIcon from '@phosphor/warning-circle.svg';+import SignOutIcon from '@phosphor-icons/core/regular/sign-out.svg?component-solid';+import IconUpload from '@phosphor-icons/core/regular/upload-simple.svg?component-solid';import { authServiceClient } from '@service-auth/client';-import { useEmail, useUserId } from '@core/context/user';+import { invoke } from '@tauri-apps/api/core';+import {+ Button,+ cn,+ Dialog,+ Dropdown,+ Panel,+ ToggleSwitch,+ Tooltip,+} from '@ui';import {createEffect,createMemo,@@ -42,15 +56,9 @@ import {Show,Switch,} from 'solid-js';-import {- type SupportedNotificationSettings,- useNotificationSettings,-} from '@notifications';-import { useAnalytics } from '@app/component/analytics-context';-import { useTauri, type BundleUpdateStatus } from '@macro/tauri';-import { invoke } from '@tauri-apps/api/core';import { Transition } from 'solid-transition-group';import { formatAssetUrl, loadEntryAssetInfo } from './entryAssetInfo';+import { SettingsCard, SettingsPage, SettingsSection } from './primitives';// 16 megabytesconst MAX_PROFILE_PICTURE_SIZE = 16 * 1000 * 1000;@@ -91,17 +99,28 @@ async function removeProfilePicture(): Promise<boolean> {function formatBundleUpdateStatus(status: BundleUpdateStatus): string {switch (status.status) {- case 'Idle': return 'Idle';- case 'CheckingForUpdate': return 'Checking for update...';- case 'UpdateFound': return `Update available: v${status.data.version}`;- case 'NoUpdateNeeded': return 'Up to date';- case 'WaitingForWifi': return 'Waiting for Wi-Fi to download';- case 'Downloading': return `Downloading: ${Math.round(status.data.progress)}%`;- case 'Unzipping': return `Installing: ${Math.round(status.data.progress)}%`;- case 'ClearRequired': return 'Cached update revoked';- case 'NativeUpdateRequired': return 'App update required';- case 'Completed': return 'Update ready';- case 'Error': return 'An error occurred when checking for updates';+ case 'Idle':+ return 'Idle';+ case 'CheckingForUpdate':+ return 'Checking for update...';+ case 'UpdateFound':+ return `Update available: v${status.data.version}`;+ case 'NoUpdateNeeded':+ return 'Up to date';+ case 'WaitingForWifi':+ return 'Waiting for Wi-Fi to download';+ case 'Downloading':+ return `Downloading: ${Math.round(status.data.progress)}%`;+ case 'Unzipping':+ return `Installing: ${Math.round(status.data.progress)}%`;+ case 'ClearRequired':+ return 'Cached update revoked';+ case 'NativeUpdateRequired':+ return 'App update required';+ case 'Completed':+ return 'Update ready';+ case 'Error':+ return 'An error occurred when checking for updates';}}@@ -304,7 +323,8 @@ export function Account() {() => ENABLE_AUTO_UPDATE_UI_OVERRIDE ?? !disableAutoUpdateUIFlag().enabled);const [showDeleteModal, setShowDeleteModal] = createSignal<boolean>(false);- const [showDeleteConfirmModal, setShowDeleteConfirmModal] = createSignal<boolean>(false);+ const [showDeleteConfirmModal, setShowDeleteConfirmModal] =+ createSignal<boolean>(false);const userName = useUserName();const [updatedFirstName, setUpdatedFirstName] = createSignal<@@ -414,68 +434,88 @@ export function Account() {<Show when={isNativeMobilePlatform()}><SettingsSection title="Danger zone"><div>- <Button variant="danger" depth={3} onClick={() => setShowDeleteModal(true)}>+ <Button+ variant="danger"+ depth={3}+ onClick={() => setShowDeleteModal(true)}+ >Delete Account</Button><Dialog- open={showDeleteModal()}- onOpenChange={setShowDeleteModal}- position="center"- class="w-120"- >- <Panel depth={2} class="rounded-xl">- <Panel.Header class="px-6">- <Dialog.Title class="text-ink text-sm font-semibold">- Delete Account- </Dialog.Title>- </Panel.Header>- <Panel.Body class="p-6 font-sans flex flex-col gap-3">- <Dialog.Description class="text-ink-muted text-sm/tight font-normal">- Are you sure you want to delete your account? This action is- permanent and cannot be undone.- </Dialog.Description>- <div class="pt-3 justify-end items-center gap-3 inline-flex">- <Button variant="base" depth={3} onClick={() => setShowDeleteModal(false)}>- Cancel- </Button>- <Button variant="danger" depth={3} onClick={() => {- setShowDeleteModal(false);- setShowDeleteConfirmModal(true);- }}>- Delete- </Button>- </div>- </Panel.Body>- </Panel>- </Dialog>- <Dialog- open={showDeleteConfirmModal()}- onOpenChange={setShowDeleteConfirmModal}- position="center"- class="w-120"- >- <Panel depth={2} class="rounded-xl">- <Panel.Header class="px-6">- <Dialog.Title class="text-ink text-sm font-semibold">- Are you absolutely sure?- </Dialog.Title>- </Panel.Header>- <Panel.Body class="p-6 font-sans flex flex-col gap-3">- <Dialog.Description class="text-ink-muted text-sm/tight font-normal">- This will permanently delete your account and all associated- data. This cannot be undone.- </Dialog.Description>- <div class="pt-3 justify-end items-center gap-3 inline-flex">- <Button variant="base" depth={3} onClick={() => setShowDeleteConfirmModal(false)}>- Cancel- </Button>- <Button variant="danger" depth={3} onClick={deleteAccountHandler}>- Delete My Account- </Button>- </div>- </Panel.Body>- </Panel>- </Dialog>+ open={showDeleteModal()}+ onOpenChange={setShowDeleteModal}+ position="center"+ class="w-120"+ >+ <Panel depth={2} class="rounded-xl">+ <Panel.Header class="px-6">+ <Dialog.Title class="text-ink text-sm font-semibold">+ Delete Account+ </Dialog.Title>+ </Panel.Header>+ <Panel.Body class="p-6 font-sans flex flex-col gap-3">+ <Dialog.Description class="text-ink-muted text-sm/tight font-normal">+ Are you sure you want to delete your account? This action is+ permanent and cannot be undone.+ </Dialog.Description>+ <div class="pt-3 justify-end items-center gap-3 inline-flex">+ <Button+ variant="base"+ depth={3}+ onClick={() => setShowDeleteModal(false)}+ >+ Cancel+ </Button>+ <Button+ variant="danger"+ depth={3}+ onClick={() => {+ setShowDeleteModal(false);+ setShowDeleteConfirmModal(true);+ }}+ >+ Delete+ </Button>+ </div>+ </Panel.Body>+ </Panel>+ </Dialog>+ <Dialog+ open={showDeleteConfirmModal()}+ onOpenChange={setShowDeleteConfirmModal}+ position="center"+ class="w-120"+ >+ <Panel depth={2} class="rounded-xl">+ <Panel.Header class="px-6">+ <Dialog.Title class="text-ink text-sm font-semibold">+ Are you absolutely sure?+ </Dialog.Title>+ </Panel.Header>+ <Panel.Body class="p-6 font-sans flex flex-col gap-3">+ <Dialog.Description class="text-ink-muted text-sm/tight font-normal">+ This will permanently delete your account and all associated+ data. This cannot be undone.+ </Dialog.Description>+ <div class="pt-3 justify-end items-center gap-3 inline-flex">+ <Button+ variant="base"+ depth={3}+ onClick={() => setShowDeleteConfirmModal(false)}+ >+ Cancel+ </Button>+ <Button+ variant="danger"+ depth={3}+ onClick={deleteAccountHandler}+ >+ Delete My Account+ </Button>+ </div>+ </Panel.Body>+ </Panel>+ </Dialog></div></SettingsSection></Show>@@ -608,13 +648,12 @@ function NotificationToggle() {function NotificationSettings(props: {settings: SupportedNotificationSettings;}) {- const analytics = useAnalytics()-- const handleToggle = (checked: boolean) => {- analytics.track('notifications_toggled')- props.settings.toggle(checked)- }+ const analytics = useAnalytics();+ const handleToggle = (checked: boolean) => {+ analytics.track('notifications_toggled');+ props.settings.toggle(checked);+ };return (<Row label="Notifications">@@ -636,14 +675,17 @@ function NotificationNotSupported() {}function bundleUpdateAction(- status: BundleUpdateStatus,+ status: BundleUpdateStatus): { label: string; action: () => void } | null {const grantBundleUpdate = () =>invoke('grant_bundle_update', { approved: true }).catch(console.error);switch (status.status) {case 'Idle':- return { label: 'Check for Update', action: () => invoke('check_for_update') };+ return {+ label: 'Check for Update',+ action: () => invoke('check_for_update'),+ };case 'Error':return { label: 'Retry', action: () => invoke('check_for_update') };case 'UpdateFound':@@ -677,7 +719,7 @@ function BundleVersionRow() {const [entryAssetInfo] = createResource(showBuildInfo, (open) =>open ? loadEntryAssetInfo() : null);-+return (<Show when={bundleDebugInfo()}>{(info) => (@@ -688,8 +730,8 @@ function BundleVersionRow() {class="appearance-none rounded-sm border-0 bg-transparent p-0 text-right text-sm text-ink-muted hover:text-ink focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent"onClick={() => setShowBuildInfo(true)}>- {info().bundleBuild}{' '}- ({info().source === 'embedded' ? 'app' : 'ota'}) -{' '}+ {info().bundleBuild} (+ {info().source === 'embedded' ? 'app' : 'ota'}) -{' '}{info().nativeBuild}</button></Row>@@ -710,8 +752,8 @@ function BundleVersionRow() {<div class="flex items-center justify-between gap-4"><span class="text-ink-muted">Selected bundle</span><span class="text-ink">- {info().bundleBuild}{' '}- ({info().source === 'embedded' ? 'app' : 'ota'})+ {info().bundleBuild} (+ {info().source === 'embedded' ? 'app' : 'ota'})</span></div><div class="flex items-center justify-between gap-4">diff --git a/js/app/packages/app/component/settings/Admin.tsx b/js/app/packages/app/component/settings/Admin.tsxindex 9edf755823..d5935bc524 100644--- a/js/app/packages/app/component/settings/Admin.tsx+++ b/js/app/packages/app/component/settings/Admin.tsx@@ -1,20 +1,23 @@-import { For } from 'solid-js';-import { Button, ToggleSwitch } from '@ui';import {- type DebugSettingDef,- DEBUG_SETTINGS,clearAllDebugSettings,+ DEBUG_SETTINGS,+ type DebugSettingDef,debugSettings,getDebugSetting,setDebugSetting,} from '@app/lib/debugSettings';+import { Button, ToggleSwitch } from '@ui';+import { For } from 'solid-js';import { SettingsCard, SettingsPage, SettingsRow } from './primitives';function DebugSettingRow(props: { setting: DebugSettingDef }) {const checked = () => getDebugSetting(props.setting.key);return (- <SettingsRow label={props.setting.label} description={props.setting.description}>+ <SettingsRow+ label={props.setting.label}+ description={props.setting.description}+ ><ToggleSwitchsize="md"checked={checked()}diff --git a/js/app/packages/app/component/settings/Appearance.tsx b/js/app/packages/app/component/settings/Appearance.tsxindex 81e903bd83..2236eccc5b 100644--- a/js/app/packages/app/component/settings/Appearance.tsx+++ b/js/app/packages/app/component/settings/Appearance.tsx@@ -1,22 +1,20 @@-import {- monochromeIcons,- setMonochromeIcons,- setTooltipsEnabled,- tooltipsEnabled,-} from '@ui/signals/signals';+import { TabsInset } from '@core/component/TabsInset';+import { toast } from '@core/component/Toast/Toast';+import { DropdownMenu as KobalteDropdownMenu } from '@kobalte/core/dropdown-menu';+import ClipboardIcon from '@phosphor/clipboard.svg';+import PencilIcon from '@phosphor/pencil-simple.svg';+import PlusIcon from '@phosphor/plus.svg';+import ShuffleIcon from '@phosphor/shuffle.svg';+import TrashIcon from '@phosphor/trash.svg';+import XIcon from '@phosphor/x.svg';+import { ThemeChipPill } from '@theme/components/ThemeChipPill';+import { ThemeChips } from '@theme/components/ThemeChips';import { ThemeEditorAdvanced } from '@theme/components/ThemeEditorAdvanced';import {- ThemeEditorBasic,randomizeTheme,+ ThemeEditorBasic,} from '@theme/components/ThemeEditorBasic';-import { createSignal, For, Show } from 'solid-js';-import { TabsInset } from '@core/component/TabsInset';-import XIcon from '@phosphor/x.svg';-import PlusIcon from '@phosphor/plus.svg';-import PencilIcon from '@phosphor/pencil-simple.svg';-import TrashIcon from '@phosphor/trash.svg';-import ClipboardIcon from '@phosphor/clipboard.svg';-import ShuffleIcon from '@phosphor/shuffle.svg';+import { DEFAULT_THEMES } from '@theme/constants';import {currentThemeId,darkModeTheme,@@ -25,10 +23,11 @@ import {setIsThemeSaved,setLightModeTheme,setThemeShouldMatchSystem,- themes,themeShouldMatchSystem,+ themes,userThemes,} from '@theme/signals/themeSignals';+import type { ThemeV2 } from '@theme/types/themeTypes';import {applyTheme,deleteTheme,@@ -38,13 +37,14 @@ import {saveTheme,updateTheme,} from '@theme/utils/themeUtils';-import { toast } from '@core/component/Toast/Toast';-import { DEFAULT_THEMES } from '@theme/constants';-import { ThemeChips } from '@theme/components/ThemeChips';-import { ThemeChipPill } from '@theme/components/ThemeChipPill';-import type { ThemeV2 } from '@theme/types/themeTypes';-import { DropdownMenu as KobalteDropdownMenu } from '@kobalte/core/dropdown-menu';import { Button, cn, Dropdown, Layer, ToggleSwitch } from '@ui';+import {+ monochromeIcons,+ setMonochromeIcons,+ setTooltipsEnabled,+ tooltipsEnabled,+} from '@ui/signals/signals';+import { createSignal, For, Show } from 'solid-js';import {SettingsCard,SettingsPage,@@ -294,7 +294,8 @@ export function Appearance() {const lightThemes = () =>themes().filter((theme) => !isTokensDark(theme.tokens));- const darkThemes = () => themes().filter((theme) => isTokensDark(theme.tokens));+ const darkThemes = () =>+ themes().filter((theme) => isTokensDark(theme.tokens));const chooseTheme = (id: string) => {applyTheme(id);@@ -373,63 +374,63 @@ export function Appearance() {<Show when={editorOpen()}><Layer depth={3}><div class="mx-3 my-2 flex flex-col gap-3 rounded-xl border border-ink/[0.05] bg-surface px-4 py-4">- <div class="flex items-center gap-2">- <Button- label="Close editor"- onClick={closeEditor}- variant="ghost"- size="icon-sm"- >- <XIcon class="size-4" />- </Button>- <input- type="text"- value={themeName()}- onInput={(e) => setThemeName(e.currentTarget.value)}- spellcheck={false}- placeholder="Theme name"- aria-label="Theme name"- class="w-40 min-w-0 rounded-md border border-edge-muted bg-transparent px-2 py-1 text-xs text-ink outline-none placeholder:text-ink-extra-muted focus:border-accent"- />- <div class="flex-1" />- <Button- label="Randomize theme"- onPointerDown={randomizeTheme}- variant="ghost"- size="icon-sm"- >- <ShuffleIcon class="size-4" />- </Button>- <TabsInset- depth={3}- onChange={(value) => setEditorTab(value as EditorTab)}- list={[- { value: 'basic', label: 'Basic' },- { value: 'advanced', label: 'Variables' },- ]}- value={editorTab()}- defaultValue="basic"- />- </div>- <div class="relative overflow-hidden rounded-lg">- {/* The Basic view defines the box height; it stays mounted+ <div class="flex items-center gap-2">+ <Button+ label="Close editor"+ onClick={closeEditor}+ variant="ghost"+ size="icon-sm"+ >+ <XIcon class="size-4" />+ </Button>+ <input+ type="text"+ value={themeName()}+ onInput={(e) => setThemeName(e.currentTarget.value)}+ spellcheck={false}+ placeholder="Theme name"+ aria-label="Theme name"+ class="w-40 min-w-0 rounded-md border border-edge-muted bg-transparent px-2 py-1 text-xs text-ink outline-none placeholder:text-ink-extra-muted focus:border-accent"+ />+ <div class="flex-1" />+ <Button+ label="Randomize theme"+ onPointerDown={randomizeTheme}+ variant="ghost"+ size="icon-sm"+ >+ <ShuffleIcon class="size-4" />+ </Button>+ <TabsInset+ depth={3}+ onChange={(value) => setEditorTab(value as EditorTab)}+ list={[+ { value: 'basic', label: 'Basic' },+ { value: 'advanced', label: 'Variables' },+ ]}+ value={editorTab()}+ defaultValue="basic"+ />+ </div>+ <div class="relative overflow-hidden rounded-lg">+ {/* The Basic view defines the box height; it stays mounted(just hidden) on the Variables tab so the variables listscrolls within that same height. Basic rows use dividersonly; the Variables list keeps a bordered container. */}- <div classList={{ invisible: editorTab() !== 'basic' }}>- <ThemeEditorBasic />- </div>- <Show when={editorTab() === 'advanced'}>- <div class="absolute inset-0 overflow-y-auto rounded-lg border border-ink/[0.05] bg-surface">- <ThemeEditorAdvanced />+ <div classList={{ invisible: editorTab() !== 'basic' }}>+ <ThemeEditorBasic /></div>- </Show>- </div>- <div class="flex justify-end">- <Button variant="base" size="sm" onClick={saveCurrentTheme}>- Save theme- </Button>- </div>+ <Show when={editorTab() === 'advanced'}>+ <div class="absolute inset-0 overflow-y-auto rounded-lg border border-ink/[0.05] bg-surface">+ <ThemeEditorAdvanced />+ </div>+ </Show>+ </div>+ <div class="flex justify-end">+ <Button variant="base" size="sm" onClick={saveCurrentTheme}>+ Save theme+ </Button>+ </div></div></Layer></Show>diff --git a/js/app/packages/app/component/settings/Billing.tsx b/js/app/packages/app/component/settings/Billing.tsxindex 7e00dd4d0a..c431205344 100644--- a/js/app/packages/app/component/settings/Billing.tsx+++ b/js/app/packages/app/component/settings/Billing.tsx@@ -1,15 +1,15 @@import { useAnalytics } from '@app/component/analytics-context';import type { PlanTier } from '@app/component/paywall/plans';import { useHasPaidAccess } from '@core/auth';-import CheckIcon from '@phosphor/check.svg';+import { PERMISSION_IDS } from '@core/constant/permissions';+import { usePermissions, useUserId } from '@core/context/user';+import { plural } from '@core/util/string';import ArrowSquareOutIcon from '@phosphor/arrow-square-out.svg';+import CheckIcon from '@phosphor/check.svg';+import { useCurrentTeamQuery } from '@queries/team/teams';import { stripeServiceClient } from '@service-stripe/client';import { Button, Layer } from '@ui';import { createMemo, For, Match, Show, Switch } from 'solid-js';-import { usePermissions, useUserId } from '@core/context/user';-import { PERMISSION_IDS } from '@core/constant/permissions';-import { useCurrentTeamQuery } from '@queries/team/teams';-import { plural } from '@core/util/string';import { SettingsCard, SettingsPage, SettingsSection } from './primitives';const BILLING_PLAN_FEATURES: Record<PlanTier, string[]> = {@@ -132,7 +132,9 @@ export const Billing = () => {them to make changes.</p></Match>- <Match when={hasPaid() && teamRole() === 'owner' && team.data}>+ <Match+ when={hasPaid() && teamRole() === 'owner' && team.data}+ >{(team) => (<p class="text-ink-extra-muted text-xs">{team().members.length}{' '}diff --git a/js/app/packages/app/component/settings/ConnectedAccounts.tsx b/js/app/packages/app/component/settings/ConnectedAccounts.tsxindex 6c65099e37..61dbc88c70 100644--- a/js/app/packages/app/component/settings/ConnectedAccounts.tsx+++ b/js/app/packages/app/component/settings/ConnectedAccounts.tsx@@ -1,9 +1,9 @@-import { Show, Suspense } from 'solid-js';import { ENABLE_EMAIL } from '@core/constant/featureFlags';-import { SettingsPage, SettingsSection } from './primitives';+import { Show, Suspense } from 'solid-js';import { EmailCard } from './Email';import { GitHubCard } from './GitHub';import { IntegrationsSection } from './Integrations';+import { SettingsPage, SettingsSection } from './primitives';/*** Consolidated "Connections" page: one card per external account the user candiff --git a/js/app/packages/app/component/settings/Email.tsx b/js/app/packages/app/component/settings/Email.tsxindex 1fe8b0fcda..51644c7833 100644--- a/js/app/packages/app/component/settings/Email.tsx+++ b/js/app/packages/app/component/settings/Email.tsx@@ -1,41 +1,41 @@-import { toast } from '@core/component/Toast/Toast';-import { match } from 'ts-pattern';-import { Button, Dialog, Panel, Tooltip } from '@ui';import { useFeatureFlag } from '@app/lib/analytics/posthog';+import { toast } from '@core/component/Toast/Toast';import {ENABLE_EMAIL_SIGNATURES,ENABLE_INBOX_RESYNC,ENABLE_INBOX_SYNC_STATUS,ENABLE_MULTI_INBOX_OVERRIDE,} from '@core/constant/featureFlags';+import { useEmail, useUserId } from '@core/context/user';+import {+ useAddInboxFlow,+ useEmailLinks,+ useEmailLinksStatus,+} from '@core/email-link';import GmailIcon from '@icon/mcp-gmail.svg';-import XIcon from '@phosphor-icons/core/regular/x.svg?component-solid';import ArrowsClockwiseIcon from '@phosphor-icons/core/regular/arrows-clockwise.svg?component-solid';import PlusIcon from '@phosphor-icons/core/regular/plus.svg?component-solid';import SignatureIcon from '@phosphor-icons/core/regular/signature.svg?component-solid';-import {- type BackfillJob,- BackfillJobStatus,- type Link as EmailLink,- SyncStatus,-} from '@service-email/generated/schemas';-import { useEmail, useUserId } from '@core/context/user';+import XIcon from '@phosphor-icons/core/regular/x.svg?component-solid';import {type BackfillProgress,estimateEtaSeconds,getBackfillProgress,useBackfillJobsQuery,} from '@queries/email/backfill';-import { createMemo, createSignal, For, Match, Show, Switch } from 'solid-js';+import { useRemoveInboxMutation } from '@queries/email/link';import {- useAddInboxFlow,- useEmailLinks,- useEmailLinksStatus,-} from '@core/email-link';+ type BackfillJob,+ BackfillJobStatus,+ type Link as EmailLink,+ SyncStatus,+} from '@service-email/generated/schemas';+import { Button, Dialog, Panel, Tooltip } from '@ui';+import { createMemo, createSignal, For, Match, Show, Switch } from 'solid-js';+import { match } from 'ts-pattern';import { AddInboxDialog, openAddInboxDialog } from '../AddInboxDialog';-import { useRemoveInboxMutation } from '@queries/email/link';-import { IntegrationRow, SettingsCard, SettingsRow } from './primitives';import { ConnectAction, StatusDot } from './integration-ui';+import { IntegrationRow, SettingsCard, SettingsRow } from './primitives';import {clearSignatureState,isSignatureExpanded,@@ -437,7 +437,9 @@ function InboxRow(props: {props.hasCompletedBackfill}>- <span class="text-xs text-ink-muted">Initial sync complete</span>+ <span class="text-xs text-ink-muted">+ Initial sync complete+ </span></Match></Switch></Show>@@ -513,4 +515,3 @@ function InboxRow(props: {</div>);}-diff --git a/js/app/packages/app/component/settings/GitHub.tsx b/js/app/packages/app/component/settings/GitHub.tsxindex f48145de87..454269fd3d 100644--- a/js/app/packages/app/component/settings/GitHub.tsx+++ b/js/app/packages/app/component/settings/GitHub.tsx@@ -7,8 +7,12 @@ import {useReauthenticateGithubMutation,} from '@queries/auth';import { Match, Show, Switch } from 'solid-js';+import {+ ConnectAction,+ type ConnectionState,+ StatusDot,+} from './integration-ui';import { IntegrationRow, SettingsCard } from './primitives';-import { ConnectAction, type ConnectionState, StatusDot } from './integration-ui';/** GitHub integration as a Connected-accounts card. */export function GitHubCard() {diff --git a/js/app/packages/app/component/settings/Integrations.tsx b/js/app/packages/app/component/settings/Integrations.tsxindex 085bcfa6a5..b5e24d7280 100644--- a/js/app/packages/app/component/settings/Integrations.tsx+++ b/js/app/packages/app/component/settings/Integrations.tsx@@ -1,29 +1,29 @@-import { createEffect, createSignal, For, Show } from 'solid-js';-import PlusIcon from '@phosphor-icons/core/regular/plus.svg?component-solid';-import PlugIcon from '@phosphor-icons/core/regular/plug.svg?component-solid';-import { Button, Dialog, Panel, ToggleSwitch } from '@ui';+import {+ FEATURED_MCP_SERVERS,+ type FeaturedMcpServer,+ QUICK_CONNECT_ICON_MAP,+ type SvgIcon,+} from '@core/component/AI/constant/mcpServers';+import { toast } from '@core/component/Toast/Toast';import CheckIcon from '@phosphor-icons/core/regular/check.svg?component-solid';+import PlugIcon from '@phosphor-icons/core/regular/plug.svg?component-solid';+import PlusIcon from '@phosphor-icons/core/regular/plus.svg?component-solid';import XIcon from '@phosphor-icons/core/regular/x.svg?component-solid';-import { toast } from '@core/component/Toast/Toast';-import type {- ServerResponse,- StartAuthResponse,-} from '@service-cognition/generated/schemas';import {- useMcpServersQuery,useAddMcpServerMutation,- useUpdateMcpServerMutation,useDeleteMcpServerMutation,+ useMcpServersQuery,useStartMcpAuthMutation,+ useUpdateMcpServerMutation,} from '@queries/mcp-servers';-import {- FEATURED_MCP_SERVERS,- QUICK_CONNECT_ICON_MAP,- type FeaturedMcpServer,- type SvgIcon,-} from '@core/component/AI/constant/mcpServers';-import { IntegrationRow, SettingsCard, SettingsSection } from './primitives';+import type {+ ServerResponse,+ StartAuthResponse,+} from '@service-cognition/generated/schemas';+import { Button, Dialog, Panel, ToggleSwitch } from '@ui';+import { createEffect, createSignal, For, Show } from 'solid-js';import { ConnectAction } from './integration-ui';+import { IntegrationRow, SettingsCard, SettingsSection } from './primitives';/** Best-effort hostname for an MCP server URL — friendlier than the raw URL. */function hostFromUrl(url: string): string {@@ -147,7 +147,9 @@ function AddServerForm(props: {variant="active"size="sm"depth={3}- disabled={!name().trim() || !url().trim() || addMutation.isPending}+ disabled={+ !name().trim() || !url().trim() || addMutation.isPending+ }onClick={handleSubmit}>{addMutation.isPending ? 'Adding...' : 'Add'}@@ -439,7 +441,9 @@ export function IntegrationsSection() {<Show when={!serversQuery.isError}><SettingsCard>- <For each={servers()}>{(server) => <ServerRow server={server} />}</For>+ <For each={servers()}>+ {(server) => <ServerRow server={server} />}+ </For><For each={suggestions()}>{(server) => <FeaturedServerRow server={server} />}</For>diff --git a/js/app/packages/app/component/settings/Settings.tsx b/js/app/packages/app/component/settings/Settings.tsxindex 1091d1771b..87cd9e24f1 100644--- a/js/app/packages/app/component/settings/Settings.tsx+++ b/js/app/packages/app/component/settings/Settings.tsx@@ -1,3 +1,22 @@+import { Billing } from '@app/component/settings/Billing';+import { useLogout } from '@core/auth/logout';+import { TabsInsetDropdown } from '@core/component/TabsInsetDropdown';+import {+ type SettingsTab,+ settingsTabFromSplitPath,+ useSettingsState,+} from '@core/constant/SettingsState';+import { useSettingsTabs } from '@core/constant/settingsTabsConfig';+import { registerHotkey, useHotkeyDOMScope } from '@core/hotkey/hotkeys';+import type { ValidHotkey } from '@core/hotkey/types';+import { isMobile } from '@core/mobile/isMobile';+import { activeTabId, setActiveTabId } from '@core/signal/settingsTab';+import ArrowsIn from '@phosphor/arrows-in.svg';+import ArrowsOut from '@phosphor/arrows-out.svg';+import CaretLeftIcon from '@phosphor/caret-left.svg';+import SignOutIcon from '@phosphor/sign-out.svg';+import { useLocation } from '@solidjs/router';+import { Button, cn, Layer, SideNav } from '@ui';import {createRenderEffect,createSignal,@@ -8,40 +27,21 @@ import {Suspense,untrack,} from 'solid-js';-import { useLocation } from '@solidjs/router';-import {- type SettingsTab,- settingsTabFromSplitPath,- useSettingsState,-} from '@core/constant/SettingsState';-import { useSettingsTabs } from '@core/constant/settingsTabsConfig';-import { activeTabId, setActiveTabId } from '@core/signal/settingsTab';-import { useLogout } from '@core/auth/logout';-import { isMobile } from '@core/mobile/isMobile';-import { MobileApp } from './MobileApp';-import { Agent } from './Agent';-import { Admin } from './Admin';-import { Appearance } from './Appearance';-import { Account } from './Account';-import { ConnectedAccounts } from './ConnectedAccounts';-import { Shortcuts } from './Shortcuts';-import { Team } from './Team';-import { registerHotkey, useHotkeyDOMScope } from '@core/hotkey/hotkeys';-import type { ValidHotkey } from '@core/hotkey/types';import { FloatRegion } from '../mobile/float-regions/FloatRegion';import { PillTabs } from '../mobile/PillTabs';import { HeaderIsland } from '../split-layout/components/HeaderIsland';-import { TabsInsetDropdown } from '@core/component/TabsInsetDropdown';-import { Button, cn, Layer, SideNav } from '@ui';-import ArrowsIn from '@phosphor/arrows-in.svg';-import ArrowsOut from '@phosphor/arrows-out.svg';-import CaretLeftIcon from '@phosphor/caret-left.svg';-import SignOutIcon from '@phosphor/sign-out.svg';import {SplitHeaderLeft,SplitHeaderRight,} from '../split-layout/components/SplitHeader';-import { Billing } from '@app/component/settings/Billing';+import { Account } from './Account';+import { Admin } from './Admin';+import { Agent } from './Agent';+import { Appearance } from './Appearance';+import { ConnectedAccounts } from './ConnectedAccounts';+import { MobileApp } from './MobileApp';+import { Shortcuts } from './Shortcuts';+import { Team } from './Team';/** Where the settings panel is mounted, which determines its header chrome. */export type SettingsVariant = 'split' | 'fullscreen';@@ -143,19 +143,21 @@ export function SettingsPanel(props: SettingsPanelProps) {}function getCurrentTabIndex() {- return flatTabs().findIndex(tab => tab.tab === activeTabId());+ return flatTabs().findIndex((tab) => tab.tab === activeTabId());}function handleNextTab() {const tabs = flatTabs();- const nextIndex = getCurrentTabIndex() >= tabs.length - 1 ? 0 : getCurrentTabIndex() + 1;+ const nextIndex =+ getCurrentTabIndex() >= tabs.length - 1 ? 0 : getCurrentTabIndex() + 1;navigateToTabIndex(nextIndex);return true;}function handlePreviousTab() {const tabs = flatTabs();- const nextIndex = getCurrentTabIndex() <= 0 ? tabs.length - 1 : getCurrentTabIndex() - 1;+ const nextIndex =+ getCurrentTabIndex() <= 0 ? tabs.length - 1 : getCurrentTabIndex() - 1;navigateToTabIndex(nextIndex);return true;}@@ -181,7 +183,9 @@ export function SettingsPanel(props: SettingsPanelProps) {// Register number keys 1-9 for direct tab navigationfor (let i = 1; i <= 9; i++) {const keyNum = i;- function handleNumberKey() { return navigateToTabIndex(keyNum - 1); }+ function handleNumberKey() {+ return navigateToTabIndex(keyNum - 1);+ }registerHotkey({description: `Go to settings tab ${keyNum}`,hotkey: `${keyNum}` as ValidHotkey,@@ -206,7 +210,10 @@ export function SettingsPanel(props: SettingsPanelProps) {<FloatRegion region="accessory"><div class="flex items-center px-(--mobile-chrome-gutter)"><PillTabs- items={flatTabs().map((tab) => ({ value: tab.tab, label: tab.label }))}+ items={flatTabs().map((tab) => ({+ value: tab.tab,+ label: tab.label,+ }))}value={activeTabId()}onChange={handleTabChange}/>diff --git a/js/app/packages/app/component/settings/SettingsButton.tsx b/js/app/packages/app/component/settings/SettingsButton.tsxindex 713b5501bf..73f3e17802 100644--- a/js/app/packages/app/component/settings/SettingsButton.tsx+++ b/js/app/packages/app/component/settings/SettingsButton.tsx@@ -1,12 +1,9 @@-import { useSettingsState } from "@core/constant/SettingsState";-import { useSplitLayout } from "../split-layout/layout";-import { Show } from "solid-js";-import { Button } from "@ui";-import { cn } from "@ui";--import { TOKENS } from "@core/hotkey/tokens";+import { useSettingsState } from '@core/constant/SettingsState';+import { TOKENS } from '@core/hotkey/tokens';import IconGear from '@icon/macro-gear.svg';-+import { Button, cn } from '@ui';+import { Show } from 'solid-js';+import { useSplitLayout } from '../split-layout/layout';export function SettingsButton() {const { settingsOpen, toggleSettings } = useSettingsState();@@ -23,9 +20,14 @@ export function SettingsButton() {hotkey={TOKENS.global.toggleSettings}onClick={() => toggleSettings()}>- <IconGear class={cn("size-4.5 box-content rounded-full hover:bg-transparent p-1", settingsOpen() && 'bg-accent/20 text-accent hover:text-ink hover:bg-hover',- !settingsOpen() &&- 'hover:text-accent hover:bg-accent/20')} />+ <IconGear+ class={cn(+ 'size-4.5 box-content rounded-full hover:bg-transparent p-1',+ settingsOpen() &&+ 'bg-accent/20 text-accent hover:text-ink hover:bg-hover',+ !settingsOpen() && 'hover:text-accent hover:bg-accent/20'+ )}+ /></Button></Show>);diff --git a/js/app/packages/app/component/settings/SettingsRoute.tsx b/js/app/packages/app/component/settings/SettingsRoute.tsxindex 6c0c57f1bd..f38be2e75f 100644--- a/js/app/packages/app/component/settings/SettingsRoute.tsx+++ b/js/app/packages/app/component/settings/SettingsRoute.tsx@@ -1,5 +1,5 @@-import { settingsSlugToTab } from '@core/constant/settingsTabsConfig';import { useSettingsState } from '@core/constant/SettingsState';+import { settingsSlugToTab } from '@core/constant/settingsTabsConfig';import { Navigate, useParams } from '@solidjs/router';import { Layer } from '@ui';import { createEffect, Show } from 'solid-js';diff --git a/js/app/packages/app/component/settings/Shortcuts.tsx b/js/app/packages/app/component/settings/Shortcuts.tsxindex e6ef58eef2..0d20b7107d 100644--- a/js/app/packages/app/component/settings/Shortcuts.tsx+++ b/js/app/packages/app/component/settings/Shortcuts.tsx@@ -1,8 +1,10 @@-import { createSignal, For, Index, createMemo, type JSX } from 'solid-js';import { IS_MAC } from '@core/constant/isMac';-import { enableScreencastHotkeys, setEnableScreencastHotkeys } from '@ui/components/ScreencastHotkeys';-import { Hotkey, ToggleSwitch } from '@ui';-import { cn } from '@ui';+import { cn, Hotkey, ToggleSwitch } from '@ui';+import {+ enableScreencastHotkeys,+ setEnableScreencastHotkeys,+} from '@ui/components/ScreencastHotkeys';+import { createMemo, createSignal, For, Index, type JSX } from 'solid-js';import { SettingsCard, SettingsPage } from './primitives';interface ShortcutItem {@@ -32,95 +34,799 @@ const CmdOrCtrl = IS_MAC ? 'MetaLeft' : 'ControlLeft';const KEYS: KeyDef[] = [// Row 1: Function keys- { name: 'Escape', label: 'esc', x: 0.0763, y: 0.0763, width: 2.8473, height: 1.8473, labelX: 1.50, labelY: 1.0228 },- { name: 'F1', label: 'F1', x: 3.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 4.00, labelY: 1.0228 },- { name: 'F2', label: 'F2', x: 5.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 6.00, labelY: 1.0228 },- { name: 'F3', label: 'F3', x: 7.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 8.00, labelY: 1.0228 },- { name: 'F4', label: 'F4', x: 9.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 10.00, labelY: 1.0228 },- { name: 'F5', label: 'F5', x: 11.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 12.00, labelY: 1.0228 },- { name: 'F6', label: 'F6', x: 13.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 14.00, labelY: 1.0228 },- { name: 'F7', label: 'F7', x: 15.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 16.00, labelY: 1.0228 },- { name: 'F8', label: 'F8', x: 17.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 18.00, labelY: 1.0228 },- { name: 'F9', label: 'F9', x: 19.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 20.00, labelY: 1.0228 },- { name: 'F10', label: 'F10', x: 21.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 22.00, labelY: 1.0228 },- { name: 'F11', label: 'F11', x: 23.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 24.00, labelY: 1.0228 },- { name: 'F12', label: 'F12', x: 25.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 26.00, labelY: 1.0228 },- { name: 'F13', label: 'F13', x: 27.0763, y: 0.0763, width: 1.8473, height: 1.8473, labelX: 28.00, labelY: 1.0228 },+ {+ name: 'Escape',+ label: 'esc',+ x: 0.0763,+ y: 0.0763,+ width: 2.8473,+ height: 1.8473,+ labelX: 1.5,+ labelY: 1.0228,+ },+ {+ name: 'F1',+ label: 'F1',+ x: 3.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 4.0,+ labelY: 1.0228,+ },+ {+ name: 'F2',+ label: 'F2',+ x: 5.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 6.0,+ labelY: 1.0228,+ },+ {+ name: 'F3',+ label: 'F3',+ x: 7.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 8.0,+ labelY: 1.0228,+ },+ {+ name: 'F4',+ label: 'F4',+ x: 9.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 10.0,+ labelY: 1.0228,+ },+ {+ name: 'F5',+ label: 'F5',+ x: 11.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 12.0,+ labelY: 1.0228,+ },+ {+ name: 'F6',+ label: 'F6',+ x: 13.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 14.0,+ labelY: 1.0228,+ },+ {+ name: 'F7',+ label: 'F7',+ x: 15.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 16.0,+ labelY: 1.0228,+ },+ {+ name: 'F8',+ label: 'F8',+ x: 17.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 18.0,+ labelY: 1.0228,+ },+ {+ name: 'F9',+ label: 'F9',+ x: 19.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 20.0,+ labelY: 1.0228,+ },+ {+ name: 'F10',+ label: 'F10',+ x: 21.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 22.0,+ labelY: 1.0228,+ },+ {+ name: 'F11',+ label: 'F11',+ x: 23.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 24.0,+ labelY: 1.0228,+ },+ {+ name: 'F12',+ label: 'F12',+ x: 25.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 26.0,+ labelY: 1.0228,+ },+ {+ name: 'F13',+ label: 'F13',+ x: 27.0763,+ y: 0.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 28.0,+ labelY: 1.0228,+ },// Row 2: Number row- { name: 'Backquote', label: '`', x: 0.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 1.00, labelY: 3.0228 },- { name: 'Digit1', label: '1', x: 2.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 3.00, labelY: 3.0228 },- { name: 'Digit2', label: '2', x: 4.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 5.00, labelY: 3.0228 },- { name: 'Digit3', label: '3', x: 6.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 7.00, labelY: 3.0228 },- { name: 'Digit4', label: '4', x: 8.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 9.00, labelY: 3.0228 },- { name: 'Digit5', label: '5', x: 10.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 11.00, labelY: 3.0228 },- { name: 'Digit6', label: '6', x: 12.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 13.00, labelY: 3.0228 },- { name: 'Digit7', label: '7', x: 14.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 15.00, labelY: 3.0228 },- { name: 'Digit8', label: '8', x: 16.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 17.00, labelY: 3.0228 },- { name: 'Digit9', label: '9', x: 18.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 19.00, labelY: 3.0228 },- { name: 'Digit0', label: '0', x: 20.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 21.00, labelY: 3.0228 },- { name: 'Minus', label: '-', x: 22.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 23.00, labelY: 3.0228 },- { name: 'Equal', label: '=', x: 24.0763, y: 2.0763, width: 1.8473, height: 1.8473, labelX: 25.00, labelY: 3.0228 },- { name: 'Backspace', label: 'del', x: 26.0763, y: 2.0763, width: 2.8473, height: 1.8473, labelX: 27.50, labelY: 3.0228 },+ {+ name: 'Backquote',+ label: '`',+ x: 0.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 1.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit1',+ label: '1',+ x: 2.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 3.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit2',+ label: '2',+ x: 4.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 5.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit3',+ label: '3',+ x: 6.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 7.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit4',+ label: '4',+ x: 8.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 9.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit5',+ label: '5',+ x: 10.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 11.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit6',+ label: '6',+ x: 12.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 13.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit7',+ label: '7',+ x: 14.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 15.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit8',+ label: '8',+ x: 16.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 17.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit9',+ label: '9',+ x: 18.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 19.0,+ labelY: 3.0228,+ },+ {+ name: 'Digit0',+ label: '0',+ x: 20.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 21.0,+ labelY: 3.0228,+ },+ {+ name: 'Minus',+ label: '-',+ x: 22.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 23.0,+ labelY: 3.0228,+ },+ {+ name: 'Equal',+ label: '=',+ x: 24.0763,+ y: 2.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 25.0,+ labelY: 3.0228,+ },+ {+ name: 'Backspace',+ label: 'del',+ x: 26.0763,+ y: 2.0763,+ width: 2.8473,+ height: 1.8473,+ labelX: 27.5,+ labelY: 3.0228,+ },// Row 3: QWERTY row- { name: 'Tab', label: 'tab', x: 0.0763, y: 4.0763, width: 2.8473, height: 1.8473, labelX: 1.50, labelY: 5.0228 },- { name: 'KeyQ', label: 'Q', x: 3.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 4.00, labelY: 5.0228 },- { name: 'KeyW', label: 'W', x: 5.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 6.00, labelY: 5.0228 },- { name: 'KeyE', label: 'E', x: 7.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 8.00, labelY: 5.0228 },- { name: 'KeyR', label: 'R', x: 9.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 10.00, labelY: 5.0228 },- { name: 'KeyT', label: 'T', x: 11.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 12.00, labelY: 5.0228 },- { name: 'KeyY', label: 'Y', x: 13.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 14.00, labelY: 5.0228 },- { name: 'KeyU', label: 'U', x: 15.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 16.00, labelY: 5.0228 },- { name: 'KeyI', label: 'I', x: 17.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 18.00, labelY: 5.0228 },- { name: 'KeyO', label: 'O', x: 19.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 20.00, labelY: 5.0228 },- { name: 'KeyP', label: 'P', x: 21.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 22.00, labelY: 5.0228 },- { name: 'BracketLeft', label: '[', x: 23.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 24.00, labelY: 5.0228 },- { name: 'BracketRight', label: ']', x: 25.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 26.00, labelY: 5.0228 },- { name: 'Backslash', label: '\\', x: 27.0763, y: 4.0763, width: 1.8473, height: 1.8473, labelX: 28.00, labelY: 5.0228 },+ {+ name: 'Tab',+ label: 'tab',+ x: 0.0763,+ y: 4.0763,+ width: 2.8473,+ height: 1.8473,+ labelX: 1.5,+ labelY: 5.0228,+ },+ {+ name: 'KeyQ',+ label: 'Q',+ x: 3.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 4.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyW',+ label: 'W',+ x: 5.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 6.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyE',+ label: 'E',+ x: 7.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 8.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyR',+ label: 'R',+ x: 9.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 10.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyT',+ label: 'T',+ x: 11.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 12.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyY',+ label: 'Y',+ x: 13.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 14.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyU',+ label: 'U',+ x: 15.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 16.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyI',+ label: 'I',+ x: 17.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 18.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyO',+ label: 'O',+ x: 19.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 20.0,+ labelY: 5.0228,+ },+ {+ name: 'KeyP',+ label: 'P',+ x: 21.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 22.0,+ labelY: 5.0228,+ },+ {+ name: 'BracketLeft',+ label: '[',+ x: 23.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 24.0,+ labelY: 5.0228,+ },+ {+ name: 'BracketRight',+ label: ']',+ x: 25.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 26.0,+ labelY: 5.0228,+ },+ {+ name: 'Backslash',+ label: '\\',+ x: 27.0763,+ y: 4.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 28.0,+ labelY: 5.0228,+ },// Row 4: Home row- { name: 'CapsLock', label: 'caps', x: 0.0763, y: 6.0763, width: 3.3473, height: 1.8473, labelX: 1.75, labelY: 7.0228 },- { name: 'KeyA', label: 'A', x: 3.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 4.50, labelY: 7.0228 },- { name: 'KeyS', label: 'S', x: 5.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 6.50, labelY: 7.0228 },- { name: 'KeyD', label: 'D', x: 7.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 8.50, labelY: 7.0228 },- { name: 'KeyF', label: 'F', x: 9.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 10.50, labelY: 7.0228 },- { name: 'KeyG', label: 'G', x: 11.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 12.50, labelY: 7.0228 },- { name: 'KeyH', label: 'H', x: 13.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 14.50, labelY: 7.0228 },- { name: 'KeyJ', label: 'J', x: 15.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 16.50, labelY: 7.0228 },- { name: 'KeyK', label: 'K', x: 17.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 18.50, labelY: 7.0228 },- { name: 'KeyL', label: 'L', x: 19.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 20.50, labelY: 7.0228 },- { name: 'Semicolon', label: ';', x: 21.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 22.50, labelY: 7.0228 },- { name: 'Quote', label: "'", x: 23.5763, y: 6.0763, width: 1.8473, height: 1.8473, labelX: 24.50, labelY: 7.0228 },- { name: 'Enter', label: 'enter', x: 25.5763, y: 6.0763, width: 3.3473, height: 1.8473, labelX: 27.25, labelY: 7.0228 },+ {+ name: 'CapsLock',+ label: 'caps',+ x: 0.0763,+ y: 6.0763,+ width: 3.3473,+ height: 1.8473,+ labelX: 1.75,+ labelY: 7.0228,+ },+ {+ name: 'KeyA',+ label: 'A',+ x: 3.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 4.5,+ labelY: 7.0228,+ },+ {+ name: 'KeyS',+ label: 'S',+ x: 5.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 6.5,+ labelY: 7.0228,+ },+ {+ name: 'KeyD',+ label: 'D',+ x: 7.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 8.5,+ labelY: 7.0228,+ },+ {+ name: 'KeyF',+ label: 'F',+ x: 9.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 10.5,+ labelY: 7.0228,+ },+ {+ name: 'KeyG',+ label: 'G',+ x: 11.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 12.5,+ labelY: 7.0228,+ },+ {+ name: 'KeyH',+ label: 'H',+ x: 13.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 14.5,+ labelY: 7.0228,+ },+ {+ name: 'KeyJ',+ label: 'J',+ x: 15.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 16.5,+ labelY: 7.0228,+ },+ {+ name: 'KeyK',+ label: 'K',+ x: 17.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 18.5,+ labelY: 7.0228,+ },+ {+ name: 'KeyL',+ label: 'L',+ x: 19.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 20.5,+ labelY: 7.0228,+ },+ {+ name: 'Semicolon',+ label: ';',+ x: 21.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 22.5,+ labelY: 7.0228,+ },+ {+ name: 'Quote',+ label: "'",+ x: 23.5763,+ y: 6.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 24.5,+ labelY: 7.0228,+ },+ {+ name: 'Enter',+ label: 'enter',+ x: 25.5763,+ y: 6.0763,+ width: 3.3473,+ height: 1.8473,+ labelX: 27.25,+ labelY: 7.0228,+ },// Row 5: Bottom letter row- { name: 'ShiftLeft', label: 'shift', x: 0.0763, y: 8.0763, width: 4.3473, height: 1.8473, labelX: 2.25, labelY: 9.0228 },- { name: 'KeyZ', label: 'Z', x: 4.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 5.50, labelY: 9.0228 },- { name: 'KeyX', label: 'X', x: 6.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 7.50, labelY: 9.0228 },- { name: 'KeyC', label: 'C', x: 8.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 9.50, labelY: 9.0228 },- { name: 'KeyV', label: 'V', x: 10.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 11.50, labelY: 9.0228 },- { name: 'KeyB', label: 'B', x: 12.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 13.50, labelY: 9.0228 },- { name: 'KeyN', label: 'N', x: 14.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 15.50, labelY: 9.0228 },- { name: 'KeyM', label: 'M', x: 16.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 17.50, labelY: 9.0228 },- { name: 'Comma', label: ',', x: 18.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 19.50, labelY: 9.0228 },- { name: 'Period', label: '.', x: 20.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 21.50, labelY: 9.0228 },- { name: 'Slash', label: '/', x: 22.5763, y: 8.0763, width: 1.8473, height: 1.8473, labelX: 23.50, labelY: 9.0228 },- { name: 'ShiftRight', label: 'shift', x: 24.5763, y: 8.0763, width: 4.3473, height: 1.8473, labelX: 26.75, labelY: 9.0228 },+ {+ name: 'ShiftLeft',+ label: 'shift',+ x: 0.0763,+ y: 8.0763,+ width: 4.3473,+ height: 1.8473,+ labelX: 2.25,+ labelY: 9.0228,+ },+ {+ name: 'KeyZ',+ label: 'Z',+ x: 4.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 5.5,+ labelY: 9.0228,+ },+ {+ name: 'KeyX',+ label: 'X',+ x: 6.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 7.5,+ labelY: 9.0228,+ },+ {+ name: 'KeyC',+ label: 'C',+ x: 8.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 9.5,+ labelY: 9.0228,+ },+ {+ name: 'KeyV',+ label: 'V',+ x: 10.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 11.5,+ labelY: 9.0228,+ },+ {+ name: 'KeyB',+ label: 'B',+ x: 12.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 13.5,+ labelY: 9.0228,+ },+ {+ name: 'KeyN',+ label: 'N',+ x: 14.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 15.5,+ labelY: 9.0228,+ },+ {+ name: 'KeyM',+ label: 'M',+ x: 16.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 17.5,+ labelY: 9.0228,+ },+ {+ name: 'Comma',+ label: ',',+ x: 18.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 19.5,+ labelY: 9.0228,+ },+ {+ name: 'Period',+ label: '.',+ x: 20.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 21.5,+ labelY: 9.0228,+ },+ {+ name: 'Slash',+ label: '/',+ x: 22.5763,+ y: 8.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 23.5,+ labelY: 9.0228,+ },+ {+ name: 'ShiftRight',+ label: 'shift',+ x: 24.5763,+ y: 8.0763,+ width: 4.3473,+ height: 1.8473,+ labelX: 26.75,+ labelY: 9.0228,+ },// Row 6: Bottom row- { name: 'Fn', label: 'fn', x: 0.0763, y: 10.0763, width: 1.8473, height: 1.8473, labelX: 1.00, labelY: 11.0228 },- { name: 'ControlLeft', label: 'ctrl', x: 2.0763, y: 10.0763, width: 1.8473, height: 1.8473, labelX: 3.00, labelY: 11.0228 },- { name: 'AltLeft', label: 'opt', x: 4.0763, y: 10.0763, width: 1.8473, height: 1.8473, labelX: 5.00, labelY: 11.0228 },- { name: 'MetaLeft', label: 'cmd', x: 6.0763, y: 10.0763, width: 2.3473, height: 1.8473, labelX: 7.25, labelY: 11.0228 },- { name: 'Space', label: 'space', x: 8.5763, y: 10.0763, width: 9.8473, height: 1.8473, labelX: 13.50, labelY: 11.0228 },- { name: 'MetaRight', label: 'cmd', x: 18.5763, y: 10.0763, width: 2.3473, height: 1.8473, labelX: 19.75, labelY: 11.0228 },- { name: 'AltRight', label: 'opt', x: 21.0763, y: 10.0763, width: 1.8473, height: 1.8473, labelX: 22.00, labelY: 11.0228 },- { name: 'ArrowLeft', label: '◂', x: 23.0763, y: 10.0763, width: 1.8473, height: 1.8473, labelX: 24.00, labelY: 11.0228 },- { name: 'ArrowUp', label: '▴', x: 25.0763, y: 10.0763, width: 1.8473, height: 0.8473, labelX: 26.00, labelY: 10.5000 },- { name: 'ArrowDown', label: '▾', x: 25.0763, y: 11.0763, width: 1.8473, height: 0.8473, labelX: 26.00, labelY: 11.5000 },- { name: 'ArrowRight', label: '▸', x: 27.0763, y: 10.0763, width: 1.8473, height: 1.8473, labelX: 28.00, labelY: 11.0228 },+ {+ name: 'Fn',+ label: 'fn',+ x: 0.0763,+ y: 10.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 1.0,+ labelY: 11.0228,+ },+ {+ name: 'ControlLeft',+ label: 'ctrl',+ x: 2.0763,+ y: 10.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 3.0,+ labelY: 11.0228,+ },+ {+ name: 'AltLeft',+ label: 'opt',+ x: 4.0763,+ y: 10.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 5.0,+ labelY: 11.0228,+ },+ {+ name: 'MetaLeft',+ label: 'cmd',+ x: 6.0763,+ y: 10.0763,+ width: 2.3473,+ height: 1.8473,+ labelX: 7.25,+ labelY: 11.0228,+ },+ {+ name: 'Space',+ label: 'space',+ x: 8.5763,+ y: 10.0763,+ width: 9.8473,+ height: 1.8473,+ labelX: 13.5,+ labelY: 11.0228,+ },+ {+ name: 'MetaRight',+ label: 'cmd',+ x: 18.5763,+ y: 10.0763,+ width: 2.3473,+ height: 1.8473,+ labelX: 19.75,+ labelY: 11.0228,+ },+ {+ name: 'AltRight',+ label: 'opt',+ x: 21.0763,+ y: 10.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 22.0,+ labelY: 11.0228,+ },+ {+ name: 'ArrowLeft',+ label: '◂',+ x: 23.0763,+ y: 10.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 24.0,+ labelY: 11.0228,+ },+ {+ name: 'ArrowUp',+ label: '▴',+ x: 25.0763,+ y: 10.0763,+ width: 1.8473,+ height: 0.8473,+ labelX: 26.0,+ labelY: 10.5,+ },+ {+ name: 'ArrowDown',+ label: '▾',+ x: 25.0763,+ y: 11.0763,+ width: 1.8473,+ height: 0.8473,+ labelX: 26.0,+ labelY: 11.5,+ },+ {+ name: 'ArrowRight',+ label: '▸',+ x: 27.0763,+ y: 10.0763,+ width: 1.8473,+ height: 1.8473,+ labelX: 28.0,+ labelY: 11.0228,+ },];function KeyRect(props: { def: KeyDef; active: boolean }) {const stroke = () => (props.active ? 'var(--a0)' : 'var(--b4)');const fill = () =>- props.active ? 'oklch(from var(--a0) l c h / 0.1)' : 'oklch(from var(--b2) l c h / 0.1)';+ props.active+ ? 'oklch(from var(--a0) l c h / 0.1)'+ : 'oklch(from var(--b2) l c h / 0.1)';return (<>@@ -138,8 +844,8 @@ function KeyRect(props: { def: KeyDef; active: boolean }) {'dominant-baseline': 'central','text-anchor': 'middle','font-size': '0.4',- 'stroke': 'none',- 'fill': stroke(),+ stroke: 'none',+ fill: stroke(),}}x={props.def.labelX}y={props.def.labelY}@@ -161,9 +867,9 @@ function Keyboard(props: { keys?: string[] }): JSX.Element {'box-sizing': 'border-box','stroke-linecap': 'round','stroke-width': '0.0572',- 'display': 'block',- 'width': '100%',- 'fill': 'none',+ display: 'block',+ width: '100%',+ fill: 'none',}}viewBox="0 0 29 12">@@ -174,47 +880,110 @@ function Keyboard(props: { keys?: string[] }): JSX.Element {);}-const shortcutSections: ShortcutSection[] = [{title: 'Core',items: [- { keys: [`${cmdOrCtrl}+k`], codes: [CmdOrCtrl, 'KeyK'] , description: 'Open the command menu' },- { keys: [`${cmdOrCtrl}+f`], codes: [CmdOrCtrl, 'KeyF'] , description: 'Search in current view' },- { keys: ['c'] , codes: ['KeyC'] , description: 'Open the create menu' },- { keys: [`${cmdOrCtrl}+;`], codes: [CmdOrCtrl, 'Semicolon'] , description: 'Open settings panel' },- { keys: ['/'] , codes: ['Slash'] , description: 'Go to search view' },- { keys: [`${cmdOrCtrl}+j`], codes: [CmdOrCtrl, 'KeyJ'] , description: 'Focus AI chat' },- { keys: ['g'] , codes: ['KeyG'] , description: 'Go to a view' },+ {+ keys: [`${cmdOrCtrl}+k`],+ codes: [CmdOrCtrl, 'KeyK'],+ description: 'Open the command menu',+ },+ {+ keys: [`${cmdOrCtrl}+f`],+ codes: [CmdOrCtrl, 'KeyF'],+ description: 'Search in current view',+ },+ { keys: ['c'], codes: ['KeyC'], description: 'Open the create menu' },+ {+ keys: [`${cmdOrCtrl}+;`],+ codes: [CmdOrCtrl, 'Semicolon'],+ description: 'Open settings panel',+ },+ { keys: ['/'], codes: ['Slash'], description: 'Go to search view' },+ {+ keys: [`${cmdOrCtrl}+j`],+ codes: [CmdOrCtrl, 'KeyJ'],+ description: 'Focus AI chat',+ },+ { keys: ['g'], codes: ['KeyG'], description: 'Go to a view' },],},{title: 'Splits',items: [- { keys: ['opt+['] , codes: ['AltLeft', 'BracketLeft'] , description: 'Go back in current split' },- { keys: ['opt+]'] , codes: ['AltLeft', 'BracketRight'] , description: 'Go forward in current split' },- { keys: ['shift+arrowleft'] , codes: ['ShiftLeft', 'ArrowLeft'] , description: 'Focus split to the left' },- { keys: ['shift+arrowright'], codes: ['ShiftLeft', 'ArrowRight'] , description: 'Focus split to the right' },- { keys: ['cmd+escape'] , codes: ['MetaLeft', 'Escape'] , description: 'Go home / close split' },- { keys: ['shift+escape'] , codes: ['ShiftLeft', 'Escape'] , description: 'Spotlight split' },- { keys: ['\\'] , codes: ['Backslash'] , description: 'Create a split' },+ {+ keys: ['opt+['],+ codes: ['AltLeft', 'BracketLeft'],+ description: 'Go back in current split',+ },+ {+ keys: ['opt+]'],+ codes: ['AltLeft', 'BracketRight'],+ description: 'Go forward in current split',+ },+ {+ keys: ['shift+arrowleft'],+ codes: ['ShiftLeft', 'ArrowLeft'],+ description: 'Focus split to the left',+ },+ {+ keys: ['shift+arrowright'],+ codes: ['ShiftLeft', 'ArrowRight'],+ description: 'Focus split to the right',+ },+ {+ keys: ['cmd+escape'],+ codes: ['MetaLeft', 'Escape'],+ description: 'Go home / close split',+ },+ {+ keys: ['shift+escape'],+ codes: ['ShiftLeft', 'Escape'],+ description: 'Spotlight split',+ },+ { keys: ['\\'], codes: ['Backslash'], description: 'Create a split' },],},{title: 'Unified List',items: [- { keys: ['enter'] , codes: ['Enter'] , description: 'Open item in current split' },- { keys: ['shift+enter'] , codes: ['ShiftLeft', 'Enter'] , description: 'Open item in a new split' },- { keys: ['arrowup'] , codes: ['ArrowUp'] , description: 'Move up' },- { keys: ['arrowdown'] , codes: ['ArrowDown'] , description: 'Move down' },- { keys: ['shift+arrowup'] , codes: ['ShiftLeft', 'ArrowUp'] , description: 'Select up' },- { keys: ['shift+arrowdown'], codes: ['ShiftLeft', 'ArrowDown'] , description: 'Select down' },- { keys: ['arrowleft'] , codes: ['ArrowLeft'] , description: 'Collapse item' },- { keys: ['arrowright'] , codes: ['ArrowRight'] , description: 'Expand item' },- { keys: ['space'] , codes: ['Space'] , description: 'Preview item' },- { keys: ['f'] , codes: ['KeyF'] , description: 'Open filter menu' },- { keys: ['x'] , codes: ['KeyX'] , description: 'Select items' },- { keys: ['e'] , codes: ['KeyE'] , description: 'Mark done' },+ {+ keys: ['enter'],+ codes: ['Enter'],+ description: 'Open item in current split',+ },+ {+ keys: ['shift+enter'],+ codes: ['ShiftLeft', 'Enter'],+ description: 'Open item in a new split',+ },+ { keys: ['arrowup'], codes: ['ArrowUp'], description: 'Move up' },+ { keys: ['arrowdown'], codes: ['ArrowDown'], description: 'Move down' },+ {+ keys: ['shift+arrowup'],+ codes: ['ShiftLeft', 'ArrowUp'],+ description: 'Select up',+ },+ {+ keys: ['shift+arrowdown'],+ codes: ['ShiftLeft', 'ArrowDown'],+ description: 'Select down',+ },+ {+ keys: ['arrowleft'],+ codes: ['ArrowLeft'],+ description: 'Collapse item',+ },+ {+ keys: ['arrowright'],+ codes: ['ArrowRight'],+ description: 'Expand item',+ },+ { keys: ['space'], codes: ['Space'], description: 'Preview item' },+ { keys: ['f'], codes: ['KeyF'], description: 'Open filter menu' },+ { keys: ['x'], codes: ['KeyX'], description: 'Select items' },+ { keys: ['e'], codes: ['KeyE'], description: 'Mark done' },],},];@@ -249,7 +1018,9 @@ function ShortcutRow(props: { item: ShortcutItem; spacer?: string }) {<><Kbd shortcut={key()} />{props.spacer && index < props.item.keys.length - 1 && (- <span class="text-ink-muted text-xs lowercase px-1">{props.spacer}</span>+ <span class="text-ink-muted text-xs lowercase px-1">+ {props.spacer}+ </span>)}</>)}diff --git a/js/app/packages/app/component/settings/SignatureEditor.tsx b/js/app/packages/app/component/settings/SignatureEditor.tsxindex 25899c2522..15dfa93aad 100644--- a/js/app/packages/app/component/settings/SignatureEditor.tsx+++ b/js/app/packages/app/component/settings/SignatureEditor.tsx@@ -2,7 +2,10 @@ import 'quill/dist/quill.snow.css';import './SignatureEditor.css';import { toast } from '@core/component/Toast/Toast';import { staticFileIdEndpoint } from '@core/constant/servers';-import { createStaticUploadFile, createUploadFile } from '@core/util/uploadFile';+import {+ createStaticUploadFile,+ createUploadFile,+} from '@core/util/uploadFile';import { Tooltip } from '@ui';import Quill, { type Parchment } from 'quill';import { createEffect, For, onCleanup, onMount } from 'solid-js';@@ -111,7 +114,11 @@ export default function SignatureEditor(props: {// getSemanticHTML drops the placeholder <br> from blank lines, and with// margins zeroed an empty <p> collapses to nothing — put the <br> back so// blank separator lines keep their one-line height in the sent email.- if (el.tagName === 'P' && !el.textContent && !el.querySelector('br, img')) {+ if (+ el.tagName === 'P' &&+ !el.textContent &&+ !el.querySelector('br, img')+ ) {el.append(doc.createElement('br'));}}diff --git a/js/app/packages/app/component/settings/SignatureSection.tsx b/js/app/packages/app/component/settings/SignatureSection.tsxindex d61c6f55f3..4888d3cc26 100644--- a/js/app/packages/app/component/settings/SignatureSection.tsx+++ b/js/app/packages/app/component/settings/SignatureSection.tsx@@ -94,8 +94,7 @@ export function SignatureSection(props: { link: EmailLink }) {const isDirty = () => draft() !== null && draft() !== persisted();// Enabled when there's a saved signature or unsaved draft text to clear — so// "Remove" stays available even after the user manually empties the editor.- const hasContent = () =>- persisted().length > 0 || (draft()?.length ?? 0) > 0;+ const hasContent = () => persisted().length > 0 || (draft()?.length ?? 0) > 0;const updateSettings = useUpdateEmailSettingsMutation();// Imperative handle to the editor, so Save/Remove sync its content directly@@ -180,7 +179,9 @@ export function SignatureSection(props: { link: EmailLink }) {checked={props.link.settings.signature_on_replies_forwards ?? false}onChange={setOnRepliesForwards}label={- <span class="text-sm text-ink-muted">Add to replies & forwards</span>+ <span class="text-sm text-ink-muted">+ Add to replies & forwards+ </span>}/><div class="flex items-center gap-2">diff --git a/js/app/packages/app/component/settings/Team.tsx b/js/app/packages/app/component/settings/Team.tsxindex bc7746bdcd..e29b7b642b 100644--- a/js/app/packages/app/component/settings/Team.tsx+++ b/js/app/packages/app/component/settings/Team.tsx@@ -1,71 +1,67 @@+import { useFeatureFlag } from '@app/lib/analytics/posthog';+import { useHasPaidAccess } from '@core/auth/license';import { UserIcon } from '@core/component/UserIcon';-import PlusIcon from '@phosphor/plus.svg';-import UsersIcon from '@phosphor/users.svg';-import TrashIcon from '@phosphor/trash.svg';-import SpinnerIcon from '@phosphor/spinner.svg';-import EnvelopeIcon from '@phosphor/envelope.svg';-import XIcon from '@phosphor/x.svg';-import LinkIcon from '@phosphor/link.svg';+import { PaywallKey, usePaywallState } from '@core/constant/PaywallState';+import { useUserId } from '@core/context/user';+import { macroIdToEmail, tryMacroId, useDisplayName } from '@core/user';+import { debouncedDependent } from '@core/util/debounce';+import { fuzzyFilter } from '@core/util/fuzzy';+import { getWebOrigin } from '@core/util/webOrigin';+import { formatRelativeTimestamp } from '@entity';+import type { CollectionNode } from '@kobalte/core';+import { Select } from '@kobalte/core/select';import CaretDownIcon from '@phosphor/caret-down.svg';import CheckIcon from '@phosphor/check.svg';+import EnvelopeIcon from '@phosphor/envelope.svg';+import LinkIcon from '@phosphor/link.svg';import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';--import { Tooltip } from '@ui';-import { Button } from '@ui';-import { Dialog, Panel } from '@ui';-import { cn } from '@ui';+import PlusIcon from '@phosphor/plus.svg';+import SpinnerIcon from '@phosphor/spinner.svg';+import TrashIcon from '@phosphor/trash.svg';+import UsersIcon from '@phosphor/users.svg';+import XIcon from '@phosphor/x.svg';import {- SettingsCard,- SettingsPage,- SettingsRow,- SettingsSection,-} from './primitives';-import { Select } from '@kobalte/core/select';-import { useUserId } from '@core/context/user';-import { getWebOrigin } from '@core/util/webOrigin';-import { useDisplayName, tryMacroId, macroIdToEmail } from '@core/user';+ useJoinTeamMutation,+ useRejectInvitationMutation,+ useUserInvitesQuery,+} from '@queries/team/invitations';+import {+ useDeleteTeamInviteMutation,+ useInviteToTeamMutation,+ useTeamInvitesQuery,+} from '@queries/team/invites';+import { useRemoveUserFromTeamMutation } from '@queries/team/members';+import {+ useCreateTeamWithInvitesMutation,+ useDeleteTeamMutation,+ usePatchTeamMutation,+ useTeamQuery,+ useUserTeamsQuery,+} from '@queries/team/teams';+import type { TeamInviteDetails } from '@service-auth/generated/schemas/teamInviteDetails';+import type { TeamMember } from '@service-auth/generated/schemas/teamMember';+import { TeamRole } from '@service-auth/generated/schemas/teamRole';+import { Button, cn, Dialog, Panel, Tooltip } from '@ui';import {createMemo,createSignal,For,Index,- mapArray,Match,+ mapArray,onCleanup,Show,Suspense,Switch,} from 'solid-js';-import type { CollectionNode } from '@kobalte/core';-import {- useUserTeamsQuery,- useTeamQuery,- usePatchTeamMutation,- useDeleteTeamMutation,- useCreateTeamWithInvitesMutation,-} from '@queries/team/teams';-import {- useTeamInvitesQuery,- useDeleteTeamInviteMutation,- useInviteToTeamMutation,-} from '@queries/team/invites';-import {- useUserInvitesQuery,- useJoinTeamMutation,- useRejectInvitationMutation,-} from '@queries/team/invitations';-import { useRemoveUserFromTeamMutation } from '@queries/team/members';-import { TeamRole } from '@service-auth/generated/schemas/teamRole';-import type { TeamMember } from '@service-auth/generated/schemas/teamMember';-import type { TeamInviteDetails } from '@service-auth/generated/schemas/teamInviteDetails';-import { formatRelativeTimestamp } from '@entity';-import { useHasPaidAccess } from '@core/auth/license';-import { PaywallKey, usePaywallState } from '@core/constant/PaywallState';-import { useFeatureFlag } from '@app/lib/analytics/posthog';import { z } from 'zod';+import {+ SettingsCard,+ SettingsPage,+ SettingsRow,+ SettingsSection,+} from './primitives';import { getTeamSlugError, normalizeTeamSlugInput } from './teamSlug';-import { debouncedDependent } from '@core/util/debounce';-import { fuzzyFilter } from '@core/util/fuzzy';function useRequiresPaidUpgrade() {const hasPaidAccess = useHasPaidAccess();@@ -396,7 +392,7 @@ function InviteRow(props: {const handleCopyLink = async () => {try {await navigator.clipboard.writeText(- `${getWebOrigin()}/app/team-invite?id=${props.invite.id}`,+ `${getWebOrigin()}/app/team-invite?id=${props.invite.id}`);} catch (err) {console.error('Failed to copy to clipboard', err);@@ -787,7 +783,12 @@ const TEAM_FIELD_CLASS = 'settings-input w-56 mobile:w-32';function ReadOnlyField(props: { value: string; tooltip: string }) {return (<Tooltip label={props.tooltip} placement="top">- <input type="text" value={props.value} disabled class={TEAM_FIELD_CLASS} />+ <input+ type="text"+ value={props.value}+ disabled+ class={TEAM_FIELD_CLASS}+ /></Tooltip>);}@@ -1319,9 +1320,7 @@ function TeamManagement(props: {</Show></SettingsSection>- <Show- when={isOwner() && (invitesQuery.data?.invites?.length ?? 0) > 0}- >+ <Show when={isOwner() && (invitesQuery.data?.invites?.length ?? 0) > 0}><SettingsSection title="Pending invites"><SettingsCard><For each={invitesQuery.data?.invites ?? []}>diff --git a/js/app/packages/app/component/settings/entryAssetInfo.ts b/js/app/packages/app/component/settings/entryAssetInfo.tsindex 8a6b3e05f0..bef43a8c70 100644--- a/js/app/packages/app/component/settings/entryAssetInfo.ts+++ b/js/app/packages/app/component/settings/entryAssetInfo.ts@@ -45,7 +45,8 @@ export async function loadEntryAssetInfo(): Promise<EntryAssetInfo> {try {const indexUrl = new URL('index.html', loadedEntryUrl);indexUrl.searchParams.set('__macro_bundle_probe', Date.now().toString());- const browserFetch = window.__MACRO_BROWSER_FETCH__ ?? window.fetch.bind(window);+ const browserFetch =+ window.__MACRO_BROWSER_FETCH__ ?? window.fetch.bind(window);const response = await browserFetch(indexUrl.href, { cache: 'no-store' });if (!response.ok) {throw new Error(`Fresh index fetch failed with ${response.status}`);diff --git a/js/app/packages/app/component/settings/integration-ui.tsx b/js/app/packages/app/component/settings/integration-ui.tsxindex d21126dc1b..735d5761a1 100644--- a/js/app/packages/app/component/settings/integration-ui.tsx+++ b/js/app/packages/app/component/settings/integration-ui.tsx@@ -1,7 +1,7 @@-import { cn } from '@ui';-import { Show } from 'solid-js';import ArrowUpRightIcon from '@phosphor/arrow-up-right.svg';import SpinnerIcon from '@phosphor/spinner-gap.svg';+import { cn } from '@ui';+import { Show } from 'solid-js';/** Shared bits for the Connected accounts integration cards: the trailingdiff --git a/js/app/packages/app/component/settings/primitives.tsx b/js/app/packages/app/component/settings/primitives.tsxindex 8909a5d0b8..d85fcdb40d 100644--- a/js/app/packages/app/component/settings/primitives.tsx+++ b/js/app/packages/app/component/settings/primitives.tsx@@ -1,5 +1,5 @@-import { type JSX, Show } from 'solid-js';import { cn, Layer } from '@ui';+import { type JSX, Show } from 'solid-js';/** Shared building blocks for the settings panels. Every settings tab composesdiff --git a/js/app/packages/app/component/settings/teamSlug.test.ts b/js/app/packages/app/component/settings/teamSlug.test.tsindex 1e576bf32d..538aaa571b 100644--- a/js/app/packages/app/component/settings/teamSlug.test.ts+++ b/js/app/packages/app/component/settings/teamSlug.test.ts@@ -1,17 +1,15 @@import { describe, expect, it } from 'vitest';import {+ getTeamSlugError,+ normalizeTeamSlugInput,TEAM_SLUG_ALLOWED_INPUT_REGEX,TEAM_SLUG_MAX_LENGTH,TEAM_SLUG_NORMALIZED_REGEX,- getTeamSlugError,- normalizeTeamSlugInput,} from './teamSlug.ts';describe('team slug validation', function () {it('uses an explicit allowed-input regex for backend-accepted characters', function () {- expect(TEAM_SLUG_ALLOWED_INPUT_REGEX.test('abc XYZ_- \t\n\f\r')).toBe(- true- );+ expect(TEAM_SLUG_ALLOWED_INPUT_REGEX.test('abc XYZ_- \t\n\f\r')).toBe(true);expect(TEAM_SLUG_ALLOWED_INPUT_REGEX.test('abc123')).toBe(false);expect(TEAM_SLUG_ALLOWED_INPUT_REGEX.test('bad.slug')).toBe(false);expect(TEAM_SLUG_ALLOWED_INPUT_REGEX.test('café')).toBe(false);@@ -40,9 +38,7 @@ describe('team slug validation', function () {it('rejects empty and separator-only input', function () {expect(getTeamSlugError('')).toBe('team slug cannot be empty');- expect(getTeamSlugError(' -__\t\n\f\r')).toBe(- 'team slug cannot be empty'- );+ expect(getTeamSlugError(' -__\t\n\f\r')).toBe('team slug cannot be empty');});it('rejects digits', function () {diff --git a/js/app/packages/app/component/settings/teamSlug.ts b/js/app/packages/app/component/settings/teamSlug.tsindex 81af131ea8..4c9c6697cb 100644--- a/js/app/packages/app/component/settings/teamSlug.ts+++ b/js/app/packages/app/component/settings/teamSlug.ts@@ -1,7 +1,6 @@export const TEAM_SLUG_MAX_LENGTH = 20;-export const TEAM_SLUG_ALLOWED_INPUT_REGEX: RegExp =- /^[A-Za-z_\- \t\n\f\r]*$/;+export const TEAM_SLUG_ALLOWED_INPUT_REGEX: RegExp = /^[A-Za-z_\- \t\n\f\r]*$/;export const TEAM_SLUG_NORMALIZED_REGEX: RegExp = /^[A-Z]+(_[A-Z]+)*$/;