4 Commits
Author SHA1 Message Date
TZGyn 8328e8131d Clear moved items from the selection
Move To only cleared the selection when more than one item moved, so a
single moved item stayed selected — invisible — in the target workspace.
Moved items are now always removed from the selection.
2026-10-28 22:12:42 +08:00
TZGyn 6661f41deb Add Copy & Delete to the selection bar
Scissors icon next to the copy actions; a single item copies as-is (image
included), a multi-selection copies as plain lines, then everything selected
is deleted.
2026-10-27 21:36:28 +08:00
TZGyn 9907db373c Add Copy & Delete to the context menu
Copies the item (or the selection, as plain lines) and removes it in one
step — the 'take this out' gesture. No shortcut: Cmd+X belongs to the text
fields, and a panel binding would steal it.
2026-10-27 21:31:30 +08:00
TZGyn 15a2aa92f7 Open on startup by default and block duplicate workspace names
- LoginItem registers on the first bundled launch, so the app opens on
  startup without the user finding the toggle; a user who turns it off is
  never overridden. A never-registered bundle reports SMAppService .notFound
  rather than .notRegistered, so the guard only treats enabled/approval as
  done. --diag now prints the raw status.
- New Workspace refuses a name that already exists (case-insensitive) and
  says so inline; Return cannot bypass it. The composer's '# Name' still
  switches to the existing workspace, which is the quick-capture gesture.
