Restore pasting and rename sections to workspaces

Replacing the main menu dropped the Edit menu that AppKit routes Cmd+V/C/A/Z through, so the composer could not paste at all. The menu is rebuilt with those items, which --diag now dumps so the wiring can be checked without a keyboard. Workspaces also gained an order: the Cmd+K switcher has up/down controls, creating one opens a naming modal instead of prefilling the composer, and the UI now says workspace throughout. The stored JSON keeps the original `sections` keys so existing data and sync payloads stay valid.
Let a multi-selection be copied as plain lines as well as a list
2026-10-09 17:29:16 +08:00 · 2026-10-09 17:18:04 +08:00
5 changed files with 287 additions and 65 deletions
@@ -26,12 +26,15 @@ clicking an item copies it back to the clipboard.
  `~/Library/Application Support/Prompt/store.json`; images are PNG files in
  `Images/` next to it, cached in an `NSCache`. Owns all mutations (add,
  toggle done, edit, delete, move, merge, clear done) and clipboard writes
-  (`copy`, `copyAsList`). Saves on every mutation.
+  (`copy`, `copyAsList` for numbered output, `copyAsLines` for plain newlines;
+  both text modes skip image items). Saves on every mutation.
 - `Sources/Prompt/PanelView.swift` — the panel UI. Header (section switcher,
  search, add photos, close), item list, composer. Composer `# Name` creates/
