diff --git a/src/renderer/src/components/use-worktree-jump-palette-list-entries.ts b/src/renderer/src/components/use-worktree-jump-palette-list-entries.ts index 3fbb18483ff..074794c148f 100644 --- a/src/renderer/src/components/use-worktree-jump-palette-list-entries.ts +++ b/src/renderer/src/components/use-worktree-jump-palette-list-entries.ts @@ -44,11 +44,7 @@ export function useWorktreeJumpPaletteListEntries({ multiPrimaryFirstScreen, multiPrimaryLayout } = paletteSections - const pushOverflowHint = ( - id: string, - overflowCount: number, - onSeeMore?: () => void - ): void => { + const pushOverflowHint = (id: string, overflowCount: number, onSeeMore?: () => void): void => { if (overflowCount > 0) { entries.push({ id, @@ -238,8 +234,7 @@ export function useWorktreeJumpPaletteListEntries({ openTabsLeadSections, paletteSections, showCreateAction, - taskSourceUrl, - + taskSourceUrl ]) const selectableItems = useMemo( () => diff --git a/src/renderer/src/components/use-worktree-jump-palette-quick-actions.ts b/src/renderer/src/components/use-worktree-jump-palette-quick-actions.ts index 0a9ca455e24..c6cf2c48d05 100644 --- a/src/renderer/src/components/use-worktree-jump-palette-quick-actions.ts +++ b/src/renderer/src/components/use-worktree-jump-palette-quick-actions.ts @@ -25,7 +25,11 @@ function getComposerPrefetchRepoId( return resolveComposerGitRepoId({ eligibleRepos: getComposerEligibleRepos(state.repos), initialRepoId, - activeRepoId: resolveComposerActiveRepoId(state.repos, getComposerEligibleRepos(state.repos), state.activeRepoId), + activeRepoId: resolveComposerActiveRepoId( + state.repos, + getComposerEligibleRepos(state.repos), + state.activeRepoId + ), focusedHostScope: state.workspaceHostScope }) } diff --git a/src/renderer/src/components/use-worktree-jump-palette-task-url.ts b/src/renderer/src/components/use-worktree-jump-palette-task-url.ts index ae78d1bfee7..7d4d735bb36 100644 --- a/src/renderer/src/components/use-worktree-jump-palette-task-url.ts +++ b/src/renderer/src/components/use-worktree-jump-palette-task-url.ts @@ -1,10 +1,17 @@ import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react' import { useAppStore } from '@/store' -import { getComposerEligibleRepos, resolveComposerActiveRepoId } from '@/lib/new-workspace-composer-repo' +import { + getComposerEligibleRepos, + resolveComposerActiveRepoId +} from '@/lib/new-workspace-composer-repo' import { resolveWorkspaceCreationTarget } from '@/lib/project-host-workspace-target' import { lookupCmdJGitHubUrlWorkItem } from '@/lib/cmd-j-github-url-lookup' import { lookupLinearIssueUrl } from '@/lib/linear-issue-url-lookup' -import { withResolvedCmdJGitHubPreview, type CmdJTaskSourceUrl, getCmdJTaskUrlCreatePreview } from '@/lib/worktree-palette-task-url-match' +import { + withResolvedCmdJGitHubPreview, + type CmdJTaskSourceUrl, + getCmdJTaskUrlCreatePreview +} from '@/lib/worktree-palette-task-url-match' import type { GitHubWorkItem } from '../../../shared/github/work-item-types' import type { LinearIssue } from '../../../shared/linear/issue-types' import type { TaskSourceContext } from '../../../shared/task-source-context' @@ -60,8 +67,14 @@ export function useWorktreeJumpPaletteTaskUrl({ const [linearIssuePreview, setLinearIssuePreview] = useState(null) const [githubWorkItemPreview, setGithubWorkItemPreview] = useState(null) - const linearLookupRef = useRef<{ query: string; promise: Promise } | null>(null) - const githubLookupRef = useRef<{ query: string; promise: Promise } | null>(null) + const linearLookupRef = useRef<{ + query: string + promise: Promise + } | null>(null) + const githubLookupRef = useRef<{ + query: string + promise: Promise + } | null>(null) const linearGenerationRef = useRef(0) const githubGenerationRef = useRef(0) diff --git a/src/renderer/src/components/worktree-jump-palette-entry.tsx b/src/renderer/src/components/worktree-jump-palette-entry.tsx index 910a09e1b9c..9ed2208dba8 100644 --- a/src/renderer/src/components/worktree-jump-palette-entry.tsx +++ b/src/renderer/src/components/worktree-jump-palette-entry.tsx @@ -78,19 +78,39 @@ export function WorktreeJumpPaletteEntry({ ) } if (entry.type === 'worktree') { - return + return ( + + ) } if (entry.type === 'project-target') { - return + return ( + + ) } if (entry.type === 'settings' || entry.type === 'quick-action') { - return + return ( + + ) } if (entry.type === 'workspace-tab') { - return + return ( + + ) } if (entry.type === 'simulator-tab') { - return + return ( + + ) } - return + return ( + + ) } diff --git a/src/renderer/src/components/worktree-jump-palette-surface.tsx b/src/renderer/src/components/worktree-jump-palette-surface.tsx index 4b4974069c7..40013f97f9d 100644 --- a/src/renderer/src/components/worktree-jump-palette-surface.tsx +++ b/src/renderer/src/components/worktree-jump-palette-surface.tsx @@ -42,8 +42,10 @@ export function WorktreeJumpPaletteSurface({ onValueChange: controller.handleCommandSelectionChange, className: 'bg-transparent', onKeyDownCapture: (event: React.KeyboardEvent) => { - if (controller.selectionMovedByUserRef && - ['ArrowDown', 'ArrowUp', 'Home', 'End', 'PageDown', 'PageUp'].includes(event.key)) { + if ( + controller.selectionMovedByUserRef && + ['ArrowDown', 'ArrowUp', 'Home', 'End', 'PageDown', 'PageUp'].includes(event.key) + ) { controller.selectionMovedByUserRef.current = true } } diff --git a/src/renderer/src/components/worktree-jump-palette-workspace-tab-row.tsx b/src/renderer/src/components/worktree-jump-palette-workspace-tab-row.tsx index bdd61d14cab..0246b8b7774 100644 --- a/src/renderer/src/components/worktree-jump-palette-workspace-tab-row.tsx +++ b/src/renderer/src/components/worktree-jump-palette-workspace-tab-row.tsx @@ -28,10 +28,7 @@ export function WorktreeJumpPaletteWorkspaceTabRow({ controller: WorktreeJumpPaletteController }): React.JSX.Element { const result = entry.result - const workspaceTabWorktree = controller.resolveWorktree( - result.worktreeId, - result.executionHostId - ) + const workspaceTabWorktree = controller.resolveWorktree(result.worktreeId, result.executionHostId) const workspaceTabRepo = workspaceTabWorktree ? resolvePaletteRepoForWorktree( workspaceTabWorktree, @@ -68,10 +65,7 @@ export function WorktreeJumpPaletteWorkspaceTabRow({ )} >
- +
diff --git a/src/renderer/src/components/worktree-jump-palette-worktree-row.tsx b/src/renderer/src/components/worktree-jump-palette-worktree-row.tsx index 7a416131670..479625fbe86 100644 --- a/src/renderer/src/components/worktree-jump-palette-worktree-row.tsx +++ b/src/renderer/src/components/worktree-jump-palette-worktree-row.tsx @@ -11,7 +11,10 @@ import { import { cn } from '@/lib/utils' import { translate } from '@/i18n/i18n' import { isRuntimeOwnedSshTargetId } from '../../../shared/execution-host' -import { isPaletteCurrentWorktree, resolvePaletteRepoForWorktree } from '@/lib/palette-repo-resolution' +import { + isPaletteCurrentWorktree, + resolvePaletteRepoForWorktree +} from '@/lib/palette-repo-resolution' import { formatPaletteSessionAge } from '@/components/cmd-j/palette-session-age' import type { WorktreePaletteItem } from './worktree-jump-palette-model' import type { WorktreeJumpPaletteController } from './use-worktree-jump-palette-controller' @@ -39,11 +42,7 @@ export function WorktreeJumpPaletteWorktreeRow({ handleSelectItem } = controller const worktree = entry.worktree - const repo = resolvePaletteRepoForWorktree( - worktree, - repoMap, - controller.repoByHostIdentity - ) + const repo = resolvePaletteRepoForWorktree(worktree, repoMap, controller.repoByHostIdentity) const repoName = repo?.displayName ?? '' const branch = resolveWorktreeBranchLabel(worktree) const worktreeLabel = resolveWorktreeDisplayName(worktree)