Make pasting reliable and turn items into checkboxes

Pasting still failed because the panel is a nonactivating panel: it can
be key while the app is not active, and menu key equivalents are not
delivered reliably in that state. Cmd+V is now dispatched to the
responder chain directly, and the app no longer replaces SwiftUI's main
menu — it only adds Hide Panel to it, so the Edit items that AppKit
routes text shortcuts through stay intact.

Rows also gained a checkbox so a workspace works as a checklist without
turning the row into a button, which would swallow the checkbox's clicks.

AGENTS.md

@@ -156,6 +156,21 @@ brew upgrade --cask prompt
 
 ## Gotchas
 
+- **Never assign `NSApp.mainMenu`.** SwiftUI installs a menu whose Edit items
+  are how AppKit routes Cmd+C/V/X/A/Z; replacing it with a hand-built menu
+  silently breaks pasting, copying and select-all in the composer (this shipped
+  once and had to be reverted). `installMenuItems()` only *augments* the
+  existing menu: it adds Hide Panel (Cmd+W) and removes SwiftUI's Settings item,
+  whose empty scene would otherwise shadow the in-panel Cmd+, sync panel.
+- **Cmd+V is handled by the paste monitor, not the menu.** The panel is a
+  `.nonactivatingPanel`, so it can be key while the app is not active, and menu
+  key equivalents are not reliably delivered in that state. The monitor
+  dispatches `paste:` to the responder chain itself for text, and adds the
+  clipboard image to the store when there is no text. `Prompt --diag` dumps the
+  menu so the wiring can be checked without a keyboard.
+- **A row is not a `Button`** because it contains a checkbox `Button` for
+  ticking items off, and nested buttons never receive clicks. The row uses
+  `contentShape` + `onTapGesture` for click-to-copy instead.
 - **Never bind bare keys as `.keyboardShortcut` in the panel** (Space, Delete,
   plain Cmd+C). SwiftUI key equivalents are matched before text input and
   would steal characters from the composer TextField. Only Cmd-modified

README.md

