From 20f2a2635baf2d5f7dc013cb00700a661c9c0aa7 Mon Sep 17 00:00:00 2001
From: Leonid Skorobogatyy <bash@opencode.itc.local>
Date: Wed, 24 Jun 2026 03:51:56 +1100
Subject: [PATCH] chore(worktree): drop dead otherBranches labels after search
 guard

The mobile and desktop (cmdk) pickers in NewWorktreeDialog now hide
non-matching branches during search via a !hasExistingBranchQuery /
!hasSourceBranchQuery outer guard. That makes the inner heading
ternaries (which switched between 'localBranches' and
'otherLocalBranches' depending on the search state) unreachable: they
always resolve to the non-query label, and the
'hasExistingBranchQuery && <CommandSeparator />' lines were dead code.

This commit:

- Replaces 8 heading ternaries with static non-query labels
  (mobile and desktop, existing/source, local/remote).
- Drops the two unreachable <CommandSeparator /> renders in the
  otherLocal blocks.
- Simplifies the otherRemote separator conditions by removing the
  always-false '|| hasExistingBranchQuery' / '|| hasSourceBranchQuery'
  terms.
- Removes the now-unused 'session.newWorktree.otherLocalBranches' and
  'session.newWorktree.otherRemoteBranches' keys from all 9 locales.

Behavior is unchanged; this is dead-branch cleanup only.
---
 .../components/session/NewWorktreeDialog.tsx  | 22 +++++++++----------
 packages/ui/src/lib/i18n/messages/en.ts       |  2 --
 packages/ui/src/lib/i18n/messages/es.ts       |  2 --
 packages/ui/src/lib/i18n/messages/fr.ts       |  2 --
 packages/ui/src/lib/i18n/messages/ko.ts       |  2 --
 packages/ui/src/lib/i18n/messages/pl.ts       |  2 --
 packages/ui/src/lib/i18n/messages/pt-BR.ts    |  2 --
 packages/ui/src/lib/i18n/messages/uk.ts       |  2 --
 packages/ui/src/lib/i18n/messages/zh-CN.ts    |  2 --
 packages/ui/src/lib/i18n/messages/zh-TW.ts    |  2 --
 10 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/packages/ui/src/components/session/NewWorktreeDialog.tsx b/packages/ui/src/components/session/NewWorktreeDialog.tsx
index 363c91c4..8d4c16f5 100644
--- a/packages/ui/src/components/session/NewWorktreeDialog.tsx
+++ b/packages/ui/src/components/session/NewWorktreeDialog.tsx
@@ -1145,7 +1145,7 @@ export function NewWorktreeDialog({
                         {!hasExistingBranchQuery && existingBranchRankedGroups.otherLocal.length > 0 && (
                           <div className="space-y-2">
                             <div className="typography-small font-semibold text-foreground px-2">
-                              {hasExistingBranchQuery ? t('session.newWorktree.otherLocalBranches') : t('session.newWorktree.localBranches')}
+                              {t('session.newWorktree.localBranches')}
                             </div>
                             <div className="space-y-1">
                               {existingBranchRankedGroups.otherLocal.map((branch) => (
@@ -1177,7 +1177,7 @@ export function NewWorktreeDialog({
                         {!hasExistingBranchQuery && existingBranchRankedGroups.otherRemote.length > 0 && (
                           <div className="space-y-2">
                             <div className="typography-small font-semibold text-foreground px-2">
-                              {hasExistingBranchQuery ? t('session.newWorktree.otherRemoteBranches') : t('session.newWorktree.remoteBranches')}
+                              {t('session.newWorktree.remoteBranches')}
                             </div>
                             <div className="space-y-1">
                               {existingBranchRankedGroups.otherRemote.map((branch) => (
@@ -1404,7 +1404,7 @@ export function NewWorktreeDialog({
                         {!hasSourceBranchQuery && sourceBranchRankedGroups.otherLocal.length > 0 && (
                           <div className="space-y-2">
                             <div className="typography-small font-semibold text-foreground px-2">
-                              {hasSourceBranchQuery ? t('session.newWorktree.otherLocalBranches') : t('session.newWorktree.localBranches')}
+                              {t('session.newWorktree.localBranches')}
                             </div>
                             <div className="space-y-1">
                               {sourceBranchRankedGroups.otherLocal.map((branch) => (
@@ -1431,7 +1431,7 @@ export function NewWorktreeDialog({
                         {!hasSourceBranchQuery && sourceBranchRankedGroups.otherRemote.length > 0 && (
                           <div className="space-y-2">
                             <div className="typography-small font-semibold text-foreground px-2">
-                              {hasSourceBranchQuery ? t('session.newWorktree.otherRemoteBranches') : t('session.newWorktree.remoteBranches')}
+                              {t('session.newWorktree.remoteBranches')}
                             </div>
                             <div className="space-y-1">
                               {sourceBranchRankedGroups.otherRemote.map((branch) => (
@@ -1609,8 +1609,7 @@ export function NewWorktreeDialog({
 
                               {!hasExistingBranchQuery && existingBranchRankedGroups.otherLocal.length > 0 && (
                                 <>
-                                  {hasExistingBranchQuery && <CommandSeparator />}
-                                  <CommandGroup heading={hasExistingBranchQuery ? t('session.newWorktree.otherLocalBranches') : t('session.newWorktree.localBranches')}>
+                                  <CommandGroup heading={t('session.newWorktree.localBranches')}>
                                     {existingBranchRankedGroups.otherLocal.map((branch) => (
                                       <CommandItem
                                         key={`local-${branch}`}
@@ -1634,10 +1633,10 @@ export function NewWorktreeDialog({
 
                               {!hasExistingBranchQuery && existingBranchRankedGroups.otherRemote.length > 0 && (
                                 <>
-                                  {(existingBranchRankedGroups.otherLocal.length > 0 || hasExistingBranchQuery) && (
+                                  {existingBranchRankedGroups.otherLocal.length > 0 && (
                                     <CommandSeparator />
                                   )}
-                                  <CommandGroup heading={hasExistingBranchQuery ? t('session.newWorktree.otherRemoteBranches') : t('session.newWorktree.remoteBranches')}>
+                                  <CommandGroup heading={t('session.newWorktree.remoteBranches')}>
                                     {existingBranchRankedGroups.otherRemote.map((branch) => (
                                       <CommandItem
                                         key={`remote-${branch}`}
@@ -1845,8 +1844,7 @@ export function NewWorktreeDialog({
 
                               {!hasSourceBranchQuery && sourceBranchRankedGroups.otherLocal.length > 0 && (
                                 <>
-                                  {hasSourceBranchQuery && <CommandSeparator />}
-                                  <CommandGroup heading={hasSourceBranchQuery ? t('session.newWorktree.otherLocalBranches') : t('session.newWorktree.localBranches')}>
+                                  <CommandGroup heading={t('session.newWorktree.localBranches')}>
                                     {sourceBranchRankedGroups.otherLocal.map((branch) => (
                                       <CommandItem
                                         key={`local-${branch}`}
@@ -1865,10 +1863,10 @@ export function NewWorktreeDialog({
 
                               {!hasSourceBranchQuery && sourceBranchRankedGroups.otherRemote.length > 0 && (
                                 <>
-                                  {(sourceBranchRankedGroups.otherLocal.length > 0 || hasSourceBranchQuery) && (
+                                  {sourceBranchRankedGroups.otherLocal.length > 0 && (
                                     <CommandSeparator />
                                   )}
-                                  <CommandGroup heading={hasSourceBranchQuery ? t('session.newWorktree.otherRemoteBranches') : t('session.newWorktree.remoteBranches')}>
+                                  <CommandGroup heading={t('session.newWorktree.remoteBranches')}>
                                     {sourceBranchRankedGroups.otherRemote.map((branch) => (
                                       <CommandItem
                                         key={`remote-${branch}`}
diff --git a/packages/ui/src/lib/i18n/messages/en.ts b/packages/ui/src/lib/i18n/messages/en.ts
index dba49cb5..e2c25bf9 100644
--- a/packages/ui/src/lib/i18n/messages/en.ts
+++ b/packages/ui/src/lib/i18n/messages/en.ts
@@ -1549,8 +1549,6 @@ export const dict = {
   'session.newWorktree.noMatchingBranches': 'No matching branches',
   'session.newWorktree.localBranches': 'Local branches',
   'session.newWorktree.remoteBranches': 'Remote branches',
-  'session.newWorktree.otherLocalBranches': 'Other local branches',
-  'session.newWorktree.otherRemoteBranches': 'Other remote branches',
   'session.newWorktree.branchName': 'Branch Name',
   'session.newWorktree.branchNamePlaceholder': 'feature/my-awesome-feature',
   'session.newWorktree.actions.change': 'Change',
diff --git a/packages/ui/src/lib/i18n/messages/es.ts b/packages/ui/src/lib/i18n/messages/es.ts
index a92e4127..80822983 100644
--- a/packages/ui/src/lib/i18n/messages/es.ts
+++ b/packages/ui/src/lib/i18n/messages/es.ts
@@ -1515,8 +1515,6 @@ export const dict: Record<I18nKey, string> = {
   "session.newWorktree.noMatchingBranches": "No hay ramas coincidentes",
   "session.newWorktree.localBranches": "Ramas locales",
   "session.newWorktree.remoteBranches": "Ramas remotas",
-  "session.newWorktree.otherLocalBranches": "Otras ramas locales",
-  "session.newWorktree.otherRemoteBranches": "Otras ramas remotas",
   "session.newWorktree.branchName": "Nombre de la rama",
   "session.newWorktree.branchNamePlaceholder": "feature/my-awesome-feature",
   "session.newWorktree.actions.change": "Cambiar",
diff --git a/packages/ui/src/lib/i18n/messages/fr.ts b/packages/ui/src/lib/i18n/messages/fr.ts
index 9d66af07..a37fb929 100644
--- a/packages/ui/src/lib/i18n/messages/fr.ts
+++ b/packages/ui/src/lib/i18n/messages/fr.ts
@@ -1414,8 +1414,6 @@ export const dict = {
   'session.newWorktree.noMatchingBranches': 'Aucune branche correspondante',
   'session.newWorktree.localBranches': 'Branches locales',
   'session.newWorktree.remoteBranches': 'Branches du dépôt distant',
-  'session.newWorktree.otherLocalBranches': 'Autres branches locales',
-  'session.newWorktree.otherRemoteBranches': 'Autres branches du remote',
   'session.newWorktree.branchName': 'Nom de la branche',
   'session.newWorktree.branchNamePlaceholder': 'fonctionnalité/ma-fonctionnalité-géniale',
   'session.newWorktree.actions.change': 'Changement',
diff --git a/packages/ui/src/lib/i18n/messages/ko.ts b/packages/ui/src/lib/i18n/messages/ko.ts
index 06532993..1e41603f 100644
--- a/packages/ui/src/lib/i18n/messages/ko.ts
+++ b/packages/ui/src/lib/i18n/messages/ko.ts
@@ -1551,8 +1551,6 @@ export const dict: Record<I18nKey, string> = {
   'session.newWorktree.noMatchingBranches': '일치하는 브랜치가 없습니다',
   'session.newWorktree.localBranches': '로컬 브랜치',
   'session.newWorktree.remoteBranches': '리모트 브랜치',
-  'session.newWorktree.otherLocalBranches': '기타 로컬 브랜치',
-  'session.newWorktree.otherRemoteBranches': '기타 리모트 브랜치',
   'session.newWorktree.branchName': '브랜치 이름',
   'session.newWorktree.branchNamePlaceholder': 'feature/my-awesome-feature',
   'session.newWorktree.actions.change': '변경',
diff --git a/packages/ui/src/lib/i18n/messages/pl.ts b/packages/ui/src/lib/i18n/messages/pl.ts
index 664f62ed..b0bb914e 100644
--- a/packages/ui/src/lib/i18n/messages/pl.ts
+++ b/packages/ui/src/lib/i18n/messages/pl.ts
@@ -2354,8 +2354,6 @@ export const dict: Record<I18nKey, string> = {
   'session.newWorktree.newSessionTitle': 'Nowa sesja',
   'session.newWorktree.noBranchesFound': 'Nie znaleziono gałęzi',
   'session.newWorktree.noMatchingBranches': 'Brak pasujących gałęzi',
-  'session.newWorktree.otherLocalBranches': 'Pozostałe lokalne gałęzie',
-  'session.newWorktree.otherRemoteBranches': 'Pozostałe zdalne gałęzie',
   'session.newWorktree.prNumber': 'PR #{number}',
   'session.newWorktree.remoteBranches': 'Zdalne gałęzie',
   'session.newWorktree.resetToMatchBranchName': 'Zresetuj do nazwy zgodnej z gałęzią',
diff --git a/packages/ui/src/lib/i18n/messages/pt-BR.ts b/packages/ui/src/lib/i18n/messages/pt-BR.ts
index 8f345e85..c86dd4a6 100644
--- a/packages/ui/src/lib/i18n/messages/pt-BR.ts
+++ b/packages/ui/src/lib/i18n/messages/pt-BR.ts
@@ -1515,8 +1515,6 @@ export const dict: Record<I18nKey, string> = {
   "session.newWorktree.noMatchingBranches": "Não há branches coincidentes",
   "session.newWorktree.localBranches": "Branches locais",
   "session.newWorktree.remoteBranches": "Branches remotas",
-  "session.newWorktree.otherLocalBranches": "Outras branches locais",
-  "session.newWorktree.otherRemoteBranches": "Outras branches remotas",
   "session.newWorktree.branchName": "Nome da branch",
   "session.newWorktree.branchNamePlaceholder": "feature/my-awesome-feature",
   "session.newWorktree.actions.change": "Alterar",
diff --git a/packages/ui/src/lib/i18n/messages/uk.ts b/packages/ui/src/lib/i18n/messages/uk.ts
index 42c09339..ce5b08e2 100644
--- a/packages/ui/src/lib/i18n/messages/uk.ts
+++ b/packages/ui/src/lib/i18n/messages/uk.ts
@@ -1515,8 +1515,6 @@ export const dict: Record<I18nKey, string> = {
   "session.newWorktree.noMatchingBranches": "Немає відповідних гілок",
   "session.newWorktree.localBranches": "Локальні гілки",
   "session.newWorktree.remoteBranches": "Віддалені гілки",
-  "session.newWorktree.otherLocalBranches": "Інші локальні гілки",
-  "session.newWorktree.otherRemoteBranches": "Інші віддалені гілки",
   "session.newWorktree.branchName": "Назва гілки",
   "session.newWorktree.branchNamePlaceholder": "feature/my-awesome-feature",
   "session.newWorktree.actions.change": "Змінити",
diff --git a/packages/ui/src/lib/i18n/messages/zh-CN.ts b/packages/ui/src/lib/i18n/messages/zh-CN.ts
index 1ffd934d..5e4c71b5 100644
--- a/packages/ui/src/lib/i18n/messages/zh-CN.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-CN.ts
@@ -1515,8 +1515,6 @@ export const dict: Record<I18nKey, string> = {
   'session.newWorktree.noMatchingBranches': '没有匹配分支',
   'session.newWorktree.localBranches': '本地分支',
   'session.newWorktree.remoteBranches': '远程分支',
-  'session.newWorktree.otherLocalBranches': '其他本地分支',
-  'session.newWorktree.otherRemoteBranches': '其他远程分支',
   'session.newWorktree.branchName': '分支名',
   'session.newWorktree.branchNamePlaceholder': 'feature/my-awesome-feature',
   'session.newWorktree.actions.change': '更改',
diff --git a/packages/ui/src/lib/i18n/messages/zh-TW.ts b/packages/ui/src/lib/i18n/messages/zh-TW.ts
index 08d30254..825fad27 100644
--- a/packages/ui/src/lib/i18n/messages/zh-TW.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-TW.ts
@@ -1519,8 +1519,6 @@ export const dict: Record<I18nKey, string> = {
   'session.newWorktree.noMatchingBranches': '沒有符合分支',
   'session.newWorktree.localBranches': '本地分支',
   'session.newWorktree.remoteBranches': '遠端分支',
-  'session.newWorktree.otherLocalBranches': '其他本地分支',
-  'session.newWorktree.otherRemoteBranches': '其他遠端分支',
   'session.newWorktree.branchName': '分支名稱',
   'session.newWorktree.branchNamePlaceholder': 'feature/my-awesome-feature',
   'session.newWorktree.actions.change': '變更',