From 6aa4f95cf04d8459aecbe5b46771276fcf28a1cf Mon Sep 17 00:00:00 2001 From: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Date: Sun, 8 Nov 2026 19:32:10 -0800 Subject: [PATCH] Clarify detached commits and deletion guidance --- .../controls/NativeChatComposerWorkspace.tsx | 15 +++++++++++++-- .../WorktreeContextMenuDeleteItems.tsx | 10 +++++++++- src/renderer/src/i18n/locales/en.json | 1 + 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/renderer/src/components/native-chat/composer/controls/NativeChatComposerWorkspace.tsx b/src/renderer/src/components/native-chat/composer/controls/NativeChatComposerWorkspace.tsx index d24d423e2bf..494c1ab1da8 100644 --- a/src/renderer/src/components/native-chat/composer/controls/NativeChatComposerWorkspace.tsx +++ b/src/renderer/src/components/native-chat/composer/controls/NativeChatComposerWorkspace.tsx @@ -54,7 +54,18 @@ export function NativeChatComposerWorkspace({ } = useAppStore(useShallow(selector)) const identity = getWorktreeGitIdentityDisplay({ branch, head }) - const label = identity?.kind === 'branch' ? identity.branchName : identity?.sourceControlLabel + const label = + identity?.kind === 'branch' + ? identity.branchName + : identity + ? t( + 'components.native-chat.composerWorkspace.detachedCommit', + 'Commit {{head}} (not a branch)', + { + head: identity.shortHead + } + ) + : undefined const identityCopyValue = identity?.kind === 'branch' ? identity.branchName : head const copyValue = async (value: string | undefined): Promise => { if (!value) { @@ -99,7 +110,7 @@ export function NativeChatComposerWorkspace({ - {label} + {identity.kind === 'detached' ? identity.tooltip : label} ) : null diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuDeleteItems.tsx b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuDeleteItems.tsx index d308aae74e1..0ac834fc6c4 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuDeleteItems.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuDeleteItems.tsx @@ -1,3 +1,4 @@ +import { useId } from 'react' import { Trash2 } from 'lucide-react' import { DropdownMenuItem, DropdownMenuShortcut } from '@/components/ui/dropdown-menu' import { useOptionalShortcutLabel } from '@/hooks/useShortcutLabel' @@ -6,6 +7,7 @@ import type { WorktreeContextMenuModel } from './use-worktree-context-menu-model export function WorktreeContextMenuDeleteItems({ model }: { model: WorktreeContextMenuModel }) { const t = useTranslate() + const primaryDeleteDescriptionId = useId() const deleteShortcut = useOptionalShortcutLabel('workspace.delete') const { batchDeleteWorktrees, @@ -42,7 +44,10 @@ export function WorktreeContextMenuDeleteItems({ model }: { model: WorktreeConte {t('auto.components.sidebar.WorktreeContextMenu.deleteWorktree', 'Delete Worktree')} -

+

{t( 'auto.components.sidebar.WorktreeContextMenu.primaryDeleteDisabled', "Primary worktree — can't be deleted. Remove the project instead." @@ -53,6 +58,9 @@ export function WorktreeContextMenuDeleteItems({ model }: { model: WorktreeConte {/* Use Radix’s direct title prop for project-removal copy; wrapper elements break flat roving-keyboard navigation. */}