@@ -4,10 +4,15 @@ A native macOS app for keeping prompts and photos, in the spirit of
 [Copper](https://shadcn.com/copper) by shadcn: a floating panel that sits next
 to your work. Click anything to copy it back to your clipboard.
 
+- **Checklists by default** — every item has a checkbox, so a workspace doubles
+  as a to-do list; done items stay in place, dimmed and struck through.
 - **Click to copy** — text notes go back as text, photos go back as images.
 - **Capture from anywhere** — select text in any app and tap **Left Shift twice**.
 - **Photos** — paste (Cmd+V), drag & drop, or add via the photo button.
-- **Sections** — type `# Name` in the composer; Cmd+K switches sections.
+- **Workspaces** — type `# Name` in the composer, or use "New Workspace" in
+  the Cmd+K switcher (which opens a name modal); Cmd+K switches, and the
+  up/down arrows in the switcher reorder them. (The code and the saved JSON
+  still call these `sections` so existing data keeps working.)
 - **Copy as List / Copy as Lines** — Cmd+click to multi-select (Shift+click for
   a range), then copy the selection as a numbered list or as plain
   newline-separated text, from the selection bar or the right-click menu.
@@ -25,7 +30,7 @@ to your work. Click anything to copy it back to your clipboard.
 | --- | --- |
 | Capture current selection | Left Shift ×2 (or Cmd+Shift+C) |
 | Show/hide panel | Right Shift ×2 (or Cmd+Shift+Space) |
-| Switch/create section | Cmd+K |
+| Switch/create workspace | Cmd+K |
 | Search | Cmd+F |
 | Focus composer | Cmd+N |
 | Sync settings | Cmd+, |

Sources/Prompt/App.swift

@@ -32,6 +32,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         // which locks the user out once the panel is hidden.
         if CommandLine.arguments.contains("--diag") {
             setupStatusItem()
+            installMenuItems()
             DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
                 self.writeDiagnostics()
                 NSApp.terminate(nil)
@@ -59,9 +60,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         HotkeyManager.shared.start()
 
         setupStatusItem()
-        setupMainMenu()
         promptForAccessibilityIfNeeded()
 
+        // Let SwiftUI finish installing its main menu, then augment it.
+        DispatchQueue.main.async { self.installMenuItems() }
+
         // Show the panel on launch so the app is discoverable (it has no Dock
         // icon and the menu bar icon can be hard to spot on a full bar).
         Task { @MainActor in
@@ -110,28 +113,24 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         return .terminateNow
     }
 
-    /// Accessory apps have no visible menu bar, but the main menu still
-    /// services key equivalents — this is what makes Cmd+Q and Cmd+W work
-    /// while the panel has focus.
-    private func setupMainMenu() {
-        let mainMenu = NSMenu()
-        let appMenuItem = NSMenuItem()
-        mainMenu.addItem(appMenuItem)
+    /// Adds "Hide Panel" to the menu SwiftUI already installed. Do NOT replace
+    /// `NSApp.mainMenu`: SwiftUI's menu carries the Edit items that AppKit
+    /// routes Cmd+C/V/X/A/Z through, so replacing it breaks text editing in the
+    /// composer. This only inserts one item and drops SwiftUI's Settings item,
+    /// whose empty scene would otherwise shadow the in-panel Cmd+, sync panel.
+    private func installMenuItems() {
+        guard let appMenu = NSApp.mainMenu?.items.first?.submenu else { return }
 
-        let appMenu = NSMenu()
-        appMenuItem.submenu = appMenu
+        if let settings = appMenu.items.firstIndex(where: { $0.keyEquivalent == "," && $0.keyEquivalentModifierMask == [.command] }) {
+            appMenu.removeItem(at: settings)
+        }
+        guard !appMenu.items.contains(where: { $0.action == #selector(hidePanel) }) else { return }
 
         let hide = NSMenuItem(title: "Hide Panel", action: #selector(hidePanel), keyEquivalent: "w")
         hide.target = self
-        appMenu.addItem(hide)
-
-        appMenu.addItem(.separator())
-
-        let quit = NSMenuItem(title: "Quit Prompt", action: #selector(quit), keyEquivalent: "q")
-        quit.target = self
-        appMenu.addItem(quit)
-
-        NSApp.mainMenu = mainMenu
+        let quitIndex = appMenu.items.firstIndex { $0.action == #selector(NSApplication.terminate(_:)) } ?? appMenu.items.count
+        appMenu.insertItem(.separator(), at: quitIndex)
+        appMenu.insertItem(hide, at: quitIndex + 1)
     }
 
     @MainActor @objc private func hidePanel() {
@@ -153,6 +152,15 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
             lines.append("status item has no window (not in the menu bar)")
         }
         lines.append("preferred position: \(UserDefaults.standard.object(forKey: "NSStatusItem Preferred Position Prompt") ?? "unset")")
+        lines.append("main menu:")
+        for item in NSApp.mainMenu?.items ?? [] {
+            lines.append("  \(item.submenu?.title ?? item.title)")
+            for entry in item.submenu?.items ?? [] {
+                guard !entry.isSeparatorItem else { continue }
+                let action = entry.action.map(NSStringFromSelector) ?? "-"
+                lines.append("    \(entry.title) [\(entry.keyEquivalentModifierMask.rawValue)] \(action)")
+            }
+        }
         try? lines.joined(separator: "\n").write(
             to: URL(fileURLWithPath: "/tmp/prompt-diag.txt"), atomically: true, encoding: .utf8
         )

Sources/Prompt/PanelController.swift

@@ -71,22 +71,28 @@ final class PanelController: NSObject {
         panel.setFrameOrigin(NSPoint(x: screen.maxX - size.width - 12, y: screen.minY + 12))
     }
 
-    // Intercept Cmd+V when the panel is key and the clipboard holds an image
-    // (and no text, so normal text paste into the composer is unaffected).
+    // Cmd+V is handled here rather than left to a menu key equivalent. The
+    // panel is a nonactivating panel, so it can be key while the app is not
+    // active, and menu key equivalents are not reliably delivered in that
+    // state — which is what silently broke pasting. Dispatching paste: to the
+    // responder chain ourselves removes that dependency.
     private func installPasteMonitor() {
         guard pasteMonitor == nil else { return }
         pasteMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
             guard let self, let panel = self.panel, event.window == panel else { return event }
             let modifiers = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
-            if modifiers == [.command], event.charactersIgnoringModifiers == "v" {
+            guard modifiers == [.command], event.charactersIgnoringModifiers == "v" else { return event }
+
             let pasteboard = NSPasteboard.general
-                if pasteboard.string(forType: .string) == nil,
-                   let images = pasteboard.readObjects(forClasses: [NSImage.self], options: nil) as? [NSImage],
+            if pasteboard.string(forType: .string) != nil {
+                NSApp.sendAction(#selector(NSText.paste(_:)), to: nil, from: nil)
+                return nil
+            }
+            if let images = pasteboard.readObjects(forClasses: [NSImage.self], options: nil) as? [NSImage],
                let image = images.first {
                 Task { @MainActor in Store.shared.addImage(image) }
                 return nil
             }
-            }
             return event
         }
     }

Sources/Prompt/PanelView.swift

@@ -10,6 +10,8 @@ struct PanelView: View {
     @State private var search = ""
     @State private var showSearch = false
     @State private var showSectionSwitcher = false
+    @State private var showNewWorkspace = false
+    @State private var newWorkspaceName = ""
     @State private var showSync = false
     @State private var joinCode = ""
     @State private var selection = Set<UUID>()
@@ -17,7 +19,7 @@ struct PanelView: View {
     @State private var copiedID: UUID?
     @State private var accessibilityGranted = AXIsProcessTrusted()
 
-    private enum Field: Hashable { case composer, search }
+    private enum Field: Hashable { case composer, search, newWorkspace }
     @FocusState private var focusedField: Field?
 
     var body: some View {
@@ -41,6 +43,7 @@ struct PanelView: View {
         .background(shortcutButtons)
         .overlay(sectionSwitcher)
         .overlay(syncOverlay)
+        .overlay(newWorkspaceModal)
         .onDrop(of: [UTType.image.identifier, UTType.fileURL.identifier], isTargeted: nil, perform: handleDrop)
         .onReceive(NotificationCenter.default.publisher(for: .promptPanelDidShow)) { _ in
             focusedField = .composer
@@ -66,7 +69,7 @@ struct PanelView: View {
                 .foregroundStyle(.secondary)
             }
             .buttonStyle(.plain)
-            .help("Switch section (Cmd+K)")
+            .help("Switch workspace (Cmd+K)")
 
             Spacer()
 
@@ -113,7 +116,7 @@ struct PanelView: View {
     private var searchField: some View {
         HStack(spacing: 8) {
             Image(systemName: "magnifyingglass").foregroundStyle(.secondary)
-            TextField("Search all sections", text: $search)
+            TextField("Search all workspaces", text: $search)
                 .textFieldStyle(.plain)
                 .focused($focusedField, equals: .search)
                 .onExitCommand {
@@ -190,8 +193,21 @@ struct PanelView: View {
         .padding(.vertical, 48)
     }
 
+    /// Rows are checklists by default: a checkbox to tick an item off, with the
+    /// rest of the row copying on click. The row cannot be a Button because the
+    /// checkbox is one, and nested buttons do not receive clicks.
     private func row(for item: PromptItem, sectionName: String) -> some View {
-        Button { handleClick(item) } label: {
+        HStack(alignment: .top, spacing: 8) {
+            Button {
+                store.toggleDone(item.id)
+            } label: {
+                Image(systemName: item.done ? "checkmark.circle.fill" : "circle")
+                    .font(.system(size: 15))
+                    .foregroundStyle(item.done ? Color.accentColor : Color.secondary.opacity(0.55))
+            }
+            .buttonStyle(.plain)
+            .help(item.done ? "Mark as not done" : "Mark as done")
+
             VStack(alignment: .leading, spacing: 6) {
                 if !sectionName.isEmpty {
                     Text(sectionName.uppercased())
@@ -205,13 +221,12 @@ struct PanelView: View {
                         Text(sourceApp)
                     }
                     Text(item.createdAt, style: .time)
-                    if item.done {
-                        Image(systemName: "checkmark")
-                    }
                 }
                 .font(.caption2)
                 .foregroundStyle(.tertiary)
             }
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
         .padding(10)
         .frame(maxWidth: .infinity, alignment: .leading)
         .background(rowBackground(item))
@@ -225,9 +240,9 @@ struct PanelView: View {
                     .transition(.opacity)
             }
         }
-        }
-        .buttonStyle(.plain)
-        .help("Click to copy · Cmd+click to select several · Shift+click for a range · right-click for more")
+        .contentShape(Rectangle())
+        .onTapGesture { handleClick(item) }
+        .help("Click to copy · checkbox to tick off · Cmd+click to select several · Shift+click for a range · right-click for more")
         .contextMenu { contextMenu(for: item) }
     }
 
@@ -315,12 +330,8 @@ struct PanelView: View {
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity)
             VStack(spacing: 0) {
-                ForEach(store.sections) { section in
-                    Button {
-                        store.activeSectionID = section.id
-                        showSectionSwitcher = false
-                    } label: {
-                        HStack {
+                ForEach(Array(store.sections.enumerated()), id: \.element.id) { index, section in
+                    HStack(spacing: 6) {
                         Text(section.name)
                             .font(.callout)
                         Spacer()
@@ -332,22 +343,44 @@ struct PanelView: View {
                                 .font(.caption)
                                 .foregroundStyle(Color.accentColor)
                         }
+                        // Reorder the workspace list; the boundary rows are
+                        // disabled rather than hidden so the list does not jump.
+                        HStack(spacing: 0) {
+                            Button {
+                                store.moveSection(section.id, by: -1)
+                            } label: {
+                                Image(systemName: "chevron.up")
+                            }
+                            .disabled(index == 0)
+                            Button {
+                                store.moveSection(section.id, by: 1)
+                            } label: {
+                                Image(systemName: "chevron.down")
+                            }
+                            .disabled(index == store.sections.count - 1)
+                        }
+                        .buttonStyle(.plain)
+                        .font(.system(size: 9, weight: .bold))
+                        .foregroundStyle(.tertiary)
                     }
                     .padding(.horizontal, 14)
                     .padding(.vertical, 8)
                     .contentShape(Rectangle())
+                    .onTapGesture {
+                        store.activeSectionID = section.id
+                        showSectionSwitcher = false
                     }
-                    .buttonStyle(.plain)
                 }
                 Divider()
                 Button {
-                    composer = "# "
                     showSectionSwitcher = false
-                    focusedField = .composer
+                    newWorkspaceName = ""
+                    showNewWorkspace = true
+                    focusedField = .newWorkspace
                 } label: {
                     HStack {
                         Image(systemName: "plus")
-                        Text("New Section")
+                        Text("New Workspace")
                         Spacer()
                     }
                     .padding(.horizontal, 14)
@@ -465,6 +498,53 @@ struct PanelView: View {
         }
     }
 
+    // MARK: - New workspace
+
+    @ViewBuilder
+    private var newWorkspaceModal: some View {
+        if showNewWorkspace {
+            ZStack {
+                Color.black.opacity(0.25)
+                    .onTapGesture { dismissNewWorkspace() }
+                VStack(alignment: .leading, spacing: 12) {
+                    Text("New Workspace")
+                        .font(.headline)
+                    TextField("Name", text: $newWorkspaceName)
+                        .textFieldStyle(.roundedBorder)
+                        .focused($focusedField, equals: .newWorkspace)
+                        .onSubmit(createWorkspace)
+                        .onExitCommand { dismissNewWorkspace() }
+                    HStack {
+                        Spacer()
+                        Button("Cancel") { dismissNewWorkspace() }
+                        Button("Create") { createWorkspace() }
+                            .keyboardShortcut(.defaultAction)
+                            .disabled(newWorkspaceName.trimmingCharacters(in: .whitespaces).isEmpty)
+                    }
+                }
+                .padding(16)
+                .frame(width: 260)
+                .background(.regularMaterial)
+                .cornerRadius(12)
+                .shadow(radius: 18)
+            }
+            .transition(.opacity)
+        }
+    }
+
+    private func createWorkspace() {
+        let name = newWorkspaceName.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !name.isEmpty else { return }
+        store.createSection(named: name)
+        dismissNewWorkspace()
+    }
+
+    private func dismissNewWorkspace() {
+        showNewWorkspace = false
+        newWorkspaceName = ""
+        focusedField = .composer
+    }
+
     // MARK: - Selection
 
     private var selectionBar: some View {

Sources/Prompt/Store.swift

@@ -38,11 +38,17 @@ final class Store: ObservableObject {
     private let storeFile: URL
     private let imageCache = NSCache<NSString, NSImage>()
 
-    init() {
+    /// `directory` is injectable so the store can be exercised against a
+    /// scratch folder instead of the user's real data.
+    init(directory: URL? = nil) {
+        if let directory {
+            self.directory = directory
+        } else {
             let appSupport = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
-        directory = appSupport.appendingPathComponent("Prompt", isDirectory: true)
-        imagesDirectory = directory.appendingPathComponent("Images", isDirectory: true)
-        storeFile = directory.appendingPathComponent("store.json")
+            self.directory = appSupport.appendingPathComponent("Prompt", isDirectory: true)
+        }
+        imagesDirectory = self.directory.appendingPathComponent("Images", isDirectory: true)
+        storeFile = self.directory.appendingPathComponent("store.json")
 
         try? FileManager.default.createDirectory(at: imagesDirectory, withIntermediateDirectories: true)
         load()
@@ -130,6 +136,18 @@ final class Store: ObservableObject {
         return section
     }
 
+    /// Reorders a workspace within the list. The UI calls these "workspaces";
+    /// the model and the persisted JSON keep the original `sections` naming so
+    /// existing stores and sync payloads keep working.
+    func moveSection(_ id: UUID, by offset: Int) {
+        guard let index = sections.firstIndex(where: { $0.id == id }) else { return }
+        let target = index + offset
+        guard sections.indices.contains(target) else { return }
+        let section = sections.remove(at: index)
+        sections.insert(section, at: target)
+        save()
+    }
+
     // MARK: - Items
 
     @discardableResult