-  switches sections. Click = copy; Cmd+click = multi-select; right-click =
-  context menu (Copy, Copy as List, Done, Edit, Open, Merge, Move To, Delete).
-  Drop target for images/files.
+  switches sections. Click = copy; Cmd+click toggles multi-select, Shift+click
+  selects a range, and a selection bar offers Copy as List / Copy as Lines;
+  right-click = context menu (Copy, Copy as List, Copy as Lines, Done, Edit,
+  Open, Merge, Move To, Delete). Esc clears the selection before it hides the
+  panel. Drop target for images/files.
 - `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel`
  (`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as
  `PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController`
@@ -153,10 +156,19 @@ brew upgrade --cask prompt

 ## Gotchas

+- **Setting `NSApp.mainMenu` replaces SwiftUI's default menu.** SwiftUI installs
+  a menu containing the standard Edit items, and AppKit routes Cmd+C/V/X/A/Z
+  through those items — so a hand-built menu with only Hide/Quit silently
+  breaks pasting, copying and select-all in the composer. `setupMainMenu()`
+  therefore rebuilds an Edit menu with `undo:`/`redo:`/`cut:`/`copy:`/`paste:`/
+  `selectAll:` (nil targets, so they travel the responder chain to the field
+  editor). `Prompt --diag` dumps the menu so this can be checked without a
+  keyboard.
 - **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
-  shortcuts that TextFields don't use are bound (Cmd+F/K/N, Shift+Cmd+C).
+  shortcuts that TextFields don't use are bound (Cmd+F/K/N, Shift+Cmd+C,
+  Option+Cmd+C).
  This is why Copy has no in-panel shortcut: click-to-copy is the primary
  gesture, matching Copper's intent.
 - The panel is a `.nonactivatingPanel`; its `canBecomeKey` override is what
@@ -7,9 +7,13 @@ to your work. Click anything to copy it back to your clipboard.
 - **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.
- **Copy as List** — Cmd+click to multi-select, right-click → Copy as List
-  (or Shift+Cmd+C) for a numbered list ready to paste into a chat.
+- **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.
 - **Merge Notes, Mark as Done, Edit, Move To** — right-click any item.
 - **Search** — Cmd+F searches across all sections.
 - **Sync (optional)** — generate an 8-digit code (`1234-5678`) on one Mac and
@@ -24,11 +28,13 @@ 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+, |
 | Copy selection as numbered list | Shift+Cmd+C |
+| Copy selection as plain lines | Option+Cmd+C |
+| Clear selection | Esc |
 | Close panel | Esc |

 Double-Shift gestures require **Accessibility access** (Prompt reads the
@@ -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()
+            setupMainMenu()
            DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
                self.writeDiagnostics()
                NSApp.terminate(nil)
@@ -113,24 +114,40 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
    /// 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.
+    ///
+    /// The Edit menu is not decoration: AppKit routes Cmd+C/V/X/A/Z through
+    /// these items, so a minimal main menu silently breaks pasting and
+    /// selecting in the composer.
    private func setupMainMenu() {
        let mainMenu = NSMenu()
+
        let appMenuItem = NSMenuItem()
        mainMenu.addItem(appMenuItem)
-
-        let appMenu = NSMenu()
+        let appMenu = NSMenu(title: "Prompt")
        appMenuItem.submenu = appMenu

        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)

+        let editMenuItem = NSMenuItem()
+        mainMenu.addItem(editMenuItem)
+        let editMenu = NSMenu(title: "Edit")
+        editMenuItem.submenu = editMenu
+
+        editMenu.addItem(withTitle: "Undo", action: Selector(("undo:")), keyEquivalent: "z")
+        let redo = editMenu.addItem(withTitle: "Redo", action: Selector(("redo:")), keyEquivalent: "z")
+        redo.keyEquivalentModifierMask = [.command, .shift]
+        editMenu.addItem(.separator())
+        editMenu.addItem(withTitle: "Cut", action: #selector(NSText.cut(_:)), keyEquivalent: "x")
+        editMenu.addItem(withTitle: "Copy", action: #selector(NSText.copy(_:)), keyEquivalent: "c")
+        editMenu.addItem(withTitle: "Paste", action: #selector(NSText.paste(_:)), keyEquivalent: "v")
+        editMenu.addItem(withTitle: "Select All", action: #selector(NSText.selectAll(_:)), keyEquivalent: "a")
+
        NSApp.mainMenu = mainMenu
    }

@@ -153,6 +170,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
        )
@@ -10,13 +10,16 @@ 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>()
+    @State private var lastSelectedID: UUID?
    @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 {
@@ -31,12 +34,16 @@ struct PanelView: View {
            Divider()
            content
            Divider()
+            if !selection.isEmpty {
+                selectionBar
+            }
            composerField
        }
        .frame(minWidth: 300)
        .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
@@ -62,7 +69,7 @@ struct PanelView: View {
                .foregroundStyle(.secondary)
            }
            .buttonStyle(.plain)
-            .help("Switch section (Cmd+K)")
+            .help("Switch workspace (Cmd+K)")

            Spacer()

@@ -109,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 {
@@ -223,6 +230,7 @@ struct PanelView: View {
            }
        }
        .buttonStyle(.plain)
+        .help("Click to copy · Cmd+click to select several · Shift+click for a range · right-click for more")
        .contextMenu { contextMenu(for: item) }
    }

@@ -262,7 +270,11 @@ struct PanelView: View {
            Button("Copy") { copy(item) }
            Button("Copy as List") {
                store.copyAsList(ids: effectiveIDs(for: item))
-                flashCopied(item)
+                flashCopied(item.id)
+            }
+            Button("Copy as Lines") {
+                store.copyAsLines(ids: effectiveIDs(for: item))
+                flashCopied(item.id)
            }
            Divider()
            Button(item.done ? "Mark as Not Done" : "Mark as Done") { store.toggleDone(item.id) }
@@ -279,7 +291,7 @@ struct PanelView: View {
            if selection.count > 1, selection.contains(item.id) {
                Button("Merge Notes") {
                    store.merge(ids: selection)
-                    selection.removeAll()
+                    clearSelection()
                }
            }
            Menu("Move To") {
@@ -306,39 +318,57 @@ struct PanelView: View {
            }
            .frame(maxWidth: .infinity, maxHeight: .infinity)
            VStack(spacing: 0) {
-                ForEach(store.sections) { section in
-                    Button {
+                ForEach(Array(store.sections.enumerated()), id: \.element.id) { index, section in
+                    HStack(spacing: 6) {
+                        Text(section.name)
+                            .font(.callout)
+                        Spacer()
+                        Text("\(section.items.count)")
+                            .font(.caption)
+                            .foregroundStyle(.tertiary)
+                        if section.id == store.activeSection.id {
+                            Image(systemName: "checkmark")
+                                .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
-                    } label: {
-                        HStack {
-                            Text(section.name)
-                                .font(.callout)
-                            Spacer()
-                            Text("\(section.items.count)")
-                                .font(.caption)
-                                .foregroundStyle(.tertiary)
-                            if section.id == store.activeSection.id {
-                                Image(systemName: "checkmark")
-                                    .font(.caption)
-                                    .foregroundStyle(Color.accentColor)
-                            }
-                        }
-                        .padding(.horizontal, 14)
-                        .padding(.vertical, 8)
-                        .contentShape(Rectangle())
                    }
-                    .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)
@@ -456,6 +486,96 @@ 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 {
+        HStack(spacing: 12) {
+            Text("\(selection.count) selected")
+                .font(.caption)
+                .foregroundStyle(.secondary)
+            Spacer()
+            Button("Copy as List") { copySelection(asList: true) }
+                .font(.caption)
+                .buttonStyle(.plain)
+                .foregroundStyle(Color.accentColor)
+            Button("Copy as Lines") { copySelection(asList: false) }
+                .font(.caption)
+                .buttonStyle(.plain)
+                .foregroundStyle(Color.accentColor)
+            Button { clearSelection() } label: {
+                Image(systemName: "xmark.circle.fill")
+            }
+            .buttonStyle(.plain)
+            .foregroundStyle(.tertiary)
+            .help("Clear selection (Esc)")
+        }
+        .padding(.horizontal, 12)
+        .padding(.vertical, 6)
+        .background(Color.accentColor.opacity(0.12))
+    }
+
+    private func copySelection(asList: Bool) {
+        guard !selection.isEmpty else { return }
+        if asList {
+            store.copyAsList(ids: selection)
+        } else {
+            store.copyAsLines(ids: selection)
+        }
+        if let id = selection.first { flashCopied(id) }
+    }
+
+    private func clearSelection() {
+        selection.removeAll()
+        lastSelectedID = nil
+    }
+
    // MARK: - Composer

    private var composerField: some View {
@@ -464,7 +584,15 @@ struct PanelView: View {
                .textFieldStyle(.plain)
                .focused($focusedField, equals: .composer)
                .onSubmit(submit)
-                .onExitCommand { PanelController.shared.hide() }
+                .onExitCommand {
+                    // Esc clears a selection first, and only hides the panel
+                    // once there is nothing selected.
+                    if selection.isEmpty {
+                        PanelController.shared.hide()
+                    } else {
+                        clearSelection()
+                    }
+                }
            if !composer.isEmpty {
                Button(action: submit) { Image(systemName: "arrow.up.circle.fill") }
                    .buttonStyle(.plain)
@@ -506,11 +634,13 @@ struct PanelView: View {
            }
            .keyboardShortcut(",", modifiers: .command)
            Button("") {
-                guard !selection.isEmpty else { return }
-                store.copyAsList(ids: selection)
-                if let id = selection.first { flashCopied(PromptItem(id: id, content: .text(""))) }
+                copySelection(asList: true)
            }
            .keyboardShortcut("c", modifiers: [.command, .shift])
+            Button("") {
+                copySelection(asList: false)
+            }
+            .keyboardShortcut("c", modifiers: [.command, .option])
        }
        .opacity(0)
        .frame(width: 0, height: 0)
@@ -520,26 +650,40 @@ struct PanelView: View {
    // MARK: - Actions

    private func handleClick(_ item: PromptItem) {
-        if NSApp.currentEvent?.modifierFlags.contains(.command) == true {
+        let modifiers = NSApp.currentEvent?.modifierFlags ?? []
+        if modifiers.contains(.command) {
            if selection.contains(item.id) {
                selection.remove(item.id)
            } else {
                selection.insert(item.id)
            }
+            lastSelectedID = item.id
+            return
+        }
+        if modifiers.contains(.shift), let anchor = lastSelectedID, anchor != item.id {
+            selectRange(from: anchor, to: item.id)
            return
        }
        copy(item)
    }

-    private func copy(_ item: PromptItem) {
-        store.copy(item)
-        flashCopied(item)
+    private func selectRange(from anchor: UUID, to target: UUID) {
+        let ids = displayedItems.map(\.item.id)
+        guard let start = ids.firstIndex(of: anchor), let end = ids.firstIndex(of: target) else { return }
+        let range = start <= end ? start...end : end...start
+        selection = Set(ids[range])
+        lastSelectedID = target
    }

-    private func flashCopied(_ item: PromptItem) {
-        withAnimation { copiedID = item.id }
+    private func copy(_ item: PromptItem) {
+        store.copy(item)
+        flashCopied(item.id)
+    }
+
+    private func flashCopied(_ id: UUID) {
+        withAnimation { copiedID = id }
        DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {
-            if copiedID == item.id {
+            if copiedID == id {
                withAnimation { copiedID = nil }
            }
        }
@@ -38,11 +38,17 @@ final class Store: ObservableObject {
    private let storeFile: URL
    private let imageCache = NSCache<NSString, NSImage>()

-    init() {
-        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")
+    /// `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]
+            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
@@ -269,18 +287,34 @@ final class Store: ObservableObject {
    }

    func copyAsList(ids: Set<UUID>) {
-        let items = sections.flatMap(\.items)
-            .filter { ids.contains($0.id) }
-            .sorted { $0.createdAt < $1.createdAt }
-        let texts = items.compactMap { item -> String? in
-            if case .text(let text) = item.content { return text }
-            return nil
-        }
+        let texts = selectedTexts(ids: ids)
        guard !texts.isEmpty else { return }
        let list = texts.enumerated().map { "\($0.offset + 1). \($0.element)" }.joined(separator: "\n")
+        writeToPasteboard(list)
+    }
+
+    /// Same selection as `copyAsList`, but joined with plain newlines so it
+    /// drops into a prompt without numbering.
+    func copyAsLines(ids: Set<UUID>) {
+        let texts = selectedTexts(ids: ids)
+        guard !texts.isEmpty else { return }
+        writeToPasteboard(texts.joined(separator: "\n"))
+    }
+
+    private func selectedTexts(ids: Set<UUID>) -> [String] {
+        sections.flatMap(\.items)
+            .filter { ids.contains($0.id) }
+            .sorted { $0.createdAt < $1.createdAt }
+            .compactMap { item in
+                if case .text(let text) = item.content { return text }
+                return nil
+            }
+    }
+
+    private func writeToPasteboard(_ string: String) {
        let pasteboard = NSPasteboard.general
        pasteboard.clearContents()
-        pasteboard.setString(list, forType: .string)
+        pasteboard.setString(string, forType: .string)
    }

    // MARK: - Images