Search: David's fix-up round 2, part A (frontend, TDD)

Dialog states made honest: the result list itself shows the spinner plus "Searching..." label while a search is in flight, and lays out "No files match these criteria:" with the active filter set when nothing matches; the status bar stops duplicating either message. Recent-searches strip gains a "Recent searches:" label so it's clear what these are. The two right-edge footer buttons (Go to file, Show all in main window) are always rendered now and disable when their preconditions don't hold, so the layout doesn't shift while typing.

⏎ ownership swaps dynamically: a new `lastDialogEvent` discriminator drives a `deriveEnterAction` helper that decides whether Enter runs a search (after a query or filter edit, or when no results are showing) or opens the cursor result (after results arrive or the cursor moves). The bar reads "Search ⏎" only when Enter runs a search; the footer's Go to file reads "Go to file ⏎" only when Enter opens; exactly one shows the hint at any moment.

Shortcut allocation finalized: ⌥A / ⌥F / ⌥R switch mode chips globally inside the dialog; ⌥⏎ shows all in the main window; ⌥C / ⌥V (popover-scoped) replace the old global ⌥F / ⌥D for "Use current folder" / "All folders" inside Search in. The stale global ⌥F/⌥D scope handlers are removed.

22 new Vitest cases (deriveEnterAction's 8-permutation table, search-states content vs status-bar split, recent-searches label, always-on footer buttons) plus 3 updated test files for the new contracts. All 320 search tests green.

Still pending in this fix-up: filter list-style popovers (Size, Modified), inline shortcut hint pills on mode chips, header-column alignment in the result list, ResizeObserver-driven path-pill width measurement, "Use current folder" smart fallback via nav history, snapshot-pane keyboard nav (PgUp/PgDn/Home/End/Space/⇧↑↓/⌘A), and context-menu fixes in the snapshot pane (Show in Finder, Open, Open with, Copy path, Copy filename label and payload).

Author: vdavid

apps/desktop/src/lib/search/CLAUDE.md

@@ -80,25 +80,55 @@ There is **no `aiPrompt` state and no `namePattern` state**. M2 deleted both. An
 
 ## Keyboard shortcuts (in-dialog, hard-coded)
 
-| Shortcut  | Action                                                              |
-| --------- | ------------------------------------------------------------------- |
-| `Enter`   | Run search in the active mode (AI in AI mode, manual otherwise)     |
-| `⌘Enter`  | Run AI search regardless of active mode (only when AI is enabled)   |
-| `⌘N`      | Clear all dialog state ("new search")                               |
-| `⌘H`      | Toggle the recent-searches popover (fuzzy over the full history)    |
-| `⌘1`      | Switch to AI (AI on) or Filename (AI off)                           |
-| `⌘2`      | Switch to Filename (AI on) or Regex (AI off)                        |
-| `⌘3`      | Switch to Regex (AI on); no-op when AI is off                       |
-| `⌘4`      | Reserved for Content when it ships; not wired now                   |
-| `⌥F`      | Set scope to the focused pane's current directory                   |
-| `⌥D`      | Clear the scope (search the whole drive)                            |
-| `⌥A`      | Show all results in the main window (snapshot opens in active pane) |
-| `⌥←`      | Navigate the active pane to the cursor row's parent folder          |
-| `⌥→`      | Navigate the active pane to the cursor row's path (descend back)    |
-| `↑` / `↓` | Move the cursor through the results list (loops top<->bottom)       |
-| `←` / `→` | When focus is on a mode chip: move between chips (skip Content)     |
-| `Tab`     | Trapped within the dialog; cycles through interactive elements      |
-| `Escape`  | Close the dialog                                                    |
+Final round-2 allocation. ⏎ has dynamic ownership (see D8 below).
+
+| Shortcut  | Action                                                            |
+| --------- | ----------------------------------------------------------------- |
+| `Enter`   | Dispatched via `enterAction`: "go-to-file" or "run-search" (D8)   |
+| `⌥⏎`      | Show all results in the main window (replaces round-1's ⌥A)       |
+| `⌘Enter`  | Run AI search regardless of active mode (only when AI is enabled) |
+| `⌘N`      | Clear all dialog state ("new search")                             |
+| `⌘H`      | Toggle the recent-searches popover (fuzzy over the full history)  |
+| `⌘1`      | Switch to AI (AI on) or Filename (AI off)                         |
+| `⌘2`      | Switch to Filename (AI on) or Regex (AI off)                      |
+| `⌘3`      | Switch to Regex (AI on); no-op when AI is off                     |
+| `⌘4`      | Reserved for Content when it ships; not wired now                 |
+| `⌥A`      | Mode chip: AI (global inside the dialog; only when AI is enabled) |
+| `⌥F`      | Mode chip: Filename (global)                                      |
+| `⌥R`      | Mode chip: Regex (global)                                         |
+| `⌥C`      | Inside Search-in popover only: Use current folder                 |
+| `⌥V`      | Inside Search-in popover only: All folders                        |
+| `⌥←`      | Navigate the active pane to the cursor row's parent folder        |
+| `⌥→`      | Navigate the active pane to the cursor row's path (descend back)  |
+| `↑` / `↓` | Move the cursor through the results list (loops top<->bottom)     |
+| `←` / `→` | When focus is on a mode chip: move between chips (skip Content)   |
+| `Tab`     | Trapped within the dialog; cycles through interactive elements    |
+| `Escape`  | Close the dialog                                                  |
+
+### Round 2 D8: `⏎` ownership swap
+
+`search-state.svelte.ts` carries `lastDialogEvent: LastDialogEvent` (one of `opened`, `results-arrived`, `cursor-moved`,
+`query-edited`, `filter-edited`). The pure helper `deriveEnterAction({ lastEvent, resultsCount })` returns
+`'go-to-file' | 'run-search'`:
+
+- `'go-to-file'` when there are results AND the last event was `results-arrived` or `cursor-moved` (the user just got a
+  list back or is browsing it). Pressing ⏎ opens the cursor row in the active pane.
+- `'run-search'` otherwise (zero results, freshly opened, query/filter just edited). Pressing ⏎ runs the search.
+
+The bar's Search button reads `Search ⏎` only when `enterAction === 'run-search'`; the footer's `Go to file` button
+reads `Go to file ⏎` only when `enterAction === 'go-to-file'`. Exactly one of them surfaces the hint at any time. Tests
+in `enter-action.test.ts` pin the eight-permutation table.
+
+### Round 2 D9: scope shortcuts moved inside the popover
+
+Round 1's global `⌥F` / `⌥D` are gone. `⌥F` is now the Filename mode chip globally. The scope actions live as `⌥C` (Use
+current folder) and `⌥V` (All folders), active ONLY while the Search-in popover is open. They're wired via a top-level
+`<svelte:window>` in `SearchFilterChips.svelte` that gates on `openChip === 'scope'`.
+
+### Round 2 D6: footer buttons always visible
+
+Both `Go to file` and `Show all in main window` render unconditionally; when there are no results (or the index isn't
+ready) they render disabled instead of hidden, so the layout stays still while the user types.
 
 The Content chip is visible-disabled with a "Coming soon" tooltip. It has **no** shortcut. Wiring a shortcut to a
 disabled control is hostile UX (either silent no-op or a popup on every press); reserving `⌘4` is the better contract.

apps/desktop/src/lib/search/RecentSearchesFooter.label.svelte.test.ts

@@ -0,0 +1,41 @@
+/**
+ * D5: the recent-searches strip carries a "Recent searches:" label prefix so
+ * the user can read what those chips are without needing context.
+ */
+import { describe, expect, it } from 'vitest'
+import { mount, tick } from 'svelte'
+import RecentSearchesFooter from './RecentSearchesFooter.svelte'
+import type { HistoryEntry } from '$lib/tauri-commands'
+
+function entry(query: string): HistoryEntry {
+  return {
+    id: query,
+    timestamp: 0,
+    mode: 'filename',
+    query,
+    filters: {},
+    scope: '',
+    caseSensitive: false,
+    excludeSystemDirs: true,
+    resultCount: 0,
+  } as HistoryEntry
+}
+
+describe('RecentSearchesFooter D5: label', () => {
+  it('renders a "Recent searches:" label when there are entries', async () => {
+    const target = document.createElement('div')
+    document.body.appendChild(target)
+    mount(RecentSearchesFooter, {
+      target,
+      props: {
+        entries: [entry('*.pdf'), entry('*.jpg')],
+        disabled: false,
+        onPick: () => {},
+        onRemove: () => {},
+        onOpenAll: () => {},
+      },
+    })
+    await tick()
+    expect(target.textContent ?? '').toContain('Recent searches:')
+  })
+})

apps/desktop/src/lib/search/RecentSearchesFooter.svelte

@@ -40,6 +40,8 @@
 
 {#if visible.length > 0}
     <div class="recent-footer" role="region" aria-label="Recent searches">
+        <!-- D5: explicit label so the user can read what these chips are. -->
+        <span class="recent-label">Recent searches:</span>
         {#each visible as entry (entry.id)}
             <button
                 type="button"
@@ -84,6 +86,14 @@
         scrollbar-width: thin;
     }
 
+    /* D5: leading label so the user reads the strip as "Recent searches: …". */
+    .recent-label {
+        font-size: var(--font-size-sm);
+        color: var(--color-text-tertiary);
+        white-space: nowrap;
+        margin-right: var(--spacing-xxs);
+    }
+
     .recent-chip,
     .all-searches {
         display: inline-flex;

apps/desktop/src/lib/search/SearchBar.svelte

@@ -32,6 +32,12 @@
         aiHighlight: boolean
         /** True when the bar should show the "Press Enter to search" hint. Owned by the parent. */
         showRunHint?: boolean
+        /**
+         * D8: when true, the Search button surfaces the `⏎` shortcut hint. The dialog
+         * owns the ⏎ ownership swap; when this is false, the hint moves to the
+         * footer's "Go to file" button.
+         */
+        showEnterHint?: boolean
         onInput: (value: string) => void
         /** Click handler for the ⏎ run button. Equivalent to pressing Enter in the input. */
         onRun: () => void
@@ -49,6 +55,7 @@
         disabled,
         aiHighlight,
         showRunHint = false,
+        showEnterHint = true,
         onInput,
         onRun,
         onCompositionStart,
@@ -103,6 +110,8 @@
     {#if showRunHint}
         <span class="run-hint" aria-hidden="true">Press Enter to search</span>
     {/if}
+    <!-- D8: button reads "Search ⏎" when ⏎ owns the run action; just "Search" when
+         the footer's Go-to-file owns ⏎. Exactly one of the two surfaces the hint. -->
     <button
         type="button"
         class="run-button"
@@ -112,6 +121,8 @@
         aria-label={runTitle}
     >
         <IconCornerDownLeft />
+        <span class="run-label">Search</span>
+        {#if showEnterHint}<span class="run-enter-hint" aria-hidden="true">⏎</span>{/if}
     </button>
 </div>
 
@@ -166,14 +177,27 @@
         flex-shrink: 0;
         display: inline-flex;
         align-items: center;
+        gap: var(--spacing-xxs);
         justify-content: center;
-        padding: var(--spacing-xxs) var(--spacing-xs);
+        padding: var(--spacing-xxs) var(--spacing-sm);
         background: transparent;
         border: 1px solid var(--color-border-subtle);
         border-radius: var(--radius-sm);
         color: var(--color-text-secondary);
         cursor: default;
         line-height: 1;
+        font-size: var(--font-size-sm);
+    }
+
+    .run-label {
+        line-height: 1;
+    }
+
+    .run-enter-hint {
+        font-family: var(--font-mono);
+        font-size: var(--font-size-xs);
+        color: var(--color-text-tertiary);
+        opacity: 0.8;
     }
 
     .run-button:hover:not(:disabled) {