native macOS codings agent orchestrator
Remove Cmd-Delete shortcut from worktree archive actions
+5
-10
+1
-3
supacode/Commands/WorktreeCommands.swift
+1
-3
supacode/Commands/WorktreeCommands.swift
···
21
21
let orderedRows = visibleHotkeyWorktreeRows ?? repositories.orderedWorktreeRows()
22
22
let pullRequestURL = selectedPullRequestURL
23
23
let githubIntegrationEnabled = store.settings.githubIntegrationEnabled
24
-
let archiveShortcut = KeyboardShortcut(.delete, modifiers: .command).display
25
24
let deleteShortcut = KeyboardShortcut(.delete, modifiers: [.command, .shift]).display
26
25
CommandMenu("Worktrees") {
27
26
Button("Select Next Worktree") {
···
96
95
Button("Archive Worktree") {
97
96
archiveWorktreeAction?()
98
97
}
99
-
.keyboardShortcut(.delete, modifiers: .command)
100
-
.help("Archive Worktree (\(archiveShortcut))")
98
+
.help("Archive Worktree")
101
99
.disabled(archiveWorktreeAction == nil)
102
100
Button("Delete Worktree") {
103
101
deleteWorktreeAction?()
+1
-2
supacode/Features/Repositories/Views/WorktreeDetailView.swift
+1
-2
supacode/Features/Repositories/Views/WorktreeDetailView.swift
···
435
435
private let visibleRowsLimit = 8
436
436
437
437
var body: some View {
438
-
let archiveShortcut = KeyboardShortcut(.delete, modifiers: .command).display
439
438
let deleteShortcut = KeyboardShortcut(.delete, modifiers: [.command, .shift]).display
440
439
VStack(alignment: .leading, spacing: 16) {
441
440
Text("\(rows.count) worktrees selected")
···
463
462
VStack(alignment: .leading, spacing: 6) {
464
463
Text("Available actions")
465
464
.font(.headline)
466
-
Text("Archive selected (\(archiveShortcut))")
465
+
Text("Archive selected")
467
466
Text("Delete selected (\(deleteShortcut))")
468
467
Text("Right-click any selected worktree to apply actions to all selected worktrees.")
469
468
}
+1
-2
supacode/Features/Repositories/Views/WorktreeRow.swift
+1
-2
supacode/Features/Repositories/Views/WorktreeRow.swift
···
32
32
let displayRemovedLines = info?.removedLines
33
33
let mergeReadiness = pullRequestMergeReadiness(for: display.pullRequest)
34
34
let hasChangeCounts = displayAddedLines != nil && displayRemovedLines != nil
35
-
let archiveShortcut = KeyboardShortcut(.delete, modifiers: .command).display
36
35
let showsPullRequestTag = display.pullRequest != nil && display.pullRequestBadgeStyle != nil
37
36
let nameColor = colorScheme == .dark ? Color.white : Color.primary
38
37
let detailText = worktreeName.isEmpty ? name : worktreeName
···
104
103
.accessibilityLabel("Archive worktree")
105
104
}
106
105
.buttonStyle(.plain)
107
-
.help("Archive Worktree (\(archiveShortcut))")
106
+
.help("Archive Worktree")
108
107
.disabled(archiveAction == nil)
109
108
}
110
109
}
+2
-3
supacode/Features/Repositories/Views/WorktreeRowsView.swift
+2
-3
supacode/Features/Repositories/Views/WorktreeRowsView.swift
···
217
217
218
218
@ViewBuilder
219
219
private func rowContextMenu(worktree: Worktree, row: WorktreeRowModel) -> some View {
220
-
let archiveShortcut = KeyboardShortcut(.delete, modifiers: .command).display
221
220
let deleteShortcut = KeyboardShortcut(.delete, modifiers: [.command, .shift]).display
222
221
let contextRows = contextActionRows(for: row)
223
222
let isBulkSelection = contextRows.count > 1
···
238
237
}
239
238
let archiveTitle =
240
239
isBulkSelection
241
-
? "Archive Selected Worktrees (\(archiveShortcut))"
242
-
: "Archive Worktree (\(archiveShortcut))"
240
+
? "Archive Selected Worktrees"
241
+
: "Archive Worktree"
243
242
let deleteTitle =
244
243
isBulkSelection
245
244
? "Delete Selected Worktrees (\(deleteShortcut))"