Navigation: migrate every bare-path caller to { location } (staging step 2)

Each edge that fed a bare path into navigation now resolves it to a `Location` (volume id + path) FIRST, so navigation always lands on the right volume — the fix for the search-result-over-SMB bug. Failures surface a friendly toast (or a typed MCP `ok: false`) instead of a wrong-volume listing.

Migrated callers:
- Search "Go to file" (`handleSearchNavigate`): now delegates to a shared, testable `revealSearchResultInPane` (resolve the parent dir's volume → navigate → move cursor onto the file). A result can live on any volume, so it can't assume the pane's.
- MCP `nav_to_path`: resolves the path first, then routes `{ location }`; unresolvable → typed refusal. The on-network refusal NARROWS — a local target from a network pane now switches and navigates; only an `smb://` target still refuses.
- ⌘G "Go to path" and ⌘J "Go to latest download": resolve the per-variant dir on the FE at jump/reveal time (`resolve_go_to_path` stays pure, no per-keystroke statfs).
- `mirrorLocalStateToPane`: the cross-volume/in-place split folds into `{ location }`; the same-volume same-path no-op is preserved (routing it through `{ location }` would reload the listing).
- Search-results row activation (`FilePane`): resolving a real entry now bubbles a `Location` via a new `onGoToLocation` callback (the go-to-a-location intent, distinct from `onVolumeChange`'s volume-(re)select), gated on the existing `isSearchResultsView` A6 classifier. Unresolvable now shows the shared toast (was a silent `log.warn`). Drops `FilePane.switchVolumeForRealPath` and its `isCrossVolumeNavigation` use.

Single-sources the resolve-or-toast as `resolveLocationOrToast` in `navigate-and-select.ts`, reused by the ⌘G, ⌘J, search, and snapshot-row edges. New shared string `fileExplorer.navigation.locationUnreachableToast`.

Tests: the search edge (resolve + reveal, failure → toast), MCP `nav_to_path` (resolve → navigate, unresolvable → ok:false, refusal verbatim), and updated ⌘G / ⌘J edge tests. The bare `{ path }` arm still exists; its removal is the final step.

Author: vdavid

apps/desktop/src/lib/downloads/go-to-latest.test.ts

@@ -9,6 +9,7 @@ const {
   downloadsWatcherStatusMock,
   addToastMock,
   openPrivacySettingsMock,
+  resolveLocationMock,
   navigateMock,
   moveCursorMock,
   getFocusedPaneMock,
@@ -19,6 +20,8 @@ const {
   downloadsWatcherStatusMock: vi.fn(),
   addToastMock: vi.fn(() => 'toast-id'),
   openPrivacySettingsMock: vi.fn(() => Promise.resolve()),
+  // The download's parent dir resolves to a `Location` on the `root` volume.
+  resolveLocationMock: vi.fn((path: string) => Promise.resolve({ ok: true as const, location: { volumeId: 'root', path } })),
   // `navigate()` returns a `NavigateResult`; default to a started no-op.
   navigateMock: vi.fn((): NavigateResult => ({ status: 'started', settled: Promise.resolve() })),
   moveCursorMock: vi.fn(() => Promise.resolve()),
@@ -49,6 +52,10 @@ vi.mock('$lib/tauri-commands', () => ({
   openPrivacySettings: openPrivacySettingsMock,
 }))
 
+vi.mock('$lib/file-explorer/navigation/resolve-location', () => ({
+  resolveLocation: resolveLocationMock,
+}))
+
 // Component imports return opaque module refs; we only assert that the same
 // reference is passed to `addToast` (proves the dedup id wires the right toast).
 vi.mock('./LatestDownloadEmptyToastContent.svelte', () => ({
@@ -68,6 +75,12 @@ import LatestDownloadEmptyToastContent from './LatestDownloadEmptyToastContent.s
 import LatestDownloadFdaToastContent from './LatestDownloadFdaToastContent.svelte'
 import type { ExplorerAPI } from '../../routes/(main)/explorer-api'
 
+/** Flush the queued microtasks (the async `onGoToDownloads` resolve-then-navigate). */
+async function flushMicrotasks(): Promise<void> {
+  await Promise.resolve()
+  await Promise.resolve()
+}
+
 function makeExplorerStub(): ExplorerAPI {
   // Only the methods these helpers touch need real stubs. Everything else is
   // unused; the typed stub avoids a `Partial<ExplorerAPI>` cast leaking into the
@@ -102,6 +115,9 @@ describe('goToLatestDownload', () => {
     downloadsWatcherStatusMock.mockReset()
     addToastMock.mockReset().mockReturnValue('toast-id')
     openPrivacySettingsMock.mockReset().mockResolvedValue(undefined)
+    resolveLocationMock
+      .mockReset()
+      .mockImplementation((path: string) => Promise.resolve({ ok: true as const, location: { volumeId: 'root', path } }))
     navigateMock.mockReset().mockReturnValue({ status: 'started', settled: Promise.resolve() })
     moveCursorMock.mockReset().mockResolvedValue(undefined)
     getFocusedPaneMock.mockReset().mockReturnValue('left')
@@ -122,7 +138,7 @@ describe('goToLatestDownload', () => {
 
     await goToLatestDownload(makeExplorerStub())
 
-    expect(navigateMock).toHaveBeenCalledWith({ pane: 'right', to: { path: '/Users/me/Downloads' }, source: 'user' })
+    expect(navigateMock).toHaveBeenCalledWith({ pane: 'right', to: { location: { volumeId: 'root', path: '/Users/me/Downloads' } }, source: 'user' })
     expect(moveCursorMock).toHaveBeenCalledWith('right', 'report.pdf')
     expect(addToastMock).not.toHaveBeenCalled()
   })
@@ -167,7 +183,7 @@ describe('goToLatestDownload', () => {
 
     await goToLatestDownload(makeExplorerStub())
 
-    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { path: '/Users/me/Downloads' }, source: 'user' })
+    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { location: { volumeId: 'root', path: '/Users/me/Downloads' } }, source: 'user' })
     expect(setFocusedPaneMock).not.toHaveBeenCalled()
     expect(moveCursorMock).toHaveBeenCalledWith('left', 'report.pdf')
   })
@@ -189,7 +205,7 @@ describe('goToLatestDownload', () => {
 
     await goToLatestDownload(makeExplorerStub())
 
-    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { path: '/Users/me/Downloads' }, source: 'user' })
+    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { location: { volumeId: 'root', path: '/Users/me/Downloads' } }, source: 'user' })
     expect(setFocusedPaneMock).not.toHaveBeenCalled()
     expect(moveCursorMock).toHaveBeenCalledWith('left', 'report.pdf')
   })
@@ -210,7 +226,7 @@ describe('goToLatestDownload', () => {
 
     await goToLatestDownload(makeExplorerStub())
 
-    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { path: '/Users/me/Downloads' }, source: 'user' })
+    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { location: { volumeId: 'root', path: '/Users/me/Downloads' } }, source: 'user' })
     expect(setFocusedPaneMock).not.toHaveBeenCalled()
   })
 