2026-10-26 20:46:02 +08:00
3 changed files with 104 additions and 8 deletions
+12 -4
View File
@@ -13,8 +13,10 @@ clicking an item copies it back to the clipboard.
`NSStatusItem Preferred Position Prompt`). Left click toggles the panel,
right click shows the menu (accessibility state, launch at login, open data
folder, quit). Contains the single-instance guard and `LoginItem`
(`SMAppService`). The sync panel also carries a Launch at Login toggle (the
app's only settings surface). Also sets `NSApp.mainMenu` with Hide Panel (Cmd+W) and Quit
(`SMAppService`): the app auto-registers as a login item on the first
bundled launch (once, tracked by `loginItem.autoRegistered` in UserDefaults)
so it opens on startup by default; the Launch at Login toggle in the sync
panel (the app's only settings surface) is the opt-out. Also sets `NSApp.mainMenu` with Hide Panel (Cmd+W) and Quit
(Cmd+Q) — an accessory app shows no menu bar, but the main menu still
services key equivalents, which is the only way to quit from the keyboard
while the panel has focus. `applicationShouldHandleReopen` shows the panel so
@@ -56,9 +58,10 @@ clicking an item copies it back to the clipboard.
There is no in-header close button: the window's own close button hides the
panel. Composer `# Name` creates/
switches sections. Click = select (Shift+click for a range); the selection
bar offers Copy (single item), Copy as List, Copy as Lines and Delete;
bar offers Copy (single item), Copy as List, Copy as Lines, Copy & Delete
(scissors icon) and Delete;
right-click = context menu acting on the whole selection (Copy, Copy as List,
Copy as Lines, Done, Edit, Open, Merge, Move To, Delete). Esc clears the
Copy as Lines, Copy & Delete, Done, Edit, Open, Merge, Move To, Delete). Esc clears the
selection before it hides the panel. Selection is scoped to the current view:
switching workspace, switching tab, or closing search clears it. Drop target for images/files.
- `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel`
@@ -239,6 +242,11 @@ brew upgrade --cask prompt
populated when the command fires.
- `captureSelection()` blocks up to 0.5s polling the pasteboard — keep it off
the main thread (the hotkey handler already dispatches to a global queue).
- **`SMAppService.mainApp.status` is `.notFound` for a bundle BTM has never
seen**, not `.notRegistered`, and `register()` still works from that state.
Only treat `.enabled` and `.requiresApproval` as "already done"; checking for
`.notRegistered` silently skips the registration. `Prompt --diag` prints the
raw status.
- The double-Shift tap needs Accessibility; without it the event tap silently
fails and only the Carbon fallbacks work. The panel banner and the status
menu both surface the permission state, and `AppDelegate` shows a launch
+27
View File
@@ -61,6 +61,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
setupStatusItem()
promptForAccessibilityIfNeeded()
LoginItem.autoRegisterOnce()
// Let SwiftUI finish installing its main menu, then augment it.
DispatchQueue.main.async { self.installMenuItems() }
@@ -140,6 +141,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
@MainActor
private func writeDiagnostics() {
var lines = ["Prompt diagnostics", "accessibility: \(AXIsProcessTrusted())"]
lines.append("login item status: \(SMAppService.mainApp.status.rawValue)")
if let window = statusItem?.button?.window {
lines.append("status item frame: \(window.frame)")
if let screen = window.screen ?? NSScreen.main {
@@ -266,6 +268,31 @@ enum LoginItem {
SMAppService.mainApp.status == .enabled
}
/// Registers the app as a login item on first launch so Prompt opens on
/// startup without the user hunting for the toggle. Runs once (tracked in
/// UserDefaults) so a user who disables it is never overridden, and skips
/// `swift run`, where there is no bundle to register.
static func autoRegisterOnce() {
let key = "loginItem.autoRegistered"
guard Bundle.main.bundleIdentifier != nil,
!UserDefaults.standard.bool(forKey: key) else { return }
// A never-registered bundle reports `.notFound` on current macOS
// (BTM has no record), not `.notRegistered`, so only skip when there
// is nothing left to do.
switch SMAppService.mainApp.status {
case .enabled, .requiresApproval:
UserDefaults.standard.set(true, forKey: key)
default:
do {
try SMAppService.mainApp.register()
UserDefaults.standard.set(true, forKey: key)
NSLog("Prompt: registered as a login item (%d)", SMAppService.mainApp.status.rawValue)
} catch {
NSLog("Prompt: login item registration failed: %@", error.localizedDescription)
}
}
}
static func toggle() -> Bool {
let service = SMAppService.mainApp
do {
+65 -4
View File
@@ -324,6 +324,9 @@ struct PanelView: View {
store.copyAsLines(ids: ids)
flashCopied(item.id)
}
Button(multiple ? "Copy & Delete \(ids.count) Items" : "Copy & Delete") {
copyAndDelete(item)
}
Divider()
Button(item.done ? "Mark as Not Done" : "Mark as Done") {
store.setDone(!item.done, ids: ids)
@@ -351,7 +354,11 @@ struct PanelView: View {
ForEach(store.sections.filter { $0.id != store.sectionID(of: item.id) }) { section in
Button(section.name) {
store.move(ids: ids, to: section.id)
if multiple { clearSelection() }
// Moved items leave the current view, so they must
// leave the selection too — otherwise they stay
// selected, invisible, in the target workspace.
selection.subtract(ids)
lastSelectedID = nil
}
}
}
@@ -616,6 +623,19 @@ struct PanelView: View {
// MARK: - New workspace
private var trimmedWorkspaceName: String {
newWorkspaceName.trimmingCharacters(in: .whitespacesAndNewlines)
}
/// Case-insensitive, like the store's dedupe. The modal blocks creation
/// with a hint instead of silently switching to the existing workspace.
private var workspaceNameExists: Bool {
let name = trimmedWorkspaceName
return !name.isEmpty && store.sections.contains {
$0.name.caseInsensitiveCompare(name) == .orderedSame
}
}
@ViewBuilder
private var newWorkspaceModal: some View {
if showNewWorkspace {
@@ -630,12 +650,17 @@ struct PanelView: View {
.focused($focusedField, equals: .newWorkspace)
.onSubmit(createWorkspace)
.onExitCommand { dismissNewWorkspace() }
if workspaceNameExists {
Text("A workspace named “\(trimmedWorkspaceName)” already exists.")
.font(.caption)
.foregroundStyle(.red)
}
HStack {
Spacer()
Button("Cancel") { dismissNewWorkspace() }
Button("Create") { createWorkspace() }
.keyboardShortcut(.defaultAction)
.disabled(newWorkspaceName.trimmingCharacters(in: .whitespaces).isEmpty)
.disabled(trimmedWorkspaceName.isEmpty || workspaceNameExists)
}
}
.padding(16)
@@ -649,8 +674,8 @@ struct PanelView: View {
}
private func createWorkspace() {
let name = newWorkspaceName.trimmingCharacters(in: .whitespacesAndNewlines)
guard !name.isEmpty else { return }
let name = trimmedWorkspaceName
guard !name.isEmpty, !workspaceNameExists else { return }
store.createSection(named: name)
dismissNewWorkspace()
}
@@ -684,6 +709,12 @@ struct PanelView: View {
.font(.caption)
.buttonStyle(.plain)
.foregroundStyle(Color.accentColor)
Button { copyAndDeleteSelection() } label: {
Image(systemName: "scissors")
}
.buttonStyle(.plain)
.foregroundStyle(Color.accentColor)
.help("Copy & Delete")
Button { deleteSelection() } label: {
Image(systemName: "trash")
}
@@ -708,6 +739,20 @@ struct PanelView: View {
clearSelection()
}
/// Same as the context menu's Copy & Delete, for the selection bar. A
/// single image still copies as an image; a multi-selection copies as
/// plain lines, same as Copy as Lines.
private func copyAndDeleteSelection() {
guard !selection.isEmpty else { return }
if selection.count == 1, let id = selection.first, let item = store.item(id) {
store.copy(item)
} else {
store.copyAsLines(ids: selection)
}
store.delete(ids: selection)
clearSelection()
}
private func copySelection(asList: Bool) {
guard !selection.isEmpty else { return }
if asList {
@@ -837,6 +882,22 @@ struct PanelView: View {
flashCopied(item.id)
}
/// One gesture for "take this out": copy, then delete. A multi-selection
/// is copied as plain lines, same as Copy as Lines. No shortcut — Cmd+X
/// belongs to the composer/editor text fields, and a panel binding would
/// steal Cut from them.
private func copyAndDelete(_ item: PromptItem) {
let ids = effectiveIDs(for: item)
if ids.count > 1 {
store.copyAsLines(ids: ids)
} else {
store.copy(item)
}
store.delete(ids: ids)
selection.subtract(ids)
lastSelectedID = nil
}
private func flashCopied(_ id: UUID) {
withAnimation { copiedID = id }
DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {