From 022bb87e770adb2a4dd417d200e60c9490c17459 Mon Sep 17 00:00:00 2001
From: onevcat <onevcat@gmail.com>
Date: Thu, 26 Feb 2026 21:17:47 +0900
Subject: [PATCH] Remove Cmd-Delete shortcut from worktree archive actions

---
 supacode/Commands/WorktreeCommands.swift                     | 4 +---
 .../Features/Repositories/Views/WorktreeDetailView.swift     | 3 +--
 supacode/Features/Repositories/Views/WorktreeRow.swift       | 3 +--
 supacode/Features/Repositories/Views/WorktreeRowsView.swift  | 5 ++---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/supacode/Commands/WorktreeCommands.swift b/supacode/Commands/WorktreeCommands.swift
index 17436be8..807dc53a 100644
--- a/supacode/Commands/WorktreeCommands.swift
+++ b/supacode/Commands/WorktreeCommands.swift
@@ -21,7 +21,6 @@ struct WorktreeCommands: Commands {
     let orderedRows = visibleHotkeyWorktreeRows ?? repositories.orderedWorktreeRows()
     let pullRequestURL = selectedPullRequestURL
     let githubIntegrationEnabled = store.settings.githubIntegrationEnabled
-    let archiveShortcut = KeyboardShortcut(.delete, modifiers: .command).display
     let deleteShortcut = KeyboardShortcut(.delete, modifiers: [.command, .shift]).display
     CommandMenu("Worktrees") {
       Button("Select Next Worktree") {
@@ -96,8 +95,7 @@ struct WorktreeCommands: Commands {
       Button("Archive Worktree") {
         archiveWorktreeAction?()
       }
-      .keyboardShortcut(.delete, modifiers: .command)
-      .help("Archive Worktree (\(archiveShortcut))")
+      .help("Archive Worktree")
       .disabled(archiveWorktreeAction == nil)
       Button("Delete Worktree") {
         deleteWorktreeAction?()
diff --git a/supacode/Features/Repositories/Views/WorktreeDetailView.swift b/supacode/Features/Repositories/Views/WorktreeDetailView.swift
index 327a3d98..c216b114 100644
--- a/supacode/Features/Repositories/Views/WorktreeDetailView.swift
+++ b/supacode/Features/Repositories/Views/WorktreeDetailView.swift
@@ -435,7 +435,6 @@ private struct MultiSelectedWorktreesDetailView: View {
   private let visibleRowsLimit = 8
 
   var body: some View {
-    let archiveShortcut = KeyboardShortcut(.delete, modifiers: .command).display
     let deleteShortcut = KeyboardShortcut(.delete, modifiers: [.command, .shift]).display
     VStack(alignment: .leading, spacing: 16) {
       Text("\(rows.count) worktrees selected")
@@ -463,7 +462,7 @@ private struct MultiSelectedWorktreesDetailView: View {
       VStack(alignment: .leading, spacing: 6) {
         Text("Available actions")
           .font(.headline)
-        Text("Archive selected (\(archiveShortcut))")
+        Text("Archive selected")
         Text("Delete selected (\(deleteShortcut))")
         Text("Right-click any selected worktree to apply actions to all selected worktrees.")
       }
diff --git a/supacode/Features/Repositories/Views/WorktreeRow.swift b/supacode/Features/Repositories/Views/WorktreeRow.swift
index cd0dbed0..d7f624e6 100644
--- a/supacode/Features/Repositories/Views/WorktreeRow.swift
+++ b/supacode/Features/Repositories/Views/WorktreeRow.swift
@@ -32,7 +32,6 @@ struct WorktreeRow: View {
     let displayRemovedLines = info?.removedLines
     let mergeReadiness = pullRequestMergeReadiness(for: display.pullRequest)
     let hasChangeCounts = displayAddedLines != nil && displayRemovedLines != nil
-    let archiveShortcut = KeyboardShortcut(.delete, modifiers: .command).display
     let showsPullRequestTag = display.pullRequest != nil && display.pullRequestBadgeStyle != nil
     let nameColor = colorScheme == .dark ? Color.white : Color.primary
     let detailText = worktreeName.isEmpty ? name : worktreeName
@@ -104,7 +103,7 @@ struct WorktreeRow: View {
               .accessibilityLabel("Archive worktree")
           }
           .buttonStyle(.plain)
-          .help("Archive Worktree (\(archiveShortcut))")
+          .help("Archive Worktree")
           .disabled(archiveAction == nil)
         }
       }
diff --git a/supacode/Features/Repositories/Views/WorktreeRowsView.swift b/supacode/Features/Repositories/Views/WorktreeRowsView.swift
index 6366ec3a..524ec5c8 100644
--- a/supacode/Features/Repositories/Views/WorktreeRowsView.swift
+++ b/supacode/Features/Repositories/Views/WorktreeRowsView.swift
@@ -217,7 +217,6 @@ struct WorktreeRowsView: View {
 
   @ViewBuilder
   private func rowContextMenu(worktree: Worktree, row: WorktreeRowModel) -> some View {
-    let archiveShortcut = KeyboardShortcut(.delete, modifiers: .command).display
     let deleteShortcut = KeyboardShortcut(.delete, modifiers: [.command, .shift]).display
     let contextRows = contextActionRows(for: row)
     let isBulkSelection = contextRows.count > 1
@@ -238,8 +237,8 @@ struct WorktreeRowsView: View {
     }
     let archiveTitle =
       isBulkSelection
-      ? "Archive Selected Worktrees (\(archiveShortcut))"
-      : "Archive Worktree (\(archiveShortcut))"
+      ? "Archive Selected Worktrees"
+      : "Archive Worktree"
     let deleteTitle =
       isBulkSelection
       ? "Delete Selected Worktrees (\(deleteShortcut))"
-- 
2.51.2