@@ -239,9 +255,11 @@ describe('goToLatestDownload', () => {
     // The "Go to Downloads" handler arrives as a prop (snapshotted closure
     // over the focused pane + Downloads dir), not via a module-state shim.
     expect(typeof options.props?.onGoToDownloads).toBe('function')
-    // Invoking the prop triggers the snapshotted navigation.
+    // Invoking the prop triggers the snapshotted navigation (which resolves the
+    // dir's volume first, so flush the microtasks before asserting).
     options.props?.onGoToDownloads()
-    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { path: '/Users/me/Downloads' }, source: 'user' })
+    await flushMicrotasks()
+    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { location: { volumeId: 'root', path: '/Users/me/Downloads' } }, source: 'user' })
     expect(moveCursorMock).not.toHaveBeenCalled()
   })
 
@@ -260,6 +278,7 @@ describe('goToLatestDownload', () => {
     // action must re-evaluate which pane shows the dir at CLICK time.
     paneShows('right', '/Users/me/Downloads')
     options.props?.onGoToDownloads()
+    await flushMicrotasks()
 
     // Pane reuse: focus the pane that shows Downloads, no fresh navigation.
     expect(navigateMock).not.toHaveBeenCalled()
@@ -335,6 +354,9 @@ describe('goToLatestDownload', () => {
 describe('goToDownload', () => {
   beforeEach(() => {
     addToastMock.mockReset().mockReturnValue('toast-id')
+    resolveLocationMock
+      .mockReset()
+      .mockImplementation((path: string) => Promise.resolve({ ok: true as const, location: { volumeId: 'root', path } }))
     navigateMock.mockReset().mockReturnValue({ status: 'started', settled: Promise.resolve() })
     moveCursorMock.mockReset().mockResolvedValue(undefined)
     getFocusedPaneMock.mockReset().mockReturnValue('left')
@@ -345,7 +367,7 @@ describe('goToDownload', () => {
   it('navigates the focused pane to parentDir and selects the file when neither pane shows it', async () => {
     await goToDownload(makeExplorerStub(), '/Users/me/Downloads', 'report.pdf')
 
-    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { path: '/Users/me/Downloads' }, source: 'user' })
+    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { location: { volumeId: 'root', path: '/Users/me/Downloads' } }, source: 'user' })
     expect(moveCursorMock).toHaveBeenCalledWith('left', 'report.pdf')
   })
 
@@ -375,7 +397,7 @@ describe('goToDownload', () => {
 
     await goToDownload(makeExplorerStub(), '/Users/me/Downloads', 'report.pdf')
 
-    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { path: '/Users/me/Downloads' }, source: 'user' })
+    expect(navigateMock).toHaveBeenCalledWith({ pane: 'left', to: { location: { volumeId: 'root', path: '/Users/me/Downloads' } }, source: 'user' })
     expect(moveCursorMock).not.toHaveBeenCalled()
   })
 })

apps/desktop/src/lib/downloads/go-to-latest.ts

@@ -13,7 +13,11 @@
 import { commands } from '$lib/ipc/bindings'
 import { addToast } from '$lib/ui/toast'
 import { getAppLogger } from '$lib/logging/logger'
-import { revealFileInBestPane, navigateToDirInBestPane } from '$lib/file-explorer/navigation/navigate-and-select'
+import {
+  revealFileInBestPane,
+  navigateToDirInBestPane,
+  resolveLocationOrToast,
+} from '$lib/file-explorer/navigation/navigate-and-select'
 import type { ExplorerAPI } from '../../routes/(main)/explorer-api'
 
 import LatestDownloadEmptyToastContent from './LatestDownloadEmptyToastContent.svelte'
@@ -47,7 +51,7 @@ export async function goToLatestDownload(explorer: ExplorerAPI | undefined): Pro
 
   const result = await commands.goToLatestDownload()
   if (result.status === 'ok') {
-    await revealFileInBestPane(explorer, result.data.parentDir, result.data.fileName)
+    await revealDownloadInBestPane(explorer, result.data.parentDir, result.data.fileName)
     return
   }
 
@@ -87,7 +91,19 @@ export async function goToDownload(
     log.debug('goToDownload: no explorer; skipping (HMR or pre-mount)')
     return
   }
-  await revealFileInBestPane(explorer, parentDir, fileName)
+  await revealDownloadInBestPane(explorer, parentDir, fileName)
+}
+
+/**
+ * Resolve the download's parent dir to a `Location` (volume id + path), then
+ * reveal the file in the best pane. A download is local, so this resolves to a
+ * real local volume; if it can't (drive gone), show the shared
+ * "couldn't reach that location's drive" toast instead of navigating wrong.
+ */
+async function revealDownloadInBestPane(explorer: ExplorerAPI, parentDir: string, fileName: string): Promise<void> {
+  const location = await resolveLocationOrToast(parentDir)
+  if (!location) return
+  await revealFileInBestPane(explorer, location, fileName)
 }
 
 async function showEmptyToast(explorer: ExplorerAPI): Promise<void> {
@@ -104,7 +120,13 @@ async function showEmptyToast(explorer: ExplorerAPI): Promise<void> {
       log.warn('Go to Downloads pressed but Downloads dir is unresolved; no action')
       return
     }
-    void navigateToDirInBestPane(explorer, downloadsDir)
+    void (async () => {
+      // Resolve the Downloads dir's volume at click time (its drive could have
+      // changed while the toast sat there), then navigate to the best pane.
+      const location = await resolveLocationOrToast(downloadsDir)
+      if (!location) return
+      await navigateToDirInBestPane(explorer, location)
+    })()
   }
   addToast(LatestDownloadEmptyToastContent, {
     id: LATEST_DOWNLOAD_EMPTY_TOAST_ID,

apps/desktop/src/lib/file-explorer/navigation/navigate-and-select.test.ts

@@ -1,7 +1,21 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { navigateToDirInPane, navigateToFileInPane } from './navigate-and-select'
+
+const { resolveLocationMock, addToastMock } = vi.hoisted(() => ({
+  resolveLocationMock: vi.fn(),
+  addToastMock: vi.fn(() => 'toast-id'),
+}))
+vi.mock('./resolve-location', () => ({ resolveLocation: resolveLocationMock }))
+vi.mock('$lib/ui/toast', () => ({ addToast: addToastMock }))
+
+import { navigateToDirInPane, navigateToFileInPane, revealSearchResultInPane } from './navigate-and-select'
 import type { ExplorerAPI } from '../../../routes/(main)/explorer-api'
 import type { NavigateResult } from '../pane/navigate'
+import type { Location } from '$lib/tauri-commands'
+
+/** A `Location` (volume id + path) — the resolved input these helpers now take. */
+function loc(path: string, volumeId = 'root'): Location {
+  return { volumeId, path }
+}
 
 /** A `started` result whose `settled` is the given promise (defaults to resolved). */
 function started(settled: Promise<void> = Promise.resolve()): NavigateResult {
@@ -21,16 +35,16 @@ function makeExplorer(navResult: NavigateResult) {
 }
 
 describe('navigateToDirInPane', () => {
-  it('navigates to the dir and never moves the cursor', async () => {
+  it('navigates to the dir location and never moves the cursor', async () => {
     const { explorer, navigate, moveCursor } = makeExplorer(started())
-    await navigateToDirInPane(explorer, 'left', '/tmp/here')
-    expect(navigate).toHaveBeenCalledWith({ pane: 'left', to: { path: '/tmp/here' }, source: 'user' })
+    await navigateToDirInPane(explorer, 'left', loc('/tmp/here'))
+    expect(navigate).toHaveBeenCalledWith({ pane: 'left', to: { location: loc('/tmp/here') }, source: 'user' })
     expect(moveCursor).not.toHaveBeenCalled()
   })
 
   it('bails on a refusal without throwing', async () => {
     const { explorer, moveCursor } = makeExplorer(refused('snapshot pane on a missing volume'))
-    await expect(navigateToDirInPane(explorer, 'right', '/tmp')).resolves.toBeUndefined()
+    await expect(navigateToDirInPane(explorer, 'right', loc('/tmp'))).resolves.toBeUndefined()
     expect(moveCursor).not.toHaveBeenCalled()
   })
 })
@@ -42,10 +56,10 @@ describe('navigateToFileInPane', () => {
     moveCursorCalls = []
   })
 
-  it('navigates to the parent, then moves the cursor onto the file', async () => {
+  it('navigates to the parent location, then moves the cursor onto the file', async () => {
     const { explorer, navigate, moveCursor } = makeExplorer(started())
-    await navigateToFileInPane(explorer, 'left', '/tmp', 'a.txt')
-    expect(navigate).toHaveBeenCalledWith({ pane: 'left', to: { path: '/tmp' }, source: 'user' })
+    await navigateToFileInPane(explorer, 'left', loc('/tmp'), 'a.txt')
+    expect(navigate).toHaveBeenCalledWith({ pane: 'left', to: { location: loc('/tmp') }, source: 'user' })
     expect(moveCursor).toHaveBeenCalledWith('left', 'a.txt')
   })
 
@@ -61,7 +75,7 @@ describe('navigateToFileInPane', () => {
     })
     const explorer = { navigate, moveCursor } as unknown as ExplorerAPI
 
-    const promise = navigateToFileInPane(explorer, 'left', '/tmp', 'a.txt')
+    const promise = navigateToFileInPane(explorer, 'left', loc('/tmp'), 'a.txt')
     // Cursor must NOT move before the navigation settles.
     expect(moveCursorCalls).toHaveLength(0)
     resolveListing()
@@ -71,7 +85,45 @@ describe('navigateToFileInPane', () => {
 
   it('bails on a refusal and never moves the cursor', async () => {
     const { explorer, moveCursor } = makeExplorer(refused('cannot start'))
-    await navigateToFileInPane(explorer, 'left', '/tmp', 'a.txt')
+    await navigateToFileInPane(explorer, 'left', loc('/tmp'), 'a.txt')
+    expect(moveCursor).not.toHaveBeenCalled()
+  })
+})
+
+describe('revealSearchResultInPane (the search "Go to file" edge)', () => {
+  beforeEach(() => {
+    resolveLocationMock.mockReset()
+    addToastMock.mockReset().mockReturnValue('toast-id')
+  })
+
+  it("resolves the result's PARENT dir, navigates with that location, then moves the cursor onto the file", async () => {
+    resolveLocationMock.mockResolvedValue({ ok: true, location: loc('/Volumes/Nas/docs', 'nas') })
+    const { explorer, navigate, moveCursor } = makeExplorer(started())
+
+    await revealSearchResultInPane(explorer, 'left', '/Volumes/Nas/docs/report.pdf')
+
+    // It resolves the parent dir, not the file path.
+    expect(resolveLocationMock).toHaveBeenCalledWith('/Volumes/Nas/docs')
+    expect(navigate).toHaveBeenCalledWith({
+      pane: 'left',
+      to: { location: loc('/Volumes/Nas/docs', 'nas') },
+      source: 'user',
+    })
+    expect(moveCursor).toHaveBeenCalledWith('left', 'report.pdf')
+    expect(addToastMock).not.toHaveBeenCalled()
+  })
+
+  it('shows the friendly toast and does NOT navigate when the parent volume is unresolvable', async () => {
+    resolveLocationMock.mockResolvedValue({ ok: false, reason: 'no-volume' })
+    const { explorer, navigate, moveCursor } = makeExplorer(started())
+
+    await revealSearchResultInPane(explorer, 'left', '/Volumes/Gone/docs/report.pdf')
+
+    expect(navigate).not.toHaveBeenCalled()
     expect(moveCursor).not.toHaveBeenCalled()
+    expect(addToastMock).toHaveBeenCalledWith(
+      "Couldn't reach that location's drive. It might be disconnected.",
+      { level: 'info' },
+    )
   })
 })