diff --git a/CLAUDE.md b/CLAUDE.md
index 8aa98e3a..6909a95a 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,3 +1,8 @@
+---
+type: Note
+_organized: true
+---
+
 @AGENTS.md
 
-This file is a Claude Code compatibility shim. Keep shared agent instructions in `AGENTS.md`.
+This file is only a Claude Code compatibility shim. Keep shared agent instructions in `AGENTS.md`.
diff --git a/GEMINI.md b/GEMINI.md
new file mode 100644
index 00000000..e7433cc3
--- /dev/null
+++ b/GEMINI.md
@@ -0,0 +1,8 @@
+---
+type: Note
+_organized: true
+---
+
+@AGENTS.md
+
+This file is only a Gemini CLI compatibility shim. Keep shared agent instructions in `AGENTS.md`.
diff --git a/docs/ABSTRACTIONS.md b/docs/ABSTRACTIONS.md
index 2c0212db..eb58ad1b 100644
--- a/docs/ABSTRACTIONS.md
+++ b/docs/ABSTRACTIONS.md
@@ -173,7 +173,9 @@ interface WorkspaceIdentity {
 }
 ```
 
-The status-bar workspace manager edits installation-local identity and mount state. The alias is the durable user-facing namespace for cross-workspace links such as `[[team/projects/alpha]]`; labels and colors are display affordances only. The default workspace controls where new notes and Type files are created, while active-vault switching still controls Git, folder tree, saved views, and watcher focus.
+The status-bar workspace manager edits installation-local identity and mount state. The alias is the durable user-facing namespace for cross-workspace links such as `[[team/projects/alpha]]`; labels and colors are display affordances only. The default workspace controls where new notes and Type files are created; it is not a claim that only one vault is active. When multiple workspaces are enabled, every mounted available workspace participates in the graph and the active Git repository set.
+
+Git-facing renderer code must pass an explicit repository path instead of assuming a single active vault. Changes and Pulse/history display one selected repository at a time, manual commit selects one target repository, and AutoGit checkpoints iterate every active repository. Diff, file history, note saves, and discarded changes resolve the repository from the note's workspace provenance or from the selected Git surface.
 
 ### File kinds and binary previews
 
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 8f56f990..65d0f578 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -106,7 +106,9 @@ Large-vault reproduction and keyboard QA steps live in [LARGE-VAULT-LOADING-QA.m
 
 #### Mounted Workspaces
 
-The registered vault list can act as a mounted-workspace set. `useVaultSwitcher` persists each workspace's installation-local identity (`label`, stable `alias`, color, mount flag) and the default destination for newly created notes in `~/.config/com.tolaria.app/vaults.json`. `useVaultLoader` scans every available mounted workspace and annotates each `VaultEntry` with provenance before React consumes the combined graph. Switching the active vault still selects which Git controls, folder tree, views, watcher, and sync operations are in focus; it no longer restricts note-list, search, or wikilink navigation to only that vault's notes.
+The registered vault list can act as a mounted-workspace set. `useVaultSwitcher` persists each workspace's installation-local identity (`label`, stable `alias`, color, mount flag) and the default destination for newly created notes in `~/.config/com.tolaria.app/vaults.json`. `useVaultLoader` scans every available mounted workspace and annotates each `VaultEntry` with provenance before React consumes the combined graph. The default workspace is the write target for new notes and Type documents; it is not the only active vault when multiple workspaces are enabled.
+
+Git surfaces resolve repository paths explicitly. `useGitRepositories` derives the active repository set from the mounted available workspaces, keeps separate selected repositories for Changes, Pulse/history, and manual commits, and exposes the combined modified-file count for status/commands. AutoGit checkpoints iterate that repository set, while manual commit, history, diff, and discard operations use the selected surface or the note's workspace provenance.
 
 Cross-workspace note reads and writes keep the disk-first invariant. When an absolute note path is saved or read without an explicit `vaultPath`, the Tauri boundary resolves the deepest registered vault root that contains the path and validates against that root before touching disk. This lets an editor tab opened from a mounted workspace save back to its source repository while preserving the same path-escape protections as active-vault operations.
 
@@ -646,13 +648,13 @@ flowchart TD
     STATUS["Click sync badge"] --> POPUP["GitStatusPopup\n(branch, ahead/behind)"]
 ```
 
-`useGitRemoteStatus` re-checks `git_remote_status` when the commit dialog opens and again right before submit. If `hasRemote` is false, Tolaria keeps the flow local-only: the status bar shows a neutral `No remote` chip, the dialog copy switches from "Commit & Push" to "Commit", and no `git_push` call is attempted.
+`useGitRemoteStatus` re-checks `git_remote_status` for the default repository, and `useCommitFlow` can resolve remote status for an explicit selected repository when the commit dialog opens and again right before submit. If `hasRemote` is false, Tolaria keeps that repository's flow local-only: the status bar shows a neutral `No remote` chip for the default repository, the dialog copy switches from "Commit & Push" to "Commit", and no `git_push` call is attempted.
 
 If the current vault is not a Git repository, Tolaria treats Git as disabled instead of degraded. The status bar replaces changes, commit, sync, remote, conflict, and history controls with a `Git disabled` warning that reopens Git setup. Command registration follows the same state: only `Initialize Git for Current Vault` is available in the Git group, while pull, commit, changes, conflict, and remote commands are hidden. `useAutoSync` is disabled for non-git vaults so the app does not run background Git commands against plain folders.
 
 The same local-only state enables the explicit Add Remote flow. `AddRemoteModal` is reachable from the `No remote` chip and the command palette. The backend `git_add_remote` command ensures the local author identity, adds `origin`, fetches it, refuses incompatible histories, and only enables tracking after a safe push or fast-forward-compatible check succeeds.
 
-`useCommitFlow` also exposes `runAutomaticCheckpoint()`, a dialog-free commit path shared by AutoGit and the bottom-bar Commit button. `useAutoGit` watches the last editor activity plus app focus/visibility state, and when the vault is git-backed, all saves are flushed, and no unsaved edits remain, it triggers the same deterministic `Updated N note(s)` / `Updated N file(s)` commit message path after the configured idle or inactive thresholds. The bottom-bar quick action reuses that checkpoint flow after forcing a save first, so manual quick commits and scheduled AutoGit commits stay aligned on message generation and push behavior.
+`useCommitFlow` also exposes `runAutomaticCheckpoint()`, a dialog-free commit path shared by AutoGit and the bottom-bar Commit button. `useAutoGit` watches the last editor activity plus app focus/visibility state, and when the default vault is git-backed, all saves are flushed, and no unsaved edits remain, it triggers the deterministic `Updated N note(s)` / `Updated N file(s)` commit message path after the configured idle or inactive thresholds. In multiple-workspace mode, that checkpoint reads, commits, and pushes every active repository independently; one failed or rejected repository does not prevent the remaining repositories from being attempted. The manual commit dialog remains single-repository and requires the user to choose the target repository when more than one is active.
 
 #### Sync States
 
diff --git a/index.html b/index.html
index 2dffca6f..4f7412ca 100644
--- a/index.html
+++ b/index.html
@@ -26,8 +26,42 @@
     <title>Tolaria</title>
   </head>
   <body>
+    <pre id="tolaria-boot-diagnostics" style="position:fixed;left:24px;top:24px;z-index:2147483647;max-width:min(760px,calc(100vw - 48px));max-height:calc(100vh - 48px);overflow:auto;margin:0;padding:12px 14px;border-radius:8px;background:#111;color:#fff;font:12px/1.4 ui-monospace,SFMono-Regular,Menlo,monospace;white-space:pre-wrap">Tolaria boot: HTML parsed</pre>
     <script>
       (function () {
+        var diagnostics = document.getElementById('tolaria-boot-diagnostics');
+        function appendDiagnostic(message) {
+          if (!diagnostics) return;
+          if (!diagnostics.isConnected) document.body.appendChild(diagnostics);
+          diagnostics.hidden = false;
+          diagnostics.textContent += '\n' + message;
+        }
+        function isResizeObserverLoopMessage(message) {
+          return typeof message === 'string'
+            && (
+              message.indexOf('ResizeObserver loop completed with undelivered notifications') !== -1
+              || message.indexOf('ResizeObserver loop limit exceeded') !== -1
+            );
+        }
+        window.addEventListener('error', function (event) {
+          if (isResizeObserverLoopMessage(event.message)) {
+            event.preventDefault();
+            return;
+          }
+          appendDiagnostic('error: ' + event.message + ' @ ' + event.filename + ':' + event.lineno + ':' + event.colno);
+        });
+        window.addEventListener('unhandledrejection', function (event) {
+          var reason = event.reason && (event.reason.stack || event.reason.message || String(event.reason));
+          if (isResizeObserverLoopMessage(reason)) {
+            event.preventDefault();
+            return;
+          }
+          appendDiagnostic('unhandled rejection: ' + reason);
+        });
+        window.addEventListener('tolaria:frontend-ready', function () {
+          if (diagnostics) diagnostics.hidden = true;
+        }, { once: true });
+
         var key = 'tolaria-theme';
         var legacyKey = 'laputa-theme';
         var systemDarkQuery = '(prefers-color-scheme: dark)';
diff --git a/lara.lock b/lara.lock
index 11e49455..66df3330 100644
--- a/lara.lock
+++ b/lara.lock
@@ -61,6 +61,7 @@ files:
     command.git.pull: 3988d61f4a4546381f61a4eaf61315b4
     command.git.resolveConflicts: 871ac36968cfca3d2297a89b28b25dee
     command.git.viewChanges: b2699edf69d8e1031afce2b2f94e5c8d
+    git.repository.select: 33fcf2b3ec4686d9cd06051c726d0ba2
     command.view.editorOnly: 8355e056b32086b9190d639be290dda8
     command.view.editorNoteList: b9604b1609eb6f581cd9570dca72d3f0
     command.view.fullLayout: 1cebdf839eee2b1713828731aaa3b507
@@ -110,6 +111,20 @@ files:
     settings.releaseChannelDescription: c5ae9b7f25376df383d36603366ac1fa
     settings.releaseStable: fa3aff3c185c6dc7754235f397c2099a
     settings.releaseAlpha: 6132295fcf5570fb8b0a944ef322a598
+    settings.workspaces.title: 10075fec14fcc45a489d02bedf972e97
+    settings.workspaces.enable: f418b797fc4d13ca6b59333326ac3246
+    settings.workspaces.enableDescription: 1487bd26586b773c77c01746399cc4cd
+    settings.workspaces.name: 49ee3087348e8d44e1feda1917443987
+    settings.workspaces.label: b021df6aac4654c454f46c77646e745f
+    settings.workspaces.slug: 0c908588520b3ef787bce443fc2b507c
+    settings.workspaces.nameAria: a94a5bbfbc6bbcff81961501be487703
+    settings.workspaces.labelAria: f6a0693020980910eaa8b168b30b33c3
+    settings.workspaces.slugAria: 1d9e314005db037b4a83a220a45f3d77
+    settings.workspaces.nameTooltip: 5c12e3507377eadae5c2340462dda553
+    settings.workspaces.labelTooltip: b1b87a2affcd504e54bf97100e3d9c34
+    settings.workspaces.slugTooltip: daa690f5855e35d1cfa9dbffe1870d40
+    settings.workspaces.color: cb5feb1b7314637725a2e73bdc9f7295
+    settings.workspaces.removeAria: a5d2ceeeb76bfcb99015fc780ced07c2
     settings.appearance.title: a1c58e94227389415de133efdf78ea6e
     settings.appearance.description: ca7b75a4c10ab8a540707e3a96cd3592
     settings.theme.label: d721757161f7f70c5b0949fdb6ec2c30
@@ -480,8 +495,11 @@ files:
     inspector.properties.addProperty: 9820ade036bf1bdf80c0b7da24a4ce0a
     inspector.properties.deleteProperty: f1d0ab48c8596108e949dfc90e13050b
     inspector.properties.none: 6adf97f83acf6453d4a6a4b1070f3754
+    inspector.properties.workspace: 5b70a213f150f01f0776fa9481ef2ddf
     inspector.properties.missingType: 9179080e7bcc72408f3de7cb944ff400
     inspector.properties.missingTypeAria: 582c2c46117cff0534d13e7c8a45a3ba
+    inspector.properties.searchWorkspaces: ebd1ca0ae74f6d6f5b32f18db699be11
+    inspector.properties.noMatchingWorkspaces: a4339dbce88712e787c0615a961636f6
     inspector.properties.searchTypes: 84c8d94846183a79444bf36667e8d7ea
     inspector.properties.noMatchingTypes: 9b64c31214171ba3b2d591743990b840
     inspector.properties.yes: 93cba07454f06a4a960172bbd6e2a435
@@ -523,16 +541,21 @@ files:
     status.vault.openLocal: a367344e0429a12a5cc9a6cecbbfcde5
     status.vault.cloneGit: a7d0aef7c6237a36e54fd5a26e9c23fe
     status.vault.cloneGettingStarted: 9953a11a477b441976a626a9acf5d7df
-    status.vault.manageWorkspaces: d79ee0855873f0437b3e2552553203cd
+    status.vault.availableHeader: 2be36e986c7859a439c30bc5696c15a9
+    status.vault.manageWorkspaces: ecce6ef1f37e975762b1413d8bc7d21d
+    status.vault.includeWorkspace: fe8ee397206a29f2d91eea7b95e9c112
     status.vault.notFound: 3119b7fa94c96209bca571b7c7ed0b7e
     status.vault.reloading: 893da50ef3a9e01d8a99ff5d3ceb55e9
     status.vault.reloadingTooltip: 4a884bd7d113797ad16f905f70742da8
     status.vault.remove: 7f3b4f76df23626170940dbc55c70728
-    workspace.manager.title: 81cc2afb2d8a8fa388c0fa1f5e58cc1e
-    workspace.manager.description: 3957142a01fc42b5bcc00ffd1eef6fc9
+    status.vault.removeConfirmTitle: 713713c6d8c4eb8b75cf12ebaca44f96
+    status.vault.removeConfirmMessage: 854744291c28ea9e18bed1110b0737d9
+    status.vault.removeConfirmAction: 8b064b07e2f4f1e63d1d5087aead2648
+    workspace.manager.title: ecce6ef1f37e975762b1413d8bc7d21d
+    workspace.manager.description: d0de6e81a4268a52f756f6073f938fc3
     workspace.manager.default: 7a1920d61156abc05a60135aefe8bc67
     workspace.manager.makeDefault: 581e972562013d920e9b4d364265829e
-    workspace.manager.label: 91068740cd2c5f552ad5cff1470f88f5
+    workspace.manager.label: ce0aa8f9a9fad0faf99b6185fbc09a1f
     workspace.manager.alias: e89ff14f985995ab3af3bd8af66d019c
     workspace.manager.mounted: 38ca22b706f01504d11883bc1984d45b
     status.remote.noneConfigured: 18a4edd4e8d862ccb343937f45585fb1
diff --git a/mcp-server/index.js b/mcp-server/index.js
index c04214c2..270fc50a 100644
--- a/mcp-server/index.js
+++ b/mcp-server/index.js
@@ -20,9 +20,11 @@ import {
 } from '@modelcontextprotocol/sdk/types.js'
 import WebSocket from 'ws'
 import { searchNotes, getNote, vaultContext } from './vault.js'
-import { requireVaultPath } from './vault-path.js'
+import { requireVaultPaths } from './vault-path.js'
+import path from 'node:path'
 
-const VAULT_PATH = requireVaultPath()
+const VAULT_PATHS = requireVaultPaths()
+const PRIMARY_VAULT_PATH = VAULT_PATHS[0]
 const WS_UI_PORT = parseInt(process.env.WS_UI_PORT || '9711', 10)
 const WS_UI_URL = `ws://localhost:${WS_UI_PORT}`
 
@@ -113,8 +115,13 @@ const TOOLS = [
   },
   {
     name: 'get_vault_context',
-    description: 'Get vault orientation: entity types, total note count, top-level folders, and 20 most recently modified notes.',
-    inputSchema: { type: 'object', properties: {} },
+    description: 'Get vault orientation for the active Tolaria vaults: entity types, note count, folders, and recent notes.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        vaultPath: { type: 'string', description: 'Optional target vault root. Omit to inspect all active vaults.' },
+      },
+    },
   },
   {
     name: 'get_note',
@@ -123,6 +130,7 @@ const TOOLS = [
       type: 'object',
       properties: {
         path: { type: 'string', description: 'Relative path to the note (e.g. "project/my-project.md")' },
+        vaultPath: { type: 'string', description: 'Optional target vault root when multiple vaults are active.' },
       },
       required: ['path'],
     },
@@ -134,6 +142,7 @@ const TOOLS = [
       type: 'object',
       properties: {
         path: { type: 'string', description: 'Relative path to the note' },
+        vaultPath: { type: 'string', description: 'Optional target vault root when opening a note outside the default vault.' },
       },
       required: ['path'],
     },
@@ -157,35 +166,107 @@ const TOOLS = [
       type: 'object',
       properties: {
         path: { type: 'string', description: 'Optional specific note path that changed' },
+        vaultPath: { type: 'string', description: 'Optional target vault root when refreshing a note outside the default vault.' },
       },
     },
   },
 ]
 
+function requestedVaultPath(args = {}) {
+  const requested = typeof args.vaultPath === 'string' ? args.vaultPath.trim() : ''
+  if (!requested) return null
+  if (!VAULT_PATHS.includes(requested)) {
+    throw new Error(`Vault is not active in Tolaria: ${requested}`)
+  }
+  return requested
+}
+
+function vaultLabel(vaultPath) {
+  return path.basename(vaultPath) || vaultPath
+}
+
+function withVaultMetadata(note, vaultPath) {
+  return {
+    ...note,
+    vaultPath,
+    vaultLabel: vaultLabel(vaultPath),
+  }
+}
+
+async function getNoteFromActiveVaults(notePath, vaultPath = null) {
+  const candidates = vaultPath ? [vaultPath] : VAULT_PATHS
+  const matches = []
+  const errors = []
+
+  for (const candidate of candidates) {
+    try {
+      matches.push(withVaultMetadata(await getNote(candidate, notePath), candidate))
+    } catch (error) {
+      errors.push(error)
+    }
+  }
+
+  if (matches.length === 1) return matches[0]
+  if (matches.length > 1) {
+    throw new Error(`Note path is ambiguous across active vaults. Pass vaultPath for ${notePath}.`)
+  }
+  throw errors[0] ?? new Error(`Note not found: ${notePath}`)
+}
+
+async function searchActiveVaults(query, limit = 10) {
+  const requestedLimit = Number.isFinite(limit) && limit > 0 ? limit : 10
+  const results = []
+
+  for (const vaultPath of VAULT_PATHS) {
+    const vaultResults = await searchNotes(vaultPath, query, requestedLimit)
+    results.push(...vaultResults.map((result) => withVaultMetadata(result, vaultPath)))
+    if (results.length >= requestedLimit) break
+  }
+
+  return results.slice(0, requestedLimit)
+}
+
+async function activeVaultContext(targetVaultPath = null) {
+  if (targetVaultPath) return vaultContext(targetVaultPath)
+  if (VAULT_PATHS.length === 1) return vaultContext(PRIMARY_VAULT_PATH)
+
+  return {
+    vaults: await Promise.all(VAULT_PATHS.map(vaultContext)),
+  }
+}
+
+function uiPath(args = {}) {
+  const notePath = typeof args.path === 'string' ? args.path : ''
+  if (path.isAbsolute(notePath)) return notePath
+  const vaultPath = requestedVaultPath(args) ?? (VAULT_PATHS.length === 1 ? PRIMARY_VAULT_PATH : '')
+  return vaultPath ? path.join(vaultPath, notePath) : notePath
+}
+
 async function handleSearchNotes(args) {
-  const results = await searchNotes(VAULT_PATH, args.query, args.limit)
+  const results = await searchActiveVaults(args.query, args.limit)
   const text = results.length === 0
     ? 'No matching notes found.'
-    : results.map(r => `**${r.title}** (${r.path})\n${r.snippet}`).join('\n\n')
+    : results.map(r => `**${r.title}** (${r.vaultLabel} / ${r.path})\n${r.snippet}`).join('\n\n')
   return { content: [{ type: 'text', text }] }
 }
 
-async function handleVaultContext() {
-  const ctx = await vaultContext(VAULT_PATH)
+async function handleVaultContext(args = {}) {
+  const ctx = await activeVaultContext(requestedVaultPath(args))
   return { content: [{ type: 'text', text: JSON.stringify(ctx, null, 2) }] }
 }
 
 async function handleGetNote(args) {
-  const note = await getNote(VAULT_PATH, args.path)
+  const note = await getNoteFromActiveVaults(args.path, requestedVaultPath(args))
   return { content: [{ type: 'text', text: JSON.stringify(note, null, 2) }] }
 }
 
 function handleOpenNote(args) {
   // Refresh vault first so the new/modified note appears in the note list,
   // then signal the UI to open it in a tab.
-  broadcastUiAction('vault_changed', { path: args.path })
-  broadcastUiAction('open_tab', { path: args.path })
-  return { content: [{ type: 'text', text: `Opening ${args.path} in Tolaria` }] }
+  const targetPath = uiPath(args)
+  broadcastUiAction('vault_changed', { path: targetPath })
+  broadcastUiAction('open_tab', { path: targetPath })
+  return { content: [{ type: 'text', text: `Opening ${targetPath} in Tolaria` }] }
 }
 
 function handleHighlightEditor(args) {
@@ -194,7 +275,7 @@ function handleHighlightEditor(args) {
 }
 
 function handleRefreshVault(args) {
-  broadcastUiAction('vault_changed', { path: args?.path })
+  broadcastUiAction('vault_changed', { path: uiPath(args) })
   return { content: [{ type: 'text', text: 'Vault refresh triggered' }] }
 }
 
@@ -203,7 +284,7 @@ function callToolHandler(name, args) {
     case 'search_notes':
       return handleSearchNotes(args)
     case 'get_vault_context':
-      return handleVaultContext()
+      return handleVaultContext(args)
     case 'get_note':
       return handleGetNote(args)
     case 'open_note':
@@ -277,7 +358,7 @@ async function main() {
 
   connectUiBridge()
   await server.connect(transport)
-  console.error(`Tolaria MCP server running (vault: ${VAULT_PATH})`)
+  console.error(`Tolaria MCP server running (vaults: ${VAULT_PATHS.join(', ')})`)
 }
 
 main().catch((error) => {
diff --git a/mcp-server/package-lock.json b/mcp-server/package-lock.json
index 75c8457d..b666522c 100644
--- a/mcp-server/package-lock.json
+++ b/mcp-server/package-lock.json
@@ -467,9 +467,9 @@
       "license": "MIT"
     },
     "node_modules/fast-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
-      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
+      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
       "funding": [
         {
           "type": "github",
@@ -619,9 +619,9 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.14",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.14.tgz",
-      "integrity": "sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==",
+      "version": "4.12.18",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.18.tgz",
+      "integrity": "sha512-RWzP96k/yv0PQfyXnWjs6zot20TqfpfsNXhOnev8d1InAxubW93L11/oNUc3tQqn2G0bSdAOBpX+2uDFHV7kdQ==",
       "license": "MIT",
       "engines": {
         "node": ">=16.9.0"
@@ -670,9 +670,9 @@
       "license": "ISC"
     },
     "node_modules/ip-address": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
-      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.1.tgz",
+      "integrity": "sha512-1FMu8/N15Ck1BL551Jf42NYIoin2unWjLQ2Fze/DXryJRl5twqtwNHlO39qERGbIOcKYWHdgRryhOC+NG4eaLw==",
       "license": "MIT",
       "engines": {
         "node": ">= 12"
diff --git a/mcp-server/package.json b/mcp-server/package.json
index 4da3dbef..11c50b90 100644
--- a/mcp-server/package.json
+++ b/mcp-server/package.json
@@ -16,7 +16,9 @@
   "overrides": {
     "@hono/node-server": "1.19.13",
     "express-rate-limit": "8.2.2",
-    "hono": "4.12.14",
+    "fast-uri": "3.1.2",
+    "hono": "4.12.18",
+    "ip-address": "10.1.1",
     "path-to-regexp": "8.4.0"
   }
 }
diff --git a/mcp-server/test.js b/mcp-server/test.js
index 565f1dc8..101edaa5 100644
--- a/mcp-server/test.js
+++ b/mcp-server/test.js
@@ -12,7 +12,7 @@ import { fileURLToPath } from 'node:url'
 import {
   findMarkdownFiles, getNote, searchNotes, vaultContext,
 } from './vault.js'
-import { requireVaultPath } from './vault-path.js'
+import { requireVaultPath, requireVaultPaths } from './vault-path.js'
 import { evaluateBridgeRequest } from './ws-bridge.js'
 
 let tmpDir
@@ -242,6 +242,16 @@ describe('requireVaultPath', () => {
       /VAULT_PATH is required/,
     )
   })
+
+  it('returns all configured active vault paths with the primary vault first', () => {
+    assert.deepEqual(
+      requireVaultPaths({
+        VAULT_PATH: '/tmp/Default Vault',
+        VAULT_PATHS: JSON.stringify(['/tmp/Default Vault', '/tmp/Second Vault']),
+      }),
+      ['/tmp/Default Vault', '/tmp/Second Vault'],
+    )
+  })
 })
 
 describe('stdio process lifecycle', () => {
diff --git a/mcp-server/vault-path.js b/mcp-server/vault-path.js
index ffe3964f..b62c15e7 100644
--- a/mcp-server/vault-path.js
+++ b/mcp-server/vault-path.js
@@ -1,7 +1,40 @@
-export function requireVaultPath(env = process.env) {
-  const vaultPath = env.VAULT_PATH?.trim()
-  if (!vaultPath) {
+function parseVaultPathList(rawValue) {
+  if (!rawValue?.trim()) return []
+
+  try {
+    const parsed = JSON.parse(rawValue)
+    if (Array.isArray(parsed)) return parsed.filter(value => typeof value === 'string')
+  } catch {
+    // Older clients only set VAULT_PATH; keep VAULT_PATHS strict JSON so paths
+    // with platform separators are never split incorrectly.
+  }
+
+  return []
+}
+
+function uniqueVaultPaths(paths) {
+  const seen = new Set()
+  const unique = []
+  for (const path of paths) {
+    const trimmed = path.trim()
+    if (!trimmed || seen.has(trimmed)) continue
+    seen.add(trimmed)
+    unique.push(trimmed)
+  }
+  return unique
+}
+
+export function requireVaultPaths(env = process.env) {
+  const vaultPaths = uniqueVaultPaths([
+    env.VAULT_PATH?.trim() ?? '',
+    ...parseVaultPathList(env.VAULT_PATHS),
+  ])
+  if (vaultPaths.length === 0) {
     throw new Error('VAULT_PATH is required. Open a vault in Tolaria before starting MCP tools.')
   }
-  return vaultPath
+  return vaultPaths
+}
+
+export function requireVaultPath(env = process.env) {
+  return requireVaultPaths(env)[0]
 }
diff --git a/mcp-server/ws-bridge.js b/mcp-server/ws-bridge.js
index 705cea78..7f699f89 100644
--- a/mcp-server/ws-bridge.js
+++ b/mcp-server/ws-bridge.js
@@ -24,7 +24,8 @@ import { WebSocketServer } from 'ws'
 import {
   getNote, searchNotes, vaultContext,
 } from './vault.js'
-import { requireVaultPath } from './vault-path.js'
+import { requireVaultPaths } from './vault-path.js'
+import path from 'node:path'
 
 const WS_PORT = parseInt(process.env.WS_PORT || '9710', 10)
 const WS_UI_PORT = parseInt(process.env.WS_UI_PORT || '9711', 10)
@@ -37,12 +38,72 @@ const TRUSTED_UI_ORIGINS = new Set([
 
 /** @type {WebSocketServer | null} */
 let uiBridge = null
-let vaultPath = null
+let vaultPaths = null
 const UNKNOWN_TOOL = Symbol('unknown tool')
 
-function activeVaultPath() {
-  vaultPath ??= requireVaultPath()
-  return vaultPath
+function activeVaultPaths() {
+  vaultPaths ??= requireVaultPaths()
+  return vaultPaths
+}
+
+function primaryVaultPath() {
+  return activeVaultPaths()[0]
+}
+
+function requestedVaultPath(args = {}) {
+  const requested = typeof args.vaultPath === 'string' ? args.vaultPath.trim() : ''
+  if (!requested) return null
+  if (!activeVaultPaths().includes(requested)) {
+    throw new Error(`Vault is not active in Tolaria: ${requested}`)
+  }
+  return requested
+}
+
+function uiPath(args = {}) {
+  const notePath = typeof args.path === 'string' ? args.path : ''
+  if (path.isAbsolute(notePath)) return notePath
+  const roots = activeVaultPaths()
+  const vaultPath = requestedVaultPath(args) ?? (roots.length === 1 ? primaryVaultPath() : '')
+  return vaultPath ? path.join(vaultPath, notePath) : notePath
+}
+
+async function getNoteFromActiveVaults(notePath, vaultPath = null) {
+  const candidates = vaultPath ? [vaultPath] : activeVaultPaths()
+  const matches = []
+  const errors = []
+
+  for (const candidate of candidates) {
+    try {
+      matches.push({ ...(await getNote(candidate, notePath)), vaultPath: candidate })
+    } catch (error) {
+      errors.push(error)
+    }
+  }
+
+  if (matches.length === 1) return matches[0]
+  if (matches.length > 1) {
+    throw new Error(`Note path is ambiguous across active vaults. Pass vaultPath for ${notePath}.`)
+  }
+  throw errors[0] ?? new Error(`Note not found: ${notePath}`)
+}
+
+async function searchActiveVaults(query, limit = 10) {
+  const requestedLimit = Number.isFinite(limit) && limit > 0 ? limit : 10
+  const results = []
+
+  for (const vaultPath of activeVaultPaths()) {
+    const vaultResults = await searchNotes(vaultPath, query, requestedLimit)
+    results.push(...vaultResults.map((result) => ({ ...result, vaultPath })))
+    if (results.length >= requestedLimit) break
+  }
+
+  return results.slice(0, requestedLimit)
+}
+
+async function activeVaultContext() {
+  const roots = activeVaultPaths()
+  if (roots.length === 1) return vaultContext(roots[0])
+  return { vaults: await Promise.all(roots.map(vaultContext)) }
 }
 
 function broadcastUiAction(action, payload) {
@@ -55,19 +116,21 @@ function broadcastUiAction(action, payload) {
 
 
 async function readNoteTool(args) {
-  const note = await getNote(activeVaultPath(), args.path)
+  const note = await getNoteFromActiveVaults(args.path, requestedVaultPath(args))
   return { content: note.content, frontmatter: note.frontmatter }
 }
 
 function uiOpenNoteTool(args) {
-  broadcastUiAction('vault_changed', { path: args.path })
-  broadcastUiAction('open_note', { path: args.path })
+  const targetPath = uiPath(args)
+  broadcastUiAction('vault_changed', { path: targetPath })
+  broadcastUiAction('open_note', { path: targetPath })
   return { ok: true }
 }
 
 function uiOpenTabTool(args) {
-  broadcastUiAction('vault_changed', { path: args.path })
-  broadcastUiAction('open_tab', { path: args.path })
+  const targetPath = uiPath(args)
+  broadcastUiAction('vault_changed', { path: targetPath })
+  broadcastUiAction('open_tab', { path: targetPath })
   return { ok: true }
 }
 
@@ -82,15 +145,15 @@ function uiSetFilterTool(args) {
 }
 
 function refreshVaultTool(args) {
-  broadcastUiAction('vault_changed', { path: args?.path })
+  broadcastUiAction('vault_changed', { path: uiPath(args) })
   return { ok: true }
 }
 
 const TOOL_EXECUTORS = [
   ['open_note', readNoteTool],
   ['read_note', readNoteTool],
-  ['search_notes', (args) => searchNotes(activeVaultPath(), args.query, args.limit)],
-  ['vault_context', () => vaultContext(activeVaultPath())],
+  ['search_notes', (args) => searchActiveVaults(args.query, args.limit)],
+  ['vault_context', () => activeVaultContext()],
   ['ui_open_note', uiOpenNoteTool],
   ['ui_open_tab', uiOpenTabTool],
   ['ui_highlight', highlightTool],
@@ -206,7 +269,7 @@ export function startUiBridge(port = WS_UI_PORT) {
 }
 
 export function startBridge(port = WS_PORT) {
-  const currentVaultPath = activeVaultPath()
+  const currentVaultPaths = activeVaultPaths()
   const wss = new WebSocketServer({
     port,
     host: LOOPBACK_HOST,
@@ -214,7 +277,7 @@ export function startBridge(port = WS_PORT) {
   })
 
   wss.on('connection', (ws) => {
-    console.error(`[ws-bridge] Client connected (vault: ${currentVaultPath})`)
+    console.error(`[ws-bridge] Client connected (vaults: ${currentVaultPaths.join(', ')})`)
 
     ws.on('message', async (raw) => {
       try {
@@ -236,7 +299,7 @@ export function startBridge(port = WS_PORT) {
 const isMain = process.argv[1]?.endsWith('ws-bridge.js')
 if (isMain) {
   try {
-    activeVaultPath()
+    activeVaultPaths()
     startUiBridge().then(() => startBridge())
   } catch (err) {
     console.error(`[ws-bridge] ${err.message}`)
diff --git a/package.json b/package.json
index cb89ccca..ae9734fa 100644
--- a/package.json
+++ b/package.json
@@ -115,8 +115,11 @@
     "overrides": {
       "@hono/node-server": "1.19.13",
       "express-rate-limit": "8.2.2",
-      "hono": "4.12.14",
+      "hono": "4.12.18",
+      "ip-address": "10.1.1",
+      "mermaid>uuid": "11.1.1",
       "path-to-regexp": "8.4.0",
+      "fast-uri": "3.1.2",
       "picomatch": "4.0.4",
       "postcss": "8.5.10",
       "protobufjs": "7.5.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d22a8d8e..a5220c0d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,8 +7,11 @@ settings:
 overrides:
   '@hono/node-server': 1.19.13
   express-rate-limit: 8.2.2
-  hono: 4.12.14
+  hono: 4.12.18
+  ip-address: 10.1.1
+  mermaid>uuid: 11.1.1
   path-to-regexp: 8.4.0
+  fast-uri: 3.1.2
   picomatch: 4.0.4
   postcss: 8.5.10
   protobufjs: 7.5.6
@@ -1030,7 +1033,7 @@ packages:
     resolution: {integrity: sha512-TsQLe4i2gvoTtrHje625ngThGBySOgSK3Xo2XRYOdqGN1teR8+I7vchQC46uLJi8OF62YTYA3AhSpumtkhsaKQ==}
     engines: {node: '>=18.14.1'}
     peerDependencies:
-      hono: 4.12.14
+      hono: 4.12.18
 
   '@humanfs/core@0.19.1':
     resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
@@ -3946,8 +3949,8 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  fast-uri@3.1.0:
-    resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
+  fast-uri@3.1.2:
+    resolution: {integrity: sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==}
 
   fast-xml-builder@1.1.5:
     resolution: {integrity: sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==}
@@ -4161,8 +4164,8 @@ packages:
     resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==}
     engines: {node: '>=12.0.0'}
 
-  hono@4.12.14:
-    resolution: {integrity: sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==}
+  hono@4.12.18:
+    resolution: {integrity: sha512-RWzP96k/yv0PQfyXnWjs6zot20TqfpfsNXhOnev8d1InAxubW93L11/oNUc3tQqn2G0bSdAOBpX+2uDFHV7kdQ==}
     engines: {node: '>=16.9.0'}
 
   hookable@5.5.3:
@@ -4251,8 +4254,8 @@ packages:
     resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
     engines: {node: '>=12'}
 
-  ip-address@10.1.0:
-    resolution: {integrity: sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==}
+  ip-address@10.1.1:
+    resolution: {integrity: sha512-1FMu8/N15Ck1BL551Jf42NYIoin2unWjLQ2Fze/DXryJRl5twqtwNHlO39qERGbIOcKYWHdgRryhOC+NG4eaLw==}
     engines: {node: '>= 12'}
 
   ipaddr.js@1.9.1:
@@ -5659,8 +5662,8 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  uuid@11.1.0:
-    resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==}
+  uuid@11.1.1:
+    resolution: {integrity: sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==}
     hasBin: true
 
   uuid@8.3.2:
@@ -6741,9 +6744,9 @@ snapshots:
       prosemirror-transform: 1.11.0
       prosemirror-view: 1.41.6
 
-  '@hono/node-server@1.19.13(hono@4.12.14)':
+  '@hono/node-server@1.19.13(hono@4.12.18)':
     dependencies:
-      hono: 4.12.14
+      hono: 4.12.18
 
   '@humanfs/core@0.19.1': {}
 
@@ -6983,7 +6986,7 @@ snapshots:
 
   '@modelcontextprotocol/sdk@1.27.1(zod@4.3.6)':
     dependencies:
-      '@hono/node-server': 1.19.13(hono@4.12.14)
+      '@hono/node-server': 1.19.13(hono@4.12.18)
       ajv: 8.18.0
       ajv-formats: 3.0.1(ajv@8.18.0)
       content-type: 1.0.5
@@ -6993,7 +6996,7 @@ snapshots:
       eventsource-parser: 3.0.6
       express: 5.2.1
       express-rate-limit: 8.2.2(express@5.2.1)
-      hono: 4.12.14
+      hono: 4.12.18
       jose: 6.1.3
       json-schema-typed: 8.0.2
       pkce-challenge: 5.0.1
@@ -9115,7 +9118,7 @@ snapshots:
   ajv@8.18.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.0
+      fast-uri: 3.1.2
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
@@ -9833,7 +9836,7 @@ snapshots:
   express-rate-limit@8.2.2(express@5.2.1):
     dependencies:
       express: 5.2.1
-      ip-address: 10.1.0
+      ip-address: 10.1.1
 
   express@5.2.1:
     dependencies:
@@ -9882,7 +9885,7 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
-  fast-uri@3.1.0: {}
+  fast-uri@3.1.2: {}
 
   fast-xml-builder@1.1.5:
     dependencies:
@@ -10185,7 +10188,7 @@ snapshots:
 
   highlight.js@11.11.1: {}
 
-  hono@4.12.14: {}
+  hono@4.12.18: {}
 
   hookable@5.5.3: {}
 
@@ -10262,7 +10265,7 @@ snapshots:
 
   internmap@2.0.3: {}
 
-  ip-address@10.1.0: {}
+  ip-address@10.1.1: {}
 
   ipaddr.js@1.9.1: {}
 
@@ -10736,7 +10739,7 @@ snapshots:
       roughjs: 4.6.6
       stylis: 4.4.0
       ts-dedent: 2.2.0
-      uuid: 11.1.0
+      uuid: 11.1.1
 
   micromark-core-commonmark@2.0.3:
     dependencies:
@@ -12016,7 +12019,7 @@ snapshots:
     dependencies:
       react: 19.2.4
 
-  uuid@11.1.0: {}
+  uuid@11.1.1: {}
 
   uuid@8.3.2: {}
 
diff --git a/src-tauri/src/ai_agents.rs b/src-tauri/src/ai_agents.rs
index 236debc1..b3cf9fa7 100644
--- a/src-tauri/src/ai_agents.rs
+++ b/src-tauri/src/ai_agents.rs
@@ -68,6 +68,8 @@ pub struct AiAgentStreamRequest {
     pub message: String,
     pub system_prompt: Option<String>,
     pub vault_path: String,
+    #[serde(default)]
+    pub vault_paths: Vec<String>,
     pub permission_mode: Option<AiAgentPermissionMode>,
 }
 
@@ -98,6 +100,7 @@ where
                 message: request.message,
                 system_prompt: request.system_prompt,
                 vault_path: request.vault_path,
+                vault_paths: request.vault_paths,
                 permission_mode,
             };
             crate::claude_cli::run_agent_stream(mapped, |event| {
@@ -111,6 +114,7 @@ where
                 message: request.message,
                 system_prompt: request.system_prompt,
                 vault_path: request.vault_path,
+                vault_paths: request.vault_paths,
                 permission_mode,
             };
             crate::codex_cli::run_agent_stream(mapped, emit)
@@ -120,6 +124,7 @@ where
                 message: request.message,
                 system_prompt: request.system_prompt,
                 vault_path: request.vault_path,
+                vault_paths: request.vault_paths,
                 permission_mode,
             };
             crate::opencode_cli::run_agent_stream(mapped, emit)
@@ -129,6 +134,7 @@ where
                 message: request.message,
                 system_prompt: request.system_prompt,
                 vault_path: request.vault_path,
+                vault_paths: request.vault_paths,
                 permission_mode,
             };
             crate::pi_cli::run_agent_stream(mapped, emit)
@@ -138,6 +144,7 @@ where
                 message: request.message,
                 system_prompt: request.system_prompt,
                 vault_path: request.vault_path,
+                vault_paths: request.vault_paths,
                 permission_mode,
             };
             crate::gemini_cli::run_agent_stream(mapped, emit)
@@ -199,6 +206,7 @@ mod tests {
             message: "Summarize this vault".into(),
             system_prompt: None,
             vault_path: "/tmp/vault".into(),
+            vault_paths: Vec::new(),
             permission_mode,
         }
     }
diff --git a/src-tauri/src/claude_cli.rs b/src-tauri/src/claude_cli.rs
index 108085fe..91d6a0a5 100644
--- a/src-tauri/src/claude_cli.rs
+++ b/src-tauri/src/claude_cli.rs
@@ -1533,6 +1533,7 @@ mod tests {
             message: "test".into(),
             system_prompt: Some("sys".into()),
             vault_path: "/tmp/nonexistent".into(),
+            vault_paths: Vec::new(),
             permission_mode: AiAgentPermissionMode::Safe,
         };
         let mut events = vec![];
diff --git a/src-tauri/src/claude_invocation.rs b/src-tauri/src/claude_invocation.rs
index 7a323e25..82b9d837 100644
--- a/src-tauri/src/claude_invocation.rs
+++ b/src-tauri/src/claude_invocation.rs
@@ -180,7 +180,7 @@ fn agent_args_with_tool_policy(
         "--verbose".into(),
         "--include-partial-messages".into(),
         "--mcp-config".into(),
-        mcp_config(&req.vault_path)?,
+        mcp_config(&req.vault_path, &req.vault_paths)?,
         "--strict-mcp-config".into(),
         "--permission-mode".into(),
         "acceptEdits".into(),
@@ -221,14 +221,18 @@ fn stdin_prompt(message: &str, system_prompt: Option<&str>) -> String {
     crate::cli_agent_runtime::build_prompt(message, system_prompt)
 }
 
-fn mcp_config(vault_path: &str) -> Result<String, String> {
+fn mcp_config(vault_path: &str, vault_paths: &[String]) -> Result<String, String> {
     let mcp_server_path = crate::cli_agent_runtime::mcp_server_path_string()?;
+    let vault_paths = crate::cli_agent_runtime::active_vault_paths_json(vault_path, vault_paths);
     let config = serde_json::json!({
         "mcpServers": {
             "tolaria": {
                 "command": "node",
                 "args": [mcp_server_path],
-                "env": { "VAULT_PATH": vault_path }
+                "env": {
+                    "VAULT_PATH": vault_path,
+                    "VAULT_PATHS": vault_paths
+                }
             }
         }
     });
@@ -378,6 +382,7 @@ mod tests {
             message: message.into(),
             system_prompt: system_prompt.map(str::to_string),
             vault_path: "/tmp/vault".into(),
+            vault_paths: Vec::new(),
             permission_mode,
         }
     }
@@ -594,13 +599,18 @@ mod tests {
 
     #[test]
     fn mcp_config_is_valid_json() {
-        if let Ok(config_str) = mcp_config("/tmp/test-vault") {
+        let extra_vaults = vec!["/tmp/secondary-vault".to_string()];
+        if let Ok(config_str) = mcp_config("/tmp/test-vault", &extra_vaults) {
             let parsed: serde_json::Value = serde_json::from_str(&config_str).unwrap();
             assert!(parsed["mcpServers"]["tolaria"]["command"].is_string());
             assert_eq!(
                 parsed["mcpServers"]["tolaria"]["env"]["VAULT_PATH"],
                 "/tmp/test-vault"
             );
+            assert_eq!(
+                parsed["mcpServers"]["tolaria"]["env"]["VAULT_PATHS"],
+                "[\"/tmp/test-vault\",\"/tmp/secondary-vault\"]"
+            );
         }
     }
 }
diff --git a/src-tauri/src/cli_agent_runtime.rs b/src-tauri/src/cli_agent_runtime.rs
index 4ae63ac4..99c5b623 100644
--- a/src-tauri/src/cli_agent_runtime.rs
+++ b/src-tauri/src/cli_agent_runtime.rs
@@ -10,6 +10,8 @@ pub struct AgentStreamRequest {
     pub message: String,
     pub system_prompt: Option<String>,
     pub vault_path: String,
+    #[serde(default)]
+    pub vault_paths: Vec<String>,
     pub permission_mode: AiAgentPermissionMode,
 }
 
@@ -65,6 +67,28 @@ pub(crate) fn mcp_server_path_string() -> Result<String, String> {
         .to_string())
 }
 
+pub(crate) fn active_vault_paths(primary_vault_path: &str, vault_paths: &[String]) -> Vec<String> {
+    let mut paths = Vec::new();
+    push_unique_vault_path(&mut paths, primary_vault_path);
+    for path in vault_paths {
+        push_unique_vault_path(&mut paths, path);
+    }
+    paths
+}
+
+pub(crate) fn active_vault_paths_json(primary_vault_path: &str, vault_paths: &[String]) -> String {
+    serde_json::to_string(&active_vault_paths(primary_vault_path, vault_paths))
+        .unwrap_or_else(|_| format!("[{}]", serde_json::json!(primary_vault_path)))
+}
+
+fn push_unique_vault_path(paths: &mut Vec<String>, path: &str) {
+    let trimmed = path.trim();
+    if trimmed.is_empty() || paths.iter().any(|existing| existing == trimmed) {
+        return;
+    }
+    paths.push(trimmed.to_string());
+}
+
 pub(crate) fn version_for_binary(binary: &Path) -> Option<String> {
     let target = command_target_avoiding_windows_cmd_shim(binary).ok()?;
     let mut command = crate::hidden_command(&target.program);
diff --git a/src-tauri/src/codex_cli.rs b/src-tauri/src/codex_cli.rs
index ec58f95e..e558118b 100644
--- a/src-tauri/src/codex_cli.rs
+++ b/src-tauri/src/codex_cli.rs
@@ -265,7 +265,7 @@ fn build_codex_args(
         "-c".into(),
         codex_config_string_list("mcp_servers.tolaria.args", &[mcp_server_path.as_str()]),
         "-c".into(),
-        codex_mcp_env_config(&request.vault_path),
+        codex_mcp_env_config(&request.vault_path, &request.vault_paths),
     ];
 
     if let Some(path) = last_message_path {
@@ -289,10 +289,12 @@ fn codex_config_string_list(key: &str, values: &[&str]) -> String {
     format!("{key}=[{values}]")
 }
 
-fn codex_mcp_env_config(vault_path: &str) -> String {
+fn codex_mcp_env_config(vault_path: &str, vault_paths: &[String]) -> String {
+    let vault_paths = crate::cli_agent_runtime::active_vault_paths_json(vault_path, vault_paths);
     format!(
-        r#"mcp_servers.tolaria.env={{VAULT_PATH="{}",WS_UI_PORT="9711"}}"#,
-        toml_escape(vault_path)
+        r#"mcp_servers.tolaria.env={{VAULT_PATH="{}",VAULT_PATHS="{}",WS_UI_PORT="9711"}}"#,
+        toml_escape(vault_path),
+        toml_escape(&vault_paths)
     )
 }
 
@@ -503,6 +505,7 @@ mod tests {
             message: "Summarize".into(),
             system_prompt: None,
             vault_path: vault_path.to_string_lossy().into_owned(),
+            vault_paths: Vec::new(),
             permission_mode,
         }
     }
@@ -553,6 +556,7 @@ mod tests {
             message: "Rename the note".into(),
             system_prompt: Some("Be concise".into()),
             vault_path: "/tmp/vault".into(),
+            vault_paths: Vec::new(),
             permission_mode: AiAgentPermissionMode::Safe,
         });
 
@@ -567,6 +571,7 @@ mod tests {
                 message: "Rename the note".into(),
                 system_prompt: None,
                 vault_path: "/tmp/vault".into(),
+                vault_paths: Vec::new(),
                 permission_mode: AiAgentPermissionMode::Safe,
             },
             None,
@@ -585,6 +590,7 @@ mod tests {
                 message: "Rename the note".into(),
                 system_prompt: None,
                 vault_path: "/tmp/vault".into(),
+                vault_paths: Vec::new(),
                 permission_mode: AiAgentPermissionMode::PowerUser,
             },
             None,
@@ -600,6 +606,7 @@ mod tests {
                 message: "Rename the note".into(),
                 system_prompt: None,
                 vault_path: "/tmp/vault".into(),
+                vault_paths: Vec::new(),
                 permission_mode: AiAgentPermissionMode::Safe,
             },
             Some(Path::new("/tmp/tolaria-codex-last-message.txt")),
@@ -619,6 +626,7 @@ mod tests {
                 message: "Read [[Test note]]".into(),
                 system_prompt: None,
                 vault_path: "/tmp/vault".into(),
+                vault_paths: Vec::new(),
                 permission_mode: AiAgentPermissionMode::Safe,
             },
             None,
diff --git a/src-tauri/src/commands/ai.rs b/src-tauri/src/commands/ai.rs
index 4e1f0ddf..c552dd8c 100644
--- a/src-tauri/src/commands/ai.rs
+++ b/src-tauri/src/commands/ai.rs
@@ -118,6 +118,11 @@ define_desktop_stream_command!(
 #[cfg(desktop)]
 fn normalize_agent_request(mut request: AiAgentStreamRequest) -> AiAgentStreamRequest {
     request.vault_path = expand_tilde(&request.vault_path).into_owned();
+    request.vault_paths = request
+        .vault_paths
+        .into_iter()
+        .map(|path| expand_tilde(&path).into_owned())
+        .collect();
     request
 }
 
@@ -273,6 +278,7 @@ mod tests {
             message: "hi".into(),
             system_prompt: None,
             vault_path: "~/Vaults/content".into(),
+            vault_paths: vec!["~/Vaults/secondary".into()],
             permission_mode: None,
         };
 
@@ -283,6 +289,11 @@ mod tests {
             format!("{}/Vaults/content", home.display()),
             "vault_path must be tilde-expanded so spawned agents can chdir into it",
         );
+        assert_eq!(
+            normalized.vault_paths,
+            vec![format!("{}/Vaults/secondary", home.display())],
+            "vault_paths must be tilde-expanded so spawned agents can access every active vault",
+        );
     }
 
     #[cfg(desktop)]
@@ -295,6 +306,7 @@ mod tests {
             message: "hi".into(),
             system_prompt: None,
             vault_path: "/Users/example/vault".into(),
+            vault_paths: Vec::new(),
             permission_mode: None,
         };
 
diff --git a/src-tauri/src/commands/system.rs b/src-tauri/src/commands/system.rs
index d329555e..c1e01d19 100644
--- a/src-tauri/src/commands/system.rs
+++ b/src-tauri/src/commands/system.rs
@@ -254,6 +254,7 @@ pub fn read_text_from_clipboard() -> Result<String, String> {
 pub async fn sync_mcp_bridge_vault(
     app: tauri::AppHandle,
     vault_path: Option<String>,
+    vault_paths: Option<Vec<String>>,
 ) -> Result<String, String> {
     let expanded_vault_path = vault_path
         .as_deref()
@@ -261,8 +262,15 @@ pub async fn sync_mcp_bridge_vault(
         .filter(|path| !path.is_empty())
         .map(|path| super::expand_tilde(path).into_owned());
     let vault_path = expanded_vault_path.as_deref().map(std::path::Path::new);
+    let expanded_vault_paths = vault_paths
+        .unwrap_or_default()
+        .into_iter()
+        .map(|path| super::expand_tilde(path.trim()).into_owned())
+        .filter(|path| !path.is_empty())
+        .map(std::path::PathBuf::from)
+        .collect::<Vec<_>>();
 
-    crate::sync_ws_bridge_for_vault(&app, vault_path).map(str::to_string)
+    crate::sync_ws_bridge_for_vault(&app, vault_path, &expanded_vault_paths).map(str::to_string)
 }
 
 // ── MCP commands (mobile stubs) ─────────────────────────────────────────────
@@ -305,7 +313,10 @@ pub fn read_text_from_clipboard() -> Result<String, String> {
 
 #[cfg(mobile)]
 #[tauri::command]
-pub async fn sync_mcp_bridge_vault(_vault_path: Option<String>) -> Result<String, String> {
+pub async fn sync_mcp_bridge_vault(
+    _vault_path: Option<String>,
+    _vault_paths: Option<Vec<String>>,
+) -> Result<String, String> {
     Err("MCP is not available on mobile".into())
 }
 
diff --git a/src-tauri/src/commands/vault/boundary.rs b/src-tauri/src/commands/vault/boundary.rs
index c5770869..b6a3f092 100644
--- a/src-tauri/src/commands/vault/boundary.rs
+++ b/src-tauri/src/commands/vault/boundary.rs
@@ -36,7 +36,9 @@ impl VaultBoundary {
 
         let root = match (configured_root, requested_root) {
             (Some(configured), Some(requested)) => {
-                if configured.canonical != requested.canonical {
+                if configured.canonical != requested.canonical
+                    && !is_registered_vault_root(&requested)?
+                {
                     return Err(ACTIVE_VAULT_MISMATCH_ERROR.to_string());
                 }
                 requested
@@ -140,6 +142,28 @@ fn load_registered_vault_roots() -> Result<Vec<VaultRootPaths>, String> {
     Ok(roots)
 }
 
+fn is_registered_vault_root(requested: &VaultRootPaths) -> Result<bool, String> {
+    let list = vault_list::load_vault_list()?;
+    let registered_paths = list
+        .vaults
+        .iter()
+        .map(|entry| entry.path.as_str())
+        .chain(list.active_vault.as_deref());
+
+    for path in registered_paths {
+        if path.trim().is_empty() {
+            continue;
+        }
+        let Ok(root) = build_vault_root_paths(path) else {
+            continue;
+        };
+        if root.canonical == requested.canonical {
+            return Ok(true);
+        }
+    }
+    Ok(false)
+}
+
 fn find_registered_root_for_absolute_path(
     raw_path: &str,
 ) -> Result<Option<VaultRootPaths>, String> {
@@ -316,11 +340,31 @@ pub(crate) fn with_existing_path_in_requested_vault<T>(
     path: &str,
     action: impl FnOnce(&str, &str) -> Result<T, String>,
 ) -> Result<T, String> {
-    with_boundary(Some(vault_path), |boundary| {
-        let requested_root = boundary.requested_root_str();
-        let validated_path = boundary.validate_existing_path(path)?;
-        action(&requested_root, &validated_path)
-    })
+    let requested_validation = with_boundary(Some(vault_path), |boundary| {
+        Ok((
+            boundary.requested_root_str(),
+            boundary.validate_existing_path(path)?,
+        ))
+    });
+
+    let validated = match requested_validation {
+        Ok(validated) => validated,
+        Err(error) if error == ACTIVE_VAULT_PATH_ERROR || error == ACTIVE_VAULT_MISMATCH_ERROR => {
+            let Some(root) = find_registered_root_for_absolute_path(path)? else {
+                return Err(error);
+            };
+            let boundary = VaultBoundary {
+                requested_root: root.requested,
+                canonical_root: root.canonical,
+            };
+            (
+                boundary.requested_root_str(),
+                boundary.validate_existing_path(path)?,
+            )
+        }
+        Err(error) => return Err(error),
+    };
+    action(&validated.0, &validated.1)
 }
 
 pub(crate) fn with_view_file<T>(
diff --git a/src-tauri/src/commands/vault/rename_cmds.rs b/src-tauri/src/commands/vault/rename_cmds.rs
index f65bab27..a752aa20 100644
--- a/src-tauri/src/commands/vault/rename_cmds.rs
+++ b/src-tauri/src/commands/vault/rename_cmds.rs
@@ -1,95 +1,264 @@
 use crate::commands::expand_tilde;
 use crate::vault::{self, DetectedRename, RenameResult};
+use serde::Deserialize;
 use std::path::Path;
 
 use super::boundary::{
-    with_existing_path_in_requested_vault, with_validated_path, ValidatedPathMode,
+    with_boundary, with_existing_path_in_requested_vault, with_validated_path, ValidatedPathMode,
 };
 
-#[tauri::command]
-pub fn rename_note(
+struct RequestedNotePath<'a> {
+    vault_path: &'a str,
+    note_path: &'a str,
+}
+
+struct ValidatedNotePath<'a> {
+    vault_path: &'a str,
+    note_path: &'a str,
+}
+
+impl<'a> RequestedNotePath<'a> {
+    fn new(vault_path: &'a str, note_path: &'a str) -> Self {
+        Self {
+            vault_path,
+            note_path,
+        }
+    }
+}
+
+fn with_note_path_in_vault<T>(
+    request: RequestedNotePath<'_>,
+    action: impl FnOnce(ValidatedNotePath<'_>) -> Result<T, String>,
+) -> Result<T, String> {
+    with_existing_path_in_requested_vault(
+        request.vault_path,
+        request.note_path,
+        |requested_root, validated_path| {
+            action(ValidatedNotePath {
+                vault_path: requested_root,
+                note_path: validated_path,
+            })
+        },
+    )
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MoveNoteToWorkspaceCommandArgs {
+    source_vault_path: String,
+    destination_vault_path: String,
+    old_path: String,
+    replacement_target: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RenameNoteCommandArgs {
     vault_path: String,
     old_path: String,
     new_title: String,
     old_title: Option<String>,
-) -> Result<RenameResult, String> {
-    with_existing_path_in_requested_vault(
-        &vault_path,
-        &old_path,
-        |requested_root, validated_path| {
-            vault::rename_note(vault::RenameNoteRequest {
-                vault_path: requested_root,
-                old_path: validated_path,
-                new_title: &new_title,
-                old_title_hint: old_title.as_deref(),
-            })
-        },
-    )
 }
 
-#[tauri::command]
-pub fn rename_note_filename(
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RenameNoteFilenameCommandArgs {
     vault_path: String,
     old_path: String,
     new_filename_stem: String,
-) -> Result<RenameResult, String> {
-    with_existing_path_in_requested_vault(
-        &vault_path,
-        &old_path,
-        |requested_root, validated_path| {
-            vault::rename_note_filename(vault::RenameNoteFilenameRequest {
-                vault_path: requested_root,
-                old_path: validated_path,
-                new_filename_stem: &new_filename_stem,
-            })
-        },
-    )
 }
 
-#[tauri::command]
-pub fn move_note_to_folder(
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MoveNoteToFolderCommandArgs {
     vault_path: String,
     old_path: String,
     folder_path: String,
-) -> Result<RenameResult, String> {
-    with_existing_path_in_requested_vault(
-        &vault_path,
-        &old_path,
-        |requested_root, validated_path| {
-            let trimmed_folder_path = folder_path.trim();
-            if trimmed_folder_path.is_empty() {
-                return Err("Folder path cannot be empty".to_string());
-            }
+}
 
-            let folder_absolute_path = Path::new(requested_root).join(trimmed_folder_path);
-            with_validated_path(
-                folder_absolute_path.to_string_lossy().as_ref(),
-                Some(&vault_path),
-                ValidatedPathMode::Existing,
-                |validated_folder_path| {
-                    let validated_folder = Path::new(validated_folder_path);
-                    if !validated_folder.is_dir() {
-                        return Err(format!("Folder does not exist: {}", trimmed_folder_path));
-                    }
-                    vault::move_note_to_folder(vault::MoveNoteToFolderRequest {
-                        vault_path: requested_root,
-                        old_path: validated_path,
-                        destination_folder_path: validated_folder_path,
-                    })
-                },
-            )
-        },
-    )
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AutoRenameUntitledCommandArgs {
+    vault_path: String,
+    note_path: String,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct VaultPathCommandArgs {
+    vault_path: String,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateWikilinksForRenamesCommandArgs {
+    vault_path: String,
+    renames: Vec<DetectedRename>,
+}
+
+enum NoteRenameCommandArgs {
+    Title {
+        new_title: String,
+        old_title: Option<String>,
+    },
+    Filename {
+        new_filename_stem: String,
+    },
+}
+
+impl NoteRenameCommandArgs {
+    fn run(self, note: ValidatedNotePath<'_>) -> Result<RenameResult, String> {
+        match self {
+            Self::Title {
+                new_title,
+                old_title,
+            } => vault::rename_note(vault::RenameNoteRequest {
+                vault_path: note.vault_path,
+                old_path: note.note_path,
+                new_title: &new_title,
+                old_title_hint: old_title.as_deref(),
+            }),
+            Self::Filename { new_filename_stem } => {
+                vault::rename_note_filename(vault::RenameNoteFilenameRequest {
+                    vault_path: note.vault_path,
+                    old_path: note.note_path,
+                    new_filename_stem: &new_filename_stem,
+                })
+            }
+        }
+    }
+}
+
+struct PendingNoteRenameCommand {
+    vault_path: String,
+    old_path: String,
+    args: NoteRenameCommandArgs,
+}
+
+enum PublicNoteRenameCommandArgs {
+    Title(RenameNoteCommandArgs),
+    Filename(RenameNoteFilenameCommandArgs),
+}
+
+fn pending_note_rename(
+    vault_path: String,
+    old_path: String,
+    args: NoteRenameCommandArgs,
+) -> PendingNoteRenameCommand {
+    PendingNoteRenameCommand {
+        vault_path,
+        old_path,
+        args,
+    }
+}
+
+fn rename_existing_note(command: PendingNoteRenameCommand) -> Result<RenameResult, String> {
+    let request = RequestedNotePath::new(&command.vault_path, &command.old_path);
+    with_note_path_in_vault(request, |note| command.args.run(note))
+}
+
+fn rename_public_note(args: PublicNoteRenameCommandArgs) -> Result<RenameResult, String> {
+    let command = match args {
+        PublicNoteRenameCommandArgs::Title(args) => pending_note_rename(
+            args.vault_path,
+            args.old_path,
+            NoteRenameCommandArgs::Title {
+                new_title: args.new_title,
+                old_title: args.old_title,
+            },
+        ),
+        PublicNoteRenameCommandArgs::Filename(args) => pending_note_rename(
+            args.vault_path,
+            args.old_path,
+            NoteRenameCommandArgs::Filename {
+                new_filename_stem: args.new_filename_stem,
+            },
+        ),
+    };
+    rename_existing_note(command)
+}
+
+#[tauri::command]
+pub fn rename_note(args: RenameNoteCommandArgs) -> Result<RenameResult, String> {
+    rename_public_note(PublicNoteRenameCommandArgs::Title(args))
+}
+
+#[tauri::command]
+pub fn rename_note_filename(args: RenameNoteFilenameCommandArgs) -> Result<RenameResult, String> {
+    rename_public_note(PublicNoteRenameCommandArgs::Filename(args))
+}
+
+fn run_folder_move(args: MoveNoteToFolderCommandArgs) -> Result<RenameResult, String> {
+    let request = RequestedNotePath::new(&args.vault_path, &args.old_path);
+    with_note_path_in_vault(request, |note| {
+        let trimmed_folder_path = args.folder_path.trim();
+        if trimmed_folder_path.is_empty() {
+            return Err("Folder path cannot be empty".to_string());
+        }
+
+        let folder_absolute_path = Path::new(note.vault_path).join(trimmed_folder_path);
+        with_validated_path(
+            folder_absolute_path.to_string_lossy().as_ref(),
+            Some(args.vault_path.as_str()),
+            ValidatedPathMode::Existing,
+            |validated_folder_path| {
+                let validated_folder = Path::new(validated_folder_path);
+                if !validated_folder.is_dir() {
+                    return Err(format!("Folder does not exist: {}", trimmed_folder_path));
+                }
+                vault::move_note_to_folder(vault::MoveNoteToFolderRequest {
+                    vault_path: note.vault_path,
+                    old_path: note.note_path,
+                    destination_folder_path: validated_folder_path,
+                })
+            },
+        )
+    })
+}
+
+#[tauri::command]
+pub fn move_note_to_folder(args: MoveNoteToFolderCommandArgs) -> Result<RenameResult, String> {
+    run_folder_move(args)
+}
+
+#[tauri::command]
+pub fn move_note_to_workspace(
+    args: MoveNoteToWorkspaceCommandArgs,
+) -> Result<RenameResult, String> {
+    let request = RequestedNotePath::new(&args.source_vault_path, &args.old_path);
+    with_note_path_in_vault(request, |note| {
+        let source_root_path = Path::new(note.vault_path);
+        let old_file = Path::new(note.note_path);
+        let relative_path = old_file
+            .strip_prefix(source_root_path)
+            .map_err(|_| "Path must stay inside the source vault".to_string())?;
+        let relative_path = relative_path.to_string_lossy();
+
+        with_boundary(Some(&args.destination_vault_path), |destination_boundary| {
+            let destination_path = destination_boundary.child_path(relative_path.as_ref())?;
+            let destination_root = destination_boundary
+                .requested_root()
+                .to_string_lossy()
+                .into_owned();
+            let destination_path = destination_path.to_string_lossy().into_owned();
+            vault::move_note_to_workspace(vault::MoveNoteToWorkspaceRequest {
+                source_vault_path: note.vault_path,
+                destination_vault_path: &destination_root,
+                old_path: note.note_path,
+                destination_path: &destination_path,
+                replacement_target: args.replacement_target.as_deref(),
+            })
+        })
+    })
 }
 
 #[tauri::command]
 pub fn auto_rename_untitled(
-    vault_path: String,
-    note_path: String,
+    args: AutoRenameUntitledCommandArgs,
 ) -> Result<Option<RenameResult>, String> {
     with_existing_path_in_requested_vault(
-        &vault_path,
-        &note_path,
+        &args.vault_path,
+        &args.note_path,
         |requested_root, validated_path| {
             vault::auto_rename_untitled(vault::AutoRenameUntitledRequest {
                 vault_path: requested_root,
@@ -100,18 +269,17 @@ pub fn auto_rename_untitled(
 }
 
 #[tauri::command]
-pub fn detect_renames(vault_path: String) -> Result<Vec<DetectedRename>, String> {
-    let vault_path = expand_tilde(&vault_path);
+pub fn detect_renames(args: VaultPathCommandArgs) -> Result<Vec<DetectedRename>, String> {
+    let vault_path = expand_tilde(&args.vault_path);
     vault::detect_renames(Path::new(vault_path.as_ref()))
 }
 
 #[tauri::command]
 pub fn update_wikilinks_for_renames(
-    vault_path: String,
-    renames: Vec<DetectedRename>,
+    args: UpdateWikilinksForRenamesCommandArgs,
 ) -> Result<usize, String> {
-    let vault_path = expand_tilde(&vault_path);
-    vault::update_wikilinks_for_renames(Path::new(vault_path.as_ref()), &renames)
+    let vault_path = expand_tilde(&args.vault_path);
+    vault::update_wikilinks_for_renames(Path::new(vault_path.as_ref()), &args.renames)
 }
 
 #[cfg(test)]
@@ -144,12 +312,12 @@ mod tests {
         );
         let linked_path = write_note(&dir, "linked.md", "See [[Old Title]].\n");
 
-        let result = rename_note(
-            vault.clone(),
-            old_path.clone(),
-            "New Title".to_string(),
-            None,
-        )
+        let result = rename_note(RenameNoteCommandArgs {
+            vault_path: vault.clone(),
+            old_path: old_path.clone(),
+            new_title: "New Title".to_string(),
+            old_title: None,
+        })
         .unwrap();
 
         assert!(result.new_path.ends_with("new-title.md"));
@@ -171,16 +339,20 @@ mod tests {
             "---\ntitle: Draft Title\n---\n# Draft Title\n",
         );
 
-        let renamed =
-            rename_note_filename(vault.clone(), old_path, "custom-name".to_string()).unwrap();
+        let renamed = rename_note_filename(RenameNoteFilenameCommandArgs {
+            vault_path: vault.clone(),
+            old_path,
+            new_filename_stem: "custom-name".to_string(),
+        })
+        .unwrap();
         assert!(renamed.new_path.ends_with("custom-name.md"));
 
         fs::create_dir(dir.path().join("Projects")).unwrap();
-        let moved = move_note_to_folder(
-            vault.clone(),
-            renamed.new_path.clone(),
-            "Projects".to_string(),
-        )
+        let moved = move_note_to_folder(MoveNoteToFolderCommandArgs {
+            vault_path: vault.clone(),
+            old_path: renamed.new_path.clone(),
+            folder_path: "Projects".to_string(),
+        })
         .unwrap();
 
         assert!(moved.new_path.ends_with("Projects/custom-name.md"));
@@ -189,15 +361,50 @@ mod tests {
             .contains("Draft Title"));
     }
 
+    #[test]
+    fn move_note_to_workspace_command_preserves_relative_path() {
+        let source = TempDir::new().unwrap();
+        let destination = TempDir::new().unwrap();
+        let source_vault = vault_path(&source);
+        let destination_vault = vault_path(&destination);
+        let old_path = write_note(
+            &source,
+            "Projects/draft.md",
+            "---\ntitle: Draft Title\n---\n# Draft Title\n",
+        );
+        let linked_path = write_note(&source, "linked.md", "See [[Draft Title]].\n");
+
+        let moved = move_note_to_workspace(MoveNoteToWorkspaceCommandArgs {
+            source_vault_path: source_vault,
+            destination_vault_path: destination_vault.clone(),
+            old_path: old_path.clone(),
+            replacement_target: Some("team/Projects/draft".to_string()),
+        })
+        .unwrap();
+
+        assert!(!Path::new(&old_path).exists());
+        assert!(moved.new_path.ends_with("Projects/draft.md"));
+        assert!(moved.new_path.starts_with(&destination_vault));
+        assert!(fs::read_to_string(moved.new_path)
+            .unwrap()
+            .contains("Draft Title"));
+        assert!(fs::read_to_string(linked_path)
+            .unwrap()
+            .contains("[[team/Projects/draft]]"));
+    }
+
     #[test]
     fn auto_rename_and_detected_rename_commands_route_through_vault() {
         let dir = TempDir::new().unwrap();
         let vault = vault_path(&dir);
         let untitled = write_note(&dir, "untitled-note-123.md", "# Project Plan\n");
 
-        let auto = auto_rename_untitled(vault.clone(), untitled)
-            .unwrap()
-            .unwrap();
+        let auto = auto_rename_untitled(AutoRenameUntitledCommandArgs {
+            vault_path: vault.clone(),
+            note_path: untitled,
+        })
+        .unwrap()
+        .unwrap();
         assert!(auto.new_path.ends_with("project-plan.md"));
 
         crate::git::init_repo(&vault).unwrap();
@@ -210,12 +417,22 @@ mod tests {
             .output()
             .unwrap();
 
-        let renames = detect_renames(vault.clone()).unwrap();
+        let renames = detect_renames(VaultPathCommandArgs {
+            vault_path: vault.clone(),
+        })
+        .unwrap();
         assert_eq!(renames.len(), 1);
         assert_eq!(renames[0].old_path, "project-plan.md");
         assert_eq!(renames[0].new_path, "plans.md");
 
-        assert_eq!(update_wikilinks_for_renames(vault, renames).unwrap(), 0);
+        assert_eq!(
+            update_wikilinks_for_renames(UpdateWikilinksForRenamesCommandArgs {
+                vault_path: vault,
+                renames,
+            })
+            .unwrap(),
+            0,
+        );
     }
 
     #[test]
@@ -224,7 +441,12 @@ mod tests {
         let vault = vault_path(&dir);
         let note = write_note(&dir, "note.md", "# Note\n");
 
-        let error = move_note_to_folder(vault, note, "  ".to_string()).unwrap_err();
+        let error = move_note_to_folder(MoveNoteToFolderCommandArgs {
+            vault_path: vault,
+            old_path: note,
+            folder_path: "  ".to_string(),
+        })
+        .unwrap_err();
         assert!(error.contains("Folder path cannot be empty"));
     }
 }
diff --git a/src-tauri/src/gemini_cli.rs b/src-tauri/src/gemini_cli.rs
index 91ae7bbc..3f355916 100644
--- a/src-tauri/src/gemini_cli.rs
+++ b/src-tauri/src/gemini_cli.rs
@@ -190,6 +190,7 @@ mod tests {
             message: "Summarize".into(),
             system_prompt: None,
             vault_path,
+            vault_paths: Vec::new(),
             permission_mode: AiAgentPermissionMode::Safe,
         }
     }
diff --git a/src-tauri/src/gemini_config.rs b/src-tauri/src/gemini_config.rs
index 4c9b0810..bb3fe8e2 100644
--- a/src-tauri/src/gemini_config.rs
+++ b/src-tauri/src/gemini_config.rs
@@ -8,7 +8,12 @@ pub(crate) fn build_command(
     request: &AgentStreamRequest,
     settings_dir: &Path,
 ) -> Result<std::process::Command, String> {
-    let settings_path = write_settings(settings_dir, &request.vault_path, request.permission_mode)?;
+    let settings_path = write_settings(
+        settings_dir,
+        &request.vault_path,
+        &request.vault_paths,
+        request.permission_mode,
+    )?;
     let target = crate::cli_agent_runtime::command_target_avoiding_windows_cmd_shim(binary)?;
     let mut command = crate::hidden_command(&target.program);
     crate::cli_agent_runtime::configure_agent_command_environment(&mut command, binary);
@@ -52,12 +57,13 @@ fn build_prompt(request: &AgentStreamRequest) -> String {
 fn write_settings(
     settings_dir: &Path,
     vault_path: &str,
+    vault_paths: &[String],
     permission_mode: AiAgentPermissionMode,
 ) -> Result<PathBuf, String> {
     std::fs::create_dir_all(settings_dir)
         .map_err(|error| format!("Failed to create Gemini settings directory: {error}"))?;
     let settings_path = settings_dir.join("settings.json");
-    let settings = build_settings(vault_path, permission_mode)?;
+    let settings = build_settings(vault_path, vault_paths, permission_mode)?;
     std::fs::write(&settings_path, settings)
         .map_err(|error| format!("Failed to write Gemini settings: {error}"))?;
     Ok(settings_path)
@@ -65,9 +71,11 @@ fn write_settings(
 
 fn build_settings(
     vault_path: &str,
+    vault_paths: &[String],
     permission_mode: AiAgentPermissionMode,
 ) -> Result<String, String> {
     let mcp_server_path = crate::cli_agent_runtime::mcp_server_path_string()?;
+    let vault_paths = crate::cli_agent_runtime::active_vault_paths_json(vault_path, vault_paths);
     let mut settings = serde_json::json!({
         "mcpServers": {
             "tolaria": {
@@ -75,6 +83,7 @@ fn build_settings(
                 "args": [mcp_server_path],
                 "env": {
                     "VAULT_PATH": vault_path,
+                    "VAULT_PATHS": vault_paths,
                     "WS_UI_PORT": "9711"
                 },
                 "description": "Tolaria active vault MCP server",
@@ -103,6 +112,7 @@ mod tests {
             message: "Rename the note".into(),
             system_prompt: None,
             vault_path: "/tmp/vault".into(),
+            vault_paths: Vec::new(),
             permission_mode: AiAgentPermissionMode::Safe,
         }
     }
@@ -194,7 +204,7 @@ mod tests {
 
     #[test]
     fn safe_settings_include_tolaria_mcp_and_exclude_shell() {
-        let settings = build_settings("/tmp/vault", AiAgentPermissionMode::Safe).unwrap();
+        let settings = build_settings("/tmp/vault", &[], AiAgentPermissionMode::Safe).unwrap();
         let json: serde_json::Value = serde_json::from_str(&settings).unwrap();
 
         assert_eq!(json["mcpServers"]["tolaria"]["command"], "node");
@@ -213,7 +223,7 @@ mod tests {
 
     #[test]
     fn power_user_settings_trust_tolaria_and_allow_shell_discovery() {
-        let settings = build_settings("/tmp/vault", AiAgentPermissionMode::PowerUser).unwrap();
+        let settings = build_settings("/tmp/vault", &[], AiAgentPermissionMode::PowerUser).unwrap();
         let json: serde_json::Value = serde_json::from_str(&settings).unwrap();
 
         assert_eq!(json["mcpServers"]["tolaria"]["trust"], true);
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 6da7c65d..892aeb13 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -77,13 +77,38 @@ fn log_startup_result(label: &str, result: Result<usize, String>) {
 }
 
 #[cfg(desktop)]
-fn selected_mcp_bridge_vault_path(vault_list: &vault_list::VaultList) -> Option<PathBuf> {
-    vault_list
+fn selected_mcp_bridge_vault_paths(vault_list: &vault_list::VaultList) -> Vec<PathBuf> {
+    let mut paths = Vec::new();
+    if let Some(active_vault) = vault_list
         .active_vault
         .as_deref()
         .map(str::trim)
         .filter(|path| !path.is_empty())
-        .map(PathBuf::from)
+    {
+        push_unique_mcp_bridge_vault_path(&mut paths, active_vault);
+    }
+
+    for vault in &vault_list.vaults {
+        if vault.mounted == Some(false) {
+            continue;
+        }
+        push_unique_mcp_bridge_vault_path(&mut paths, &vault.path);
+    }
+
+    paths
+}
+
+#[cfg(desktop)]
+fn push_unique_mcp_bridge_vault_path(paths: &mut Vec<PathBuf>, path: &str) {
+    let trimmed = path.trim();
+    if trimmed.is_empty() {
+        return;
+    }
+    let path = PathBuf::from(trimmed);
+    if paths.iter().any(|existing| existing == &path) {
+        return;
+    }
+    paths.push(path);
 }
 
 #[cfg(desktop)]
@@ -118,6 +143,7 @@ fn stop_ws_bridge_child(active_child: &mut Option<Child>) {
 pub(crate) fn sync_ws_bridge_for_vault(
     app_handle: &tauri::AppHandle,
     vault_path: Option<&Path>,
+    active_vault_paths: &[PathBuf],
 ) -> Result<&'static str, String> {
     use tauri::Manager;
 
@@ -142,7 +168,12 @@ pub(crate) fn sync_ws_bridge_for_vault(
 
     stop_ws_bridge_child(&mut active_child);
 
-    let child = mcp::spawn_ws_bridge(&resolved_vault_path)?;
+    let resolved_active_vault_paths = active_vault_paths
+        .iter()
+        .filter_map(|path| validate_mcp_bridge_vault_path(path).ok())
+        .collect::<Vec<_>>();
+    let child =
+        mcp::spawn_ws_bridge_with_paths(&resolved_vault_path, &resolved_active_vault_paths)?;
 
     *active_child = Some(child);
     Ok("started")
@@ -197,20 +228,20 @@ fn spawn_startup_tasks() {
 
 #[cfg(desktop)]
 fn sync_ws_bridge_for_selected_vault(app_handle: &tauri::AppHandle) {
-    let vault_path = match vault_list::load_vault_list() {
-        Ok(vault_list) => selected_mcp_bridge_vault_path(&vault_list),
+    let vault_paths = match vault_list::load_vault_list() {
+        Ok(vault_list) => selected_mcp_bridge_vault_paths(&vault_list),
         Err(e) => {
             log::warn!("Failed to load active vault for ws-bridge startup: {}", e);
-            None
+            Vec::new()
         }
     };
 
-    let Some(vault_path) = vault_path else {
+    let Some(vault_path) = vault_paths.first() else {
         log::info!("ws-bridge not started: no active vault selected");
         return;
     };
 
-    if let Err(e) = sync_ws_bridge_for_vault(app_handle, Some(&vault_path)) {
+    if let Err(e) = sync_ws_bridge_for_vault(app_handle, Some(vault_path), &vault_paths) {
         log::warn!("Failed to start ws-bridge: {}", e);
     }
 }
@@ -247,9 +278,25 @@ fn setup_desktop_plugins(app: &mut tauri::App) -> Result<(), Box<dyn std::error:
     menu::setup_menu(app)?;
     setup_linux_window_chrome(app)?;
     window_state::restore_main_window_state(app);
+    show_debug_main_window(app);
     Ok(())
 }
 
+#[cfg(debug_assertions)]
+fn show_debug_main_window(app: &mut tauri::App) {
+    use tauri::Manager;
+
+    if let Some(window) = app.get_webview_window("main") {
+        let _ = window.unminimize();
+        let _ = window.show();
+        let _ = window.center();
+        let _ = window.set_focus();
+    }
+}
+
+#[cfg(not(debug_assertions))]
+fn show_debug_main_window(_app: &mut tauri::App) {}
+
 #[cfg(all(desktop, target_os = "linux"))]
 fn setup_linux_window_chrome(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
     use tauri::Manager;
@@ -387,6 +434,7 @@ macro_rules! app_invoke_handler {
             commands::rename_note,
             commands::rename_note_filename,
             commands::move_note_to_folder,
+            commands::move_note_to_workspace,
             commands::auto_rename_untitled,
             commands::detect_renames,
             commands::update_wikilinks_for_renames,
@@ -518,11 +566,11 @@ mod tests {
 
     #[cfg(desktop)]
     use super::{
-        missing_asset_scope_roots, selected_mcp_bridge_vault_path,
+        missing_asset_scope_roots, selected_mcp_bridge_vault_paths,
         spawn_startup_tasks_for_vault_with, validate_mcp_bridge_vault_path,
     };
     #[cfg(desktop)]
-    use crate::vault_list::VaultList;
+    use crate::vault_list::{VaultEntry, VaultList};
     #[cfg(desktop)]
     use std::path::PathBuf;
 
@@ -537,23 +585,45 @@ mod tests {
 
     #[cfg(desktop)]
     #[test]
-    fn selected_mcp_bridge_vault_path_uses_persisted_active_vault() {
+    fn selected_mcp_bridge_vault_paths_puts_persisted_active_vault_first() {
         let list = VaultList {
-            vaults: Vec::new(),
+            vaults: vec![
+                VaultEntry {
+                    label: "Secondary".to_string(),
+                    path: "/tmp/Secondary Vault".to_string(),
+                    mounted: Some(true),
+                    ..VaultEntry::default()
+                },
+                VaultEntry {
+                    label: "Hidden".to_string(),
+                    path: "/tmp/Hidden Vault".to_string(),
+                    mounted: Some(false),
+                    ..VaultEntry::default()
+                },
+                VaultEntry {
+                    label: "Selected".to_string(),
+                    path: "/tmp/Selected Vault".to_string(),
+                    mounted: Some(true),
+                    ..VaultEntry::default()
+                },
+            ],
             active_vault: Some("/tmp/Selected Vault".to_string()),
             default_workspace_path: None,
             hidden_defaults: Vec::new(),
         };
 
         assert_eq!(
-            selected_mcp_bridge_vault_path(&list),
-            Some(std::path::PathBuf::from("/tmp/Selected Vault"))
+            selected_mcp_bridge_vault_paths(&list),
+            vec![
+                PathBuf::from("/tmp/Selected Vault"),
+                PathBuf::from("/tmp/Secondary Vault"),
+            ]
         );
     }
 
     #[cfg(desktop)]
     #[test]
-    fn selected_mcp_bridge_vault_path_ignores_blank_active_vault() {
+    fn selected_mcp_bridge_vault_paths_ignores_blank_active_vault() {
         let list = VaultList {
             vaults: Vec::new(),
             active_vault: Some("  ".to_string()),
@@ -561,7 +631,7 @@ mod tests {
             hidden_defaults: Vec::new(),
         };
 
-        assert_eq!(selected_mcp_bridge_vault_path(&list), None);
+        assert!(selected_mcp_bridge_vault_paths(&list).is_empty());
     }
 
     #[cfg(desktop)]
diff --git a/src-tauri/src/mcp.rs b/src-tauri/src/mcp.rs
index e84bbbb7..355163d8 100644
--- a/src-tauri/src/mcp.rs
+++ b/src-tauri/src/mcp.rs
@@ -225,12 +225,10 @@ fn node_binary_name() -> &'static str {
 
 /// Resolve the path to `mcp-server/`.
 ///
-/// In dev mode, uses `CARGO_MANIFEST_DIR` (set at compile time).
-/// In release mode, uses platform resource roots exposed by the launcher.
+/// In dev mode, prefers `CARGO_MANIFEST_DIR` and falls back to runtime checkout ancestors.
+/// In release mode, uses launcher roots plus bundle paths derived from the executable.
 pub(crate) fn mcp_server_dir() -> Result<PathBuf, String> {
-    let dev_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .join("..")
-        .join("mcp-server");
+    let dev_path = build_time_dev_mcp_server_dir();
     let resource_roots = paths::runtime_resource_roots();
     let candidates = mcp_server_dir_candidates(&dev_path, &resource_roots);
     if let Some(path) = candidates
@@ -250,20 +248,118 @@ pub(crate) fn mcp_server_dir() -> Result<PathBuf, String> {
     ))
 }
 
+fn build_time_dev_mcp_server_dir() -> PathBuf {
+    PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("..")
+        .join("mcp-server")
+}
+
 fn mcp_server_dir_candidates(dev_path: &Path, resource_roots: &[PathBuf]) -> Vec<PathBuf> {
-    let mut candidates = vec![dev_path.to_path_buf()];
+    let current_dir = std::env::current_dir().ok();
+    let current_exe = std::env::current_exe().ok();
+
+    mcp_server_dir_candidates_for(
+        dev_path,
+        resource_roots,
+        current_dir.as_deref(),
+        current_exe.as_deref(),
+    )
+}
+
+fn mcp_server_dir_candidates_for(
+    dev_path: &Path,
+    resource_roots: &[PathBuf],
+    current_dir: Option<&Path>,
+    current_exe: Option<&Path>,
+) -> Vec<PathBuf> {
+    let mut candidates = Vec::new();
+    push_unique_path(&mut candidates, dev_path.to_path_buf());
 
     for root in resource_roots {
-        candidates.push(root.join("mcp-server"));
-        candidates.push(root.join("resources").join("mcp-server"));
-        candidates.extend(linux_package_mcp_server_dirs(root));
+        push_resource_root_candidates(&mut candidates, root);
     }
 
-    candidates.extend(linux_package_mcp_server_dirs(Path::new("/usr/local")));
-    candidates.extend(linux_package_mcp_server_dirs(Path::new("/usr")));
+    if let Some(current_exe) = current_exe {
+        for root in executable_resource_roots(current_exe) {
+            push_resource_root_candidates(&mut candidates, &root);
+        }
+    }
+
+    for root in runtime_development_roots(current_dir, current_exe) {
+        push_development_root_candidates(&mut candidates, &root);
+    }
+
+    push_linux_package_candidates(&mut candidates, Path::new("/usr/local"));
+    push_linux_package_candidates(&mut candidates, Path::new("/usr"));
     candidates
 }
 
+fn push_resource_root_candidates(candidates: &mut Vec<PathBuf>, root: &Path) {
+    push_unique_path(candidates, root.join("mcp-server"));
+    push_unique_path(candidates, root.join("resources").join("mcp-server"));
+    push_linux_package_candidates(candidates, root);
+}
+
+fn push_development_root_candidates(candidates: &mut Vec<PathBuf>, root: &Path) {
+    push_unique_path(candidates, root.join("mcp-server"));
+    push_unique_path(candidates, root.join("resources").join("mcp-server"));
+}
+
+fn runtime_development_roots(
+    current_dir: Option<&Path>,
+    current_exe: Option<&Path>,
+) -> Vec<PathBuf> {
+    let mut roots = Vec::new();
+
+    if let Some(current_dir) = current_dir {
+        push_ancestor_paths(&mut roots, current_dir);
+    }
+    if let Some(exe_dir) = current_exe.and_then(Path::parent) {
+        push_ancestor_paths(&mut roots, exe_dir);
+    }
+
+    roots
+}
+
+fn executable_resource_roots(current_exe: &Path) -> Vec<PathBuf> {
+    let mut roots = Vec::new();
+    let Some(exe_dir) = current_exe.parent() else {
+        return roots;
+    };
+
+    if exe_dir.file_name().and_then(|name| name.to_str()) == Some("MacOS") {
+        if let Some(contents_dir) = exe_dir.parent() {
+            push_unique_path(&mut roots, contents_dir.join("Resources"));
+        }
+    }
+
+    push_unique_path(&mut roots, exe_dir.to_path_buf());
+    if let Some(parent) = exe_dir.parent() {
+        push_unique_path(&mut roots, parent.join("Resources"));
+        push_unique_path(&mut roots, parent.to_path_buf());
+    }
+
+    roots
+}
+
+fn push_ancestor_paths(paths: &mut Vec<PathBuf>, start: &Path) {
+    for ancestor in start.ancestors().filter(|path| path.parent().is_some()) {
+        push_unique_path(paths, ancestor.to_path_buf());
+    }
+}
+
+fn push_linux_package_candidates(candidates: &mut Vec<PathBuf>, root: &Path) {
+    for path in linux_package_mcp_server_dirs(root) {
+        push_unique_path(candidates, path);
+    }
+}
+
+fn push_unique_path(paths: &mut Vec<PathBuf>, path: PathBuf) {
+    if !path.as_os_str().is_empty() && !paths.iter().any(|existing| existing == &path) {
+        paths.push(path);
+    }
+}
+
 fn linux_package_mcp_server_dirs(root: &Path) -> Vec<PathBuf> {
     vec![
         root.join("Tolaria").join("mcp-server"),
@@ -287,14 +383,24 @@ fn mcp_server_dir_has_files(path: &Path) -> bool {
 
 /// Spawn the WebSocket bridge as a child process.
 pub fn spawn_ws_bridge(vault_path: impl AsRef<Path>) -> Result<Child, String> {
+    spawn_ws_bridge_with_paths(vault_path, &[])
+}
+
+/// Spawn the WebSocket bridge with every active vault exposed to MCP tools.
+pub fn spawn_ws_bridge_with_paths(
+    vault_path: impl AsRef<Path>,
+    vault_paths: &[PathBuf],
+) -> Result<Child, String> {
     let node = find_node()?;
     let server_dir = mcp_server_dir()?;
     let script = server_dir.join("ws-bridge.js");
     let vault_path = vault_path.as_ref();
+    let active_vault_paths = active_vault_paths_json(vault_path, vault_paths);
 
     let child = crate::hidden_command(node)
         .arg(&script)
         .env("VAULT_PATH", vault_path)
+        .env("VAULT_PATHS", active_vault_paths)
         .env("WS_PORT", "9710")
         .env("WS_UI_PORT", "9711")
         .stdin(std::process::Stdio::null())
@@ -311,6 +417,23 @@ pub fn spawn_ws_bridge(vault_path: impl AsRef<Path>) -> Result<Child, String> {
     Ok(child)
 }
 
+fn active_vault_paths_json(vault_path: &Path, vault_paths: &[PathBuf]) -> String {
+    let mut paths = Vec::new();
+    push_unique_bridge_vault_path(&mut paths, vault_path);
+    for path in vault_paths {
+        push_unique_bridge_vault_path(&mut paths, path);
+    }
+    serde_json::to_string(&paths).unwrap_or_else(|_| "[]".to_string())
+}
+
+fn push_unique_bridge_vault_path(paths: &mut Vec<String>, path: &Path) {
+    let value = path.to_string_lossy().trim().to_string();
+    if value.is_empty() || paths.iter().any(|existing| existing == &value) {
+        return;
+    }
+    paths.push(value);
+}
+
 fn mcp_config_paths() -> Vec<PathBuf> {
     dirs::home_dir()
         .map(|home| mcp_config_paths_for_home(&home))
@@ -788,6 +911,35 @@ mod tests {
         )));
     }
 
+    #[test]
+    fn mcp_server_dir_candidates_include_runtime_dev_roots_when_build_path_is_stale() {
+        let stale_dev_path = Path::new("/Users/runner/work/tolaria/tolaria/mcp-server");
+        let current_dir = Path::new("/Users/luca/Workspace/tolaria");
+        let current_exe = Path::new("/Users/luca/Workspace/tolaria/src-tauri/target/debug/tolaria");
+        let candidates = mcp_server_dir_candidates_for(
+            stale_dev_path,
+            &[],
+            Some(current_dir),
+            Some(current_exe),
+        );
+
+        assert!(candidates.contains(&PathBuf::from("/Users/luca/Workspace/tolaria/mcp-server")));
+        assert!(candidates.contains(&PathBuf::from(
+            "/Users/luca/Workspace/tolaria/src-tauri/resources/mcp-server"
+        )));
+    }
+
+    #[test]
+    fn mcp_server_dir_candidates_include_macos_bundle_resources() {
+        let dev_path = Path::new("/repo/mcp-server");
+        let current_exe = Path::new("/Applications/Tolaria.app/Contents/MacOS/Tolaria");
+        let candidates = mcp_server_dir_candidates_for(dev_path, &[], None, Some(current_exe));
+
+        assert!(candidates.contains(&PathBuf::from(
+            "/Applications/Tolaria.app/Contents/Resources/mcp-server"
+        )));
+    }
+
     #[test]
     fn upsert_creates_new_config() {
         let tmp = tempfile::tempdir().unwrap();
diff --git a/src-tauri/src/opencode_cli.rs b/src-tauri/src/opencode_cli.rs
index bf538d29..29287e10 100644
--- a/src-tauri/src/opencode_cli.rs
+++ b/src-tauri/src/opencode_cli.rs
@@ -53,6 +53,7 @@ mod tests {
             message: "Summarize".into(),
             system_prompt: None,
             vault_path,
+            vault_paths: Vec::new(),
             permission_mode: AiAgentPermissionMode::Safe,
         }
     }
diff --git a/src-tauri/src/opencode_config.rs b/src-tauri/src/opencode_config.rs
index 297b190d..bf4bb899 100644
--- a/src-tauri/src/opencode_config.rs
+++ b/src-tauri/src/opencode_config.rs
@@ -18,7 +18,11 @@ pub(crate) fn build_command(
         .arg(build_prompt(request))
         .env(
             "OPENCODE_CONFIG_CONTENT",
-            build_config(&request.vault_path, request.permission_mode)?,
+            build_config(
+                &request.vault_path,
+                &request.vault_paths,
+                request.permission_mode,
+            )?,
         )
         .current_dir(&request.vault_path)
         .stdin(Stdio::null())
@@ -37,9 +41,11 @@ fn build_prompt(request: &AgentStreamRequest) -> String {
 
 fn build_config(
     vault_path: &str,
+    vault_paths: &[String],
     permission_mode: AiAgentPermissionMode,
 ) -> Result<String, String> {
     let mcp_server_path = crate::cli_agent_runtime::mcp_server_path_string()?;
+    let vault_paths = crate::cli_agent_runtime::active_vault_paths_json(vault_path, vault_paths);
 
     serde_json::to_string(&serde_json::json!({
         "$schema": "https://opencode.ai/config.json",
@@ -48,7 +54,10 @@ fn build_config(
             "tolaria": {
                 "type": "local",
                 "command": ["node", mcp_server_path],
-                "environment": { "VAULT_PATH": vault_path },
+                "environment": {
+                    "VAULT_PATH": vault_path,
+                    "VAULT_PATHS": vault_paths
+                },
                 "enabled": true
             }
         }
@@ -84,6 +93,7 @@ mod tests {
             message: "Rename the note".into(),
             system_prompt: None,
             vault_path: "/tmp/vault".into(),
+            vault_paths: Vec::new(),
             permission_mode: crate::ai_agents::AiAgentPermissionMode::Safe,
         }
     }
@@ -184,9 +194,11 @@ mod tests {
 
     #[test]
     fn config_includes_permissions_and_tolaria_mcp_server() {
-        if let Ok(config) =
-            build_config("/tmp/vault", crate::ai_agents::AiAgentPermissionMode::Safe)
-        {
+        if let Ok(config) = build_config(
+            "/tmp/vault",
+            &[],
+            crate::ai_agents::AiAgentPermissionMode::Safe,
+        ) {
             let json: serde_json::Value = serde_json::from_str(&config).unwrap();
             assert_eq!(
                 (
@@ -210,6 +222,14 @@ mod tests {
                     true,
                 )
             );
+            assert_eq!(
+                json["mcp"]["tolaria"]["environment"]["VAULT_PATHS"],
+                r#"["/tmp/vault"]"#
+            );
+            assert!(json["mcp"]["tolaria"]["command"][1]
+                .as_str()
+                .unwrap()
+                .ends_with("index.js"));
         }
     }
 
@@ -217,6 +237,7 @@ mod tests {
     fn power_user_config_allows_bash_but_keeps_external_directories_denied() {
         if let Ok(config) = build_config(
             "/tmp/vault",
+            &[],
             crate::ai_agents::AiAgentPermissionMode::PowerUser,
         ) {
             let json: serde_json::Value = serde_json::from_str(&config).unwrap();
diff --git a/src-tauri/src/pi_cli.rs b/src-tauri/src/pi_cli.rs
index 1d801c31..45779459 100644
--- a/src-tauri/src/pi_cli.rs
+++ b/src-tauri/src/pi_cli.rs
@@ -57,6 +57,7 @@ mod tests {
             message: "Summarize".into(),
             system_prompt: None,
             vault_path,
+            vault_paths: Vec::new(),
             permission_mode: AiAgentPermissionMode::Safe,
         }
     }
diff --git a/src-tauri/src/pi_config.rs b/src-tauri/src/pi_config.rs
index dfb6aab2..a2291b49 100644
--- a/src-tauri/src/pi_config.rs
+++ b/src-tauri/src/pi_config.rs
@@ -8,7 +8,12 @@ pub(crate) fn build_command(
     request: &AgentStreamRequest,
     agent_dir: &Path,
 ) -> Result<std::process::Command, String> {
-    write_mcp_config(agent_dir, &request.vault_path, request.permission_mode)?;
+    write_mcp_config(
+        agent_dir,
+        &request.vault_path,
+        &request.vault_paths,
+        request.permission_mode,
+    )?;
 
     let mut command = crate::hidden_command(binary);
     crate::cli_agent_runtime::configure_agent_command_environment(&mut command, binary);
@@ -40,20 +45,23 @@ fn build_prompt(request: &AgentStreamRequest) -> String {
 fn write_mcp_config(
     agent_dir: &Path,
     vault_path: &str,
+    vault_paths: &[String],
     permission_mode: AiAgentPermissionMode,
 ) -> Result<(), String> {
     std::fs::create_dir_all(agent_dir)
         .map_err(|error| format!("Failed to create Pi agent directory: {error}"))?;
-    let config = build_mcp_config(vault_path, permission_mode)?;
+    let config = build_mcp_config(vault_path, vault_paths, permission_mode)?;
     std::fs::write(agent_dir.join("mcp.json"), config)
         .map_err(|error| format!("Failed to write Pi MCP config: {error}"))
 }
 
 fn build_mcp_config(
     vault_path: &str,
+    vault_paths: &[String],
     _permission_mode: AiAgentPermissionMode,
 ) -> Result<String, String> {
     let mcp_server_path = crate::cli_agent_runtime::mcp_server_path_string()?;
+    let vault_paths = crate::cli_agent_runtime::active_vault_paths_json(vault_path, vault_paths);
 
     serde_json::to_string(&serde_json::json!({
         "settings": {
@@ -66,6 +74,7 @@ fn build_mcp_config(
                 "args": [mcp_server_path],
                 "env": {
                     "VAULT_PATH": vault_path,
+                    "VAULT_PATHS": vault_paths,
                     "WS_UI_PORT": "9711"
                 },
                 "lifecycle": "lazy",
@@ -87,6 +96,7 @@ mod tests {
             message: "Rename the note".into(),
             system_prompt: None,
             vault_path: "/tmp/vault".into(),
+            vault_paths: Vec::new(),
             permission_mode: crate::ai_agents::AiAgentPermissionMode::Safe,
         }
     }
@@ -124,9 +134,11 @@ mod tests {
 
     #[test]
     fn mcp_config_includes_tolaria_server_for_active_vault() {
-        if let Ok(config) =
-            build_mcp_config("/tmp/vault", crate::ai_agents::AiAgentPermissionMode::Safe)
-        {
+        if let Ok(config) = build_mcp_config(
+            "/tmp/vault",
+            &[],
+            crate::ai_agents::AiAgentPermissionMode::Safe,
+        ) {
             let json: serde_json::Value = serde_json::from_str(&config).unwrap();
             assert_eq!(json["settings"]["toolPrefix"], "none");
             assert_eq!(json["mcpServers"]["tolaria"]["command"], "node");
@@ -136,6 +148,10 @@ mod tests {
                 json["mcpServers"]["tolaria"]["env"]["VAULT_PATH"],
                 "/tmp/vault"
             );
+            assert_eq!(
+                json["mcpServers"]["tolaria"]["env"]["VAULT_PATHS"],
+                r#"["/tmp/vault"]"#
+            );
             assert_eq!(json["mcpServers"]["tolaria"]["env"]["WS_UI_PORT"], "9711");
             assert!(json["mcpServers"]["tolaria"]["args"][0]
                 .as_str()
@@ -146,10 +162,15 @@ mod tests {
 
     #[test]
     fn power_user_mode_uses_the_same_pi_mcp_config_as_safe_mode() {
-        let safe =
-            build_mcp_config("/tmp/vault", crate::ai_agents::AiAgentPermissionMode::Safe).unwrap();
+        let safe = build_mcp_config(
+            "/tmp/vault",
+            &[],
+            crate::ai_agents::AiAgentPermissionMode::Safe,
+        )
+        .unwrap();
         let power = build_mcp_config(
             "/tmp/vault",
+            &[],
             crate::ai_agents::AiAgentPermissionMode::PowerUser,
         )
         .unwrap();
diff --git a/src-tauri/src/settings.rs b/src-tauri/src/settings.rs
index 0e924e33..90c34f01 100644
--- a/src-tauri/src/settings.rs
+++ b/src-tauri/src/settings.rs
@@ -89,6 +89,7 @@ pub struct Settings {
     pub all_notes_show_pdfs: Option<bool>,
     pub all_notes_show_images: Option<bool>,
     pub all_notes_show_unsupported: Option<bool>,
+    pub multi_workspace_enabled: Option<bool>,
 }
 
 fn normalize_optional_string(value: Option<String>) -> Option<String> {
@@ -201,6 +202,7 @@ fn normalize_settings(settings: Settings) -> Settings {
         all_notes_show_pdfs: settings.all_notes_show_pdfs,
         all_notes_show_images: settings.all_notes_show_images,
         all_notes_show_unsupported: settings.all_notes_show_unsupported,
+        multi_workspace_enabled: settings.multi_workspace_enabled,
     }
 }
 
@@ -349,6 +351,7 @@ mod tests {
             default_ai_target: Some("agent:codex".to_string()),
             ai_model_providers: None,
             hide_gitignored_files: Some(false),
+            multi_workspace_enabled: Some(true),
             all_notes_show_pdfs: Some(true),
             all_notes_show_images: Some(true),
             all_notes_show_unsupported: Some(false),
@@ -383,6 +386,7 @@ mod tests {
             initial_h1_auto_rename_enabled: Some(false),
             default_ai_agent: Some("codex".to_string()),
             hide_gitignored_files: Some(false),
+            multi_workspace_enabled: Some(true),
             all_notes_show_pdfs: Some(true),
             all_notes_show_images: Some(false),
             all_notes_show_unsupported: Some(true),
@@ -402,6 +406,7 @@ mod tests {
         assert_eq!(loaded.initial_h1_auto_rename_enabled, Some(false));
         assert_eq!(loaded.default_ai_agent.as_deref(), Some("codex"));
         assert_eq!(loaded.hide_gitignored_files, Some(false));
+        assert_eq!(loaded.multi_workspace_enabled, Some(true));
         assert_eq!(loaded.all_notes_show_pdfs, Some(true));
         assert_eq!(loaded.all_notes_show_images, Some(false));
         assert_eq!(loaded.all_notes_show_unsupported, Some(true));
diff --git a/src-tauri/src/vault/mod.rs b/src-tauri/src/vault/mod.rs
index ed23402a..ea829e37 100644
--- a/src-tauri/src/vault/mod.rs
+++ b/src-tauri/src/vault/mod.rs
@@ -30,9 +30,10 @@ pub use ignored::{filter_gitignored_entries, filter_gitignored_folders, filter_g
 pub use image::{copy_image_to_vault, save_image};
 pub use migration::migrate_is_a_to_type;
 pub use rename::{
-    auto_rename_untitled, detect_renames, move_note_to_folder, rename_note, rename_note_filename,
-    update_wikilinks_for_renames, AutoRenameUntitledRequest, DetectedRename,
-    MoveNoteToFolderRequest, RenameNoteFilenameRequest, RenameNoteRequest, RenameResult,
+    auto_rename_untitled, detect_renames, move_note_to_folder, move_note_to_workspace, rename_note,
+    rename_note_filename, update_wikilinks_for_renames, AutoRenameUntitledRequest, DetectedRename,
+    MoveNoteToFolderRequest, MoveNoteToWorkspaceRequest, RenameNoteFilenameRequest,
+    RenameNoteRequest, RenameResult,
 };
 pub use title_sync::{sync_title_on_open, SyncAction};
 pub use trash::{batch_delete_notes, delete_note};
diff --git a/src-tauri/src/vault/rename.rs b/src-tauri/src/vault/rename.rs
index 206f546b..7bdd2306 100644
--- a/src-tauri/src/vault/rename.rs
+++ b/src-tauri/src/vault/rename.rs
@@ -2,6 +2,7 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 use std::fs;
+use std::io::Write;
 use std::path::Path;
 use tempfile::NamedTempFile;
 use walkdir::WalkDir;
@@ -44,6 +45,15 @@ pub struct MoveNoteToFolderRequest<'a> {
     pub destination_folder_path: &'a str,
 }
 
+#[derive(Clone, Copy)]
+pub struct MoveNoteToWorkspaceRequest<'a> {
+    pub source_vault_path: &'a str,
+    pub destination_vault_path: &'a str,
+    pub old_path: &'a str,
+    pub destination_path: &'a str,
+    pub replacement_target: Option<&'a str>,
+}
+
 #[derive(Clone, Copy)]
 pub struct AutoRenameUntitledRequest<'a> {
     pub vault_path: &'a str,
@@ -237,6 +247,33 @@ fn finalize_rename(vault: &Path, old_targets: &[&str], new_file: &Path) -> Renam
     }
 }
 
+fn create_new_note_file(path: &Path, content: &str) -> Result<(), String> {
+    if let Some(parent) = path.parent() {
+        fs::create_dir_all(parent)
+            .map_err(|e| format!("Failed to create {}: {}", parent.display(), e))?;
+    }
+
+    let mut file = fs::OpenOptions::new()
+        .write(true)
+        .create_new(true)
+        .open(path)
+        .map_err(|e| {
+            if e.kind() == std::io::ErrorKind::AlreadyExists {
+                "A note with that name already exists".to_string()
+            } else {
+                format!("Failed to create {}: {}", path.display(), e)
+            }
+        })?;
+    file.write_all(content.as_bytes())
+        .map_err(|e| format!("Failed to write {}: {}", path.display(), e))?;
+    file.sync_all()
+        .map_err(|e| format!("Failed to sync {}: {}", path.display(), e))
+}
+
+fn remove_created_file(path: &Path) {
+    let _ = fs::remove_file(path);
+}
+
 fn normalize_filename_stem(new_filename_stem: &str) -> Result<String, String> {
     let trimmed = new_filename_stem.trim();
     let stem = trimmed.strip_suffix(".md").unwrap_or(trimmed).trim();
@@ -444,6 +481,69 @@ pub fn move_note_to_folder(request: MoveNoteToFolderRequest<'_>) -> Result<Renam
     Ok(finalize_rename(vault, &old_targets, committed.new_file()))
 }
 
+/// Move a note into another workspace while preserving its vault-relative path.
+pub fn move_note_to_workspace(
+    request: MoveNoteToWorkspaceRequest<'_>,
+) -> Result<RenameResult, String> {
+    let source_vault = Path::new(request.source_vault_path);
+    let destination_vault = Path::new(request.destination_vault_path);
+    let old_file = Path::new(request.old_path);
+    let new_file = Path::new(request.destination_path);
+
+    recover_pending_rename_transactions(source_vault)?;
+    recover_pending_rename_transactions(destination_vault)?;
+    ensure_existing_note(old_file)?;
+
+    if new_file == old_file {
+        return Ok(unchanged_result(old_file));
+    }
+    if new_file.exists() {
+        return Err("A note with that name already exists".to_string());
+    }
+
+    let content = fs::read_to_string(old_file)
+        .map_err(|e| format!("Failed to read {}: {}", request.old_path, e))?;
+    let old_filename = old_file
+        .file_name()
+        .map(|f| f.to_string_lossy().to_string())
+        .unwrap_or_default();
+    let fm_title = extract_fm_title_value(&content);
+    let old_title = super::extract_title(fm_title.as_deref(), &content, &old_filename);
+
+    create_new_note_file(new_file, &content)?;
+    if let Err(error) = fs::remove_file(old_file) {
+        remove_created_file(new_file);
+        return Err(format!(
+            "Failed to remove {}: {}",
+            old_file.display(),
+            error
+        ));
+    }
+
+    let old_path_stem = to_path_stem(old_file, source_vault);
+    let old_targets = collect_legacy_wikilink_targets(&old_title, &old_path_stem);
+    let fallback_target = to_path_stem(new_file, destination_vault);
+    let replacement_target = request.replacement_target.unwrap_or(&fallback_target);
+    let source_summary =
+        update_wikilinks_in_vault(source_vault, &old_targets, replacement_target, new_file);
+    let destination_summary = if source_vault == destination_vault {
+        WikilinkUpdateSummary::default()
+    } else {
+        update_wikilinks_in_vault(
+            destination_vault,
+            &old_targets,
+            replacement_target,
+            new_file,
+        )
+    };
+
+    Ok(RenameResult {
+        new_path: new_file.to_string_lossy().to_string(),
+        updated_files: source_summary.updated_files + destination_summary.updated_files,
+        failed_updates: source_summary.failed_updates + destination_summary.failed_updates,
+    })
+}
+
 /// Check if a filename matches the untitled pattern (e.g. "untitled-note-1234567890.md").
 fn is_untitled_filename(filename: &str) -> bool {
     let stem = filename.strip_suffix(".md").unwrap_or(filename);
@@ -1202,6 +1302,42 @@ mod tests {
         assert_move_note_to_folder_error("A note with that name already exists");
     }
 
+    #[test]
+    fn test_move_note_to_workspace_preserves_relative_path_and_updates_source_links() {
+        let source = TempDir::new().unwrap();
+        let destination = TempDir::new().unwrap();
+        create_test_file(
+            source.path(),
+            "Projects/project-kickoff.md",
+            "---\ntitle: Project Kickoff\ntype: Note\n---\n\nBody.\n",
+        );
+        create_test_file(
+            source.path(),
+            "source-ref.md",
+            "# Ref\n\nSee [[Projects/project-kickoff]] and [[Project Kickoff]].\n",
+        );
+
+        let old_path = source.path().join("Projects/project-kickoff.md");
+        let destination_path = destination.path().join("Projects/project-kickoff.md");
+        let result = move_note_to_workspace(MoveNoteToWorkspaceRequest {
+            source_vault_path: source.path().to_str().unwrap(),
+            destination_vault_path: destination.path().to_str().unwrap(),
+            old_path: old_path.to_str().unwrap(),
+            destination_path: destination_path.to_str().unwrap(),
+            replacement_target: Some("team/Projects/project-kickoff"),
+        })
+        .unwrap();
+
+        assert_eq!(result.new_path, destination_path.to_string_lossy());
+
+        assert!(!old_path.exists());
+
+        assert!(destination_path.exists());
+
+        let source_reference = fs::read_to_string(source.path().join("source-ref.md")).unwrap();
+        assert!(source_reference.contains("[[team/Projects/project-kickoff]]"));
+    }
+
     #[test]
     fn test_rename_note_with_old_title_hint_updates_wikilinks() {
         // Simulates H1 sync: content already saved with new H1, but wikilinks still use old title.
diff --git a/src-tauri/src/vault_list.rs b/src-tauri/src/vault_list.rs
index 83dfb37c..d08c05ab 100644
--- a/src-tauri/src/vault_list.rs
+++ b/src-tauri/src/vault_list.rs
@@ -12,6 +12,9 @@ pub struct VaultEntry {
     #[serde(default)]
     pub alias: Option<String>,
     #[serde(default)]
+    #[serde(rename = "shortLabel")]
+    pub short_label: Option<String>,
+    #[serde(default)]
     pub color: Option<String>,
     #[serde(default)]
     pub icon: Option<String>,
@@ -219,6 +222,7 @@ mod tests {
                 label: "Team Notes".to_string(),
                 path: "/tmp/team".to_string(),
                 alias: Some("team".to_string()),
+                short_label: Some("TN".to_string()),
                 color: Some("green".to_string()),
                 icon: Some("briefcase".to_string()),
                 mounted: Some(false),
@@ -232,6 +236,7 @@ mod tests {
 
         assert_eq!(loaded.default_workspace_path.as_deref(), Some("/tmp/team"));
         assert_eq!(loaded.vaults[0].alias.as_deref(), Some("team"));
+        assert_eq!(loaded.vaults[0].short_label.as_deref(), Some("TN"));
         assert_eq!(loaded.vaults[0].color.as_deref(), Some("green"));
         assert_eq!(loaded.vaults[0].icon.as_deref(), Some("briefcase"));
         assert_eq!(loaded.vaults[0].mounted, Some(false));
diff --git a/src-tauri/src/vault_watcher.rs b/src-tauri/src/vault_watcher.rs
index 805687f8..e2293937 100644
--- a/src-tauri/src/vault_watcher.rs
+++ b/src-tauri/src/vault_watcher.rs
@@ -59,7 +59,7 @@ mod desktop {
     }
 
     pub struct VaultWatcherState {
-        active: Mutex<Option<ActiveVaultWatcher>>,
+        active: Mutex<Vec<ActiveVaultWatcher>>,
     }
 
     impl Default for VaultWatcherState {
@@ -71,7 +71,7 @@ mod desktop {
     impl VaultWatcherState {
         pub fn new() -> Self {
             Self {
-                active: Mutex::new(None),
+                active: Mutex::new(Vec::new()),
             }
         }
     }
@@ -129,10 +129,7 @@ mod desktop {
             .active
             .lock()
             .map_err(|_| "Failed to lock vault watcher state".to_string())?;
-        if active
-            .as_ref()
-            .is_some_and(|watcher| watcher.path == vault_path)
-        {
+        if active.iter().any(|watcher| watcher.path == vault_path) {
             return Ok(());
         }
 
@@ -147,7 +144,7 @@ mod desktop {
             .watch(&vault_path, RecursiveMode::Recursive)
             .map_err(|err| format!("Failed to watch {}: {err}", vault_path.display()))?;
 
-        *active = Some(ActiveVaultWatcher {
+        active.push(ActiveVaultWatcher {
             path: vault_path,
             _watcher: watcher,
         });
@@ -159,7 +156,7 @@ mod desktop {
             .active
             .lock()
             .map_err(|_| "Failed to lock vault watcher state".to_string())?;
-        *active = None;
+        active.clear();
         Ok(())
     }
 
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 6c8e9117..5ff4188b 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -43,6 +43,7 @@
         "media-src": "'self' asset: http://asset.localhost data: blob: https:",
         "object-src": "'self' asset: http://asset.localhost"
       },
+      "devCsp": "default-src 'self' ipc: http://ipc.localhost http://localhost:5202 http://127.0.0.1:5202 asset: http://asset.localhost data: blob: https:; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:5202 http://127.0.0.1:5202 https://us.i.posthog.com https://eu.i.posthog.com https://us-assets.i.posthog.com https://eu-assets.i.posthog.com; connect-src 'self' ipc: http://ipc.localhost http://localhost:5202 http://127.0.0.1:5202 data: ws://localhost:5202 ws://127.0.0.1:5202 ws://localhost:9710 ws://127.0.0.1:9710 ws://localhost:9711 ws://127.0.0.1:9711 https:; img-src 'self' asset: http://asset.localhost data: blob: https:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; style-src-elem 'self' 'unsafe-inline' 'nonce-tolaria-runtime-style' https://fonts.googleapis.com; style-src-attr 'unsafe-inline'; font-src 'self' data: https://fonts.gstatic.com; media-src 'self' asset: http://asset.localhost data: blob: https:; object-src 'self' asset: http://asset.localhost",
       "assetProtocol": {
         "enable": true,
         "scope": []
diff --git a/src/App.test.tsx b/src/App.test.tsx
index 2dbd2765..603d6a79 100644
--- a/src/App.test.tsx
+++ b/src/App.test.tsx
@@ -1,5 +1,5 @@
-import { act, render, screen, fireEvent, waitFor, within } from '@testing-library/react'
-import type { ReactNode } from 'react'
+import { act, render as testingLibraryRender, screen, fireEvent, waitFor, within } from '@testing-library/react'
+import type { ReactElement, ReactNode } from 'react'
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { DEFAULT_VAULTS } from './hooks/useVaultSwitcher'
 import { formatShortcutDisplay } from './hooks/appCommandCatalog'
@@ -443,6 +443,7 @@ vi.mock('./components/tolariaEditorFormatting', () => ({
 }))
 
 import App from './App'
+import { TooltipProvider } from './components/ui/tooltip'
 import { useUpdater } from './hooks/useUpdater'
 import { isTauri } from './mock-tauri'
 import { streamAiAgent } from './utils/streamAiAgent'
@@ -451,6 +452,13 @@ const AI_AGENTS_ONBOARDING_DISMISSED_STORAGE_NAME = 'tolaria:ai-agents-onboardin
 const CLAUDE_CODE_ONBOARDING_DISMISSED_STORAGE_NAME = 'tolaria:claude-code-onboarding-dismissed'
 const SLOW_APP_READY_TIMEOUT_MS = 10_000
 
+function render(ui: ReactElement, options?: Parameters<typeof testingLibraryRender>[1]) {
+  return testingLibraryRender(ui, {
+    wrapper: ({ children }) => <TooltipProvider>{children}</TooltipProvider>,
+    ...options,
+  })
+}
+
 function createMockUpdaterResult(
   checkForUpdates: () => Promise<{ kind: 'up-to-date' } | { kind: 'available'; version: string; displayVersion: string } | { kind: 'error'; message: string }> = async () => ({ kind: 'up-to-date' }),
 ) {
diff --git a/src/App.tsx b/src/App.tsx
index 7cbe4182..2f5949e9 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -36,6 +36,7 @@ import type { ThemeMode } from './lib/themeMode'
 import { useNoteActions } from './hooks/useNoteActions'
 import { planNewTypeCreation } from './hooks/useNoteCreation'
 import { useCommitFlow } from './hooks/useCommitFlow'
+import { useGitRepositories } from './hooks/useGitRepositories'
 import { useGitRemoteStatus } from './hooks/useGitRemoteStatus'
 import { useViewMode, type ViewMode } from './hooks/useViewMode'
 import { useEntryActions } from './hooks/useEntryActions'
@@ -86,7 +87,7 @@ import { DeleteProgressNotice } from './components/DeleteProgressNotice'
 import { UpdateBanner } from './components/UpdateBanner'
 import { invoke } from '@tauri-apps/api/core'
 import { isTauri, mockInvoke } from './mock-tauri'
-import type { SidebarSelection, InboxPeriod, VaultEntry, ViewDefinition } from './types'
+import type { SidebarSelection, InboxPeriod, VaultEntry, ViewDefinition, GitCommit, GitRemoteStatus, WorkspaceIdentity } from './types'
 import type { NoteListItem } from './utils/ai-context'
 import { initializeNoteProperties } from './utils/initializeNoteProperties'
 import { filterEntries, filterInboxEntries, type NoteListFilter } from './utils/noteListHelpers'
@@ -127,7 +128,17 @@ import {
   sanitizeSelectionForOrganization,
 } from './utils/organizationWorkflow'
 import { requestPlainTextPaste } from './utils/plainTextPaste'
-import { workspacesMountedInGraph } from './utils/workspaces'
+import { SETTINGS_SECTION_IDS } from './components/settingsSectionIds'
+import {
+  filterEntriesToVisibleWorkspaces,
+  graphWorkspaceVaultsForLoading,
+  vaultPathForEntry,
+  visibleWorkspacePaths,
+  workspacesMountedInGraph,
+  workspaceIdentityFromVault,
+  writableWorkspacePaths,
+} from './utils/workspaces'
+import { activeGitRepositories } from './utils/gitRepositories'
 import './App.css'
 
 const ACTIVE_EDITOR_SURFACE_SELECTOR = '.editor__blocknote-container, .raw-editor-codemirror'
@@ -155,6 +166,16 @@ function getNextVisibleInboxEntry(entries: VaultEntry[], currentPath: string): V
   return entries[currentIndex + 1] ?? null
 }
 
+function hideWorkspaceMetadata(entries: VaultEntry[]): VaultEntry[] {
+  let changed = false
+  const nextEntries = entries.map((entry) => {
+    if (!entry.workspace) return entry
+    changed = true
+    return { ...entry, workspace: undefined }
+  })
+  return changed ? nextEntries : entries
+}
+
 function shouldPreferOnboardingVaultPath(
   onboardingState: { status: string; vaultPath?: string },
   vaults: Array<{ path: string }>,
@@ -165,6 +186,39 @@ function shouldPreferOnboardingVaultPath(
     && !vaults.some((vault) => vault.path === onboardingState.vaultPath)
 }
 
+function workspaceLoadVaultsKey(options: {
+  activeVaultPath: string
+  enabled: boolean
+  vaults: Array<{
+    alias?: string | null
+    available?: boolean
+    color?: string | null
+    icon?: string | null
+    label?: string
+    managedDefault?: boolean
+    mounted?: boolean
+    path: string
+    shortLabel?: string | null
+  }>
+}): string {
+  const { activeVaultPath, enabled, vaults } = options
+  if (!enabled) return `disabled:${activeVaultPath}`
+  return JSON.stringify({
+    activeVaultPath,
+    vaults: vaults.map((vault) => ({
+      alias: vault.alias ?? null,
+      available: vault.available !== false,
+      color: vault.color ?? null,
+      icon: vault.icon ?? null,
+      label: vault.label ?? '',
+      managedDefault: vault.managedDefault === true,
+      mounted: vault.mounted !== false,
+      path: vault.path,
+      shortLabel: vault.shortLabel ?? null,
+    })),
+  })
+}
+
 async function resolveNoteWindowEntry(noteWindowParams: NoteWindowParams): Promise<VaultEntry | undefined> {
   for (const path of getNoteWindowPathCandidates(noteWindowParams)) {
     try {
@@ -187,6 +241,56 @@ async function loadNoteWindowContent(path: string, vaultPath: string): Promise<s
   return invoke<string>('get_note_content', request)
 }
 
+function appTauriCall<T>(command: string, args: Record<string, unknown>): Promise<T> {
+  return isTauri() ? invoke<T>(command, args) : mockInvoke<T>(command, args)
+}
+
+async function syncVaultAssetScope(vaultPath: string): Promise<void> {
+  if (!isTauri() || !vaultPath.trim()) return
+  await invoke('sync_vault_asset_scope_for_window', { vaultPath })
+}
+
+function canCustomizeColumnsForSelection(
+  selection: SidebarSelection,
+  explicitOrganizationEnabled: boolean,
+): boolean {
+  if (selection.kind === 'view') return true
+  if (selection.kind !== 'filter') return false
+  if (selection.filter === 'all') return true
+  return explicitOrganizationEnabled && selection.filter === 'inbox'
+}
+
+function shouldShowTelemetryConsentDialog(options: {
+  isStartupLoading: boolean
+  noteWindowParams: NoteWindowParams | null
+  settingsLoaded: boolean
+  telemetryConsent: boolean | null | undefined
+}): boolean {
+  if (options.noteWindowParams || options.isStartupLoading || !options.settingsLoaded) return false
+  return options.telemetryConsent === null
+}
+
+function shouldShowWelcomeOnboarding(options: {
+  noteWindowParams: NoteWindowParams | null
+  onboardingStatus: string
+  runtimeMissingVaultPath: string | null
+  shouldResumeFreshStartOnboarding: boolean
+}): boolean {
+  if (options.noteWindowParams) return false
+  if (options.runtimeMissingVaultPath || options.shouldResumeFreshStartOnboarding) return true
+  return options.onboardingStatus === 'welcome' || options.onboardingStatus === 'vault-missing'
+}
+
+function shouldShowAiAgentsOnboarding(options: {
+  noteWindowParams: NoteWindowParams | null
+  onboardingStatus: string
+  showMcpSetupDialog: boolean
+  showPrompt: boolean
+}): boolean {
+  if (options.noteWindowParams || options.showMcpSetupDialog) return false
+  return options.onboardingStatus === 'ready' && options.showPrompt
+}
+
 function createPulseDeletedNoteEntry(fullPath: string, relativePath: string): DeletedNoteEntry {
   const filename = relativePath.split('/').pop() ?? relativePath
   return {
@@ -338,16 +442,83 @@ function App() {
       ? onboarding.state.vaultPath
       : vaultSwitcher.vaultPath
   )
-  const graphVaults = useMemo(
-    () => noteWindowParams ? [] : workspacesMountedInGraph(allVaults, resolvedPath),
-    [allVaults, noteWindowParams, resolvedPath],
+  const { settings, loaded: settingsLoaded, saveSettings } = useSettings()
+  const [settingsInitialSectionId, setSettingsInitialSectionId] = useState<string | null>(null)
+  const multiWorkspaceEnabled = settings.multi_workspace_enabled === true
+  const workspaceGraphLoadingEnabled = !noteWindowParams
+  const graphDefaultWorkspacePath = !noteWindowParams && multiWorkspaceEnabled
+    ? (defaultWorkspacePath ?? resolvedPath)
+    : resolvedPath
+  const graphVaultsCacheRef = useRef<{ key: string; value: typeof allVaults | undefined } | null>(null)
+  const graphVaultsKey = useMemo(
+    () => workspaceLoadVaultsKey({
+      activeVaultPath: graphDefaultWorkspacePath,
+      enabled: workspaceGraphLoadingEnabled,
+      vaults: allVaults,
+    }),
+    [allVaults, graphDefaultWorkspacePath, workspaceGraphLoadingEnabled],
+  )
+  const graphVaults = useMemo(() => {
+    const key = noteWindowParams ? `note-window:${resolvedPath}` : graphVaultsKey
+    if (graphVaultsCacheRef.current?.key === key) return graphVaultsCacheRef.current.value
+    const value = noteWindowParams
+      ? undefined
+      : graphWorkspaceVaultsForLoading({
+        defaultVaultPath: graphDefaultWorkspacePath,
+        enabled: workspaceGraphLoadingEnabled,
+        vaults: allVaults,
+      })
+    graphVaultsCacheRef.current = { key, value }
+    return value
+  }, [allVaults, graphDefaultWorkspacePath, graphVaultsKey, noteWindowParams, resolvedPath, workspaceGraphLoadingEnabled])
+  const visibleWorkspacePathList = useMemo(
+    () => {
+      if (noteWindowParams) return undefined
+      if (!multiWorkspaceEnabled) {
+        return graphDefaultWorkspacePath.trim() ? [graphDefaultWorkspacePath] : undefined
+      }
+      return visibleWorkspacePaths({
+        defaultVaultPath: graphDefaultWorkspacePath,
+        enabled: true,
+        vaults: allVaults,
+      })
+    },
+    [allVaults, graphDefaultWorkspacePath, multiWorkspaceEnabled, noteWindowParams],
   )
   const writableVaultPaths = useMemo(
-    () => graphVaults
-      .filter((workspace) => workspace.available !== false && workspace.mounted !== false)
-      .map((workspace) => workspace.path),
-    [graphVaults],
+    () => visibleWorkspacePathList ?? writableWorkspacePaths({
+      defaultVaultPath: graphDefaultWorkspacePath,
+      graphVaults: undefined,
+    }),
+    [graphDefaultWorkspacePath, visibleWorkspacePathList],
   )
+  const inspectorWorkspaces = useMemo(() => {
+    if (!multiWorkspaceEnabled || noteWindowParams) return []
+    const writablePathSet = new Set(writableVaultPaths)
+    return (graphVaults ?? [])
+      .filter((vault) => writablePathSet.has(vault.path))
+      .map((vault) => workspaceIdentityFromVault(vault, { defaultWorkspacePath }))
+  }, [defaultWorkspacePath, graphVaults, multiWorkspaceEnabled, noteWindowParams, writableVaultPaths])
+  const folderVaults = useMemo(
+    () => noteWindowParams || !multiWorkspaceEnabled
+      ? undefined
+      : workspacesMountedInGraph({
+        defaultVaultPath: graphDefaultWorkspacePath,
+        vaults: allVaults,
+    }),
+    [allVaults, graphDefaultWorkspacePath, multiWorkspaceEnabled, noteWindowParams],
+  )
+  useEffect(() => {
+    if (noteWindowParams || !vaultSwitcher.loaded) return
+
+    const bridgeVaultPath = writableVaultPaths[0] ?? null
+    void appTauriCall<string>('sync_mcp_bridge_vault', {
+      vaultPath: bridgeVaultPath,
+      vaultPaths: writableVaultPaths,
+    }).catch((err) => {
+      console.warn('Failed to sync MCP bridge vault scope:', err)
+    })
+  }, [noteWindowParams, vaultSwitcher.loaded, writableVaultPaths])
   // Git repo check: 'checking' | 'missing' | 'ready'
   const [gitRepoState, setGitRepoState] = useState<'checking' | 'missing' | 'ready'>('checking')
   const [showGitSetupDialog, setShowGitSetupDialog] = useState(false)
@@ -396,12 +567,45 @@ function App() {
     setToastMessage('Git initialized for this vault')
   }, [resolvedPath, setToastMessage])
 
-  const vault = useVaultLoader(noteWindowParams ? '' : resolvedPath, graphVaults, defaultWorkspacePath)
+  const vault = useVaultLoader(
+    noteWindowParams ? '' : resolvedPath,
+    graphVaults,
+    multiWorkspaceEnabled ? defaultWorkspacePath : null,
+    folderVaults,
+  )
+  const gitRepositories = useMemo(() => activeGitRepositories({
+    defaultVaultPath: graphDefaultWorkspacePath,
+    multiWorkspaceEnabled,
+    vaults: allVaults,
+  }), [allVaults, graphDefaultWorkspacePath, multiWorkspaceEnabled])
+  const activeGitRepositoryPaths = useMemo(
+    () => gitRepositories.map((repository) => repository.path),
+    [gitRepositories],
+  )
+  const gitSurfaces = useGitRepositories({
+    defaultVaultPath: graphDefaultWorkspacePath,
+    repositories: gitRepositories,
+  })
+  const watchedVaultPaths = useMemo(() => {
+    if (noteWindowParams) return []
+    if (visibleWorkspacePathList && visibleWorkspacePathList.length > 0) return visibleWorkspacePathList
+    return resolvedPath.trim() ? [resolvedPath] : []
+  }, [noteWindowParams, resolvedPath, visibleWorkspacePathList])
+  const visibleEntries = useMemo(
+    () => {
+      const entries = filterEntriesToVisibleWorkspaces(vault.entries, visibleWorkspacePathList)
+      return multiWorkspaceEnabled ? entries : hideWorkspaceMetadata(entries)
+    },
+    [multiWorkspaceEnabled, vault.entries, visibleWorkspacePathList],
+  )
   const runtimeMissingVaultPath = !noteWindowParams ? vault.unavailableVaultPath : null
   const {
     markInternalWrite: markRecentVaultWrite,
     filterExternalPaths: filterExternalVaultPaths,
-  } = useRecentVaultWrites({ vaultPath: noteWindowParams ? '' : resolvedPath })
+  } = useRecentVaultWrites({
+    vaultPath: noteWindowParams ? '' : resolvedPath,
+    vaultPaths: watchedVaultPaths,
+  })
   const {
     status: vaultAiGuidanceStatus,
     refresh: refreshVaultAiGuidance,
@@ -433,7 +637,6 @@ function App() {
       explicitOrganization: enabled,
     })
   }, [updateConfig, vaultConfig.inbox?.noteListProperties])
-  const { settings, loaded: settingsLoaded, saveSettings } = useSettings()
   const systemLocale = useMemo(
     () => resolveEffectiveLocale(SYSTEM_UI_LANGUAGE, getBrowserLanguagePreferences()),
     [],
@@ -494,8 +697,26 @@ function App() {
     copyMcpConfig,
   } = useMcpStatus(resolvedPath, setToastMessage, appLocale)
   const gitRemoteStatus = useGitRemoteStatus(resolvedPath)
-  const loadVaultModifiedFiles = vault.loadModifiedFiles
+  const loadDefaultVaultModifiedFiles = vault.loadModifiedFiles
+  const loadAllGitModifiedFiles = gitSurfaces.loadAllModifiedFiles
+  const loadModifiedFilesForRepository = gitSurfaces.loadModifiedFilesForRepository
   const refreshGitRemoteStatus = gitRemoteStatus.refreshRemoteStatus
+  const refreshGitModifiedFiles = useCallback(async () => {
+    await Promise.all([
+      loadDefaultVaultModifiedFiles(),
+      loadAllGitModifiedFiles(),
+    ])
+  }, [loadAllGitModifiedFiles, loadDefaultVaultModifiedFiles])
+  const loadVaultModifiedFiles = refreshGitModifiedFiles
+  const resolveRemoteStatusForVaultPath = useCallback(async (vaultPath: string): Promise<GitRemoteStatus | null> => {
+    if (vaultPath === resolvedPath) return refreshGitRemoteStatus()
+
+    try {
+      return await appTauriCall<GitRemoteStatus>('git_remote_status', { vaultPath })
+    } catch {
+      return null
+    }
+  }, [refreshGitRemoteStatus, resolvedPath])
 
   useEffect(() => {
     if (gitRepoState !== 'ready') return
@@ -536,6 +757,16 @@ function App() {
     void copyMcpConfig()
   }, [copyMcpConfig])
 
+  const handleOpenSettings = useCallback(() => {
+    setSettingsInitialSectionId(null)
+    dialogs.openSettings()
+  }, [dialogs])
+
+  const handleOpenVaultSettings = useCallback(() => {
+    setSettingsInitialSectionId(SETTINGS_SECTION_IDS.workspaces)
+    dialogs.openSettings()
+  }, [dialogs])
+
   const handleLoadMcpConfigSnippet = useCallback(() => {
     void loadMcpConfigSnippet().catch(() => undefined)
   }, [loadMcpConfigSnippet])
@@ -545,7 +776,7 @@ function App() {
   useEffect(() => {
     if (!isTauri() || !resolvedPath) return
     const handleFocus = () => {
-      invoke<DetectedRename[]>('detect_renames', { vaultPath: resolvedPath })
+      invoke<DetectedRename[]>('detect_renames', { args: { vaultPath: resolvedPath } })
         .then(renames => { if (renames.length > 0) setDetectedRenames(renames) })
         .catch((err) => console.warn('[vault] Git rename detection failed:', err))
     }
@@ -556,7 +787,7 @@ function App() {
   const handleUpdateWikilinks = useCallback(async () => {
     if (!isTauri()) return
     try {
-      const count = await invoke<number>('update_wikilinks_for_renames', { vaultPath: resolvedPath, renames: detectedRenames })
+      const count = await invoke<number>('update_wikilinks_for_renames', { args: { vaultPath: resolvedPath, renames: detectedRenames } })
       setDetectedRenames([])
       vault.reloadVault()
       setToastMessage(`Updated wikilinks in ${count} file${count !== 1 ? 's' : ''}`)
@@ -580,19 +811,20 @@ function App() {
   })
   const flushPendingEditorContentRef = useRef<((path: string) => void) | null>(null)
   const flushPendingRawContentRef = useRef<((path: string) => void) | null>(null)
-  const flushEditorStateBeforeAction = async (path: string) => {
+  const appSaveFlushBeforeActionRef = useRef<((path: string) => Promise<unknown>) | null>(null)
+  const flushEditorStateBeforeAction = useCallback(async (path: string) => {
     flushPendingEditorContentRef.current?.(path)
     flushPendingRawContentRef.current?.(path)
-    await appSave.flushBeforeAction(path)
-  }
+    await appSaveFlushBeforeActionRef.current?.(path)
+  }, [])
   const handleCreatedVaultEntryPersisting = useCallback((path: string) => {
     markRecentVaultWrite(path)
     vault.addPendingSave(path)
   }, [markRecentVaultWrite, vault])
   const handleCreatedVaultEntryPersisted = useCallback((path: string) => {
     markRecentVaultWrite(path)
-    vault.loadModifiedFiles()
-  }, [markRecentVaultWrite, vault])
+    void refreshGitModifiedFiles()
+  }, [markRecentVaultWrite, refreshGitModifiedFiles])
   const handleMissingActiveVault = useCallback(() => {
     if (!noteWindowParams && resolvedPath) vault.markVaultUnavailable(resolvedPath)
   }, [noteWindowParams, resolvedPath, vault])
@@ -600,15 +832,15 @@ function App() {
   const notes = useNoteActions({
     addEntry: vault.addEntry,
     removeEntry: vault.removeEntry,
-    entries: vault.entries,
+    entries: visibleEntries,
     flushBeforeNoteSwitch: flushEditorStateBeforeAction,
     flushBeforeNoteMutation: flushEditorStateBeforeAction,
     reloadVault: vault.reloadVault,
     setToastMessage,
     updateEntry: vault.updateEntry,
     vaultPath: resolvedPath,
-    defaultWorkspacePath: noteWindowParams ? null : defaultWorkspacePath,
-    vaults: graphVaults,
+    defaultWorkspacePath: noteWindowParams || !multiWorkspaceEnabled ? null : defaultWorkspacePath,
+    vaults: graphVaults ?? [],
     addPendingSave: handleCreatedVaultEntryPersisting,
     removePendingSave: vault.removePendingSave,
     trackUnsaved: vault.trackUnsaved,
@@ -619,7 +851,7 @@ function App() {
     onMissingActiveVault: handleMissingActiveVault,
     onTypeStateChanged: async () => { await vault.reloadVault() },
     replaceEntry: vault.replaceEntry,
-    onFrontmatterPersisted: vault.loadModifiedFiles,
+    onFrontmatterPersisted: refreshGitModifiedFiles,
     onPathRenamed: (oldPath, newPath) => appSave.trackRenamedPath(oldPath, newPath),
   })
   const {
@@ -651,11 +883,13 @@ function App() {
       updatedFiles,
       vaultPath: resolvedPath,
     })
+    await refreshGitModifiedFiles()
   }, [
       closeAllTabs,
       handleReplaceActiveTab,
       notes.activeTabPath,
       notes.activeTabPathRef,
+      refreshGitModifiedFiles,
       resolvedPath,
       vault.reloadFolders,
       vault.reloadVault,
@@ -670,8 +904,21 @@ function App() {
     (updatedFiles: string[]) => handleVaultUpdate(updatedFiles, { preserveFocusedEditor: true }),
     [handleVaultUpdate],
   )
+  useEffect(() => {
+    if (watchedVaultPaths.length === 0) return
+    let cancelled = false
+    for (const vaultPath of watchedVaultPaths) {
+      void syncVaultAssetScope(vaultPath).catch((err) => {
+        if (!cancelled) console.warn('[vault] Failed to sync asset scope:', err)
+      })
+    }
+    return () => {
+      cancelled = true
+    }
+  }, [watchedVaultPaths])
   useVaultWatcher({
     vaultPath: noteWindowParams ? '' : resolvedPath,
+    vaultPaths: watchedVaultPaths,
     onVaultChanged: handleFocusedVaultUpdate,
     filterChangedPaths: filterExternalVaultPaths,
   })
@@ -735,7 +982,7 @@ function App() {
     notes.setTabs(prev => {
       let changed = false
       const next = prev.map(tab => {
-        const fresh = vault.entries.find(e => e.path === tab.entry.path)
+        const fresh = visibleEntries.find(e => e.path === tab.entry.path)
         if (fresh && fresh !== tab.entry) {
           changed = true
           return { ...tab, entry: fresh }
@@ -744,10 +991,10 @@ function App() {
       })
       return changed ? next : prev
     })
-  }, [vault.entries]) // eslint-disable-line react-hooks/exhaustive-deps -- notes.setTabs is stable (useState setter)
+  }, [visibleEntries]) // eslint-disable-line react-hooks/exhaustive-deps -- notes.setTabs is stable (useState setter)
 
   const { handleGoBack, handleGoForward, canGoBack, canGoForward, entriesByPath } = useAppNavigation({
-    entries: vault.entries,
+    entries: visibleEntries,
     activeTabPath: notes.activeTabPath,
     onSelectNote: notes.handleSelectNote,
   })
@@ -768,7 +1015,7 @@ function App() {
   }, [])
 
   const handlePulseOpenNote = useCallback((relativePath: string, commitHash?: string) => {
-    const fullPath = `${resolvedPath}/${relativePath}`
+    const fullPath = `${gitSurfaces.historyRepositoryPath}/${relativePath}`
     const entry = entriesByPath.get(fullPath) ?? entriesByPath.get(relativePath)
 
     if (commitHash) {
@@ -785,7 +1032,13 @@ function App() {
     if (entry) {
       void handleSelectNote(entry)
     }
-  }, [entriesByPath, resolvedPath, queuePendingDiff, handleSelectNote, openTabWithContent])
+  }, [
+    entriesByPath,
+    gitSurfaces.historyRepositoryPath,
+    queuePendingDiff,
+    handleSelectNote,
+    openTabWithContent,
+  ])
 
   const handleOpenFavorite = useCallback(async (entry: VaultEntry) => {
     await handleReplaceActiveTab(entry)
@@ -808,7 +1061,7 @@ function App() {
   })
 
   const conflictFlow = useConflictFlow({
-    resolvedPath, entries: vault.entries,
+    resolvedPath, entries: visibleEntries,
     conflictFiles: autoSync.conflictFiles,
     pausePull: autoSync.pausePull, resumePull: autoSync.resumePull,
     triggerSync: autoSync.triggerSync, reloadVault: vault.reloadVault,
@@ -822,7 +1075,7 @@ function App() {
 
   const appSave = useAppSave({
     updateEntry: vault.updateEntry, setTabs: notes.setTabs, handleSwitchTab: notes.handleSwitchTab, setToastMessage,
-    loadModifiedFiles: vault.loadModifiedFiles, reloadViews: async () => { await vault.reloadViews() },
+    loadModifiedFiles: refreshGitModifiedFiles, reloadViews: async () => { await vault.reloadViews() },
     trackUnsaved: vault.trackUnsaved, clearUnsaved: vault.clearUnsaved, unsavedPaths: vault.unsavedPaths,
     tabs: notes.tabs, activeTabPath: notes.activeTabPath,
     handleRenameNote: notes.handleRenameNote, handleRenameFilename: notes.handleRenameFilename,
@@ -832,6 +1085,55 @@ function App() {
     onInternalVaultWrite: markRecentVaultWrite,
     locale: appLocale,
   })
+  useEffect(() => {
+    appSaveFlushBeforeActionRef.current = appSave.flushBeforeAction
+  }, [appSave.flushBeforeAction])
+
+  const handleChangeWorkspace = useCallback(async (entry: VaultEntry, workspace: WorkspaceIdentity) => {
+    const sourceVaultPath = vaultPathForEntry(entry, resolvedPath)
+    if (sourceVaultPath === workspace.path) return
+
+    try {
+      await flushEditorStateBeforeAction(entry.path)
+      const result = await notes.handleMoveNoteToWorkspace(
+        entry.path,
+        workspace,
+        sourceVaultPath,
+        (oldPath, newEntry) => {
+          appSave.trackRenamedPath(oldPath, newEntry.path)
+          vault.replaceEntry(oldPath, newEntry)
+          if (effectiveSelection.kind === 'entity' && effectiveSelection.entry.path === oldPath) {
+            handleSetSelection({
+              kind: 'entity',
+              entry: {
+                ...effectiveSelection.entry,
+                ...newEntry,
+              },
+            })
+          }
+        },
+      )
+      if (!result) return
+
+      markRecentVaultWrite(entry.path)
+      markRecentVaultWrite(result.new_path)
+      await refreshGitModifiedFiles()
+    } catch (err) {
+      console.error('Failed to change note workspace:', err)
+      setToastMessage(`Failed to move note: ${String(err)}`)
+    }
+  }, [
+    appSave,
+    effectiveSelection,
+    flushEditorStateBeforeAction,
+    handleSetSelection,
+    markRecentVaultWrite,
+    notes,
+    refreshGitModifiedFiles,
+    resolvedPath,
+    setToastMessage,
+    vault,
+  ])
 
   const aiActivity = useAiActivity({
     onOpenNote: vaultBridge.openNoteByPath,
@@ -929,22 +1231,77 @@ function App() {
 
   const handleOpenInNewWindow = useCallback(() => {
     const activeTab = notes.tabs.find(t => t.entry.path === notes.activeTabPath)
-    if (activeTab) openNoteInNewWindow(activeTab.entry.path, resolvedPath, activeTab.entry.title)
+    if (activeTab) {
+      openNoteInNewWindow(
+        activeTab.entry.path,
+        vaultPathForEntry(activeTab.entry, resolvedPath),
+        activeTab.entry.title,
+      )
+    }
   }, [notes.tabs, notes.activeTabPath, resolvedPath])
 
-  const handleOpenEntryInNewWindow = useCallback((entry: { path: string; title: string }) => {
-    openNoteInNewWindow(entry.path, resolvedPath, entry.title)
+  const handleOpenEntryInNewWindow = useCallback((entry: Pick<VaultEntry, 'path' | 'title' | 'workspace'>) => {
+    openNoteInNewWindow(entry.path, vaultPathForEntry(entry, resolvedPath), entry.title)
   }, [resolvedPath])
 
+  const allGitModifiedFiles = gitSurfaces.allModifiedFiles
+  const selectedChangesModifiedFiles = gitSurfaces.changesModifiedFiles
+  const commitModifiedFiles = gitSurfaces.commitModifiedFiles
+  const changesRepositoryPath = gitSurfaces.changesRepositoryPath
+  const gitModifiedCount = gitSurfaces.totalModifiedCount
+
+  const findEntryForPath = useCallback((path: string) => {
+    const openTabEntry = notes.tabs.find((tab) => tab.entry.path === path)?.entry
+    if (openTabEntry) return openTabEntry
+
+    const visibleEntry = visibleEntries.find((entry) => entry.path === path)
+    if (visibleEntry) return visibleEntry
+
+    return vault.entries.find((entry) => entry.path === path) ?? null
+  }, [notes.tabs, vault.entries, visibleEntries])
+
+  const vaultPathForNotePath = useCallback((path: string) => {
+    const entry = findEntryForPath(path)
+    if (entry) return vaultPathForEntry(entry, resolvedPath)
+
+    const modifiedFile = allGitModifiedFiles.find((file) =>
+      file.path === path || file.relativePath === path || path.endsWith('/' + file.relativePath),
+    )
+    return modifiedFile?.vaultPath ?? resolvedPath
+  }, [allGitModifiedFiles, findEntryForPath, resolvedPath])
+
+  const loadGitHistoryForPath = useCallback(async (path: string): Promise<GitCommit[]> => {
+    try {
+      return await appTauriCall<GitCommit[]>('get_file_history', {
+        vaultPath: vaultPathForNotePath(path),
+        path,
+      })
+    } catch (err) {
+      console.warn('Failed to load git history:', err)
+      return []
+    }
+  }, [vaultPathForNotePath])
+
+  const loadDiffForPath = useCallback((path: string): Promise<string> =>
+    appTauriCall<string>('get_file_diff', {
+      vaultPath: vaultPathForNotePath(path),
+      path,
+    }), [vaultPathForNotePath])
+
+  const loadDiffAtCommitForPath = useCallback((path: string, commitHash: string): Promise<string> =>
+    appTauriCall<string>('get_file_diff_at_commit', {
+      vaultPath: vaultPathForNotePath(path),
+      path,
+      commitHash,
+    }), [vaultPathForNotePath])
+
   const handleDiscardFile = useCallback(async (relativePath: string) => {
-    const targetFile = vault.modifiedFiles.find((file) => file.relativePath === relativePath)
+    const targetVaultPath = changesRepositoryPath
+    const targetFile = selectedChangesModifiedFiles.find((file) => file.relativePath === relativePath)
     const activePathBefore = notes.activeTabPath
     try {
-      if (isTauri()) {
-        await invoke('git_discard_file', { vaultPath: resolvedPath, relativePath })
-      } else {
-        await mockInvoke('git_discard_file', { vaultPath: resolvedPath, relativePath })
-      }
+      await appTauriCall('git_discard_file', { vaultPath: targetVaultPath, relativePath })
+      await loadModifiedFilesForRepository(targetVaultPath)
       const reloadedEntries = await vault.reloadVault()
       const affectedActiveTab = !!activePathBefore
         && (activePathBefore === targetFile?.path || activePathBefore.endsWith('/' + relativePath))
@@ -960,13 +1317,20 @@ function App() {
     } catch (err) {
       setToastMessage(typeof err === 'string' ? err : 'Failed to discard changes')
     }
-  }, [resolvedPath, vault, notes, setToastMessage])
+  }, [
+    changesRepositoryPath,
+    loadModifiedFilesForRepository,
+    notes,
+    selectedChangesModifiedFiles,
+    setToastMessage,
+    vault,
+  ])
 
   const handleOpenDeletedNote = useCallback(async (entry: DeletedNoteEntry) => {
     let previewContent = 'Content not available (untracked)'
     let hasDiff = false
     try {
-      const diff = await vault.loadDiff(entry.path)
+      const diff = await loadDiffForPath(entry.path)
       hasDiff = diff.length > 0
       previewContent = extractDeletedContentFromDiff(diff) ?? previewContent
     } catch (err) {
@@ -978,7 +1342,7 @@ function App() {
     } else {
       setToastMessage('Content not available (untracked)')
     }
-  }, [vault, notes, queuePendingDiff, setToastMessage])
+  }, [loadDiffForPath, notes, queuePendingDiff, setToastMessage])
 
   const handleReplaceActiveTabWithQueuedDiff = useCallback((entry: VaultEntry) => {
     notes.handleReplaceActiveTab(entry)
@@ -989,25 +1353,28 @@ function App() {
 
   const commitFlow = useCommitFlow({
     savePending: appSave.savePending,
-    loadModifiedFiles: vault.loadModifiedFiles,
+    loadModifiedFiles: refreshGitModifiedFiles,
     resolveRemoteStatus: gitRemoteStatus.refreshRemoteStatus,
+    resolveRemoteStatusForVaultPath,
     setToastMessage,
     onPushRejected: autoSync.handlePushRejected,
+    automaticVaultPaths: activeGitRepositoryPaths,
+    manualVaultPath: gitSurfaces.commitRepositoryPath,
     vaultPath: resolvedPath,
   })
-  const suggestedCommitMessage = useMemo(() => generateCommitMessage(vault.modifiedFiles), [vault.modifiedFiles])
+  const suggestedCommitMessage = useMemo(() => generateCommitMessage(commitModifiedFiles), [commitModifiedFiles])
   const isGitVault = gitRepoState !== 'missing'
   const shouldShowGitSetupDialog = !noteWindowParams && gitRepoState === 'missing' && showGitSetupDialog
   const modifiedFilesSignature = useMemo(
-    () => vault.modifiedFiles.map((file) => `${file.relativePath}:${file.status}`).sort().join('|'),
-    [vault.modifiedFiles],
+    () => allGitModifiedFiles.map((file) => `${file.vaultPath ?? ''}:${file.relativePath}:${file.status}`).sort().join('|'),
+    [allGitModifiedFiles],
   )
   const autoGit = useAutoGit({
     enabled: settings.autogit_enabled === true,
     idleThresholdSeconds: settings.autogit_idle_threshold_seconds ?? 90,
     inactiveThresholdSeconds: settings.autogit_inactive_threshold_seconds ?? 30,
     isGitVault,
-    hasPendingChanges: vault.modifiedFiles.length > 0
+    hasPendingChanges: gitModifiedCount > 0
       || ((autoSync.remoteStatus?.hasRemote ?? false) && (autoSync.remoteStatus?.ahead ?? 0) > 0),
     hasUnsavedChanges: vault.unsavedPaths.size > 0,
     onCheckpoint: () => commitFlow.runAutomaticCheckpoint(),
@@ -1017,7 +1384,7 @@ function App() {
   const runAutomaticCheckpoint = commitFlow.runAutomaticCheckpoint
   const handleAppContentChange = appSave.handleContentChange
   const handleAppSave = appSave.handleSave
-  const loadModifiedFiles = vault.loadModifiedFiles
+  const loadModifiedFiles = refreshGitModifiedFiles
 
   useEffect(() => {
     if (modifiedFilesSignature.length === 0) return
@@ -1043,9 +1410,22 @@ function App() {
       flushPendingRawContentRef.current?.(notes.activeTabPath)
     }
     const result = await handleAppSave(...args)
+    const activeTab = notes.activeTabPath
+      ? notes.tabs.find((tab) => tab.entry.path === notes.activeTabPath)
+      : null
+    if (activeTab) {
+      await loadModifiedFilesForRepository(vaultPathForEntry(activeTab.entry, resolvedPath))
+    }
     recordAutoGitActivity()
     return result
-  }, [handleAppSave, notes.activeTabPath, recordAutoGitActivity])
+  }, [
+    handleAppSave,
+    loadModifiedFilesForRepository,
+    notes.activeTabPath,
+    notes.tabs,
+    recordAutoGitActivity,
+    resolvedPath,
+  ])
 
   const seedAutoGitSavedChange = useCallback(async () => {
     if (isTauri()) {
@@ -1062,15 +1442,16 @@ function App() {
     }
 
     const saveNoteContent = window.__mockHandlers?.save_note_content
+    const activeVaultPath = vaultPathForEntry(activeTab.entry, resolvedPath)
     if (typeof saveNoteContent === 'function') {
-      await Promise.resolve(saveNoteContent({ path: activePath, content: activeTab.content }))
+      await Promise.resolve(saveNoteContent({ path: activePath, content: activeTab.content, vaultPath: activeVaultPath }))
     } else {
-      await mockInvoke('save_note_content', { path: activePath, content: activeTab.content })
+      await mockInvoke('save_note_content', { path: activePath, content: activeTab.content, vaultPath: activeVaultPath })
     }
 
     await loadModifiedFiles()
     recordAutoGitActivity()
-  }, [loadModifiedFiles, notes.activeTabPath, notes.tabs, recordAutoGitActivity])
+  }, [loadModifiedFiles, notes.activeTabPath, notes.tabs, recordAutoGitActivity, resolvedPath])
 
   useEffect(() => {
     window.__laputaTest = {
@@ -1087,32 +1468,38 @@ function App() {
   }, [notes.activeTabPath, seedAutoGitSavedChange])
 
   const entryActions = useEntryActions({
-    entries: vault.entries, updateEntry: vault.updateEntry,
+    entries: visibleEntries, updateEntry: vault.updateEntry,
     handleUpdateFrontmatter: notes.handleUpdateFrontmatter,
     handleDeleteProperty: notes.handleDeleteProperty, setToastMessage,
     createTypeEntry: notes.createTypeEntrySilent,
     onBeforeAction: flushEditorStateBeforeAction,
   })
 
+  const resolveVaultPathForNotePath = useCallback((path: string) => {
+    const entry = vault.entries.find((candidate) => candidate.path === path)
+    return entry ? vaultPathForEntry(entry, resolvedPath) : resolvedPath
+  }, [resolvedPath, vault.entries])
+
   const deleteActions = useDeleteActions({
     onDeselectNote: (path: string) => { if (notes.activeTabPath === path) notes.closeAllTabs() },
     removeEntry: vault.removeEntry,
     removeEntries: vault.removeEntries,
-    refreshModifiedFiles: vault.loadModifiedFiles,
+    resolveVaultPathForPath: resolveVaultPathForNotePath,
+    refreshModifiedFiles: refreshGitModifiedFiles,
     reloadVault: vault.reloadVault,
     setToastMessage,
   })
 
   const handleDeleteType = useCallback((typeName: string) => {
-    const typeEntry = vault.entries.find((entry) => entry.isA === 'Type' && entry.title === typeName)
+    const typeEntry = visibleEntries.find((entry) => entry.isA === 'Type' && entry.title === typeName)
     if (!typeEntry) return
 
     trackEvent('sidebar_type_delete_requested')
     deleteActions.handleDeleteNote(typeEntry.path)
-  }, [deleteActions, vault.entries])
+  }, [deleteActions, visibleEntries])
 
   const shouldLoadGitHistory = !layout.inspectorCollapsed && !showAIChat
-  const gitHistory = useGitHistory(notes.activeTabPath, vault.loadGitHistory, shouldLoadGitHistory)
+  const gitHistory = useGitHistory(notes.activeTabPath, loadGitHistoryForPath, shouldLoadGitHistory)
 
   const handleCreateType = useCallback(async (name: string) => {
     const created = await notes.handleCreateType(name)
@@ -1124,7 +1511,7 @@ function App() {
     const trimmed = nextTypeName.trim()
     if (!trimmed) return false
 
-    const plan = planNewTypeCreation({ entries: vault.entries, typeName: trimmed, vaultPath: resolvedPath })
+    const plan = planNewTypeCreation({ entries: visibleEntries, typeName: trimmed, vaultPath: resolvedPath })
     if (plan.status === 'blocked') {
       setToastMessage(plan.message)
       return false
@@ -1147,7 +1534,7 @@ function App() {
         : `Type set to "${resolvedTypeName}"`,
     )
     return true
-  }, [notes, resolvedPath, setToastMessage, vault.entries])
+  }, [notes, resolvedPath, setToastMessage, visibleEntries])
 
   const handleCreateOrUpdateView = useCallback(async (definition: ViewDefinition) => {
     const editing = dialogs.editingView
@@ -1226,9 +1613,9 @@ function App() {
 
   const availableFields = useMemo(() => {
     const builtIn = ['type', 'status', 'title', 'favorite', 'body']
-    if (!vault.entries?.length) return builtIn
+    if (!visibleEntries?.length) return builtIn
     const customFields = new Set<string>()
-    for (const e of vault.entries) {
+    for (const e of visibleEntries) {
       if (e.properties) {
         for (const key of Object.keys(e.properties)) customFields.add(key)
       }
@@ -1237,9 +1624,9 @@ function App() {
       }
     }
     return [...builtIn, ...Array.from(customFields).sort()]
-  }, [vault.entries])
+  }, [visibleEntries])
 
-  const bulkActions = useBulkActions(entryActions, vault.entries, setToastMessage)
+  const bulkActions = useBulkActions(entryActions, visibleEntries, setToastMessage)
 
   // Raw-toggle ref: Editor registers its handleToggleRaw here so the command palette can call it
   const rawToggleRef = useRef<() => void>(() => {})
@@ -1353,11 +1740,11 @@ function App() {
   const activeDeletedFile = useMemo(() => {
     const activeTabPath = notes.activeTabPath
     if (!activeTabPath) return null
-    return vault.modifiedFiles.find((file) =>
+    return allGitModifiedFiles.find((file) =>
       file.status === 'deleted'
       && (file.path === activeTabPath || activeTabPath.endsWith('/' + file.relativePath)),
     ) ?? null
-  }, [notes.activeTabPath, vault.modifiedFiles])
+  }, [allGitModifiedFiles, notes.activeTabPath])
 
   const activeCommandEntry = useMemo(() => {
     if (!notes.activeTabPath) return null
@@ -1368,7 +1755,7 @@ function App() {
   const noteRetargetingUi = useNoteRetargetingUi({
     activeEntry: activeCommandEntry,
     activeNoteBlocked: !!activeDeletedFile,
-    entries: vault.entries,
+    entries: visibleEntries,
     folders: vault.folders,
     selection: effectiveSelection,
     setSelection: handleSetSelection,
@@ -1416,13 +1803,13 @@ function App() {
     selection: effectiveSelection,
     vaultPath: resolvedPath,
     reloadViews: vault.reloadViews,
-    loadModifiedFiles: vault.loadModifiedFiles,
+    loadModifiedFiles: refreshGitModifiedFiles,
     onToast: setToastMessage,
     locale: appLocale,
   })
   const activeNoteModified = useMemo(
-    () => vault.modifiedFiles.some((file) => file.path === notes.activeTabPath),
-    [notes.activeTabPath, vault.modifiedFiles],
+    () => allGitModifiedFiles.some((file) => file.path === notes.activeTabPath),
+    [allGitModifiedFiles, notes.activeTabPath],
   )
   const toggleDiffCommand = useCallback(() => diffToggleRef.current(), [])
   const toggleRawEditorCommand = useMemo(
@@ -1462,7 +1849,7 @@ function App() {
     return hasNoteIconValue(entry?.icon)
   }, [notes.activeTabPath, vault.entries])
   const handleToggleOrganizedWithInboxAdvance = useCallback(async (path: string) => {
-    const entry = vault.entries.find((candidate) => candidate.path === path)
+    const entry = visibleEntries.find((candidate) => candidate.path === path)
     if (!entry) return
 
     const shouldAutoAdvance = settings.auto_advance_inbox_after_organize === true
@@ -1484,14 +1871,10 @@ function App() {
     ) {
       void notes.handleSelectNote(nextVisibleInboxEntry)
     }
-  }, [effectiveSelection, entryActions, notes, settings.auto_advance_inbox_after_organize, vault.entries])
+  }, [effectiveSelection, entryActions, notes, settings.auto_advance_inbox_after_organize, visibleEntries])
   const toggleOrganizedCommand = explicitOrganizationEnabled ? handleToggleOrganizedWithInboxAdvance : undefined
   const canCustomizeNoteListColumns = useMemo(() => (
-    effectiveSelection.kind === 'view'
-      || (
-        effectiveSelection.kind === 'filter'
-        && (effectiveSelection.filter === 'all' || (explicitOrganizationEnabled && effectiveSelection.filter === 'inbox'))
-      )
+    canCustomizeColumnsForSelection(effectiveSelection, explicitOrganizationEnabled)
   ), [effectiveSelection, explicitOrganizationEnabled])
   const restoreDeletedNoteCommand = useMemo(
     () => activeDeletedFile ? () => { void handleDiscardFile(activeDeletedFile.relativePath) } : undefined,
@@ -1519,13 +1902,14 @@ function App() {
     updateFrontmatter: notes.handleUpdateFrontmatter,
     setToastMessage,
   })
+  const activeEditorVaultPath = activeTab ? vaultPathForEntry(activeTab.entry, resolvedPath) : resolvedPath
 
   const commands = useAppCommands({
     activeTabPath: notes.activeTabPath, activeTabPathRef: notes.activeTabPathRef,
-    entries: vault.entries,
+    entries: visibleEntries,
     visibleNotesRef,
     multiSelectionCommandRef,
-    modifiedCount: vault.modifiedFiles.length,
+    modifiedCount: gitModifiedCount,
     activeNoteModified,
     selection: effectiveSelection,
     onQuickOpen: dialogs.openQuickOpen, onCommandPalette: dialogs.openCommandPalette,
@@ -1536,7 +1920,7 @@ function App() {
     onCreateNote: notes.handleCreateNoteImmediate,
     onCreateNoteOfType: notes.handleCreateNoteImmediate,
     onSave: appSave.handleSave,
-    onOpenSettings: dialogs.openSettings,
+    onOpenSettings: handleOpenSettings,
     onOpenFeedback: openFeedback,
     onDeleteNote: deleteActions.handleDeleteNote,
     onArchiveNote: entryActions.handleArchiveNote, onUnarchiveNote: entryActions.handleUnarchiveNote,
@@ -1618,20 +2002,20 @@ function App() {
     canRestoreDeletedNote: !!activeDeletedFile,
   })
 
-  const inboxCount = useMemo(() => filterInboxEntries(vault.entries, inboxPeriod).length, [vault.entries, inboxPeriod])
+  const inboxCount = useMemo(() => filterInboxEntries(visibleEntries, inboxPeriod).length, [visibleEntries, inboxPeriod])
 
   const aiNoteList = useMemo<NoteListItem[]>(() => {
     const isInbox = effectiveSelection.kind === 'filter' && effectiveSelection.filter === 'inbox'
     const filtered = isInbox
-      ? filterInboxEntries(vault.entries, inboxPeriod)
-      : filterEntries(vault.entries, effectiveSelection, {
+      ? filterInboxEntries(visibleEntries, inboxPeriod)
+      : filterEntries(visibleEntries, effectiveSelection, {
         views: vault.views,
         allNotesFileVisibility,
       })
     return filtered.map(e => ({
       path: e.path, title: e.title, type: e.isA ?? 'Note',
     }))
-  }, [allNotesFileVisibility, vault.entries, vault.views, effectiveSelection, inboxPeriod])
+  }, [allNotesFileVisibility, visibleEntries, vault.views, effectiveSelection, inboxPeriod])
 
   const aiNoteListFilter = useMemo(() => {
     if (effectiveSelection.kind === 'sectionGroup') return { type: effectiveSelection.type, query: '' }
@@ -1650,6 +2034,24 @@ function App() {
   }, [onboarding.state, selectedVaultPath, vaultSwitcher.allVaults, vaultSwitcher.loaded, vaultSwitcher.vaultPath])
 
   const isStartupLoading = !noteWindowParams && onboarding.state.status === 'loading'
+  const showTelemetryConsentDialog = shouldShowTelemetryConsentDialog({
+    isStartupLoading,
+    noteWindowParams,
+    settingsLoaded,
+    telemetryConsent: settings.telemetry_consent,
+  })
+  const showWelcomeOnboarding = shouldShowWelcomeOnboarding({
+    noteWindowParams,
+    onboardingStatus: onboarding.state.status,
+    runtimeMissingVaultPath,
+    shouldResumeFreshStartOnboarding,
+  })
+  const showAiAgentsOnboarding = shouldShowAiAgentsOnboarding({
+    noteWindowParams,
+    onboardingStatus: onboarding.state.status,
+    showMcpSetupDialog,
+    showPrompt: aiAgentsOnboarding.showPrompt,
+  })
 
   const shouldShowStartupScreen = !noteWindowParams && (
     (!isStartupLoading && settingsLoaded && settings.telemetry_consent === null)
@@ -1682,6 +2084,9 @@ function App() {
   }
 
   const isVaultContentLoading = !noteWindowParams && (isStartupLoading || (onboarding.state.status === 'ready' && vault.isLoading))
+  const isChangesSelection = effectiveSelection.kind === 'filter' && effectiveSelection.filter === 'changes'
+  const noteListModifiedFiles = isChangesSelection ? selectedChangesModifiedFiles : allGitModifiedFiles
+  const noteListModifiedFilesError = isChangesSelection ? gitSurfaces.changesModifiedFilesError : null
 
   return (
     <div className="app-shell">
@@ -1689,7 +2094,7 @@ function App() {
           {sidebarVisible && (
             <>
               <div className="app__sidebar" style={{ width: layout.sidebarWidth }}>
-                <Sidebar entries={vault.entries} folders={vault.folders} views={vault.views} selection={effectiveSelection} onSelect={handleSetSelection} onSelectNote={notes.handleSelectNote} onSelectFavorite={handleOpenFavorite} onReorderFavorites={entryActions.handleReorderFavorites} onCreateType={notes.handleCreateNoteImmediate} onCreateNewType={dialogs.openCreateType} onCustomizeType={entryActions.handleCustomizeType} onUpdateTypeTemplate={entryActions.handleUpdateTypeTemplate} onReorderSections={entryActions.handleReorderSections} onRenameSection={entryActions.handleRenameSection} onDeleteType={handleDeleteType} onToggleTypeVisibility={entryActions.handleToggleTypeVisibility} onCreateFolder={handleCreateFolder} onRenameFolder={folderActions.renameFolder} onDeleteFolder={folderActions.requestDeleteFolder} folderFileActions={fileActions.folderActions} renamingFolderPath={folderActions.renamingFolderPath} onStartRenameFolder={folderActions.startFolderRename} onCancelRenameFolder={folderActions.cancelFolderRename} onCreateView={dialogs.openCreateView} onEditView={handleEditView} onDeleteView={handleDeleteView} onUpdateViewDefinition={handleSidebarUpdateViewDefinition} onReorderViews={viewOrdering.onReorderViews} showInbox={explicitOrganizationEnabled} inboxCount={inboxCount} allNotesFileVisibility={allNotesFileVisibility} pluralizeTypeLabels={settings.sidebar_type_pluralization_enabled ?? true} onCollapse={handleCollapseSidebar} onGoBack={handleGoBack} onGoForward={handleGoForward} canGoBack={canGoBack} canGoForward={canGoForward} locale={appLocale} loading={isVaultContentLoading} vaultRootPath={resolvedPath} />
+                <Sidebar entries={visibleEntries} folders={vault.folders} views={vault.views} selection={effectiveSelection} onSelect={handleSetSelection} onSelectNote={notes.handleSelectNote} onSelectFavorite={handleOpenFavorite} onReorderFavorites={entryActions.handleReorderFavorites} onCreateType={notes.handleCreateNoteImmediate} onCreateNewType={dialogs.openCreateType} onCustomizeType={entryActions.handleCustomizeType} onUpdateTypeTemplate={entryActions.handleUpdateTypeTemplate} onReorderSections={entryActions.handleReorderSections} onRenameSection={entryActions.handleRenameSection} onDeleteType={handleDeleteType} onToggleTypeVisibility={entryActions.handleToggleTypeVisibility} onCreateFolder={handleCreateFolder} onRenameFolder={folderActions.renameFolder} onDeleteFolder={folderActions.requestDeleteFolder} folderFileActions={fileActions.folderActions} renamingFolderPath={folderActions.renamingFolderPath} onStartRenameFolder={folderActions.startFolderRename} onCancelRenameFolder={folderActions.cancelFolderRename} onCreateView={dialogs.openCreateView} onEditView={handleEditView} onDeleteView={handleDeleteView} onUpdateViewDefinition={handleSidebarUpdateViewDefinition} onReorderViews={viewOrdering.onReorderViews} showInbox={explicitOrganizationEnabled} inboxCount={inboxCount} allNotesFileVisibility={allNotesFileVisibility} pluralizeTypeLabels={settings.sidebar_type_pluralization_enabled ?? true} onCollapse={handleCollapseSidebar} onGoBack={handleGoBack} onGoForward={handleGoForward} canGoBack={canGoBack} canGoForward={canGoForward} locale={appLocale} loading={isVaultContentLoading} vaultRootPath={resolvedPath} />
               </div>
               <ResizeHandle onResize={layout.handleSidebarResize} />
             </>
@@ -1698,9 +2103,9 @@ function App() {
             <>
               <div className={`app__note-list${aiActivity.highlightElement === 'notelist' ? ' ai-highlight' : ''}`} style={{ width: layout.noteListWidth }}>
                 {effectiveSelection.kind === 'filter' && effectiveSelection.filter === 'pulse' ? (
-                  <PulseView vaultPath={resolvedPath} onOpenNote={handlePulseOpenNote} sidebarCollapsed={!sidebarVisible} onExpandSidebar={() => handleSetViewMode('all')} locale={appLocale} />
+                  <PulseView vaultPath={gitSurfaces.historyRepositoryPath} onOpenNote={handlePulseOpenNote} sidebarCollapsed={!sidebarVisible} onExpandSidebar={() => handleSetViewMode('all')} repositories={gitRepositories} selectedRepositoryPath={gitSurfaces.historyRepositoryPath} onRepositoryChange={gitSurfaces.setHistoryRepositoryPath} locale={appLocale} />
                 ) : (
-                  <NoteList entries={vault.entries} selection={effectiveSelection} selectedNote={activeTab?.entry ?? null} loading={isVaultContentLoading} noteListFilter={noteListFilter} onNoteListFilterChange={setNoteListFilter} inboxPeriod={inboxPeriod} modifiedFiles={vault.modifiedFiles} modifiedFilesError={vault.modifiedFilesError} getNoteStatus={vault.getNoteStatus} sidebarCollapsed={!sidebarVisible} onSelectNote={notes.handleSelectNote} onReplaceActiveTab={handleReplaceActiveTabWithQueuedDiff} onEnterNeighborhood={handleEnterNeighborhood} onCreateNote={notes.handleCreateNoteImmediate} onBulkOrganize={explicitOrganizationEnabled ? bulkActions.handleBulkOrganize : undefined} onBulkArchive={bulkActions.handleBulkArchive} onBulkDeletePermanently={deleteActions.handleBulkDeletePermanently} onUpdateTypeSort={notes.handleUpdateFrontmatter} onUpdateViewDefinition={handleUpdateViewDefinition} updateEntry={vault.updateEntry} onOpenInNewWindow={handleOpenEntryInNewWindow} onDiscardFile={handleDiscardFile} onOpenDeletedNote={handleOpenDeletedNote} allNotesNoteListProperties={vaultConfig.allNotes?.noteListProperties ?? null} onUpdateAllNotesNoteListProperties={handleUpdateAllNotesNoteListProperties} inboxNoteListProperties={vaultConfig.inbox?.noteListProperties ?? null} onUpdateInboxNoteListProperties={handleUpdateInboxNoteListProperties} views={vault.views} visibleNotesRef={visibleNotesRef} allNotesFileVisibility={allNotesFileVisibility} multiSelectionCommandRef={multiSelectionCommandRef} locale={appLocale} dateDisplayFormat={dateDisplayFormat} />
+                  <NoteList entries={visibleEntries} selection={effectiveSelection} selectedNote={activeTab?.entry ?? null} loading={isVaultContentLoading} noteListFilter={noteListFilter} onNoteListFilterChange={setNoteListFilter} inboxPeriod={inboxPeriod} modifiedFiles={noteListModifiedFiles} modifiedFilesError={noteListModifiedFilesError} gitRepositories={gitRepositories} selectedGitRepositoryPath={gitSurfaces.changesRepositoryPath} onGitRepositoryChange={gitSurfaces.setChangesRepositoryPath} getNoteStatus={vault.getNoteStatus} sidebarCollapsed={!sidebarVisible} onSelectNote={notes.handleSelectNote} onReplaceActiveTab={handleReplaceActiveTabWithQueuedDiff} onEnterNeighborhood={handleEnterNeighborhood} onCreateNote={notes.handleCreateNoteImmediate} onBulkOrganize={explicitOrganizationEnabled ? bulkActions.handleBulkOrganize : undefined} onBulkArchive={bulkActions.handleBulkArchive} onBulkDeletePermanently={deleteActions.handleBulkDeletePermanently} onUpdateTypeSort={notes.handleUpdateFrontmatter} onUpdateViewDefinition={handleUpdateViewDefinition} updateEntry={vault.updateEntry} onOpenInNewWindow={handleOpenEntryInNewWindow} onDiscardFile={handleDiscardFile} onOpenDeletedNote={handleOpenDeletedNote} allNotesNoteListProperties={vaultConfig.allNotes?.noteListProperties ?? null} onUpdateAllNotesNoteListProperties={handleUpdateAllNotesNoteListProperties} inboxNoteListProperties={vaultConfig.inbox?.noteListProperties ?? null} onUpdateInboxNoteListProperties={handleUpdateInboxNoteListProperties} views={vault.views} visibleNotesRef={visibleNotesRef} allNotesFileVisibility={allNotesFileVisibility} multiSelectionCommandRef={multiSelectionCommandRef} locale={appLocale} dateDisplayFormat={dateDisplayFormat} />
                 )}
               </div>
               <ResizeHandle onResize={layout.handleNoteListResize} />
@@ -1711,10 +2116,10 @@ function App() {
               tabs={notes.tabs}
               activeTabPath={notes.activeTabPath}
               isVaultLoading={isVaultContentLoading}
-              entries={noteWindowParams && activeTab ? [activeTab.entry] : vault.entries}
+              entries={noteWindowParams && activeTab ? [activeTab.entry] : visibleEntries}
               onNavigateWikilink={notes.handleNavigateWikilink}
-              onLoadDiff={vault.loadDiff}
-              onLoadDiffAtCommit={vault.loadDiffAtCommit}
+              onLoadDiff={loadDiffForPath}
+              onLoadDiffAtCommit={loadDiffAtCommitForPath}
               pendingCommitDiffRequest={pendingDiffRequest}
               onPendingCommitDiffHandled={handlePendingDiffHandled}
               getNoteStatus={vault.getNoteStatus}
@@ -1736,10 +2141,12 @@ function App() {
               onAddProperty={notes.handleAddProperty}
               onCreateMissingType={handleCreateMissingType}
               onCreateAndOpenNote={notes.handleCreateNoteForRelationship}
+              onChangeWorkspace={activeDeletedFile ? undefined : handleChangeWorkspace}
               onInitializeProperties={handleInitializeProperties}
               showAIChat={dialogs.showAIChat}
               onToggleAIChat={dialogs.toggleAIChat}
-              vaultPath={resolvedPath}
+              vaultPath={activeEditorVaultPath}
+              vaultPaths={writableVaultPaths}
               noteList={aiNoteList}
               noteListFilter={aiNoteListFilter}
               onToggleFavorite={activeDeletedFile ? undefined : entryActions.handleToggleFavorite}
@@ -1768,6 +2175,7 @@ function App() {
               onFileCreated={vaultBridge.handleAgentFileCreated}
               onFileModified={vaultBridge.handleAgentFileModified}
               onVaultChanged={vaultBridge.handleAgentVaultChanged}
+              workspaces={inspectorWorkspaces}
               isConflicted={conflictFlow.isConflicted}
               onKeepMine={conflictFlow.handleKeepMine}
               onKeepTheirs={conflictFlow.handleKeepTheirs}
@@ -1780,21 +2188,21 @@ function App() {
         </div>
         <UpdateBanner status={updateStatus} actions={updateActions} locale={appLocale} />
         <RenameDetectedBanner renames={detectedRenames} onUpdate={handleUpdateWikilinks} onDismiss={handleDismissRenames} />
-        <StatusBar noteCount={vault.entries.length} modifiedCount={vault.modifiedFiles.length} vaultPath={resolvedPath} vaults={vaultSwitcher.allVaults} defaultWorkspacePath={vaultSwitcher.defaultWorkspacePath} onSwitchVault={vaultSwitcher.switchVault} onOpenSettings={dialogs.openSettings} onOpenFeedback={openFeedback} onOpenDocs={openDocs} onOpenLocalFolder={vaultSwitcher.handleOpenLocalFolder} onCreateEmptyVault={vaultSwitcher.handleCreateEmptyVault} onCloneVault={dialogs.openCloneVault} onCloneGettingStarted={cloneGettingStartedVault} onClickPending={() => handleSetSelection({ kind: 'filter', filter: 'changes' })} onClickPulse={() => handleSetSelection({ kind: 'filter', filter: 'pulse' })} onCommitPush={handleCommitPush} onInitializeGit={openGitSetupDialog} isOffline={networkStatus.isOffline} isGitVault={isGitVault} isVaultReloading={vault.isReloading || isVaultContentLoading} syncStatus={autoSync.syncStatus} lastSyncTime={autoSync.lastSyncTime} conflictCount={autoSync.conflictFiles.length} remoteStatus={autoSync.remoteStatus} onTriggerSync={autoSync.triggerSync} onPullAndPush={autoSync.pullAndPush} onOpenConflictResolver={conflictFlow.handleOpenConflictResolver} zoomLevel={zoom.zoomLevel} themeMode={documentThemeMode} onZoomReset={zoom.zoomReset} onToggleThemeMode={settingsLoaded ? handleToggleThemeMode : undefined} buildNumber={buildNumber} onCheckForUpdates={handleCheckForUpdates} onRemoveVault={vaultSwitcher.removeVault} onSetDefaultWorkspace={vaultSwitcher.setDefaultWorkspace} onUpdateWorkspaceIdentity={vaultSwitcher.updateWorkspaceIdentity} mcpStatus={mcpStatus} onInstallMcp={openMcpSetupDialog} aiAgentsStatus={aiAgentsStatus} vaultAiGuidanceStatus={vaultAiGuidanceStatus} defaultAiAgent={aiAgentPreferences.defaultAiAgent} defaultAiTarget={settings.default_ai_target ?? undefined} aiModelProviders={settings.ai_model_providers ?? []} onSetDefaultAiAgent={aiAgentPreferences.setDefaultAiAgent} onSetDefaultAiTarget={aiAgentPreferences.setDefaultAiTarget} onRestoreVaultAiGuidance={() => { void restoreVaultAiGuidance() }} locale={appLocale} />
+        <StatusBar noteCount={visibleEntries.length} modifiedCount={gitModifiedCount} vaultPath={resolvedPath} defaultWorkspacePath={defaultWorkspacePath} vaults={vaultSwitcher.allVaults} multiWorkspaceEnabled={multiWorkspaceEnabled} onSwitchVault={vaultSwitcher.switchVault} onSetDefaultWorkspace={vaultSwitcher.setDefaultWorkspace} onOpenSettings={handleOpenSettings} onOpenVaultSettings={handleOpenVaultSettings} onOpenFeedback={openFeedback} onOpenDocs={openDocs} onOpenLocalFolder={vaultSwitcher.handleOpenLocalFolder} onCreateEmptyVault={vaultSwitcher.handleCreateEmptyVault} onCloneVault={dialogs.openCloneVault} onCloneGettingStarted={cloneGettingStartedVault} onClickPending={() => handleSetSelection({ kind: 'filter', filter: 'changes' })} onClickPulse={() => handleSetSelection({ kind: 'filter', filter: 'pulse' })} onCommitPush={handleCommitPush} onInitializeGit={openGitSetupDialog} isOffline={networkStatus.isOffline} isGitVault={isGitVault} isVaultReloading={vault.isReloading || isVaultContentLoading} syncStatus={autoSync.syncStatus} lastSyncTime={autoSync.lastSyncTime} conflictCount={autoSync.conflictFiles.length} remoteStatus={autoSync.remoteStatus} onTriggerSync={autoSync.triggerSync} onPullAndPush={autoSync.pullAndPush} onOpenConflictResolver={conflictFlow.handleOpenConflictResolver} zoomLevel={zoom.zoomLevel} themeMode={documentThemeMode} onZoomReset={zoom.zoomReset} onToggleThemeMode={settingsLoaded ? handleToggleThemeMode : undefined} buildNumber={buildNumber} onCheckForUpdates={handleCheckForUpdates} onRemoveVault={vaultSwitcher.removeVault} onUpdateWorkspaceIdentity={vaultSwitcher.updateWorkspaceIdentity} mcpStatus={mcpStatus} onInstallMcp={openMcpSetupDialog} aiAgentsStatus={aiAgentsStatus} vaultAiGuidanceStatus={vaultAiGuidanceStatus} defaultAiAgent={aiAgentPreferences.defaultAiAgent} defaultAiTarget={settings.default_ai_target ?? undefined} aiModelProviders={settings.ai_model_providers ?? []} onSetDefaultAiAgent={aiAgentPreferences.setDefaultAiAgent} onSetDefaultAiTarget={aiAgentPreferences.setDefaultAiTarget} onRestoreVaultAiGuidance={() => { void restoreVaultAiGuidance() }} locale={appLocale} />
         <GitSetupDialog open={shouldShowGitSetupDialog} onInitGit={handleInitGitRepo} onDismiss={dismissGitSetupDialog} />
         <DeleteProgressNotice count={deleteActions.pendingDeleteCount} />
         <Toast message={toastMessage} onDismiss={() => setToastMessage(null)} />
-        <QuickOpenPalette open={dialogs.showQuickOpen} entries={vault.entries} isLoading={vault.isLoading} onSelect={notes.handleSelectNote} onClose={dialogs.closeQuickOpen} locale={appLocale} />
+        <QuickOpenPalette open={dialogs.showQuickOpen} entries={visibleEntries} isLoading={vault.isLoading} onSelect={notes.handleSelectNote} onClose={dialogs.closeQuickOpen} locale={appLocale} />
         <CommandPalette
           open={dialogs.showCommandPalette}
           commands={commands}
-          entries={vault.entries}
+          entries={visibleEntries}
           aiAgentReady={aiAgentPreferences.defaultAiAgentReady}
           aiAgentLabel={aiAgentPreferences.defaultAiAgentLabel}
           locale={appLocale}
           onClose={dialogs.closeCommandPalette}
         />
-        <SearchPanel open={dialogs.showSearch} vaultPath={resolvedPath} entries={vault.entries} onSelectNote={notes.handleSelectNote} onClose={dialogs.closeSearch} dateDisplayFormat={dateDisplayFormat} />
+        <SearchPanel open={dialogs.showSearch} vaultPath={resolvedPath} entries={visibleEntries} onSelectNote={notes.handleSelectNote} onClose={dialogs.closeSearch} dateDisplayFormat={dateDisplayFormat} />
         <CreateTypeDialog open={dialogs.showCreateTypeDialog} onClose={dialogs.closeCreateType} onCreate={handleCreateType} />
         <NoteRetargetingDialogs
           dialogState={noteRetargetingUi.dialogState}
@@ -1808,9 +2216,13 @@ function App() {
         <CreateViewDialog open={dialogs.showCreateViewDialog} onClose={dialogs.closeCreateView} onCreate={handleCreateOrUpdateView} availableFields={availableFields} locale={appLocale} editingView={dialogs.editingView?.definition ?? null} />
         <CommitDialog
           open={commitFlow.showCommitDialog}
-          modifiedCount={vault.modifiedFiles.length}
+          modifiedCount={commitModifiedFiles.length}
           commitMode={commitFlow.commitMode}
+          locale={appLocale}
+          repositories={gitRepositories}
+          selectedRepositoryPath={gitSurfaces.commitRepositoryPath}
           suggestedMessage={suggestedCommitMessage}
+          onRepositoryChange={gitSurfaces.setCommitRepositoryPath}
           onCommit={commitFlow.handleCommitPush}
           onClose={commitFlow.closeCommitDialog}
         />
@@ -1825,7 +2237,7 @@ function App() {
           onCommit={conflictResolver.commitResolution}
           onClose={conflictFlow.handleCloseConflictResolver}
         />
-        <SettingsPanel open={dialogs.showSettings} settings={settings} aiAgentsStatus={aiAgentsStatus} locale={appLocale} systemLocale={systemLocale} isGitVault={isGitVault} onSave={saveSettings} onCopyMcpConfig={handleCopyMcpConfig} explicitOrganizationEnabled={explicitOrganizationEnabled} onSaveExplicitOrganization={handleSaveExplicitOrganization} onClose={dialogs.closeSettings} />
+        <SettingsPanel open={dialogs.showSettings} initialSectionId={settingsInitialSectionId} settings={settings} aiAgentsStatus={aiAgentsStatus} locale={appLocale} systemLocale={systemLocale} vaults={vaultSwitcher.allVaults} defaultWorkspacePath={vaultSwitcher.defaultWorkspacePath} onSetDefaultWorkspace={vaultSwitcher.setDefaultWorkspace} onRemoveVault={vaultSwitcher.removeVault} onUpdateWorkspaceIdentity={vaultSwitcher.updateWorkspaceIdentity} isGitVault={isGitVault} onSave={saveSettings} onCopyMcpConfig={handleCopyMcpConfig} explicitOrganizationEnabled={explicitOrganizationEnabled} onSaveExplicitOrganization={handleSaveExplicitOrganization} onClose={dialogs.closeSettings} />
         <FeedbackDialog open={showFeedback} onClose={closeFeedback} />
         <McpSetupDialog open={showMcpSetupDialog} status={mcpStatus} busyAction={mcpDialogAction} manualConfigSnippet={mcpConfigSnippet} manualConfigLoading={mcpConfigLoading} manualConfigError={mcpConfigError} locale={appLocale} onClose={closeMcpSetupDialog} onConnect={handleConnectMcp} onCopyManualConfig={handleCopyMcpConfig} onDisconnect={handleDisconnectMcp} onLoadManualConfig={handleLoadMcpConfigSnippet} />
         <CloneVaultModal key={dialogs.showCloneVault ? 'clone-open' : 'clone-closed'} open={dialogs.showCloneVault} onClose={dialogs.closeCloneVault} onVaultCloned={vaultSwitcher.handleVaultCloned} />
diff --git a/src/components/AccentColorPicker.tsx b/src/components/AccentColorPicker.tsx
new file mode 100644
index 00000000..ab35beeb
--- /dev/null
+++ b/src/components/AccentColorPicker.tsx
@@ -0,0 +1,76 @@
+import type { MouseEvent } from 'react'
+import { Check } from '@phosphor-icons/react'
+import { Button } from './ui/button'
+import { cn } from '@/lib/utils'
+import { ACCENT_COLOR_PICKER_COLORS } from '../utils/typeColors'
+
+type AccentColorIndicator = 'border' | 'check'
+
+interface AccentColorPickerProps {
+  className?: string
+  disabled?: boolean
+  getOptionTestId?: (key: string) => string
+  indicator?: AccentColorIndicator
+  onSelectColor: (key: string) => void
+  selectedColor: string | null
+  size?: number
+  stopPropagation?: boolean
+}
+
+const DEFAULT_SWATCH_SIZE = 24
+
+function selectedBorder(indicator: AccentColorIndicator, selected: boolean): string {
+  if (indicator === 'check') return '0 solid transparent'
+  return selected ? '2px solid var(--foreground)' : '2px solid transparent'
+}
+
+export function AccentColorPicker({
+  className,
+  disabled = false,
+  getOptionTestId,
+  indicator = 'border',
+  onSelectColor,
+  selectedColor,
+  size = DEFAULT_SWATCH_SIZE,
+  stopPropagation = false,
+}: AccentColorPickerProps) {
+  const handleSelect = (event: MouseEvent<HTMLButtonElement>, key: string) => {
+    if (stopPropagation) event.stopPropagation()
+    if (!disabled) onSelectColor(key)
+  }
+
+  return (
+    <div className={cn('flex flex-wrap items-center gap-2', className)}>
+      {ACCENT_COLOR_PICKER_COLORS.map((color) => {
+        const selected = selectedColor === color.key
+        return (
+          <Button
+            key={color.key}
+            type="button"
+            variant="ghost"
+            size="icon-xs"
+            className={cn(
+              'shrink-0 rounded-full p-0 transition-transform',
+              disabled ? 'cursor-not-allowed opacity-50' : selected ? 'scale-110' : 'hover:scale-105',
+            )}
+            style={{
+              width: size,
+              height: size,
+              backgroundColor: color.css,
+              border: selectedBorder(indicator, selected),
+            }}
+            title={color.label}
+            aria-label={color.label}
+            data-testid={getOptionTestId?.(color.key)}
+            disabled={disabled}
+            onClick={(event) => handleSelect(event, color.key)}
+          >
+            {indicator === 'check' && selected && (
+              <Check size={Math.max(8, Math.round(size * 0.58))} weight="bold" style={{ color: 'var(--text-inverse)' }} />
+            )}
+          </Button>
+        )
+      })}
+    </div>
+  )
+}
diff --git a/src/components/AiPanel.test.tsx b/src/components/AiPanel.test.tsx
index 95e5ff5a..985bc2cc 100644
--- a/src/components/AiPanel.test.tsx
+++ b/src/components/AiPanel.test.tsx
@@ -122,6 +122,7 @@ describe('AiPanel', () => {
     expect(mockUseCliAiAgent).toHaveBeenCalledWith(
       '/tmp/vault',
       undefined,
+      undefined,
       expect.any(Object),
       expect.objectContaining({ permissionMode: 'power_user' }),
     )
diff --git a/src/components/AiPanel.tsx b/src/components/AiPanel.tsx
index 743571c7..fcbf400a 100644
--- a/src/components/AiPanel.tsx
+++ b/src/components/AiPanel.tsx
@@ -34,6 +34,7 @@ interface AiPanelProps {
   onFileModified?: (relativePath: string) => void
   onVaultChanged?: () => void
   vaultPath: string
+  vaultPaths?: string[]
   activeEntry?: VaultEntry | null
   /** Direct content of the active note from the editor tab. */
   activeNoteContent?: string | null
@@ -174,6 +175,7 @@ export function AiPanel({
   onFileModified,
   onVaultChanged,
   vaultPath,
+  vaultPaths,
   activeEntry,
   activeNoteContent,
   entries,
@@ -185,6 +187,7 @@ export function AiPanel({
     ?? readinessFromReadyFlag(providedDefaultAiAgentReady)
   const controller = useAiPanelController({
     vaultPath,
+    vaultPaths,
     defaultAiAgent: providedDefaultAiAgent ?? DEFAULT_AI_AGENT,
     defaultAiTarget,
     defaultAiAgentReady: providedDefaultAiAgentReady ?? true,
diff --git a/src/components/BreadcrumbBar.test.tsx b/src/components/BreadcrumbBar.test.tsx
index 36a4c3f3..d7319e8b 100644
--- a/src/components/BreadcrumbBar.test.tsx
+++ b/src/components/BreadcrumbBar.test.tsx
@@ -281,6 +281,30 @@ describe('BreadcrumbBar — title in breadcrumb (always rendered, CSS-toggled)',
     expect(screen.getByText('test')).toBeInTheDocument()
   })
 
+  it('shows the workspace initials label before the note type when workspace metadata is present', () => {
+    renderBreadcrumb({
+      isA: 'Responsibility',
+      workspace: {
+        id: 'brian',
+        label: 'Brian',
+        alias: 'brian',
+        path: '/brian',
+        shortLabel: 'BR',
+        color: 'purple',
+        icon: null,
+        mounted: true,
+        available: true,
+        defaultForNewNotes: false,
+      },
+    })
+
+    const workspaceLabel = screen.getByTestId('breadcrumb-workspace-label')
+    const typeLabel = screen.getByText('Responsibility')
+    expect(workspaceLabel).toHaveTextContent('BR')
+    expect(workspaceLabel).toHaveAttribute('title', 'Brian (brian)')
+    expect(workspaceLabel.compareDocumentPosition(typeLabel) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+  })
+
   it('does not render emoji note icons in the breadcrumb filename', () => {
     const entryWithEmoji = { ...baseEntry, icon: '🚀' }
     render(<BreadcrumbBar entry={entryWithEmoji} {...defaultProps} />)
diff --git a/src/components/BreadcrumbBar.tsx b/src/components/BreadcrumbBar.tsx
index 959b64e2..c77ca4d2 100644
--- a/src/components/BreadcrumbBar.tsx
+++ b/src/components/BreadcrumbBar.tsx
@@ -8,6 +8,7 @@ import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { ActionTooltip, type ActionTooltipCopy } from '@/components/ui/action-tooltip'
 import { TooltipProvider } from '@/components/ui/tooltip'
+import { WorkspaceInitialsBadge } from './WorkspaceInitialsBadge'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -990,6 +991,26 @@ function BreadcrumbOverflowMenu({
   )
 }
 
+function BreadcrumbSeparator() {
+  return <span aria-hidden="true" className="shrink-0 text-border">›</span>
+}
+
+function WorkspaceCrumb({ entry }: Pick<BreadcrumbBarProps, 'entry'>) {
+  const workspace = entry.workspace
+  if (!workspace) return null
+
+  return (
+    <>
+      <WorkspaceInitialsBadge
+        className="shrink-0"
+        testId="breadcrumb-workspace-label"
+        workspace={workspace}
+      />
+      <BreadcrumbSeparator />
+    </>
+  )
+}
+
 function BreadcrumbTitle({
   content,
   entry,
@@ -1000,8 +1021,9 @@ function BreadcrumbTitle({
   const typeLabel = entry.isA ?? 'Note'
   return (
     <div className="breadcrumb-bar__title-content flex items-center gap-1.5 min-w-0 text-sm text-muted-foreground">
+      <WorkspaceCrumb entry={entry} />
       <span className="shrink-0">{typeLabel}</span>
-      <span className="shrink-0 text-border">›</span>
+      <BreadcrumbSeparator />
       <div className="flex min-w-0 items-center gap-1 truncate">
         {loadingTitle
           ? <BreadcrumbTitleSkeleton />
diff --git a/src/components/CommitDialog.test.tsx b/src/components/CommitDialog.test.tsx
index 09426de7..e960486a 100644
--- a/src/components/CommitDialog.test.tsx
+++ b/src/components/CommitDialog.test.tsx
@@ -114,4 +114,24 @@ describe('CommitDialog', () => {
     expect(screen.getByText(`${submitShortcut} to commit locally`)).toBeInTheDocument()
     expect(getActionButton('Commit')).toBeDisabled()
   })
+
+  it('shows a repository selector when multiple repositories are available', () => {
+    render(
+      <CommitDialog
+        open={true}
+        modifiedCount={2}
+        repositories={[
+          { path: '/default', label: 'Default', defaultForNewNotes: true },
+          { path: '/work', label: 'Work', defaultForNewNotes: false },
+        ]}
+        selectedRepositoryPath="/work"
+        onRepositoryChange={vi.fn()}
+        onCommit={onCommit}
+        onClose={onClose}
+      />,
+    )
+
+    expect(screen.getByTestId('commit-repository-select')).toBeInTheDocument()
+    expect(screen.getByText('Work')).toBeInTheDocument()
+  })
 })
diff --git a/src/components/CommitDialog.tsx b/src/components/CommitDialog.tsx
index 76137791..14b15bba 100644
--- a/src/components/CommitDialog.tsx
+++ b/src/components/CommitDialog.tsx
@@ -5,6 +5,9 @@ import { Badge } from '@/components/ui/badge'
 import { Textarea } from '@/components/ui/textarea'
 import { formatShortcutDisplay } from '../hooks/appCommandCatalog'
 import type { CommitMode } from '../hooks/useCommitFlow'
+import { GitRepositorySelect } from './GitRepositorySelect'
+import type { GitRepositoryOption } from '../utils/gitRepositories'
+import { translate, type AppLocale } from '../lib/i18n'
 
 type CommitDialogCopy = {
   title: string
@@ -49,7 +52,11 @@ interface CommitDialogProps {
   open: boolean
   modifiedCount: number
   commitMode?: CommitMode
+  locale?: AppLocale
+  repositories?: GitRepositoryOption[]
+  selectedRepositoryPath?: string
   suggestedMessage?: string
+  onRepositoryChange?: (path: string) => void
   onCommit: (message: string) => void
   onClose: () => void
 }
@@ -58,7 +65,11 @@ export function CommitDialog({
   open,
   modifiedCount,
   commitMode = 'push',
+  locale = 'en',
+  repositories = [],
+  selectedRepositoryPath = '',
   suggestedMessage,
+  onRepositoryChange,
   onCommit,
   onClose,
 }: CommitDialogProps) {
@@ -100,6 +111,15 @@ export function CommitDialog({
           </div>
           <DialogDescription>{copy.description}</DialogDescription>
         </DialogHeader>
+        {onRepositoryChange && selectedRepositoryPath && (
+          <GitRepositorySelect
+            label={translate(locale, 'git.repository.select')}
+            repositories={repositories}
+            selectedPath={selectedRepositoryPath}
+            onChange={onRepositoryChange}
+            testId="commit-repository-select"
+          />
+        )}
         <Textarea
           ref={inputRef}
           className="min-h-[84px] resize-y bg-[var(--bg-input)] py-2.5 text-[13px]"
diff --git a/src/components/DynamicPropertiesPanel.test.tsx b/src/components/DynamicPropertiesPanel.test.tsx
index a66ff7ed..e42f3824 100644
--- a/src/components/DynamicPropertiesPanel.test.tsx
+++ b/src/components/DynamicPropertiesPanel.test.tsx
@@ -332,6 +332,44 @@ describe('DynamicPropertiesPanel', () => {
       makeEntry({ path: '/vault/topic.md', title: 'Topic', isA: 'Type' }),
     ]
 
+    it('renders workspace selector before type selector when multiple workspaces are available', () => {
+      const personalWorkspace = {
+        id: 'personal',
+        label: 'Personal',
+        alias: 'personal',
+        path: '/personal',
+        shortLabel: 'PE',
+        color: 'green',
+        icon: null,
+        mounted: true,
+        available: true,
+        defaultForNewNotes: true,
+      }
+      const teamWorkspace = {
+        id: 'team',
+        label: 'Team',
+        alias: 'team',
+        path: '/team',
+        shortLabel: 'TE',
+        color: 'purple',
+        icon: null,
+        mounted: true,
+        available: true,
+        defaultForNewNotes: false,
+      }
+
+      renderPanel({
+        entry: makeEntry({ workspace: personalWorkspace }),
+        workspaces: [personalWorkspace, teamWorkspace],
+        onUpdateProperty,
+        onChangeWorkspace: vi.fn(),
+      })
+
+      const workspaceSelector = screen.getByTestId('workspace-selector')
+      const typeSelector = screen.getByTestId('type-selector')
+      expect(workspaceSelector.compareDocumentPosition(typeSelector) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+    })
+
     it('renders as dropdown when editable', () => {
       renderPanel({ entries: typeEntries, onUpdateProperty })
       expect(screen.getByTestId('type-selector')).toBeInTheDocument()
diff --git a/src/components/DynamicPropertiesPanel.tsx b/src/components/DynamicPropertiesPanel.tsx
index 3841d873..c47db756 100644
--- a/src/components/DynamicPropertiesPanel.tsx
+++ b/src/components/DynamicPropertiesPanel.tsx
@@ -1,13 +1,14 @@
 import { Plus } from '@phosphor-icons/react'
 import { useMemo, useCallback, useEffect, useState } from 'react'
 import { Button } from '@/components/ui/button'
-import type { VaultEntry } from '../types'
+import type { VaultEntry, WorkspaceIdentity } from '../types'
 import type { FrontmatterValue } from './Inspector'
 import type { ParsedFrontmatter } from '../utils/frontmatter'
 import { usePropertyPanelState } from '../hooks/usePropertyPanelState'
 import { getEffectiveDisplayMode, detectPropertyType, DISPLAY_MODE_ICONS } from '../utils/propertyTypes'
 import { SmartPropertyValueCell, DisplayModeSelector } from './PropertyValueCells'
 import { TypeSelector } from './TypeSelector'
+import { WorkspaceSelector } from './WorkspaceSelector'
 import { AddPropertyForm } from './AddPropertyForm'
 import type { PropertyDisplayMode } from '../utils/propertyTypes'
 import { FOCUS_NOTE_ICON_PROPERTY_EVENT } from './noteIconPropertyEvents'
@@ -453,19 +454,72 @@ function SuggestedPropertyRows({
 
 type PropertyPanelState = ReturnType<typeof usePropertyPanelState>
 
+function MetadataSelectors({
+  availableTypes,
+  customColorKey,
+  entry,
+  locale,
+  missingTypeName,
+  onChangeWorkspace,
+  onCreateMissingType,
+  onNavigate,
+  onUpdateProperty,
+  typeColorKeys,
+  typeIconKeys,
+  workspaces,
+}: {
+  availableTypes: string[]
+  customColorKey?: string | null
+  entry: VaultEntry
+  locale: AppLocale
+  missingTypeName?: string | null
+  onChangeWorkspace?: (workspace: WorkspaceIdentity) => void | Promise<void>
+  onCreateMissingType?: (typeName: string) => boolean | void | Promise<boolean | void>
+  onNavigate?: (target: string) => void
+  onUpdateProperty?: (key: string, value: FrontmatterValue) => void
+  typeColorKeys: Record<string, string | null>
+  typeIconKeys: Record<string, string | null>
+  workspaces?: WorkspaceIdentity[]
+}) {
+  return (
+    <>
+      <WorkspaceSelector
+        currentWorkspace={entry.workspace}
+        workspaces={workspaces ?? []}
+        onChangeWorkspace={onChangeWorkspace}
+        locale={locale}
+      />
+      <TypeSelector
+        isA={entry.isA}
+        customColorKey={customColorKey}
+        availableTypes={availableTypes}
+        typeColorKeys={typeColorKeys}
+        typeIconKeys={typeIconKeys}
+        onUpdateProperty={onUpdateProperty}
+        onNavigate={onNavigate}
+        missingTypeName={missingTypeName}
+        onCreateMissingType={onCreateMissingType}
+        locale={locale}
+      />
+    </>
+  )
+}
+
 function DynamicPropertiesPanelContent({
   entry,
-  propertyState,
+  propertyState: PropertyPanelState
   pendingSuggestedKey,
   missingSuggested,
   missingTypeName,
   dateDisplayFormat,
   locale,
+  workspaces,
   onUpdateProperty,
   onDeleteProperty,
   onAddProperty,
   onNavigate,
   onCreateMissingType,
+  onChangeWorkspace,
   onStartPendingSuggestedEdit,
   onSaveSuggestedValue,
   onAddSuggestedProperty,
@@ -477,11 +531,13 @@ function DynamicPropertiesPanelContent({
   missingTypeName: string | null
   dateDisplayFormat: DateDisplayFormat
   locale: AppLocale
+  workspaces?: WorkspaceIdentity[]
   onUpdateProperty?: (key: string, value: FrontmatterValue) => void
   onDeleteProperty?: (key: string) => void
   onAddProperty?: (key: string, value: FrontmatterValue) => void
   onNavigate?: (target: string) => void
   onCreateMissingType?: (typeName: string) => boolean | void | Promise<boolean | void>
+  onChangeWorkspace?: (workspace: WorkspaceIdentity) => void | Promise<void>
   onStartPendingSuggestedEdit: (key: string | null) => void
   onSaveSuggestedValue: (key: string, newValue: string) => void
   onAddSuggestedProperty: (key: string) => void
@@ -495,17 +551,19 @@ function DynamicPropertiesPanelContent({
   return (
     <div className="flex flex-col gap-3">
       <div className="grid min-w-0 gap-x-2 gap-y-1.5" style={PROPERTY_PANEL_GRID_STYLE}>
-        <TypeSelector
-          isA={entry.isA}
-          customColorKey={customColorKey}
+        <MetadataSelectors
           availableTypes={availableTypes}
+          customColorKey={customColorKey}
+          entry={entry}
+          locale={locale}
+          missingTypeName={missingTypeName}
+          onChangeWorkspace={onChangeWorkspace}
+          onCreateMissingType={onCreateMissingType}
+          onNavigate={onNavigate}
+          onUpdateProperty={onUpdateProperty}
           typeColorKeys={typeColorKeys}
           typeIconKeys={typeIconKeys}
-          onUpdateProperty={onUpdateProperty}
-          onNavigate={onNavigate}
-          missingTypeName={missingTypeName}
-          onCreateMissingType={onCreateMissingType}
-          locale={locale}
+          workspaces={workspaces}
         />
         <PropertyEntryRows
           source="frontmatter"
@@ -572,24 +630,29 @@ function DynamicPropertiesPanelContent({
   )
 }
 
-export function DynamicPropertiesPanel({
-  entry, frontmatter, entries,
-  onUpdateProperty, onDeleteProperty, onAddProperty, onNavigate, onCreateMissingType,
-  locale = 'en',
-  dateDisplayFormat = DEFAULT_DATE_DISPLAY_FORMAT,
-}: {
+interface DynamicPropertiesPanelProps {
   entry: VaultEntry
   content?: string | null
   frontmatter: ParsedFrontmatter
   entries?: VaultEntry[]
+  workspaces?: WorkspaceIdentity[]
   onUpdateProperty?: (key: string, value: FrontmatterValue) => void
   onDeleteProperty?: (key: string) => void
   onAddProperty?: (key: string, value: FrontmatterValue) => void
   onNavigate?: (target: string) => void
   onCreateMissingType?: (typeName: string) => boolean | void | Promise<boolean | void>
+  onChangeWorkspace?: (workspace: WorkspaceIdentity) => void | Promise<void>
   locale?: AppLocale
   dateDisplayFormat?: DateDisplayFormat
-}) {
+}
+
+export function DynamicPropertiesPanel({
+  entry, frontmatter, entries,
+  onUpdateProperty, onDeleteProperty, onAddProperty, onNavigate, onCreateMissingType,
+  onChangeWorkspace, workspaces,
+  locale = 'en',
+  dateDisplayFormat = DEFAULT_DATE_DISPLAY_FORMAT,
+}: DynamicPropertiesPanelProps) {
   const propertyState = usePropertyPanelState({ entries, entryIsA: entry.isA, frontmatter, onUpdateProperty, onDeleteProperty, onAddProperty })
   const [pendingSuggestedKey, setPendingSuggestedKey] = useState<string | null>(null)
   const missingTypeName = useMemo(() => resolveMissingTypeName(entry.isA, propertyState.availableTypes), [entry.isA, propertyState.availableTypes])
@@ -623,11 +686,13 @@ export function DynamicPropertiesPanel({
       missingTypeName={missingTypeName}
       dateDisplayFormat={dateDisplayFormat}
       locale={locale}
+      workspaces={workspaces}
       onUpdateProperty={onUpdateProperty}
       onDeleteProperty={onDeleteProperty}
       onAddProperty={onAddProperty}
       onNavigate={onNavigate}
       onCreateMissingType={onCreateMissingType}
+      onChangeWorkspace={onChangeWorkspace}
       onStartPendingSuggestedEdit={handlePendingSuggestedEdit}
       onSaveSuggestedValue={handleSaveSuggestedValue}
       onAddSuggestedProperty={handleSuggestedAdd}
diff --git a/src/components/Editor.raw-mode-sync.test.ts b/src/components/Editor.raw-mode-sync.test.ts
new file mode 100644
index 00000000..97a97ffd
--- /dev/null
+++ b/src/components/Editor.raw-mode-sync.test.ts
@@ -0,0 +1,213 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { VaultEntry } from '../types'
+import type { Tab } from '../hooks/useTabManagement'
+import {
+  applyPendingRawExitContent,
+  rememberPendingRawExitContent,
+  syncActiveTabIntoRawBuffer,
+} from './editorRawModeSync'
+
+const mockEntry: VaultEntry = {
+  path: '/vault/project/test.md',
+  filename: 'test.md',
+  title: 'Test Project',
+  isA: 'Project',
+  aliases: [],
+  belongsTo: [],
+  relatedTo: [],
+  status: 'Active',
+  archived: false,
+  modifiedAt: 1700000000,
+  createdAt: null,
+  fileSize: 1024,
+  snippet: '',
+  wordCount: 12,
+  relationships: {},
+  icon: null,
+  color: null,
+  order: null,
+  template: null,
+  sort: null,
+  outgoingLinks: [],
+  sidebarLabel: null,
+  view: null,
+  visible: null,
+  properties: {},
+  organized: false,
+  favorite: false,
+  favoriteIndex: null,
+  listPropertiesDisplay: [],
+  hasH1: false,
+}
+
+const mockContent = `---
+title: Test Project
+is_a: Project
+Status: Active
+---
+
+# Test Project
+
+This is a test note with some words to count.
+`
+const normalizedContent = '---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\nThis is a test note with some words to count.\n'
+
+const mockTab: Tab = { entry: mockEntry, content: mockContent }
+const otherTab: Tab = {
+  entry: { ...mockEntry, path: '/vault/other.md', filename: 'other.md', title: 'Other Note' },
+  content: '# Other\n',
+}
+
+const mockEditor = {
+  document: [{ id: '1', type: 'paragraph', content: [], props: {}, children: [] }],
+  blocksToMarkdownLossy: vi.fn(() => '# Test Project\n\nThis is a test note with some words to count.\n'),
+}
+
+function rememberRawExit(current: string, onContentChange = vi.fn()) {
+  return {
+    onContentChange,
+    result: rememberPendingRawExitContent({
+      activeTabPath: mockEntry.path,
+      activeTabContent: mockContent,
+      rawInitialContent: normalizedContent,
+      rawLatestContentRef: { current },
+      onContentChange,
+    }),
+  }
+}
+
+describe('applyPendingRawExitContent', () => {
+  it('overrides only the matching tab when raw content is newer than tab state', () => {
+    const pending = {
+      path: mockEntry.path,
+      content: '---\ntype: Note\nstatus: Active\n---\n| Head 1 | Head 2 | Head 3 |\n| --- | --- | --- |\n| A | B | C |\n',
+    }
+
+    const result = applyPendingRawExitContent([mockTab, otherTab], pending)
+
+    expect(result[0]).toEqual({ ...mockTab, content: pending.content })
+    expect(result[1]).toBe(otherTab)
+  })
+
+  it('returns the original tabs array when the pending raw content is already synced', () => {
+    const tabs = [mockTab, otherTab]
+    const pending = { path: mockEntry.path, content: mockContent }
+
+    expect(applyPendingRawExitContent(tabs, pending)).toBe(tabs)
+  })
+})
+
+describe('raw-mode sync content guards', () => {
+  it('does not emit a content change when entering raw mode normalizes markdown', () => {
+    const onContentChange = vi.fn()
+    const rawLatestContentRef = { current: null as string | null }
+
+    const result = syncActiveTabIntoRawBuffer({
+      editor: mockEditor as never,
+      activeTabPath: mockEntry.path,
+      activeTabContent: mockContent,
+      rawLatestContentRef,
+    })
+
+    expect(result).toBe('---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\nThis is a test note with some words to count.\n')
+    expect(rawLatestContentRef.current).toBe(result)
+    expect(onContentChange).not.toHaveBeenCalled()
+  })
+
+  it('captures the latest serialized markdown when entering raw mode', () => {
+    const rawLatestContentRef = { current: null as string | null }
+    mockEditor.blocksToMarkdownLossy.mockReturnValueOnce('# Test Project\n\nUpdated body\n')
+
+    const result = syncActiveTabIntoRawBuffer({
+      editor: mockEditor as never,
+      activeTabPath: mockEntry.path,
+      activeTabContent: mockContent,
+      rawLatestContentRef,
+    })
+
+    expect(result).toBe('---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\nUpdated body\n')
+    expect(rawLatestContentRef.current).toBe(result)
+  })
+
+  it('keeps raw-mode serialization portable for vault attachment images', () => {
+    const rawLatestContentRef = { current: null as string | null }
+    mockEditor.blocksToMarkdownLossy.mockReturnValueOnce(
+      '# Test Project\n\n![shot](asset://localhost/%2Fvault%2Fattachments%2Fshot.png)\n',
+    )
+
+    const result = syncActiveTabIntoRawBuffer({
+      editor: mockEditor as never,
+      activeTabPath: mockEntry.path,
+      activeTabContent: mockContent,
+      rawLatestContentRef,
+      vaultPath: '/vault',
+    })
+
+    expect(result).toBe(
+      '---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\n![shot](attachments/shot.png)\n',
+    )
+    expect(rawLatestContentRef.current).toBe(result)
+  })
+
+  it('serializes rich math nodes back to Markdown source when entering raw mode', () => {
+    const rawLatestContentRef = { current: null as string | null }
+    const originalDocument = mockEditor.document
+    const originalSerializer = mockEditor.blocksToMarkdownLossy.getMockImplementation()
+
+    try {
+      mockEditor.document = [
+        {
+          id: 'math-inline',
+          type: 'paragraph',
+          content: [
+            { type: 'text', text: 'Inline ', styles: {} },
+            { type: 'mathInline', props: { latex: 'E=mc^2' } },
+          ],
+          props: {},
+          children: [],
+        },
+        {
+          id: 'math-block',
+          type: 'mathBlock',
+          props: { latex: '\\int_0^1 x\\,dx' },
+          children: [],
+        },
+      ]
+      mockEditor.blocksToMarkdownLossy.mockImplementation((blocks: unknown[]) => (
+        (blocks as Array<{ content?: Array<{ text?: string }> }>)
+          .map((block) => block.content?.map((item) => item.text ?? '').join('') ?? '')
+          .join('\n\n')
+      ))
+
+      const result = syncActiveTabIntoRawBuffer({
+        editor: mockEditor as never,
+        activeTabPath: mockEntry.path,
+        activeTabContent: mockContent,
+        rawLatestContentRef,
+      })
+
+      expect(result).toBe(
+        '---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\nInline $E=mc^2$\n\n$$\n\\int_0^1 x\\,dx\n$$\n',
+      )
+      expect(rawLatestContentRef.current).toBe(result)
+    } finally {
+      mockEditor.document = originalDocument
+      mockEditor.blocksToMarkdownLossy.mockImplementation(originalSerializer)
+    }
+  })
+
+  it('does not emit a content change when leaving raw mode without user edits', () => {
+    const { onContentChange, result } = rememberRawExit(normalizedContent)
+
+    expect(result).toBeNull()
+    expect(onContentChange).not.toHaveBeenCalled()
+  })
+
+  it('emits a content change when leaving raw mode with edited markdown', () => {
+    const editedContent = `${normalizedContent}\nUpdated in raw mode\n`
+    const { onContentChange, result } = rememberRawExit(editedContent)
+
+    expect(result).toEqual({ path: mockEntry.path, content: editedContent })
+    expect(onContentChange).toHaveBeenCalledWith(mockEntry.path, editedContent)
+  })
+})
diff --git a/src/components/Editor.test.tsx b/src/components/Editor.test.tsx
index 1796854f..4b132dc6 100644
--- a/src/components/Editor.test.tsx
+++ b/src/components/Editor.test.tsx
@@ -145,11 +145,6 @@ vi.mock('./tolariaEditorFormatting', () => ({
 }))
 
 import { Editor } from './Editor'
-import {
-  applyPendingRawExitContent,
-  rememberPendingRawExitContent,
-  syncActiveTabIntoRawBuffer,
-} from './editorRawModeSync'
 import type { VaultEntry } from '../types'
 import { bindVaultConfigStore, resetVaultConfigStore } from '../utils/vaultConfigStore'
 import { TooltipProvider } from '@/components/ui/tooltip'
@@ -205,13 +200,6 @@ This is a test note with some words to count.
 `
 
 const mockTab = { entry: mockEntry, content: mockContent }
-const otherEntry: VaultEntry = {
-  ...mockEntry,
-  path: '/vault/other.md',
-  filename: 'other.md',
-  title: 'Other Note',
-}
-const otherTab = { entry: otherEntry, content: '# Other\n' }
 
 const defaultProps = {
   tabs: [] as { entry: VaultEntry; content: string }[],
@@ -806,162 +794,6 @@ describe('Editor', () => {
   })
 })
 
-describe('applyPendingRawExitContent', () => {
-  it('overrides only the matching tab when raw content is newer than tab state', () => {
-    const pending = {
-      path: mockEntry.path,
-      content: '---\ntype: Note\nstatus: Active\n---\n| Head 1 | Head 2 | Head 3 |\n| --- | --- | --- |\n| A | B | C |\n',
-    }
-
-    const result = applyPendingRawExitContent([mockTab, otherTab], pending)
-
-    expect(result[0]).toEqual({ ...mockTab, content: pending.content })
-    expect(result[1]).toBe(otherTab)
-  })
-
-  it('returns the original tabs array when the pending raw content is already synced', () => {
-    const tabs = [mockTab, otherTab]
-    const pending = { path: mockEntry.path, content: mockContent }
-
-    expect(applyPendingRawExitContent(tabs, pending)).toBe(tabs)
-  })
-})
-
-describe('raw-mode sync content guards', () => {
-  it('does not emit a content change when entering raw mode normalizes markdown', () => {
-    const onContentChange = vi.fn()
-    const rawLatestContentRef = { current: null as string | null }
-
-    const result = syncActiveTabIntoRawBuffer({
-      editor: mockEditor as never,
-      activeTabPath: mockEntry.path,
-      activeTabContent: mockContent,
-      rawLatestContentRef,
-    })
-
-    expect(result).toBe('---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\nThis is a test note with some words to count.\n')
-    expect(rawLatestContentRef.current).toBe(result)
-    expect(onContentChange).not.toHaveBeenCalled()
-  })
-
-  it('captures the latest serialized markdown when entering raw mode', () => {
-    const rawLatestContentRef = { current: null as string | null }
-
-    mockEditor.blocksToMarkdownLossy.mockReturnValueOnce('# Test Project\n\nUpdated body\n')
-
-    const result = syncActiveTabIntoRawBuffer({
-      editor: mockEditor as never,
-      activeTabPath: mockEntry.path,
-      activeTabContent: mockContent,
-      rawLatestContentRef,
-    })
-
-    expect(result).toBe('---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\nUpdated body\n')
-    expect(rawLatestContentRef.current).toBe(result)
-  })
-
-  it('keeps raw-mode serialization portable for vault attachment images', () => {
-    const rawLatestContentRef = { current: null as string | null }
-
-    mockEditor.blocksToMarkdownLossy.mockReturnValueOnce(
-      '# Test Project\n\n![shot](asset://localhost/%2Fvault%2Fattachments%2Fshot.png)\n',
-    )
-
-    const result = syncActiveTabIntoRawBuffer({
-      editor: mockEditor as never,
-      activeTabPath: mockEntry.path,
-      activeTabContent: mockContent,
-      rawLatestContentRef,
-      vaultPath: '/vault',
-    })
-
-    expect(result).toBe(
-      '---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\n![shot](attachments/shot.png)\n',
-    )
-    expect(rawLatestContentRef.current).toBe(result)
-  })
-
-  it('serializes rich math nodes back to Markdown source when entering raw mode', () => {
-    const rawLatestContentRef = { current: null as string | null }
-    const originalDocument = mockEditor.document
-    const originalSerializer = mockEditor.blocksToMarkdownLossy.getMockImplementation()
-
-    try {
-      mockEditor.document = [
-        {
-          id: 'math-inline',
-          type: 'paragraph',
-          content: [
-            { type: 'text', text: 'Inline ', styles: {} },
-            { type: 'mathInline', props: { latex: 'E=mc^2' } },
-          ],
-          props: {},
-          children: [],
-        },
-        {
-          id: 'math-block',
-          type: 'mathBlock',
-          props: { latex: '\\int_0^1 x\\,dx' },
-          children: [],
-        },
-      ]
-      mockEditor.blocksToMarkdownLossy.mockImplementation((blocks: unknown[]) => (
-        (blocks as Array<{ content?: Array<{ text?: string }> }>)
-          .map((block) => block.content?.map((item) => item.text ?? '').join('') ?? '')
-          .join('\n\n')
-      ))
-
-      const result = syncActiveTabIntoRawBuffer({
-        editor: mockEditor as never,
-        activeTabPath: mockEntry.path,
-        activeTabContent: mockContent,
-        rawLatestContentRef,
-      })
-
-      expect(result).toBe(
-        '---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\nInline $E=mc^2$\n\n$$\n\\int_0^1 x\\,dx\n$$\n',
-      )
-      expect(rawLatestContentRef.current).toBe(result)
-    } finally {
-      mockEditor.document = originalDocument
-      mockEditor.blocksToMarkdownLossy.mockImplementation(originalSerializer)
-    }
-  })
-
-  it('does not emit a content change when leaving raw mode without user edits', () => {
-    const onContentChange = vi.fn()
-    const normalizedContent = '---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\nThis is a test note with some words to count.\n'
-
-    const result = rememberPendingRawExitContent({
-      activeTabPath: mockEntry.path,
-      activeTabContent: mockContent,
-      rawInitialContent: normalizedContent,
-      rawLatestContentRef: { current: normalizedContent },
-      onContentChange,
-    })
-
-    expect(result).toBeNull()
-    expect(onContentChange).not.toHaveBeenCalled()
-  })
-
-  it('emits a content change when leaving raw mode with edited markdown', () => {
-    const onContentChange = vi.fn()
-    const normalizedContent = '---\ntitle: Test Project\nis_a: Project\nStatus: Active\n---\n# Test Project\n\nThis is a test note with some words to count.\n'
-    const editedContent = `${normalizedContent}\nUpdated in raw mode\n`
-
-    const result = rememberPendingRawExitContent({
-      activeTabPath: mockEntry.path,
-      activeTabContent: mockContent,
-      rawInitialContent: normalizedContent,
-      rawLatestContentRef: { current: editedContent },
-      onContentChange,
-    })
-
-    expect(result).toEqual({ path: mockEntry.path, content: editedContent })
-    expect(onContentChange).toHaveBeenCalledWith(mockEntry.path, editedContent)
-  })
-})
-
 describe('click empty editor space', () => {
   it('focuses editor at end of last block when clicking empty space below content', () => {
     mockEditor.focus.mockClear()
@@ -1147,6 +979,69 @@ describe('wikilink autocomplete', () => {
     ], { updateSelection: true })
   })
 
+  it('prefixes inserted wikilinks when the selected note is in another workspace', async () => {
+    const personalWorkspace = {
+      id: 'personal',
+      label: 'Personal',
+      alias: 'personal',
+      path: '/personal',
+      shortLabel: 'PE',
+      color: null,
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: true,
+    }
+    const teamWorkspace = {
+      id: 'team',
+      label: 'Team',
+      alias: 'team',
+      path: '/team',
+      shortLabel: 'TE',
+      color: null,
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: false,
+    }
+    const source = {
+      ...mockEntry,
+      path: '/personal/source.md',
+      filename: 'source.md',
+      title: 'Source',
+      workspace: personalWorkspace,
+    }
+    const target = {
+      ...mockEntry,
+      path: '/team/projects/alpha.md',
+      filename: 'alpha.md',
+      title: 'Alpha',
+      workspace: teamWorkspace,
+    }
+    capturedGetItems = null
+    mockFilterSuggestionItems.mockImplementation((items: unknown[]) => items)
+    render(
+      <Editor
+        {...defaultProps}
+        tabs={[{ entry: source, content: '# Source\n' }]}
+        activeTabPath={source.path}
+        entries={[source, target]}
+        vaultPath="/personal"
+      />,
+    )
+
+    mockEditor.insertInlineContent.mockClear()
+    const items = await capturedGetItems!('Alpha')
+    expect(items[0].workspace).toBe(teamWorkspace)
+    items[0].onItemClick()
+
+    expect(mockEditor.insertInlineContent).toHaveBeenCalledWith([
+      { type: 'wikilink', props: { target: 'team/projects/alpha' } },
+      ' ',
+    ], { updateSelection: true })
+    mockFilterSuggestionItems.mockImplementation((items: unknown[]) => items)
+  })
+
   it('deduplicates entries with the same path', async () => {
     const dupEntries: VaultEntry[] = [
       { ...mockEntry, title: 'Dup Note', filename: 'dup.md', path: '/vault/dup.md', aliases: [] },
diff --git a/src/components/Editor.tsx b/src/components/Editor.tsx
index 702cd2ea..e82003d5 100644
--- a/src/components/Editor.tsx
+++ b/src/components/Editor.tsx
@@ -8,7 +8,7 @@ import { DEFAULT_AI_AGENT, type AiAgentId, type AiAgentReadiness } from '../lib/
 import type { AiTarget } from '../lib/aiTargets'
 import { translate, type AppLocale } from '../lib/i18n'
 import { RUNTIME_STYLE_NONCE } from '../lib/runtimeStyleNonce'
-import type { VaultEntry, GitCommit, NoteWidthMode, NoteStatus } from '../types'
+import type { VaultEntry, GitCommit, NoteWidthMode, NoteStatus, WorkspaceIdentity } from '../types'
 import type { NoteListItem } from '../utils/ai-context'
 import type { DateDisplayFormat } from '../utils/dateDisplay'
 import type { FrontmatterValue } from './Inspector'
@@ -73,10 +73,12 @@ interface EditorProps {
   onAddProperty?: (path: string, key: string, value: FrontmatterValue, options?: FrontmatterOpOptions) => Promise<void>
   onCreateMissingType?: (path: string, missingType: string, nextTypeName: string) => Promise<boolean | void>
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
+  onChangeWorkspace?: (entry: VaultEntry, workspace: WorkspaceIdentity) => Promise<void> | void
   onInitializeProperties?: (path: string) => void
   showAIChat?: boolean
   onToggleAIChat?: () => void
   vaultPath?: string
+  vaultPaths?: string[]
   noteList?: NoteListItem[]
   noteListFilter?: { type: string | null; query: string }
   onToggleFavorite?: (path: string) => void
@@ -110,6 +112,7 @@ interface EditorProps {
   onFileCreated?: (relativePath: string) => void
   onFileModified?: (relativePath: string) => void
   onVaultChanged?: () => void
+  workspaces?: WorkspaceIdentity[]
   /** Whether the active note has a merge conflict. */
   isConflicted?: boolean
   /** Resolve conflict by keeping the local version. */
@@ -351,6 +354,7 @@ function EditorLayout({
   onArchiveNote,
   onUnarchiveNote,
   vaultPath,
+  vaultPaths,
   rawModeContent,
   findRequest,
   rawLatestContentRef,
@@ -377,10 +381,12 @@ function EditorLayout({
   onAddProperty,
   onCreateMissingType,
   onCreateAndOpenNote,
+  onChangeWorkspace,
   onInitializeProperties,
   onFileCreated,
   onFileModified,
   onVaultChanged,
+  workspaces,
   onUnsupportedAiPaste,
   locale,
   dateDisplayFormat,
@@ -420,6 +426,7 @@ function EditorLayout({
   onArchiveNote?: (path: string) => void
   onUnarchiveNote?: (path: string) => void
   vaultPath?: string
+  vaultPaths?: string[]
   rawModeContent: string | null
   findRequest?: RawEditorFindRequest | null
   rawLatestContentRef: React.MutableRefObject<string | null>
@@ -446,10 +453,12 @@ function EditorLayout({
   onAddProperty?: (path: string, key: string, value: FrontmatterValue, options?: FrontmatterOpOptions) => Promise<void>
   onCreateMissingType?: (path: string, missingType: string, nextTypeName: string) => Promise<boolean | void>
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
+  onChangeWorkspace?: (entry: VaultEntry, workspace: WorkspaceIdentity) => Promise<void> | void
   onInitializeProperties?: (path: string) => void
   onFileCreated?: (relativePath: string) => void
   onFileModified?: (relativePath: string) => void
   onVaultChanged?: () => void
+  workspaces?: WorkspaceIdentity[]
   onUnsupportedAiPaste?: (message: string) => void
   locale?: AppLocale
   dateDisplayFormat?: DateDisplayFormat
@@ -534,6 +543,7 @@ function EditorLayout({
           entries={entries}
           gitHistory={gitHistory}
           vaultPath={vaultPath ?? ''}
+          vaultPaths={vaultPaths}
           noteList={noteList}
           noteListFilter={noteListFilter}
           onToggleInspector={onToggleInspector}
@@ -546,12 +556,14 @@ function EditorLayout({
           onAddProperty={onAddProperty}
           onCreateMissingType={onCreateMissingType}
           onCreateAndOpenNote={onCreateAndOpenNote}
+          onChangeWorkspace={onChangeWorkspace}
           onInitializeProperties={onInitializeProperties}
           onToggleRawEditor={handleToggleRawExclusive}
           onOpenNote={onNavigateWikilink}
           onFileCreated={onFileCreated}
           onFileModified={onFileModified}
           onVaultChanged={onVaultChanged}
+          workspaces={workspaces}
           locale={locale}
           dateDisplayFormat={dateDisplayFormat}
         />
diff --git a/src/components/EditorRightPanel.tsx b/src/components/EditorRightPanel.tsx
index 259d9823..87709721 100644
--- a/src/components/EditorRightPanel.tsx
+++ b/src/components/EditorRightPanel.tsx
@@ -3,7 +3,7 @@ import type { useCreateBlockNote } from '@blocknote/react'
 import { DEFAULT_AI_AGENT, type AiAgentId, type AiAgentReadiness } from '../lib/aiAgents'
 import type { AiTarget } from '../lib/aiTargets'
 import type { AppLocale } from '../lib/i18n'
-import type { VaultEntry, GitCommit } from '../types'
+import type { VaultEntry, GitCommit, WorkspaceIdentity } from '../types'
 import type { NoteListItem } from '../utils/ai-context'
 import type { DateDisplayFormat } from '../utils/dateDisplay'
 import { Inspector, type FrontmatterValue } from './Inspector'
@@ -29,6 +29,7 @@ interface EditorRightPanelProps {
   entries: VaultEntry[]
   gitHistory: GitCommit[]
   vaultPath: string
+  vaultPaths?: string[]
   noteList?: NoteListItem[]
   noteListFilter?: { type: string | null; query: string }
   onToggleInspector: () => void
@@ -41,12 +42,14 @@ interface EditorRightPanelProps {
   onAddProperty?: (path: string, key: string, value: FrontmatterValue, options?: FrontmatterOpOptions) => Promise<void>
   onCreateMissingType?: (path: string, missingType: string, nextTypeName: string) => Promise<boolean | void>
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
+  onChangeWorkspace?: (entry: VaultEntry, workspace: WorkspaceIdentity) => Promise<void> | void
   onInitializeProperties?: (path: string) => void
   onToggleRawEditor?: () => void
   onOpenNote?: (path: string) => void
   onFileCreated?: (relativePath: string) => void
   onFileModified?: (relativePath: string) => void
   onVaultChanged?: () => void
+  workspaces?: WorkspaceIdentity[]
   locale?: AppLocale
   dateDisplayFormat?: DateDisplayFormat
 }
@@ -57,15 +60,18 @@ export function EditorRightPanel({
   defaultAiAgent = DEFAULT_AI_AGENT, defaultAiTarget, defaultAiAgentReadiness, defaultAiAgentReady = true,
   onUnsupportedAiPaste,
   inspectorEntry, inspectorContent, entries, gitHistory, vaultPath,
+  vaultPaths,
   noteList, noteListFilter,
   onToggleInspector, onToggleAIChat, onToggleTableOfContents, onNavigateWikilink, onViewCommitDiff,
-  onUpdateFrontmatter, onDeleteProperty, onAddProperty, onCreateMissingType, onCreateAndOpenNote, onInitializeProperties, onToggleRawEditor, onOpenNote,
+  onUpdateFrontmatter, onDeleteProperty, onAddProperty, onCreateMissingType, onCreateAndOpenNote, onChangeWorkspace, onInitializeProperties, onToggleRawEditor, onOpenNote,
   onFileCreated, onFileModified, onVaultChanged,
+  workspaces,
   locale,
   dateDisplayFormat,
 }: EditorRightPanelProps) {
   const aiPanelController = useAiPanelController({
     vaultPath,
+    vaultPaths,
     defaultAiAgent,
     defaultAiTarget,
     defaultAiAgentReady,
@@ -113,8 +119,10 @@ export function EditorRightPanel({
           onAddProperty={onAddProperty}
           onCreateMissingType={onCreateMissingType}
           onCreateAndOpenNote={onCreateAndOpenNote}
+          onChangeWorkspace={onChangeWorkspace}
           onInitializeProperties={onInitializeProperties}
           onToggleRawEditor={onToggleRawEditor}
+          workspaces={workspaces}
           locale={locale}
           dateDisplayFormat={dateDisplayFormat}
         />
diff --git a/src/components/FolderTree.test.tsx b/src/components/FolderTree.test.tsx
index 7136c601..f7bb42fb 100644
--- a/src/components/FolderTree.test.tsx
+++ b/src/components/FolderTree.test.tsx
@@ -68,6 +68,45 @@ describe('FolderTree', () => {
     expect(screen.getByText('Laputa')).toBeInTheDocument()
   })
 
+  it('renders one scoped root per mounted workspace and selects folders inside that root', () => {
+    const onSelect = vi.fn()
+    const folders: FolderNode[] = [
+      {
+        name: 'Personal',
+        path: '',
+        rootPath: '/Users/luca/Personal',
+        children: [{ name: 'projects', path: 'projects', rootPath: '/Users/luca/Personal', children: [] }],
+      },
+      {
+        name: 'Team',
+        path: '',
+        rootPath: '/Users/luca/Team',
+        children: [{ name: 'projects', path: 'projects', rootPath: '/Users/luca/Team', children: [] }],
+      },
+    ]
+
+    render(
+      <FolderTree
+        folders={folders}
+        selection={defaultSelection}
+        onSelect={onSelect}
+        vaultRootPath="/Users/luca/Personal"
+      />,
+    )
+
+    expect(screen.getByText('Personal')).toBeInTheDocument()
+    expect(screen.getByText('Team')).toBeInTheDocument()
+    expect(screen.getAllByTestId('folder-row:projects')).toHaveLength(2)
+
+    fireEvent.click(screen.getAllByTestId('folder-row:projects')[1])
+
+    expect(onSelect).toHaveBeenCalledWith({
+      kind: 'folder',
+      path: 'projects',
+      rootPath: '/Users/luca/Team',
+    })
+  })
+
   it('lets the vault root collapse and expand from the row', () => {
     vi.useFakeTimers()
     render(
@@ -128,6 +167,22 @@ describe('FolderTree', () => {
     expect(onSelect).toHaveBeenCalledWith({ kind: 'folder', path: '', rootPath: vaultRootPath })
   })
 
+  it('selects child folders with the vault root path attached when the tree has a root', () => {
+    const onSelect = vi.fn()
+    render(
+      <FolderTree
+        folders={mockFolders}
+        selection={defaultSelection}
+        onSelect={onSelect}
+        vaultRootPath={vaultRootPath}
+      />,
+    )
+
+    fireEvent.click(screen.getByTestId('folder-row:areas'))
+
+    expect(onSelect).toHaveBeenCalledWith({ kind: 'folder', path: 'areas', rootPath: vaultRootPath })
+  })
+
   it('expands children when single-clicking a folder row with children', () => {
     vi.useFakeTimers()
     function FolderTreeHarness() {
diff --git a/src/components/FolderTree.tsx b/src/components/FolderTree.tsx
index fff3ea1c..9035bcb8 100644
--- a/src/components/FolderTree.tsx
+++ b/src/components/FolderTree.tsx
@@ -12,6 +12,7 @@ import type { FolderNode, SidebarSelection } from '../types'
 import { FolderContextMenu } from './folder-tree/FolderContextMenu'
 import { FolderNameInput } from './folder-tree/FolderNameInput'
 import { FolderTreeRow } from './folder-tree/FolderTreeRow'
+import { folderNodeKey } from './folder-tree/folderTreeUtils'
 import { useFolderContextMenu } from './folder-tree/useFolderContextMenu'
 import { useFolderTreeDisclosure } from './folder-tree/useFolderTreeDisclosure'
 import { SidebarGroupHeader } from './sidebar/SidebarGroupHeader'
@@ -67,15 +68,27 @@ function buildRootNode(folders: FolderNode[], vaultRootPath: string | undefined,
   return {
     name: vaultRootLabel(vaultRootPath, locale),
     path: '',
+    rootPath: vaultRootPath,
     children: folders,
   }
 }
 
 function useDisplayedFolders(folders: FolderNode[], expanded: Record<string, boolean>, vaultRootPath: string | undefined, locale: AppLocale) {
   return useMemo(() => {
+    if (folders.some((folder) => folder.rootPath)) {
+      const expandedRoots = Object.fromEntries(
+        folders
+          .filter((folder) => folder.path === '' && folder.rootPath)
+          .map((folder) => [folderNodeKey(folder), true]),
+      )
+      return {
+        displayedExpanded: { ...expandedRoots, ...expanded },
+        displayedFolders: folders,
+      }
+    }
     const rootNode = buildRootNode(folders, vaultRootPath, locale)
     return {
-      displayedExpanded: rootNode ? { '': true, ...expanded } : expanded,
+      displayedExpanded: rootNode ? { [folderNodeKey(rootNode)]: true, ...expanded } : expanded,
       displayedFolders: rootNode ? [rootNode] : folders,
     }
   }, [expanded, folders, locale, vaultRootPath])
@@ -211,7 +224,7 @@ function FolderTreeBody({
     <div className="flex flex-col gap-0.5 pb-2">
       {displayedFolders.map((node) => (
         <FolderTreeRow
-          key={node.path}
+          key={folderNodeKey(node)}
           depth={0}
           expanded={displayedExpanded}
           node={node}
diff --git a/src/components/GitRepositorySelect.tsx b/src/components/GitRepositorySelect.tsx
new file mode 100644
index 00000000..c817f7be
--- /dev/null
+++ b/src/components/GitRepositorySelect.tsx
@@ -0,0 +1,48 @@
+import type { GitRepositoryOption } from '../utils/gitRepositories'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select'
+
+interface GitRepositorySelectProps {
+  label: string
+  onChange: (path: string) => void
+  repositories: GitRepositoryOption[]
+  selectedPath: string
+  testId?: string
+}
+
+export function GitRepositorySelect({
+  label,
+  onChange,
+  repositories,
+  selectedPath,
+  testId,
+}: GitRepositorySelectProps) {
+  if (repositories.length <= 1) return null
+
+  return (
+    <label className="flex min-w-0 items-center gap-2 text-[11px] font-medium text-muted-foreground">
+      <span className="shrink-0">{label}</span>
+      <Select value={selectedPath} onValueChange={onChange}>
+        <SelectTrigger
+          size="sm"
+          className="h-7 min-w-0 max-w-44 flex-1 border-border bg-[var(--bg-input)] px-2 text-xs"
+          data-testid={testId}
+        >
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent align="end" className="z-[13000]">
+          {repositories.map((repository) => (
+            <SelectItem key={repository.path} value={repository.path} className="text-xs">
+              {repository.label}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    </label>
+  )
+}
diff --git a/src/components/Inspector.tsx b/src/components/Inspector.tsx
index ef263a11..2c910112 100644
--- a/src/components/Inspector.tsx
+++ b/src/components/Inspector.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import type { VaultEntry, GitCommit } from '../types'
+import type { VaultEntry, GitCommit, WorkspaceIdentity } from '../types'
 import { cn } from '@/lib/utils'
 import { Separator } from './ui/separator'
 import { parseFrontmatter, detectFrontmatterState, detectFrontmatterWarnings } from '../utils/frontmatter'
@@ -37,8 +37,10 @@ interface InspectorProps {
   onAddProperty?: (path: string, key: string, value: FrontmatterValue, options?: FrontmatterOpOptions) => Promise<void>
   onCreateMissingType?: (path: string, missingType: string, nextTypeName: string) => Promise<boolean | void>
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
+  onChangeWorkspace?: (entry: VaultEntry, workspace: WorkspaceIdentity) => Promise<void> | void
   onInitializeProperties?: (path: string) => void
   onToggleRawEditor?: () => void
+  workspaces?: WorkspaceIdentity[]
   locale?: AppLocale
   dateDisplayFormat?: DateDisplayFormat
 }
@@ -68,6 +70,8 @@ function ValidFrontmatterPanels({
   onDeleteProperty,
   onAddProperty,
   onCreateMissingType,
+  onChangeWorkspace,
+  workspaces,
   locale,
   dateDisplayFormat,
 }: {
@@ -83,6 +87,8 @@ function ValidFrontmatterPanels({
   onDeleteProperty?: (key: string) => void
   onAddProperty?: (key: string, value: FrontmatterValue) => void
   onCreateMissingType?: (typeName: string) => Promise<boolean | void>
+  onChangeWorkspace?: (entry: VaultEntry, workspace: WorkspaceIdentity) => Promise<void> | void
+  workspaces?: WorkspaceIdentity[]
   locale: AppLocale
   dateDisplayFormat?: DateDisplayFormat
 }) {
@@ -97,6 +103,8 @@ function ValidFrontmatterPanels({
         onAddProperty={onAddProperty}
         onNavigate={onNavigate}
         onCreateMissingType={onCreateMissingType}
+        onChangeWorkspace={onChangeWorkspace ? (workspace) => onChangeWorkspace(entry, workspace) : undefined}
+        workspaces={workspaces}
         locale={locale}
         dateDisplayFormat={dateDisplayFormat}
       />
@@ -136,6 +144,8 @@ function PrimaryInspectorPanel({
   onDeleteProperty,
   onAddProperty,
   onCreateMissingType,
+  onChangeWorkspace,
+  workspaces,
   locale,
   dateDisplayFormat,
 }: {
@@ -154,6 +164,8 @@ function PrimaryInspectorPanel({
   onDeleteProperty?: (key: string) => void
   onAddProperty?: (key: string, value: FrontmatterValue) => void
   onCreateMissingType?: (typeName: string) => Promise<boolean | void>
+  onChangeWorkspace?: (entry: VaultEntry, workspace: WorkspaceIdentity) => Promise<void> | void
+  workspaces?: WorkspaceIdentity[]
   locale: AppLocale
   dateDisplayFormat?: DateDisplayFormat
 }) {
@@ -172,6 +184,8 @@ function PrimaryInspectorPanel({
         onDeleteProperty={onDeleteProperty}
         onAddProperty={onAddProperty}
         onCreateMissingType={onCreateMissingType}
+        onChangeWorkspace={onChangeWorkspace}
+        workspaces={workspaces}
         locale={locale}
         dateDisplayFormat={dateDisplayFormat}
       />
@@ -197,9 +211,11 @@ function InspectorBody({
   onDeleteProperty,
   onAddProperty,
   onCreateMissingType,
+  onChangeWorkspace,
   onCreateAndOpenNote,
   onInitializeProperties,
   onToggleRawEditor,
+  workspaces,
   locale = 'en',
   dateDisplayFormat,
 }: Omit<InspectorProps, 'collapsed' | 'onToggle'>) {
@@ -244,6 +260,8 @@ function InspectorBody({
           onDeleteProperty={onDeleteProperty ? handleDeleteProperty : undefined}
           onAddProperty={onAddProperty ? handleAddProperty : undefined}
           onCreateMissingType={onCreateMissingType ? handleCreateMissingType : undefined}
+          onChangeWorkspace={onChangeWorkspace}
+          workspaces={workspaces}
           locale={locale}
           dateDisplayFormat={dateDisplayFormat}
         />
diff --git a/src/components/InspectorPanels.test.tsx b/src/components/InspectorPanels.test.tsx
index ac793450..bb2147ac 100644
--- a/src/components/InspectorPanels.test.tsx
+++ b/src/components/InspectorPanels.test.tsx
@@ -37,6 +37,23 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
   ...overrides,
 })
 
+const makeWorkspace = (
+  alias: string,
+  path: string,
+  label = alias,
+): NonNullable<VaultEntry['workspace']> => ({
+  id: alias,
+  label,
+  alias,
+  path,
+  shortLabel: label.slice(0, 2).toUpperCase(),
+  color: null,
+  icon: null,
+  mounted: true,
+  available: true,
+  defaultForNewNotes: false,
+})
+
 describe('DynamicRelationshipsPanel', () => {
   const onNavigate = vi.fn()
   const onAddProperty = vi.fn()
@@ -203,6 +220,40 @@ describe('DynamicRelationshipsPanel', () => {
     expect(onAddProperty).toHaveBeenCalledWith('Related to', '[[topic/ai]]')
   })
 
+  it('prefixes selected cross-workspace relationship targets from the add form', () => {
+    const personal = makeWorkspace('personal', '/personal', 'Personal')
+    const team = makeWorkspace('team', '/team', 'Team')
+    const source = makeEntry({
+      path: '/personal/source.md',
+      filename: 'source.md',
+      title: 'Source',
+      workspace: personal,
+    })
+    const remote = makeEntry({
+      path: '/team/topic/remote.md',
+      filename: 'remote.md',
+      title: 'Remote',
+      workspace: team,
+    })
+
+    renderRelationshipsPanel({
+      entry: source,
+      entries: [source, remote, ...entries],
+      vaultPath: '/personal',
+      onAddProperty,
+    })
+    fireEvent.click(screen.getByText('+ Add relationship'))
+    fireEvent.change(screen.getByPlaceholderText('Relationship name'), { target: { value: 'Mentions' } })
+    const noteInput = screen.getByPlaceholderText('Note title')
+    fireEvent.focus(noteInput)
+    fireEvent.change(noteInput, { target: { value: 'Remote' } })
+    expect(screen.getByTestId('note-search-workspace-badge')).toHaveTextContent('TE')
+    fireEvent.click(screen.getByText('Remote'))
+    fireEvent.click(screen.getByTestId('submit-add-relationship'))
+
+    expect(onAddProperty).toHaveBeenCalledWith('Mentions', '[[team/topic/remote]]')
+  })
+
   it('cancels add relationship form', () => {
     renderRelationshipsPanel({ onAddProperty })
     fireEvent.click(screen.getByText('+ Add relationship'))
@@ -381,6 +432,33 @@ describe('DynamicRelationshipsPanel', () => {
       expect(screen.queryByTestId('add-relation-ref-input')).not.toBeInTheDocument()
     })
 
+    it('prefixes inline cross-workspace relationship targets with the target workspace alias', () => {
+      const personal = makeWorkspace('personal', '/personal', 'Personal')
+      const team = makeWorkspace('team', '/team', 'Team')
+      const source = makeEntry({
+        path: '/personal/source.md',
+        filename: 'source.md',
+        title: 'Source',
+        workspace: personal,
+      })
+      const remote = makeEntry({
+        path: '/team/topic/remote.md',
+        filename: 'remote.md',
+        title: 'Remote',
+        workspace: team,
+      })
+
+      renderEditableRelationships({
+        entry: source,
+        entries: [source, remote, ...entries],
+        vaultPath: '/personal',
+      })
+      const input = openInlineAdd('Remote')
+      fireEvent.keyDown(input, { key: 'Enter' })
+
+      expect(onUpdateProperty).toHaveBeenCalledWith('Belongs to', ['[[project/my-project]]', '[[team/topic/remote]]'])
+    })
+
     it('does not add duplicate refs', () => {
       renderEditableRelationships({ frontmatter: { 'Belongs to': ['[[topic/ai]]'] } })
       const input = openInlineAdd('AI')
diff --git a/src/components/NoteAutocomplete.tsx b/src/components/NoteAutocomplete.tsx
index 268c264a..ad294e73 100644
--- a/src/components/NoteAutocomplete.tsx
+++ b/src/components/NoteAutocomplete.tsx
@@ -12,11 +12,12 @@ import {
   type SVGAttributes,
 } from 'react'
 import { Input } from '@/components/ui/input'
-import type { VaultEntry } from '../types'
+import type { VaultEntry, WorkspaceIdentity } from '../types'
 import { getTypeColor, getTypeLightColor } from '../utils/typeColors'
 import { scrollSelectedHTMLChildIntoView } from '../utils/domScroll'
 import { getTypeIcon } from './NoteItem'
 import { NoteTitleIcon } from './NoteTitleIcon'
+import { WorkspaceInitialsBadge } from './WorkspaceInitialsBadge'
 import './WikilinkSuggestionMenu.css'
 
 const MIN_QUERY_LENGTH = 2
@@ -43,6 +44,7 @@ interface MatchedEntry {
   typeColor?: string
   typeLightColor?: string
   TypeIcon?: ComponentType<SVGAttributes<SVGSVGElement>>
+  workspace?: WorkspaceIdentity | null
 }
 
 interface OpenAutocompleteKeyContext {
@@ -61,7 +63,11 @@ function entryMatchesQuery(entry: VaultEntry, lowerQuery: string): boolean {
     || entry.aliases.some(alias => alias.toLowerCase().includes(lowerQuery))
 }
 
-function buildMatchedEntry(entry: VaultEntry, typeEntryMap: Record<string, VaultEntry>): MatchedEntry {
+function shouldShowWorkspaceBadge(entries: VaultEntry[]): boolean {
+  return new Set(entries.map((entry) => entry.workspace?.alias).filter(Boolean)).size > 1
+}
+
+function buildMatchedEntry(entry: VaultEntry, typeEntryMap: Record<string, VaultEntry>, showWorkspace: boolean): MatchedEntry {
   const isA = entry.isA
   const typeEntry = Reflect.get(typeEntryMap, isA ?? '') as VaultEntry | undefined
   const noteType = isA || undefined
@@ -72,16 +78,18 @@ function buildMatchedEntry(entry: VaultEntry, typeEntryMap: Record<string, Vault
     typeColor: noteType ? getTypeColor(isA, typeEntry?.color) : undefined,
     typeLightColor: noteType ? getTypeLightColor(isA, typeEntry?.color) : undefined,
     TypeIcon: noteType ? getTypeIcon(isA, typeEntry?.icon) : undefined,
+    workspace: showWorkspace ? entry.workspace ?? null : null,
   }
 }
 
 function matchEntries(entries: VaultEntry[], typeEntryMap: Record<string, VaultEntry>, query: string): MatchedEntry[] {
   if (query.length < MIN_QUERY_LENGTH) return []
   const lowerQuery = query.toLowerCase()
+  const showWorkspace = shouldShowWorkspaceBadge(entries)
   return entries
     .filter(entry => entryMatchesQuery(entry, lowerQuery))
     .slice(0, MAX_RESULTS)
-    .map(entry => buildMatchedEntry(entry, typeEntryMap))
+    .map(entry => buildMatchedEntry(entry, typeEntryMap, showWorkspace))
 }
 
 function resolveOpenAutocompleteKeyAction(key: string): AutocompleteKeyAction | null {
@@ -205,7 +213,7 @@ function NoteAutocompleteMenuItem({
       onClick={() => onSelect(item.title)}
       onMouseEnter={onHover}
     >
-      <span className="wikilink-menu__title" style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+      <span className="wikilink-menu__title" style={{ display: 'flex', alignItems: 'center', gap: 6, flex: 1, minWidth: 0 }}>
         {item.TypeIcon && <item.TypeIcon width={14} height={14} style={{ color: item.typeColor, flexShrink: 0 }} />}
         <NoteTitleIcon icon={item.noteIcon} size={14} />
         {item.title}
@@ -215,6 +223,7 @@ function NoteAutocompleteMenuItem({
           {item.noteType}
         </span>
       )}
+      <WorkspaceInitialsBadge workspace={item.workspace} testId="note-autocomplete-workspace-badge" />
     </div>
   )
 }
diff --git a/src/components/NoteItem.test.tsx b/src/components/NoteItem.test.tsx
index fbc3f943..cf738708 100644
--- a/src/components/NoteItem.test.tsx
+++ b/src/components/NoteItem.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, fireEvent } from '@testing-library/react'
+import { render, screen, fireEvent, within } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { NoteItem } from './NoteItem'
 import { makeEntry } from '../test-utils/noteListTestUtils'
@@ -241,6 +241,66 @@ describe('NoteItem', () => {
     expect(dateRow).toHaveTextContent('Created April 5, 2025')
   })
 
+  it('shows the workspace badge after the creation date as an outlined badge', () => {
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date(NOW_SECONDS * 1000))
+    const personalWorkspace = {
+      id: 'personal',
+      label: 'Personal',
+      alias: 'personal',
+      path: '/personal',
+      shortLabel: 'PE',
+      color: 'blue',
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: true,
+    }
+    const launchWorkspace = {
+      id: 'launch',
+      label: 'Launch',
+      alias: 'launch',
+      path: '/launch',
+      shortLabel: 'LA',
+      color: 'red',
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: false,
+    }
+    const entry = makeEntry({
+      title: 'Campaigns',
+      createdAt: NOW_SECONDS - 600,
+      modifiedAt: NOW_SECONDS - 600,
+      workspace: launchWorkspace,
+    })
+    const otherEntry = makeEntry({
+      path: '/personal/other.md',
+      filename: 'other.md',
+      title: 'Other',
+      workspace: personalWorkspace,
+    })
+
+    render(
+      <NoteItem
+        entry={entry}
+        isSelected={false}
+        typeEntryMap={{}}
+        allEntries={[entry, otherEntry]}
+        onClickNote={vi.fn()}
+      />,
+    )
+
+    const dateRow = screen.getByTestId('note-date-row')
+    const badge = within(dateRow).getByTestId('workspace-badge')
+    expect(screen.getByTestId('note-title-row')).not.toContainElement(badge)
+    expect(dateRow).toHaveTextContent('Created 10m ago')
+    expect(badge).toHaveTextContent('LA')
+    expect(badge).toHaveClass('-mr-1.5', 'border', 'bg-transparent', 'opacity-75')
+    expect(badge.getAttribute('style')).toContain('border-color: var(--accent-red)')
+    expect(badge.getAttribute('style')).toContain('color: var(--accent-red)')
+  })
+
   it('leaves the right side empty when no creation date exists', () => {
     vi.useFakeTimers()
     vi.setSystemTime(new Date(NOW_SECONDS * 1000))
diff --git a/src/components/NoteItem.tsx b/src/components/NoteItem.tsx
index 25b4a163..a43db782 100644
--- a/src/components/NoteItem.tsx
+++ b/src/components/NoteItem.tsx
@@ -15,6 +15,7 @@ import { NoteTitleIcon } from './NoteTitleIcon'
 import { PropertyChips } from './note-item/PropertyChips'
 import { ChangeNoteContent } from './note-item/ChangeNoteContent'
 import { workspaceForEntry } from '../utils/workspaces'
+import { WorkspaceInitialsBadge } from './WorkspaceInitialsBadge'
 
 const TYPE_ICON_MAP: Record<string, ComponentType<SVGAttributes<SVGSVGElement>>> = {
   Project: Wrench,
@@ -73,17 +74,7 @@ function WorkspaceBadge({ entry, allEntries }: { entry: VaultEntry; allEntries:
   const workspace = workspaceForEntry(entry)
   const hasMultipleWorkspaces = new Set(allEntries.map((candidate) => candidate.workspace?.alias).filter(Boolean)).size > 1
   if (!workspace || !hasMultipleWorkspaces) return null
-
-  return (
-    <span
-      className="ml-1.5 inline-flex h-[16px] min-w-[18px] items-center justify-center rounded-sm px-1 align-middle text-[9px] font-semibold text-white"
-      style={{ background: workspace.color ? `var(--accent-${workspace.color})` : 'var(--muted-foreground)' }}
-      title={`${workspace.label} (${workspace.alias})`}
-      aria-label={`Workspace ${workspace.label}`}
-    >
-      {workspace.shortLabel}
-    </span>
-  )
+  return <WorkspaceInitialsBadge workspace={workspace} className="-mr-1.5" testId="workspace-badge" />
 }
 
 type NoteItemVisualState = {
@@ -214,7 +205,6 @@ function InteractiveNoteDetails({
     <>
       <NoteTitleRow
         entry={entry}
-        allEntries={allEntries}
         isBinary={false}
         isSelected={isSelected}
         noteStatus={noteStatus}
@@ -228,7 +218,7 @@ function InteractiveNoteDetails({
         dateDisplayFormat={dateDisplayFormat}
         onClickNote={onClickNote}
       />
-      <NoteDateRow entry={entry} dateDisplayFormat={dateDisplayFormat} />
+      <NoteDateRow entry={entry} allEntries={allEntries} dateDisplayFormat={dateDisplayFormat} />
     </>
   )
 }
@@ -279,7 +269,6 @@ function StandardNoteContent({
         {isBinary ? (
           <NoteTitleRow
             entry={entry}
-            allEntries={allEntries}
             isBinary={isUnavailableBinary}
             isSelected={isSelected}
             noteStatus={noteStatus}
@@ -303,23 +292,23 @@ function StandardNoteContent({
 
 function NoteTitleRow({
   entry,
-  allEntries,
   isBinary,
   isSelected,
   noteStatus,
 }: {
   entry: VaultEntry
-  allEntries: VaultEntry[]
   isBinary: boolean
   isSelected: boolean
   noteStatus: NoteStatus
 }) {
   return (
-    <div className={cn('truncate pr-5 text-[13px]', isBinary ? 'text-muted-foreground' : 'text-foreground', isSelected && !isBinary ? 'font-semibold' : 'font-medium')}>
+    <div
+      className={cn('truncate pr-5 text-[13px]', isBinary ? 'text-muted-foreground' : 'text-foreground', isSelected && !isBinary ? 'font-semibold' : 'font-medium')}
+      data-testid="note-title-row"
+    >
       {hasStatusDot(noteStatus) && !isBinary && <StatusDot noteStatus={noteStatus} />}
       <NoteTitleIcon icon={entry.icon} size={15} className="mr-1" testId="note-title-icon" />
       {entry.title}
-      <WorkspaceBadge entry={entry} allEntries={allEntries} />
       {!isBinary && <StateBadge archived={entry.archived} />}
     </div>
   )
@@ -327,9 +316,11 @@ function NoteTitleRow({
 
 function NoteDateRow({
   entry,
+  allEntries,
   dateDisplayFormat,
 }: {
   entry: VaultEntry
+  allEntries: VaultEntry[]
   dateDisplayFormat: DateDisplayFormat
 }) {
   const modifiedLabel = formatTimestampForDateDisplay(getDisplayDate(entry), dateDisplayFormat)
@@ -340,7 +331,10 @@ function NoteDateRow({
   return (
     <div className="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-3 text-[10px] text-muted-foreground" data-testid="note-date-row">
       <span>{modifiedLabel}</span>
-      {createdLabel && <span className="justify-self-end text-right">{createdLabel}</span>}
+      <span className="flex min-w-0 items-center justify-end gap-1.5 text-right">
+        {createdLabel && <span>{createdLabel}</span>}
+        <WorkspaceBadge entry={entry} allEntries={allEntries} />
+      </span>
     </div>
   )
 }
diff --git a/src/components/NoteList.changes.test.tsx b/src/components/NoteList.changes.test.tsx
index d00d7fec..089e04a4 100644
--- a/src/components/NoteList.changes.test.tsx
+++ b/src/components/NoteList.changes.test.tsx
@@ -40,6 +40,22 @@ describe('NoteList changes view', () => {
     expect(screen.getByText('Changes')).toBeInTheDocument()
   })
 
+  it('shows a repository selector in changes view when multiple repositories are available', () => {
+    renderNoteList({
+      selection: changesSelection,
+      modifiedFiles,
+      gitRepositories: [
+        { path: '/default', label: 'Default', defaultForNewNotes: true },
+        { path: '/work', label: 'Work', defaultForNewNotes: false },
+      ],
+      selectedGitRepositoryPath: '/work',
+      onGitRepositoryChange: vi.fn(),
+    })
+
+    expect(screen.getByTestId('changes-repository-select')).toBeInTheDocument()
+    expect(screen.getByText('Work')).toBeInTheDocument()
+  })
+
   it('shows an empty state when no modified files exist', () => {
     renderNoteList({ selection: changesSelection, modifiedFiles: [] })
     expect(screen.getByText('No pending changes')).toBeInTheDocument()
diff --git a/src/components/NoteSearchList.test.tsx b/src/components/NoteSearchList.test.tsx
index 66cbb2fc..29aae475 100644
--- a/src/components/NoteSearchList.test.tsx
+++ b/src/components/NoteSearchList.test.tsx
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent } from '@testing-library/react'
+import { render, screen, fireEvent, createEvent } from '@testing-library/react'
 import { NoteSearchList } from './NoteSearchList'
 import type { NoteSearchResultItem } from './NoteSearchList'
 
@@ -16,6 +16,19 @@ const items: TestItem[] = [
   { id: '3', title: 'Gamma Experiment', noteType: 'Experiment' },
 ]
 
+const teamWorkspace = {
+  id: 'team',
+  label: 'Team',
+  alias: 'team',
+  path: '/team',
+  shortLabel: 'TE',
+  color: 'green',
+  icon: null,
+  mounted: true,
+  available: true,
+  defaultForNewNotes: false,
+}
+
 describe('NoteSearchList', () => {
   const onItemClick = vi.fn()
   const onItemHover = vi.fn()
@@ -79,6 +92,25 @@ describe('NoteSearchList', () => {
     expect(badge.style.backgroundColor).toBe('var(--accent-blue-light)')
   })
 
+  it('shows workspace initials at the far right when workspace metadata is present', () => {
+    render(
+      <NoteSearchList
+        items={[{ ...items[0], workspace: teamWorkspace }]}
+        selectedIndex={0}
+        getItemKey={(item) => item.id}
+        onItemClick={onItemClick}
+      />,
+    )
+
+    const typeBadge = screen.getByText('Project')
+    const workspaceBadge = screen.getByTestId('note-search-workspace-badge')
+    const row = workspaceBadge.closest('div')!
+    expect(workspaceBadge).toHaveTextContent('TE')
+    expect(typeBadge.compareDocumentPosition(workspaceBadge) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+    expect(row).toContainElement(workspaceBadge)
+    expect(workspaceBadge.getAttribute('style')).toContain('border-color: var(--accent-green)')
+  })
+
   it('shows empty message when no items', () => {
     render(
       <NoteSearchList
@@ -117,6 +149,41 @@ describe('NoteSearchList', () => {
     expect(onItemClick).toHaveBeenCalledWith(items[1], 1)
   })
 
+  it('can activate an item on mouse down for transient popovers', () => {
+    render(
+      <NoteSearchList
+        items={items}
+        selectedIndex={0}
+        getItemKey={(item) => item.id}
+        onItemClick={onItemClick}
+        activateOnMouseDown
+      />,
+    )
+
+    fireEvent.mouseDown(screen.getByText('Beta Notes'))
+    fireEvent.click(screen.getByText('Beta Notes'))
+
+    expect(onItemClick).toHaveBeenCalledTimes(1)
+    expect(onItemClick).toHaveBeenCalledWith(items[1], 1)
+  })
+
+  it('keeps focus on the current editor/input while clicking an item', () => {
+    render(
+      <NoteSearchList
+        items={items}
+        selectedIndex={0}
+        getItemKey={(item) => item.id}
+        onItemClick={onItemClick}
+      />,
+    )
+    const mouseDown = createEvent.mouseDown(screen.getByText('Beta Notes'))
+    const preventDefault = vi.spyOn(mouseDown, 'preventDefault')
+
+    fireEvent(screen.getByText('Beta Notes'), mouseDown)
+
+    expect(preventDefault).toHaveBeenCalledOnce()
+  })
+
   it('calls onItemHover when mouse enters an item', () => {
     render(
       <NoteSearchList
diff --git a/src/components/NoteSearchList.tsx b/src/components/NoteSearchList.tsx
index e34b0894..577f7254 100644
--- a/src/components/NoteSearchList.tsx
+++ b/src/components/NoteSearchList.tsx
@@ -1,8 +1,10 @@
-import { useRef, useEffect, type ComponentType, type SVGAttributes } from 'react'
+import { useRef, useEffect, type ComponentType, type MouseEvent, type PointerEvent, type SVGAttributes } from 'react'
 import { cn } from '@/lib/utils'
 import { Badge } from '@/components/ui/badge'
 import { scrollSelectedHTMLChildIntoView } from '../utils/domScroll'
 import { NoteTitleIcon } from './NoteTitleIcon'
+import { WorkspaceInitialsBadge } from './WorkspaceInitialsBadge'
+import type { WorkspaceIdentity } from '../types'
 
 export interface NoteSearchResultItem {
   title: string
@@ -11,6 +13,7 @@ export interface NoteSearchResultItem {
   typeColor?: string
   typeLightColor?: string
   TypeIcon?: ComponentType<SVGAttributes<SVGSVGElement>>
+  workspace?: WorkspaceIdentity | null
 }
 
 interface NoteSearchListProps<T extends NoteSearchResultItem> {
@@ -19,6 +22,7 @@ interface NoteSearchListProps<T extends NoteSearchResultItem> {
   getItemKey: (item: T, index: number) => string
   onItemClick: (item: T, index: number) => void
   onItemHover?: (index: number) => void
+  activateOnMouseDown?: boolean
   emptyMessage?: string
   className?: string
 }
@@ -29,6 +33,7 @@ interface NoteSearchListItemProps<T extends NoteSearchResultItem> {
   selected: boolean
   onItemClick: (item: T, index: number) => void
   onItemHover?: (index: number) => void
+  activateOnMouseDown?: boolean
 }
 
 function NoteSearchListItem<T extends NoteSearchResultItem>({
@@ -37,14 +42,43 @@ function NoteSearchListItem<T extends NoteSearchResultItem>({
   selected,
   onItemClick,
   onItemHover,
+  activateOnMouseDown,
 }: NoteSearchListItemProps<T>) {
+  const pressActivatedRef = useRef(false)
+
+  const activateFromPress = (event: MouseEvent<HTMLDivElement> | PointerEvent<HTMLDivElement>) => {
+    event.preventDefault()
+    if (!activateOnMouseDown) return
+
+    event.stopPropagation()
+    if (pressActivatedRef.current) return
+
+    pressActivatedRef.current = true
+    window.setTimeout(() => {
+      pressActivatedRef.current = false
+    }, 0)
+    onItemClick(item, index)
+  }
+
+  const handleClick = (event: MouseEvent<HTMLDivElement>) => {
+    if (activateOnMouseDown) {
+      event.preventDefault()
+      event.stopPropagation()
+      return
+    }
+
+    onItemClick(item, index)
+  }
+
   return (
     <div
       className={cn(
         'flex cursor-pointer items-center justify-between gap-2 px-3 py-1.5 transition-colors',
         selected ? 'bg-accent' : 'hover:bg-secondary',
       )}
-      onClick={() => onItemClick(item, index)}
+      onPointerDownCapture={activateFromPress}
+      onMouseDownCapture={activateFromPress}
+      onClick={handleClick}
       onMouseEnter={() => onItemHover?.(index)}
     >
       <span className="flex min-w-0 flex-1 items-center gap-1.5 truncate text-sm text-foreground">
@@ -59,14 +93,19 @@ function NoteSearchListItem<T extends NoteSearchResultItem>({
         <NoteTitleIcon icon={item.noteIcon} size={14} testId="note-search-item-icon" />
         <span className="truncate">{item.title}</span>
       </span>
-      {item.noteType && (
-        <Badge
-          variant="secondary"
-          className="shrink-0 text-[11px]"
-          style={item.typeColor ? { color: item.typeColor, backgroundColor: item.typeLightColor } : undefined}
-        >
-          {item.noteType}
-        </Badge>
+      {(item.noteType || item.workspace) && (
+        <span className="ml-2 flex shrink-0 items-center gap-1.5">
+          {item.noteType && (
+            <Badge
+              variant="secondary"
+              className="shrink-0 text-[11px]"
+              style={item.typeColor ? { color: item.typeColor, backgroundColor: item.typeLightColor } : undefined}
+            >
+              {item.noteType}
+            </Badge>
+          )}
+          <WorkspaceInitialsBadge workspace={item.workspace} testId="note-search-workspace-badge" />
+        </span>
       )}
     </div>
   )
@@ -78,6 +117,7 @@ export function NoteSearchList<T extends NoteSearchResultItem>({
   getItemKey,
   onItemClick,
   onItemHover,
+  activateOnMouseDown,
   emptyMessage = 'No results',
   className,
 }: NoteSearchListProps<T>) {
@@ -107,6 +147,7 @@ export function NoteSearchList<T extends NoteSearchResultItem>({
           selected={i === selectedIndex}
           onItemClick={onItemClick}
           onItemHover={onItemHover}
+          activateOnMouseDown={activateOnMouseDown}
         />
       ))}
     </div>
diff --git a/src/components/PulseView.test.tsx b/src/components/PulseView.test.tsx
index e0ac280c..a8af8cd2 100644
--- a/src/components/PulseView.test.tsx
+++ b/src/components/PulseView.test.tsx
@@ -269,6 +269,25 @@ describe('PulseView', () => {
     })
   })
 
+  it('shows a repository selector in the History header when multiple repositories are available', async () => {
+    mockInvokeFn.mockResolvedValue([])
+
+    render(
+      <PulseView
+        vaultPath="/work"
+        repositories={[
+          { path: '/default', label: 'Default', defaultForNewNotes: true },
+          { path: '/work', label: 'Work', defaultForNewNotes: false },
+        ]}
+        selectedRepositoryPath="/work"
+        onRepositoryChange={vi.fn()}
+      />,
+    )
+
+    expect(await screen.findByTestId('pulse-repository-select')).toBeInTheDocument()
+    expect(screen.getByText('Work')).toBeInTheDocument()
+  })
+
   it('wires the Pulse header into the shared drag-region handler', async () => {
     mockInvokeFn.mockResolvedValue([])
 
diff --git a/src/components/PulseView.tsx b/src/components/PulseView.tsx
index 59c2d56a..b40daafc 100644
--- a/src/components/PulseView.tsx
+++ b/src/components/PulseView.tsx
@@ -6,6 +6,8 @@ import { useDragRegion } from '../hooks/useDragRegion'
 import type { PulseCommit, PulseFile } from '../types'
 import { relativeDate } from '../utils/noteListHelpers'
 import { getLocaleDateLocale, translate, type AppLocale } from '../lib/i18n'
+import { GitRepositorySelect } from './GitRepositorySelect'
+import type { GitRepositoryOption } from '../utils/gitRepositories'
 import {
   Plus, Minus, PencilSimple, GitCommit, ArrowSquareOut,
   FileText, CaretDown, CaretRight, Pulse,
@@ -20,6 +22,9 @@ interface PulseViewProps {
   onOpenNote?: (relativePath: string, commitHash?: string) => void
   sidebarCollapsed?: boolean
   onExpandSidebar?: () => void
+  repositories?: GitRepositoryOption[]
+  selectedRepositoryPath?: string
+  onRepositoryChange?: (path: string) => void
   locale?: AppLocale
 }
 
@@ -293,6 +298,27 @@ function PulseHeader({
   )
 }
 
+function PulseRepositoryRow({
+  repositories = [],
+  selectedRepositoryPath = '',
+  onRepositoryChange,
+  locale = 'en',
+}: Pick<PulseViewProps, 'repositories' | 'selectedRepositoryPath' | 'onRepositoryChange' | 'locale'>) {
+  if (!onRepositoryChange || !selectedRepositoryPath || repositories.length <= 1) return null
+
+  return (
+    <div className="flex h-11 shrink-0 items-center border-b border-border px-4" style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}>
+      <GitRepositorySelect
+        label={translate(locale, 'git.repository.select')}
+        repositories={repositories}
+        selectedPath={selectedRepositoryPath}
+        onChange={onRepositoryChange}
+        testId="pulse-repository-select"
+      />
+    </div>
+  )
+}
+
 function EmptyState({ locale = 'en' }: { locale?: AppLocale }) {
   return (
     <div className="flex flex-1 flex-col items-center justify-center text-muted-foreground" style={{ padding: 32 }}>
@@ -379,7 +405,16 @@ function PulseFeed({
 
 const PAGE_SIZE = 20
 
-export const PulseView = memo(function PulseView({ vaultPath, onOpenNote, sidebarCollapsed, onExpandSidebar, locale = 'en' }: PulseViewProps) {
+export const PulseView = memo(function PulseView({
+  vaultPath,
+  onOpenNote,
+  sidebarCollapsed,
+  onExpandSidebar,
+  repositories,
+  selectedRepositoryPath,
+  onRepositoryChange,
+  locale = 'en',
+}: PulseViewProps) {
   const [commits, setCommits] = useState<PulseCommit[]>([])
   const [loading, setLoading] = useState(true)
   const [loadingMore, setLoadingMore] = useState(false)
@@ -442,7 +477,17 @@ export const PulseView = memo(function PulseView({ vaultPath, onOpenNote, sideba
 
   return (
     <div className="flex h-full flex-col overflow-hidden border-r border-[var(--sidebar-border)] bg-background">
-      <PulseHeader sidebarCollapsed={sidebarCollapsed} locale={locale} onExpandSidebar={onExpandSidebar} />
+      <PulseHeader
+        sidebarCollapsed={sidebarCollapsed}
+        locale={locale}
+        onExpandSidebar={onExpandSidebar}
+      />
+      <PulseRepositoryRow
+        repositories={repositories}
+        selectedRepositoryPath={selectedRepositoryPath}
+        locale={locale}
+        onRepositoryChange={onRepositoryChange}
+      />
 
       <div className="flex-1 overflow-y-auto">
         <PulseFeed
diff --git a/src/components/RawEditorView.tsx b/src/components/RawEditorView.tsx
index da796de1..6f4899df 100644
--- a/src/components/RawEditorView.tsx
+++ b/src/components/RawEditorView.tsx
@@ -27,6 +27,7 @@ export interface RawEditorViewProps {
   content: string
   path: string
   entries: VaultEntry[]
+  sourceEntry?: VaultEntry
   onContentChange: (path: string, content: string) => void
   vaultPath?: string
   onSave: () => void
@@ -200,12 +201,14 @@ function getRawEditorAutocompleteDirection(key: string): RawEditorAutocompleteDi
 function buildNextRawEditorAutocomplete({
   baseItems,
   insertWikilinkRef,
+  sourceEntry,
   typeEntryMap,
   vaultPath,
   view,
 }: {
   baseItems: ReturnType<typeof buildRawEditorBaseItems>
   insertWikilinkRef: React.MutableRefObject<(target: string) => void>
+  sourceEntry?: VaultEntry
   typeEntryMap: RawEditorTypeEntryMap
   vaultPath?: string
   view: EditorView
@@ -221,6 +224,7 @@ function buildNextRawEditorAutocomplete({
     query,
     typeEntryMap,
     onInsertTarget: (target: string) => insertWikilinkRef.current(target),
+    sourceEntry,
     vaultPath: vaultPath ?? '',
   })
 }
@@ -258,8 +262,9 @@ function useRawEditorAutocompleteKeyboard(
 
 function useRawEditorAutocompleteController({
   entries,
+  sourceEntry,
   vaultPath,
-}: Pick<RawEditorViewProps, 'entries' | 'vaultPath'>) {
+}: Pick<RawEditorViewProps, 'entries' | 'sourceEntry' | 'vaultPath'>) {
   const [autocomplete, setAutocomplete] = useState<RawEditorAutocompleteState | null>(null)
   const typeEntryMap = useMemo(() => buildTypeEntryMap(entries), [entries])
   const baseItems = useMemo(() => buildRawEditorBaseItems(entries), [entries])
@@ -269,11 +274,12 @@ function useRawEditorAutocompleteController({
     setAutocomplete(buildNextRawEditorAutocomplete({
       baseItems,
       insertWikilinkRef,
+      sourceEntry,
       typeEntryMap,
       vaultPath,
       view,
     }))
-  }, [baseItems, typeEntryMap, vaultPath])
+  }, [baseItems, sourceEntry, typeEntryMap, vaultPath])
 
   const handleItemHover = useCallback((index: number) => {
     setAutocomplete(prev => prev ? { ...prev, selectedIndex: index } : null)
@@ -386,7 +392,7 @@ function useRawEditorPlainTextPasteTarget({
   }, [])
 }
 
-export function RawEditorView({ content, path, entries, onContentChange, onSave, latestContentRef, vaultPath, locale = 'en', findRequest }: RawEditorViewProps) {
+export function RawEditorView({ content, path, entries, sourceEntry, onContentChange, onSave, latestContentRef, vaultPath, locale = 'en', findRequest }: RawEditorViewProps) {
   const containerRef = useRef<HTMLDivElement>(null)
   const [rawDoc, setRawDoc] = useState(content)
   const [findOpen, setFindOpen] = useState(false)
@@ -400,7 +406,7 @@ export function RawEditorView({ content, path, entries, onContentChange, onSave,
     handleItemHover,
     insertWikilinkRef,
     setAutocomplete,
-  } = useRawEditorAutocompleteController({ entries, vaultPath })
+  } = useRawEditorAutocompleteController({ entries, sourceEntry, vaultPath })
   const handleDocChange = useCallback((doc: string) => {
     setRawDoc(doc)
     pendingChanges.handleDocChange(doc)
diff --git a/src/components/SearchPanel.test.tsx b/src/components/SearchPanel.test.tsx
index 47524fa9..7c8e579e 100644
--- a/src/components/SearchPanel.test.tsx
+++ b/src/components/SearchPanel.test.tsx
@@ -287,6 +287,57 @@ describe('SearchPanel', () => {
     })
   })
 
+  it('shows workspace initials at the far right instead of prefixing result titles', async () => {
+    const personalWorkspace = {
+      id: 'personal',
+      label: 'Personal',
+      alias: 'personal',
+      path: '/personal',
+      shortLabel: 'PE',
+      color: 'blue',
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: true,
+    }
+    const teamWorkspace = {
+      id: 'team',
+      label: 'Team',
+      alias: 'team',
+      path: '/team',
+      shortLabel: 'TE',
+      color: 'green',
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: false,
+    }
+    const workspaceEntries = [
+      { ...MOCK_ENTRIES[0], path: '/team/essay/ai-apis.md', workspace: teamWorkspace },
+      { ...MOCK_ENTRIES[1], path: '/personal/event/retreat.md', workspace: personalWorkspace },
+    ]
+    mockInvokeFn.mockResolvedValue({
+      results: [
+        { title: 'How to Design AI-first APIs', path: '/team/essay/ai-apis.md', snippet: 'Content', score: 0.9, note_type: null },
+      ],
+      elapsed_ms: 20,
+    })
+
+    render(
+      <SearchPanel open={true} vaultPath="/personal" entries={workspaceEntries} onSelectNote={vi.fn()} onClose={vi.fn()} />,
+    )
+
+    fireEvent.change(screen.getByPlaceholderText('Search in all notes...'), { target: { value: 'api' } })
+
+    await waitFor(() => {
+      expect(screen.getByText('How to Design AI-first APIs')).toBeInTheDocument()
+    })
+    expect(screen.queryByText(/Team \//)).not.toBeInTheDocument()
+    const workspaceBadge = screen.getByTestId('search-result-workspace-badge')
+    expect(workspaceBadge).toHaveTextContent('TE')
+    expect(screen.getByText('Essay').compareDocumentPosition(workspaceBadge) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+  })
+
   it('shows metadata subtitle with word count and links', async () => {
     mockInvokeFn.mockResolvedValue({
       results: [
diff --git a/src/components/SearchPanel.tsx b/src/components/SearchPanel.tsx
index fc74e9f8..cd437c0c 100644
--- a/src/components/SearchPanel.tsx
+++ b/src/components/SearchPanel.tsx
@@ -8,7 +8,7 @@ import { DEFAULT_DATE_DISPLAY_FORMAT, type DateDisplayFormat } from '../utils/da
 import { scrollSelectedHTMLChildIntoView } from '../utils/domScroll'
 import { getTypeIcon } from './NoteItem'
 import { NoteTitleIcon } from './NoteTitleIcon'
-import { workspaceDisplayPrefix } from '../utils/workspaces'
+import { WorkspaceInitialsBadge } from './WorkspaceInitialsBadge'
 
 interface SearchPanelProps {
   open: boolean
@@ -45,11 +45,6 @@ function nextSearchSelectionIndex(
   return Math.max(currentIndex - 1, 0)
 }
 
-function workspaceTitlePrefix(entry: VaultEntry | undefined, showWorkspace: boolean): string | null {
-  if (!entry || !showWorkspace) return null
-  return workspaceDisplayPrefix(entry)
-}
-
 function searchVaultPathsForEntries(entries: VaultEntry[], fallbackVaultPath: string): string | string[] {
   const paths = entries
     .map((entry) => entry.workspace?.path)
@@ -316,8 +311,8 @@ interface SearchResultPresentation {
   noteType: string | null
   subtitle: string | null
   title: string
-  titlePrefix: string | null
   typeColor?: string
+  workspace: VaultEntry['workspace'] | null
 }
 
 function resolveSearchResultPresentation({
@@ -337,8 +332,8 @@ function resolveSearchResultPresentation({
     noteType,
     subtitle: entry ? formatSearchSubtitle(entry, dateDisplayFormat) : null,
     title: entry?.title ?? result.title,
-    titlePrefix: workspaceTitlePrefix(entry, showWorkspace),
     typeColor: noteType ? getTypeColor(isA, typeEntry?.color) : undefined,
+    workspace: showWorkspace ? entry?.workspace ?? null : null,
   }
 }
 
@@ -369,19 +364,19 @@ function SearchResultRow({
           className: 'shrink-0',
           style: { color: presentation.typeColor ?? 'var(--muted-foreground)' },
         })}
-        <SearchResultTitle icon={presentation.icon} prefix={presentation.titlePrefix} title={presentation.title} />
+        <SearchResultTitle icon={presentation.icon} title={presentation.title} />
         <SearchResultTypeLabel noteType={presentation.noteType} />
+        <WorkspaceInitialsBadge workspace={presentation.workspace} testId="search-result-workspace-badge" />
       </div>
       <SearchResultSubtitle subtitle={presentation.subtitle} />
     </div>
   )
 }
 
-function SearchResultTitle({ icon, prefix, title }: { icon?: string | null; prefix: string | null; title: string }) {
+function SearchResultTitle({ icon, title }: { icon?: string | null; title: string }) {
   return (
     <span className="min-w-0 flex-1 truncate text-[13px] font-medium text-foreground">
       <NoteTitleIcon icon={icon} size={14} className="mr-1" />
-      {prefix}
       {title}
     </span>
   )
diff --git a/src/components/SettingsBodyNav.tsx b/src/components/SettingsBodyNav.tsx
new file mode 100644
index 00000000..fba23341
--- /dev/null
+++ b/src/components/SettingsBodyNav.tsx
@@ -0,0 +1,41 @@
+import { Bot, Folder, GitBranch, ListChecks, Palette, RefreshCw, ShieldCheck } from 'lucide-react'
+import type { TranslationKey } from '../lib/i18n'
+import { Button } from './ui/button'
+import { SETTINGS_SECTION_IDS } from './settingsSectionIds'
+
+interface SettingsBodyNavProps {
+  t: (key: TranslationKey) => string
+}
+
+export function SettingsBodyNav({ t }: SettingsBodyNavProps) {
+  const items = [
+    { id: SETTINGS_SECTION_IDS.sync, label: t('settings.sync.title'), Icon: RefreshCw },
+    { id: SETTINGS_SECTION_IDS.workspaces, label: t('settings.workspaces.title'), Icon: Folder },
+    { id: SETTINGS_SECTION_IDS.autogit, label: t('settings.autogit.title'), Icon: GitBranch },
+    { id: SETTINGS_SECTION_IDS.appearance, label: t('settings.appearance.title'), Icon: Palette },
+    { id: SETTINGS_SECTION_IDS.content, label: t('settings.vaultContent.title'), Icon: Folder },
+    { id: SETTINGS_SECTION_IDS.ai, label: t('settings.aiAgents.title'), Icon: Bot },
+    { id: SETTINGS_SECTION_IDS.workflow, label: t('settings.workflow.title'), Icon: ListChecks },
+    { id: SETTINGS_SECTION_IDS.privacy, label: t('settings.privacy.title'), Icon: ShieldCheck },
+  ]
+
+  return (
+    <div className="hidden w-48 shrink-0 border-r border-border px-3 py-4 md:block">
+      <div className="sticky top-0 space-y-1.5">
+        {items.map((item) => (
+          <Button
+            key={item.id}
+            type="button"
+            variant="ghost"
+            size="sm"
+            className="h-10 w-full justify-start gap-2.5 px-2.5 text-sm font-medium text-muted-foreground hover:text-foreground"
+            onClick={() => document.getElementById(item.id)?.scrollIntoView({ block: 'start', behavior: 'smooth' })}
+          >
+            <item.Icon size={16} className="shrink-0" />
+            <span className="truncate">{item.label}</span>
+          </Button>
+        ))}
+      </div>
+    </div>
+  )
+}
diff --git a/src/components/SettingsPanel.test.tsx b/src/components/SettingsPanel.test.tsx
index 7edc815a..be386438 100644
--- a/src/components/SettingsPanel.test.tsx
+++ b/src/components/SettingsPanel.test.tsx
@@ -4,6 +4,7 @@ import { SettingsPanel } from './SettingsPanel'
 import type { Settings } from '../types'
 import { THEME_MODE_STORAGE_KEY } from '../lib/themeMode'
 import type { AiAgentsStatus } from '../lib/aiAgents'
+import type { VaultOption } from './StatusBar'
 
 const { trackEventMock } = vi.hoisted(() => ({
   trackEventMock: vi.fn(),
@@ -34,6 +35,11 @@ const emptySettings: Settings = {
   all_notes_show_unsupported: null,
 }
 
+const workspaceVaults: VaultOption[] = [
+  { label: 'Personal Notes', path: '/personal', alias: 'personal', color: 'purple', available: true, mounted: true },
+  { label: 'Team Vault', path: '/team', alias: 'team', available: true, mounted: false },
+]
+
 function installPointerCapturePolyfill() {
   if (!HTMLElement.prototype.hasPointerCapture) {
     HTMLElement.prototype.hasPointerCapture = () => false
@@ -203,10 +209,95 @@ describe('SettingsPanel', () => {
       all_notes_show_pdfs: false,
       all_notes_show_images: false,
       all_notes_show_unsupported: false,
+      multi_workspace_enabled: false,
     }))
     expect(onClose).toHaveBeenCalled()
   })
 
+  it('keeps vault identity management hidden until multiple vaults are enabled', () => {
+    const onUpdateWorkspaceIdentity = vi.fn()
+    render(
+      <SettingsPanel
+        open={true}
+        settings={emptySettings}
+        vaults={workspaceVaults}
+        defaultWorkspacePath="/personal"
+        onSave={onSave}
+        onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
+        onClose={onClose}
+      />,
+    )
+
+    expect(screen.getAllByText('Vaults').length).toBeGreaterThan(0)
+    expect(screen.queryByTestId('settings-workspace-row-personal')).not.toBeInTheDocument()
+
+    fireEvent.click(screen.getByRole('switch', { name: 'Use multiple vaults at the same time' }))
+
+    expect(screen.getByTestId('settings-workspace-row-personal')).toBeInTheDocument()
+    expect(screen.getByLabelText('Vault name for Personal Notes')).toBeInTheDocument()
+    const labelInput = screen.getByLabelText('Vault label for Personal Notes') as HTMLInputElement
+    expect(labelInput).toHaveValue('PN')
+    const slugInput = screen.getByLabelText('Vault slug for Personal Notes') as HTMLInputElement
+    expect(slugInput).toBeInTheDocument()
+    expect(slugInput.readOnly).toBe(true)
+    expect(screen.getAllByLabelText('The display name shown in menus, settings, and vault selectors.').length).toBeGreaterThan(0)
+    expect(screen.getAllByLabelText('The short initials shown on notes, search results, breadcrumbs, and vault badges.').length).toBeGreaterThan(0)
+    expect(screen.getAllByLabelText('The stable prefix used in cross-vault links and relationships. It is read-only for now to avoid breaking existing references.').length).toBeGreaterThan(0)
+    expect(screen.getByRole('button', { name: 'Make Default' })).toHaveAttribute('data-variant', 'secondary')
+    expect(within(screen.getByTestId('settings-workspace-row-personal')).getByRole('button', { name: 'Purple' }).getAttribute('style')).toContain('2px solid var(--foreground)')
+
+    const nameInput = screen.getByLabelText('Vault name for Personal Notes')
+    fireEvent.change(nameInput, {
+      target: { value: 'Personal Main' },
+    })
+    expect(nameInput).toHaveValue('Personal Main')
+    expect(onUpdateWorkspaceIdentity).not.toHaveBeenCalled()
+    fireEvent.blur(nameInput)
+    expect(onUpdateWorkspaceIdentity).toHaveBeenCalledWith('/personal', { label: 'Personal Main' })
+
+    onUpdateWorkspaceIdentity.mockClear()
+    fireEvent.change(labelInput, {
+      target: { value: 'pm' },
+    })
+    expect(labelInput).toHaveValue('PM')
+    expect(onUpdateWorkspaceIdentity).not.toHaveBeenCalled()
+    fireEvent.blur(labelInput)
+    expect(onUpdateWorkspaceIdentity).toHaveBeenCalledWith('/personal', { shortLabel: 'PM' })
+
+    fireEvent.change(slugInput, {
+      target: { value: 'personal-main' },
+    })
+    expect(onUpdateWorkspaceIdentity).not.toHaveBeenCalledWith('/personal', { alias: 'personal-main' })
+
+    saveSettingsPanel()
+
+    expectSettingsSaved({ multi_workspace_enabled: true })
+  })
+
+  it('confirms before removing a non-default vault from settings', () => {
+    const onRemoveVault = vi.fn()
+    render(
+      <SettingsPanel
+        open={true}
+        settings={{ ...emptySettings, multi_workspace_enabled: true }}
+        vaults={workspaceVaults}
+        defaultWorkspacePath="/personal"
+        onSave={onSave}
+        onRemoveVault={onRemoveVault}
+        onUpdateWorkspaceIdentity={vi.fn()}
+        onClose={onClose}
+      />,
+    )
+
+    expect(screen.getByRole('button', { name: 'Remove vault Personal Notes' })).toBeDisabled()
+    fireEvent.click(screen.getByRole('button', { name: 'Remove vault Team Vault' }))
+
+    expect(screen.getByTestId('confirm-delete-dialog')).toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: 'Remove vault' }))
+
+    expect(onRemoveVault).toHaveBeenCalledWith('/team')
+  })
+
   it('saves Gitignored content visibility immediately for keyboard close', () => {
     render(
       <SettingsPanel open={true} settings={emptySettings} onSave={onSave} onClose={onClose} />
diff --git a/src/components/SettingsPanel.tsx b/src/components/SettingsPanel.tsx
index 581962cf..d33505c9 100644
--- a/src/components/SettingsPanel.tsx
+++ b/src/components/SettingsPanel.tsx
@@ -21,10 +21,9 @@ import {
   type KeyboardEvent as ReactKeyboardEvent,
   type MouseEvent as ReactMouseEvent,
   type ReactNode,
-  type RefObject,
 } from 'react'
 import { Moon, Sun, X } from '@phosphor-icons/react'
-import { Bot, Copy, Folder, GitBranch, ListChecks, Monitor, Palette, RefreshCw, ShieldCheck } from 'lucide-react'
+import { Copy, Monitor } from 'lucide-react'
 import type { Settings } from '../types'
 import {
   APP_LOCALES,
@@ -48,6 +47,7 @@ import { shouldHideGitignoredFiles } from '../lib/gitignoredVisibility'
 import { trackAllNotesVisibilityChanged } from '../lib/productAnalytics'
 import { AiProviderSettings } from './AiProviderSettings'
 import { PrivacySettingsSection } from './PrivacySettingsSection'
+import { SettingsBodyNav } from './SettingsBodyNav'
 import {
   NumberInputControl,
   SectionHeading,
@@ -59,6 +59,7 @@ import {
 } from './SettingsControls'
 import { SettingsFooter } from './SettingsFooter'
 import { VaultContentSettingsSection } from './VaultContentSettingsSection'
+import { WorkspaceSettingsSection } from './WorkspaceSettingsSection'
 import {
   resolveAllNotesFileVisibility,
   settingsWithAllNotesFileVisibility,
@@ -73,19 +74,28 @@ import {
 import { Button } from './ui/button'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from './ui/tabs'
 import type { NoteWidthMode } from '../types'
+import type { VaultOption } from './status-bar/types'
+import { SETTINGS_SECTION_IDS } from './settingsSectionIds'
 import {
   trackSettingsPreferenceChanges,
   trackTelemetryConsentChange,
 } from './settingsPreferenceTracking'
+import { useSettingsPanelAutofocus, useSettingsPanelFocusTrap } from './useSettingsPanelFocus'
 
 interface SettingsPanelProps {
   open: boolean
   settings: Settings
   aiAgentsStatus?: AiAgentsStatus
+  initialSectionId?: string | null
   locale?: AppLocale
   systemLocale?: AppLocale
   onSave: (settings: Settings) => void
   onCopyMcpConfig?: () => void
+  vaults?: VaultOption[]
+  defaultWorkspacePath?: string | null
+  onRemoveVault?: (path: string) => void
+  onSetDefaultWorkspace?: (path: string) => void
+  onUpdateWorkspaceIdentity?: (path: string, patch: Partial<VaultOption>) => void
   isGitVault?: boolean
   explicitOrganizationEnabled?: boolean
   onSaveExplicitOrganization?: (enabled: boolean) => void
@@ -110,6 +120,7 @@ interface SettingsDraft {
   initialH1AutoRename: boolean
   hideGitignoredFiles: boolean
   allNotesFileVisibility: AllNotesFileVisibility
+  multiWorkspaceEnabled: boolean
   crashReporting: boolean
   analytics: boolean
   explicitOrganization: boolean
@@ -156,6 +167,13 @@ interface SettingsBodyProps {
   setHideGitignoredFiles: (value: boolean) => void
   allNotesFileVisibility: AllNotesFileVisibility
   setAllNotesFileVisibility: (value: AllNotesFileVisibility) => void
+  multiWorkspaceEnabled: boolean
+  setMultiWorkspaceEnabled: (value: boolean) => void
+  vaults: VaultOption[]
+  defaultWorkspacePath?: string | null
+  onRemoveVault?: (path: string) => void
+  onSetDefaultWorkspace?: (path: string) => void
+  onUpdateWorkspaceIdentity?: (path: string, patch: Partial<VaultOption>) => void
   explicitOrganization: boolean
   setExplicitOrganization: (value: boolean) => void
   crashReporting: boolean
@@ -167,77 +185,12 @@ interface SettingsBodyProps {
 const PULL_INTERVAL_OPTIONS = [1, 2, 5, 10, 15, 30] as const
 const DEFAULT_AUTOGIT_IDLE_THRESHOLD_SECONDS = 90
 const DEFAULT_AUTOGIT_INACTIVE_THRESHOLD_SECONDS = 30
-const SETTINGS_SECTION_IDS = {
-  sync: 'settings-section-sync',
-  autogit: 'settings-section-autogit',
-  appearance: 'settings-section-appearance',
-  content: 'settings-section-content',
-  ai: 'settings-section-ai',
-  workflow: 'settings-section-workflow',
-  privacy: 'settings-section-privacy',
-} as const
 type Translate = ReturnType<typeof createTranslator>
 
-const SETTINGS_FOCUSABLE_SELECTOR = [
-  'a[href]',
-  'button:not([disabled])',
-  'input:not([disabled])',
-  'select:not([disabled])',
-  'textarea:not([disabled])',
-  '[tabindex]:not([tabindex="-1"])',
-].join(',')
-
 function isSaveShortcut(event: ReactKeyboardEvent): boolean {
   return event.key === 'Enter' && (event.metaKey || event.ctrlKey)
 }
 
-function getSettingsFocusableElements(panel: HTMLElement): HTMLElement[] {
-  return Array.from(panel.querySelectorAll<HTMLElement>(SETTINGS_FOCUSABLE_SELECTOR))
-    .filter((element) => (
-      element.tabIndex >= 0 &&
-      element.getAttribute('aria-disabled') !== 'true' &&
-      !element.closest('[hidden], [aria-hidden="true"]')
-    ))
-}
-
-function focusSettingsBoundary(focusableElements: HTMLElement[], shiftKey: boolean): void {
-  const targetIndex = shiftKey ? focusableElements.length - 1 : 0
-  focusableElements.at(targetIndex)?.focus()
-}
-
-function isSettingsPanelElement(panel: HTMLElement, activeElement: Element | null): activeElement is Element {
-  return activeElement instanceof Element && panel.contains(activeElement)
-}
-
-function isSettingsFocusBoundary(activeElement: Element, focusableElements: HTMLElement[], shiftKey: boolean): boolean {
-  const boundaryIndex = shiftKey ? 0 : focusableElements.length - 1
-  return activeElement === focusableElements.at(boundaryIndex)
-}
-
-function trapSettingsPanelFocus(event: KeyboardEvent, panel: HTMLElement | null): void {
-  if (event.key !== 'Tab' || !panel) return
-
-  const focusableElements = getSettingsFocusableElements(panel)
-  if (focusableElements.length === 0) {
-    event.preventDefault()
-    panel.focus()
-    return
-  }
-
-  const activeElement = document.activeElement
-
-  if (!isSettingsPanelElement(panel, activeElement)) {
-    event.preventDefault()
-    focusSettingsBoundary(focusableElements, event.shiftKey)
-    return
-  }
-
-  if (isSettingsFocusBoundary(activeElement, focusableElements, event.shiftKey)) {
-    event.preventDefault()
-    focusSettingsBoundary(focusableElements, event.shiftKey)
-  }
-}
-
 function createSettingsDraft(
   settings: Settings,
   explicitOrganizationEnabled: boolean,
@@ -266,6 +219,7 @@ function createSettingsDraft(
     initialH1AutoRename: settings.initial_h1_auto_rename_enabled ?? true,
     hideGitignoredFiles: shouldHideGitignoredFiles(settings),
     allNotesFileVisibility: resolveAllNotesFileVisibility(settings),
+    multiWorkspaceEnabled: settings.multi_workspace_enabled === true,
     crashReporting: settings.crash_reporting_enabled ?? false,
     analytics: settings.analytics_enabled ?? false,
     explicitOrganization: explicitOrganizationEnabled,
@@ -313,6 +267,7 @@ function buildSettingsFromDraft(settings: Settings, draft: SettingsDraft): Setti
     default_ai_target: draft.defaultAiTarget,
     ai_model_providers: draft.aiModelProviders.length > 0 ? draft.aiModelProviders : null,
     hide_gitignored_files: draft.hideGitignoredFiles,
+    multi_workspace_enabled: draft.multiWorkspaceEnabled,
   }
   return settingsWithAllNotesFileVisibility(nextSettings, draft.allNotesFileVisibility)
 }
@@ -328,35 +283,20 @@ function applyThemeModeSelection(value: ThemeMode): void {
   if (typeof window !== 'undefined') writeStoredThemeMode(window.localStorage, value)
 }
 
-function useSettingsPanelAutofocus(panelRef: RefObject<HTMLDivElement | null>): void {
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      const focusTarget = panelRef.current?.querySelector<HTMLElement>('[data-settings-autofocus="true"]')
-      focusTarget?.focus()
-    }, 50)
-    return () => clearTimeout(timer)
-  }, [panelRef])
-}
-
-function useSettingsPanelFocusTrap(panelRef: RefObject<HTMLDivElement | null>): void {
-  useEffect(() => {
-    const handleDocumentKeyDown = (event: KeyboardEvent) => {
-      trapSettingsPanelFocus(event, panelRef.current)
-    }
-
-    document.addEventListener('keydown', handleDocumentKeyDown, true)
-    return () => document.removeEventListener('keydown', handleDocumentKeyDown, true)
-  }, [panelRef])
-}
-
 export function SettingsPanel({
   open,
   settings,
   aiAgentsStatus = createMissingAiAgentsStatus(),
+  initialSectionId = null,
   locale = 'en',
   systemLocale = locale,
   onSave,
   onCopyMcpConfig,
+  vaults = [],
+  defaultWorkspacePath = null,
+  onRemoveVault,
+  onSetDefaultWorkspace,
+  onUpdateWorkspaceIdentity,
   isGitVault = true,
   explicitOrganizationEnabled = true,
   onSaveExplicitOrganization,
@@ -368,10 +308,16 @@ export function SettingsPanel({
     <SettingsPanelInner
       settings={settings}
       aiAgentsStatus={aiAgentsStatus}
+      initialSectionId={initialSectionId}
       locale={locale}
       systemLocale={systemLocale}
       onSave={onSave}
       onCopyMcpConfig={onCopyMcpConfig}
+      vaults={vaults}
+      defaultWorkspacePath={defaultWorkspacePath}
+      onRemoveVault={onRemoveVault}
+      onSetDefaultWorkspace={onSetDefaultWorkspace}
+      onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
       isGitVault={isGitVault}
       explicitOrganizationEnabled={explicitOrganizationEnabled}
       onSaveExplicitOrganization={onSaveExplicitOrganization}
@@ -382,6 +328,7 @@ export function SettingsPanel({
 
 type SettingsPanelInnerProps = Omit<SettingsPanelProps, 'open' | 'explicitOrganizationEnabled' | 'aiAgentsStatus' | 'isGitVault'> & {
   aiAgentsStatus: AiAgentsStatus
+  initialSectionId: string | null
   locale: AppLocale
   systemLocale: AppLocale
   isGitVault: boolean
@@ -391,9 +338,15 @@ type SettingsPanelInnerProps = Omit<SettingsPanelProps, 'open' | 'explicitOrgani
 function SettingsPanelInner({
   settings,
   aiAgentsStatus,
+  initialSectionId,
   systemLocale,
   onSave,
   onCopyMcpConfig,
+  vaults,
+  defaultWorkspacePath,
+  onRemoveVault,
+  onSetDefaultWorkspace,
+  onUpdateWorkspaceIdentity,
   isGitVault,
   explicitOrganizationEnabled,
   onSaveExplicitOrganization,
@@ -411,6 +364,14 @@ function SettingsPanelInner({
   useSettingsPanelAutofocus(panelRef)
   useSettingsPanelFocusTrap(panelRef)
 
+  useEffect(() => {
+    if (!initialSectionId) return
+    const timer = window.setTimeout(() => {
+      document.getElementById(initialSectionId)?.scrollIntoView({ block: 'start' })
+    }, 50)
+    return () => window.clearTimeout(timer)
+  }, [initialSectionId])
+
   const updateDraft = useCallback(
     <Key extends keyof SettingsDraft>(key: Key, value: SettingsDraft[Key]) => {
       setDraft((current) => ({ ...current, [key]: value }))
@@ -486,6 +447,11 @@ function SettingsPanelInner({
           isGitVault={isGitVault}
           aiAgentsStatus={aiAgentsStatus}
           onCopyMcpConfig={onCopyMcpConfig}
+          vaults={vaults ?? []}
+          defaultWorkspacePath={defaultWorkspacePath}
+          onRemoveVault={onRemoveVault}
+          onSetDefaultWorkspace={onSetDefaultWorkspace}
+          onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
           setThemeMode={handleThemeModeChange}
           setHideGitignoredFiles={handleGitignoredVisibilityChange}
           setAllNotesFileVisibility={handleAllNotesFileVisibilityChange}
@@ -525,6 +491,11 @@ interface SettingsBodyFromDraftProps {
   isGitVault: boolean
   aiAgentsStatus: AiAgentsStatus
   onCopyMcpConfig?: () => void
+  vaults: VaultOption[]
+  defaultWorkspacePath?: string | null
+  onRemoveVault?: (path: string) => void
+  onSetDefaultWorkspace?: (path: string) => void
+  onUpdateWorkspaceIdentity?: (path: string, patch: Partial<VaultOption>) => void
   setThemeMode: (value: ThemeMode) => void
   setHideGitignoredFiles: (value: boolean) => void
   setAllNotesFileVisibility: (value: AllNotesFileVisibility) => void
@@ -539,6 +510,11 @@ function SettingsBodyFromDraft({
   isGitVault,
   aiAgentsStatus,
   onCopyMcpConfig,
+  vaults,
+  defaultWorkspacePath,
+  onRemoveVault,
+  onSetDefaultWorkspace,
+  onUpdateWorkspaceIdentity,
   setThemeMode,
   setHideGitignoredFiles,
   setAllNotesFileVisibility,
@@ -585,6 +561,13 @@ function SettingsBodyFromDraft({
       setHideGitignoredFiles={setHideGitignoredFiles}
       allNotesFileVisibility={draft.allNotesFileVisibility}
       setAllNotesFileVisibility={setAllNotesFileVisibility}
+      multiWorkspaceEnabled={draft.multiWorkspaceEnabled}
+      setMultiWorkspaceEnabled={(value) => updateDraft('multiWorkspaceEnabled', value)}
+      vaults={vaults}
+      defaultWorkspacePath={defaultWorkspacePath}
+      onRemoveVault={onRemoveVault}
+      onSetDefaultWorkspace={onSetDefaultWorkspace}
+      onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
       explicitOrganization={draft.explicitOrganization}
       setExplicitOrganization={(value) => updateDraft('explicitOrganization', value)}
       crashReporting={draft.crashReporting}
@@ -608,38 +591,6 @@ function SettingsBody(props: SettingsBodyProps) {
   )
 }
 
-function SettingsBodyNav({ t }: { t: Translate }) {
-  const items = [
-    { id: SETTINGS_SECTION_IDS.sync, label: t('settings.sync.title'), Icon: RefreshCw },
-    { id: SETTINGS_SECTION_IDS.autogit, label: t('settings.autogit.title'), Icon: GitBranch },
-    { id: SETTINGS_SECTION_IDS.appearance, label: t('settings.appearance.title'), Icon: Palette },
-    { id: SETTINGS_SECTION_IDS.content, label: t('settings.vaultContent.title'), Icon: Folder },
-    { id: SETTINGS_SECTION_IDS.ai, label: t('settings.aiAgents.title'), Icon: Bot },
-    { id: SETTINGS_SECTION_IDS.workflow, label: t('settings.workflow.title'), Icon: ListChecks },
-    { id: SETTINGS_SECTION_IDS.privacy, label: t('settings.privacy.title'), Icon: ShieldCheck },
-  ]
-
-  return (
-    <div className="hidden w-48 shrink-0 border-r border-border px-3 py-4 md:block">
-      <div className="sticky top-0 space-y-1.5">
-        {items.map((item) => (
-          <Button
-            key={item.id}
-            type="button"
-            variant="ghost"
-            size="sm"
-            className="h-10 w-full justify-start gap-2.5 px-2.5 text-sm font-medium text-muted-foreground hover:text-foreground"
-            onClick={() => document.getElementById(item.id)?.scrollIntoView({ block: 'start', behavior: 'smooth' })}
-          >
-            <item.Icon size={16} className="shrink-0" />
-            <span className="truncate">{item.label}</span>
-          </Button>
-        ))}
-      </div>
-    </div>
-  )
-}
-
 function SettingsSyncAndAppearanceSections({
   t,
   locale,
@@ -655,6 +606,13 @@ function SettingsSyncAndAppearanceSections({
   setAutoGitInactiveThresholdSeconds,
   releaseChannel,
   setReleaseChannel,
+  multiWorkspaceEnabled,
+  setMultiWorkspaceEnabled,
+  vaults,
+  defaultWorkspacePath,
+  onRemoveVault,
+  onSetDefaultWorkspace,
+  onUpdateWorkspaceIdentity,
   themeMode,
   setThemeMode,
   uiLanguage,
@@ -671,6 +629,19 @@ function SettingsSyncAndAppearanceSections({
           setReleaseChannel={setReleaseChannel}
         />
       </SettingsSection>
+      <SettingsSection id={SETTINGS_SECTION_IDS.workspaces}>
+        <SectionHeading title={t('settings.workspaces.title')} />
+        <WorkspaceSettingsSection
+          defaultWorkspacePath={defaultWorkspacePath}
+          enabled={multiWorkspaceEnabled}
+          locale={locale}
+          onEnabledChange={setMultiWorkspaceEnabled}
+          onRemoveVault={onRemoveVault}
+          onSetDefaultWorkspace={onSetDefaultWorkspace}
+          onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
+          vaults={vaults}
+        />
+      </SettingsSection>
       <SettingsSection id={SETTINGS_SECTION_IDS.autogit}>
         <AutoGitSettingsSection
           t={t}
diff --git a/src/components/SingleEditorView.test.tsx b/src/components/SingleEditorView.test.tsx
index 881e0a14..65ffd7e3 100644
--- a/src/components/SingleEditorView.test.tsx
+++ b/src/components/SingleEditorView.test.tsx
@@ -170,6 +170,7 @@ vi.mock('../utils/personMentionSuggestions', () => ({
 vi.mock('../utils/suggestionEnrichment', () => ({
   attachClickHandlers: <T,>(items: T[]) => items,
   enrichSuggestionItems: <T,>(items: T[]) => items,
+  hasMultipleSuggestionWorkspaces: () => false,
 }))
 
 vi.mock('./WikilinkSuggestionMenu', () => ({
@@ -667,6 +668,31 @@ describe('SingleEditorView', () => {
     expect(staleItemClick).not.toHaveBeenCalled()
   })
 
+  it('runs suggestion item clicks when BlockNote keeps the editor DOM outside the React container', () => {
+    const editor = createEditor()
+    editor.domElement = document.createElement('div')
+    document.body.appendChild(editor.domElement)
+    const itemClick = vi.fn()
+
+    try {
+      render(
+        <SingleEditorView
+          editor={editor as never}
+          entries={[makeEntry()]}
+          onNavigateWikilink={vi.fn()}
+        />,
+      )
+
+      ;(state.capturedSuggestionProps['[['].onItemClick as (item: { onItemClick: () => void }) => void)({
+        onItemClick: itemClick,
+      })
+
+      expect(itemClick).toHaveBeenCalledOnce()
+    } finally {
+      editor.domElement.remove()
+    }
+  })
+
   it('guards stale click handlers stored on wikilink suggestion items', async () => {
     const editor = createEditor()
     editor.domElement = document.createElement('div')
diff --git a/src/components/SingleEditorView.tsx b/src/components/SingleEditorView.tsx
index a3e8ee6e..d05f4bfb 100644
--- a/src/components/SingleEditorView.tsx
+++ b/src/components/SingleEditorView.tsx
@@ -29,7 +29,7 @@ import { isTauri } from '../mock-tauri'
 import { buildTypeEntryMap } from '../utils/typeColors'
 import { preFilterWikilinks, deduplicateByPath, MIN_QUERY_LENGTH } from '../utils/wikilinkSuggestions'
 import { filterPersonMentions, PERSON_MENTION_MIN_QUERY } from '../utils/personMentionSuggestions'
-import { attachClickHandlers, enrichSuggestionItems } from '../utils/suggestionEnrichment'
+import { attachClickHandlers, enrichSuggestionItems, hasMultipleSuggestionWorkspaces } from '../utils/suggestionEnrichment'
 import { observeNativeTextAssistanceDisabled } from '../lib/nativeTextAssistance'
 import { getRuntimeStyleNonce } from '../lib/runtimeStyleNonce'
 import { WikilinkSuggestionMenu, type WikilinkSuggestionItem } from './WikilinkSuggestionMenu'
@@ -181,7 +181,7 @@ function isEditorReadyForSuggestionAction(
   const editorElement = editor.domElement
   if (!(editorElement instanceof HTMLElement)) return true
 
-  return editorElement.isConnected && container.contains(editorElement)
+  return editorElement.isConnected
 }
 
 function runSuggestionActionSafely({
@@ -1062,6 +1062,7 @@ function buildBaseSuggestionItems(entries: VaultEntry[]) {
       title,
       aliases: [...new Set([filenameStem, ...safeStringArray(entry.aliases)])],
       group: entryType ?? 'Note',
+      entry,
       entryType,
       entryTitle: title,
       path,
@@ -1090,6 +1091,7 @@ function useSuggestionMenuItems(options: {
   insertWikilink: (target: string) => void
   locale: AppLocale
   runEditorAction: (action: SuggestionAction) => void
+  sourceEntry?: VaultEntry
   typeEntryMap: Record<string, VaultEntry>
   vaultPath?: string
 }) {
@@ -1099,6 +1101,7 @@ function useSuggestionMenuItems(options: {
     insertWikilink,
     locale,
     runEditorAction,
+    sourceEntry,
     typeEntryMap,
     vaultPath,
   } = options
@@ -1113,12 +1116,14 @@ function useSuggestionMenuItems(options: {
       ? preFilterWikilinks(baseItems, normalizedQuery)
       : filterPersonMentions(baseItems, normalizedQuery)
 
-    const items = attachClickHandlers(candidates, insertWikilink, vaultPath ?? '')
+    const items = attachClickHandlers(candidates, insertWikilink, vaultPath ?? '', sourceEntry)
     return guardSuggestionMenuItems(
-      enrichSuggestionItems(items, normalizedQuery, typeEntryMap),
+      enrichSuggestionItems(items, normalizedQuery, typeEntryMap, {
+        showWorkspace: hasMultipleSuggestionWorkspaces(baseItems),
+      }),
       runEditorAction,
     )
-  }, [baseItems, insertWikilink, runEditorAction, typeEntryMap, vaultPath])
+  }, [baseItems, insertWikilink, runEditorAction, sourceEntry, typeEntryMap, vaultPath])
 
   const getWikilinkItems = useCallback(async (query: string): Promise<WikilinkSuggestionItem[]> => (
     buildItems(query, '[[') ?? []
@@ -1260,11 +1265,12 @@ function useRichEditorPlainTextPasteTarget(options: {
 }
 
 /** Single BlockNote editor view — content is swapped via replaceBlocks */
-export function SingleEditorView({ editor, entries, onNavigateWikilink, onChange, vaultPath, editable = true, locale = 'en' }: {
+export function SingleEditorView({ editor, entries, onNavigateWikilink, onChange, sourceEntry, vaultPath, editable = true, locale = 'en' }: {
   editor: ReturnType<typeof useCreateBlockNote>
   entries: VaultEntry[]
   onNavigateWikilink: (target: string) => void
   onChange?: () => void
+  sourceEntry?: VaultEntry | null
   vaultPath?: string
   editable?: boolean
   locale?: AppLocale
@@ -1345,6 +1351,7 @@ export function SingleEditorView({ editor, entries, onNavigateWikilink, onChange
     insertWikilink,
     locale,
     runEditorAction,
+    sourceEntry: sourceEntry ?? undefined,
     typeEntryMap,
     vaultPath,
   })
diff --git a/src/components/StatusBar.test.tsx b/src/components/StatusBar.test.tsx
index 64e8426b..4f46bd71 100644
--- a/src/components/StatusBar.test.tsx
+++ b/src/components/StatusBar.test.tsx
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { act, render, screen, fireEvent } from '@testing-library/react'
+import { act, render, screen, fireEvent, within } from '@testing-library/react'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import { StatusBar } from './StatusBar'
 import { StatusBarPrimarySection } from './status-bar/StatusBarSections'
@@ -12,8 +12,8 @@ vi.mock('../utils/url', async () => {
 const { openExternalUrl } = await import('../utils/url') as typeof import('../utils/url') & { openExternalUrl: ReturnType<typeof vi.fn> }
 
 const vaults: VaultOption[] = [
-  { label: 'Main Vault', path: '/Users/luca/Laputa' },
-  { label: 'Work Vault', path: '/Users/luca/Work' },
+  { label: 'Main Vault', path: '/Users/luca/Laputa', alias: 'main', mounted: true },
+  { label: 'Work Vault', path: '/Users/luca/Work', alias: 'work', mounted: false },
 ]
 
 const installedAiAgentsStatus = {
@@ -206,6 +206,111 @@ describe('StatusBar', () => {
     expect(screen.getByText('Work Vault')).toBeInTheDocument()
   })
 
+  it('does not show workspace management or mount controls before opt-in', () => {
+    render(
+      <StatusBar
+        noteCount={100}
+        vaultPath="/Users/luca/Laputa"
+        vaults={vaults}
+        onSwitchVault={vi.fn()}
+        onUpdateWorkspaceIdentity={vi.fn()}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Switch vault' }))
+
+    expect(screen.queryByTestId('vault-menu-manage-vaults')).not.toBeInTheDocument()
+    expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
+  })
+
+  it('mounts and unmounts workspaces from the vault menu after opt-in', () => {
+    const onSwitchVault = vi.fn()
+    const onUpdateWorkspaceIdentity = vi.fn()
+    render(
+      <StatusBar
+        noteCount={100}
+        vaultPath="/Users/luca/Laputa"
+        vaults={vaults}
+        multiWorkspaceEnabled={true}
+        onSwitchVault={onSwitchVault}
+        onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Switch vault' }))
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Include Work Vault in the unified graph' }))
+
+    expect(onUpdateWorkspaceIdentity).toHaveBeenCalledWith('/Users/luca/Work', { mounted: true })
+    expect(onSwitchVault).not.toHaveBeenCalled()
+    expect(screen.getByText('Work Vault')).toBeInTheDocument()
+  })
+
+  it('shows the active workspace as checked because it is always included', () => {
+    render(
+      <StatusBar
+        noteCount={100}
+        vaultPath="/Users/luca/Laputa"
+        vaults={[
+          { ...vaults[0], mounted: false },
+          vaults[1],
+        ]}
+        multiWorkspaceEnabled={true}
+        onSwitchVault={vi.fn()}
+        onUpdateWorkspaceIdentity={vi.fn()}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Switch vault' }))
+
+    const activeCheckbox = screen.getByRole('checkbox', { name: 'Include Main Vault in the unified graph' })
+    expect(activeCheckbox).toBeChecked()
+    expect(activeCheckbox).toBeDisabled()
+  })
+
+  it('uses the expanded multi-workspace vault picker layout', () => {
+    const onOpenVaultSettings = vi.fn()
+    render(
+      <StatusBar
+        noteCount={100}
+        vaultPath="/Users/luca/Laputa"
+        vaults={[
+          { ...vaults[0], color: 'purple' },
+          { ...vaults[1], color: 'green' },
+        ]}
+        multiWorkspaceEnabled={true}
+        onSwitchVault={vi.fn()}
+        onOpenVaultSettings={onOpenVaultSettings}
+        onCreateEmptyVault={vi.fn()}
+        onUpdateWorkspaceIdentity={vi.fn()}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Switch vault' }))
+
+    expect(screen.getByTestId('vault-menu-popover')).toHaveStyle({ minWidth: '320px' })
+    expect(screen.getByText('Available vaults')).toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: 'Manage vaults' }))
+    expect(onOpenVaultSettings).toHaveBeenCalledOnce()
+
+    fireEvent.click(screen.getByRole('button', { name: 'Switch vault' }))
+    const activeItem = screen.getByTestId('vault-menu-item-Main Vault')
+    const defaultLabel = within(activeItem).getByTestId('vault-menu-default-label')
+    const activeBadge = within(activeItem).getByTestId('vault-menu-workspace-badge-Main Vault')
+    expect(within(activeItem).getByTestId('vault-menu-item-label-Main Vault').className).toContain('text-[12px]')
+    expect(within(activeItem).getByTestId('vault-menu-item-label-Main Vault').getAttribute('style')).toContain('background: transparent')
+    expect(defaultLabel).toHaveTextContent('Default')
+    expect(activeBadge).toHaveTextContent('MV')
+    expect(defaultLabel.compareDocumentPosition(activeBadge) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+
+    const workBadge = screen.getByTestId('vault-menu-workspace-badge-Work Vault')
+    expect(workBadge).toHaveTextContent('WV')
+    expect(workBadge.getAttribute('style')).toContain('border-color: var(--accent-green)')
+
+    const createAction = screen.getByTestId('vault-menu-create-empty')
+    expect(createAction.className).toContain('text-[12px]')
+    expect(createAction.getAttribute('style')).toContain('color: var(--muted-foreground)')
+  })
+
   it('calls onSwitchVault when selecting a different vault', () => {
     const onSwitchVault = vi.fn()
     render(<StatusBar noteCount={100} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={onSwitchVault} />)
@@ -217,6 +322,55 @@ describe('StatusBar', () => {
     expect(onSwitchVault).toHaveBeenCalledWith('/Users/luca/Work')
   })
 
+  it('sets the default workspace instead of switching vaults after multi-workspace opt-in', () => {
+    const onSetDefaultWorkspace = vi.fn()
+    const onSwitchVault = vi.fn()
+    render(
+      <StatusBar
+        noteCount={100}
+        vaultPath="/Users/luca/Laputa"
+        defaultWorkspacePath="/Users/luca/Laputa"
+        vaults={vaults}
+        multiWorkspaceEnabled={true}
+        onSwitchVault={onSwitchVault}
+        onSetDefaultWorkspace={onSetDefaultWorkspace}
+        onUpdateWorkspaceIdentity={vi.fn()}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Switch vault' }))
+    fireEvent.click(screen.getByText('Work Vault'))
+
+    expect(onSetDefaultWorkspace).toHaveBeenCalledWith('/Users/luca/Work')
+    expect(onSwitchVault).not.toHaveBeenCalled()
+  })
+
+  it('unmounts the current default by moving the default to another included workspace first', () => {
+    const onSetDefaultWorkspace = vi.fn()
+    const onUpdateWorkspaceIdentity = vi.fn()
+    render(
+      <StatusBar
+        noteCount={100}
+        vaultPath="/Users/luca/Laputa"
+        defaultWorkspacePath="/Users/luca/Laputa"
+        vaults={[
+          { ...vaults[0], mounted: true },
+          { ...vaults[1], mounted: true },
+        ]}
+        multiWorkspaceEnabled={true}
+        onSwitchVault={vi.fn()}
+        onSetDefaultWorkspace={onSetDefaultWorkspace}
+        onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Switch vault' }))
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Include Main Vault in the unified graph' }))
+
+    expect(onSetDefaultWorkspace).toHaveBeenCalledWith('/Users/luca/Work')
+    expect(onUpdateWorkspaceIdentity).toHaveBeenCalledWith('/Users/luca/Laputa', { mounted: false })
+  })
+
   it('closes vault menu when clicking outside', () => {
     render(<StatusBar noteCount={100} vaultPath="/Users/luca/Laputa" vaults={vaults} onSwitchVault={vi.fn()} />)
 
@@ -344,16 +498,16 @@ describe('StatusBar', () => {
     const removeAction = screen.getByTestId('vault-menu-remove-Work Vault')
 
     expect(item.className).toContain('hover:bg-[var(--hover)]')
-    expect(item.className).toContain('pr-7')
-    expect(removeAction.className).toContain('absolute')
-    expect(removeAction.className).toContain('right-1')
+    expect(removeAction.compareDocumentPosition(within(item).getByText('Work Vault')) & Node.DOCUMENT_POSITION_PRECEDING).toBeTruthy()
+    expect(removeAction.className).not.toContain('absolute')
+    expect(removeAction.className).not.toContain('right-1')
     expect(removeAction.className).toContain('group-hover:opacity-100')
     expect(removeAction.className).toContain('group-focus-within:opacity-100')
     expect(removeAction.className).toContain('pointer-events-none')
     expect(screen.getByRole('button', { name: 'Remove Work Vault from list' })).toBeInTheDocument()
   })
 
-  it('calls onRemoveVault when clicking the remove action in the vault menu', () => {
+  it('confirms before removing a vault from the vault menu', () => {
     const onRemoveVault = vi.fn()
     render(
       <StatusBar
@@ -368,6 +522,10 @@ describe('StatusBar', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Switch vault' }))
     fireEvent.click(screen.getByRole('button', { name: 'Remove Work Vault from list' }))
 
+    expect(onRemoveVault).not.toHaveBeenCalled()
+    expect(screen.getByTestId('confirm-delete-dialog')).toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: 'Remove vault' }))
+
     expect(onRemoveVault).toHaveBeenCalledWith('/Users/luca/Work')
   })
 
diff --git a/src/components/StatusBar.tsx b/src/components/StatusBar.tsx
index 4d4335b7..52b59c7d 100644
--- a/src/components/StatusBar.tsx
+++ b/src/components/StatusBar.tsx
@@ -60,10 +60,13 @@ interface StatusBarProps {
   noteCount: number
   modifiedCount?: number
   vaultPath: string
-  vaults: VaultOption[]
   defaultWorkspacePath?: string | null
+  vaults: VaultOption[]
+  multiWorkspaceEnabled?: boolean
   onSwitchVault: (path: string) => void
+  onSetDefaultWorkspace?: (path: string) => void
   onOpenSettings?: () => void
+  onOpenVaultSettings?: () => void
   onOpenLocalFolder?: () => void
   onCreateEmptyVault?: () => void
   onCloneVault?: () => void
@@ -91,7 +94,6 @@ interface StatusBarProps {
   buildNumber?: string
   onCheckForUpdates?: () => void
   onRemoveVault?: (path: string) => void
-  onSetDefaultWorkspace?: (path: string) => void
   onUpdateWorkspaceIdentity?: (path: string, patch: Partial<VaultOption>) => void
   mcpStatus?: McpStatus
   onInstallMcp?: () => void
@@ -116,9 +118,12 @@ interface StatusBarFooterProps extends StatusBarProps {
 function StatusBarPrimaryFromFooter({
   modifiedCount = 0,
   vaultPath,
-  vaults,
   defaultWorkspacePath,
+  vaults,
+  multiWorkspaceEnabled,
   onSwitchVault,
+  onSetDefaultWorkspace,
+  onOpenVaultSettings,
   onOpenLocalFolder,
   onCreateEmptyVault,
   onCloneVault,
@@ -140,7 +145,6 @@ function StatusBarPrimaryFromFooter({
   buildNumber,
   onCheckForUpdates,
   onRemoveVault,
-  onSetDefaultWorkspace,
   onUpdateWorkspaceIdentity,
   mcpStatus,
   onInstallMcp,
@@ -162,9 +166,12 @@ function StatusBarPrimaryFromFooter({
     <StatusBarPrimarySection
       modifiedCount={modifiedCount}
       vaultPath={vaultPath}
-      vaults={vaults}
       defaultWorkspacePath={defaultWorkspacePath}
+      vaults={vaults}
+      multiWorkspaceEnabled={multiWorkspaceEnabled}
       onSwitchVault={onSwitchVault}
+      onSetDefaultWorkspace={onSetDefaultWorkspace}
+      onOpenVaultSettings={onOpenVaultSettings}
       onOpenLocalFolder={onOpenLocalFolder}
       onCreateEmptyVault={onCreateEmptyVault}
       onCloneVault={onCloneVault}
@@ -186,7 +193,6 @@ function StatusBarPrimaryFromFooter({
       buildNumber={buildNumber}
       onCheckForUpdates={onCheckForUpdates}
       onRemoveVault={onRemoveVault}
-      onSetDefaultWorkspace={onSetDefaultWorkspace}
       onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
       mcpStatus={mcpStatus}
       onInstallMcp={onInstallMcp}
diff --git a/src/components/TagsDropdown.tsx b/src/components/TagsDropdown.tsx
index 05dd32dc..8a435bc7 100644
--- a/src/components/TagsDropdown.tsx
+++ b/src/components/TagsDropdown.tsx
@@ -1,7 +1,6 @@
 import { useState, useRef, useCallback, useMemo } from 'react'
 import { createPortal } from 'react-dom'
 import { getTagStyle, setTagColor, getTagColorKey } from '../utils/tagStyles'
-import { ACCENT_COLORS } from '../utils/typeColors'
 import {
   getNextHighlightIndex,
   getPreviousHighlightIndex,
@@ -9,9 +8,9 @@ import {
   useAnchoredDropdownPosition,
   useAutoFocus,
 } from './propertyDropdownUtils'
+import { AccentColorPicker } from './AccentColorPicker'
 
 const PROPERTY_DROPDOWN_WIDTH = 208
-const SELECTED_SWATCH_CHECK_STYLE = { color: 'var(--text-inverse)', fontSize: 8, lineHeight: 1 } as const
 
 export function TagPill({ tag, className }: { tag: string; className?: string }) {
   const style = getTagStyle(tag)
@@ -40,20 +39,15 @@ function ColorPickerRow({ tag, onColorChange }: { tag: string; onColorChange: (t
   const currentKey = getTagColorKey(tag)
   return (
     <div className="flex items-center gap-1 px-3 py-1.5" data-testid={`tag-color-picker-${tag}`}>
-      {ACCENT_COLORS.map(c => (
-        <button
-          key={c.key}
-          className="flex size-4 shrink-0 items-center justify-center rounded-full border-none p-0 transition-transform hover:scale-125"
-          style={{ backgroundColor: c.css }}
-          onClick={(e) => { e.stopPropagation(); onColorChange(tag, c.key) }}
-          title={c.label}
-          data-testid={`tag-color-option-${c.key}`}
-        >
-          {currentKey === c.key && (
-            <span style={SELECTED_SWATCH_CHECK_STYLE}>{'\u2713'}</span>
-          )}
-        </button>
-      ))}
+      <AccentColorPicker
+        className="gap-1"
+        getOptionTestId={(key) => `tag-color-option-${key}`}
+        indicator="check"
+        selectedColor={currentKey}
+        onSelectColor={(colorKey) => onColorChange(tag, colorKey)}
+        size={16}
+        stopPropagation
+      />
     </div>
   )
 }
diff --git a/src/components/TypeCustomizePopover.tsx b/src/components/TypeCustomizePopover.tsx
index b0544ac1..049010de 100644
--- a/src/components/TypeCustomizePopover.tsx
+++ b/src/components/TypeCustomizePopover.tsx
@@ -1,12 +1,12 @@
 import { useState, useMemo, useCallback, useRef, useEffect } from 'react'
 import { MagnifyingGlass } from '@phosphor-icons/react'
 import { ICON_OPTIONS, type IconEntry } from '../utils/iconRegistry'
-import { ACCENT_COLORS } from '../utils/typeColors'
 import { cn } from '@/lib/utils'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Textarea } from '@/components/ui/textarea'
 import { translate, type AppLocale } from '../lib/i18n'
+import { AccentColorPicker } from './AccentColorPicker'
 
 function filterIcons(icons: IconEntry[], query: string): IconEntry[] {
   if (!query) return icons
@@ -51,17 +51,6 @@ interface TemplateSectionProps {
 
 const ICON_PICKER_ICON_SIZE = 18
 const ICON_PICKER_ICON_CLASS_NAME = 'size-[18px]'
-const COLOR_PICKER_ACCENT_COLORS = [
-  'red',
-  'orange',
-  'yellow',
-  'green',
-  'blue',
-  'purple',
-  'pink',
-  'gray',
-].map((key) => ACCENT_COLORS.find((color) => color.key === key) ?? null)
-  .filter((color): color is typeof ACCENT_COLORS[number] => color !== null)
 
 /** Debounce a callback by `delay` ms. Returns a stable ref-based wrapper. */
 function useDebouncedCallback(fn: (v: string) => void, delay: number): (v: string) => void {
@@ -81,29 +70,12 @@ function ColorSection({ selectedColor, locale, onSelectColor }: ColorSectionProp
   return (
     <>
       <div className="font-mono-overline mb-2 text-muted-foreground">{translate(locale, 'customize.color')}</div>
-      <div className="flex gap-2 mb-3 flex-wrap">
-        {COLOR_PICKER_ACCENT_COLORS.map((color) => (
-          <Button
-            key={color.key}
-            type="button"
-            variant="ghost"
-            size="icon-xs"
-            className={cn(
-              'h-6 w-6 rounded-full p-0 transition-transform',
-              selectedColor === color.key ? 'scale-110' : 'hover:scale-105',
-            )}
-            style={{
-              width: 24,
-              height: 24,
-              backgroundColor: color.css,
-              border: selectedColor === color.key ? '2px solid var(--foreground)' : '2px solid transparent',
-            }}
-            onClick={() => onSelectColor(color.key)}
-            title={color.label}
-            aria-label={color.label}
-          />
-        ))}
-      </div>
+      <AccentColorPicker
+        className="mb-3 gap-2"
+        selectedColor={selectedColor}
+        onSelectColor={onSelectColor}
+        size={24}
+      />
     </>
   )
 }
diff --git a/src/components/WikilinkSuggestionMenu.test.tsx b/src/components/WikilinkSuggestionMenu.test.tsx
new file mode 100644
index 00000000..13b97562
--- /dev/null
+++ b/src/components/WikilinkSuggestionMenu.test.tsx
@@ -0,0 +1,66 @@
+import { fireEvent, render, screen } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+import { WikilinkSuggestionMenu, type WikilinkSuggestionItem } from './WikilinkSuggestionMenu'
+
+const item: WikilinkSuggestionItem = {
+  title: 'Alpha',
+  path: '/vault/alpha.md',
+  onItemClick: vi.fn(),
+}
+
+describe('WikilinkSuggestionMenu', () => {
+  it('runs the item click once when the controller callback invokes the item action', () => {
+    const itemClick = vi.fn()
+    const controllerClick = vi.fn((clickedItem: WikilinkSuggestionItem) => clickedItem.onItemClick())
+
+    render(
+      <WikilinkSuggestionMenu
+        items={[{ ...item, onItemClick: itemClick }]}
+        loadingState="loaded"
+        selectedIndex={0}
+        onItemClick={controllerClick}
+      />,
+    )
+
+    fireEvent.mouseDown(screen.getByText('Alpha'))
+
+    expect(controllerClick).toHaveBeenCalledOnce()
+    expect(controllerClick).toHaveBeenCalledWith(expect.objectContaining({ title: 'Alpha' }))
+    expect(itemClick).toHaveBeenCalledOnce()
+  })
+
+  it('falls back to the item click handler when the controller callback only closes the menu', () => {
+    const controllerClick = vi.fn()
+    const itemClick = vi.fn()
+
+    render(
+      <WikilinkSuggestionMenu
+        items={[{ ...item, onItemClick: itemClick }]}
+        loadingState="loaded"
+        selectedIndex={0}
+        onItemClick={controllerClick}
+      />,
+    )
+
+    fireEvent.mouseDown(screen.getByText('Alpha'))
+
+    expect(controllerClick).toHaveBeenCalledOnce()
+    expect(itemClick).toHaveBeenCalledOnce()
+  })
+
+  it('falls back to the item click handler when no controller callback is supplied', () => {
+    const itemClick = vi.fn()
+
+    render(
+      <WikilinkSuggestionMenu
+        items={[{ ...item, onItemClick: itemClick }]}
+        loadingState="loaded"
+        selectedIndex={0}
+      />,
+    )
+
+    fireEvent.mouseDown(screen.getByText('Alpha'))
+
+    expect(itemClick).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/components/WikilinkSuggestionMenu.tsx b/src/components/WikilinkSuggestionMenu.tsx
index 876886b0..4a314803 100644
--- a/src/components/WikilinkSuggestionMenu.tsx
+++ b/src/components/WikilinkSuggestionMenu.tsx
@@ -1,5 +1,6 @@
 import type { ComponentType, SVGAttributes } from 'react'
 import { NoteSearchList } from './NoteSearchList'
+import type { WorkspaceIdentity } from '../types'
 import './WikilinkSuggestionMenu.css'
 
 export interface WikilinkSuggestionItem {
@@ -12,6 +13,7 @@ export interface WikilinkSuggestionItem {
   aliases?: string[]
   entryTitle?: string
   path?: string
+  workspace?: WorkspaceIdentity | null
 }
 
 interface WikilinkSuggestionMenuProps {
@@ -21,6 +23,23 @@ interface WikilinkSuggestionMenuProps {
   onItemClick?: (item: WikilinkSuggestionItem) => void
 }
 
+function runSuggestionItemClickOnce(
+  item: WikilinkSuggestionItem,
+  onItemClick?: (item: WikilinkSuggestionItem) => void,
+): void {
+  let itemActionRan = false
+  const runItemAction = () => {
+    itemActionRan = true
+    item.onItemClick()
+  }
+
+  if (onItemClick) {
+    onItemClick({ ...item, onItemClick: runItemAction })
+  }
+
+  if (!itemActionRan) runItemAction()
+}
+
 export function WikilinkSuggestionMenu({ items, selectedIndex, onItemClick }: WikilinkSuggestionMenuProps) {
   return (
     <div className="wikilink-menu">
@@ -28,10 +47,8 @@ export function WikilinkSuggestionMenu({ items, selectedIndex, onItemClick }: Wi
           items={items}
           selectedIndex={selectedIndex ?? 0}
           getItemKey={(item, i) => `${item.title}-${item.path ?? i}`}
-          onItemClick={(item) => {
-            item.onItemClick()
-            onItemClick?.(item)
-          }}
+          onItemClick={(item) => runSuggestionItemClickOnce(item, onItemClick)}
+          activateOnMouseDown
           emptyMessage="No results"
         />
     </div>
diff --git a/src/components/WorkspaceInitialsBadge.tsx b/src/components/WorkspaceInitialsBadge.tsx
new file mode 100644
index 00000000..271d078c
--- /dev/null
+++ b/src/components/WorkspaceInitialsBadge.tsx
@@ -0,0 +1,29 @@
+import { cn } from '@/lib/utils'
+import type { WorkspaceIdentity } from '../types'
+
+interface WorkspaceInitialsBadgeProps {
+  className?: string
+  testId?: string
+  workspace?: WorkspaceIdentity | null
+}
+
+export function WorkspaceInitialsBadge({ className, testId, workspace }: WorkspaceInitialsBadgeProps) {
+  if (!workspace) return null
+
+  const accentColor = workspace.color ? `var(--accent-${workspace.color})` : 'var(--muted-foreground)'
+
+  return (
+    <span
+      className={cn(
+        'inline-flex h-[16px] min-w-[18px] items-center justify-center rounded-sm border bg-transparent px-1 align-middle text-[9px] font-semibold opacity-75',
+        className,
+      )}
+      style={{ borderColor: accentColor, color: accentColor }}
+      title={`${workspace.label} (${workspace.alias})`}
+      aria-label={`Workspace ${workspace.label}`}
+      data-testid={testId}
+    >
+      {workspace.shortLabel}
+    </span>
+  )
+}
diff --git a/src/components/WorkspaceSelector.test.tsx b/src/components/WorkspaceSelector.test.tsx
new file mode 100644
index 00000000..685b7355
--- /dev/null
+++ b/src/components/WorkspaceSelector.test.tsx
@@ -0,0 +1,89 @@
+import type { ComponentProps } from 'react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+import type { WorkspaceIdentity } from '../types'
+import { WorkspaceSelector } from './WorkspaceSelector'
+
+const personalWorkspace: WorkspaceIdentity = {
+  id: 'personal',
+  label: 'Personal',
+  alias: 'personal',
+  path: '/personal',
+  shortLabel: 'PE',
+  color: 'green',
+  icon: null,
+  mounted: true,
+  available: true,
+  defaultForNewNotes: true,
+}
+
+const teamWorkspace: WorkspaceIdentity = {
+  id: 'team',
+  label: 'Team',
+  alias: 'team',
+  path: '/team',
+  shortLabel: 'TE',
+  color: 'purple',
+  icon: null,
+  mounted: true,
+  available: true,
+  defaultForNewNotes: false,
+}
+
+function renderWorkspaceSelector(overrides: Partial<ComponentProps<typeof WorkspaceSelector>> = {}) {
+  const onChangeWorkspace = vi.fn()
+  render(
+    <WorkspaceSelector
+      currentWorkspace={personalWorkspace}
+      workspaces={[personalWorkspace, teamWorkspace]}
+      onChangeWorkspace={onChangeWorkspace}
+      {...overrides}
+    />,
+  )
+  return { onChangeWorkspace }
+}
+
+function openWorkspaceCombobox() {
+  fireEvent.pointerDown(screen.getByRole('combobox'), { button: 0, pointerType: 'mouse' })
+}
+
+describe('WorkspaceSelector', () => {
+  it('renders the current workspace above properties as a chip-style combobox', () => {
+    renderWorkspaceSelector()
+
+    expect(screen.getByTestId('workspace-selector')).toBeInTheDocument()
+    const trigger = screen.getByRole('combobox', { name: /personal/i })
+    expect(trigger.getAttribute('style')).toContain('color: var(--accent-green)')
+    expect(trigger.getAttribute('style')).toContain('background: var(--accent-green-light)')
+  })
+
+  it('filters workspaces and selects a different workspace', () => {
+    const { onChangeWorkspace } = renderWorkspaceSelector()
+
+    openWorkspaceCombobox()
+    fireEvent.change(screen.getByTestId('workspace-selector-search-input'), { target: { value: 'tea' } })
+    fireEvent.click(screen.getByRole('option', { name: 'Team' }))
+
+    expect(onChangeWorkspace).toHaveBeenCalledWith(teamWorkspace)
+  })
+
+  it('handles rejected workspace changes without an unhandled rejection', async () => {
+    const error = new Error('move failed')
+    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
+    renderWorkspaceSelector({ onChangeWorkspace: vi.fn().mockRejectedValue(error) })
+
+    openWorkspaceCombobox()
+    fireEvent.click(screen.getByRole('option', { name: 'Team' }))
+
+    await waitFor(() => {
+      expect(consoleError).toHaveBeenCalledWith('Failed to change workspace:', error)
+    })
+    consoleError.mockRestore()
+  })
+
+  it('stays hidden when only one workspace is available', () => {
+    renderWorkspaceSelector({ workspaces: [personalWorkspace] })
+
+    expect(screen.queryByTestId('workspace-selector')).not.toBeInTheDocument()
+  })
+})
diff --git a/src/components/WorkspaceSelector.tsx b/src/components/WorkspaceSelector.tsx
new file mode 100644
index 00000000..64be858e
--- /dev/null
+++ b/src/components/WorkspaceSelector.tsx
@@ -0,0 +1,396 @@
+import { CaretUpDown, Check } from '@phosphor-icons/react'
+import { useEffect, useId, useMemo, useRef, useState, type KeyboardEvent, type PointerEvent } from 'react'
+import type { WorkspaceIdentity } from '../types'
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Popover, PopoverAnchor, PopoverContent } from '@/components/ui/popover'
+import { cn } from '@/lib/utils'
+import { translate, type AppLocale } from '../lib/i18n'
+import { PROPERTY_CHIP_STYLE } from './propertyChipStyles'
+import {
+  PROPERTY_PANEL_LABEL_CLASS_NAME,
+  PROPERTY_PANEL_ROW_STYLE,
+} from './propertyPanelLayout'
+
+const MIN_POPOVER_WIDTH = 220
+const OPEN_COMBOBOX_KEYS = new Set(['ArrowDown', 'ArrowUp', 'Enter', ' '])
+
+interface WorkspaceSelectorProps {
+  currentWorkspace?: WorkspaceIdentity | null
+  locale?: AppLocale
+  onChangeWorkspace?: (workspace: WorkspaceIdentity) => void | Promise<void>
+  workspaces: WorkspaceIdentity[]
+}
+
+function normalizeWorkspaceQuery(query: string): string {
+  return query.trim().toLowerCase()
+}
+
+function workspaceColor(workspace?: WorkspaceIdentity | null): string | undefined {
+  return workspace?.color ? `var(--accent-${workspace.color})` : undefined
+}
+
+function workspaceLightColor(workspace?: WorkspaceIdentity | null): string | undefined {
+  return workspace?.color ? `var(--accent-${workspace.color}-light)` : undefined
+}
+
+function uniqueWorkspaceOptions(
+  workspaces: WorkspaceIdentity[],
+  currentWorkspace?: WorkspaceIdentity | null,
+): WorkspaceIdentity[] {
+  const byPath = new Map<string, WorkspaceIdentity>()
+  for (const workspace of workspaces) {
+    if (workspace.available === false || workspace.mounted === false) continue
+    byPath.set(workspace.path, workspace)
+  }
+  if (currentWorkspace) byPath.set(currentWorkspace.path, currentWorkspace)
+  return [...byPath.values()].sort((left, right) => left.label.localeCompare(right.label))
+}
+
+function buildWorkspaceOptions({
+  currentWorkspace,
+  query,
+  workspaces,
+}: {
+  currentWorkspace?: WorkspaceIdentity | null
+  query: string
+  workspaces: WorkspaceIdentity[]
+}): WorkspaceIdentity[] {
+  const normalizedQuery = normalizeWorkspaceQuery(query)
+  return uniqueWorkspaceOptions(workspaces, currentWorkspace).filter((workspace) => {
+    if (normalizedQuery === '') return true
+    return workspace.label.toLowerCase().includes(normalizedQuery)
+      || workspace.alias.toLowerCase().includes(normalizedQuery)
+  })
+}
+
+function initialHighlightedIndex({
+  currentWorkspace,
+  options,
+}: {
+  currentWorkspace?: WorkspaceIdentity | null
+  options: WorkspaceIdentity[]
+}): number {
+  if (options.length === 0) return -1
+  const currentIndex = options.findIndex((workspace) => workspace.path === currentWorkspace?.path)
+  return currentIndex >= 0 ? currentIndex : 0
+}
+
+function stepHighlightedIndex(current: number, optionsLength: number, direction: 'next' | 'previous') {
+  if (optionsLength === 0) return -1
+  if (current < 0) return direction === 'next' ? 0 : optionsLength - 1
+  return direction === 'next'
+    ? (current + 1) % optionsLength
+    : (current - 1 + optionsLength) % optionsLength
+}
+
+function shouldOpenCombobox(event: KeyboardEvent<HTMLButtonElement>) {
+  return OPEN_COMBOBOX_KEYS.has(event.key)
+}
+
+function reportWorkspaceChangeFailure(error: unknown) {
+  console.error('Failed to change workspace:', error)
+}
+
+function WorkspaceRowLabel({ locale }: { locale: AppLocale }) {
+  return (
+    <span className={PROPERTY_PANEL_LABEL_CLASS_NAME}>
+      <span className="min-w-0 truncate">{translate(locale, 'inspector.properties.workspace')}</span>
+    </span>
+  )
+}
+
+function WorkspaceSelectorValue({
+  currentWorkspace,
+  locale,
+}: {
+  currentWorkspace?: WorkspaceIdentity | null
+  locale: AppLocale
+}) {
+  if (!currentWorkspace) {
+    return <span className="truncate text-muted-foreground">{translate(locale, 'inspector.properties.none')}</span>
+  }
+  return <span className="min-w-0 truncate">{currentWorkspace.label}</span>
+}
+
+function ReadOnlyWorkspaceSelector({
+  currentWorkspace,
+  locale,
+}: {
+  currentWorkspace?: WorkspaceIdentity | null
+  locale: AppLocale
+}) {
+  if (!currentWorkspace) return null
+  return (
+    <div className="grid min-h-7 min-w-0 grid-cols-2 items-center gap-2 px-1.5" style={PROPERTY_PANEL_ROW_STYLE}>
+      <WorkspaceRowLabel locale={locale} />
+      <span
+        className="min-w-0 max-w-full truncate text-[12px] font-medium"
+        style={{
+          ...PROPERTY_CHIP_STYLE,
+          background: workspaceLightColor(currentWorkspace) ?? 'var(--muted)',
+          color: workspaceColor(currentWorkspace) ?? 'var(--secondary-foreground)',
+          display: 'inline-flex',
+          alignItems: 'center',
+        }}
+        title={currentWorkspace.label}
+      >
+        {currentWorkspace.label}
+      </span>
+    </div>
+  )
+}
+
+export function WorkspaceSelector({
+  currentWorkspace,
+  locale = 'en',
+  onChangeWorkspace,
+  workspaces,
+}: WorkspaceSelectorProps) {
+  const optionsForVisibility = useMemo(
+    () => uniqueWorkspaceOptions(workspaces, currentWorkspace),
+    [currentWorkspace, workspaces],
+  )
+
+  if (!currentWorkspace || optionsForVisibility.length <= 1) return null
+  if (!onChangeWorkspace) {
+    return <ReadOnlyWorkspaceSelector currentWorkspace={currentWorkspace} locale={locale} />
+  }
+
+  return (
+    <EditableWorkspaceSelector
+      currentWorkspace={currentWorkspace}
+      locale={locale}
+      onChangeWorkspace={onChangeWorkspace}
+      workspaces={optionsForVisibility}
+    />
+  )
+}
+
+function EditableWorkspaceSelector({
+  currentWorkspace,
+  locale,
+  onChangeWorkspace,
+  workspaces,
+}: {
+  currentWorkspace: WorkspaceIdentity
+  locale: AppLocale
+  onChangeWorkspace: (workspace: WorkspaceIdentity) => void | Promise<void>
+  workspaces: WorkspaceIdentity[]
+}) {
+  const [open, setOpen] = useState(false)
+  const [query, setQuery] = useState('')
+  const [highlightedIndex, setHighlightedIndex] = useState(-1)
+  const [contentWidth, setContentWidth] = useState(MIN_POPOVER_WIDTH)
+  const rootRef = useRef<HTMLDivElement>(null)
+  const inputRef = useRef<HTMLInputElement>(null)
+  const listRef = useRef<HTMLDivElement>(null)
+  const listboxId = useId()
+  const options = useMemo(
+    () => buildWorkspaceOptions({ currentWorkspace, query, workspaces }),
+    [currentWorkspace, query, workspaces],
+  )
+
+  useEffect(() => {
+    if (!open) return
+
+    const updateWidth = () => {
+      const nextWidth = rootRef.current?.getBoundingClientRect().width ?? MIN_POPOVER_WIDTH
+      setContentWidth(Math.max(nextWidth, MIN_POPOVER_WIDTH))
+    }
+
+    updateWidth()
+    const frame = requestAnimationFrame(() => inputRef.current?.focus())
+    window.addEventListener('resize', updateWidth)
+    return () => {
+      cancelAnimationFrame(frame)
+      window.removeEventListener('resize', updateWidth)
+    }
+  }, [open])
+
+  const openCombobox = () => {
+    const nextOptions = buildWorkspaceOptions({ currentWorkspace, query: '', workspaces })
+    setQuery('')
+    setHighlightedIndex(initialHighlightedIndex({ currentWorkspace, options: nextOptions }))
+    setOpen(true)
+  }
+
+  const closeCombobox = () => {
+    setOpen(false)
+    setQuery('')
+    setHighlightedIndex(-1)
+  }
+
+  const selectWorkspace = (workspace: WorkspaceIdentity) => {
+    if (workspace.path !== currentWorkspace.path) {
+      void Promise.resolve(onChangeWorkspace(workspace)).catch(reportWorkspaceChangeFailure)
+    }
+    closeCombobox()
+  }
+
+  const handleOpenChange = (nextOpen: boolean) => {
+    if (nextOpen) {
+      openCombobox()
+      return
+    }
+    closeCombobox()
+  }
+
+  const scrollHighlightedOptionIntoView = (index: number) => {
+    if (index < 0) return
+    listRef.current?.querySelector<HTMLElement>(`[data-index="${index}"]`)?.scrollIntoView({ block: 'nearest' })
+  }
+
+  const moveHighlight = (direction: 'next' | 'previous') => {
+    setHighlightedIndex((current) => {
+      const nextIndex = stepHighlightedIndex(current, options.length, direction)
+      scrollHighlightedOptionIntoView(nextIndex)
+      return nextIndex
+    })
+  }
+
+  const handleTriggerPointerDown = (event: PointerEvent<HTMLButtonElement>) => {
+    if (event.button !== 0) return
+    event.preventDefault()
+    openCombobox()
+  }
+
+  const handleTriggerKeyDown = (event: KeyboardEvent<HTMLButtonElement>) => {
+    if (!shouldOpenCombobox(event)) return
+    event.preventDefault()
+    openCombobox()
+  }
+
+  const handleSearchChange = (nextQuery: string) => {
+    const nextOptions = buildWorkspaceOptions({ currentWorkspace, query: nextQuery, workspaces })
+    setQuery(nextQuery)
+    setHighlightedIndex(nextOptions.length > 0 ? 0 : -1)
+  }
+
+  const handleSearchKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+    switch (event.key) {
+      case 'ArrowDown':
+        event.preventDefault()
+        moveHighlight('next')
+        return
+      case 'ArrowUp':
+        event.preventDefault()
+        moveHighlight('previous')
+        return
+      case 'Enter': {
+        const selected = options.at(highlightedIndex)
+        if (!selected) return
+        event.preventDefault()
+        selectWorkspace(selected)
+        return
+      }
+      case 'Escape':
+        event.preventDefault()
+        closeCombobox()
+        return
+      default:
+        return
+    }
+  }
+
+  return (
+    <div
+      className="grid min-h-7 min-w-0 grid-cols-2 items-center gap-2 px-1.5"
+      style={PROPERTY_PANEL_ROW_STYLE}
+      data-testid="workspace-selector"
+    >
+      <WorkspaceRowLabel locale={locale} />
+      <div className="flex min-w-0 items-center justify-start">
+        <Popover open={open} onOpenChange={handleOpenChange}>
+          <PopoverAnchor asChild>
+            <div ref={rootRef} className="min-w-0">
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                role="combobox"
+                aria-label={currentWorkspace.label}
+                aria-controls={listboxId}
+                aria-expanded={open}
+                aria-haspopup="listbox"
+                className={cn(
+                  'h-auto max-w-full justify-between gap-1 border-none px-2 shadow-none ring-inset [&_svg]:text-current',
+                  'hover:ring-1 hover:ring-current',
+                )}
+                style={{
+                  ...PROPERTY_CHIP_STYLE,
+                  background: workspaceLightColor(currentWorkspace) ?? undefined,
+                  color: workspaceColor(currentWorkspace) ?? undefined,
+                }}
+                onPointerDown={handleTriggerPointerDown}
+                onKeyDown={handleTriggerKeyDown}
+              >
+                <span className="flex min-w-0 items-center truncate">
+                  <WorkspaceSelectorValue currentWorkspace={currentWorkspace} locale={locale} />
+                </span>
+                <CaretUpDown size={14} aria-hidden="true" />
+              </Button>
+            </div>
+          </PopoverAnchor>
+          <PopoverContent
+            align="start"
+            side="left"
+            sideOffset={4}
+            className="overflow-hidden p-1"
+            style={{ width: contentWidth }}
+            onOpenAutoFocus={(event) => event.preventDefault()}
+            onCloseAutoFocus={(event) => event.preventDefault()}
+          >
+            <div className="border-b border-border p-1">
+              <Input
+                ref={inputRef}
+                value={query}
+                placeholder={translate(locale, 'inspector.properties.searchWorkspaces')}
+                autoComplete="off"
+                aria-label={translate(locale, 'inspector.properties.searchWorkspaces')}
+                className="h-8 text-sm"
+                data-testid="workspace-selector-search-input"
+                onChange={(event) => handleSearchChange(event.target.value)}
+                onKeyDown={handleSearchKeyDown}
+              />
+            </div>
+            <div ref={listRef} className="max-h-60 overflow-y-auto p-1">
+              {options.length === 0 ? (
+                <div className="px-2 py-6 text-center text-sm text-muted-foreground">
+                  {translate(locale, 'inspector.properties.noMatchingWorkspaces')}
+                </div>
+              ) : (
+                <div id={listboxId} role="listbox">
+                  {options.map((workspace, index) => {
+                    const selected = workspace.path === currentWorkspace.path
+                    const highlighted = index === highlightedIndex
+                    return (
+                      <Button
+                        key={workspace.path}
+                        type="button"
+                        variant="ghost"
+                        size="sm"
+                        role="option"
+                        aria-selected={selected}
+                        data-index={index}
+                        className={cn(
+                          'h-auto w-full justify-between px-2 py-1.5 text-left font-normal',
+                          highlighted && 'bg-muted',
+                        )}
+                        onMouseEnter={() => setHighlightedIndex(index)}
+                        onClick={() => selectWorkspace(workspace)}
+                      >
+                        <span className="min-w-0 truncate">{workspace.label}</span>
+                        {selected ? <Check size={14} aria-hidden="true" /> : null}
+                      </Button>
+                    )
+                  })}
+                </div>
+              )}
+            </div>
+          </PopoverContent>
+        </Popover>
+      </div>
+    </div>
+  )
+}
diff --git a/src/components/WorkspaceSettingsSection.tsx b/src/components/WorkspaceSettingsSection.tsx
new file mode 100644
index 00000000..cbf67609
--- /dev/null
+++ b/src/components/WorkspaceSettingsSection.tsx
@@ -0,0 +1,314 @@
+import { Info } from '@phosphor-icons/react'
+import { Trash2 } from 'lucide-react'
+import { type KeyboardEvent, useState } from 'react'
+import { Button } from './ui/button'
+import { Input } from './ui/input'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip'
+import { ConfirmDeleteDialog } from './ConfirmDeleteDialog'
+import { SettingsGroup, SettingsGroupItem, SettingsSwitchRow } from './SettingsControls'
+import { createTranslator, type AppLocale } from '../lib/i18n'
+import { trackEvent } from '../lib/telemetry'
+import type { VaultOption } from './status-bar/types'
+import { workspaceIdentityFromVault } from '../utils/workspaces'
+import { AccentColorPicker } from './AccentColorPicker'
+
+interface WorkspaceSettingsSectionProps {
+  defaultWorkspacePath?: string | null
+  enabled: boolean
+  locale: AppLocale
+  onEnabledChange: (enabled: boolean) => void
+  onRemoveVault?: (path: string) => void
+  onSetDefaultWorkspace?: (path: string) => void
+  onUpdateWorkspaceIdentity?: (path: string, patch: Partial<VaultOption>) => void
+  vaults: VaultOption[]
+}
+
+function workspaceInputId(alias: string, field: 'name' | 'label' | 'slug'): string {
+  return `settings-workspace-${alias}-${field}`
+}
+
+function sanitizeWorkspaceShortLabel(value: string): string {
+  return value.trim().toUpperCase().slice(0, 3)
+}
+
+function WorkspaceFieldLabel({
+  htmlFor,
+  label,
+  tooltip,
+}: {
+  htmlFor: string
+  label: string
+  tooltip: string
+}) {
+  return (
+    <div className="flex min-w-0 items-center gap-1">
+      <label className="truncate text-[11px] font-medium text-muted-foreground" htmlFor={htmlFor}>
+        {label}
+      </label>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon-xs"
+            className="h-4 w-4 shrink-0 rounded-full p-0 text-muted-foreground hover:bg-muted hover:text-foreground"
+            aria-label={tooltip}
+          >
+            <Info size={12} />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side="top" align="start">{tooltip}</TooltipContent>
+      </Tooltip>
+    </div>
+  )
+}
+
+function WorkspaceIdentityInputs({
+  canEdit,
+  locale,
+  onUpdateWorkspaceIdentity,
+  vault,
+}: Pick<WorkspaceSettingsSectionProps, 'locale' | 'onUpdateWorkspaceIdentity'> & {
+  canEdit: boolean
+  vault: VaultOption
+}) {
+  const t = createTranslator(locale)
+  const workspace = workspaceIdentityFromVault(vault)
+  const nameId = workspaceInputId(workspace.alias, 'name')
+  const labelId = workspaceInputId(workspace.alias, 'label')
+  const slugId = workspaceInputId(workspace.alias, 'slug')
+  const savedNameDraft = vault.label ?? ''
+  const savedShortLabelDraft = sanitizeWorkspaceShortLabel(vault.shortLabel || workspace.shortLabel)
+  const [nameDraft, setNameDraft] = useState(savedNameDraft)
+  const [shortLabelDraft, setShortLabelDraft] = useState(savedShortLabelDraft)
+
+  const commitNameDraft = () => {
+    if (!canEdit || nameDraft === savedNameDraft) return
+    onUpdateWorkspaceIdentity?.(vault.path, { label: nameDraft })
+  }
+
+  const commitShortLabelDraft = () => {
+    const normalizedShortLabel = sanitizeWorkspaceShortLabel(shortLabelDraft)
+    if (!canEdit || normalizedShortLabel === savedShortLabelDraft) return
+    onUpdateWorkspaceIdentity?.(vault.path, { shortLabel: normalizedShortLabel })
+  }
+
+  const blurOnEnter = (event: KeyboardEvent<HTMLInputElement>) => {
+    if (event.key === 'Enter') {
+      event.currentTarget.blur()
+    }
+  }
+
+  return (
+    <div className="grid gap-2 sm:grid-cols-[minmax(0,1fr)_minmax(80px,0.28fr)_minmax(140px,0.55fr)]">
+      <div className="grid gap-1.5">
+        <WorkspaceFieldLabel
+          htmlFor={nameId}
+          label={t('settings.workspaces.name')}
+          tooltip={t('settings.workspaces.nameTooltip')}
+        />
+        <Input
+          id={nameId}
+          value={nameDraft}
+          onChange={(event) => setNameDraft(event.target.value)}
+          onBlur={commitNameDraft}
+          onKeyDown={blurOnEnter}
+          aria-label={t('settings.workspaces.nameAria', { label: workspace.label })}
+          disabled={!canEdit}
+          className="h-8 bg-transparent"
+        />
+      </div>
+      <div className="grid gap-1.5">
+        <WorkspaceFieldLabel
+          htmlFor={labelId}
+          label={t('settings.workspaces.label')}
+          tooltip={t('settings.workspaces.labelTooltip')}
+        />
+        <Input
+          id={labelId}
+          value={shortLabelDraft}
+          maxLength={3}
+          onChange={(event) => setShortLabelDraft(sanitizeWorkspaceShortLabel(event.target.value))}
+          onBlur={commitShortLabelDraft}
+          onKeyDown={blurOnEnter}
+          aria-label={t('settings.workspaces.labelAria', { label: workspace.label })}
+          disabled={!canEdit}
+          className="h-8 bg-transparent uppercase"
+        />
+      </div>
+      <div className="grid gap-1.5">
+        <WorkspaceFieldLabel
+          htmlFor={slugId}
+          label={t('settings.workspaces.slug')}
+          tooltip={t('settings.workspaces.slugTooltip')}
+        />
+        <Input
+          id={slugId}
+          value={vault.alias ?? workspace.alias}
+          aria-label={t('settings.workspaces.slugAria', { label: workspace.label })}
+          readOnly
+          aria-readonly="true"
+          className="h-8 cursor-default bg-muted/30 text-muted-foreground"
+        />
+      </div>
+    </div>
+  )
+}
+
+function WorkspaceRowActions({
+  canEdit,
+  locale,
+  onSetDefaultWorkspace,
+  onUpdateWorkspaceIdentity,
+  onRemoveVault,
+  workspace,
+  vault,
+}: Pick<WorkspaceSettingsSectionProps, 'locale' | 'onRemoveVault' | 'onSetDefaultWorkspace' | 'onUpdateWorkspaceIdentity'> & {
+  canEdit: boolean
+  workspace: ReturnType<typeof workspaceIdentityFromVault>
+  vault: VaultOption
+}) {
+  const t = createTranslator(locale)
+  const removeLabel = t('settings.workspaces.removeAria', { label: workspace.label })
+
+  return (
+    <div className="flex shrink-0 flex-wrap items-center justify-end gap-3">
+      <AccentColorPicker
+        className="gap-1.5"
+        disabled={!canEdit}
+        selectedColor={vault.color ?? null}
+        onSelectColor={(color) => onUpdateWorkspaceIdentity?.(vault.path, { color })}
+        size={18}
+      />
+      <Button
+        type="button"
+        variant="secondary"
+        size="xs"
+        onClick={() => {
+          onSetDefaultWorkspace?.(vault.path)
+          trackEvent('workspace_default_changed', { workspace_alias: workspace.alias })
+        }}
+        disabled={!onSetDefaultWorkspace || workspace.defaultForNewNotes}
+        data-testid={`settings-workspace-default-${workspace.alias}`}
+      >
+        {workspace.defaultForNewNotes
+          ? t('workspace.manager.default')
+          : t('workspace.manager.makeDefault')}
+      </Button>
+      {onRemoveVault && (
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon-sm"
+          onClick={() => onRemoveVault(vault.path)}
+          disabled={workspace.defaultForNewNotes}
+          aria-label={removeLabel}
+          title={removeLabel}
+          data-testid={`settings-workspace-remove-${workspace.alias}`}
+          className="text-muted-foreground hover:text-destructive"
+        >
+          <Trash2 size={15} />
+        </Button>
+      )}
+    </div>
+  )
+}
+
+function WorkspaceSettingsRow({
+  defaultWorkspacePath,
+  locale,
+  onSetDefaultWorkspace,
+  onUpdateWorkspaceIdentity,
+  onRemoveVault,
+  vault,
+}: Pick<WorkspaceSettingsSectionProps, 'defaultWorkspacePath' | 'locale' | 'onRemoveVault' | 'onSetDefaultWorkspace' | 'onUpdateWorkspaceIdentity'> & {
+  vault: VaultOption
+}) {
+  const workspace = workspaceIdentityFromVault(vault, { defaultWorkspacePath })
+  const canEdit = !!onUpdateWorkspaceIdentity && vault.path !== '' && !vault.managedDefault
+
+  return (
+    <div className="grid gap-3 px-4 py-4" data-testid={`settings-workspace-row-${workspace.alias}`}>
+      <div className="flex flex-wrap items-start justify-between gap-x-4 gap-y-2">
+        <div className="min-w-[220px] flex-1">
+          <div className="truncate text-sm font-medium text-foreground">{workspace.label}</div>
+          <div className="truncate text-[11px] text-muted-foreground">{workspace.path}</div>
+        </div>
+        <WorkspaceRowActions
+          canEdit={canEdit}
+          locale={locale}
+          onSetDefaultWorkspace={onSetDefaultWorkspace}
+          onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
+          onRemoveVault={onRemoveVault}
+          workspace={workspace}
+          vault={vault}
+        />
+      </div>
+      <WorkspaceIdentityInputs
+        canEdit={canEdit}
+        locale={locale}
+        onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
+        vault={vault}
+      />
+    </div>
+  )
+}
+
+export function WorkspaceSettingsSection({
+  defaultWorkspacePath,
+  enabled,
+  locale,
+  onEnabledChange,
+  onRemoveVault,
+  onSetDefaultWorkspace,
+  onUpdateWorkspaceIdentity,
+  vaults,
+}: WorkspaceSettingsSectionProps) {
+  const t = createTranslator(locale)
+  const [vaultPendingRemoval, setVaultPendingRemoval] = useState<VaultOption | null>(null)
+  const pendingRemovalIdentity = vaultPendingRemoval ? workspaceIdentityFromVault(vaultPendingRemoval, { defaultWorkspacePath }) : null
+
+  return (
+    <TooltipProvider>
+      <SettingsGroup>
+        <SettingsSwitchRow
+          label={t('settings.workspaces.enable')}
+          description={t('settings.workspaces.enableDescription')}
+          checked={enabled}
+          onChange={onEnabledChange}
+          testId="settings-multi-workspace-enabled"
+        />
+        {enabled && (
+          <SettingsGroupItem testId="settings-workspace-list">
+            <div className="-mx-4 divide-y divide-border">
+              {vaults.map((vault) => (
+                <WorkspaceSettingsRow
+                  key={vault.path}
+                  defaultWorkspacePath={defaultWorkspacePath}
+                  locale={locale}
+                  onSetDefaultWorkspace={onSetDefaultWorkspace}
+                  onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
+                  onRemoveVault={onRemoveVault ? () => setVaultPendingRemoval(vault) : undefined}
+                  vault={vault}
+                />
+              ))}
+            </div>
+          </SettingsGroupItem>
+        )}
+      </SettingsGroup>
+      <ConfirmDeleteDialog
+        open={!!vaultPendingRemoval}
+        title={t('status.vault.removeConfirmTitle')}
+        message={t('status.vault.removeConfirmMessage', { label: pendingRemovalIdentity?.label ?? '' })}
+        confirmLabel={t('status.vault.removeConfirmAction')}
+        onCancel={() => setVaultPendingRemoval(null)}
+        onConfirm={() => {
+          if (vaultPendingRemoval) {
+            onRemoveVault?.(vaultPendingRemoval.path)
+          }
+          setVaultPendingRemoval(null)
+        }}
+      />
+    </TooltipProvider>
+  )
+}
diff --git a/src/components/editor-content/EditorContentLayout.tsx b/src/components/editor-content/EditorContentLayout.tsx
index befce577..c79bca50 100644
--- a/src/components/editor-content/EditorContentLayout.tsx
+++ b/src/components/editor-content/EditorContentLayout.tsx
@@ -143,6 +143,7 @@ function RawModeEditorSection({
         content={rawModeContent ?? activeTab.content}
         path={activeTab.entry.path}
         entries={entries}
+        sourceEntry={activeTab.entry}
         findRequest={findRequest}
         onContentChange={onRawContentChange ?? (() => {})}
         onSave={onSave ?? (() => {})}
@@ -352,6 +353,7 @@ function EditorCanvas({
   showEditor,
   cssVars,
   editor,
+  activeTab,
   entries,
   onNavigateWikilink,
   onEditorChange,
@@ -363,6 +365,7 @@ function EditorCanvas({
   | 'showEditor'
   | 'cssVars'
   | 'editor'
+  | 'activeTab'
   | 'entries'
   | 'onNavigateWikilink'
   | 'onEditorChange'
@@ -383,6 +386,7 @@ function EditorCanvas({
           entries={entries}
           onNavigateWikilink={onNavigateWikilink}
           onChange={onEditorChange}
+          sourceEntry={activeTab?.entry ?? null}
           vaultPath={vaultPath}
           editable={!isDeletedPreview}
           locale={locale}
@@ -510,6 +514,7 @@ export function EditorContentLayout(model: EditorContentModel) {
           <EditorCanvas
             showEditor={showEditor}
             cssVars={cssVars}
+            activeTab={activeTab}
             vaultPath={vaultPath}
             editor={editor}
             entries={entries}
diff --git a/src/components/folder-tree/FolderItemRow.tsx b/src/components/folder-tree/FolderItemRow.tsx
index d82eb4e6..1ed2b650 100644
--- a/src/components/folder-tree/FolderItemRow.tsx
+++ b/src/components/folder-tree/FolderItemRow.tsx
@@ -17,7 +17,8 @@ interface FolderItemRowProps {
   onOpenMenu: (node: FolderNode, event: ReactMouseEvent<HTMLDivElement>) => void
   onSelect: () => void
   onStartRenameFolder?: (folderPath: string) => void
-  onToggle: (path: string) => void
+  onToggle: () => void
+  canOpenMenu?: boolean
 }
 
 export function FolderItemRow({
@@ -30,13 +31,14 @@ export function FolderItemRow({
   onSelect,
   onStartRenameFolder,
   onToggle,
+  canOpenMenu = true,
 }: FolderItemRowProps) {
   const hasChildren = node.children.length > 0
   const { handleRenameDoubleClick, handleSelectClick } = useFolderRowInteractions({
     hasChildren,
     onRenameFolder: onStartRenameFolder ? () => onStartRenameFolder(node.path) : undefined,
     onSelect,
-    onToggle: () => onToggle(node.path),
+    onToggle,
   })
 
   return (
@@ -49,6 +51,10 @@ export function FolderItemRow({
       )}
       style={{ paddingLeft: depthIndent, borderRadius: 4 }}
       onContextMenu={(event) => {
+        if (!canOpenMenu) {
+          event.preventDefault()
+          return
+        }
         onSelect()
         onOpenMenu(node, event)
       }}
diff --git a/src/components/folder-tree/FolderTreeRow.tsx b/src/components/folder-tree/FolderTreeRow.tsx
index 80fc61ca..1364d5ae 100644
--- a/src/components/folder-tree/FolderTreeRow.tsx
+++ b/src/components/folder-tree/FolderTreeRow.tsx
@@ -3,6 +3,7 @@ import type { FolderNode, SidebarSelection } from '../../types'
 import { FolderNameInput } from './FolderNameInput'
 import { FolderItemRow } from './FolderItemRow'
 import { FOLDER_ROW_CONTENT_INSET, getFolderConnectorLeft, getFolderDepthIndent } from './folderTreeLayout'
+import { folderNodeKey } from './folderTreeUtils'
 import { translate, type AppLocale } from '../../lib/i18n'
 
 interface FolderTreeRowProps {
@@ -69,7 +70,7 @@ function FolderChildren({
   rootPath,
   selection,
 }: FolderTreeRowProps) {
-  const isExpanded = expanded[node.path] ?? false
+  const isExpanded = expanded[folderNodeKey({ path: node.path, rootPath: node.rootPath ?? rootPath })] ?? false
   const hasChildren = node.children.length > 0
   if (!isExpanded || !hasChildren) return null
 
@@ -82,7 +83,7 @@ function FolderChildren({
       />
       {node.children.map((child) => (
         <FolderTreeRow
-          key={child.path}
+          key={folderNodeKey({ path: child.path, rootPath: child.rootPath ?? rootPath })}
           depth={depth + 1}
           expanded={expanded}
           node={child}
@@ -103,6 +104,19 @@ function FolderChildren({
   )
 }
 
+function folderSelectionMatches(
+  selection: SidebarSelection,
+  node: FolderNode,
+  defaultRootPath?: string,
+): boolean {
+  if (selection.kind !== 'folder' || selection.path !== node.path) return false
+
+  const nodeRootPath = node.rootPath ?? defaultRootPath
+  if (!nodeRootPath) return !selection.rootPath
+  if (selection.rootPath) return selection.rootPath === nodeRootPath
+  return nodeRootPath === defaultRootPath
+}
+
 export const FolderTreeRow = memo(function FolderTreeRow({
   depth,
   expanded,
@@ -119,17 +133,23 @@ export const FolderTreeRow = memo(function FolderTreeRow({
   rootPath,
   selection,
 }: FolderTreeRowProps) {
-  const isExpanded = expanded[node.path] ?? false
-  const isRenaming = renamingFolderPath === node.path
-  const isSelected = selection.kind === 'folder' && selection.path === node.path
-  const canMutateFolder = node.path.length > 0
+  const nodeKey = folderNodeKey({ path: node.path, rootPath: node.rootPath ?? rootPath })
+  const nodeRootPath = node.rootPath ?? rootPath
+  const isExpanded = expanded[nodeKey] ?? false
+  const isSelected = folderSelectionMatches(selection, { ...node, rootPath: nodeRootPath }, rootPath)
+  const canUseDefaultFolderActions = !nodeRootPath || nodeRootPath === rootPath
+  const canMutateFolder = node.path.length > 0 && canUseDefaultFolderActions
+  const isRenaming = canMutateFolder && renamingFolderPath === node.path
   const depthIndent = getFolderDepthIndent(depth)
   const contentInset = FOLDER_ROW_CONTENT_INSET
   const selectFolder = useCallback(() => {
-    onSelect(node.path === '' ? { kind: 'folder', path: '', rootPath } : { kind: 'folder', path: node.path })
-  }, [node.path, onSelect, rootPath])
+    onSelect(nodeRootPath
+      ? { kind: 'folder', path: node.path, rootPath: nodeRootPath }
+      : { kind: 'folder', path: node.path })
+  }, [node.path, nodeRootPath, onSelect])
   const row = (
     <FolderItemRow
+      canOpenMenu={canUseDefaultFolderActions}
       contentInset={contentInset}
       depthIndent={depthIndent}
       isExpanded={isExpanded}
@@ -138,7 +158,7 @@ export const FolderTreeRow = memo(function FolderTreeRow({
       onOpenMenu={onOpenMenu}
       onSelect={selectFolder}
       onStartRenameFolder={canMutateFolder ? onStartRenameFolder : undefined}
-      onToggle={onToggle}
+      onToggle={() => onToggle(nodeKey)}
     />
   )
 
diff --git a/src/components/folder-tree/folderTreeUtils.ts b/src/components/folder-tree/folderTreeUtils.ts
index 535a4d13..2d631d54 100644
--- a/src/components/folder-tree/folderTreeUtils.ts
+++ b/src/components/folder-tree/folderTreeUtils.ts
@@ -7,6 +7,15 @@ export function ancestorTreePaths(path: string): string[] {
   return expandedTreePaths(path).slice(0, -1)
 }
 
+export function folderNodeKey(node: { path: string; rootPath?: string | null }): string {
+  return node.rootPath ? `${node.rootPath}::${node.path}` : node.path
+}
+
+export function scopedFolderKeys(paths: string[], rootPath?: string | null): string[] {
+  if (!rootPath) return paths
+  return paths.map((path) => folderNodeKey({ path, rootPath }))
+}
+
 export function mergeExpandedPaths(
   current: Record<string, boolean>,
   paths: string[],
diff --git a/src/components/folder-tree/useFolderTreeDisclosure.ts b/src/components/folder-tree/useFolderTreeDisclosure.ts
index 0971558f..923fe03c 100644
--- a/src/components/folder-tree/useFolderTreeDisclosure.ts
+++ b/src/components/folder-tree/useFolderTreeDisclosure.ts
@@ -1,6 +1,6 @@
 import { useCallback, useMemo, useState } from 'react'
 import type { SidebarSelection } from '../../types'
-import { ancestorTreePaths, expandedTreePaths, mergeExpandedPaths } from './folderTreeUtils'
+import { ancestorTreePaths, expandedTreePaths, folderNodeKey, mergeExpandedPaths, scopedFolderKeys } from './folderTreeUtils'
 
 interface UseFolderTreeDisclosureInput {
   collapsed?: boolean
@@ -13,7 +13,10 @@ function useExpandedFolders(selection: SidebarSelection, renamingFolderPath?: st
   const [manualExpanded, setManualExpanded] = useState<Record<string, boolean>>({})
   const requiredExpandedPaths = useMemo(() => {
     const nextPaths: string[] = []
-    if (selection.kind === 'folder') nextPaths.push(...ancestorTreePaths(selection.path))
+    if (selection.kind === 'folder') {
+      if (selection.path && selection.rootPath) nextPaths.push(folderNodeKey({ path: '', rootPath: selection.rootPath }))
+      nextPaths.push(...scopedFolderKeys(ancestorTreePaths(selection.path), selection.rootPath))
+    }
     if (renamingFolderPath) nextPaths.push(...expandedTreePaths(renamingFolderPath))
     return [...new Set(nextPaths)]
   }, [renamingFolderPath, selection])
@@ -23,11 +26,11 @@ function useExpandedFolders(selection: SidebarSelection, renamingFolderPath?: st
     [manualExpanded, requiredExpandedPaths],
   )
 
-  const toggleFolder = useCallback((path: string) => {
+  const toggleFolder = useCallback((key: string) => {
     setManualExpanded((current) => {
-      const defaultExpanded = path === ''
+      const defaultExpanded = key.endsWith('::') || key === ''
       const next = { ...current }
-      Reflect.set(next, path, !((Reflect.get(current, path) as boolean | undefined) ?? defaultExpanded))
+      Reflect.set(next, key, !((Reflect.get(current, key) as boolean | undefined) ?? defaultExpanded))
       return next
     })
   }, [])
diff --git a/src/components/inspector/RelationshipsPanel.tsx b/src/components/inspector/RelationshipsPanel.tsx
index 7b57066a..9e24f947 100644
--- a/src/components/inspector/RelationshipsPanel.tsx
+++ b/src/components/inspector/RelationshipsPanel.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useCallback, useState, useRef, type ReactNode } from 'react'
+import { useMemo, useCallback, useState, useRef, type KeyboardEvent, type ReactNode } from 'react'
 import type { VaultEntry } from '../../types'
 import { Plus, X } from '@phosphor-icons/react'
 import type { ParsedFrontmatter } from '../../utils/frontmatter'
@@ -22,6 +22,8 @@ import {
 import { humanizePropertyKey } from '../../utils/propertyLabels'
 import { translate, type AppLocale } from '../../lib/i18n'
 import { canonicalFrontmatterKey } from '../../utils/systemMetadata'
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
 
 const RELATIONSHIP_SECTION_ROW_CLASS_NAME = 'flex min-w-0 flex-col gap-1 px-1.5'
 const RELATIONSHIPS_PANEL_GRID_CLASS_NAME = 'grid min-w-0 gap-x-2 gap-y-3'
@@ -44,6 +46,7 @@ type RelationshipPanelEditHandlers = {
 
 interface RelationshipLookupContext {
   entries: VaultEntry[]
+  sourceEntry?: VaultEntry
   vaultPath: string
 }
 
@@ -116,12 +119,12 @@ function inferVaultPath(entries: VaultEntry[]): string {
   return prefix.join('/')
 }
 
-function canonicalRefForEntry({ entry, vaultPath }: { entry: VaultEntry; vaultPath: string }): string {
-  return formatWikilinkRef(canonicalWikilinkTargetForEntry(entry, vaultPath))
+function canonicalRefForEntry({ entry, sourceEntry, vaultPath }: { entry: VaultEntry } & RelationshipLookupContext): string {
+  return formatWikilinkRef(canonicalWikilinkTargetForEntry(entry, vaultPath, sourceEntry))
 }
 
-function canonicalRefForTitle({ title, entries, vaultPath }: { title: string } & RelationshipLookupContext): string {
-  return formatWikilinkRef(canonicalWikilinkTargetForTitle(title, entries, vaultPath))
+function canonicalRefForTitle({ title, entries, sourceEntry, vaultPath }: { title: string } & RelationshipLookupContext): string {
+  return formatWikilinkRef(canonicalWikilinkTargetForTitle(title, entries, vaultPath, sourceEntry))
 }
 
 function shouldShowSearchDropdown({ focused, trimmed, resultCount, showCreate }: SearchDropdownArgs): boolean {
@@ -293,6 +296,7 @@ function SearchDropdownWithCreate({ search, onSelect, query, entries, locale, on
 function useInlineAddNoteState(
   entries: VaultEntry[],
   vaultPath: string,
+  sourceEntry: VaultEntry | undefined,
   onAdd: (ref: string) => void,
   onCreateAndOpenNote?: (title: string) => Promise<boolean>,
 ) {
@@ -300,7 +304,7 @@ function useInlineAddNoteState(
   const [query, setQuery] = useState('')
   const inputRef = useRef<HTMLInputElement>(null)
   const search = useNoteSearch(entries, query, 8)
-  const lookupContext = useMemo(() => ({ entries, vaultPath }), [entries, vaultPath])
+  const lookupContext = useMemo(() => ({ entries, sourceEntry, vaultPath }), [entries, sourceEntry, vaultPath])
 
   const trimmed = query.trim()
   const { showCreate, createIndex, totalItems } = useCreateOption({
@@ -321,8 +325,8 @@ function useInlineAddNoteState(
   }, [onAdd, dismiss])
 
   const selectEntryAndClose = useCallback((entry: VaultEntry) => {
-    selectAndClose(canonicalRefForEntry({ entry, vaultPath }))
-  }, [selectAndClose, vaultPath])
+    selectAndClose(canonicalRefForEntry({ entry, entries, sourceEntry, vaultPath }))
+  }, [entries, selectAndClose, sourceEntry, vaultPath])
 
   const handleCreateAndOpen = useCreateAndOpen(
     onCreateAndOpenNote,
@@ -372,8 +376,9 @@ function useInlineAddNoteState(
   }
 }
 
-function InlineAddNote({ entries, vaultPath, locale, onAdd, onCreateAndOpenNote }: {
+function InlineAddNote({ entries, sourceEntry, vaultPath, locale, onAdd, onCreateAndOpenNote }: {
   entries: VaultEntry[]
+  sourceEntry?: VaultEntry
   vaultPath: string
   onAdd: (ref: string) => void
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
@@ -391,7 +396,7 @@ function InlineAddNote({ entries, vaultPath, locale, onAdd, onCreateAndOpenNote
     showDropdown,
     selectEntryAndClose,
     handleCreateAndOpen,
-  } = useInlineAddNoteState(entries, vaultPath, onAdd, onCreateAndOpenNote)
+  } = useInlineAddNoteState(entries, vaultPath, sourceEntry, onAdd, onCreateAndOpenNote)
 
   if (!active) {
     return (
@@ -441,8 +446,9 @@ function InlineAddNote({ entries, vaultPath, locale, onAdd, onCreateAndOpenNote
   )
 }
 
-function RelationshipGroup({ label, refs, entries, typeEntryMap, vaultPath, locale, onNavigate, onRemoveRef, onAddRef, onCreateAndOpenNote }: {
+function RelationshipGroup({ label, refs, entries, sourceEntry, typeEntryMap, vaultPath, locale, onNavigate, onRemoveRef, onAddRef, onCreateAndOpenNote }: {
   label: string; refs: string[]; entries: VaultEntry[]; typeEntryMap: Record<string, VaultEntry>; vaultPath: string
+  sourceEntry?: VaultEntry
   onNavigate: (target: string) => void
   onRemoveRef?: (ref: string) => void
   onAddRef?: (ref: string) => void
@@ -468,6 +474,7 @@ function RelationshipGroup({ label, refs, entries, typeEntryMap, vaultPath, loca
       {onAddRef && (
         <InlineAddNote
           entries={entries}
+          sourceEntry={sourceEntry}
           vaultPath={vaultPath}
           onAdd={onAddRef}
           onCreateAndOpenNote={onCreateAndOpenNote}
@@ -540,10 +547,11 @@ function buildTypeDerivedRelationshipEntries({
   return result
 }
 
-function NoteTargetInput({ entries, value, locale, onChange, onSubmit, onCancel, onCreateAndOpenNote, onSubmitWithCreate }: {
+function NoteTargetInput({ entries, value, locale, onChange, onSelectEntry, onSubmit, onCancel, onCreateAndOpenNote, onSubmitWithCreate }: {
   entries: VaultEntry[]
   value: string
   onChange: (v: string) => void
+  onSelectEntry?: (entry: VaultEntry) => void
   onSubmit?: () => void
   onCancel?: () => void
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
@@ -562,9 +570,10 @@ function NoteTargetInput({ entries, value, locale, onChange, onSubmit, onCancel,
   })
 
   const selectEntry = useCallback((entry: VaultEntry) => {
-    onChange(entry.title)
+    onSelectEntry?.(entry)
+    if (!onSelectEntry) onChange(entry.title)
     setFocused(false)
-  }, [onChange])
+  }, [onChange, onSelectEntry])
 
   const handleConfirm = useCallback(() => {
     confirmRelationshipSelection({
@@ -701,69 +710,157 @@ function useRelationshipPanelState({
   }
 }
 
-function AddRelationshipForm({ entries, vaultPath, locale, onAddProperty, onCreateAndOpenNote }: {
+interface AddRelationshipFormProps {
   entries: VaultEntry[]
+  sourceEntry?: VaultEntry
   vaultPath: string
   onAddProperty: (key: string, value: FrontmatterValue) => void
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
   locale: AppLocale
+}
+
+function AddRelationshipButton({ locale, onClick }: { locale: AppLocale; onClick: () => void }) {
+  return (
+    <Button type="button" variant="outline" className="mt-2 h-auto w-full justify-center px-3 py-1.5 text-xs text-muted-foreground" onClick={onClick}>
+      {translate(locale, 'inspector.relationship.addRelationship')}
+    </Button>
+  )
+}
+
+function RelationshipKeyInput({
+  inputRef,
+  locale,
+  value,
+  onChange,
+  onSubmit,
+  onCancel,
+}: {
+  inputRef: React.RefObject<HTMLInputElement | null>
+  locale: AppLocale
+  value: string
+  onChange: (value: string) => void
+  onSubmit: () => void
+  onCancel: () => void
 }) {
+  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+    if (event.key === 'Enter') onSubmit()
+    if (event.key === 'Escape') onCancel()
+  }
+
+  return (
+    <Input
+      ref={inputRef}
+      autoFocus
+      placeholder={translate(locale, 'inspector.relationship.name')}
+      value={value}
+      onChange={(event) => onChange(event.target.value)}
+      onKeyDown={handleKeyDown}
+      className="h-7 text-xs"
+    />
+  )
+}
+
+function AddRelationshipActions({
+  canSubmit,
+  locale,
+  onCancel,
+  onSubmit,
+}: {
+  canSubmit: boolean
+  locale: AppLocale
+  onCancel: () => void
+  onSubmit: () => void
+}) {
+  return (
+    <div className="flex gap-1.5">
+      <Button type="button" variant="outline" size="sm" className="h-7 flex-1 text-xs" onClick={onSubmit} disabled={!canSubmit} data-testid="submit-add-relationship">
+        {translate(locale, 'inspector.relationship.add')}
+      </Button>
+      <Button type="button" variant="outline" size="sm" className="h-7 px-2 text-xs text-muted-foreground" onClick={onCancel}>
+        {translate(locale, 'common.cancel')}
+      </Button>
+    </div>
+  )
+}
+
+function AddRelationshipForm({ entries, sourceEntry, vaultPath, locale, onAddProperty, onCreateAndOpenNote }: AddRelationshipFormProps) {
   const [relKey, setRelKey] = useState('')
   const [relTarget, setRelTarget] = useState('')
+  const [selectedTargetEntry, setSelectedTargetEntry] = useState<VaultEntry | null>(null)
   const [showForm, setShowForm] = useState(false)
   const keyInputRef = useRef<HTMLInputElement>(null)
 
   const resetForm = useCallback(() => {
-    setShowForm(false); setRelKey(''); setRelTarget('')
+    setShowForm(false)
+    setRelKey('')
+    setRelTarget('')
+    setSelectedTargetEntry(null)
+  }, [])
+
+  const openForm = useCallback(() => {
+    setShowForm(true)
+    setTimeout(() => keyInputRef.current?.focus(), 0)
+  }, [])
+
+  const handleTargetChange = useCallback((value: string) => {
+    setRelTarget(value)
+    setSelectedTargetEntry(null)
+  }, [])
+
+  const handleTargetEntrySelected = useCallback((entry: VaultEntry) => {
+    setSelectedTargetEntry(entry)
+    setRelTarget(entry.title)
   }, [])
 
   const submitForm = useCallback((targetOverride?: string) => {
     const key = relKey.trim()
     const rawTarget = (targetOverride ?? relTarget).trim()
     if (!key || !rawTarget) return
-    onAddProperty(key, canonicalRefForTitle({ title: rawTarget, entries, vaultPath }))
+    const ref = !targetOverride && selectedTargetEntry
+      ? canonicalRefForEntry({ entry: selectedTargetEntry, entries, sourceEntry, vaultPath })
+      : canonicalRefForTitle({ title: rawTarget, entries, sourceEntry, vaultPath })
+    onAddProperty(key, ref)
     resetForm()
-  }, [relKey, relTarget, entries, vaultPath, onAddProperty, resetForm])
+  }, [relKey, relTarget, selectedTargetEntry, entries, sourceEntry, vaultPath, onAddProperty, resetForm])
 
   const addPropertyForKey = useCallback((title: string) => {
     const key = relKey.trim()
-    if (key) onAddProperty(key, canonicalRefForTitle({ title, entries, vaultPath }))
-  }, [relKey, entries, vaultPath, onAddProperty])
+    if (key) onAddProperty(key, canonicalRefForTitle({ title, entries, sourceEntry, vaultPath }))
+  }, [relKey, entries, sourceEntry, vaultPath, onAddProperty])
 
   const handleCreateAndSubmit = useCreateAndOpen(onCreateAndOpenNote, addPropertyForKey, resetForm)
 
   if (!showForm) {
-    return (
-      <button className="mt-2 w-full border border-border bg-transparent text-center text-muted-foreground" style={{ borderRadius: 6, padding: '6px 12px', fontSize: 12, cursor: 'pointer' }} onClick={() => { setShowForm(true); setTimeout(() => keyInputRef.current?.focus(), 0) }}>{translate(locale, 'inspector.relationship.addRelationship')}</button>
-    )
+    return <AddRelationshipButton locale={locale} onClick={openForm} />
   }
 
   return (
     <div className="mt-2 flex flex-col gap-1.5">
-      <input
-        ref={keyInputRef}
-        autoFocus
-        className="w-full border border-border bg-transparent px-2 py-1 text-xs text-foreground"
-        style={{ borderRadius: 4, outline: 'none' }}
-        placeholder={translate(locale, 'inspector.relationship.name')}
+      <RelationshipKeyInput
+        inputRef={keyInputRef}
+        locale={locale}
         value={relKey}
-        onChange={e => setRelKey(e.target.value)}
-        onKeyDown={e => { if (e.key === 'Enter') submitForm(); else if (e.key === 'Escape') resetForm() }}
+        onChange={setRelKey}
+        onSubmit={() => submitForm()}
+        onCancel={resetForm}
       />
       <NoteTargetInput
         entries={entries}
         value={relTarget}
-        onChange={setRelTarget}
+        onChange={handleTargetChange}
+        onSelectEntry={handleTargetEntrySelected}
         onSubmit={submitForm}
         onCancel={resetForm}
         onCreateAndOpenNote={onCreateAndOpenNote}
         onSubmitWithCreate={handleCreateAndSubmit}
         locale={locale}
       />
-      <div className="flex gap-1.5">
-        <button className="flex-1 border border-border bg-transparent text-xs text-foreground" style={{ borderRadius: 4, padding: '4px 0' }} onClick={() => submitForm()} disabled={!relKey.trim() || !relTarget.trim()} data-testid="submit-add-relationship">{translate(locale, 'inspector.relationship.add')}</button>
-        <button className="border border-border bg-transparent text-xs text-muted-foreground" style={{ borderRadius: 4, padding: '4px 8px' }} onClick={resetForm}>{translate(locale, 'common.cancel')}</button>
-      </div>
+      <AddRelationshipActions
+        canSubmit={!!relKey.trim() && !!relTarget.trim()}
+        locale={locale}
+        onSubmit={() => submitForm()}
+        onCancel={resetForm}
+      />
     </div>
   )
 }
@@ -786,9 +883,10 @@ function DisabledLinkButton({ locale }: { locale: AppLocale }) {
   )
 }
 
-function SuggestedRelationshipSlot({ label, entries, vaultPath, locale, onAdd, onCreateAndOpenNote, dataTestId = 'suggested-relationship' }: {
+function SuggestedRelationshipSlot({ label, entries, sourceEntry, vaultPath, locale, onAdd, onCreateAndOpenNote, dataTestId = 'suggested-relationship' }: {
   label: string
   entries: VaultEntry[]
+  sourceEntry?: VaultEntry
   vaultPath: string
   onAdd: (ref: string) => void
   onCreateAndOpenNote?: (title: string) => Promise<boolean>
@@ -799,6 +897,7 @@ function SuggestedRelationshipSlot({ label, entries, vaultPath, locale, onAdd, o
     <RelationshipSectionRow label={label} dataTestId={dataTestId} locale={locale} placeholder>
       <InlineAddNote
         entries={entries}
+        sourceEntry={sourceEntry}
         vaultPath={vaultPath}
         onAdd={onAdd}
         onCreateAndOpenNote={onCreateAndOpenNote}
@@ -840,6 +939,7 @@ export function DynamicRelationshipsPanel({ entry, frontmatter, entries, typeEnt
       {relationshipEntries.map(({ key, refs }) => (
         <RelationshipGroup
           key={key} label={key} refs={refs} entries={entries} typeEntryMap={typeEntryMap} vaultPath={resolvedVaultPath} onNavigate={onNavigate}
+          sourceEntry={entry}
           onRemoveRef={canEdit ? (ref) => handleRemoveRef(key, ref) : undefined}
           onAddRef={canEdit ? (ref) => handleAddRef(key, ref) : undefined}
           onCreateAndOpenNote={canEdit ? onCreateAndOpenNote : undefined}
@@ -851,6 +951,7 @@ export function DynamicRelationshipsPanel({ entry, frontmatter, entries, typeEnt
           key={`type-derived:${key}`}
           label={key}
           entries={entries}
+          sourceEntry={entry}
           vaultPath={resolvedVaultPath}
           onAdd={(ref) => onAddProperty(key, ref)}
           onCreateAndOpenNote={onCreateAndOpenNote}
@@ -863,6 +964,7 @@ export function DynamicRelationshipsPanel({ entry, frontmatter, entries, typeEnt
           key={label}
           label={label}
           entries={entries}
+          sourceEntry={entry}
           vaultPath={resolvedVaultPath}
           onAdd={(ref) => onAddProperty!(label, ref)}
           onCreateAndOpenNote={onCreateAndOpenNote}
@@ -871,7 +973,7 @@ export function DynamicRelationshipsPanel({ entry, frontmatter, entries, typeEnt
       ))}
       <RelationshipActionRow>
         {onAddProperty
-          ? <AddRelationshipForm entries={entries} vaultPath={resolvedVaultPath} onAddProperty={onAddProperty} onCreateAndOpenNote={onCreateAndOpenNote} locale={locale} />
+          ? <AddRelationshipForm entries={entries} sourceEntry={entry} vaultPath={resolvedVaultPath} onAddProperty={onAddProperty} onCreateAndOpenNote={onCreateAndOpenNote} locale={locale} />
           : <DisabledLinkButton locale={locale} />
         }
       </RelationshipActionRow>
diff --git a/src/components/note-list/NoteListHeader.tsx b/src/components/note-list/NoteListHeader.tsx
index 4df886f1..a8c3cc27 100644
--- a/src/components/note-list/NoteListHeader.tsx
+++ b/src/components/note-list/NoteListHeader.tsx
@@ -10,32 +10,12 @@ import { trackEvent } from '../../lib/telemetry'
 import { useDragRegion } from '../../hooks/useDragRegion'
 import { SortDropdown } from '../SortDropdown'
 import { ListPropertiesPopover, type ListPropertiesPopoverProps } from './ListPropertiesPopover'
+import { GitRepositorySelect } from '../GitRepositorySelect'
+import type { GitRepositoryOption } from '../../utils/gitRepositories'
 
 const NOTE_LIST_ACTION_BUTTON_CLASSNAME = '!h-auto !w-auto !min-w-0 !rounded-none !p-0 !text-muted-foreground hover:!bg-transparent hover:!text-foreground focus-visible:!bg-transparent data-[state=open]:!bg-transparent data-[state=open]:!text-foreground [&_svg]:!size-4'
 const NOTE_LIST_EXPAND_BUTTON_CLASSNAME = '!h-6 !w-6 !min-w-0 !rounded !p-0 !text-muted-foreground hover:!bg-accent hover:!text-foreground focus-visible:!bg-accent [&_svg]:!size-4'
 
-interface NoteListHeaderProps {
-  title: string
-  typeDocument: VaultEntry | null
-  isEntityView: boolean
-  listSort: SortOption
-  listDirection: SortDirection
-  customProperties: string[]
-  sidebarCollapsed?: boolean
-  searchVisible: boolean
-  search: string
-  isSearching: boolean
-  searchInputRef: React.RefObject<HTMLInputElement | null>
-  propertyPicker?: ListPropertiesPopoverProps | null
-  locale?: AppLocale
-  onSortChange: (groupLabel: string, option: SortOption, direction: SortDirection) => void
-  onCreateNote: () => void
-  onOpenType: (entry: VaultEntry) => void
-  onToggleSearch: () => void
-  onSearchChange: (value: string) => void
-  onSearchKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void
-}
-
 function localizePropertiesTriggerTitle(triggerTitle: string, locale: AppLocale): string {
   if (triggerTitle === 'Customize columns') return translate(locale, 'noteList.properties.customizeColumns')
   if (triggerTitle === 'Customize All Notes columns') return translate(locale, 'noteList.properties.customizeAllColumns')
@@ -47,6 +27,32 @@ function localizePropertiesTriggerTitle(triggerTitle: string, locale: AppLocale)
     : triggerTitle
 }
 
+interface NoteListHeaderProps {
+  title: string
+  typeDocument: VaultEntry | null
+  isEntityView: boolean
+  isChangesView?: boolean
+  listSort: SortOption
+  listDirection: SortDirection
+  customProperties: string[]
+  sidebarCollapsed?: boolean
+  searchVisible: boolean
+  search: string
+  isSearching: boolean
+  searchInputRef: React.RefObject<HTMLInputElement | null>
+  propertyPicker?: ListPropertiesPopoverProps | null
+  gitRepositories?: GitRepositoryOption[]
+  selectedGitRepositoryPath?: string
+  locale?: AppLocale
+  onSortChange: (groupLabel: string, option: SortOption, direction: SortDirection) => void
+  onCreateNote: () => void
+  onOpenType: (entry: VaultEntry) => void
+  onToggleSearch: () => void
+  onSearchChange: (value: string) => void
+  onSearchKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void
+  onGitRepositoryChange?: (path: string) => void
+}
+
 function dispatchExpandSidebarFromHeader() {
   trackEvent('sidebar_expanded_from_note_list_header')
   window.dispatchEvent(new CustomEvent(APP_COMMAND_EVENT_NAME, {
@@ -78,11 +84,13 @@ function HeaderTitle({
   typeDocument,
   onOpenType,
 }: Pick<NoteListHeaderProps, 'title' | 'typeDocument' | 'onOpenType'>) {
+  const handleClick = typeDocument ? () => onOpenType(typeDocument) : undefined
+
   return (
     <h3
       className="m-0 min-w-0 flex-1 truncate text-[14px] font-semibold"
       style={typeDocument ? { cursor: 'pointer' } : undefined}
-      onClick={typeDocument ? () => onOpenType(typeDocument) : undefined}
+      onClick={handleClick}
       data-testid={typeDocument ? 'type-header-link' : undefined}
     >
       {title}
@@ -107,6 +115,35 @@ function HeaderLeading({
   )
 }
 
+function RepositorySelectorRow({
+  isChangesView,
+  gitRepositories = [],
+  selectedGitRepositoryPath = '',
+  locale = 'en',
+  onGitRepositoryChange,
+}: Pick<
+  NoteListHeaderProps,
+  | 'isChangesView'
+  | 'gitRepositories'
+  | 'selectedGitRepositoryPath'
+  | 'locale'
+  | 'onGitRepositoryChange'
+>) {
+  if (!isChangesView || !onGitRepositoryChange || gitRepositories.length <= 1) return null
+
+  return (
+    <div className="flex h-11 shrink-0 items-center border-b border-border px-4" style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}>
+      <GitRepositorySelect
+        label={translate(locale, 'git.repository.select')}
+        repositories={gitRepositories}
+        selectedPath={selectedGitRepositoryPath}
+        onChange={onGitRepositoryChange}
+        testId="changes-repository-select"
+      />
+    </div>
+  )
+}
+
 function HeaderActions({
   isEntityView,
   listSort,
@@ -115,8 +152,8 @@ function HeaderActions({
   propertyPicker,
   locale,
   onSortChange,
-  onToggleSearch,
   onCreateNote,
+  onToggleSearch,
 }: Pick<
   NoteListHeaderProps,
   | 'isEntityView'
@@ -126,8 +163,8 @@ function HeaderActions({
   | 'propertyPicker'
   | 'locale'
   | 'onSortChange'
-  | 'onToggleSearch'
   | 'onCreateNote'
+  | 'onToggleSearch'
 > & {
   locale: AppLocale
 }) {
@@ -153,6 +190,7 @@ function HeaderActions({
 }
 
 function SearchRow({
+  searchVisible,
   search,
   isSearching,
   searchInputRef,
@@ -161,6 +199,7 @@ function SearchRow({
   onSearchKeyDown,
 }: Pick<
   NoteListHeaderProps,
+  | 'searchVisible'
   | 'search'
   | 'isSearching'
   | 'searchInputRef'
@@ -170,6 +209,8 @@ function SearchRow({
 > & {
   locale: AppLocale
 }) {
+  if (!searchVisible) return null
+
   return (
     <div className="border-b border-border px-3 py-2">
       <div className="relative flex-1" aria-live="polite">
@@ -198,6 +239,7 @@ export function NoteListHeader({
   title,
   typeDocument,
   isEntityView,
+  isChangesView = false,
   listSort,
   listDirection,
   customProperties,
@@ -207,6 +249,8 @@ export function NoteListHeader({
   isSearching,
   searchInputRef,
   propertyPicker,
+  gitRepositories = [],
+  selectedGitRepositoryPath = '',
   locale = 'en',
   onSortChange,
   onCreateNote,
@@ -214,6 +258,7 @@ export function NoteListHeader({
   onToggleSearch,
   onSearchChange,
   onSearchKeyDown,
+  onGitRepositoryChange,
 }: NoteListHeaderProps) {
   const { onMouseDown: onDragMouseDown } = useDragRegion()
 
@@ -235,20 +280,26 @@ export function NoteListHeader({
           propertyPicker={propertyPicker}
           locale={locale}
           onSortChange={onSortChange}
-          onToggleSearch={onToggleSearch}
           onCreateNote={onCreateNote}
+          onToggleSearch={onToggleSearch}
         />
       </div>
-      {searchVisible && (
-        <SearchRow
-          search={search}
-          isSearching={isSearching}
-          searchInputRef={searchInputRef}
-          locale={locale}
-          onSearchChange={onSearchChange}
-          onSearchKeyDown={onSearchKeyDown}
-        />
-      )}
+      <RepositorySelectorRow
+        isChangesView={isChangesView}
+        gitRepositories={gitRepositories}
+        selectedGitRepositoryPath={selectedGitRepositoryPath}
+        locale={locale}
+        onGitRepositoryChange={onGitRepositoryChange}
+      />
+      <SearchRow
+        searchVisible={searchVisible}
+        search={search}
+        isSearching={isSearching}
+        searchInputRef={searchInputRef}
+        locale={locale}
+        onSearchChange={onSearchChange}
+        onSearchKeyDown={onSearchKeyDown}
+      />
     </>
   )
 }
diff --git a/src/components/note-list/NoteListLayout.tsx b/src/components/note-list/NoteListLayout.tsx
index 04cabc0e..97857189 100644
--- a/src/components/note-list/NoteListLayout.tsx
+++ b/src/components/note-list/NoteListLayout.tsx
@@ -252,9 +252,13 @@ function NoteListLayoutHeader({
   title,
   typeDocument,
   isEntityView,
+  isChangesView,
   listSort,
   listDirection,
   customProperties,
+  gitRepositories,
+  selectedGitRepositoryPath,
+  onGitRepositoryChange,
   locale,
   sidebarCollapsed,
   searchVisible,
@@ -273,9 +277,13 @@ function NoteListLayoutHeader({
   | 'title'
   | 'typeDocument'
   | 'isEntityView'
+  | 'isChangesView'
   | 'listSort'
   | 'listDirection'
   | 'customProperties'
+  | 'gitRepositories'
+  | 'selectedGitRepositoryPath'
+  | 'onGitRepositoryChange'
   | 'locale'
   | 'sidebarCollapsed'
   | 'searchVisible'
@@ -295,9 +303,13 @@ function NoteListLayoutHeader({
       title={title}
       typeDocument={typeDocument}
       isEntityView={isEntityView}
+      isChangesView={isChangesView}
       listSort={listSort}
       listDirection={listDirection}
       customProperties={customProperties}
+      gitRepositories={gitRepositories}
+      selectedGitRepositoryPath={selectedGitRepositoryPath}
+      onGitRepositoryChange={onGitRepositoryChange}
       locale={locale}
       sidebarCollapsed={sidebarCollapsed}
       searchVisible={searchVisible}
diff --git a/src/components/note-list/noteListUtils.test.ts b/src/components/note-list/noteListUtils.test.ts
index b3664731..a40b55cb 100644
--- a/src/components/note-list/noteListUtils.test.ts
+++ b/src/components/note-list/noteListUtils.test.ts
@@ -1,5 +1,6 @@
 import { describe, it, expect, vi } from 'vitest'
-import { resolveHeaderTitle, routeNoteClick, type ClickActions } from './noteListUtils'
+import { createNoteStatusResolver, resolveHeaderTitle, routeNoteClick, type ClickActions } from './noteListUtils'
+import type { ModifiedFile } from '../../types'
 import type { SidebarSelection, VaultEntry } from '../../types'
 
 function makeEntry(path = '/test.md'): VaultEntry {
@@ -103,3 +104,36 @@ describe('routeNoteClick', () => {
     expect(actions.onEnterNeighborhood).not.toHaveBeenCalled()
   })
 })
+
+describe('createNoteStatusResolver', () => {
+  it('keeps transient note status ahead of repository status', () => {
+    const modifiedFiles: ModifiedFile[] = [{
+      path: '/vault/note.md',
+      relativePath: 'note.md',
+      status: 'modified',
+    }]
+    const resolver = createNoteStatusResolver(
+      () => 'unsaved',
+      modifiedFiles,
+      new Set(modifiedFiles.map((file) => file.path)),
+    )
+
+    expect(resolver('/vault/note.md')).toBe('unsaved')
+  })
+
+  it('uses modified files when active-vault status says the note is clean', () => {
+    const modifiedFiles: ModifiedFile[] = [{
+      path: '/other-vault/note.md',
+      relativePath: 'note.md',
+      status: 'untracked',
+      vaultPath: '/other-vault',
+    }]
+    const resolver = createNoteStatusResolver(
+      () => 'clean',
+      modifiedFiles,
+      new Set(modifiedFiles.map((file) => file.path)),
+    )
+
+    expect(resolver('/other-vault/note.md')).toBe('new')
+  })
+})
diff --git a/src/components/note-list/noteListUtils.ts b/src/components/note-list/noteListUtils.ts
index 0173fbfc..d8b93a47 100644
--- a/src/components/note-list/noteListUtils.ts
+++ b/src/components/note-list/noteListUtils.ts
@@ -106,10 +106,17 @@ export function createNoteStatusResolver(
   modifiedFiles: ModifiedFile[] | undefined,
   modifiedPathSet: Set<string>,
 ): (path: string) => NoteStatus {
-  if (getNoteStatus) return getNoteStatus
   if (modifiedFiles && modifiedFiles.length > 0) {
-    return (path: string) => modifiedPathSet.has(path) ? 'modified' : 'clean'
+    return (path: string) => {
+      const explicitStatus = getNoteStatus?.(path)
+      if (explicitStatus && explicitStatus !== 'clean') return explicitStatus
+
+      const modifiedFile = modifiedFiles.find((file) => file.path === path)
+      if (modifiedFile?.status === 'added' || modifiedFile?.status === 'untracked') return 'new'
+      return modifiedPathSet.has(path) ? 'modified' : 'clean'
+    }
   }
+  if (getNoteStatus) return getNoteStatus
   return () => 'clean'
 }
 
diff --git a/src/components/note-list/useNoteListModel.tsx b/src/components/note-list/useNoteListModel.tsx
index b48e0482..445b7407 100644
--- a/src/components/note-list/useNoteListModel.tsx
+++ b/src/components/note-list/useNoteListModel.tsx
@@ -13,6 +13,7 @@ import type { DateDisplayFormat } from '../../utils/dateDisplay'
 import type { NoteListFilter } from '../../utils/noteListHelpers'
 import { countByFilter, countAllByFilter, countAllNotesByFilter } from '../../utils/noteListHelpers'
 import type { AllNotesFileVisibility } from '../../utils/allNotesFileVisibility'
+import type { GitRepositoryOption } from '../../utils/gitRepositories'
 import { NoteItem } from '../NoteItem'
 import { prefetchNoteContent } from '../../hooks/useTabManagement'
 import type { MultiSelectState } from '../../hooks/useMultiSelect'
@@ -480,6 +481,9 @@ export interface NoteListProps {
   onInboxPeriodChange?: (period: InboxPeriod) => void
   modifiedFiles?: ModifiedFile[]
   modifiedFilesError?: string | null
+  gitRepositories?: GitRepositoryOption[]
+  selectedGitRepositoryPath?: string
+  onGitRepositoryChange?: (path: string) => void
   getNoteStatus?: (path: string) => NoteStatus
   sidebarCollapsed?: boolean
   onSelectNote: (entry: VaultEntry) => void
@@ -512,6 +516,9 @@ function buildNoteListLayoutModel(params: {
   sidebarCollapsed?: boolean
   loading: boolean
   modifiedFilesError?: string | null
+  gitRepositories?: GitRepositoryOption[]
+  selectedGitRepositoryPath?: string
+  onGitRepositoryChange?: (path: string) => void
   noteListFilter: NoteListFilter
   filterCounts: ReturnType<typeof useFilterCounts>
   onNoteListFilterChange: (filter: NoteListFilter) => void
@@ -565,6 +572,9 @@ function buildNoteListLayoutModel(params: {
     handleClickNote: params.interaction.handleClickNote,
     isArchivedView: params.content.isArchivedView,
     isChangesView: params.selection.kind === 'filter' && params.selection.filter === 'changes',
+    gitRepositories: params.gitRepositories ?? [],
+    selectedGitRepositoryPath: params.selectedGitRepositoryPath ?? '',
+    onGitRepositoryChange: params.onGitRepositoryChange,
     isInboxView: params.selection.kind === 'filter' && params.selection.filter === 'inbox',
     modifiedFilesError: params.modifiedFilesError,
     searched: params.content.searched,
@@ -592,6 +602,9 @@ export function useNoteListModel({
   inboxPeriod = 'all',
   modifiedFiles,
   modifiedFilesError,
+  gitRepositories,
+  selectedGitRepositoryPath,
+  onGitRepositoryChange,
   getNoteStatus,
   sidebarCollapsed,
   onReplaceActiveTab,
@@ -713,6 +726,9 @@ export function useNoteListModel({
     loading,
     onOpenType: onReplaceActiveTab,
     modifiedFilesError,
+    gitRepositories,
+    selectedGitRepositoryPath,
+    onGitRepositoryChange,
     noteListFilter,
     filterCounts,
     onNoteListFilterChange,
diff --git a/src/components/settingsPreferenceTracking.ts b/src/components/settingsPreferenceTracking.ts
index ed20dbad..a976fcad 100644
--- a/src/components/settingsPreferenceTracking.ts
+++ b/src/components/settingsPreferenceTracking.ts
@@ -16,6 +16,7 @@ export interface SettingsPreferenceDraft {
   analytics: boolean
   dateDisplayFormat: DateDisplayFormat
   defaultNoteWidth: NoteWidthMode
+  multiWorkspaceEnabled: boolean
   sidebarTypePluralizationEnabled: boolean
 }
 
@@ -39,4 +40,9 @@ export function trackSettingsPreferenceChanges(settings: Settings, draft: Settin
   if (previousPluralization !== draft.sidebarTypePluralizationEnabled) {
     trackSidebarTypePluralizationChanged(draft.sidebarTypePluralizationEnabled)
   }
+
+  const previousMultiWorkspaceEnabled = settings.multi_workspace_enabled === true
+  if (previousMultiWorkspaceEnabled !== draft.multiWorkspaceEnabled) {
+    trackEvent('multi_workspace_mode_changed', { enabled: draft.multiWorkspaceEnabled ? 1 : 0 })
+  }
 }
diff --git a/src/components/settingsSectionIds.ts b/src/components/settingsSectionIds.ts
new file mode 100644
index 00000000..68f33a40
--- /dev/null
+++ b/src/components/settingsSectionIds.ts
@@ -0,0 +1,10 @@
+export const SETTINGS_SECTION_IDS = {
+  sync: 'settings-section-sync',
+  workspaces: 'settings-section-workspaces',
+  autogit: 'settings-section-autogit',
+  appearance: 'settings-section-appearance',
+  content: 'settings-section-content',
+  ai: 'settings-section-ai',
+  workflow: 'settings-section-workflow',
+  privacy: 'settings-section-privacy',
+} as const
diff --git a/src/components/sidebar/SidebarSections.tsx b/src/components/sidebar/SidebarSections.tsx
index 7dc7975f..c837220c 100644
--- a/src/components/sidebar/SidebarSections.tsx
+++ b/src/components/sidebar/SidebarSections.tsx
@@ -18,7 +18,6 @@ import {
 import { APP_COMMAND_IDS, getAppCommandShortcutDisplay } from '../../hooks/appCommandCatalog'
 import { Button } from '@/components/ui/button'
 import { ActionTooltip } from '@/components/ui/action-tooltip'
-import { TooltipProvider } from '@/components/ui/tooltip'
 import {
   type SectionGroup, isSelectionActive, SectionContent, VisibilityPopover,
 } from '../SidebarParts'
@@ -389,41 +388,39 @@ export function SidebarTitleBar({
   const forwardLabel = translate(locale, 'command.navigation.goForward')
 
   return (
-    <TooltipProvider>
-      <div
-        className="shrink-0 flex items-center border-b border-border"
-        style={{ height: 52, padding: '0 8px', paddingLeft: 90, cursor: 'default', justifyContent: 'flex-start' }}
-        onMouseDown={onMouseDown}
-      >
-        <div className="flex items-center gap-5" style={{ WebkitAppRegion: 'no-drag' } as CSSProperties}>
-          {onCollapse && (
-            <SidebarTitleBarAction label={collapseLabel} shortcut={SIDEBAR_COLLAPSE_SHORTCUT} onClick={onCollapse}>
-              <SidebarSimple size={16} weight="regular" />
-            </SidebarTitleBarAction>
-          )}
-          {onGoBack && (
-            <SidebarTitleBarAction
-              label={backLabel}
-              shortcut={HISTORY_BACK_SHORTCUT}
-              onClick={onGoBack}
-              disabled={!canGoBack}
-            >
-              <ArrowLeft size={16} weight="regular" />
-            </SidebarTitleBarAction>
-          )}
-          {onGoForward && (
-            <SidebarTitleBarAction
-              label={forwardLabel}
-              shortcut={HISTORY_FORWARD_SHORTCUT}
-              onClick={onGoForward}
-              disabled={!canGoForward}
-            >
-              <ArrowRight size={16} weight="regular" />
-            </SidebarTitleBarAction>
-          )}
-        </div>
+    <div
+      className="shrink-0 flex items-center border-b border-border"
+      style={{ height: 52, padding: '0 8px', paddingLeft: 90, cursor: 'default', justifyContent: 'flex-start' }}
+      onMouseDown={onMouseDown}
+    >
+      <div className="flex items-center gap-5" style={{ WebkitAppRegion: 'no-drag' } as CSSProperties}>
+        {onCollapse && (
+          <SidebarTitleBarAction label={collapseLabel} shortcut={SIDEBAR_COLLAPSE_SHORTCUT} onClick={onCollapse}>
+            <SidebarSimple size={16} weight="regular" />
+          </SidebarTitleBarAction>
+        )}
+        {onGoBack && (
+          <SidebarTitleBarAction
+            label={backLabel}
+            shortcut={HISTORY_BACK_SHORTCUT}
+            onClick={onGoBack}
+            disabled={!canGoBack}
+          >
+            <ArrowLeft size={16} weight="regular" />
+          </SidebarTitleBarAction>
+        )}
+        {onGoForward && (
+          <SidebarTitleBarAction
+            label={forwardLabel}
+            shortcut={HISTORY_FORWARD_SHORTCUT}
+            onClick={onGoForward}
+            disabled={!canGoForward}
+          >
+            <ArrowRight size={16} weight="regular" />
+          </SidebarTitleBarAction>
+        )}
       </div>
-    </TooltipProvider>
+    </div>
   )
 }
 
diff --git a/src/components/sidebar/SidebarTitleBar.test.tsx b/src/components/sidebar/SidebarTitleBar.test.tsx
index e6015ba0..9931d4fb 100644
--- a/src/components/sidebar/SidebarTitleBar.test.tsx
+++ b/src/components/sidebar/SidebarTitleBar.test.tsx
@@ -1,10 +1,11 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import type { ComponentProps } from 'react'
 import { describe, expect, it, vi } from 'vitest'
+import { TooltipProvider } from '@/components/ui/tooltip'
 import { SidebarTitleBar } from './SidebarSections'
 
 function renderTitleBar(overrides: Partial<ComponentProps<typeof SidebarTitleBar>> = {}) {
-  return render(<SidebarTitleBar {...overrides} />)
+  return render(<SidebarTitleBar {...overrides} />, { wrapper: TooltipProvider })
 }
 
 describe('SidebarTitleBar', () => {
diff --git a/src/components/status-bar/StatusBarSections.tsx b/src/components/status-bar/StatusBarSections.tsx
index 4e7373ef..39594c71 100644
--- a/src/components/status-bar/StatusBarSections.tsx
+++ b/src/components/status-bar/StatusBarSections.tsx
@@ -43,9 +43,12 @@ const ZOOM_RESET_SHORTCUT = {
 interface StatusBarPrimarySectionProps {
   modifiedCount: number
   vaultPath: string
-  vaults: VaultOption[]
   defaultWorkspacePath?: string | null
+  vaults: VaultOption[]
+  multiWorkspaceEnabled?: boolean
   onSwitchVault: (path: string) => void
+  onSetDefaultWorkspace?: (path: string) => void
+  onOpenVaultSettings?: () => void
   onOpenLocalFolder?: () => void
   onCreateEmptyVault?: () => void
   onCloneVault?: () => void
@@ -68,7 +71,6 @@ interface StatusBarPrimarySectionProps {
   buildNumber?: string
   onCheckForUpdates?: () => void
   onRemoveVault?: (path: string) => void
-  onSetDefaultWorkspace?: (path: string) => void
   onUpdateWorkspaceIdentity?: (path: string, patch: Partial<VaultOption>) => void
   mcpStatus?: McpStatus
   onInstallMcp?: () => void
@@ -403,8 +405,11 @@ function PrimarySeparator({ compact }: { compact: boolean }) {
 export function StatusBarPrimarySection({
   modifiedCount,
   vaultPath,
-  vaults, defaultWorkspacePath,
+  defaultWorkspacePath,
+  vaults, multiWorkspaceEnabled,
   onSwitchVault,
+  onSetDefaultWorkspace,
+  onOpenVaultSettings,
   onOpenLocalFolder,
   onCreateEmptyVault,
   onCloneVault,
@@ -424,7 +429,7 @@ export function StatusBarPrimarySection({
   onOpenConflictResolver,
   buildNumber,
   onCheckForUpdates,
-  onRemoveVault, onSetDefaultWorkspace, onUpdateWorkspaceIdentity,
+  onRemoveVault, onUpdateWorkspaceIdentity,
   mcpStatus,
   onInstallMcp,
   aiAgentsStatus,
@@ -460,13 +465,15 @@ export function StatusBarPrimarySection({
         vaults={vaults}
         vaultPath={vaultPath}
         defaultWorkspacePath={defaultWorkspacePath}
+        multiWorkspaceEnabled={multiWorkspaceEnabled}
         onSwitchVault={onSwitchVault}
+        onSetDefaultWorkspace={onSetDefaultWorkspace}
+        onOpenVaultSettings={onOpenVaultSettings}
         onOpenLocalFolder={onOpenLocalFolder}
         onCreateEmptyVault={onCreateEmptyVault}
         onCloneVault={onCloneVault}
         onCloneGettingStarted={onCloneGettingStarted}
         onRemoveVault={onRemoveVault}
-        onSetDefaultWorkspace={onSetDefaultWorkspace}
         onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
         compact={compact}
         locale={locale}
diff --git a/src/components/status-bar/VaultMenu.tsx b/src/components/status-bar/VaultMenu.tsx
index a6780dd1..1fe17fd2 100644
--- a/src/components/status-bar/VaultMenu.tsx
+++ b/src/components/status-bar/VaultMenu.tsx
@@ -1,28 +1,29 @@
 import { useMemo, useRef, useState } from 'react'
 import type { ReactNode } from 'react'
-import { AlertTriangle, Check, FolderOpen, GitBranch, Plus, Rocket, Settings2, X } from 'lucide-react'
+import { AlertTriangle, Check, FolderOpen, GitBranch, Plus, Rocket, X } from 'lucide-react'
 import { ActionTooltip } from '@/components/ui/action-tooltip'
 import { Button } from '@/components/ui/button'
-import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'
-import { Input } from '@/components/ui/input'
-import { Switch } from '@/components/ui/switch'
+import { Checkbox } from '@/components/ui/checkbox'
+import { ConfirmDeleteDialog } from '../ConfirmDeleteDialog'
 import { translate, type AppLocale, type TranslationKey } from '../../lib/i18n'
 import { trackEvent } from '../../lib/telemetry'
 import type { VaultOption } from './types'
 import { useDismissibleLayer } from './useDismissibleLayer'
-import { WORKSPACE_COLORS, workspaceIdentityFromVault } from '../../utils/workspaces'
+import { workspaceAliasFromOption, workspaceIdentityFromVault } from '../../utils/workspaces'
 
 interface VaultMenuProps {
   vaults: VaultOption[]
   vaultPath: string
+  defaultWorkspacePath?: string | null
   onSwitchVault: (path: string) => void
+  onSetDefaultWorkspace?: (path: string) => void
+  onOpenVaultSettings?: () => void
   onOpenLocalFolder?: () => void
   onCreateEmptyVault?: () => void
   onCloneVault?: () => void
   onCloneGettingStarted?: () => void
   onRemoveVault?: (path: string) => void
-  defaultWorkspacePath?: string | null
-  onSetDefaultWorkspace?: (path: string) => void
+  multiWorkspaceEnabled?: boolean
   onUpdateWorkspaceIdentity?: (path: string, patch: Partial<VaultOption>) => void
   compact?: boolean
   locale?: AppLocale
@@ -32,9 +33,12 @@ interface VaultMenuItemProps {
   vault: VaultOption
   isActive: boolean
   canRemove: boolean
+  disableMountToggle: boolean
   locale: AppLocale
+  multiWorkspaceEnabled: boolean
   onSelect: () => void
-  onRemove?: () => void
+  onMountedChange?: (path: string, mounted: boolean) => void
+  onRequestRemove?: () => void
 }
 
 interface VaultMenuActionProps {
@@ -45,23 +49,6 @@ interface VaultMenuActionProps {
   onClick: () => void
 }
 
-interface WorkspaceManagerProps {
-  defaultWorkspacePath?: string | null
-  locale: AppLocale
-  onOpenChange: (open: boolean) => void
-  onSetDefaultWorkspace?: (path: string) => void
-  onUpdateWorkspaceIdentity?: (path: string, patch: Partial<VaultOption>) => void
-  open: boolean
-  vaults: VaultOption[]
-}
-
-interface WorkspaceRowProps extends Pick<
-  WorkspaceManagerProps,
-  'defaultWorkspacePath' | 'locale' | 'onSetDefaultWorkspace' | 'onUpdateWorkspaceIdentity'
-> {
-  vault: VaultOption
-}
-
 interface VaultAction {
   key: string
   icon: ReactNode
@@ -84,34 +71,21 @@ function getVaultTriggerClassName(open: boolean, compact: boolean) {
 }
 
 function buildVaultActions({
-  onManageWorkspaces,
+  multiWorkspaceEnabled,
   onCreateEmptyVault,
   onCloneGettingStarted,
   onCloneVault,
   onOpenLocalFolder,
-}: Pick<VaultMenuProps, 'onCreateEmptyVault' | 'onCloneGettingStarted' | 'onCloneVault' | 'onOpenLocalFolder'> & {
-  onManageWorkspaces?: () => void
-}): VaultAction[] {
+}: Pick<VaultMenuProps, 'multiWorkspaceEnabled' | 'onCreateEmptyVault' | 'onCloneGettingStarted' | 'onCloneVault' | 'onOpenLocalFolder'>): VaultAction[] {
   const items: VaultAction[] = []
 
-  if (onManageWorkspaces) {
-    items.push({
-      key: 'manage-workspaces',
-      icon: <Settings2 size={12} />,
-      labelKey: 'status.vault.manageWorkspaces',
-      testId: 'vault-menu-manage-workspaces',
-      accent: true,
-      onClick: onManageWorkspaces,
-    })
-  }
-
   if (onCreateEmptyVault) {
     items.push({
       key: 'create-empty',
       icon: <Plus size={12} />,
       labelKey: 'status.vault.createEmpty',
       testId: 'vault-menu-create-empty',
-      accent: true,
+      accent: !multiWorkspaceEnabled,
       onClick: onCreateEmptyVault,
     })
   }
@@ -156,69 +130,234 @@ function VaultMenuIcon({ isActive, unavailable }: { isActive: boolean; unavailab
   return <span style={{ width: 12 }} />
 }
 
-function VaultMenuItem({ vault, isActive, canRemove, locale, onSelect, onRemove }: VaultMenuItemProps) {
-  const unavailable = vault.available === false
-  const removeLabel = translate(locale, 'status.vault.remove', { label: vault.label })
-  const itemClassName = [
-    'w-full justify-start rounded-sm px-2 py-1 text-xs font-normal',
-    canRemove ? 'pr-7' : '',
+function workspaceMountLabel(locale: AppLocale, vault: VaultOption): string {
+  return translate(locale, 'status.vault.includeWorkspace', { label: vault.label })
+}
+
+function WorkspaceMountCheckbox({
+  checked,
+  disabled,
+  locale,
+  onMountedChange,
+  vault,
+}: {
+  checked: boolean
+  disabled: boolean
+  locale: AppLocale
+  onMountedChange?: (path: string, mounted: boolean) => void
+  vault: VaultOption
+}) {
+  return (
+    <Checkbox
+      checked={checked}
+      disabled={disabled || !onMountedChange}
+      aria-label={workspaceMountLabel(locale, vault)}
+      className="ml-1"
+      onCheckedChange={(checked) => {
+        if (typeof checked !== 'boolean') return
+        onMountedChange?.(vault.path, checked)
+        trackEvent('workspace_mount_changed', {
+          workspace_alias: workspaceAliasFromOption(vault),
+          mounted: checked ? 1 : 0,
+        })
+      }}
+    />
+  )
+}
+
+function vaultMenuItemClassName(isActive: boolean, multiWorkspaceEnabled: boolean): string {
+  return [
+    'min-w-0 max-w-[190px] flex-none justify-start rounded-sm px-2 font-normal',
+    multiWorkspaceEnabled ? 'py-1.5 text-[12px]' : 'py-1 text-xs',
     isActive
       ? 'text-foreground hover:bg-[var(--hover)] hover:text-foreground'
       : 'text-muted-foreground hover:bg-[var(--hover)] hover:text-foreground',
   ].filter(Boolean).join(' ')
+}
+
+function vaultMenuItemStyle(unavailable: boolean) {
+  return {
+    height: 'auto',
+    background: 'transparent',
+    opacity: unavailable ? 0.45 : 1,
+  }
+}
+
+function VaultMenuItemButton({
+  vault,
+  isActive,
+  locale,
+  multiWorkspaceEnabled,
+  onSelect,
+}: Pick<VaultMenuItemProps, 'vault' | 'isActive' | 'locale' | 'multiWorkspaceEnabled' | 'onSelect'>) {
+  const unavailable = vault.available === false
+  return (
+    <Button
+      type="button"
+      variant="ghost"
+      size="xs"
+      disabled={unavailable}
+      onClick={onSelect}
+      aria-current={isActive ? 'true' : undefined}
+      title={unavailable ? translate(locale, 'status.vault.notFound', { path: vault.path }) : vault.path}
+      data-testid={`vault-menu-item-label-${vault.label}`}
+      className={vaultMenuItemClassName(isActive, multiWorkspaceEnabled)}
+      style={vaultMenuItemStyle(unavailable)}
+    >
+      <span className="flex min-w-0 items-center gap-1.5">
+        {!multiWorkspaceEnabled && <VaultMenuIcon isActive={isActive} unavailable={unavailable} />}
+        <span className="truncate">{vault.label}</span>
+      </span>
+    </Button>
+  )
+}
+
+function DefaultVaultLabel({ isDefault, locale }: { isDefault: boolean; locale: AppLocale }) {
+  if (!isDefault) return null
 
   return (
-    <div className="group relative flex w-full items-center rounded-sm">
-      <Button
-        type="button"
-        variant="ghost"
-        size="xs"
-        disabled={unavailable}
-        onClick={onSelect}
-        aria-current={isActive ? 'true' : undefined}
-        title={unavailable ? translate(locale, 'status.vault.notFound', { path: vault.path }) : vault.path}
-        data-testid={`vault-menu-item-${vault.label}`}
-        className={itemClassName}
-        style={{
-          height: 'auto',
-          background: isActive ? 'var(--hover)' : 'transparent',
-          opacity: unavailable ? 0.45 : 1,
-        }}
-      >
-        <span className="flex min-w-0 items-center gap-1.5">
-          <VaultMenuIcon isActive={isActive} unavailable={unavailable} />
-          <span className="truncate">{vault.label}</span>
+    <span className="text-[10px] font-medium text-muted-foreground" data-testid="vault-menu-default-label">
+      {translate(locale, 'workspace.manager.default')}
+    </span>
+  )
+}
+
+function WorkspaceInitialsBadge({ vault }: { vault: VaultOption }) {
+  const workspace = workspaceIdentityFromVault(vault)
+  const accentColor = workspace.color ? `var(--accent-${workspace.color})` : 'var(--muted-foreground)'
+
+  return (
+    <span
+      className="inline-flex h-[16px] min-w-[18px] items-center justify-center rounded-sm border bg-transparent px-1 text-[9px] font-semibold opacity-75"
+      style={{ borderColor: accentColor, color: accentColor }}
+      title={`${workspace.label} (${workspace.alias})`}
+      aria-label={`Vault ${workspace.label}`}
+      data-testid={`vault-menu-workspace-badge-${vault.label}`}
+    >
+      {workspace.shortLabel}
+    </span>
+  )
+}
+
+function VaultMenuRemoveButton({
+  locale,
+  onRequestRemove,
+  vault,
+}: Pick<VaultMenuItemProps, 'locale' | 'onRequestRemove' | 'vault'>) {
+  if (!onRequestRemove) return null
+
+  const removeLabel = translate(locale, 'status.vault.remove', { label: vault.label })
+  return (
+    <Button
+      type="button"
+      variant="ghost"
+      size="icon-xs"
+      onClick={(event) => {
+        event.stopPropagation()
+        onRequestRemove()
+      }}
+      title={removeLabel}
+      aria-label={removeLabel}
+      data-testid={`vault-menu-remove-${vault.label}`}
+      className="ml-0.5 h-6 w-6 shrink-0 rounded-sm text-muted-foreground opacity-0 pointer-events-none transition-opacity hover:bg-[var(--hover)] hover:text-foreground focus-visible:opacity-100 focus-visible:pointer-events-auto group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto"
+    >
+      <X size={10} />
+    </Button>
+  )
+}
+
+function VaultMenuItem({
+  vault,
+  isActive,
+  canRemove,
+  disableMountToggle,
+  locale,
+  multiWorkspaceEnabled,
+  onSelect,
+  onMountedChange,
+  onRequestRemove,
+}: VaultMenuItemProps) {
+  const unavailable = vault.available === false
+
+  return (
+    <div
+      className="group relative flex w-full items-center rounded-sm hover:bg-[var(--hover)]"
+      data-testid={`vault-menu-item-${vault.label}`}
+      onClick={(event) => {
+        if (event.target === event.currentTarget) onSelect()
+      }}
+    >
+      {multiWorkspaceEnabled && (
+        <WorkspaceMountCheckbox
+          checked={isActive || vault.mounted !== false}
+          disabled={unavailable || disableMountToggle}
+          locale={locale}
+          onMountedChange={onMountedChange}
+          vault={vault}
+        />
+      )}
+      <VaultMenuItemButton
+        vault={vault}
+        isActive={isActive}
+        locale={locale}
+        multiWorkspaceEnabled={multiWorkspaceEnabled}
+        onSelect={onSelect}
+      />
+      {canRemove && <VaultMenuRemoveButton locale={locale} onRequestRemove={onRequestRemove} vault={vault} />}
+      {multiWorkspaceEnabled && (
+        <span className="ml-auto flex shrink-0 items-center gap-1.5 pl-2 pr-1">
+          <DefaultVaultLabel isDefault={isActive} locale={locale} />
+          <WorkspaceInitialsBadge vault={vault} />
         </span>
-      </Button>
-      {canRemove && onRemove && (
+      )}
+    </div>
+  )
+}
+
+function VaultMenuHeader({
+  locale,
+  onOpenVaultSettings,
+}: {
+  locale: AppLocale
+  onOpenVaultSettings?: () => void
+}) {
+  return (
+    <div className="flex items-center justify-between gap-3 px-2 py-1.5">
+      <span className="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">
+        {translate(locale, 'status.vault.availableHeader')}
+      </span>
+      {onOpenVaultSettings && (
         <Button
           type="button"
           variant="ghost"
-          size="icon-xs"
-          onClick={(event) => {
-            event.stopPropagation()
-            onRemove()
-          }}
-          title={removeLabel}
-          aria-label={removeLabel}
-          data-testid={`vault-menu-remove-${vault.label}`}
-          className="absolute top-1/2 right-1 -translate-y-1/2 rounded-sm text-muted-foreground opacity-0 pointer-events-none transition-opacity hover:text-foreground focus-visible:opacity-100 focus-visible:pointer-events-auto group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto"
+          size="xs"
+          className="h-auto rounded-sm px-1 py-0.5 text-[11px] font-medium text-muted-foreground hover:bg-[var(--hover)] hover:text-foreground"
+          onClick={onOpenVaultSettings}
+          data-testid="vault-menu-manage-vaults"
         >
-          <X size={10} />
+          {translate(locale, 'status.vault.manageWorkspaces')}
         </Button>
       )}
     </div>
   )
 }
 
-function VaultMenuAction({ icon, labelKey, testId, accent = false, onClick, locale = 'en' }: VaultMenuActionProps & { locale?: AppLocale }) {
+function VaultMenuAction({
+  icon,
+  labelKey,
+  testId,
+  accent = false,
+  multiWorkspaceEnabled,
+  onClick,
+  locale = 'en',
+}: VaultMenuActionProps & { locale?: AppLocale; multiWorkspaceEnabled: boolean }) {
   return (
     <Button
       type="button"
       variant="ghost"
       size="xs"
       onClick={onClick}
-      className="h-auto w-full justify-start rounded-sm px-2 py-1 text-xs font-normal"
+      className={`h-auto w-full justify-start rounded-sm px-2 py-1 font-normal ${multiWorkspaceEnabled ? 'text-[12px]' : 'text-xs'}`}
       style={{ color: accent ? 'var(--accent-blue)' : 'var(--muted-foreground)' }}
       data-testid={testId}
     >
@@ -228,258 +367,45 @@ function VaultMenuAction({ icon, labelKey, testId, accent = false, onClick, loca
   )
 }
 
-function WorkspaceColorButton({
-  color,
-  selected,
-  onSelect,
-}: {
-  color: string
-  selected: boolean
-  onSelect: () => void
-}) {
-  return (
-    <Button
-      type="button"
-      variant="ghost"
-      size="icon-xs"
-      className="h-5 w-5 rounded-sm p-0"
-      style={{
-        background: selected ? `var(--accent-${color})` : 'transparent',
-        border: `1px solid var(--accent-${color})`,
-      }}
-      aria-label={color}
-      onClick={onSelect}
-    />
-  )
-}
-
-function workspaceBadgeClassName(): string {
-  return 'inline-flex h-5 min-w-6 items-center justify-center rounded-sm px-1 text-[10px] font-semibold text-white'
-}
-
-function WorkspaceBadge({ workspace }: { workspace: ReturnType<typeof workspaceIdentityFromVault> }) {
-  return (
-    <span
-      className={workspaceBadgeClassName()}
-      style={{ background: workspace.color ? `var(--accent-${workspace.color})` : 'var(--muted-foreground)' }}
-    >
-      {workspace.shortLabel}
-    </span>
-  )
-}
-
-function WorkspaceHeader({
-  locale,
-  onSetDefaultWorkspace,
-  vault,
-  workspace,
-}: Pick<WorkspaceRowProps, 'locale' | 'onSetDefaultWorkspace' | 'vault'> & {
-  workspace: ReturnType<typeof workspaceIdentityFromVault>
-}) {
-  const handleSetDefaultWorkspace = () => {
-    onSetDefaultWorkspace?.(vault.path)
-    trackEvent('workspace_default_changed', { workspace_alias: workspace.alias })
-  }
-
-  return (
-    <div className="flex items-center justify-between gap-2">
-      <div className="flex min-w-0 items-center gap-2">
-        <WorkspaceBadge workspace={workspace} />
-        <div className="min-w-0">
-          <div className="truncate text-sm font-medium text-foreground">{workspace.label}</div>
-          <div className="truncate text-[11px] text-muted-foreground">{workspace.path}</div>
-        </div>
-      </div>
-      <Button
-        type="button"
-        variant={workspace.defaultForNewNotes ? 'secondary' : 'ghost'}
-        size="xs"
-        onClick={handleSetDefaultWorkspace}
-        disabled={!onSetDefaultWorkspace || workspace.defaultForNewNotes}
-        data-testid={`workspace-default-${workspace.alias}`}
-      >
-        {workspace.defaultForNewNotes
-          ? translate(locale, 'workspace.manager.default')
-          : translate(locale, 'workspace.manager.makeDefault')}
-      </Button>
-    </div>
-  )
-}
-
-function WorkspaceMountedControl({
-  canEdit,
-  locale,
-  onUpdateWorkspaceIdentity,
-  vault,
-  workspace,
-}: Pick<WorkspaceRowProps, 'locale' | 'onUpdateWorkspaceIdentity' | 'vault'> & {
-  canEdit: boolean
-  workspace: ReturnType<typeof workspaceIdentityFromVault>
-}) {
-  const handleMountedChange = (mounted: boolean) => {
-    onUpdateWorkspaceIdentity?.(vault.path, { mounted })
-    trackEvent('workspace_mount_changed', { workspace_alias: workspace.alias, mounted: mounted ? 1 : 0 })
-  }
-
-  return (
-    <label className="flex items-center justify-between gap-3 text-xs text-muted-foreground">
-      <span>{translate(locale, 'workspace.manager.mounted')}</span>
-      <Switch
-        checked={workspace.mounted}
-        onCheckedChange={(mounted) => canEdit && handleMountedChange(mounted)}
-        disabled={!canEdit}
-        aria-label={translate(locale, 'workspace.manager.mounted')}
-      />
-    </label>
-  )
-}
-
-function WorkspaceIdentityInputs({
-  canEdit,
-  locale,
-  onUpdateWorkspaceIdentity,
-  vault,
-  workspace,
-}: Pick<WorkspaceRowProps, 'locale' | 'onUpdateWorkspaceIdentity' | 'vault'> & {
-  canEdit: boolean
-  workspace: ReturnType<typeof workspaceIdentityFromVault>
-}) {
-  return (
-    <div className="grid grid-cols-[minmax(0,1fr)_minmax(120px,0.5fr)] gap-2">
-      <Input
-        value={vault.label}
-        onChange={(event) => canEdit && onUpdateWorkspaceIdentity?.(vault.path, { label: event.target.value })}
-        aria-label={translate(locale, 'workspace.manager.label')}
-        disabled={!canEdit}
-      />
-      <Input
-        value={vault.alias ?? workspace.alias}
-        onChange={(event) => canEdit && onUpdateWorkspaceIdentity?.(vault.path, { alias: event.target.value })}
-        aria-label={translate(locale, 'workspace.manager.alias')}
-        disabled={!canEdit}
-      />
-    </div>
-  )
-}
-
-function WorkspaceColorPicker({
-  canEdit,
-  onUpdateWorkspaceIdentity,
-  vault,
-}: Pick<WorkspaceRowProps, 'onUpdateWorkspaceIdentity' | 'vault'> & {
-  canEdit: boolean
-}) {
-  return (
-    <div className="flex items-center gap-1">
-      {WORKSPACE_COLORS.map((color) => (
-        <WorkspaceColorButton
-          key={color}
-          color={color}
-          selected={(vault.color ?? null) === color}
-          onSelect={() => canEdit && onUpdateWorkspaceIdentity?.(vault.path, { color })}
-        />
-      ))}
-    </div>
-  )
-}
-
-function WorkspaceRow({
-  defaultWorkspacePath,
-  locale,
-  onSetDefaultWorkspace,
-  onUpdateWorkspaceIdentity,
-  vault,
-}: WorkspaceRowProps) {
-  const workspace = workspaceIdentityFromVault(vault, { defaultWorkspacePath })
-  const canEdit = !!onUpdateWorkspaceIdentity && vault.path !== '' && !vault.managedDefault
-
-  return (
-    <div
-      className="grid gap-2 rounded-md border border-border p-3"
-      data-testid={`workspace-row-${workspace.alias}`}
-    >
-      <WorkspaceHeader locale={locale} onSetDefaultWorkspace={onSetDefaultWorkspace} vault={vault} workspace={workspace} />
-      <WorkspaceMountedControl canEdit={canEdit} locale={locale} onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity} vault={vault} workspace={workspace} />
-      <WorkspaceIdentityInputs canEdit={canEdit} locale={locale} onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity} vault={vault} workspace={workspace} />
-      <WorkspaceColorPicker canEdit={canEdit} onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity} vault={vault} />
-    </div>
-  )
-}
-
-function WorkspaceManager({
-  defaultWorkspacePath,
-  locale,
-  onOpenChange,
-  onSetDefaultWorkspace,
-  onUpdateWorkspaceIdentity,
-  open,
-  vaults,
-}: WorkspaceManagerProps) {
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-h-[82vh] overflow-y-auto sm:max-w-[720px]" data-testid="workspace-manager-dialog">
-        <DialogHeader>
-          <DialogTitle>{translate(locale, 'workspace.manager.title')}</DialogTitle>
-          <DialogDescription>{translate(locale, 'workspace.manager.description')}</DialogDescription>
-        </DialogHeader>
-        <div className="space-y-3">
-          {vaults.map((vault) => (
-            <WorkspaceRow
-              key={vault.path}
-              defaultWorkspacePath={defaultWorkspacePath}
-              locale={locale}
-              onSetDefaultWorkspace={onSetDefaultWorkspace}
-              onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
-              vault={vault}
-            />
-          ))}
-        </div>
-      </DialogContent>
-    </Dialog>
-  )
-}
-
 export function VaultMenu(props: VaultMenuProps) {
   const {
     vaults, vaultPath, onSwitchVault, onOpenLocalFolder, onCreateEmptyVault,
-    onCloneVault, onCloneGettingStarted, onRemoveVault, defaultWorkspacePath,
-    onSetDefaultWorkspace, onUpdateWorkspaceIdentity, compact = false, locale = 'en',
+    defaultWorkspacePath, onSetDefaultWorkspace, onOpenVaultSettings,
+    onCloneVault, onCloneGettingStarted, onRemoveVault, multiWorkspaceEnabled = false,
+    onUpdateWorkspaceIdentity, compact = false, locale = 'en',
   } = props
   const [open, setOpen] = useState(false)
-  const [manageOpen, setManageOpen] = useState(false)
+  const [vaultPendingRemoval, setVaultPendingRemoval] = useState<VaultOption | null>(null)
   const menuRef = useRef<HTMLDivElement>(null)
-  const activeVault = vaults.find((vault) => vault.path === vaultPath)
+  const defaultPath = multiWorkspaceEnabled ? (defaultWorkspacePath ?? vaultPath) : vaultPath
+  const activeVault = vaults.find((vault) => vault.path === defaultPath)
   const canRemove = !!onRemoveVault && vaults.length > 1
   const triggerClassName = getVaultTriggerClassName(open, compact)
   const triggerSize = compact ? 'icon-xs' : 'xs'
   const activeVaultLabel = activeVault?.label ?? translate(locale, 'status.vault.default')
+  const menuMinWidth = multiWorkspaceEnabled ? 320 : 200
+  const includedVaults = useMemo(
+    () => vaults.filter((vault) => (
+      vault.available !== false
+      && (vault.path === defaultPath || vault.mounted !== false)
+    )),
+    [defaultPath, vaults],
+  )
 
   useDismissibleLayer(open, menuRef, () => setOpen(false))
 
   const actions = useMemo<VaultAction[]>(() => {
     return buildVaultActions({
-      onManageWorkspaces: () => {
-        setManageOpen(true)
-        trackEvent('workspace_manager_opened', { workspace_count: vaults.length })
-      },
+      multiWorkspaceEnabled,
       onCreateEmptyVault,
       onCloneGettingStarted,
       onCloneVault,
       onOpenLocalFolder,
     })
-  }, [onCreateEmptyVault, onCloneGettingStarted, onCloneVault, onOpenLocalFolder, vaults.length])
+  }, [multiWorkspaceEnabled, onCreateEmptyVault, onCloneGettingStarted, onCloneVault, onOpenLocalFolder])
 
   return (
     <div ref={menuRef} style={{ position: 'relative' }}>
-      <WorkspaceManager
-        defaultWorkspacePath={defaultWorkspacePath}
-        locale={locale}
-        onOpenChange={setManageOpen}
-        onSetDefaultWorkspace={onSetDefaultWorkspace}
-        onUpdateWorkspaceIdentity={onUpdateWorkspaceIdentity}
-        open={manageOpen}
-        vaults={vaults}
-      />
       <ActionTooltip copy={{ label: translate(locale, 'status.vault.switch') }} side="top">
         <Button
           type="button"
@@ -505,26 +431,47 @@ export function VaultMenu(props: VaultMenuProps) {
             border: '1px solid var(--border)',
             borderRadius: 6,
             padding: 4,
-            minWidth: 200,
+            minWidth: menuMinWidth,
             boxShadow: '0 4px 12px var(--shadow-dialog)',
             zIndex: 1000,
           }}
+          data-testid="vault-menu-popover"
         >
+          {multiWorkspaceEnabled && (
+            <>
+              <VaultMenuHeader
+                locale={locale}
+                onOpenVaultSettings={onOpenVaultSettings ? () => {
+                  onOpenVaultSettings()
+                  setOpen(false)
+                } : undefined}
+              />
+              <div style={{ height: 1, background: 'var(--border)', margin: '2px 0 4px' }} />
+            </>
+          )}
           {vaults.map((vault) => (
             <VaultMenuItem
               key={vault.path}
               vault={vault}
-              isActive={vault.path === vaultPath}
-              canRemove={canRemove}
+              isActive={vault.path === defaultPath}
+              canRemove={canRemove && vault.path !== defaultPath}
+              disableMountToggle={vault.path === defaultPath && (includedVaults.length <= 1 || !onSetDefaultWorkspace)}
               locale={locale}
+              multiWorkspaceEnabled={multiWorkspaceEnabled}
               onSelect={() => {
-                onSwitchVault(vault.path)
+                if (multiWorkspaceEnabled && onSetDefaultWorkspace) onSetDefaultWorkspace(vault.path)
+                else onSwitchVault(vault.path)
                 setOpen(false)
               }}
-              onRemove={onRemoveVault ? () => {
-                onRemoveVault(vault.path)
-                setOpen(false)
-              } : undefined}
+              onMountedChange={(path, mounted) => {
+                if (!mounted && path === defaultPath) {
+                  const nextDefaultPath = includedVaults.find((includedVault) => includedVault.path !== path)?.path
+                  if (!nextDefaultPath) return
+                  onSetDefaultWorkspace?.(nextDefaultPath)
+                }
+                onUpdateWorkspaceIdentity?.(path, { mounted })
+              }}
+              onRequestRemove={onRemoveVault ? () => setVaultPendingRemoval(vault) : undefined}
             />
           ))}
           {actions.length > 0 && <div style={{ height: 1, background: 'var(--border)', margin: '4px 0' }} />}
@@ -535,6 +482,7 @@ export function VaultMenu(props: VaultMenuProps) {
               labelKey={action.labelKey}
               testId={action.testId}
               accent={action.accent}
+              multiWorkspaceEnabled={multiWorkspaceEnabled}
               locale={locale}
               onClick={() => {
                 action.onClick()
@@ -544,6 +492,20 @@ export function VaultMenu(props: VaultMenuProps) {
           ))}
         </div>
       )}
+      <ConfirmDeleteDialog
+        open={!!vaultPendingRemoval}
+        title={translate(locale, 'status.vault.removeConfirmTitle')}
+        message={translate(locale, 'status.vault.removeConfirmMessage', { label: vaultPendingRemoval?.label ?? '' })}
+        confirmLabel={translate(locale, 'status.vault.removeConfirmAction')}
+        onCancel={() => setVaultPendingRemoval(null)}
+        onConfirm={() => {
+          if (vaultPendingRemoval) {
+            onRemoveVault?.(vaultPendingRemoval.path)
+          }
+          setVaultPendingRemoval(null)
+          setOpen(false)
+        }}
+      />
     </div>
   )
 }
diff --git a/src/components/status-bar/types.ts b/src/components/status-bar/types.ts
index 4e3910a3..22c5abbb 100644
--- a/src/components/status-bar/types.ts
+++ b/src/components/status-bar/types.ts
@@ -2,6 +2,7 @@ export interface VaultOption {
   label: string
   path: string
   alias?: string
+  shortLabel?: string | null
   color?: string | null
   icon?: string | null
   mounted?: boolean
diff --git a/src/components/tolariaBlockNoteSideMenu.tsx b/src/components/tolariaBlockNoteSideMenu.tsx
index b7b5ba6f..eca994d2 100644
--- a/src/components/tolariaBlockNoteSideMenu.tsx
+++ b/src/components/tolariaBlockNoteSideMenu.tsx
@@ -327,11 +327,13 @@ function createSideMenuAlignmentController(editor: TolariaBlockNoteEditor, block
 }
 
 function useSideMenuTextAlignment(editor: TolariaBlockNoteEditor, block: SideMenuBlock | undefined) {
-  useLayoutEffect(() => {
-    if (!block) return
+  const blockId = block?.id
 
-    return createSideMenuAlignmentController(editor, block.id)
-  }, [block?.id, editor])
+  useLayoutEffect(() => {
+    if (!blockId) return
+
+    return createSideMenuAlignmentController(editor, blockId)
+  }, [blockId, editor])
 }
 
 function styleDragPreview(preview: HTMLElement, rect: DOMRect) {
diff --git a/src/components/useAiPanelController.ts b/src/components/useAiPanelController.ts
index 37fa53fe..9546da08 100644
--- a/src/components/useAiPanelController.ts
+++ b/src/components/useAiPanelController.ts
@@ -23,6 +23,7 @@ import { useAiPanelContextSnapshot } from './useAiPanelContextSnapshot'
 
 interface UseAiPanelControllerArgs {
   vaultPath: string
+  vaultPaths?: string[]
   defaultAiAgent: AiAgentId
   defaultAiTarget?: AiTarget
   defaultAiAgentReady: boolean
@@ -106,6 +107,7 @@ function useAiPermissionModeHandler({
 
 function usePanelAgent({
   vaultPath,
+  vaultPaths,
   contextPrompt,
   defaultAiAgent,
   defaultAiTarget,
@@ -117,6 +119,7 @@ function usePanelAgent({
 }: Pick<
   UseAiPanelControllerArgs,
   | 'vaultPath'
+  | 'vaultPaths'
   | 'defaultAiAgent'
   | 'defaultAiTarget'
   | 'defaultAiAgentReady'
@@ -127,7 +130,7 @@ function usePanelAgent({
 > & { contextPrompt?: string }) {
   const fileCallbacks = useAgentFileCallbacks({ onFileCreated, onFileModified, onVaultChanged })
   const permissionMode = useVaultAiAgentPermissionMode()
-  const agent = useCliAiAgent(vaultPath, contextPrompt, fileCallbacks, {
+  const agent = useCliAiAgent(vaultPath, vaultPaths, contextPrompt, fileCallbacks, {
     agent: defaultAiAgent,
     target: defaultAiTarget,
     agentReady: resolveAgentReady(defaultAiAgentReadiness, defaultAiAgentReady),
@@ -138,6 +141,7 @@ function usePanelAgent({
 
 export function useAiPanelController({
   vaultPath,
+  vaultPaths,
   defaultAiAgent,
   defaultAiTarget,
   defaultAiAgentReady,
@@ -165,7 +169,7 @@ export function useAiPanelController({
     noteListFilter,
   })
 
-  const { agent, permissionMode } = usePanelAgent({ vaultPath, contextPrompt, defaultAiAgent, defaultAiTarget, defaultAiAgentReady, defaultAiAgentReadiness, onFileCreated, onFileModified, onVaultChanged })
+  const { agent, permissionMode } = usePanelAgent({ vaultPath, vaultPaths, contextPrompt, defaultAiAgent, defaultAiTarget, defaultAiAgentReady, defaultAiAgentReadiness, onFileCreated, onFileModified, onVaultChanged })
   const isActive = agent.status === 'thinking' || agent.status === 'tool-executing'
 
   const handleSend = useCallback((text: string, references: NoteReference[]) => {
diff --git a/src/components/useSettingsPanelFocus.ts b/src/components/useSettingsPanelFocus.ts
new file mode 100644
index 00000000..7ee40af9
--- /dev/null
+++ b/src/components/useSettingsPanelFocus.ts
@@ -0,0 +1,73 @@
+import { useEffect, type RefObject } from 'react'
+
+const hasFocusableTabIndex = (element: HTMLElement): boolean => element.tabIndex >= 0
+
+const isAriaEnabled = (element: HTMLElement): boolean => element.getAttribute('aria-disabled') !== 'true'
+
+const isNativeEnabled = (element: HTMLElement): boolean => element.getAttribute('disabled') === null
+
+const getSettingsFocusableElements = (panel: HTMLElement): HTMLElement[] => {
+  return Array.from(panel.querySelectorAll<HTMLElement>('*'))
+    .filter(hasFocusableTabIndex)
+    .filter(isAriaEnabled)
+    .filter(isNativeEnabled)
+}
+
+const settingsBoundaryElement = (focusableElements: HTMLElement[], shiftKey: boolean): HTMLElement | undefined => {
+  const targetIndex = shiftKey ? focusableElements.length - 1 : 0
+  return focusableElements.at(targetIndex)
+}
+
+const isSettingsPanelElement = (panel: HTMLElement, activeElement: Element | null): activeElement is Element => {
+  return activeElement instanceof Element && panel.contains(activeElement)
+}
+
+const isSettingsFocusBoundary = (activeElement: Element, focusableElements: HTMLElement[], shiftKey: boolean): boolean => {
+  const boundaryIndex = shiftKey ? 0 : focusableElements.length - 1
+  return activeElement === focusableElements.at(boundaryIndex)
+}
+
+const resolveSettingsFocusTarget = (panel: HTMLElement, shiftKey: boolean): HTMLElement | null => {
+  const focusableElements = getSettingsFocusableElements(panel)
+  if (focusableElements.length === 0) return panel
+
+  const boundaryElement = settingsBoundaryElement(focusableElements, shiftKey)
+  if (!boundaryElement) return null
+
+  const activeElement = document.activeElement
+  if (!isSettingsPanelElement(panel, activeElement)) return boundaryElement
+  if (isSettingsFocusBoundary(activeElement, focusableElements, shiftKey)) return boundaryElement
+
+  return null
+}
+
+const trapSettingsPanelFocus = (event: KeyboardEvent, panel: HTMLElement | null): void => {
+  if (event.key !== 'Tab' || !panel) return
+
+  const focusTarget = resolveSettingsFocusTarget(panel, event.shiftKey)
+  if (!focusTarget) return
+
+  event.preventDefault()
+  focusTarget.focus()
+}
+
+export function useSettingsPanelAutofocus(panelRef: RefObject<HTMLDivElement | null>): void {
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      const focusTarget = panelRef.current?.querySelector<HTMLElement>('[data-settings-autofocus="true"]')
+      focusTarget?.focus()
+    }, 50)
+    return () => clearTimeout(timer)
+  }, [panelRef])
+}
+
+export function useSettingsPanelFocusTrap(panelRef: RefObject<HTMLDivElement | null>): void {
+  useEffect(() => {
+    const handleDocumentKeyDown = (event: KeyboardEvent) => {
+      trapSettingsPanelFocus(event, panelRef.current)
+    }
+
+    document.addEventListener('keydown', handleDocumentKeyDown, true)
+    return () => document.removeEventListener('keydown', handleDocumentKeyDown, true)
+  }, [panelRef])
+}
diff --git a/src/hooks/editorMarkdownParseFallback.test.ts b/src/hooks/editorMarkdownParseFallback.test.ts
new file mode 100644
index 00000000..3dee3cb2
--- /dev/null
+++ b/src/hooks/editorMarkdownParseFallback.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it } from 'vitest'
+import { parseMarkdownBlocksWithFallback } from './editorMarkdownParseFallback'
+
+describe('parseMarkdownBlocksWithFallback', () => {
+  it('renders non-empty source markdown when the parser returns no blocks', async () => {
+    const parsed = await parseMarkdownBlocksWithFallback({
+      parseMarkdownBlocks: () => [],
+      preprocessed: '## Heading\n\nBody',
+      sourceMarkdown: '## Heading\n\nBody',
+      context: 'workspace-note.md',
+    })
+
+    expect(parsed.usedSourceFallback).toBe(true)
+    expect(parsed.blocks).toEqual([
+      {
+        type: 'paragraph',
+        content: [{ type: 'text', text: '## Heading', styles: {} }],
+        children: [],
+      },
+      {
+        type: 'paragraph',
+        content: [],
+        children: [],
+      },
+      {
+        type: 'paragraph',
+        content: [{ type: 'text', text: 'Body', styles: {} }],
+        children: [],
+      },
+    ])
+  })
+
+  it('keeps genuinely blank markdown blank', async () => {
+    const parsed = await parseMarkdownBlocksWithFallback({
+      parseMarkdownBlocks: () => [],
+      preprocessed: '',
+      sourceMarkdown: '',
+      context: 'blank-note.md',
+    })
+
+    expect(parsed.usedSourceFallback).toBe(false)
+    expect(parsed.blocks).toEqual([])
+  })
+})
diff --git a/src/hooks/editorMarkdownParseFallback.ts b/src/hooks/editorMarkdownParseFallback.ts
index d175c790..25d7ae80 100644
--- a/src/hooks/editorMarkdownParseFallback.ts
+++ b/src/hooks/editorMarkdownParseFallback.ts
@@ -20,6 +20,20 @@ function buildMarkdownSourceBlocks(markdown: string): EditorBlocks {
   return markdown.split('\n').map(buildSourceLineBlock)
 }
 
+function parsedBlocksOrSourceFallback(blocks: EditorBlocks, sourceMarkdown: string): MarkdownParseResult {
+  const normalizedBlocks = normalizeParsedImageBlocks(blocks)
+  if (normalizedBlocks.length > 0 || sourceMarkdown.trim().length === 0) {
+    return {
+      blocks: normalizedBlocks,
+      usedSourceFallback: false,
+    }
+  }
+  return {
+    blocks: buildMarkdownSourceBlocks(sourceMarkdown),
+    usedSourceFallback: true,
+  }
+}
+
 export async function parseMarkdownBlocksWithFallback(options: {
   parseMarkdownBlocks: ParseMarkdownBlocks
   preprocessed: string
@@ -29,10 +43,7 @@ export async function parseMarkdownBlocksWithFallback(options: {
   const { parseMarkdownBlocks, preprocessed, sourceMarkdown, context } = options
 
   try {
-    return {
-      blocks: normalizeParsedImageBlocks(await parseMarkdownBlocks(preprocessed)),
-      usedSourceFallback: false,
-    }
+    return parsedBlocksOrSourceFallback(await parseMarkdownBlocks(preprocessed), sourceMarkdown)
   } catch (error) {
     console.warn(`[editor] Rendering ${context} as plain Markdown because BlockNote could not parse it:`, error)
     return {
diff --git a/src/hooks/noteContentCache.ts b/src/hooks/noteContentCache.ts
index 6e0a0590..3cdad1f1 100644
--- a/src/hooks/noteContentCache.ts
+++ b/src/hooks/noteContentCache.ts
@@ -93,6 +93,11 @@ function targetEntry(target: string | VaultEntry): VaultEntry | null {
   return typeof target === 'string' ? null : target
 }
 
+function targetVaultPath(target: string | VaultEntry): string | undefined {
+  const entry = targetEntry(target)
+  return entry ? workspacePathForEntry(entry) : undefined
+}
+
 function targetIdentity(target: string | VaultEntry): NoteContentIdentity | null {
   const entry = targetEntry(target)
   return entry ? noteContentIdentity(entry) : null
@@ -170,7 +175,12 @@ function getValidateNoteContentCommandPayload(path: string, content: string, vau
   return { ...getNoteContentCommandPayload(path, vaultPath), content }
 }
 
-function shouldReuseExistingRequest(existing: NoteContentCacheEntry, identity: NoteContentIdentity | null): boolean {
+function shouldReuseExistingRequest(
+  existing: NoteContentCacheEntry,
+  identity: NoteContentIdentity | null,
+  vaultPath?: string,
+): boolean {
+  if (existing.vaultPath !== vaultPath) return false
   if (!isCompleteIdentity(identity) || !isCompleteIdentity(existing.identity)) return true
   return sameIdentity(existing.identity, identity)
 }
@@ -184,7 +194,7 @@ function markRequestSettled(entry: NoteContentCacheEntry, state: Extract<NoteCon
 function createNoteContentRequest(target: string | VaultEntry): NoteContentCacheEntry {
   const path = targetPath(target)
   const sourceEntry = targetEntry(target)
-  const vaultPath = sourceEntry ? workspacePathForEntry(sourceEntry) : undefined
+  const vaultPath = targetVaultPath(target)
   const identity = targetIdentity(target)
   const cacheEntry: NoteContentCacheEntry = {
     path,
@@ -277,8 +287,9 @@ function requestNoteContent(target: string | VaultEntry, mode: NoteContentReques
 export function prefetchNoteContent(target: string | VaultEntry): void {
   const path = targetPath(target)
   const identity = targetIdentity(target)
+  const vaultPath = targetVaultPath(target)
   const existing = prefetchCache.get(path)
-  if (existing && shouldReuseExistingRequest(existing, identity)) return
+  if (existing && shouldReuseExistingRequest(existing, identity, vaultPath)) return
 
   void requestNoteContent(target, 'prefetch').promise.catch((error) => {
     if (isCanceledNoteContentRequest(error) || isNoActiveVaultSelectedError(error) || isUnreadableNoteContentError(error)) return
@@ -325,13 +336,18 @@ async function validateCachedNoteContent(entry: NoteContentCacheEntry): Promise<
     : mockInvoke<boolean>('validate_note_content', payload)
 }
 
+function matchesCachedContentVault(entry: VaultEntry, cachedEntry: NoteContentCacheEntry): boolean {
+  return cachedEntry.vaultPath === targetVaultPath(entry)
+}
+
 function canTrustCachedContentIdentity(entry: VaultEntry, cachedEntry: NoteContentCacheEntry): boolean {
-  return sameIdentity(noteContentIdentity(entry), cachedEntry.identity)
+  return matchesCachedContentVault(entry, cachedEntry)
+    && sameIdentity(noteContentIdentity(entry), cachedEntry.identity)
 }
 
 function canUseExistingContentRequest(target: VaultEntry, existing: NoteContentCacheEntry | undefined, forceFresh: boolean): existing is NoteContentCacheEntry {
   if (forceFresh || !existing) return false
-  return shouldReuseExistingRequest(existing, noteContentIdentity(target))
+  return shouldReuseExistingRequest(existing, noteContentIdentity(target), targetVaultPath(target))
 }
 
 async function loadNoteContent(target: VaultEntry, forceFresh = false): Promise<string> {
@@ -345,6 +361,10 @@ async function loadNoteContent(target: VaultEntry, forceFresh = false): Promise<
 
 async function loadCachedContentIfFresh(entry: VaultEntry, cachedEntry: NoteContentCacheEntry): Promise<string | null> {
   if (cachedEntry.value === null) return null
+  if (!matchesCachedContentVault(entry, cachedEntry)) {
+    prefetchCache.delete(entry.path)
+    return null
+  }
   if (canTrustCachedContentIdentity(entry, cachedEntry)) {
     rememberNoteContent(cachedEntry)
     return cachedEntry.value
diff --git a/src/hooks/useAppSave.test.ts b/src/hooks/useAppSave.test.ts
index 16c3a8cf..e37f4c1e 100644
--- a/src/hooks/useAppSave.test.ts
+++ b/src/hooks/useAppSave.test.ts
@@ -32,6 +32,21 @@ function makeEntry(path: string, title = 'Test', filename = 'test.md'): VaultEnt
   return { path, title, filename, content: '', outgoingLinks: [], snippet: '', wordCount: 0, isA: 'Note', status: null, createdAt: null, modifiedAt: null, icon: null, tags: [] } as unknown as VaultEntry
 }
 
+function makeWorkspace(path: string, alias = 'workspace'): NonNullable<VaultEntry['workspace']> {
+  return {
+    id: alias,
+    label: alias,
+    alias,
+    path,
+    shortLabel: alias.slice(0, 2).toUpperCase(),
+    color: null,
+    icon: null,
+    mounted: true,
+    available: true,
+    defaultForNewNotes: false,
+  }
+}
+
 describe('useAppSave', () => {
   const deps = {
     updateEntry: vi.fn(),
@@ -406,8 +421,10 @@ describe('useAppSave', () => {
     })
 
     expect(vi.mocked(invoke)).toHaveBeenCalledWith('auto_rename_untitled', {
-      vaultPath: '/vault',
-      notePath: entry.path,
+      args: {
+        vaultPath: '/vault',
+        notePath: entry.path,
+      },
     })
     expect(deps.replaceEntry).toHaveBeenCalledWith(
       entry.path,
@@ -616,6 +633,41 @@ describe('useAppSave', () => {
     )
   })
 
+  it('passes the active tab workspace path to manual filename renames', async () => {
+    vi.mocked(isTauri).mockReturnValue(true)
+
+    const oldPath = '/team/fresh-title.md'
+    const newPath = '/team/manual-name.md'
+    const entry = {
+      ...makeEntry(oldPath, 'Fresh Title', 'fresh-title.md'),
+      workspace: makeWorkspace('/team', 'team'),
+    }
+
+    deps.handleRenameFilename.mockImplementation(async (path, newFilenameStem, vaultPath, onEntryRenamed) => {
+      expect(path).toBe(oldPath)
+      expect(newFilenameStem).toBe('manual-name')
+      expect(vaultPath).toBe('/team')
+      onEntryRenamed(path, { path: newPath, filename: 'manual-name.md', title: 'Fresh Title' }, '# Fresh Title\n')
+    })
+
+    const { result } = renderSave({
+      resolvedPath: '/personal',
+      tabs: [{ entry, content: '# Fresh Title\n' }],
+      activeTabPath: oldPath,
+    })
+
+    await act(async () => {
+      await result.current.handleFilenameRename(oldPath, 'manual-name')
+    })
+
+    expect(deps.handleRenameFilename).toHaveBeenCalledWith(
+      oldPath,
+      'manual-name',
+      '/team',
+      expect.any(Function),
+    )
+  })
+
   it('uses the latest active tab content when untitled auto-rename resolves after continued typing', async () => {
     const {
       oldPath,
diff --git a/src/hooks/useAppSave.ts b/src/hooks/useAppSave.ts
index d5e21676..a0251582 100644
--- a/src/hooks/useAppSave.ts
+++ b/src/hooks/useAppSave.ts
@@ -7,6 +7,7 @@ import { isTauri } from '../mock-tauri'
 import type { VaultEntry } from '../types'
 import { createTranslator, type AppLocale } from '../lib/i18n'
 import { canWritePathToVault } from '../utils/vaultPathContainment'
+import { vaultPathForEntry } from '../utils/workspaces'
 
 interface TabState {
   entry: VaultEntry
@@ -43,6 +44,11 @@ function trackRenamedPath(renamedPaths: RenamedPathMap, oldPath: string, newPath
   renamedPaths.set(oldPath, newPath)
 }
 
+function vaultPathForTabPath(tabs: TabState[], path: string, fallbackVaultPath: string): string {
+  const tab = tabs.find((candidate) => candidate.entry.path === path)
+  return tab ? vaultPathForEntry(tab.entry, fallbackVaultPath) : fallbackVaultPath
+}
+
 async function waitForSettledPath({
   path,
   renamedPaths,
@@ -278,9 +284,9 @@ function useUntitledRenameExecutor({
 
     const renamePromise = (async () => {
       try {
+        const renameVaultPath = vaultPathForTabPath(tabsRef.current, path, resolvedPath)
         const result = await invoke<{ new_path: string; updated_files: number } | null>('auto_rename_untitled', {
-          vaultPath: resolvedPath,
-          notePath: path,
+          args: { vaultPath: renameVaultPath, notePath: path },
         })
         if (!result) return path
         onInternalVaultWrite?.(path)
@@ -574,6 +580,7 @@ function useRenameHandlers({
   handleRenameNote,
   handleRenameFilename,
   resolvedPath,
+  tabsRef,
   replaceRenamedEntry,
   loadModifiedFiles,
 }: {
@@ -583,6 +590,7 @@ function useRenameHandlers({
   handleRenameNote: AppSaveDeps['handleRenameNote']
   handleRenameFilename: AppSaveDeps['handleRenameFilename']
   resolvedPath: string
+  tabsRef: MutableRefObject<TabState[]>
   replaceRenamedEntry: (oldPath: string, newEntry: Partial<VaultEntry> & { path: string }, newContent: string) => void
   loadModifiedFiles: AppSaveDeps['loadModifiedFiles']
 }) {
@@ -593,8 +601,9 @@ function useRenameHandlers({
       savePendingForPath,
       cancelPendingUntitledRename,
     })
-    await handleRenameFilename(currentPath, newFilenameStem, resolvedPath, replaceRenamedEntry).then(loadModifiedFiles)
-  }, [resolveCurrentPath, savePendingForPath, cancelPendingUntitledRename, handleRenameFilename, resolvedPath, replaceRenamedEntry, loadModifiedFiles])
+    const renameVaultPath = vaultPathForTabPath(tabsRef.current, currentPath, resolvedPath)
+    await handleRenameFilename(currentPath, newFilenameStem, renameVaultPath, replaceRenamedEntry).then(loadModifiedFiles)
+  }, [resolveCurrentPath, savePendingForPath, cancelPendingUntitledRename, tabsRef, resolvedPath, handleRenameFilename, replaceRenamedEntry, loadModifiedFiles])
 
   const handleTitleSync = useCallback((path: string, newTitle: string) => {
     void preparePathForManualRename({
@@ -603,10 +612,13 @@ function useRenameHandlers({
       savePendingForPath,
       cancelPendingUntitledRename,
     })
-      .then((currentPath) => handleRenameNote(currentPath, newTitle, resolvedPath, replaceRenamedEntry))
+      .then((currentPath) => {
+        const renameVaultPath = vaultPathForTabPath(tabsRef.current, currentPath, resolvedPath)
+        return handleRenameNote(currentPath, newTitle, renameVaultPath, replaceRenamedEntry)
+      })
       .then(loadModifiedFiles)
       .catch((err) => console.error('Title rename failed:', err))
-  }, [resolveCurrentPath, savePendingForPath, cancelPendingUntitledRename, handleRenameNote, resolvedPath, replaceRenamedEntry, loadModifiedFiles])
+  }, [resolveCurrentPath, savePendingForPath, cancelPendingUntitledRename, tabsRef, resolvedPath, handleRenameNote, replaceRenamedEntry, loadModifiedFiles])
 
   return { handleFilenameRename, handleTitleSync }
 }
@@ -789,6 +801,7 @@ function useAppSaveHandlers({
     handleRenameNote,
     handleRenameFilename,
     resolvedPath,
+    tabsRef,
     replaceRenamedEntry,
     loadModifiedFiles,
   })
diff --git a/src/hooks/useCliAiAgent.test.ts b/src/hooks/useCliAiAgent.test.ts
index 9f8b2847..3d14b719 100644
--- a/src/hooks/useCliAiAgent.test.ts
+++ b/src/hooks/useCliAiAgent.test.ts
@@ -27,7 +27,7 @@ function renderAgent(
   permissionMode: 'safe' | 'power_user' = 'safe',
 ) {
   return renderHook(
-    ({ context }) => useCliAiAgent(VAULT, context, undefined, {
+    ({ context }) => useCliAiAgent(VAULT, [VAULT, '/Users/luca/Brian'], context, undefined, {
       agent: 'codex',
       agentReady: true,
       permissionMode,
@@ -61,6 +61,7 @@ describe('useCliAiAgent', () => {
       agent: 'codex',
       agentDocsPath: '/app/agent-docs',
       permissionMode: 'safe',
+      vaultPaths: [VAULT, '/Users/luca/Brian'],
       vaultContext: 'You are viewing note with body: Hello world',
     })
     expect(mockStreamAiAgent).toHaveBeenCalledWith(expect.objectContaining({
@@ -80,6 +81,19 @@ describe('useCliAiAgent', () => {
     }))
   })
 
+  it('forwards active vault roots to the stream request', async () => {
+    const { result } = renderAgent()
+
+    await act(async () => {
+      await result.current.sendMessage('Search all active vaults')
+    })
+
+    expect(mockStreamAiAgent).toHaveBeenCalledWith(expect.objectContaining({
+      vaultPath: VAULT,
+      vaultPaths: [VAULT, '/Users/luca/Brian'],
+    }))
+  })
+
   it('adds local transcript markers without sending them as chat history', async () => {
     const { result } = renderAgent()
 
@@ -127,7 +141,7 @@ describe('useCliAiAgent', () => {
   })
 
   it('adds a local response instead of streaming when the selected agent is unavailable', async () => {
-    const { result } = renderHook(() => useCliAiAgent(VAULT, undefined, undefined, {
+    const { result } = renderHook(() => useCliAiAgent(VAULT, undefined, undefined, undefined, {
       agent: 'codex',
       agentReady: false,
       permissionMode: 'safe',
diff --git a/src/hooks/useCliAiAgent.ts b/src/hooks/useCliAiAgent.ts
index 03fc674e..c5818b54 100644
--- a/src/hooks/useCliAiAgent.ts
+++ b/src/hooks/useCliAiAgent.ts
@@ -67,6 +67,7 @@ function useCliAiAgentRuntime(fileCallbacks: AgentFileCallbacks | undefined): Us
 
 export function useCliAiAgent(
   vaultPath: string,
+  vaultPaths: string[] | undefined,
   contextPrompt: string | undefined,
   fileCallbacks: AgentFileCallbacks | undefined,
   options: UseCliAiAgentOptions,
@@ -87,6 +88,7 @@ export function useCliAiAgent(
         target,
         ready: agentReady,
         vaultPath,
+        vaultPaths,
         permissionMode,
         systemPromptOverride: contextPrompt,
       },
diff --git a/src/hooks/useCommitFlow.test.ts b/src/hooks/useCommitFlow.test.ts
index e6193548..6f85e13f 100644
--- a/src/hooks/useCommitFlow.test.ts
+++ b/src/hooks/useCommitFlow.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { renderHook, act } from '@testing-library/react'
+import { renderHook, act, waitFor } from '@testing-library/react'
 import { useCommitFlow } from './useCommitFlow'
 
 const mockInvokeFn = vi.fn()
@@ -41,7 +41,7 @@ describe('useCommitFlow', () => {
     })
   })
 
-  function renderCommitFlow() {
+  function renderCommitFlow(overrides: Partial<Parameters<typeof useCommitFlow>[0]> = {}) {
     return renderHook(() => useCommitFlow({
       savePending,
       loadModifiedFiles,
@@ -49,6 +49,7 @@ describe('useCommitFlow', () => {
       setToastMessage,
       onPushRejected,
       vaultPath: '/vault',
+      ...overrides,
     }))
   }
 
@@ -98,6 +99,44 @@ describe('useCommitFlow', () => {
     expect(setToastMessage).toHaveBeenCalledWith('Committed and pushed')
   })
 
+  it('runAutomaticCheckpoint commits and pushes all active repositories', async () => {
+    const resolveRemoteStatusForVaultPath = vi.fn().mockResolvedValue({
+      branch: 'main',
+      ahead: 0,
+      behind: 0,
+      hasRemote: true,
+    })
+    mockInvokeFn.mockImplementation((command: string, args: { vaultPath?: string }) => {
+      if (command === 'get_modified_files') {
+        return Promise.resolve([{
+          path: `${args.vaultPath}/note.md`,
+          relativePath: 'note.md',
+          status: 'modified',
+        }])
+      }
+      if (command === 'git_commit') return Promise.resolve('[main abc1234] test commit')
+      if (command === 'git_push') return Promise.resolve({ status: 'ok', message: 'Pushed to remote' })
+      throw new Error(`Unexpected command: ${command}`)
+    })
+
+    const { result } = renderCommitFlow({
+      automaticVaultPaths: ['/vault', '/work'],
+      resolveRemoteStatusForVaultPath,
+    })
+
+    await act(async () => {
+      await result.current.runAutomaticCheckpoint()
+    })
+
+    expect(mockInvokeFn).toHaveBeenCalledWith('git_commit', { vaultPath: '/vault', message: 'Updated 1 note' })
+    expect(mockInvokeFn).toHaveBeenCalledWith('git_push', { vaultPath: '/vault' })
+    expect(mockInvokeFn).toHaveBeenCalledWith('git_commit', { vaultPath: '/work', message: 'Updated 1 note' })
+    expect(mockInvokeFn).toHaveBeenCalledWith('git_push', { vaultPath: '/work' })
+    expect(resolveRemoteStatusForVaultPath).toHaveBeenCalledWith('/work')
+    expect(loadModifiedFiles).toHaveBeenCalled()
+    expect(setToastMessage).toHaveBeenCalledWith('AutoGit checkpointed 2 repositories')
+  })
+
   it('runAutomaticCheckpoint retries push-only when local commits are already ahead', async () => {
     resolveRemoteStatus.mockResolvedValue({ branch: 'main', ahead: 2, behind: 0, hasRemote: true })
     mockInvokeFn.mockImplementation((command: string) => {
@@ -153,6 +192,57 @@ describe('useCommitFlow', () => {
     expect(onPushRejected).not.toHaveBeenCalled()
   })
 
+  it('handleCommitPush uses the selected manual repository', async () => {
+    const resolveRemoteStatusForVaultPath = vi.fn().mockResolvedValue({
+      branch: 'main',
+      ahead: 0,
+      behind: 0,
+      hasRemote: true,
+    })
+    const { result } = renderCommitFlow({
+      manualVaultPath: '/work',
+      resolveRemoteStatusForVaultPath,
+    })
+
+    await act(async () => {
+      await result.current.handleCommitPush('test message')
+    })
+
+    expect(mockInvokeFn).toHaveBeenCalledWith('git_commit', { vaultPath: '/work', message: 'test message' })
+    expect(mockInvokeFn).toHaveBeenCalledWith('git_push', { vaultPath: '/work' })
+    expect(resolveRemoteStatusForVaultPath).toHaveBeenCalledWith('/work')
+  })
+
+  it('refreshes dialog mode when the selected manual repository changes', async () => {
+    const resolveRemoteStatusForVaultPath = vi.fn((vaultPath: string) => Promise.resolve({
+      branch: 'main',
+      ahead: 0,
+      behind: 0,
+      hasRemote: vaultPath !== '/local',
+    }))
+    const { result, rerender } = renderHook(
+      ({ manualVaultPath }) => useCommitFlow({
+        savePending,
+        loadModifiedFiles,
+        resolveRemoteStatus,
+        resolveRemoteStatusForVaultPath,
+        setToastMessage,
+        onPushRejected,
+        vaultPath: '/vault',
+        manualVaultPath,
+      }),
+      { initialProps: { manualVaultPath: '/work' } },
+    )
+
+    await act(async () => {
+      await result.current.openCommitDialog()
+    })
+    expect(result.current.commitMode).toBe('push')
+
+    rerender({ manualVaultPath: '/local' })
+    await waitFor(() => expect(result.current.commitMode).toBe('local'))
+  })
+
   it('handleCommitPush calls onPushRejected when push is rejected', async () => {
     mockInvokeFn.mockImplementation((command: string) => {
       if (command === 'git_commit') return Promise.resolve('[main abc1234] test message')
diff --git a/src/hooks/useCommitFlow.ts b/src/hooks/useCommitFlow.ts
index 3709413b..0e927d51 100644
--- a/src/hooks/useCommitFlow.ts
+++ b/src/hooks/useCommitFlow.ts
@@ -1,4 +1,4 @@
-import { useCallback, useRef, useState, type MutableRefObject } from 'react'
+import { useCallback, useEffect, useRef, useState, type MutableRefObject } from 'react'
 import { invoke } from '@tauri-apps/api/core'
 import type { GitPushResult, GitRemoteStatus, ModifiedFile } from '../types'
 import { trackEvent } from '../lib/telemetry'
@@ -23,8 +23,11 @@ interface CommitFlowConfig {
   savePending: () => Promise<void | boolean>
   loadModifiedFiles: () => Promise<void>
   resolveRemoteStatus: () => Promise<GitRemoteStatus | null>
+  resolveRemoteStatusForVaultPath?: (vaultPath: string) => Promise<GitRemoteStatus | null>
   setToastMessage: (msg: string | null) => void
   onPushRejected?: () => void
+  automaticVaultPaths?: string[]
+  manualVaultPath?: string
   vaultPath: string
 }
 
@@ -54,6 +57,25 @@ interface ExecutedCheckpoint {
   result: CommitResult
 }
 
+interface RepositoryCheckpointResult {
+  action?: CheckpointAction
+  error?: unknown
+  remoteStatus: GitRemoteStatus | null
+  result?: CommitResult
+  status: 'executed' | 'failed' | 'skipped'
+  vaultPath: string
+}
+
+type AutomaticCheckpointRunConfig = Pick<
+  CommitFlowConfig,
+  | 'loadModifiedFiles'
+  | 'onPushRejected'
+  | 'resolveRemoteStatus'
+  | 'resolveRemoteStatusForVaultPath'
+  | 'setToastMessage'
+  | 'vaultPath'
+>
+
 function commitModeFromRemoteStatus(remoteStatus: GitRemoteStatus | null): CommitMode {
   return remoteStatus?.hasRemote === false ? 'local' : 'push'
 }
@@ -83,6 +105,14 @@ async function readModifiedFiles({ vaultPath }: VaultPathArgs): Promise<Modified
   return invoke<ModifiedFile[]>('get_modified_files', { vaultPath })
 }
 
+async function readRemoteStatus({ vaultPath }: VaultPathArgs): Promise<GitRemoteStatus> {
+  if (!isTauri()) {
+    return mockInvoke<GitRemoteStatus>('git_remote_status', { vaultPath })
+  }
+
+  return invoke<GitRemoteStatus>('git_remote_status', { vaultPath })
+}
+
 async function executeCommitAction({
   vaultPath,
   message,
@@ -164,6 +194,83 @@ async function executeAutomaticCheckpoint(
   return { action: 'commit', result }
 }
 
+function uniqueVaultPaths(paths: string[]): string[] {
+  const seen = new Set<string>()
+  return paths.filter((path) => {
+    const trimmed = path.trim()
+    if (!trimmed || seen.has(trimmed)) return false
+    seen.add(trimmed)
+    return true
+  })
+}
+
+function checkpointVaultPaths({
+  automaticVaultPaths,
+  vaultPath,
+}: Pick<CommitFlowConfig, 'automaticVaultPaths' | 'vaultPath'>): string[] {
+  const configuredPaths = automaticVaultPaths && automaticVaultPaths.length > 0
+    ? automaticVaultPaths
+    : [vaultPath]
+  const paths = uniqueVaultPaths(configuredPaths)
+  return paths.length > 0 ? paths : [vaultPath]
+}
+
+async function resolveRemoteStatusForPath(
+  vaultPath: string,
+  config: Pick<CommitFlowConfig, 'resolveRemoteStatus' | 'resolveRemoteStatusForVaultPath' | 'vaultPath'>,
+): Promise<GitRemoteStatus | null> {
+  if (vaultPath === config.vaultPath) {
+    return config.resolveRemoteStatus()
+  }
+
+  if (config.resolveRemoteStatusForVaultPath) {
+    return config.resolveRemoteStatusForVaultPath(vaultPath)
+  }
+
+  try {
+    return await readRemoteStatus({ vaultPath })
+  } catch {
+    return null
+  }
+}
+
+async function checkpointRepository(
+  vaultPath: string,
+  config: Pick<CommitFlowConfig, 'resolveRemoteStatus' | 'resolveRemoteStatusForVaultPath' | 'vaultPath'>,
+): Promise<RepositoryCheckpointResult> {
+  const remoteStatus = await resolveRemoteStatusForPath(vaultPath, config)
+  const modifiedFiles = await readModifiedFiles({ vaultPath })
+  const message = generateAutomaticCommitMessage(modifiedFiles)
+  const command = createAutomaticCheckpointCommand({ remoteStatus, vaultPath, message })
+
+  if (!command) {
+    return { remoteStatus, status: 'skipped', vaultPath }
+  }
+
+  const { action, result } = await executeAutomaticCheckpoint(command)
+  return { action, remoteStatus, result, status: 'executed', vaultPath }
+}
+
+function multiRepositoryCheckpointToast(results: RepositoryCheckpointResult[]): string {
+  const executedCount = results.filter((result) => result.status === 'executed').length
+  const failedCount = results.filter((result) => result.status === 'failed').length
+  const rejectedCount = results.filter((result) => result.result && isPushRejected(result.result)).length
+
+  if (executedCount === 0) {
+    const firstError = results.find((result) => result.status === 'failed')?.error
+    return firstError
+      ? `AutoGit failed: ${formatCommitError(firstError)}`
+      : 'Nothing to commit or push'
+  }
+
+  const suffixes = []
+  if (rejectedCount > 0) suffixes.push(`${rejectedCount} push rejected`)
+  if (failedCount > 0) suffixes.push(`${failedCount} failed`)
+
+  const summary = `AutoGit checkpointed ${executedCount} ${executedCount === 1 ? 'repository' : 'repositories'}`
+  return suffixes.length > 0 ? `${summary}; ${suffixes.join(', ')}` : summary
+}
+
 async function runCheckpointRefresh({
   loadModifiedFiles,
   resolveRemoteStatus,
@@ -191,13 +298,83 @@ async function finalizeCheckpoint({
   await runCheckpointRefresh({ loadModifiedFiles, resolveRemoteStatus })
 }
 
+async function runSingleRepositoryCheckpoint(
+  targetVaultPath: string,
+  config: AutomaticCheckpointRunConfig,
+): Promise<boolean> {
+  const remoteStatus = await resolveRemoteStatusForPath(targetVaultPath, config)
+  const modifiedFiles = await readModifiedFiles({ vaultPath: targetVaultPath })
+  const message = generateAutomaticCommitMessage(modifiedFiles)
+  const command = createAutomaticCheckpointCommand({
+    remoteStatus,
+    vaultPath: targetVaultPath,
+    message,
+  })
+
+  if (!command) {
+    config.setToastMessage(nothingToCommitToast(remoteStatus))
+    return false
+  }
+
+  const { action, result } = await executeAutomaticCheckpoint(command)
+  await finalizeCheckpoint({
+    result,
+    toastMessage: checkpointToastMessage(result, action),
+    loadModifiedFiles: config.loadModifiedFiles,
+    resolveRemoteStatus: config.resolveRemoteStatus,
+    setToastMessage: config.setToastMessage,
+    onPushRejected: config.onPushRejected,
+  })
+  return true
+}
+
+async function checkpointRepositories(
+  vaultPaths: string[],
+  config: AutomaticCheckpointRunConfig,
+): Promise<RepositoryCheckpointResult[]> {
+  const results: RepositoryCheckpointResult[] = []
+  for (const targetVaultPath of vaultPaths) {
+    try {
+      results.push(await checkpointRepository(targetVaultPath, config))
+    } catch (error) {
+      results.push({
+        error,
+        remoteStatus: null,
+        status: 'failed',
+        vaultPath: targetVaultPath,
+      })
+    }
+  }
+  return results
+}
+
+async function runMultipleRepositoryCheckpoint(
+  targetVaultPaths: string[],
+  config: AutomaticCheckpointRunConfig,
+): Promise<boolean> {
+  const results = await checkpointRepositories(targetVaultPaths, config)
+
+  if (results.some((result) => result.result && isPushRejected(result.result))) {
+    config.onPushRejected?.()
+  }
+
+  config.setToastMessage(multiRepositoryCheckpointToast(results))
+  await runCheckpointRefresh({
+    loadModifiedFiles: config.loadModifiedFiles,
+    resolveRemoteStatus: config.resolveRemoteStatus,
+  })
+  return results.some((result) => result.status === 'executed')
+}
+
 function useAutomaticCheckpointAction({
   checkpointInFlightRef,
   savePending,
   loadModifiedFiles,
   resolveRemoteStatus,
+  resolveRemoteStatusForVaultPath,
   setToastMessage,
   onPushRejected,
+  automaticVaultPaths,
   vaultPath,
 }: CommitFlowConfig & {
   checkpointInFlightRef: MutableRefObject<boolean>
@@ -213,25 +390,18 @@ function useAutomaticCheckpointAction({
         await savePending()
       }
 
-      const remoteStatus = await resolveRemoteStatus()
-      const modifiedFiles = await readModifiedFiles({ vaultPath })
-      const message = generateAutomaticCommitMessage(modifiedFiles)
-      const command = createAutomaticCheckpointCommand({ remoteStatus, vaultPath, message })
-      if (!command) {
-        setToastMessage(nothingToCommitToast(remoteStatus))
-        return false
-      }
-
-      const { action, result } = await executeAutomaticCheckpoint(command)
-      await finalizeCheckpoint({
-        result,
-        toastMessage: checkpointToastMessage(result, action),
+      const targetVaultPaths = checkpointVaultPaths({ automaticVaultPaths, vaultPath })
+      const runConfig = {
         loadModifiedFiles,
-        resolveRemoteStatus,
-        setToastMessage,
         onPushRejected,
-      })
-      return true
+        resolveRemoteStatus,
+        resolveRemoteStatusForVaultPath,
+        setToastMessage,
+        vaultPath,
+      }
+      return targetVaultPaths.length === 1
+        ? runSingleRepositoryCheckpoint(targetVaultPaths[0], runConfig)
+        : runMultipleRepositoryCheckpoint(targetVaultPaths, runConfig)
     } catch (err) {
       console.error('Commit failed:', err)
       setToastMessage(`Commit failed: ${formatCommitError(err)}`)
@@ -239,7 +409,17 @@ function useAutomaticCheckpointAction({
     } finally {
       checkpointInFlightRef.current = false
     }
-  }, [checkpointInFlightRef, loadModifiedFiles, onPushRejected, resolveRemoteStatus, savePending, setToastMessage, vaultPath])
+  }, [
+    automaticVaultPaths,
+    checkpointInFlightRef,
+    loadModifiedFiles,
+    onPushRejected,
+    resolveRemoteStatus,
+    resolveRemoteStatusForVaultPath,
+    savePending,
+    setToastMessage,
+    vaultPath,
+  ])
 }
 
 function useManualCommitPushAction({
@@ -247,8 +427,10 @@ function useManualCommitPushAction({
   savePending,
   loadModifiedFiles,
   resolveRemoteStatus,
+  resolveRemoteStatusForVaultPath,
   setToastMessage,
   onPushRejected,
+  manualVaultPath,
   vaultPath,
   setShowCommitDialog,
 }: CommitFlowConfig & {
@@ -262,9 +444,14 @@ function useManualCommitPushAction({
 
     try {
       await savePending()
-      const remoteStatus = await resolveRemoteStatus()
-      const result = await executeCommitAction({
+      const targetVaultPath = manualVaultPath || vaultPath
+      const remoteStatus = await resolveRemoteStatusForPath(targetVaultPath, {
+        resolveRemoteStatus,
+        resolveRemoteStatusForVaultPath,
         vaultPath,
+      })
+      const result = await executeCommitAction({
+        vaultPath: targetVaultPath,
         message,
         commitMode: commitModeFromRemoteStatus(remoteStatus),
       })
@@ -284,7 +471,113 @@ function useManualCommitPushAction({
     } finally {
       checkpointInFlightRef.current = false
     }
-  }, [checkpointInFlightRef, loadModifiedFiles, onPushRejected, resolveRemoteStatus, savePending, setShowCommitDialog, setToastMessage, vaultPath])
+  }, [
+    checkpointInFlightRef,
+    loadModifiedFiles,
+    manualVaultPath,
+    onPushRejected,
+    resolveRemoteStatus,
+    resolveRemoteStatusForVaultPath,
+    savePending,
+    setShowCommitDialog,
+    setToastMessage,
+    vaultPath,
+  ])
+}
+
+function useCommitModeRefresh({
+  commitModeVaultPathRef,
+  manualVaultPath,
+  resolveRemoteStatus,
+  resolveRemoteStatusForVaultPath,
+  setCommitMode,
+  showCommitDialog,
+  vaultPath,
+}: Pick<
+  CommitFlowConfig,
+  'manualVaultPath' | 'resolveRemoteStatus' | 'resolveRemoteStatusForVaultPath' | 'vaultPath'
+> & {
+  commitModeVaultPathRef: MutableRefObject<string | null>
+  setCommitMode: (mode: CommitMode) => void
+  showCommitDialog: boolean
+}) {
+  useEffect(() => {
+    if (!showCommitDialog) return
+
+    let cancelled = false
+    const targetVaultPath = manualVaultPath || vaultPath
+    if (commitModeVaultPathRef.current === targetVaultPath) return
+
+    void resolveRemoteStatusForPath(targetVaultPath, {
+      resolveRemoteStatus,
+      resolveRemoteStatusForVaultPath,
+      vaultPath,
+    }).then((remoteStatus) => {
+      if (cancelled) return
+      commitModeVaultPathRef.current = targetVaultPath
+      setCommitMode(commitModeFromRemoteStatus(remoteStatus))
+    })
+
+    return () => {
+      cancelled = true
+    }
+  }, [
+    commitModeVaultPathRef,
+    manualVaultPath,
+    resolveRemoteStatus,
+    resolveRemoteStatusForVaultPath,
+    setCommitMode,
+    showCommitDialog,
+    vaultPath,
+  ])
+}
+
+function useOpenCommitDialog({
+  commitModeVaultPathRef,
+  loadModifiedFiles,
+  manualVaultPath,
+  resolveRemoteStatus,
+  resolveRemoteStatusForVaultPath,
+  savePending,
+  setCommitMode,
+  setShowCommitDialog,
+  vaultPath,
+}: Pick<
+  CommitFlowConfig,
+  | 'loadModifiedFiles'
+  | 'manualVaultPath'
+  | 'resolveRemoteStatus'
+  | 'resolveRemoteStatusForVaultPath'
+  | 'savePending'
+  | 'vaultPath'
+> & {
+  commitModeVaultPathRef: MutableRefObject<string | null>
+  setCommitMode: (mode: CommitMode) => void
+  setShowCommitDialog: (open: boolean) => void
+}) {
+  return useCallback(async () => {
+    await savePending()
+    await loadModifiedFiles()
+    const targetVaultPath = manualVaultPath || vaultPath
+    const remoteStatus = await resolveRemoteStatusForPath(targetVaultPath, {
+      resolveRemoteStatus,
+      resolveRemoteStatusForVaultPath,
+      vaultPath,
+    })
+    commitModeVaultPathRef.current = targetVaultPath
+    setCommitMode(commitModeFromRemoteStatus(remoteStatus))
+    setShowCommitDialog(true)
+  }, [
+    commitModeVaultPathRef,
+    loadModifiedFiles,
+    manualVaultPath,
+    resolveRemoteStatus,
+    resolveRemoteStatusForVaultPath,
+    savePending,
+    setCommitMode,
+    setShowCommitDialog,
+    vaultPath,
+  ])
 }
 
 /** Manages the commit dialog state and the save→commit→push/local flow. */
@@ -292,29 +585,39 @@ export function useCommitFlow({
   savePending,
   loadModifiedFiles,
   resolveRemoteStatus,
+  resolveRemoteStatusForVaultPath,
   setToastMessage,
   onPushRejected,
+  automaticVaultPaths,
+  manualVaultPath,
   vaultPath,
 }: CommitFlowConfig) {
   const [showCommitDialog, setShowCommitDialog] = useState(false)
   const [commitMode, setCommitMode] = useState<CommitMode>('push')
   const checkpointInFlightRef = useRef(false)
+  const commitModeVaultPathRef = useRef<string | null>(null)
 
-  const openCommitDialog = useCallback(async () => {
-    await savePending()
-    await loadModifiedFiles()
-    const remoteStatus = await resolveRemoteStatus()
-    setCommitMode(commitModeFromRemoteStatus(remoteStatus))
-    setShowCommitDialog(true)
-  }, [loadModifiedFiles, resolveRemoteStatus, savePending])
+  const openCommitDialog = useOpenCommitDialog({
+    commitModeVaultPathRef,
+    loadModifiedFiles,
+    manualVaultPath,
+    resolveRemoteStatus,
+    resolveRemoteStatusForVaultPath,
+    savePending,
+    setCommitMode,
+    setShowCommitDialog,
+    vaultPath,
+  })
 
   const runAutomaticCheckpoint = useAutomaticCheckpointAction({
     checkpointInFlightRef,
     savePending,
     loadModifiedFiles,
     resolveRemoteStatus,
+    resolveRemoteStatusForVaultPath,
     setToastMessage,
     onPushRejected,
+    automaticVaultPaths,
     vaultPath,
   })
 
@@ -323,11 +626,22 @@ export function useCommitFlow({
     savePending,
     loadModifiedFiles,
     resolveRemoteStatus,
+    resolveRemoteStatusForVaultPath,
     setToastMessage,
     onPushRejected,
+    manualVaultPath,
     vaultPath,
     setShowCommitDialog,
   })
+  useCommitModeRefresh({
+    commitModeVaultPathRef,
+    manualVaultPath,
+    resolveRemoteStatus,
+    resolveRemoteStatusForVaultPath,
+    setCommitMode,
+    showCommitDialog,
+    vaultPath,
+  })
 
   const closeCommitDialog = useCallback(() => setShowCommitDialog(false), [])
 
diff --git a/src/hooks/useDeleteActions.test.ts b/src/hooks/useDeleteActions.test.ts
index e3a25cea..3e773001 100644
--- a/src/hooks/useDeleteActions.test.ts
+++ b/src/hooks/useDeleteActions.test.ts
@@ -14,6 +14,7 @@ describe('useDeleteActions', () => {
   let onDeselectNote: ReturnType<typeof vi.fn>
   let removeEntry: ReturnType<typeof vi.fn>
   let removeEntries: ReturnType<typeof vi.fn>
+  let resolveVaultPathForPath: ReturnType<typeof vi.fn>
   let refreshModifiedFiles: ReturnType<typeof vi.fn>
   let reloadVault: ReturnType<typeof vi.fn>
   let setToastMessage: ReturnType<typeof vi.fn>
@@ -22,18 +23,20 @@ describe('useDeleteActions', () => {
     onDeselectNote = vi.fn()
     removeEntry = vi.fn()
     removeEntries = vi.fn()
+    resolveVaultPathForPath = vi.fn()
     refreshModifiedFiles = vi.fn().mockResolvedValue(undefined)
     reloadVault = vi.fn().mockResolvedValue(undefined)
     setToastMessage = vi.fn()
     mockInvokeFn.mockReset()
   })
 
-  function renderDeleteActions() {
+  function renderDeleteActions(options: { resolveVaultPathForPath?: (path: string) => string | null | undefined } = {}) {
     return renderHook(() =>
       useDeleteActions({
         onDeselectNote,
         removeEntry,
         removeEntries,
+        resolveVaultPathForPath: options.resolveVaultPathForPath,
         refreshModifiedFiles,
         reloadVault,
         setToastMessage,
@@ -111,6 +114,21 @@ describe('useDeleteActions', () => {
       expect(setToastMessage).toHaveBeenLastCalledWith('Note permanently deleted')
     })
 
+    it('passes the owning vault path when deleting a note outside the default vault', async () => {
+      mockInvokeFn.mockResolvedValue(['/team/a.md'])
+      resolveVaultPathForPath.mockReturnValue('/team')
+      const { result } = renderDeleteActions({ resolveVaultPathForPath })
+
+      await act(async () => {
+        await result.current.deleteNoteFromDisk('/team/a.md')
+      })
+
+      expect(mockInvokeFn).toHaveBeenCalledWith('batch_delete_notes', {
+        paths: ['/team/a.md'],
+        vaultPath: '/team',
+      })
+    })
+
     it('reloads the vault and returns false on failure', async () => {
       mockInvokeFn.mockRejectedValue(new Error('disk full'))
       const { result } = renderDeleteActions()
@@ -161,6 +179,27 @@ describe('useDeleteActions', () => {
       expect(setToastMessage).toHaveBeenCalledWith('2 notes permanently deleted')
     })
 
+    it('splits bulk deletes by owning vault path', async () => {
+      mockInvokeFn.mockImplementation(async (_command, args: { paths: string[] }) => args.paths)
+      resolveVaultPathForPath.mockImplementation((path: string) => path.startsWith('/team') ? '/team' : '/personal')
+      const { result } = renderDeleteActions({ resolveVaultPathForPath })
+
+      act(() => {
+        result.current.handleBulkDeletePermanently(['/personal/a.md', '/team/b.md'])
+      })
+      await confirmCurrentDelete(result)
+
+      expect(mockInvokeFn).toHaveBeenCalledWith('batch_delete_notes', {
+        paths: ['/personal/a.md'],
+        vaultPath: '/personal',
+      })
+      expect(mockInvokeFn).toHaveBeenCalledWith('batch_delete_notes', {
+        paths: ['/team/b.md'],
+        vaultPath: '/team',
+      })
+      expect(setToastMessage).toHaveBeenCalledWith('2 notes permanently deleted')
+    })
+
     it('reloads the note list when a batch delete only partially succeeds', async () => {
       await confirmDeleteAndExpectBatchCall(['/vault/a.md', '/vault/b.md'], ['/vault/a.md'])
 
diff --git a/src/hooks/useDeleteActions.ts b/src/hooks/useDeleteActions.ts
index bd63c493..fdb5d821 100644
--- a/src/hooks/useDeleteActions.ts
+++ b/src/hooks/useDeleteActions.ts
@@ -15,11 +15,17 @@ interface UseDeleteActionsInput {
   onDeselectNote: (path: string) => void
   removeEntry: (path: string) => void
   removeEntries?: (paths: string[]) => void
+  resolveVaultPathForPath?: (path: string) => string | null | undefined
   refreshModifiedFiles: () => Promise<unknown> | void
   reloadVault: () => Promise<unknown> | void
   setToastMessage: (msg: string | null) => void
 }
 
+interface DeleteCommandBatch {
+  paths: string[]
+  vaultPath?: string
+}
+
 function describeNotes(count: number): string {
   return count === 1 ? 'note' : `${count} notes`
 }
@@ -43,15 +49,49 @@ function buildPartialDeleteMessage(deletedCount: number, requestedCount: number)
   return `Deleted ${deletedCount} of ${requestedCount} notes. The note list was reloaded to recover failed items.`
 }
 
-async function runDeleteCommand(paths: string[]): Promise<string[]> {
-  if (isTauri()) return invoke<string[]>('batch_delete_notes_async', { paths })
-  return mockInvoke<string[]>('batch_delete_notes', { paths })
+function deleteCommandArgs({ paths, vaultPath }: DeleteCommandBatch): { paths: string[]; vaultPath?: string } {
+  return vaultPath ? { paths, vaultPath } : { paths }
+}
+
+function groupDeletePathsByVault(
+  paths: string[],
+  resolveVaultPathForPath?: (path: string) => string | null | undefined,
+): DeleteCommandBatch[] {
+  if (!resolveVaultPathForPath) return [{ paths }]
+
+  const batches = new Map<string, DeleteCommandBatch>()
+  for (const path of paths) {
+    const vaultPath = resolveVaultPathForPath(path)?.trim() || undefined
+    const key = vaultPath ?? ''
+    const batch = batches.get(key)
+    if (batch) {
+      batch.paths.push(path)
+      continue
+    }
+    batches.set(key, { paths: [path], vaultPath })
+  }
+
+  return [...batches.values()]
+}
+
+async function runDeleteCommand(
+  paths: string[],
+  resolveVaultPathForPath?: (path: string) => string | null | undefined,
+): Promise<string[]> {
+  const batches = groupDeletePathsByVault(paths, resolveVaultPathForPath)
+  const deletedGroups = await Promise.all(batches.map((batch) => (
+    isTauri()
+      ? invoke<string[]>('batch_delete_notes_async', deleteCommandArgs(batch))
+      : mockInvoke<string[]>('batch_delete_notes', deleteCommandArgs(batch))
+  )))
+  return deletedGroups.flat()
 }
 
 function useDeleteRunner({
   onDeselectNote,
   removeEntry,
   removeEntries,
+  resolveVaultPathForPath,
   refreshModifiedFiles,
   reloadVault,
   setToastMessage,
@@ -84,7 +124,7 @@ function useDeleteRunner({
     optimisticallyRemoveEntries(paths)
 
     try {
-      const deletedPaths = await runDeleteCommand(paths)
+      const deletedPaths = await runDeleteCommand(paths, resolveVaultPathForPath)
       const deletedCount = deletedPaths.length
 
       if (deletedCount > 0) {
@@ -107,7 +147,7 @@ function useDeleteRunner({
     } finally {
       setPendingDeleteCount((count) => Math.max(0, count - paths.length))
     }
-  }, [optimisticallyRemoveEntries, reconcileDeleteFailure, refreshModifiedFiles, setToastMessage])
+  }, [optimisticallyRemoveEntries, reconcileDeleteFailure, refreshModifiedFiles, resolveVaultPathForPath, setToastMessage])
 
   const deleteNoteFromDisk = useCallback(async (path: string) => {
     const deletedCount = await deleteNotesFromDisk([path])
@@ -125,6 +165,7 @@ export function useDeleteActions({
   onDeselectNote,
   removeEntry,
   removeEntries,
+  resolveVaultPathForPath,
   refreshModifiedFiles,
   reloadVault,
   setToastMessage,
@@ -138,6 +179,7 @@ export function useDeleteActions({
     onDeselectNote,
     removeEntry,
     removeEntries,
+    resolveVaultPathForPath,
     refreshModifiedFiles,
     reloadVault,
     setToastMessage,
diff --git a/src/hooks/useFileActions.ts b/src/hooks/useFileActions.ts
index 1cec906f..dea7c27d 100644
--- a/src/hooks/useFileActions.ts
+++ b/src/hooks/useFileActions.ts
@@ -44,8 +44,8 @@ export function useFileActions({
     })
   }, [setToastMessage, vaultPath])
 
-  const resolveFolderPath = useCallback((folderPath: string) => (
-    folderAbsolutePath({ vaultPath, folderPath })
+  const resolveFolderPath = useCallback((folderPath: string, rootPath?: string) => (
+    folderAbsolutePath({ vaultPath: rootPath ?? vaultPath, folderPath })
   ), [vaultPath])
 
   const folderActions = useMemo<FolderFileActions>(() => ({
@@ -62,13 +62,18 @@ export function useFileActions({
 
   const revealSelectedFolder = useCallback(() => {
     if (selection.kind !== 'folder') return
-    folderActions.revealFolder(selection.path)
-  }, [folderActions, selection])
+    revealFile(resolveFolderPath(selection.path, selection.rootPath))
+  }, [resolveFolderPath, revealFile, selection])
 
   const copySelectedFolderPath = useCallback(() => {
     if (selection.kind !== 'folder') return
-    folderActions.copyFolderPath(selection.path)
-  }, [folderActions, selection])
+    const absolutePath = resolveFolderPath(selection.path, selection.rootPath)
+    void copyLocalPath(absolutePath)
+      .then(() => setToastMessage('Folder path copied'))
+      .catch((error) => {
+        setToastMessage(fileActionErrorMessage('copy folder path', error))
+      })
+  }, [resolveFolderPath, selection, setToastMessage])
 
   return useMemo(() => ({
     copyFilePath,
diff --git a/src/hooks/useGitRepositories.test.ts b/src/hooks/useGitRepositories.test.ts
new file mode 100644
index 00000000..e323a4dd
--- /dev/null
+++ b/src/hooks/useGitRepositories.test.ts
@@ -0,0 +1,66 @@
+import { act, renderHook, waitFor } from '@testing-library/react'
+import { describe, expect, it, vi, beforeEach } from 'vitest'
+import { mockInvoke } from '../mock-tauri'
+import type { ModifiedFile } from '../types'
+import { useGitRepositories } from './useGitRepositories'
+
+vi.mock('@tauri-apps/api/core', () => ({ invoke: vi.fn() }))
+vi.mock('../mock-tauri', () => ({
+  isTauri: vi.fn(() => false),
+  mockInvoke: vi.fn(),
+}))
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  const promise = new Promise<T>((res) => {
+    resolve = res
+  })
+  return { promise, resolve }
+}
+
+function modifiedFile(relativePath: string): ModifiedFile {
+  return {
+    path: `/default/${relativePath}`,
+    relativePath,
+    status: 'modified',
+  }
+}
+
+describe('useGitRepositories', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('keeps the newest modified-files refresh when older loads finish later', async () => {
+    const firstLoad = deferred<ModifiedFile[]>()
+    const secondLoad = deferred<ModifiedFile[]>()
+    vi.mocked(mockInvoke)
+      .mockReturnValueOnce(firstLoad.promise)
+      .mockReturnValueOnce(secondLoad.promise)
+    const repositories = [{ path: '/default', label: 'Default', defaultForNewNotes: true }]
+
+    const { result } = renderHook(() => useGitRepositories({
+      defaultVaultPath: '/default',
+      repositories,
+    }))
+
+    await waitFor(() => expect(mockInvoke).toHaveBeenCalledTimes(1))
+
+    await act(async () => {
+      void result.current.loadModifiedFilesForRepository('/default')
+    })
+    await waitFor(() => expect(mockInvoke).toHaveBeenCalledTimes(2))
+
+    await act(async () => {
+      secondLoad.resolve([modifiedFile('new.md')])
+      await secondLoad.promise
+    })
+    expect(result.current.changesModifiedFiles.map((file) => file.relativePath)).toEqual(['new.md'])
+
+    await act(async () => {
+      firstLoad.resolve([modifiedFile('old.md')])
+      await firstLoad.promise
+    })
+    expect(result.current.changesModifiedFiles.map((file) => file.relativePath)).toEqual(['new.md'])
+  })
+})
diff --git a/src/hooks/useGitRepositories.ts b/src/hooks/useGitRepositories.ts
new file mode 100644
index 00000000..12ef1f6f
--- /dev/null
+++ b/src/hooks/useGitRepositories.ts
@@ -0,0 +1,133 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { invoke } from '@tauri-apps/api/core'
+import { isTauri, mockInvoke } from '../mock-tauri'
+import type { ModifiedFile } from '../types'
+import type { GitRepositoryOption } from '../utils/gitRepositories'
+import { validGitRepositoryPath } from '../utils/gitRepositories'
+
+interface RepositoryModifiedFiles {
+  error: string | null
+  files: ModifiedFile[]
+}
+
+interface UseGitRepositoriesOptions {
+  defaultVaultPath: string
+  repositories: GitRepositoryOption[]
+}
+
+const EMPTY_MODIFIED_FILES: RepositoryModifiedFiles = {
+  error: null,
+  files: [],
+}
+
+type RepositoryLoadIds = Map<string, number>
+
+function tauriCall<T>(command: string, args: Record<string, unknown>): Promise<T> {
+  return isTauri() ? invoke<T>(command, args) : mockInvoke<T>(command, args)
+}
+
+function withRepositoryPath(files: ModifiedFile[], vaultPath: string): ModifiedFile[] {
+  return files.map((file) => ({ ...file, vaultPath }))
+}
+
+function modifiedFilesState(
+  byRepository: Record<string, RepositoryModifiedFiles>,
+  path: string,
+): RepositoryModifiedFiles {
+  return byRepository[path] ?? EMPTY_MODIFIED_FILES
+}
+
+function nextRepositoryLoadId(loadIds: RepositoryLoadIds, path: string): number {
+  const nextId = (loadIds.get(path) ?? 0) + 1
+  loadIds.set(path, nextId)
+  return nextId
+}
+
+function isLatestRepositoryLoad(loadIds: RepositoryLoadIds, path: string, id: number): boolean {
+  return loadIds.get(path) === id
+}
+
+function useValidatedRepositoryPath(
+  repositories: GitRepositoryOption[],
+  fallbackPath: string,
+) {
+  const [requestedPath, setRequestedPath] = useState(fallbackPath)
+  const selectedPath = validGitRepositoryPath(requestedPath, repositories, fallbackPath)
+
+  const setRepositoryPath = useCallback((path: string) => {
+    setRequestedPath(path)
+  }, [])
+
+  return [selectedPath, setRepositoryPath] as const
+}
+
+function useRepositoryModifiedFiles(repositories: GitRepositoryOption[]) {
+  const [byRepository, setByRepository] = useState<Record<string, RepositoryModifiedFiles>>({})
+  const loadIdsRef = useRef<RepositoryLoadIds>(new Map())
+
+  const loadModifiedFilesForRepository = useCallback(async (vaultPath: string) => {
+    if (!vaultPath.trim()) return [] as ModifiedFile[]
+    const loadId = nextRepositoryLoadId(loadIdsRef.current, vaultPath)
+
+    try {
+      const files = withRepositoryPath(
+        await tauriCall<ModifiedFile[]>('get_modified_files', { vaultPath }),
+        vaultPath,
+      )
+      if (isLatestRepositoryLoad(loadIdsRef.current, vaultPath, loadId)) {
+        setByRepository((current) => ({ ...current, [vaultPath]: { error: null, files } }))
+      }
+      return files
+    } catch (error) {
+      const message = typeof error === 'string' ? error : 'Failed to load changes'
+      if (isLatestRepositoryLoad(loadIdsRef.current, vaultPath, loadId)) {
+        setByRepository((current) => ({ ...current, [vaultPath]: { error: message, files: [] } }))
+      }
+      return [] as ModifiedFile[]
+    }
+  }, [])
+
+  const loadAllModifiedFiles = useCallback(async () => {
+    await Promise.all(repositories.map((repository) => loadModifiedFilesForRepository(repository.path)))
+  }, [loadModifiedFilesForRepository, repositories])
+
+  useEffect(() => {
+    if (repositories.length === 0) return
+    void loadAllModifiedFiles()
+  }, [loadAllModifiedFiles, repositories.length])
+
+  return { byRepository, loadAllModifiedFiles, loadModifiedFilesForRepository }
+}
+
+export function useGitRepositories({
+  defaultVaultPath,
+  repositories,
+}: UseGitRepositoriesOptions) {
+  const [changesRepositoryPath, setChangesRepositoryPath] = useValidatedRepositoryPath(repositories, defaultVaultPath)
+  const [historyRepositoryPath, setHistoryRepositoryPath] = useValidatedRepositoryPath(repositories, defaultVaultPath)
+  const [commitRepositoryPath, setCommitRepositoryPath] = useValidatedRepositoryPath(repositories, defaultVaultPath)
+  const { byRepository, loadAllModifiedFiles, loadModifiedFilesForRepository } = useRepositoryModifiedFiles(repositories)
+
+  const allModifiedFiles = useMemo(
+    () => repositories.flatMap((repository) => modifiedFilesState(byRepository, repository.path).files),
+    [byRepository, repositories],
+  )
+  const changesState = modifiedFilesState(byRepository, changesRepositoryPath)
+  const commitState = modifiedFilesState(byRepository, commitRepositoryPath)
+
+  return {
+    allModifiedFiles,
+    changesModifiedFiles: changesState.files,
+    changesModifiedFilesError: changesState.error,
+    changesRepositoryPath,
+    commitModifiedFiles: commitState.files,
+    commitRepositoryPath,
+    historyRepositoryPath,
+    loadAllModifiedFiles,
+    loadModifiedFilesForRepository,
+    setChangesRepositoryPath,
+    setCommitRepositoryPath,
+    setHistoryRepositoryPath,
+    totalModifiedCount: allModifiedFiles.length,
+  }
+}
diff --git a/src/hooks/useNoteActions.hook.test.ts b/src/hooks/useNoteActions.hook.test.ts
index 00e481c8..2d5643a5 100644
--- a/src/hooks/useNoteActions.hook.test.ts
+++ b/src/hooks/useNoteActions.hook.test.ts
@@ -55,6 +55,22 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
   ...overrides,
 })
 
+const makeWorkspace = (
+  path: string,
+  alias: string,
+): NonNullable<VaultEntry['workspace']> => ({
+  id: alias,
+  label: alias,
+  alias,
+  path,
+  shortLabel: alias.slice(0, 2).toUpperCase(),
+  color: null,
+  icon: null,
+  mounted: true,
+  available: true,
+  defaultForNewNotes: false,
+})
+
 describe('useNoteActions hook', () => {
   const addEntry = vi.fn()
   const removeEntry = vi.fn()
@@ -633,6 +649,103 @@ describe('useNoteActions hook', () => {
       }))
     })
 
+    it('exposes the workspace move handler from composed note actions', async () => {
+      const sourceWorkspace = makeWorkspace('/test/vault', 'personal')
+      const destinationWorkspace = makeWorkspace('/team/vault', 'team')
+      const entry = makeEntry({
+        path: '/test/vault/project.md',
+        filename: 'project.md',
+        title: 'Project',
+        workspace: sourceWorkspace,
+      })
+      const replaceEntry = vi.fn()
+      const config = makeConfig([entry])
+
+      vi.mocked(mockInvoke).mockImplementation(async (cmd: string) => {
+        if (cmd === 'move_note_to_workspace') {
+          return { new_path: '/team/vault/project.md', updated_files: 0, failed_updates: 0 }
+        }
+        if (cmd === 'get_note_content') return '# Project\n'
+        return ''
+      })
+
+      const { result } = renderHook(() => useNoteActions(config))
+
+      await act(async () => {
+        await result.current.handleMoveNoteToWorkspace(
+          '/test/vault/project.md',
+          destinationWorkspace,
+          '/test/vault',
+          replaceEntry,
+        )
+      })
+
+      expect(mockInvoke).toHaveBeenCalledWith('move_note_to_workspace', expect.objectContaining({
+        source_vault_path: '/test/vault',
+        destination_vault_path: '/team/vault',
+        old_path: '/test/vault/project.md',
+      }))
+      expect(replaceEntry).toHaveBeenCalledWith(
+        '/test/vault/project.md',
+        expect.objectContaining({ path: '/team/vault/project.md', workspace: destinationWorkspace }),
+        '# Project\n',
+      )
+    })
+
+    it('routes stale frontmatter saves to a note moved between workspaces', async () => {
+      const sourcePath = '/test/vault/project.md'
+      const destinationPath = '/team/vault/project.md'
+      const sourceWorkspace = makeWorkspace('/test/vault', 'personal')
+      const destinationWorkspace = makeWorkspace('/team/vault', 'team')
+      const entry = makeEntry({
+        path: sourcePath,
+        filename: 'project.md',
+        title: 'Project',
+        workspace: sourceWorkspace,
+      })
+      const replaceEntry = vi.fn()
+      const onPathRenamed = vi.fn()
+      const config = makeConfig([entry])
+      config.onPathRenamed = onPathRenamed
+
+      vi.mocked(mockInvoke).mockImplementation(async (cmd: string) => {
+        if (cmd === 'move_note_to_workspace') {
+          return { new_path: destinationPath, updated_files: 0, failed_updates: 0 }
+        }
+        if (cmd === 'get_note_content') return '# Project\n'
+        if (cmd === 'save_note_content') return undefined
+        return ''
+      })
+
+      const { result } = renderHook(() => useNoteActions(config))
+
+      await act(async () => {
+        await result.current.handleMoveNoteToWorkspace(
+          sourcePath,
+          destinationWorkspace,
+          sourceWorkspace.path,
+          replaceEntry,
+        )
+        await result.current.handleUpdateFrontmatter(sourcePath, 'status', 'Done')
+      })
+
+      const savePaths = vi.mocked(mockInvoke).mock.calls
+        .filter(([cmd]) => cmd === 'save_note_content')
+        .map(([, args]) => args)
+        .filter((args): args is { path: string } => (
+          typeof args === 'object'
+          && args !== null
+          && 'path' in args
+          && typeof args.path === 'string'
+        ))
+        .map((args) => args.path)
+
+      expect(onPathRenamed).toHaveBeenCalledWith(sourcePath, destinationPath)
+      expect(savePaths).toContain(destinationPath)
+      expect(savePaths).not.toContain(sourcePath)
+      expect(updateEntry).toHaveBeenCalledWith(destinationPath, expect.objectContaining({ status: 'Done' }))
+    })
+
     it('handleUpdateFrontmatter triggers rename when title key is changed', async () => {
       const entry = makeEntry({
         path: '/test/vault/old-name.md',
diff --git a/src/hooks/useNoteActions.ts b/src/hooks/useNoteActions.ts
index eb3b3b66..85eb0481 100644
--- a/src/hooks/useNoteActions.ts
+++ b/src/hooks/useNoteActions.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, type MutableRefObject } from 'react'
+import { useCallback, useEffect, useRef, type MutableRefObject } from 'react'
 import type { VaultEntry } from '../types'
 import type { FrontmatterValue } from '../components/Inspector'
 import { useTabManagement } from './useTabManagement'
@@ -42,7 +42,7 @@ export interface NoteActionsConfig {
   /** Called after frontmatter is written to disk — used for live-reloading theme CSS vars. */
   onFrontmatterContentChanged?: (path: string, content: string) => void
   /** Called after a frontmatter mutation is fully persisted, including follow-up renames. */
-  onFrontmatterPersisted?: () => void
+  onFrontmatterPersisted?: () => void | Promise<void>
   /** Called after type files or type assignments change, so derived type surfaces can reload. */
   onTypeStateChanged?: () => void | Promise<void>
 }
@@ -61,6 +61,31 @@ function entryDisplayLabel(entry: VaultEntry): string {
     || 'Note'
 }
 
+type RenamedPathMap = Map<string, string>
+
+function resolveLatestNotePath(renamedPaths: RenamedPathMap, path: string): string {
+  let current = path
+  const visited = new Set<string>()
+
+  while (!visited.has(current)) {
+    visited.add(current)
+    const next = renamedPaths.get(current)
+    if (!next || next === current) return current
+    current = next
+  }
+
+  return current
+}
+
+function trackRenamedNotePath(renamedPaths: RenamedPathMap, oldPath: string, newPath: string): void {
+  if (notePathsMatch(oldPath, newPath)) return
+  const latestPath = resolveLatestNotePath(renamedPaths, newPath)
+  for (const [trackedOldPath, trackedNewPath] of renamedPaths) {
+    if (trackedNewPath === oldPath) renamedPaths.set(trackedOldPath, latestPath)
+  }
+  renamedPaths.set(oldPath, latestPath)
+}
+
 interface TitleRenameDeps {
   vaultPath: string
   tabsRef: React.MutableRefObject<{ entry: VaultEntry; content: string }[]>
@@ -123,7 +148,7 @@ function isTypeFieldKey(key: string): boolean {
 }
 
 async function notifyFrontmatterPersisted(config: NoteActionsConfig, key: string): Promise<void> {
-  config.onFrontmatterPersisted?.()
+  await config.onFrontmatterPersisted?.()
   if (isTypeFieldKey(key)) {
     await config.onTypeStateChanged?.()
   }
@@ -287,6 +312,8 @@ function useGitignoredVisibilityTabCleanup({
 
 function useFrontmatterActionHandlers({
   config,
+  onPathRenamed,
+  resolvePath,
   renameTabsRef,
   setTabs,
   activeTabPathRef,
@@ -296,6 +323,8 @@ function useFrontmatterActionHandlers({
   runFrontmatterOp,
 }: {
   config: NoteActionsConfig
+  onPathRenamed?: (oldPath: string, newPath: string) => void
+  resolvePath: (path: string) => string
   renameTabsRef: TitleRenameDeps['tabsRef']
   setTabs: React.Dispatch<React.SetStateAction<{ entry: VaultEntry; content: string }[]>>
   activeTabPathRef: React.MutableRefObject<string | null>
@@ -310,6 +339,7 @@ function useFrontmatterActionHandlers({
     value: FrontmatterValue,
     options?: FrontmatterOpOptions,
   ) => {
+    const currentPath = resolvePath(path)
     await updateFrontmatterAndMaybeRename({
       config,
       deps: {
@@ -317,42 +347,44 @@ function useFrontmatterActionHandlers({
         tabsRef: renameTabsRef,
         reloadVault: config.reloadVault,
         replaceEntry: config.replaceEntry,
-        onPathRenamed: config.onPathRenamed,
+        onPathRenamed,
         setTabs,
         activeTabPathRef,
         handleSwitchTab,
         setToastMessage,
         updateTabContent,
       },
-      path,
+      path: currentPath,
       key,
       value,
       options,
       runFrontmatterOp,
     })
-  }, [activeTabPathRef, config, handleSwitchTab, renameTabsRef, runFrontmatterOp, setTabs, setToastMessage, updateTabContent])
+  }, [activeTabPathRef, config, handleSwitchTab, onPathRenamed, renameTabsRef, resolvePath, runFrontmatterOp, setTabs, setToastMessage, updateTabContent])
 
   const handleDeleteProperty = useCallback(async (path: string, key: string, options?: FrontmatterOpOptions) => {
-    if (!activePathGuardAllowsMutation(path, activeTabPathRef, options)) return
-    const canFlush = await flushBeforeNoteMutation(path, config.flushBeforeNoteMutation)
+    const currentPath = resolvePath(path)
+    if (!activePathGuardAllowsMutation(currentPath, activeTabPathRef, options)) return
+    const canFlush = await flushBeforeNoteMutation(currentPath, config.flushBeforeNoteMutation)
     if (!canFlush) return
-    if (!activePathGuardAllowsMutation(path, activeTabPathRef, options)) return
+    if (!activePathGuardAllowsMutation(currentPath, activeTabPathRef, options)) return
 
-    const newContent = await runFrontmatterOp('delete', path, key, undefined, options)
-    if (!applyFrontmatterCallbacks({ config, path, newContent })) return
+    const newContent = await runFrontmatterOp('delete', currentPath, key, undefined, options)
+    if (!applyFrontmatterCallbacks({ config, path: currentPath, newContent })) return
     await notifyFrontmatterPersisted(config, key)
-  }, [activeTabPathRef, config, runFrontmatterOp])
+  }, [activeTabPathRef, config, resolvePath, runFrontmatterOp])
 
   const handleAddProperty = useCallback(async (path: string, key: string, value: FrontmatterValue, options?: FrontmatterOpOptions) => {
-    if (!activePathGuardAllowsMutation(path, activeTabPathRef, options)) return
-    const canFlush = await flushBeforeNoteMutation(path, config.flushBeforeNoteMutation)
+    const currentPath = resolvePath(path)
+    if (!activePathGuardAllowsMutation(currentPath, activeTabPathRef, options)) return
+    const canFlush = await flushBeforeNoteMutation(currentPath, config.flushBeforeNoteMutation)
     if (!canFlush) return
-    if (!activePathGuardAllowsMutation(path, activeTabPathRef, options)) return
+    if (!activePathGuardAllowsMutation(currentPath, activeTabPathRef, options)) return
 
-    const newContent = await runFrontmatterOp('update', path, key, value, options)
-    if (!applyFrontmatterCallbacks({ config, path, newContent })) return
+    const newContent = await runFrontmatterOp('update', currentPath, key, value, options)
+    if (!applyFrontmatterCallbacks({ config, path: currentPath, newContent })) return
     await notifyFrontmatterPersisted(config, key)
-  }, [activeTabPathRef, config, runFrontmatterOp])
+  }, [activeTabPathRef, config, resolvePath, runFrontmatterOp])
 
   return {
     handleUpdateFrontmatter,
@@ -393,8 +425,20 @@ function useFrontmatterRunner({
   )
 }
 
+function useRenamedNotePathResolver(onPathRenamed?: (oldPath: string, newPath: string) => void) {
+  const renamedPathsRef = useRef<RenamedPathMap>(new Map())
+  const handlePathRenamed = useCallback((oldPath: string, newPath: string) => {
+    trackRenamedNotePath(renamedPathsRef.current, oldPath, newPath)
+    onPathRenamed?.(oldPath, newPath)
+  }, [onPathRenamed])
+  const resolveActionPath = useCallback((path: string) => resolveLatestNotePath(renamedPathsRef.current, path), [])
+
+  return { handlePathRenamed, resolveActionPath }
+}
+
 export function useNoteActions(config: NoteActionsConfig) {
   const { entries, setToastMessage, updateEntry } = config
+  const { handlePathRenamed, resolveActionPath } = useRenamedNotePathResolver(config.onPathRenamed)
   const tabMgmt = useTabManagement(buildTabManagementOptions(config))
   const { setTabs, handleSelectNote, openTabWithContent, activeTabPathRef, handleSwitchTab } = tabMgmt
   useGitignoredVisibilityTabCleanup({
@@ -409,7 +453,7 @@ export function useNoteActions(config: NoteActionsConfig) {
 
   const creation = useNoteCreation(config, { openTabWithContent })
   const rename = useNoteRename(
-    { entries, setToastMessage, reloadVault: config.reloadVault },
+    { entries, setToastMessage, reloadVault: config.reloadVault, onPathRenamed: handlePathRenamed },
     { tabs: tabMgmt.tabs, setTabs, activeTabPathRef, handleSwitchTab, updateTabContent },
   )
 
@@ -426,6 +470,8 @@ export function useNoteActions(config: NoteActionsConfig) {
   const runFrontmatterOp = useFrontmatterRunner({ activeTabPathRef, entries, setToastMessage, updateEntry, updateTabContent })
   const frontmatterActions = useFrontmatterActionHandlers({
     config,
+    onPathRenamed: handlePathRenamed,
+    resolvePath: resolveActionPath,
     renameTabsRef: rename.tabsRef,
     setTabs,
     activeTabPathRef,
@@ -449,5 +495,6 @@ export function useNoteActions(config: NoteActionsConfig) {
     handleRenameNote: rename.handleRenameNote,
     handleRenameFilename: rename.handleRenameFilename,
     handleMoveNoteToFolder: rename.handleMoveNoteToFolder,
+    handleMoveNoteToWorkspace: rename.handleMoveNoteToWorkspace,
   }
 }
diff --git a/src/hooks/useNoteRename.test.ts b/src/hooks/useNoteRename.test.ts
index 4de395df..5b81d962 100644
--- a/src/hooks/useNoteRename.test.ts
+++ b/src/hooks/useNoteRename.test.ts
@@ -28,6 +28,19 @@ const makeEntry = (overrides: Partial<VaultEntry> = {}): VaultEntry => ({
   ...overrides,
 })
 
+const makeWorkspace = (path: string, alias = 'workspace'): NonNullable<VaultEntry['workspace']> => ({
+  id: alias,
+  label: alias,
+  alias,
+  path,
+  shortLabel: alias.slice(0, 2).toUpperCase(),
+  color: null,
+  icon: null,
+  mounted: true,
+  available: true,
+  defaultForNewNotes: false,
+})
+
 describe('needsRenameOnSave', () => {
   it('returns true when filename does not match title slug', () => {
     expect(needsRenameOnSave('My New Note', 'untitled-note.md')).toBe(true)
@@ -168,6 +181,61 @@ describe('useNoteRename hook', () => {
     expect(onEntryRenamed).toHaveBeenCalled()
   })
 
+  it.each([
+    {
+      name: 'title rename',
+      command: 'rename_note',
+      oldPath: '/team/old.md',
+      filename: 'old.md',
+      title: 'Old',
+      newPath: '/team/new.md',
+      run: async (hook: ReturnType<typeof renderUseNoteRename>['result']['current']) =>
+        hook.handleRenameNote('/team/old.md', 'New', '/personal', vi.fn()),
+      expected: { old_path: '/team/old.md', old_title: 'Old' },
+    },
+    {
+      name: 'filename rename',
+      command: 'rename_note_filename',
+      oldPath: '/team/old-name.md',
+      filename: 'old-name.md',
+      title: 'Project Kickoff',
+      newPath: '/team/manual-name.md',
+      run: async (hook: ReturnType<typeof renderUseNoteRename>['result']['current']) =>
+        hook.handleRenameFilename('/team/old-name.md', 'manual-name', '/personal', vi.fn()),
+      expected: { old_path: '/team/old-name.md', new_filename_stem: 'manual-name' },
+    },
+  ])('uses the note workspace root for $name even when the app-level vault path differs', async ({
+    command,
+    oldPath,
+    filename,
+    title,
+    newPath,
+    run,
+    expected,
+  }) => {
+    const entry = makeEntry({
+      path: oldPath,
+      filename,
+      title,
+      workspace: makeWorkspace('/team', 'team'),
+    })
+    vi.mocked(mockInvoke).mockImplementation(async (cmd: string) => {
+      if (cmd === command) return { new_path: newPath, updated_files: 0, failed_updates: 0 }
+      if (cmd === 'get_note_content') return '# New\n'
+      return ''
+    })
+    const { result } = renderUseNoteRename([entry])
+
+    await act(async () => {
+      await run(result.current)
+    })
+
+    expect(mockInvoke).toHaveBeenCalledWith(command, expect.objectContaining({
+      vault_path: '/team',
+      ...expected,
+    }))
+  })
+
   it('handleRenameNote passes null old_title when entry not found', async () => {
     await runHandleRenameNote()
 
@@ -373,4 +441,59 @@ describe('useNoteRename hook', () => {
     }))
     expect(setToastMessage).toHaveBeenCalledWith('Moved to "active"')
   })
+
+  it('handleMoveNoteToWorkspace moves the note to a different workspace', async () => {
+    const sourceWorkspace = makeWorkspace('/personal', 'personal')
+    const destinationWorkspace = makeWorkspace('/team', 'team')
+    destinationWorkspace.label = 'Team'
+    const entry = makeEntry({
+      path: '/personal/notes/project-kickoff.md',
+      filename: 'project-kickoff.md',
+      title: 'Project Kickoff',
+      workspace: sourceWorkspace,
+    })
+    vi.mocked(mockInvoke).mockImplementation(async (cmd: string) => {
+      if (cmd === 'move_note_to_workspace') {
+        return {
+          new_path: '/team/notes/project-kickoff.md',
+          updated_files: 1,
+          failed_updates: 0,
+        }
+      }
+      if (cmd === 'get_note_content') return '# Project Kickoff\n'
+      return ''
+    })
+
+    const { result } = renderHook(() => useNoteRename(
+      { entries: [entry], setToastMessage },
+      { tabs: [], setTabs, activeTabPathRef, handleSwitchTab, updateTabContent },
+    ))
+
+    const onEntryRenamed = vi.fn()
+    await act(async () => {
+      await result.current.handleMoveNoteToWorkspace(
+        '/personal/notes/project-kickoff.md',
+        destinationWorkspace,
+        '/personal',
+        onEntryRenamed,
+      )
+    })
+
+    expect(mockInvoke).toHaveBeenCalledWith('move_note_to_workspace', expect.objectContaining({
+      source_vault_path: '/personal',
+      destination_vault_path: '/team',
+      old_path: '/personal/notes/project-kickoff.md',
+      replacement_target: 'team/notes/project-kickoff',
+    }))
+    expect(onEntryRenamed).toHaveBeenCalledWith(
+      '/personal/notes/project-kickoff.md',
+      expect.objectContaining({
+        path: '/team/notes/project-kickoff.md',
+        filename: 'project-kickoff.md',
+        workspace: destinationWorkspace,
+      }),
+      '# Project Kickoff\n',
+    )
+    expect(setToastMessage).toHaveBeenCalledWith('Moved to "Team" and updated 1 note')
+  })
 })
diff --git a/src/hooks/useNoteRename.ts b/src/hooks/useNoteRename.ts
index 6b6c0512..e8965337 100644
--- a/src/hooks/useNoteRename.ts
+++ b/src/hooks/useNoteRename.ts
@@ -1,7 +1,7 @@
 import { useCallback, useRef } from 'react'
 import { invoke } from '@tauri-apps/api/core'
 import { isTauri, mockInvoke } from '../mock-tauri'
-import type { VaultEntry } from '../types'
+import type { VaultEntry, WorkspaceIdentity } from '../types'
 import { slugify } from './useNoteCreation'
 import {
   findByNotePath,
@@ -10,6 +10,8 @@ import {
   notePathsMatch,
   vaultRelativePathLabel,
 } from '../utils/notePathIdentity'
+import { vaultPathForEntry } from '../utils/workspaces'
+import { relativePathStem } from '../utils/wikilink'
 
 interface RenameResult {
   new_path: string
@@ -38,6 +40,13 @@ interface FolderMoveRequest {
   vaultPath: string
 }
 
+interface WorkspaceMoveRequest {
+  path: string
+  sourceVaultPath: string
+  destinationVaultPath: string
+  replacementTarget?: string
+}
+
 interface LoadNoteContentRequest {
   path: string
 }
@@ -47,7 +56,34 @@ interface ReloadTabsAfterRenameRequest {
   updateTabContent: (path: string, content: string) => void
 }
 
-type RenameCommand = 'rename_note' | 'rename_note_filename' | 'move_note_to_folder'
+type RenameCommand = 'rename_note' | 'rename_note_filename' | 'move_note_to_folder' | 'move_note_to_workspace'
+type NoteCommandExtra = Record<string, unknown>
+
+interface NoteCommandRequest {
+  command: RenameCommand
+  mockExtra: NoteCommandExtra
+  path: string
+  tauriExtra: NoteCommandExtra
+  vaultPath: string
+}
+
+interface SingleValueNoteCommand {
+  command: RenameCommand
+  mockKey: string
+  tauriKey: string
+}
+
+const FILENAME_RENAME_COMMAND: SingleValueNoteCommand = {
+  command: 'rename_note_filename',
+  mockKey: 'new_filename_stem',
+  tauriKey: 'newFilenameStem',
+}
+
+const FOLDER_MOVE_COMMAND: SingleValueNoteCommand = {
+  command: 'move_note_to_folder',
+  mockKey: 'folder_path',
+  tauriKey: 'folderPath',
+}
 
 /** Check if a note's filename doesn't match the slug of its current title. */
 export function needsRenameOnSave(title: string, filename: string): boolean {
@@ -61,10 +97,13 @@ export async function performRename({
   vaultPath,
   oldTitle,
 }: RenameRequest): Promise<RenameResult> {
-  return invokeRenameCommand({
+  const oldTitleArg = oldTitle ?? null
+  return invokeNoteCommand({
     command: 'rename_note',
-    tauriArgs: { vaultPath, oldPath: path, newTitle, oldTitle: oldTitle ?? null },
-    mockArgs: { vault_path: vaultPath, old_path: path, new_title: newTitle, old_title: oldTitle ?? null },
+    path,
+    vaultPath,
+    tauriExtra: { newTitle, oldTitle: oldTitleArg },
+    mockExtra: { new_title: newTitle, old_title: oldTitleArg },
   })
 }
 
@@ -80,15 +119,74 @@ function invokeRenameCommand(
     : mockInvoke<RenameResult>(params.command, params.mockArgs)
 }
 
+function invokeStructuredRenameCommand(params: {
+  command: RenameCommand
+  args: Record<string, unknown>
+  mockArgs: Record<string, unknown>
+}): Promise<RenameResult> {
+  return invokeRenameCommand({
+    command: params.command,
+    tauriArgs: { args: params.args },
+    mockArgs: params.mockArgs,
+  })
+}
+
+function noteCommandArgs({
+  mockExtra,
+  path,
+  style,
+  tauriExtra,
+  vaultPath,
+}: {
+  mockExtra: NoteCommandExtra
+  path: string
+  style: 'mock' | 'tauri'
+  tauriExtra: NoteCommandExtra
+  vaultPath: string
+}) {
+  return style === 'tauri'
+    ? { vaultPath, oldPath: path, ...tauriExtra }
+    : { vault_path: vaultPath, old_path: path, ...mockExtra }
+}
+
+function invokeNoteCommand(params: NoteCommandRequest): Promise<RenameResult> {
+  return invokeStructuredRenameCommand({
+    command: params.command,
+    args: noteCommandArgs({ ...params, style: 'tauri' }),
+    mockArgs: noteCommandArgs({ ...params, style: 'mock' }),
+  })
+}
+
+function performSingleValueNoteCommand({
+  descriptor,
+  path,
+  value,
+  vaultPath,
+}: {
+  descriptor: SingleValueNoteCommand
+  path: string
+  value: string
+  vaultPath: string
+}) {
+  return invokeNoteCommand({
+    command: descriptor.command,
+    path,
+    vaultPath,
+    tauriExtra: { [descriptor.tauriKey]: value },
+    mockExtra: { [descriptor.mockKey]: value },
+  })
+}
+
 export async function performFilenameRename({
   path,
   newFilenameStem,
   vaultPath,
 }: FilenameRenameRequest): Promise<RenameResult> {
-  return invokeRenameCommand({
-    command: 'rename_note_filename',
-    tauriArgs: { vaultPath, oldPath: path, newFilenameStem },
-    mockArgs: { vault_path: vaultPath, old_path: path, new_filename_stem: newFilenameStem },
+  return performSingleValueNoteCommand({
+    descriptor: FILENAME_RENAME_COMMAND,
+    path,
+    value: newFilenameStem,
+    vaultPath,
   })
 }
 
@@ -97,10 +195,37 @@ export async function performMoveNoteToFolder({
   folderPath,
   vaultPath,
 }: FolderMoveRequest): Promise<RenameResult> {
+  return performSingleValueNoteCommand({
+    descriptor: FOLDER_MOVE_COMMAND,
+    path,
+    value: folderPath,
+    vaultPath,
+  })
+}
+
+export async function performMoveNoteToWorkspace({
+  path,
+  sourceVaultPath,
+  destinationVaultPath,
+  replacementTarget,
+}: WorkspaceMoveRequest): Promise<RenameResult> {
+  const tauriReplacementTarget = replacementTarget ?? null
   return invokeRenameCommand({
-    command: 'move_note_to_folder',
-    tauriArgs: { vaultPath, oldPath: path, folderPath },
-    mockArgs: { vault_path: vaultPath, old_path: path, folder_path: folderPath },
+    command: 'move_note_to_workspace',
+    tauriArgs: {
+      args: {
+        sourceVaultPath,
+        destinationVaultPath,
+        oldPath: path,
+        replacementTarget: tauriReplacementTarget,
+      },
+    },
+    mockArgs: {
+      source_vault_path: sourceVaultPath,
+      destination_vault_path: destinationVaultPath,
+      old_path: path,
+      replacement_target: tauriReplacementTarget,
+    },
   })
 }
 
@@ -114,6 +239,33 @@ export function buildFilenameRenamedEntry(entry: VaultEntry, newPath: string): V
   return { ...entry, path: newPath, filename }
 }
 
+export function buildWorkspaceMovedEntry(
+  entry: VaultEntry,
+  newPath: string,
+  workspace: WorkspaceIdentity,
+): VaultEntry {
+  return {
+    ...buildFilenameRenamedEntry(entry, newPath),
+    workspace,
+  }
+}
+
+export function workspaceMoveReplacementTarget({
+  entry,
+  sourceVaultPath,
+  destinationWorkspace,
+}: {
+  entry: VaultEntry
+  sourceVaultPath: string
+  destinationWorkspace: WorkspaceIdentity
+}): string {
+  const localTarget = relativePathStem(entry.path, sourceVaultPath)
+  const sourceAlias = entry.workspace?.alias
+  return destinationWorkspace.alias && destinationWorkspace.alias !== sourceAlias
+    ? `${destinationWorkspace.alias}/${localTarget}`
+    : localTarget
+}
+
 export async function loadNoteContent({ path }: LoadNoteContentRequest): Promise<string> {
   return isTauri()
     ? invoke<string>('get_note_content', { path })
@@ -174,6 +326,14 @@ function moveToastMessage(folderPath: string, updatedFiles: number, failedUpdate
   })
 }
 
+function moveWorkspaceToastMessage(workspaceLabel: string, updatedFiles: number, failedUpdates = 0): string {
+  return formatRewriteToast({
+    action: `Moved to "${workspaceLabel}"`,
+    updatedFiles,
+    failedUpdates,
+  })
+}
+
 export async function reloadVaultAfterRename(reloadVault?: () => Promise<unknown>): Promise<void> {
   if (!reloadVault) return
   try {
@@ -205,6 +365,10 @@ function findRenameEntry(entries: VaultEntry[], tabs: Tab[], path: string): Vaul
     ?? tabs.find((tab) => notePathsMatch(tab.entry.path, path))?.entry
 }
 
+function resolveRenameVaultPath(entry: VaultEntry | undefined, fallbackVaultPath: string): string {
+  return entry ? vaultPathForEntry(entry, fallbackVaultPath) : fallbackVaultPath
+}
+
 function renameErrorMessage(err: unknown): string {
   const message = typeof err === 'string'
     ? err.trim()
@@ -230,6 +394,7 @@ export interface NoteRenameConfig {
   entries: VaultEntry[]
   setToastMessage: (msg: string | null) => void
   reloadVault?: () => Promise<unknown>
+  onPathRenamed?: (oldPath: string, newPath: string) => void
 }
 
 interface RenameTabDeps {
@@ -248,7 +413,7 @@ function useRenameResultApplier(
   config: NoteRenameConfig,
   tabDeps: RenameTabDeps,
 ) {
-  const { entries, setToastMessage, reloadVault } = config
+  const { entries, setToastMessage, reloadVault, onPathRenamed } = config
   const { setTabs, activeTabPathRef, handleSwitchTab, updateTabContent } = tabDeps
 
   const tabsRef = useRef(tabDeps.tabs)
@@ -269,6 +434,7 @@ function useRenameResultApplier(
     const otherTabPaths = currentTabs
       .filter((tab) => !notePathsMatch(tab.entry.path, oldPath) && !notePathsMatch(tab.entry.path, result.new_path))
       .map((tab) => tab.entry.path)
+    if (!notePathsMatch(oldPath, result.new_path)) onPathRenamed?.(oldPath, result.new_path)
     setTabs((prev) => prev.map((tab) => notePathsMatch(tab.entry.path, oldPath) ? { entry: newEntry, content: newContent } : tab))
     if (notePathsMatch(activeTabPathRef.current, oldPath)) handleSwitchTab(result.new_path)
     onEntryRenamed(oldPath, newEntry, newContent)
@@ -279,7 +445,7 @@ function useRenameResultApplier(
       : renameToastMessage(result.updated_files, result.failed_updates ?? 0)
     setToastMessage(successMessage)
     return result
-  }, [entries, setTabs, activeTabPathRef, handleSwitchTab, updateTabContent, reloadVault, setToastMessage])
+  }, [entries, setTabs, activeTabPathRef, handleSwitchTab, updateTabContent, reloadVault, setToastMessage, onPathRenamed])
 
   return {
     tabsRef,
@@ -328,20 +494,72 @@ async function runRenameAction({
   }
 }
 
+type ApplyRenameResult = ReturnType<typeof useRenameResultApplier>['applyRenameResult']
+
+function useWorkspaceMoveHandler({
+  applyRenameResult,
+  entries,
+  setToastMessage,
+  tabsRef,
+}: {
+  applyRenameResult: ApplyRenameResult
+  entries: VaultEntry[]
+  setToastMessage: (message: string | null) => void
+  tabsRef: React.MutableRefObject<Tab[]>
+}) {
+  return useCallback(async (
+    path: string,
+    destinationWorkspace: WorkspaceIdentity,
+    vaultPath: string,
+    onEntryRenamed: (oldPath: string, newEntry: Partial<VaultEntry> & { path: string }, newContent: string) => void,
+  ) => {
+    const entry = findRenameEntry(entries, tabsRef.current, path)
+    if (!entry) {
+      setToastMessage('Failed to move note: note not found')
+      return null
+    }
+
+    const sourceVaultPath = resolveRenameVaultPath(entry, vaultPath)
+    if (sourceVaultPath === destinationWorkspace.path) {
+      return { new_path: path, updated_files: 0, failed_updates: 0 }
+    }
+
+    return runRenameAction({
+      path,
+      perform: () => performMoveNoteToWorkspace({
+        path,
+        sourceVaultPath,
+        destinationVaultPath: destinationWorkspace.path,
+        replacementTarget: workspaceMoveReplacementTarget({ entry, sourceVaultPath, destinationWorkspace }),
+      }),
+      applyRenameResult,
+      buildEntry: (currentEntry, newPath) => buildWorkspaceMovedEntry(currentEntry ?? entry, newPath, destinationWorkspace),
+      onEntryRenamed,
+      setToastMessage,
+      errorMessage: moveNoteErrorMessage,
+      logLabel: 'Failed to move note to workspace',
+      successMessage: (result) => moveWorkspaceToastMessage(
+        destinationWorkspace.label,
+        result.updated_files,
+        result.failed_updates ?? 0,
+      ),
+      allowUnchangedResult: true,
+    })
+  }, [applyRenameResult, entries, setToastMessage, tabsRef])
+}
+
 export function useNoteRename(config: NoteRenameConfig, tabDeps: RenameTabDeps) {
   const { entries, setToastMessage } = config
   const { tabsRef, applyRenameResult } = useRenameResultApplier(config, tabDeps)
 
-  const handleRenameNote = useCallback(async (
-    path: string, newTitle: string, vaultPath: string,
-    onEntryRenamed: (oldPath: string, newEntry: Partial<VaultEntry> & { path: string }, newContent: string) => void,
-  ) => {
+  const handleRenameNote = useCallback(async (path: string, newTitle: string, vaultPath: string, onEntryRenamed: (oldPath: string, newEntry: Partial<VaultEntry> & { path: string }, newContent: string) => void) => {
     const entry = findRenameEntry(entries, tabsRef.current, path)
+    const renameVaultPath = resolveRenameVaultPath(entry, vaultPath)
     await runRenameAction({
       path,
-      perform: () => performRename({ path, newTitle, vaultPath, oldTitle: entry?.title }),
+      perform: () => performRename({ path, newTitle, vaultPath: renameVaultPath, oldTitle: entry?.title }),
       applyRenameResult,
-      buildEntry: (currentEntry, newPath) => buildRenamedEntry(currentEntry ?? {} as VaultEntry, newTitle, newPath),
+      buildEntry: (currentEntry, newPath) => buildRenamedEntry(currentEntry ?? ({} as VaultEntry), newTitle, newPath),
       onEntryRenamed,
       setToastMessage,
       errorMessage: renameErrorMessage,
@@ -349,48 +567,45 @@ export function useNoteRename(config: NoteRenameConfig, tabDeps: RenameTabDeps)
     })
   }, [entries, tabsRef, applyRenameResult, setToastMessage])
 
-  const handleRenameFilename = useCallback(async (
-    path: string,
-    newFilenameStem: string,
-    vaultPath: string,
-    onEntryRenamed: (oldPath: string, newEntry: Partial<VaultEntry> & { path: string }, newContent: string) => void,
-  ) => {
+  const handleRenameFilename = useCallback(async (path: string, newFilenameStem: string, vaultPath: string, onEntryRenamed: (oldPath: string, newEntry: Partial<VaultEntry> & { path: string }, newContent: string) => void) => {
+    const entry = findRenameEntry(entries, tabsRef.current, path)
+    const renameVaultPath = resolveRenameVaultPath(entry, vaultPath)
     await runRenameAction({
       path,
-      perform: () => performFilenameRename({ path, newFilenameStem, vaultPath }),
+      perform: () => performFilenameRename({ path, newFilenameStem, vaultPath: renameVaultPath }),
       applyRenameResult,
-      buildEntry: (currentEntry, newPath) => buildFilenameRenamedEntry(currentEntry ?? {} as VaultEntry, newPath),
+      buildEntry: (currentEntry, newPath) => buildFilenameRenamedEntry(currentEntry ?? ({} as VaultEntry), newPath),
       onEntryRenamed,
       setToastMessage,
       errorMessage: renameErrorMessage,
       logLabel: 'Failed to rename note filename',
     })
-  }, [applyRenameResult, setToastMessage])
+  }, [entries, tabsRef, applyRenameResult, setToastMessage])
 
-  const handleMoveNoteToFolder = useCallback(async (
-    path: string,
-    folderPath: string,
-    vaultPath: string,
-    onEntryRenamed: (oldPath: string, newEntry: Partial<VaultEntry> & { path: string }, newContent: string) => void,
-  ) => {
+  const handleMoveNoteToFolder = useCallback(async (path: string, folderPath: string, vaultPath: string, onEntryRenamed: (oldPath: string, newEntry: Partial<VaultEntry> & { path: string }, newContent: string) => void) => {
     const normalizedFolderPath = normalizeVaultRelativePath(folderPath)
+    const entry = findRenameEntry(entries, tabsRef.current, path)
+    const moveVaultPath = resolveRenameVaultPath(entry, vaultPath)
     return runRenameAction({
       path,
-      perform: () => performMoveNoteToFolder({ path, folderPath: normalizedFolderPath, vaultPath }),
+      perform: () => performMoveNoteToFolder({ path, folderPath: normalizedFolderPath, vaultPath: moveVaultPath }),
       applyRenameResult,
-      buildEntry: (currentEntry, newPath) => buildFilenameRenamedEntry(currentEntry ?? {} as VaultEntry, newPath),
+      buildEntry: (currentEntry, newPath) => buildFilenameRenamedEntry(currentEntry ?? ({} as VaultEntry), newPath),
       onEntryRenamed,
       setToastMessage,
       errorMessage: moveNoteErrorMessage,
       logLabel: 'Failed to move note to folder',
-      successMessage: (result) => moveToastMessage(
-        normalizedFolderPath,
-        result.updated_files,
-        result.failed_updates ?? 0,
-      ),
+      successMessage: (result) => moveToastMessage(normalizedFolderPath, result.updated_files, result.failed_updates ?? 0),
       allowUnchangedResult: true,
     })
-  }, [applyRenameResult, setToastMessage])
+  }, [entries, tabsRef, applyRenameResult, setToastMessage])
 
-  return { handleRenameNote, handleRenameFilename, handleMoveNoteToFolder, tabsRef }
+  const handleMoveNoteToWorkspace = useWorkspaceMoveHandler({
+    applyRenameResult,
+    entries,
+    setToastMessage,
+    tabsRef,
+  })
+
+  return { handleRenameNote, handleRenameFilename, handleMoveNoteToFolder, handleMoveNoteToWorkspace, tabsRef }
 }
diff --git a/src/hooks/useNoteSearch.test.ts b/src/hooks/useNoteSearch.test.ts
index dacce8cd..122b0b5f 100644
--- a/src/hooks/useNoteSearch.test.ts
+++ b/src/hooks/useNoteSearch.test.ts
@@ -86,6 +86,40 @@ describe('useNoteSearch', () => {
     expect(result.current.results[0].noteIcon).toBe('🚀')
   })
 
+  it('keeps workspace identity separate from the title when multiple workspaces are searchable', () => {
+    const personalWorkspace = {
+      id: 'personal',
+      label: 'Personal',
+      alias: 'personal',
+      path: '/personal',
+      shortLabel: 'PE',
+      color: 'blue',
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: true,
+    }
+    const teamWorkspace = {
+      id: 'team',
+      label: 'Team',
+      alias: 'team',
+      path: '/team',
+      shortLabel: 'TE',
+      color: 'green',
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: false,
+    }
+    const { result } = renderHook(() => useNoteSearch([
+      makeEntry({ path: '/personal/a.md', title: 'Alpha', workspace: personalWorkspace }),
+      makeEntry({ path: '/team/b.md', title: 'Beta', workspace: teamWorkspace }),
+    ], ''))
+
+    expect(result.current.results[0].title).toBe('Alpha')
+    expect(result.current.results[0].workspace).toBe(personalWorkspace)
+  })
+
   it('starts with selectedIndex 0', () => {
     const { result } = renderHook(() => useNoteSearch(entries, ''))
     expect(result.current.selectedIndex).toBe(0)
diff --git a/src/hooks/useNoteSearch.ts b/src/hooks/useNoteSearch.ts
index dd5e0235..790035cf 100644
--- a/src/hooks/useNoteSearch.ts
+++ b/src/hooks/useNoteSearch.ts
@@ -4,7 +4,6 @@ import { fuzzyMatch, bestSearchRank } from '../utils/fuzzyMatch'
 import { getTypeColor, getTypeLightColor, buildTypeEntryMap } from '../utils/typeColors'
 import { getTypeIcon } from '../components/NoteItem'
 import type { NoteSearchResultItem } from '../components/NoteSearchList'
-import { workspaceDisplayPrefix } from '../utils/workspaces'
 
 const DEFAULT_MAX_RESULTS = 20
 
@@ -17,12 +16,13 @@ function toResult(e: VaultEntry, typeEntryMap: Record<string, VaultEntry>, showW
   const te = typeEntryMap[e.isA ?? '']
   return {
     entry: e,
-    title: `${showWorkspace ? workspaceDisplayPrefix(e) ?? '' : ''}${e.title}`,
+    title: e.title,
     noteIcon: e.icon,
     noteType,
     typeColor: noteType ? getTypeColor(e.isA, te?.color) : undefined,
     typeLightColor: noteType ? getTypeLightColor(e.isA, te?.color) : undefined,
     TypeIcon: noteType ? getTypeIcon(e.isA, te?.icon) : undefined,
+    workspace: showWorkspace ? e.workspace ?? null : null,
   }
 }
 
diff --git a/src/hooks/useSettings.test.ts b/src/hooks/useSettings.test.ts
index 1deff9dd..d0423873 100644
--- a/src/hooks/useSettings.test.ts
+++ b/src/hooks/useSettings.test.ts
@@ -32,6 +32,7 @@ const defaultSettings: Settings = {
   default_ai_target: null,
   ai_model_providers: null,
   hide_gitignored_files: null,
+  multi_workspace_enabled: null,
   all_notes_show_pdfs: null,
   all_notes_show_images: null,
   all_notes_show_unsupported: null,
@@ -57,6 +58,7 @@ const savedSettings: Settings = {
   default_ai_target: null,
   ai_model_providers: null,
   hide_gitignored_files: null,
+  multi_workspace_enabled: null,
   all_notes_show_pdfs: null,
   all_notes_show_images: null,
   all_notes_show_unsupported: null,
@@ -119,6 +121,7 @@ function changedSettings(): Settings {
     default_ai_target: null,
     ai_model_providers: null,
     hide_gitignored_files: false,
+    multi_workspace_enabled: null,
     all_notes_show_pdfs: true,
     all_notes_show_images: false,
     all_notes_show_unsupported: true,
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index 568b8eb2..8d2496cd 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -57,6 +57,7 @@ const EMPTY_SETTINGS: Settings = {
   all_notes_show_pdfs: null,
   all_notes_show_images: null,
   all_notes_show_unsupported: null,
+  multi_workspace_enabled: null,
 }
 
 function normalizeSettings(settings: Settings): Settings {
@@ -79,6 +80,7 @@ function normalizeSettings(settings: Settings): Settings {
     all_notes_show_pdfs: settings.all_notes_show_pdfs ?? null,
     all_notes_show_images: settings.all_notes_show_images ?? null,
     all_notes_show_unsupported: settings.all_notes_show_unsupported ?? null,
+    multi_workspace_enabled: settings.multi_workspace_enabled ?? null,
   }
 }
 
diff --git a/src/hooks/useTabManagement.test.ts b/src/hooks/useTabManagement.test.ts
index 5d9eb030..046f53b0 100644
--- a/src/hooks/useTabManagement.test.ts
+++ b/src/hooks/useTabManagement.test.ts
@@ -351,6 +351,74 @@ describe('useTabManagement (single-note model)', () => {
       })
       expect(result.current.tabs[0].content).toBe('# Window content')
     })
+
+    it('uses the entry workspace vault path when Tauri opens a mounted workspace note', async () => {
+      vi.mocked(isTauri).mockReturnValue(true)
+      vi.mocked(invoke).mockResolvedValue('# Workspace content')
+
+      const { result } = renderHook(() => useTabManagement())
+      await selectNote(result, {
+        path: '/team/tolaria-app.md',
+        title: 'Tolaria',
+        workspace: {
+          id: 'team',
+          label: 'Team',
+          alias: 'team',
+          path: '/team',
+          shortLabel: 'TE',
+          color: null,
+          icon: null,
+          mounted: true,
+          available: true,
+          defaultForNewNotes: false,
+        },
+      })
+
+      expect(vi.mocked(invoke)).toHaveBeenCalledWith('get_note_content', {
+        path: '/team/tolaria-app.md',
+        vaultPath: '/team',
+      })
+      expect(result.current.tabs[0].content).toBe('# Workspace content')
+    })
+
+    it('does not reuse cached content across workspaces with the same relative note path', async () => {
+      vi.mocked(isTauri).mockReturnValue(true)
+      vi.mocked(invoke).mockImplementation((_cmd: string, args?: { vaultPath?: string }) => (
+        Promise.resolve(args?.vaultPath === '/team' ? '# Team content' : '# Personal content')
+      ))
+
+      const personalWorkspace = {
+        id: 'personal',
+        label: 'Personal',
+        alias: 'personal',
+        path: '/personal',
+        shortLabel: 'PE',
+        color: null,
+        icon: null,
+        mounted: true,
+        available: true,
+        defaultForNewNotes: false,
+      }
+      const teamWorkspace = { ...personalWorkspace, id: 'team', label: 'Team', alias: 'team', path: '/team', shortLabel: 'TE' }
+      prefetchNoteContent(makeEntry({ path: 'shared.md', workspace: personalWorkspace }))
+      await vi.waitFor(() => expect(vi.mocked(invoke)).toHaveBeenCalledWith('get_note_content', {
+        path: 'shared.md',
+        vaultPath: '/personal',
+      }))
+
+      const { result } = renderHook(() => useTabManagement())
+      await selectNote(result, {
+        path: 'shared.md',
+        title: 'Shared',
+        workspace: teamWorkspace,
+      })
+
+      expect(vi.mocked(invoke)).toHaveBeenCalledWith('get_note_content', {
+        path: 'shared.md',
+        vaultPath: '/team',
+      })
+      expect(result.current.tabs[0].content).toBe('# Team content')
+    })
   })
 
   describe('handleReplaceActiveTab', () => {
diff --git a/src/hooks/useVaultLoader.test.ts b/src/hooks/useVaultLoader.test.ts
index 50d3756d..9410938e 100644
--- a/src/hooks/useVaultLoader.test.ts
+++ b/src/hooks/useVaultLoader.test.ts
@@ -2,6 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { renderHook, act, waitFor } from '@testing-library/react'
 import type { VaultEntry, ModifiedFile, GitCommit, FolderNode } from '../types'
 import { useVaultLoader, resolveNoteStatus } from './useVaultLoader'
+import { workspaceIdentityFromVault } from '../utils/workspaces'
 
 const mockEntries: VaultEntry[] = [
   {
@@ -187,6 +188,318 @@ describe('useVaultLoader', () => {
     expect(result.current.entries.find((entry) => entry.workspace?.alias === 'team')?.workspace?.defaultForNewNotes).toBe(false)
   })
 
+  it('loads one folder root per mounted workspace when folder vaults are provided', async () => {
+    const vaults = [
+      { label: 'Personal', path: '/personal', alias: 'personal', available: true, mounted: true },
+      { label: 'Team', path: '/team', alias: 'team', available: true, mounted: true },
+    ]
+    backendInvokeFn.mockImplementation(((cmd: string, args?: Record<string, unknown>) => {
+      if (isVaultLoadCommand(cmd)) {
+        const path = args?.path
+        return Promise.resolve([{ ...mockEntries[0], path: `${path}/note/hello.md` }])
+      }
+      if (cmd === 'list_vault_folders') {
+        const path = args?.path
+        return Promise.resolve([
+          { name: path === '/team' ? 'team-projects' : 'personal-projects', path: 'projects', children: [] },
+        ])
+      }
+      if (cmd === 'list_views' || cmd === 'get_modified_files') return Promise.resolve([])
+      return Promise.resolve(null)
+    }) as typeof defaultMockInvoke)
+
+    const { result } = renderHook(() => useVaultLoader('/personal', vaults, '/personal', vaults))
+
+    await waitForEntries(result, 2)
+    await waitFor(() => {
+      expect(result.current.folders).toEqual([
+        {
+          name: 'Personal',
+          path: '',
+          rootPath: '/personal',
+          children: [{ name: 'personal-projects', path: 'projects', rootPath: '/personal', children: [] }],
+        },
+        {
+          name: 'Team',
+          path: '',
+          rootPath: '/team',
+          children: [{ name: 'team-projects', path: 'projects', rootPath: '/team', children: [] }],
+        },
+      ])
+    })
+  })
+
+  it('does not re-add the base vault as a folder root after it is unmounted', async () => {
+    const entryVaults = [
+      { label: 'Brian', path: '/brian', alias: 'brian', available: true, mounted: false },
+      { label: 'Laputa', path: '/laputa', alias: 'laputa', available: true, mounted: true },
+    ]
+    const folderVaults = [entryVaults[1]]
+    backendInvokeFn.mockImplementation(((cmd: string, args?: Record<string, unknown>) => {
+      if (isVaultLoadCommand(cmd)) {
+        const path = args?.path
+        return Promise.resolve([{ ...mockEntries[0], path: `${path}/note/hello.md` }])
+      }
+      if (cmd === 'list_vault_folders') {
+        const path = args?.path
+        return Promise.resolve([
+          { name: path === '/brian' ? 'brian-projects' : 'laputa-projects', path: 'projects', children: [] },
+        ])
+      }
+      if (cmd === 'list_views' || cmd === 'get_modified_files') return Promise.resolve([])
+      return Promise.resolve(null)
+    }) as typeof defaultMockInvoke)
+
+    const { result } = renderHook(() => useVaultLoader('/brian', entryVaults, '/laputa', folderVaults))
+
+    await waitForEntries(result, 2)
+    await waitFor(() => {
+      expect(result.current.folders).toEqual([
+        {
+          name: 'Laputa',
+          path: '',
+          rootPath: '/laputa',
+          children: [{ name: 'laputa-projects', path: 'projects', rootPath: '/laputa', children: [] }],
+        },
+      ])
+    })
+  })
+
+  it('updates workspace default metadata without reloading vault contents', async () => {
+    backendInvokeFn.mockImplementation(buildMountedWorkspaceLoadMock())
+    const vaults = [
+      { label: 'Personal', path: '/personal', alias: 'personal', available: true, mounted: true },
+      { label: 'Team', path: '/team', alias: 'team', available: true, mounted: true },
+    ]
+    const { result, rerender } = renderHook(
+      ({ defaultPath }) => useVaultLoader('/personal', vaults, defaultPath, vaults),
+      { initialProps: { defaultPath: '/personal' } },
+    )
+
+    await waitForEntries(result, 2)
+    const vaultLoadCalls = backendInvokeFn.mock.calls.filter(([command]) => isVaultLoadCommand(command)).length
+    const folderLoadCalls = backendInvokeFn.mock.calls.filter(([command]) => command === 'list_vault_folders').length
+
+    rerender({ defaultPath: '/team' })
+
+    await waitFor(() => {
+      expect(result.current.entries.find((entry) => entry.workspace?.path === '/team')?.workspace?.defaultForNewNotes).toBe(true)
+    })
+    expect(backendInvokeFn.mock.calls.filter(([command]) => isVaultLoadCommand(command))).toHaveLength(vaultLoadCalls)
+    expect(backendInvokeFn.mock.calls.filter(([command]) => command === 'list_vault_folders')).toHaveLength(folderLoadCalls)
+  })
+
+  it('loads a newly added workspace incrementally without clearing existing entries', async () => {
+    backendInvokeFn.mockImplementation(buildMountedWorkspaceLoadMock())
+    const personal = { label: 'Personal', path: '/personal', alias: 'personal', available: true, mounted: true }
+    const team = { label: 'Team', path: '/team', alias: 'team', available: true, mounted: true }
+    const { result, rerender } = renderHook(
+      ({ vaults }) => useVaultLoader('/personal', vaults, '/personal', vaults),
+      { initialProps: { vaults: [personal] } },
+    )
+
+    await waitForEntries(result, 1)
+    expect(result.current.entries.map((entry) => entry.workspace?.path)).toEqual(['/personal'])
+
+    rerender({ vaults: [personal, team] })
+
+    expect(result.current.entries.map((entry) => entry.workspace?.path)).toContain('/personal')
+    await waitForEntries(result, 2)
+    expect(result.current.entries.map((entry) => entry.workspace?.path).sort()).toEqual(['/personal', '/team'])
+  })
+
+  it('keeps preloaded workspace entries mounted when switching the visible vault', async () => {
+    backendInvokeFn.mockImplementation(buildMountedWorkspaceLoadMock())
+    const personal = { label: 'Personal', path: '/personal', alias: 'personal', available: true, mounted: true }
+    const team = { label: 'Team', path: '/team', alias: 'team', available: true, mounted: true }
+    const vaults = [personal, team]
+    const { result, rerender } = renderHook(
+      ({ path }) => useVaultLoader(path, vaults, path),
+      { initialProps: { path: '/personal' } },
+    )
+
+    await waitForEntries(result, 2)
+    const vaultLoadCalls = backendInvokeFn.mock.calls.filter(([command]) => isVaultLoadCommand(command)).length
+
+    rerender({ path: '/team' })
+
+    expect(result.current.isLoading).toBe(false)
+    expect(result.current.entries.map((entry) => entry.workspace?.path).sort()).toEqual(['/personal', '/team'])
+    await waitFor(() => {
+      expect(backendInvokeFn.mock.calls.filter(([command]) => isVaultLoadCommand(command))).toHaveLength(vaultLoadCalls)
+    })
+  })
+
+  it('reloads scoped folder roots when another mounted workspace is added', async () => {
+    const brian = { label: 'Brian', path: '/brian', alias: 'brian', available: true, mounted: true }
+    const laputa = { label: 'Laputa', path: '/laputa', alias: 'laputa', available: true, mounted: true }
+    const third = { label: 'Third', path: '/third', alias: 'third', available: true, mounted: true }
+    backendInvokeFn.mockImplementation(((cmd: string, args?: Record<string, unknown>) => {
+      const path = args?.path
+      if (isVaultLoadCommand(cmd)) return Promise.resolve([{ ...mockEntries[0], path: `${path}/note/hello.md` }])
+      if (cmd === 'list_vault_folders') {
+        const rootName = path === '/laputa'
+          ? 'laputa-root'
+          : path === '/third'
+            ? 'third-root'
+            : 'brian-root'
+        return Promise.resolve([{ name: rootName, path: 'root', children: [] }])
+      }
+      if (cmd === 'list_views' || cmd === 'get_modified_files') return Promise.resolve([])
+      return Promise.resolve(null)
+    }) as typeof defaultMockInvoke)
+    const { result, rerender } = renderHook(
+      ({ folderVaults }) => useVaultLoader('/brian', [brian, laputa, third], '/brian', folderVaults),
+      { initialProps: { folderVaults: [brian] } },
+    )
+
+    await waitForEntries(result, 3)
+    await waitFor(() => {
+      expect(result.current.folders.map((folder) => folder.name)).toEqual(['brian-root'])
+    })
+
+    rerender({ folderVaults: [brian, laputa] })
+
+    await waitFor(() => {
+      expect(result.current.folders.map((folder) => folder.rootPath)).toEqual(['/brian', '/laputa'])
+    })
+
+    rerender({ folderVaults: [brian, laputa, third] })
+
+    await waitFor(() => {
+      expect(result.current.folders.map((folder) => folder.rootPath)).toEqual(['/brian', '/laputa', '/third'])
+    })
+  })
+
+  it('adds each mounted workspace as soon as that workspace finishes loading', async () => {
+    let resolveLaputa: ((entries: VaultEntry[]) => void) | null = null
+    const brian = { label: 'Brian', path: '/brian', alias: 'brian', available: true, mounted: true }
+    const laputa = { label: 'Laputa', path: '/laputa', alias: 'laputa', available: true, mounted: true }
+    const team = { label: 'Team', path: '/team', alias: 'team', available: true, mounted: true }
+    const vaults = [brian, laputa, team]
+
+    backendInvokeFn.mockImplementation(((cmd: string, args?: Record<string, unknown>) => {
+      const path = args?.path
+      if (isVaultLoadCommand(cmd)) {
+        if (path === '/laputa') {
+          return new Promise<VaultEntry[]>((resolve) => {
+            resolveLaputa = resolve
+          })
+        }
+        return Promise.resolve([{ ...mockEntries[0], path: `${path}/note/hello.md` }])
+      }
+      if (cmd === 'list_vault_folders' || cmd === 'list_views' || cmd === 'get_modified_files') return Promise.resolve([])
+      return Promise.resolve(null)
+    }) as typeof defaultMockInvoke)
+
+    const { result } = renderHook(() => useVaultLoader('/brian', vaults, '/brian', vaults))
+
+    await waitFor(() => {
+      expect(result.current.entries.map((entry) => entry.workspace?.path).sort()).toEqual(['/brian', '/team'])
+    })
+
+    await act(async () => {
+      resolveLaputa?.([{ ...mockEntries[0], path: '/laputa/note/hello.md' }])
+    })
+
+    await waitFor(() => {
+      expect(result.current.entries.map((entry) => entry.workspace?.path).sort()).toEqual(['/brian', '/laputa', '/team'])
+    })
+  })
+
+  it('preserves mounted workspace entries that arrive while the active vault scan is pending', async () => {
+    const field = { label: 'Field Notes', path: '/field', alias: 'field', available: true, mounted: true }
+    const research = { label: 'Research Lab', path: '/research', alias: 'research', available: true, mounted: true }
+    const vaults = [field, research]
+    const fieldLoad = createDeferred<VaultEntry[]>()
+    backendInvokeFn.mockImplementation(((cmd: string, args?: Record<string, unknown>) => {
+      const path = args?.path
+      if (isVaultLoadCommand(cmd)) {
+        if (path === '/field') return fieldLoad.promise
+        return Promise.resolve([{ ...mockEntries[0], path: `${path}/note/hello.md` }])
+      }
+      if (cmd === 'list_vault_folders' || cmd === 'list_views' || cmd === 'get_modified_files') return Promise.resolve([])
+      return Promise.resolve(null)
+    }) as typeof defaultMockInvoke)
+
+    const { result } = renderHook(() => useVaultLoader('/field', vaults, '/field', vaults))
+
+    act(() => {
+      result.current.addEntry({
+        ...mockEntries[0],
+        path: '/research/note/hello.md',
+        title: 'Research Hello',
+        workspace: workspaceIdentityFromVault(research, { defaultWorkspacePath: '/field' }),
+      })
+    })
+
+    act(() => {
+      fieldLoad.resolve([{ ...mockEntries[0], path: '/field/note/hello.md', title: 'Field Hello' }])
+    })
+
+    await waitFor(() => {
+      expect(result.current.entries.map((entry) => entry.workspace?.path).sort()).toEqual(['/field', '/research'])
+    })
+  })
+
+  it('uses cached vault listing for background workspace loads in Tauri mode', async () => {
+    await enableTauriMode()
+    const brian = { label: 'Brian', path: '/brian', alias: 'brian', available: true, mounted: true }
+    const laputa = { label: 'Laputa', path: '/laputa', alias: 'laputa', available: true, mounted: true }
+    const vaults = [brian, laputa]
+
+    backendInvokeFn.mockImplementation(((cmd: string, args?: Record<string, unknown>) => {
+      if (isVaultLoadCommand(cmd)) {
+        const path = args?.path
+        return Promise.resolve([{ ...mockEntries[0], path: `${path}/note/hello.md` }])
+      }
+      if (cmd === 'list_vault_folders' || cmd === 'list_views' || cmd === 'get_modified_files') return Promise.resolve([])
+      return Promise.resolve(null)
+    }) as typeof defaultMockInvoke)
+
+    const { result } = renderHook(() => useVaultLoader('/brian', vaults, '/brian', vaults))
+
+    await waitForEntries(result, 2)
+
+    const laputaLoadCommands = backendInvokeFn.mock.calls
+      .filter(([, args]) => args?.path === '/laputa')
+      .map(([command]) => command)
+    expect(laputaLoadCommands).toContain('list_vault')
+    expect(laputaLoadCommands).not.toContain('reload_vault')
+  })
+
+  it('clears stale views immediately when switching to another preloaded workspace', async () => {
+    backendInvokeFn.mockImplementation(((cmd: string, args?: Record<string, unknown>) => {
+      const path = args?.path
+      if (isVaultLoadCommand(cmd)) return Promise.resolve([{ ...mockEntries[0], path: `${path}/note/hello.md` }])
+      if (cmd === 'list_views') {
+        return Promise.resolve(args?.vaultPath === '/brian'
+          ? [{ filename: 'brian.yml', definition: { name: 'Brian View', icon: null, color: null, sort: null, filters: { all: [] } } }]
+          : [])
+      }
+      if (cmd === 'list_vault_folders' || cmd === 'get_modified_files') return Promise.resolve([])
+      return Promise.resolve(null)
+    }) as typeof defaultMockInvoke)
+    const brian = { label: 'Brian', path: '/brian', alias: 'brian', available: true, mounted: true }
+    const laputa = { label: 'Laputa', path: '/laputa', alias: 'laputa', available: true, mounted: true }
+    const vaults = [brian, laputa]
+    const { result, rerender } = renderHook(
+      ({ path }) => useVaultLoader(path, vaults, path),
+      { initialProps: { path: '/brian' } },
+    )
+
+    await waitFor(() => {
+      expect(result.current.views.map((view) => view.filename)).toEqual(['brian.yml'])
+    })
+
+    rerender({ path: '/laputa' })
+
+    expect(result.current.views).toEqual([])
+    await waitFor(() => {
+      expect(result.current.views).toEqual([])
+    })
+  })
+
   it('normalizes missing entry and view string metadata from vault load', async () => {
     backendInvokeFn.mockImplementation(((cmd: string) => {
       if (isVaultLoadCommand(cmd)) {
diff --git a/src/hooks/useVaultLoader.ts b/src/hooks/useVaultLoader.ts
index 75949e0d..ef7414f5 100644
--- a/src/hooks/useVaultLoader.ts
+++ b/src/hooks/useVaultLoader.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState, type Dispatch, type SetStateAction } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState, type Dispatch, type SetStateAction } from 'react'
 import type { VaultEntry, FolderNode, GitCommit, ModifiedFile, NoteStatus, GitPushResult, ViewFile } from '../types'
 import type { VaultOption } from '../components/status-bar/types'
 import {
@@ -13,14 +13,17 @@ import {
   hasVaultPath,
   loadVaultChrome,
   loadVaultData,
+  loadMountedVaultFolders,
   loadVaultFolders,
   loadVaultViews,
+  loadWorkspaceEntries,
   reloadVaultEntries,
   tauriCall,
 } from './vaultLoaderCommands'
 import { normalizeVaultEntry } from '../utils/vaultMetadataNormalization'
 import { useUnavailableVaultState } from './useUnavailableVaultState'
 import { resetVaultState } from './vaultStateReset'
+import { workspaceIdentityFromVault } from '../utils/workspaces'
 
 interface InitialVaultLoadStateOptions {
   defaultWorkspacePath?: string | null
@@ -28,7 +31,7 @@ interface InitialVaultLoadStateOptions {
   path: string
   handleVaultUnavailable: (path: string) => void
   isCurrentVaultPath: (path: string) => boolean
-  setEntries: (entries: VaultEntry[]) => void
+  setEntries: Dispatch<SetStateAction<VaultEntry[]>>
   setFolders: (folders: FolderNode[]) => void
   setIsLoading: (isLoading: boolean) => void
   setViews: (views: ViewFile[]) => void
@@ -65,10 +68,20 @@ async function loadInitialVaultEntriesState(options: Pick<
   const { handleVaultAvailable, handleVaultUnavailable, isCurrentVaultPath, path, setEntries } = options
 
   try {
-    const { entries } = await loadVaultData({ vaultPath: path, vaults: options.vaults, defaultWorkspacePath: options.defaultWorkspacePath })
+    const { entries } = await loadVaultData({
+      vaultPath: path,
+      vaults: initialVaultsForPath(path, options.vaults),
+      defaultWorkspacePath: options.defaultWorkspacePath,
+    })
     if (isCurrentVaultPath(path)) {
       handleVaultAvailable(path)
-      setEntries(entries)
+      setEntries((currentEntries) => replaceLoadedWorkspaceEntries({
+        defaultWorkspacePath: options.defaultWorkspacePath,
+        entries: currentEntries,
+        fallbackVaultPath: path,
+        loadedEntries: entries,
+        vaults: options.vaults,
+      }))
     }
   } catch (err) {
     const unavailable = await handleUnavailableVaultPath({ handleVaultUnavailable, isCurrentVaultPath, path })
@@ -241,13 +254,14 @@ interface InitialVaultLoadOptions {
   defaultWorkspacePath?: string | null
   handleVaultAvailable: (path: string) => void
   handleVaultUnavailable: (path: string) => void
+  isWorkspacePathLoaded: (path: string) => boolean
   vaultPath: string
   vaults?: VaultOption[]
   tracker: ReturnType<typeof useNewNoteTracker>
   unsaved: ReturnType<typeof useUnsavedTracker>
   isCurrentVaultPath: (path: string) => boolean
   resetReloading: () => void
-  setEntries: (entries: VaultEntry[]) => void
+  setEntries: Dispatch<SetStateAction<VaultEntry[]>>
   setFolders: (folders: FolderNode[]) => void
   setIsLoading: (isLoading: boolean) => void
   setModifiedFiles: (files: ModifiedFile[]) => void
@@ -259,6 +273,7 @@ function useInitialVaultLoad(options: InitialVaultLoadOptions) {
   const {
     handleVaultAvailable,
     handleVaultUnavailable,
+    isWorkspacePathLoaded,
     vaultPath,
     tracker,
     unsaved,
@@ -273,32 +288,52 @@ function useInitialVaultLoad(options: InitialVaultLoadOptions) {
     vaults,
     defaultWorkspacePath,
   } = options
+  const loadOptionsRef = useRef({ vaults, defaultWorkspacePath })
+
+  useEffect(() => {
+    loadOptionsRef.current = { vaults, defaultWorkspacePath }
+  }, [defaultWorkspacePath, vaults])
 
   useEffect(() => {
     const path = vaultPath
+    const loadOptions = loadOptionsRef.current
+    const reuseLoadedWorkspaceEntries = !!loadOptions.vaults?.length && isWorkspacePathLoaded(path)
     clearPrefetchCache()
+    setViews([])
     resetVaultState({
       clearNewPaths: tracker.clear,
       clearUnsaved: unsaved.clearAll,
-      setEntries,
+      setEntries: reuseLoadedWorkspaceEntries ? () => {} : setEntries,
       setFolders,
       setIsLoading,
       setModifiedFiles,
       setModifiedFilesError,
-      setViews,
+      setViews: reuseLoadedWorkspaceEntries ? () => {} : setViews,
     })
     resetReloading()
 
     if (!hasVaultPath({ vaultPath: path })) return
 
     let cancelled = false
+    if (reuseLoadedWorkspaceEntries) {
+      void loadInitialVaultChromeState({
+        handleVaultUnavailable,
+        isCurrentVaultPath: (candidate) => !cancelled && isCurrentVaultPath(candidate),
+        path,
+        setFolders,
+        setViews,
+        shouldApplyChrome: () => !cancelled && isCurrentVaultPath(path),
+      })
+      return () => { cancelled = true }
+    }
+
     void loadInitialVaultState({
       handleVaultAvailable,
       path,
       handleVaultUnavailable,
       isCurrentVaultPath: (candidate) => !cancelled && isCurrentVaultPath(candidate),
-      vaults,
-      defaultWorkspacePath,
+      vaults: loadOptions.vaults,
+      defaultWorkspacePath: loadOptions.defaultWorkspacePath,
       setEntries,
       setFolders,
       setIsLoading,
@@ -319,8 +354,7 @@ function useInitialVaultLoad(options: InitialVaultLoadOptions) {
     setModifiedFiles,
     setModifiedFilesError,
     setViews,
-    vaults,
-    defaultWorkspacePath,
+    isWorkspacePathLoaded,
   ])
 }
 
@@ -446,6 +480,7 @@ function useGitLoaders(vaultPath: string) {
 
 interface VaultReloadOptions {
   defaultWorkspacePath?: string | null
+  folderVaults?: VaultOption[]
   handleVaultAvailable: (path: string) => void
   handleVaultUnavailable: (path: string) => void
   vaultPath: string
@@ -486,18 +521,21 @@ async function reloadVaultCollection<T>(options: CollectionReloadOptions<T>): Pr
 }
 
 function useFolderReload({
+  folderVaults,
   handleVaultUnavailable,
   isCurrentVaultPath,
   setFolders,
   vaultPath,
-}: Pick<VaultReloadOptions, 'handleVaultUnavailable' | 'isCurrentVaultPath' | 'setFolders' | 'vaultPath'>) {
+}: Pick<VaultReloadOptions, 'defaultWorkspacePath' | 'folderVaults' | 'handleVaultUnavailable' | 'isCurrentVaultPath' | 'setFolders' | 'vaultPath'>) {
   return useCallback(() => reloadVaultCollection({
     handleVaultUnavailable,
     isCurrentVaultPath,
-    loadCollection: loadVaultFolders,
+    loadCollection: folderVaults?.length
+      ? (options) => loadMountedVaultFolders({ ...options, vaults: folderVaults })
+      : loadVaultFolders,
     path: vaultPath,
     setCollection: setFolders,
-  }), [handleVaultUnavailable, vaultPath, isCurrentVaultPath, setFolders])
+  }), [folderVaults, handleVaultUnavailable, vaultPath, isCurrentVaultPath, setFolders])
 }
 
 function useEntryReload({
@@ -644,9 +682,162 @@ function useVaultUnavailable(vaultPath: string, state: ReturnType<typeof useVaul
   })
 }
 
-export function useVaultLoader(vaultPath: string, vaults?: VaultOption[], defaultWorkspacePath?: string | null) {
+function uniqueWorkspacePathsFromVaults(vaultPath: string, vaults?: VaultOption[]): string[] {
+  const paths = vaults?.length
+    ? vaults.map((vault) => vault.path)
+    : [vaultPath]
+  return [...new Set(paths.filter((path) => path.trim().length > 0))]
+}
+
+function workspacePathSetKey(paths: readonly string[]): string {
+  return paths.join('\n')
+}
+
+function entryWorkspacePath(entry: VaultEntry, fallbackVaultPath: string): string {
+  return entry.workspace?.path ?? fallbackVaultPath
+}
+
+function initialVaultsForPath(path: string, vaults?: VaultOption[]): VaultOption[] | undefined {
+  if (!vaults?.length) return undefined
+  const matchingVaults = vaults.filter((vault) => vault.path === path)
+  return matchingVaults.length > 0 ? matchingVaults : undefined
+}
+
+function workspacePathsFromEntries(entries: VaultEntry[], fallbackVaultPath: string): string[] {
+  const paths = new Set<string>()
+  for (const entry of entries) {
+    const path = entryWorkspacePath(entry, fallbackVaultPath)
+    if (path.trim()) paths.add(path)
+  }
+  return [...paths]
+}
+
+function loadedWorkspacePathsFromEntries(entries: VaultEntry[], fallbackVaultPath: string): string[] {
+  const paths = workspacePathsFromEntries(entries, fallbackVaultPath)
+  if (paths.length > 0) return paths
+  return fallbackVaultPath.trim() ? [fallbackVaultPath] : []
+}
+
+function retagEntriesForWorkspaceMetadata({
+  defaultWorkspacePath,
+  entries,
+  fallbackVaultPath,
+  vaults,
+}: {
+  defaultWorkspacePath?: string | null
+  entries: VaultEntry[]
+  fallbackVaultPath: string
+  vaults?: VaultOption[]
+}): VaultEntry[] {
+  if (!vaults?.length) return entries
+
+  const identitiesByPath = new Map(vaults.map((vault) => [
+    vault.path,
+    workspaceIdentityFromVault(vault, { defaultWorkspacePath }),
+  ]))
+  let changed = false
+  const nextEntries = entries.map((entry) => {
+    const identity = identitiesByPath.get(entryWorkspacePath(entry, fallbackVaultPath))
+    if (!identity) return entry
+    const current = entry.workspace
+    if (
+      current
+      && current.label === identity.label
+      && current.alias === identity.alias
+      && current.shortLabel === identity.shortLabel
+      && current.color === identity.color
+      && current.icon === identity.icon
+      && current.mounted === identity.mounted
+      && current.available === identity.available
+      && current.defaultForNewNotes === identity.defaultForNewNotes
+    ) {
+      return entry
+    }
+    changed = true
+    return { ...entry, workspace: identity }
+  })
+
+  return changed ? nextEntries : entries
+}
+
+function pruneEntriesOutsideWorkspaceSet({
+  desiredPaths,
+  entries,
+  fallbackVaultPath,
+}: {
+  desiredPaths: readonly string[]
+  entries: VaultEntry[]
+  fallbackVaultPath: string
+}): VaultEntry[] {
+  const desiredPathSet = new Set(desiredPaths)
+  const nextEntries = entries.filter((entry) => desiredPathSet.has(entryWorkspacePath(entry, fallbackVaultPath)))
+  return nextEntries.length === entries.length ? entries : nextEntries
+}
+
+function replaceWorkspaceEntries({
+  defaultWorkspacePath,
+  entries,
+  fallbackVaultPath,
+  loadedEntries,
+  loadedWorkspacePath,
+  vaults,
+}: {
+  defaultWorkspacePath?: string | null
+  entries: VaultEntry[]
+  fallbackVaultPath: string
+  loadedEntries: VaultEntry[]
+  loadedWorkspacePath: string
+  vaults?: VaultOption[]
+}): VaultEntry[] {
+  return retagEntriesForWorkspaceMetadata({
+    defaultWorkspacePath,
+    entries: [
+      ...entries.filter((entry) => entryWorkspacePath(entry, fallbackVaultPath) !== loadedWorkspacePath),
+      ...loadedEntries,
+    ],
+    fallbackVaultPath,
+    vaults,
+  })
+}
+
+function replaceLoadedWorkspaceEntries({
+  defaultWorkspacePath,
+  entries,
+  fallbackVaultPath,
+  loadedEntries,
+  vaults,
+}: {
+  defaultWorkspacePath?: string | null
+  entries: VaultEntry[]
+  fallbackVaultPath: string
+  loadedEntries: VaultEntry[]
+  vaults?: VaultOption[]
+}): VaultEntry[] {
+  const loadedPathSet = new Set(loadedWorkspacePathsFromEntries(loadedEntries, fallbackVaultPath))
+  return retagEntriesForWorkspaceMetadata({
+    defaultWorkspacePath,
+    entries: [
+      ...entries.filter((entry) => !loadedPathSet.has(entryWorkspacePath(entry, fallbackVaultPath))),
+      ...loadedEntries,
+    ],
+    fallbackVaultPath,
+    vaults,
+  })
+}
+
+export function useVaultLoader(vaultPath: string, vaults?: VaultOption[], defaultWorkspacePath?: string | null, folderVaults?: VaultOption[]) {
   const state = useVaultState(vaultPath)
   const { entries, folders, isCurrentVaultPath, isLoading, modified, pendingSave, setEntries, setFolders, setIsLoading, setViews, tracker, unsaved, views } = state
+  const loadedWorkspacePathsRef = useRef<Set<string>>(new Set())
+  const loadingWorkspacePathsRef = useRef<Set<string>>(new Set())
+  const initialLoadedVaultPathRef = useRef<string | null>(null)
+  const folderVaultsRef = useRef(folderVaults)
+  useEffect(() => {
+    folderVaultsRef.current = folderVaults
+  }, [folderVaults])
+  const setInitialFolders = useCallback((nextFolders: FolderNode[]) => {
+    if ((folderVaultsRef.current?.length ?? 0) === 0) setFolders(nextFolders)
+  }, [setFolders])
   const {
     modifiedFiles,
     modifiedFilesError,
@@ -661,6 +852,7 @@ export function useVaultLoader(vaultPath: string, vaults?: VaultOption[], defaul
     handleVaultAvailable: unavailableVault.markVaultAvailable,
     handleVaultUnavailable: unavailableVault.markVaultUnavailable,
     defaultWorkspacePath,
+    folderVaults,
     vaultPath,
     vaults,
     isCurrentVaultPath,
@@ -670,6 +862,105 @@ export function useVaultLoader(vaultPath: string, vaults?: VaultOption[], defaul
     setViews,
   })
   useGitignoredVisibilityReloads(vaultReloads)
+  const reloadFoldersForCurrentVault = vaultReloads.reloadFolders
+  const reloadViewsForCurrentVault = vaultReloads.reloadViews
+  useEffect(() => {
+    if (!hasVaultPath({ vaultPath })) return
+    void Promise.all([
+      reloadFoldersForCurrentVault(),
+      reloadViewsForCurrentVault(),
+    ])
+  }, [vaultPath, reloadFoldersForCurrentVault, reloadViewsForCurrentVault])
+
+  const desiredWorkspacePaths = useMemo(
+    () => uniqueWorkspacePathsFromVaults(vaultPath, vaults),
+    [vaultPath, vaults],
+  )
+  const desiredWorkspaceKey = useMemo(
+    () => workspacePathSetKey(desiredWorkspacePaths),
+    [desiredWorkspacePaths],
+  )
+  const isWorkspacePathLoaded = useCallback((path: string) => (
+    path.trim().length > 0 && loadedWorkspacePathsRef.current.has(path)
+  ), [])
+
+  useEffect(() => {
+    const desiredPathSet = new Set(desiredWorkspacePaths)
+    loadedWorkspacePathsRef.current = new Set(
+      [...loadedWorkspacePathsRef.current].filter((path) => desiredPathSet.has(path)),
+    )
+    loadingWorkspacePathsRef.current = new Set(
+      [...loadingWorkspacePathsRef.current].filter((path) => desiredPathSet.has(path)),
+    )
+  }, [desiredWorkspaceKey, desiredWorkspacePaths])
+
+  useEffect(() => {
+    if (isLoading || !hasVaultPath({ vaultPath }) || initialLoadedVaultPathRef.current === vaultPath) return
+    initialLoadedVaultPathRef.current = vaultPath
+    loadedWorkspacePathsRef.current = new Set([
+      ...loadedWorkspacePathsRef.current,
+      ...loadedWorkspacePathsFromEntries(entries, vaultPath),
+    ])
+  }, [entries, isLoading, vaultPath])
+
+  useEffect(() => {
+    if (!hasVaultPath({ vaultPath })) return
+
+    setEntries((currentEntries) => retagEntriesForWorkspaceMetadata({
+      defaultWorkspacePath,
+      entries: pruneEntriesOutsideWorkspaceSet({
+        desiredPaths: desiredWorkspacePaths,
+        entries: currentEntries,
+        fallbackVaultPath: vaultPath,
+      }),
+      fallbackVaultPath: vaultPath,
+      vaults,
+    }))
+
+    if (!vaults?.length || isLoading) return
+
+    const loadedPaths = loadedWorkspacePathsRef.current
+    const loadingPaths = loadingWorkspacePathsRef.current
+    const missingVaults = vaults.filter((vault) => (
+      desiredWorkspacePaths.includes(vault.path)
+      && !loadedPaths.has(vault.path)
+      && !loadingPaths.has(vault.path)
+    ))
+    if (missingVaults.length === 0) return
+
+    for (const vault of missingVaults) loadingPaths.add(vault.path)
+
+    for (const vault of missingVaults) {
+      void loadWorkspaceEntries(vault, defaultWorkspacePath)
+        .then((loadedEntries) => {
+          if (!isCurrentVaultPath(vaultPath)) return
+          loadedPaths.add(vault.path)
+          setEntries((currentEntries) => replaceWorkspaceEntries({
+            defaultWorkspacePath,
+            entries: currentEntries,
+            fallbackVaultPath: vaultPath,
+            loadedEntries,
+            loadedWorkspacePath: vault.path,
+            vaults,
+          }))
+        })
+        .catch((error: unknown) => {
+          console.warn(`Failed to load workspace entries for ${vault.path}:`, error)
+        })
+        .finally(() => {
+          loadingPaths.delete(vault.path)
+        })
+    }
+  }, [
+    defaultWorkspacePath,
+    desiredWorkspaceKey,
+    desiredWorkspacePaths,
+    isCurrentVaultPath,
+    isLoading,
+    setEntries,
+    vaultPath,
+    vaults,
+  ])
 
   useInitialVaultLoad({
     handleVaultAvailable: unavailableVault.markVaultAvailable,
@@ -677,12 +968,13 @@ export function useVaultLoader(vaultPath: string, vaults?: VaultOption[], defaul
     vaultPath,
     vaults,
     defaultWorkspacePath,
+    isWorkspacePathLoaded,
     tracker,
     unsaved,
     isCurrentVaultPath,
     resetReloading: vaultReloads.resetReloading,
     setEntries,
-    setFolders,
+    setFolders: setInitialFolders,
     setIsLoading,
     setModifiedFiles,
     setModifiedFilesError,
diff --git a/src/hooks/useVaultSwitcher.test.ts b/src/hooks/useVaultSwitcher.test.ts
index b377d61a..f39bdd87 100644
--- a/src/hooks/useVaultSwitcher.test.ts
+++ b/src/hooks/useVaultSwitcher.test.ts
@@ -103,6 +103,34 @@ describe('useVaultSwitcher', () => {
     expect(result.current.vaultPath).toBe(expectedDefaultVaultPath)
   })
 
+  it('persists workspace identity changes for the implicit default vault', async () => {
+    const { result } = await renderLoadedVaultSwitcher()
+
+    act(() => {
+      result.current.updateWorkspaceIdentity(expectedDefaultVaultPath, { mounted: false, shortLabel: 'GS' })
+    })
+
+    await waitFor(() => {
+      expect(result.current.allVaults).toEqual([
+        expect.objectContaining({
+          path: expectedDefaultVaultPath,
+          managedDefault: true,
+          mounted: false,
+          shortLabel: 'GS',
+        }),
+      ])
+    })
+    await waitFor(() => {
+      expect(mockVaultListStore.vaults).toEqual([
+        expect.objectContaining({
+          path: expectedDefaultVaultPath,
+          mounted: false,
+          shortLabel: 'GS',
+        }),
+      ])
+    })
+  })
+
   it('loads persisted vaults on mount', async () => {
     mockVaultListStore = {
       vaults: [{ label: 'My Vault', path: '/Users/luca/Laputa' }],
diff --git a/src/hooks/useVaultSwitcher.ts b/src/hooks/useVaultSwitcher.ts
index 993a7846..8593226f 100644
--- a/src/hooks/useVaultSwitcher.ts
+++ b/src/hooks/useVaultSwitcher.ts
@@ -154,10 +154,11 @@ function serializePersistedVaultSnapshot(
     activeVault,
     defaultWorkspacePath,
     hiddenDefaults,
-    vaults: vaults.map(({ label, path, alias, color, icon, mounted }) => ({
+    vaults: vaults.map(({ label, path, alias, shortLabel, color, icon, mounted }) => ({
       label,
       path,
       alias: alias ?? null,
+      shortLabel: shortLabel ?? null,
       color: color ?? null,
       icon: icon ?? null,
       mounted: mounted !== false,
@@ -186,12 +187,6 @@ function selectedBridgeVaultPath(selectedVaultPath: string | null): string | nul
   return path ? path : null
 }
 
-async function syncMcpBridgeVault(selectedVaultPath: string | null): Promise<void> {
-  await tauriCall<string>('sync_mcp_bridge_vault', {
-    vaultPath: selectedBridgeVaultPath(selectedVaultPath),
-  })
-}
-
 function isCanonicalGettingStartedPath(path: string, resolvedDefaultPath: string): boolean {
   return path === resolvedDefaultPath
 }
@@ -353,7 +348,13 @@ function buildAllVaults({
   visibleDefaults: VaultOption[]
   extraVaults: VaultOption[]
 }): VaultOption[] {
-  return [...visibleDefaults, ...extraVaults]
+  const vaultsByPath = new Map<string, VaultOption>()
+  for (const vault of visibleDefaults) vaultsByPath.set(vault.path, vault)
+  for (const vault of extraVaults) {
+    const existingVault = vaultsByPath.get(vault.path)
+    vaultsByPath.set(vault.path, existingVault ? { ...existingVault, ...vault, path: vault.path } : vault)
+  }
+  return [...vaultsByPath.values()]
 }
 
 function applyResolvedDefaultPath({
@@ -571,7 +572,9 @@ function useMcpBridgeVaultSync(loaded: boolean, selectedVaultPath: string | null
   useEffect(() => {
     if (!loaded) return
 
-    syncMcpBridgeVault(selectedVaultPath).catch(err => {
+    tauriCall<string>('sync_mcp_bridge_vault', {
+      vaultPath: selectedBridgeVaultPath(selectedVaultPath),
+    }).catch(err => {
       console.warn('Failed to sync MCP bridge vault:', err)
     })
   }, [loaded, selectedVaultPath])
@@ -1236,14 +1239,13 @@ export function useVaultSwitcher({ onSwitch, onToast }: UseVaultSwitcherOptions)
     selectedVaultPath,
     vaultPath,
   } = persistedState
-  useMcpBridgeVaultSync(loaded, selectedVaultPath)
-
   const { allVaults, defaultVaults, isGettingStartedHidden } = useVaultCollections(
     defaultAvailable,
     defaultPath,
     hiddenDefaults,
     extraVaults,
   )
+  useMcpBridgeVaultSync(loaded, selectedVaultPath)
   const {
     handleCreateEmptyVault,
     handleOpenLocalFolder,
diff --git a/src/hooks/useVaultWatcher.test.ts b/src/hooks/useVaultWatcher.test.ts
index 4ffde38d..0cbea2c3 100644
--- a/src/hooks/useVaultWatcher.test.ts
+++ b/src/hooks/useVaultWatcher.test.ts
@@ -79,6 +79,23 @@ describe('useRecentVaultWrites', () => {
     expect(result.current.filterExternalPaths(['/vault/notes/self.md'])).toEqual(['/vault/notes/self.md'])
   })
 
+  it('filters recent app-owned writes across mounted vault roots', () => {
+    const { result } = renderHook(() => useRecentVaultWrites({
+      vaultPath: '/vault-a',
+      vaultPaths: ['/vault-a', '/vault-b'],
+      now: () => 1000,
+    }))
+
+    act(() => {
+      result.current.markInternalWrite('/vault-b/notes/self.md')
+    })
+
+    expect(result.current.filterExternalPaths([
+      '/vault-a/notes/external.md',
+      '/vault-b/notes/self.md',
+    ])).toEqual(['/vault-a/notes/external.md'])
+  })
+
   it('clears recent writes when the active vault changes', () => {
     const { result, rerender } = renderHook(
       ({ vaultPath }) => useRecentVaultWrites({ vaultPath, now: () => 1000 }),
@@ -92,6 +109,20 @@ describe('useRecentVaultWrites', () => {
 
     expect(result.current.filterExternalPaths(['/vault-a/note.md'])).toEqual(['/vault-a/note.md'])
   })
+
+  it('clears recent writes when the mounted vault root set changes', () => {
+    const { result, rerender } = renderHook(
+      ({ vaultPaths }) => useRecentVaultWrites({ vaultPath: '/vault-a', vaultPaths, now: () => 1000 }),
+      { initialProps: { vaultPaths: ['/vault-a', '/vault-b'] } },
+    )
+
+    act(() => {
+      result.current.markInternalWrite('/vault-b/note.md')
+    })
+    rerender({ vaultPaths: ['/vault-a'] })
+
+    expect(result.current.filterExternalPaths(['/vault-b/note.md'])).toEqual(['/vault-b/note.md'])
+  })
 })
 
 describe('useVaultWatcher', () => {
@@ -143,6 +174,20 @@ describe('useVaultWatcher', () => {
     expect(mocks.invoke).toHaveBeenCalledWith('stop_vault_watcher')
   })
 
+  it('starts a native watcher for every mounted vault root', async () => {
+    renderHook(() => useVaultWatcher({
+      vaultPath: '/vault-a',
+      vaultPaths: ['/vault-a', '/vault-b', '/vault-a/'],
+      onVaultChanged: vi.fn(),
+    }))
+
+    await settleWatcherSubscription()
+    expect(mocks.listen).toHaveBeenCalledWith(VAULT_CHANGED_EVENT, expect.any(Function))
+    expect(mocks.invoke).toHaveBeenCalledWith('start_vault_watcher', { path: '/vault-a' })
+    expect(mocks.invoke).toHaveBeenCalledWith('start_vault_watcher', { path: '/vault-b' })
+    expect(mocks.invoke.mock.calls.filter(([command]) => command === 'start_vault_watcher')).toHaveLength(2)
+  })
+
   it('swallows stale native watcher unlisten failures and still stops the watcher', async () => {
     mocks.unlisten.mockImplementationOnce(() => {
       throw new TypeError("undefined is not an object (evaluating 'listeners[eventId].handlerId')")
@@ -198,6 +243,23 @@ describe('useVaultWatcher', () => {
     expect(onVaultChanged).toHaveBeenCalledWith(['/vault/notes/a.md', '/vault/notes/b.md'])
   })
 
+  it('batches changed paths from every watched vault root', async () => {
+    const onVaultChanged = vi.fn()
+    renderHook(() => useVaultWatcher({
+      vaultPath: '/vault-a',
+      vaultPaths: ['/vault-a', '/vault-b'],
+      onVaultChanged,
+    }))
+
+    await settleWatcherSubscription()
+    expect(mocks.listener).toBeDefined()
+    emitVaultChanged({ vaultPath: '/vault-a', paths: ['notes/a.md'] })
+    emitVaultChanged({ vaultPath: '/vault-b', paths: ['notes/b.md'] })
+    await flushWatcherDebounce()
+
+    expect(onVaultChanged).toHaveBeenCalledWith(['/vault-a/notes/a.md', '/vault-b/notes/b.md'])
+  })
+
   it('ignores watcher events for other vaults', async () => {
     const onVaultChanged = vi.fn()
     renderHook(() => useVaultWatcher({ vaultPath: '/vault', onVaultChanged }))
diff --git a/src/hooks/useVaultWatcher.ts b/src/hooks/useVaultWatcher.ts
index 40c8ad49..1c1bfe4f 100644
--- a/src/hooks/useVaultWatcher.ts
+++ b/src/hooks/useVaultWatcher.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, type RefObject } from 'react'
+import { useCallback, useEffect, useMemo, useRef, type RefObject } from 'react'
 import { invoke } from '@tauri-apps/api/core'
 import { listen, type UnlistenFn } from '@tauri-apps/api/event'
 import { isTauri } from '../mock-tauri'
@@ -16,7 +16,8 @@ interface VaultChangedPayload {
 }
 
 interface UseVaultWatcherOptions {
-  vaultPath: WatchPath
+  vaultPath?: WatchPath
+  vaultPaths?: WatchPath[]
   onVaultChanged: (paths: WatchPath[]) => Promise<void> | void
   debounceMs?: number
   filterChangedPaths?: (paths: WatchPath[]) => WatchPath[]
@@ -56,6 +57,55 @@ function isSamePathOrChild({ path, parent }: PathContainmentOptions): boolean {
   return normalizedPath === normalizedParent || normalizedPath.startsWith(`${normalizedParent}/`)
 }
 
+function uniqueWatchRoots(paths: WatchPath[]): WatchPath[] {
+  return [...new Set(paths.map(normalizeWatchPath).filter(Boolean))]
+}
+
+function watchRootsFromOptions(vaultPath?: WatchPath, vaultPaths?: WatchPath[]): WatchPath[] {
+  if (vaultPaths && vaultPaths.length > 0) return uniqueWatchRoots(vaultPaths)
+  return uniqueWatchRoots(vaultPath ? [vaultPath] : [])
+}
+
+function watchRootsKeyFor(watchRoots: readonly WatchPath[]): string {
+  return watchRoots.join('\u0000')
+}
+
+function useWatchRootsRef(watchRoots: WatchPath[]) {
+  const watchRootsRef = useRef(watchRoots)
+  const watchRootsKey = watchRootsKeyFor(watchRoots)
+
+  useEffect(() => {
+    watchRootsRef.current = watchRoots
+  }, [watchRoots, watchRootsKey])
+
+  return { watchRootsRef, watchRootsKey }
+}
+
+function rootForPath(path: WatchPath, roots: readonly WatchPath[]): WatchPath | null {
+  const normalizedPath = normalizeWatchPath(path)
+  return roots.find((root) => isSamePathOrChild({ path: normalizedPath, parent: root })) ?? null
+}
+
+function resolvePathForKnownRoots({
+  path,
+  fallbackRoot,
+  roots,
+}: {
+  path: WatchPath
+  fallbackRoot: WatchPath
+  roots: readonly WatchPath[]
+}): WatchPath | null {
+  const normalizedPath = normalizeWatchPath(path)
+  if (isAbsoluteWatchPath(normalizedPath)) return normalizedPath
+  const root = fallbackRoot || roots[0]
+  return root ? resolveChangedPath({ path: normalizedPath, vaultPath: root }) : null
+}
+
+function eventRootForPayload(vaultPath: WatchPath, roots: readonly WatchPath[]): WatchPath | null {
+  const eventRoot = normalizeWatchPath(vaultPath)
+  return roots.find((root) => root === eventRoot) ?? null
+}
+
 function pruneRecentWrites(writes: Map<string, number>, now: number) {
   for (const [path, timestamp] of writes) {
     if (now - timestamp > INTERNAL_WRITE_SUPPRESSION_MS) writes.delete(path)
@@ -81,35 +131,47 @@ function useVaultPathRef(vaultPath: WatchPath) {
 }
 
 export function useRecentVaultWrites({
-  vaultPath,
+  vaultPath = '',
+  vaultPaths,
   now = Date.now,
 }: {
-  vaultPath: WatchPath
+  vaultPath?: WatchPath
+  vaultPaths?: WatchPath[]
   now?: TimestampProvider
 }) {
   const recentWritesRef = useRef<Map<string, number>>(new Map())
+  const watchRoots = useMemo(() => watchRootsFromOptions(vaultPath, vaultPaths), [vaultPath, vaultPaths])
+  const { watchRootsRef, watchRootsKey } = useWatchRootsRef(watchRoots)
   const vaultPathRef = useVaultPathRef(vaultPath)
 
   useEffect(() => {
     recentWritesRef.current.clear()
-  }, [vaultPath])
+  }, [watchRootsKey])
 
   const markInternalWrite = useCallback((path: WatchPath) => {
-    const root = vaultPathRef.current
-    if (!root) return
-    const resolvedPath = resolveChangedPath({ path, vaultPath: root })
-    if (isSamePathOrChild({ path: resolvedPath, parent: root })) {
+    const resolvedPath = resolvePathForKnownRoots({
+      path,
+      fallbackRoot: vaultPathRef.current,
+      roots: watchRootsRef.current,
+    })
+    if (resolvedPath && rootForPath(resolvedPath, watchRootsRef.current)) {
       recentWritesRef.current.set(resolvedPath, now())
     }
-  }, [now, vaultPathRef])
+  }, [now, vaultPathRef, watchRootsRef])
 
   const filterExternalPaths = useCallback((paths: WatchPath[]) => {
-    const root = vaultPathRef.current
-    if (!root || paths.length === 0) return paths
+    if (watchRootsRef.current.length === 0 || paths.length === 0) return paths
     const currentTime = now()
     pruneRecentWrites(recentWritesRef.current, currentTime)
-    return paths.filter((path) => !recentWritesRef.current.has(resolveChangedPath({ path, vaultPath: root })))
-  }, [now, vaultPathRef])
+    return paths.filter((path) => {
+      const resolvedPath = resolvePathForKnownRoots({
+        path,
+        fallbackRoot: vaultPathRef.current,
+        roots: watchRootsRef.current,
+      })
+      return !resolvedPath || !recentWritesRef.current.has(resolvedPath)
+    })
+  }, [now, vaultPathRef, watchRootsRef])
 
   return { markInternalWrite, filterExternalPaths }
 }
@@ -188,16 +250,15 @@ function filteredRefreshPaths({
 
 function handleWatcherEvent({
   event,
-  root,
+  roots,
   enqueueChangedPaths,
 }: {
   event: { payload: VaultChangedPayload }
-  root: WatchPath
-  enqueueChangedPaths: (paths: WatchPath[]) => void
+  roots: readonly WatchPath[]
+  enqueueChangedPaths: (root: WatchPath, paths: WatchPath[]) => void
 }) {
-  if (normalizeWatchPath(event.payload.vaultPath) === root) {
-    enqueueChangedPaths(event.payload.paths ?? [])
-  }
+  const root = eventRootForPayload(event.payload.vaultPath, roots)
+  if (root) enqueueChangedPaths(root, event.payload.paths ?? [])
 }
 
 function cleanupNativeWatcherListener(unlisten: UnlistenFn): void {
@@ -207,12 +268,10 @@ function cleanupNativeWatcherListener(unlisten: UnlistenFn): void {
 }
 
 function usePendingVaultRefresh({
-  vaultPathRef,
   onVaultChanged,
   filterChangedPaths,
   debounceMs,
 }: {
-  vaultPathRef: RefObject<WatchPath>
   onVaultChanged: UseVaultWatcherOptions['onVaultChanged']
   filterChangedPaths: UseVaultWatcherOptions['filterChangedPaths']
   debounceMs: number
@@ -243,8 +302,7 @@ function usePendingVaultRefresh({
     })
   }, [clearPendingRefresh, filterChangedPathsRef, onVaultChangedRef])
 
-  const enqueueChangedPaths = useCallback((paths: WatchPath[]) => {
-    const root = vaultPathRef.current
+  const enqueueChangedPaths = useCallback((root: WatchPath, paths: WatchPath[]) => {
     if (!root) return
     addQueuedChangedPaths({
       root,
@@ -255,29 +313,30 @@ function usePendingVaultRefresh({
     if (!hasRefreshWork({ queuedPathsRef, fullRefreshPendingRef })) return
     if (debounceTimerRef.current) clearTimeout(debounceTimerRef.current)
     debounceTimerRef.current = setTimeout(flushQueuedRefresh, debounceMs)
-  }, [debounceMs, flushQueuedRefresh, vaultPathRef])
+  }, [debounceMs, flushQueuedRefresh])
 
   return { clearPendingRefresh, enqueueChangedPaths }
 }
 
 function useNativeVaultWatcher({
-  vaultPath,
+  watchRoots,
+  watchRootsKey,
   enqueueChangedPaths,
   clearPendingRefresh,
 }: {
-  vaultPath: WatchPath
-  enqueueChangedPaths: (paths: WatchPath[]) => void
+  watchRoots: WatchPath[]
+  watchRootsKey: string
+  enqueueChangedPaths: (root: WatchPath, paths: WatchPath[]) => void
   clearPendingRefresh: () => void
 }) {
   useEffect(() => {
-    const root = normalizeWatchPath(vaultPath)
-    if (!root || !isTauri()) return
+    if (watchRoots.length === 0 || !isTauri()) return
 
     let cancelled = false
     let unlisten: UnlistenFn | null = null
 
     void listen<VaultChangedPayload>(VAULT_CHANGED_EVENT, (event) => {
-      handleWatcherEvent({ event, root, enqueueChangedPaths })
+      handleWatcherEvent({ event, roots: watchRoots, enqueueChangedPaths })
     }).then((nextUnlisten) => {
       if (cancelled) {
         cleanupNativeWatcherListener(nextUnlisten)
@@ -288,9 +347,11 @@ function useNativeVaultWatcher({
       console.warn('Failed to subscribe to vault watcher events:', err)
     })
 
-    void invoke('start_vault_watcher', { path: vaultPath }).catch((err) => {
-      console.warn('Failed to start vault watcher:', err)
-    })
+    for (const root of watchRoots) {
+      void invoke('start_vault_watcher', { path: root }).catch((err) => {
+        console.warn('Failed to start vault watcher:', err)
+      })
+    }
 
     return () => {
       cancelled = true
@@ -298,25 +359,27 @@ function useNativeVaultWatcher({
       if (unlisten) cleanupNativeWatcherListener(unlisten)
       void invoke('stop_vault_watcher').catch(() => {})
     }
-  }, [vaultPath, enqueueChangedPaths, clearPendingRefresh])
+  }, [watchRoots, watchRootsKey, enqueueChangedPaths, clearPendingRefresh])
 }
 
 export function useVaultWatcher({
-  vaultPath,
+  vaultPath = '',
+  vaultPaths,
   onVaultChanged,
   debounceMs = VAULT_WATCHER_DEBOUNCE_MS,
   filterChangedPaths,
 }: UseVaultWatcherOptions) {
-  const vaultPathRef = useVaultPathRef(vaultPath)
+  const watchRoots = useMemo(() => watchRootsFromOptions(vaultPath, vaultPaths), [vaultPath, vaultPaths])
+  const watchRootsKey = watchRootsKeyFor(watchRoots)
   const pendingRefresh = usePendingVaultRefresh({
-    vaultPathRef,
     onVaultChanged,
     filterChangedPaths,
     debounceMs,
   })
 
   useNativeVaultWatcher({
-    vaultPath,
+    watchRoots,
+    watchRootsKey,
     enqueueChangedPaths: pendingRefresh.enqueueChangedPaths,
     clearPendingRefresh: pendingRefresh.clearPendingRefresh,
   })
diff --git a/src/hooks/useWorkspaceIdentityActions.ts b/src/hooks/useWorkspaceIdentityActions.ts
index 4c27a0be..15dfeb10 100644
--- a/src/hooks/useWorkspaceIdentityActions.ts
+++ b/src/hooks/useWorkspaceIdentityActions.ts
@@ -1,13 +1,34 @@
 import { useCallback, type Dispatch, type SetStateAction } from 'react'
 import type { VaultOption } from '../components/status-bar/types'
+import { labelFromWorkspacePath } from '../utils/workspaces'
 
 function updateVaultOptionInList(
   path: string,
   patch: Partial<VaultOption>,
 ): (vaults: VaultOption[]) => VaultOption[] {
-  return (vaults) => vaults.map((vault) => (
-    vault.path === path ? { ...vault, ...patch, path: vault.path } : vault
-  ))
+  const safePatch = { ...patch }
+  delete safePatch.path
+
+  return (vaults) => {
+    let updated = false
+    const nextVaults = vaults.map((vault) => {
+      if (vault.path !== path) return vault
+      updated = true
+      return { ...vault, ...safePatch, path: vault.path }
+    })
+
+    if (updated) return nextVaults
+
+    return [
+      ...nextVaults,
+      {
+        label: labelFromWorkspacePath(path),
+        path,
+        available: true,
+        ...safePatch,
+      },
+    ]
+  }
 }
 
 export function useWorkspaceIdentityActions({
diff --git a/src/hooks/vaultLoaderCommands.ts b/src/hooks/vaultLoaderCommands.ts
index 569aed21..bb61cbe4 100644
--- a/src/hooks/vaultLoaderCommands.ts
+++ b/src/hooks/vaultLoaderCommands.ts
@@ -17,9 +17,13 @@ interface VaultPathOptions {
 
 interface MountedVaultEntriesOptions extends VaultPathOptions {
   defaultWorkspacePath?: string | null
+  forceReload?: boolean
+  includeFallbackVault?: boolean
   vaults?: VaultOption[]
 }
 
+type MountedVaultFoldersOptions = MountedVaultEntriesOptions
+
 interface CommitWithPushOptions extends VaultPathOptions {
   message: string
 }
@@ -59,19 +63,24 @@ function loadVaultEntriesWithCommand({ vaultPath, command }: VaultPathOptions &
     .then((entries) => normalizeVaultEntries(entries, vaultPath))
 }
 
-function loadWorkspaceEntries(vault: VaultOption, defaultWorkspacePath?: string | null): Promise<VaultEntry[]> {
+export function loadWorkspaceEntries(
+  vault: VaultOption,
+  defaultWorkspacePath?: string | null,
+  options: { forceReload?: boolean } = {},
+): Promise<VaultEntry[]> {
   const workspace = workspaceIdentityFromVault(vault, { defaultWorkspacePath })
-  return tauriCall<unknown>({ command: isTauri() ? 'reload_vault' : 'list_vault', tauriArgs: { path: vault.path } })
+  const command = options.forceReload && isTauri() ? 'reload_vault' : 'list_vault'
+  return tauriCall<unknown>({ command, tauriArgs: { path: vault.path } })
     .then((entries) => normalizeVaultEntries(entries, vault.path, workspace))
 }
 
-function uniqueMountedVaults({ vaultPath, vaults = [] }: MountedVaultEntriesOptions): VaultOption[] {
+function uniqueMountedVaults({ vaultPath, vaults = [], includeFallbackVault = true }: MountedVaultEntriesOptions): VaultOption[] {
   const byPath = new Map<string, VaultOption>()
   for (const vault of vaults) {
     if (vault.available === false || vault.mounted === false || !vault.path.trim()) continue
     byPath.set(vault.path, vault)
   }
-  if (vaultPath.trim() && !byPath.has(vaultPath)) {
+  if (includeFallbackVault && vaultPath.trim() && !byPath.has(vaultPath)) {
     byPath.set(vaultPath, { label: vaultPath.split('/').filter(Boolean).pop() || 'Workspace', path: vaultPath, mounted: true, available: true })
   }
   return [...byPath.values()]
@@ -82,20 +91,30 @@ function loadMountedVaultEntries(options: MountedVaultEntriesOptions): Promise<V
   if (mountedVaults.length <= 1) {
     const onlyVault = mountedVaults[0]
     return onlyVault
-      ? loadWorkspaceEntries(onlyVault, options.defaultWorkspacePath)
+      ? loadWorkspaceEntries(onlyVault, options.defaultWorkspacePath, { forceReload: options.forceReload })
       : loadVaultEntries({ vaultPath: options.vaultPath })
   }
-  return Promise.all(mountedVaults.map((vault) => loadWorkspaceEntries(vault, options.defaultWorkspacePath)))
+  return Promise.all(mountedVaults.map((vault) => (
+    loadWorkspaceEntries(vault, options.defaultWorkspacePath, { forceReload: options.forceReload })
+  )))
     .then((groups) => groups.flat())
 }
 
+function attachFolderRootPath(folders: FolderNode[], rootPath: string): FolderNode[] {
+  return folders.map((folder) => ({
+    ...folder,
+    rootPath,
+    children: attachFolderRootPath(folder.children, rootPath),
+  }))
+}
+
 function loadVaultEntries({ vaultPath }: VaultPathOptions): Promise<VaultEntry[]> {
   const command = isTauri() ? 'reload_vault' : 'list_vault'
   return loadVaultEntriesWithCommand({ vaultPath, command })
 }
 
 export function reloadVaultEntries({ vaultPath, vaults, defaultWorkspacePath }: MountedVaultEntriesOptions): Promise<VaultEntry[]> {
-  if (vaults?.length) return loadMountedVaultEntries({ vaultPath, vaults, defaultWorkspacePath })
+  if (vaults?.length) return loadMountedVaultEntries({ vaultPath, vaults, defaultWorkspacePath, forceReload: true })
   return loadVaultEntriesWithCommand({ vaultPath, command: 'reload_vault' })
 }
 
@@ -103,6 +122,41 @@ export function loadVaultFolders({ vaultPath }: VaultPathOptions): Promise<Folde
   return tauriCall<FolderNode[]>({ command: 'list_vault_folders', tauriArgs: { path: vaultPath } })
 }
 
+export async function loadMountedVaultFolders(options: MountedVaultFoldersOptions): Promise<FolderNode[]> {
+  const mountedVaults = uniqueMountedVaults({ ...options, includeFallbackVault: false })
+  if (mountedVaults.length === 0) return []
+  if (mountedVaults.length === 1) {
+    const [vault] = mountedVaults
+    if (vault.path === options.vaultPath) return loadVaultFolders({ vaultPath: vault.path })
+
+    const identity = workspaceIdentityFromVault(vault, { defaultWorkspacePath: options.defaultWorkspacePath })
+    const children = await loadVaultFolders({ vaultPath: vault.path })
+      .then((folders) => attachFolderRootPath(folders ?? [], vault.path))
+      .catch(() => [] as FolderNode[])
+    return [{
+      name: identity.label,
+      path: '',
+      rootPath: vault.path,
+      children,
+    }]
+  }
+
+  const folderGroups = await Promise.all(mountedVaults.map(async (vault) => {
+    const identity = workspaceIdentityFromVault(vault, { defaultWorkspacePath: options.defaultWorkspacePath })
+    const children = await loadVaultFolders({ vaultPath: vault.path })
+      .then((folders) => attachFolderRootPath(folders ?? [], vault.path))
+      .catch(() => [] as FolderNode[])
+    return {
+      name: identity.label,
+      path: '',
+      rootPath: vault.path,
+      children,
+    }
+  }))
+
+  return folderGroups
+}
+
 export function loadVaultViews({ vaultPath }: VaultPathOptions): Promise<ViewFile[]> {
   return tauriCall<unknown>({ command: 'list_views', tauriArgs: { vaultPath } })
     .then(normalizeViewFiles)
diff --git a/src/indexBootDiagnostics.test.ts b/src/indexBootDiagnostics.test.ts
new file mode 100644
index 00000000..4cbbf206
--- /dev/null
+++ b/src/indexBootDiagnostics.test.ts
@@ -0,0 +1,41 @@
+import { readFileSync } from 'node:fs'
+import { describe, expect, it } from 'vitest'
+
+function firstInlineScriptFromIndex(): string {
+  const indexHtml = readFileSync(`${process.cwd()}/index.html`, 'utf8')
+  const match = indexHtml.match(/<script>\s*([\s\S]*?)\s*<\/script>/)
+  if (!match) throw new Error('index.html boot diagnostics script was not found')
+  return match[1]
+}
+
+describe('index boot diagnostics', () => {
+  it('does not show the boot overlay for ResizeObserver loop notifications', () => {
+    document.body.innerHTML = '<pre id="tolaria-boot-diagnostics">Tolaria boot: HTML parsed</pre>'
+    new Function(firstInlineScriptFromIndex())()
+
+    const event = new ErrorEvent('error', {
+      cancelable: true,
+      message: 'ResizeObserver loop completed with undelivered notifications.',
+    })
+    window.dispatchEvent(event)
+
+    expect(event.defaultPrevented).toBe(true)
+    expect(document.getElementById('tolaria-boot-diagnostics')?.textContent).toBe('Tolaria boot: HTML parsed')
+  })
+
+  it('still shows the boot overlay for real startup errors', () => {
+    document.body.innerHTML = '<pre id="tolaria-boot-diagnostics">Tolaria boot: HTML parsed</pre>'
+    new Function(firstInlineScriptFromIndex())()
+
+    window.dispatchEvent(new ErrorEvent('error', {
+      message: 'startup failed',
+      filename: 'app.js',
+      lineno: 1,
+      colno: 2,
+    }))
+
+    expect(document.getElementById('tolaria-boot-diagnostics')?.textContent).toContain(
+      'error: startup failed @ app.js:1:2',
+    )
+  })
+})
diff --git a/src/lib/aiAgentConversation.test.ts b/src/lib/aiAgentConversation.test.ts
index aa754443..83866690 100644
--- a/src/lib/aiAgentConversation.test.ts
+++ b/src/lib/aiAgentConversation.test.ts
@@ -124,6 +124,7 @@ describe('aiAgentConversation', () => {
       agent: 'codex',
       agentDocsPath: undefined,
       permissionMode: 'safe',
+      vaultPaths: undefined,
       vaultContext: undefined,
     })
     expect(trimHistoryMock).toHaveBeenCalledWith([
@@ -158,6 +159,7 @@ describe('aiAgentConversation', () => {
       agent: 'codex',
       agentDocsPath: '/docs',
       permissionMode: 'power_user',
+      vaultPaths: undefined,
       vaultContext: 'CONTEXT',
     })
     expect(result.systemPrompt).toBe('SYSTEM')
diff --git a/src/lib/aiAgentConversation.ts b/src/lib/aiAgentConversation.ts
index 326958ba..1278a771 100644
--- a/src/lib/aiAgentConversation.ts
+++ b/src/lib/aiAgentConversation.ts
@@ -33,6 +33,7 @@ export interface AgentExecutionContext {
   target?: AiTarget
   ready: boolean
   vaultPath: string
+  vaultPaths?: string[]
   agentDocsPath?: string
   permissionMode: AiAgentPermissionMode
   systemPromptOverride?: string
@@ -117,6 +118,7 @@ export function buildFormattedMessage(
     agent: context.agent,
     agentDocsPath: context.agentDocsPath,
     permissionMode: context.permissionMode,
+    vaultPaths: context.vaultPaths,
     vaultContext: context.systemPromptOverride,
   })
   const chatHistory = toChatHistory(messages.filter((message) => !message.isStreaming))
diff --git a/src/lib/aiAgentSession.ts b/src/lib/aiAgentSession.ts
index 2be00795..f375bcad 100644
--- a/src/lib/aiAgentSession.ts
+++ b/src/lib/aiAgentSession.ts
@@ -85,6 +85,7 @@ async function streamWithSelectedTarget(
     message: formattedMessage,
     systemPrompt,
     vaultPath: context.vaultPath,
+    vaultPaths: context.vaultPaths,
     permissionMode: context.permissionMode,
     callbacks,
   })
diff --git a/src/lib/locales/de-DE.json b/src/lib/locales/de-DE.json
index f4932b96..c677316c 100644
--- a/src/lib/locales/de-DE.json
+++ b/src/lib/locales/de-DE.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Von Remote abrufen",
   "command.git.resolveConflicts": "Konflikte auflösen",
   "command.git.viewChanges": "Ausstehende Änderungen anzeigen",
+  "git.repository.select": "Repository",
   "command.view.editorOnly": "Nur Editor",
   "command.view.editorNoteList": "Editor + Notizenliste",
   "command.view.fullLayout": "Vollständiges Layout",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable folgt freigegebenen Releases; Alpha folgt jedem Push auf main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vaults",
+  "settings.workspaces.enable": "Mehrere Vaults gleichzeitig verwenden",
+  "settings.workspaces.enableDescription": "Experimentell: Enthaltene Vaults in einen einzigen Graphen laden. Deaktivieren Sie diese Option, um jeweils nur einen Vault zu verwenden.",
+  "settings.workspaces.name": "Name",
+  "settings.workspaces.label": "Bezeichnung",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Vault-Name für {label}",
+  "settings.workspaces.labelAria": "Vault-Label für {label}",
+  "settings.workspaces.slugAria": "Vault-Slug für {label}",
+  "settings.workspaces.nameTooltip": "Der Anzeigename, der in Menüs, Einstellungen und Vault-Auswahlfeldern angezeigt wird.",
+  "settings.workspaces.labelTooltip": "Die kurzen Initialen, die in Notizen, Suchergebnissen, Breadcrumbs und Vault-Badges angezeigt werden.",
+  "settings.workspaces.slugTooltip": "Das stabile Präfix, das in vault-übergreifenden Links und Beziehungen verwendet wird. Derzeit schreibgeschützt, um zu vermeiden, dass bestehende Verweise beschädigt werden.",
+  "settings.workspaces.color": "Farbe",
+  "settings.workspaces.removeAria": "Vault {label} entfernen",
   "settings.appearance.title": "Darstellung",
   "settings.appearance.description": "Wählen Sie den App-Farbmodus aus, der für Tolaria Chrome, Editor-Oberflächen, Menüs und Dialoge verwendet werden soll.",
   "settings.theme.label": "Design",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Eigenschaft hinzufügen",
   "inspector.properties.deleteProperty": "Eigenschaft löschen",
   "inspector.properties.none": "Keine",
+  "inspector.properties.workspace": "Vault",
   "inspector.properties.missingType": "Fehlender Typ",
   "inspector.properties.missingTypeAria": "Typ {type} fehlt. Klicken Sie, um diesen Typ zu erstellen.",
+  "inspector.properties.searchWorkspaces": "Vaults durchsuchen …",
+  "inspector.properties.noMatchingWorkspaces": "Keine passenden Vaults",
   "inspector.properties.searchTypes": "Typen suchen …",
   "inspector.properties.noMatchingTypes": "Keine passenden Typen",
   "inspector.properties.yes": "Ja",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Lokalen Ordner öffnen",
   "status.vault.cloneGit": "Git-Repo klonen",
   "status.vault.cloneGettingStarted": "Getting-Started-Vault klonen",
-  "status.vault.manageWorkspaces": "Workspaces verwalten …",
+  "status.vault.availableHeader": "Verfügbare Vaults",
+  "status.vault.manageWorkspaces": "Vaults verwalten",
+  "status.vault.includeWorkspace": "{label} in den einheitlichen Graphen aufnehmen",
   "status.vault.notFound": "Vault nicht gefunden: {path}",
   "status.vault.reloading": "Vault wird neu geladen …",
   "status.vault.reloadingTooltip": "Vault von der Festplatte neu laden",
   "status.vault.remove": "{label} aus der Liste entfernen",
-  "workspace.manager.title": "Workspaces verwalten",
-  "workspace.manager.description": "Workspace-Identität bearbeiten und Standardziel für neue Notizen auswählen.",
+  "status.vault.removeConfirmTitle": "Vault entfernen?",
+  "status.vault.removeConfirmMessage": "Dadurch wird {label} aus der Tolaria-Vault-Liste entfernt. Dateien auf der Festplatte werden nicht gelöscht.",
+  "status.vault.removeConfirmAction": "Vault entfernen",
+  "workspace.manager.title": "Vaults verwalten",
+  "workspace.manager.description": "Bearbeiten Sie die Vault-Identität und wählen Sie den Standardzielspeicherort für neue Notizen aus.",
   "workspace.manager.default": "Standard",
   "workspace.manager.makeDefault": "Als Standard festlegen",
-  "workspace.manager.label": "Workspace-Label",
+  "workspace.manager.label": "Vault-Label",
   "workspace.manager.alias": "Stabiler Alias",
   "workspace.manager.mounted": "Im Graphen eingebunden",
   "status.remote.noneConfigured": "Kein Remote konfiguriert",
diff --git a/src/lib/locales/en.json b/src/lib/locales/en.json
index acd75f41..279b41a9 100644
--- a/src/lib/locales/en.json
+++ b/src/lib/locales/en.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Pull from Remote",
   "command.git.resolveConflicts": "Resolve Conflicts",
   "command.git.viewChanges": "View Pending Changes",
+  "git.repository.select": "Repository",
   "command.view.editorOnly": "Editor Only",
   "command.view.editorNoteList": "Editor + Note List",
   "command.view.fullLayout": "Full Layout",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable follows promoted releases; Alpha follows every push to main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vaults",
+  "settings.workspaces.enable": "Use multiple vaults at the same time",
+  "settings.workspaces.enableDescription": "Experimental: load included vaults into one graph. Leave this off to use one vault at a time.",
+  "settings.workspaces.name": "Name",
+  "settings.workspaces.label": "Label",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Vault name for {label}",
+  "settings.workspaces.labelAria": "Vault label for {label}",
+  "settings.workspaces.slugAria": "Vault slug for {label}",
+  "settings.workspaces.nameTooltip": "The display name shown in menus, settings, and vault selectors.",
+  "settings.workspaces.labelTooltip": "The short initials shown on notes, search results, breadcrumbs, and vault badges.",
+  "settings.workspaces.slugTooltip": "The stable prefix used in cross-vault links and relationships. It is read-only for now to avoid breaking existing references.",
+  "settings.workspaces.color": "Color",
+  "settings.workspaces.removeAria": "Remove vault {label}",
   "settings.appearance.title": "Appearance",
   "settings.appearance.description": "Choose the app color mode used for Tolaria chrome, editor surfaces, menus, and dialogs.",
   "settings.theme.label": "Theme",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Add property",
   "inspector.properties.deleteProperty": "Delete property",
   "inspector.properties.none": "None",
+  "inspector.properties.workspace": "Vault",
   "inspector.properties.missingType": "Missing type",
   "inspector.properties.missingTypeAria": "Missing type {type}. Click to create this type.",
+  "inspector.properties.searchWorkspaces": "Search vaults...",
+  "inspector.properties.noMatchingWorkspaces": "No matching vaults",
   "inspector.properties.searchTypes": "Search types...",
   "inspector.properties.noMatchingTypes": "No matching types",
   "inspector.properties.yes": "Yes",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Open local folder",
   "status.vault.cloneGit": "Clone Git repo",
   "status.vault.cloneGettingStarted": "Clone Getting Started Vault",
-  "status.vault.manageWorkspaces": "Manage Workspaces...",
+  "status.vault.availableHeader": "Available vaults",
+  "status.vault.manageWorkspaces": "Manage vaults",
+  "status.vault.includeWorkspace": "Include {label} in the unified graph",
   "status.vault.notFound": "Vault not found: {path}",
   "status.vault.reloading": "Reloading vault...",
   "status.vault.reloadingTooltip": "Reloading vault from disk",
   "status.vault.remove": "Remove {label} from list",
-  "workspace.manager.title": "Manage Workspaces",
-  "workspace.manager.description": "Edit workspace identity and choose the default destination for new notes.",
+  "status.vault.removeConfirmTitle": "Remove vault?",
+  "status.vault.removeConfirmMessage": "This removes {label} from Tolaria's vault list. Files on disk are not deleted.",
+  "status.vault.removeConfirmAction": "Remove vault",
+  "workspace.manager.title": "Manage vaults",
+  "workspace.manager.description": "Edit vault identity and choose the default destination for new notes.",
   "workspace.manager.default": "Default",
   "workspace.manager.makeDefault": "Make Default",
-  "workspace.manager.label": "Workspace label",
+  "workspace.manager.label": "Vault label",
   "workspace.manager.alias": "Stable alias",
   "workspace.manager.mounted": "Mounted in graph",
   "status.remote.noneConfigured": "No remote configured",
diff --git a/src/lib/locales/es-419.json b/src/lib/locales/es-419.json
index 66b77447..0ccccdc9 100644
--- a/src/lib/locales/es-419.json
+++ b/src/lib/locales/es-419.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Extraer desde el repositorio remoto",
   "command.git.resolveConflicts": "Resolver conflictos",
   "command.git.viewChanges": "Ver cambios pendientes",
+  "git.repository.select": "Repositorio",
   "command.view.editorOnly": "Solo editor",
   "command.view.editorNoteList": "Editor + Lista de notas",
   "command.view.fullLayout": "Diseño completo",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable sigue las versiones promocionadas; Alpha sigue cada push a main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vaults",
+  "settings.workspaces.enable": "Usar varios almacenes al mismo tiempo",
+  "settings.workspaces.enableDescription": "Experimental: cargar los vaults incluidos en un solo grafo. Deje esta opción desactivada para usar un solo repositorio a la vez.",
+  "settings.workspaces.name": "Nombre",
+  "settings.workspaces.label": "Etiqueta",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Nombre del almacén para {label}",
+  "settings.workspaces.labelAria": "Etiqueta de caja fuerte para {label}",
+  "settings.workspaces.slugAria": "Slug del almacén para {label}",
+  "settings.workspaces.nameTooltip": "Nombre para mostrar en menús, configuraciones y selectores de vault.",
+  "settings.workspaces.labelTooltip": "Las iniciales abreviadas que se muestran en las notas, los resultados de búsqueda, las rutas de navegación y las insignias de los almacenes.",
+  "settings.workspaces.slugTooltip": "El prefijo estable utilizado en los enlaces y las relaciones entre almacenes. Por el momento, es de solo lectura para evitar que se dañen las referencias existentes.",
+  "settings.workspaces.color": "Color",
+  "settings.workspaces.removeAria": "Eliminar el almacén {label}",
   "settings.appearance.title": "Apariencia",
   "settings.appearance.description": "Elija el modo de color de la aplicación que se utilizará para Tolaria Chrome, las superficies del editor, los menús y los cuadros de diálogo.",
   "settings.theme.label": "Tema",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Agregar propiedad",
   "inspector.properties.deleteProperty": "Eliminar propiedad",
   "inspector.properties.none": "Ninguna",
+  "inspector.properties.workspace": "Caja fuerte",
   "inspector.properties.missingType": "Falta el tipo",
   "inspector.properties.missingTypeAria": "Falta el tipo {type}. Haga clic para crear este tipo.",
+  "inspector.properties.searchWorkspaces": "Buscar vaults...",
+  "inspector.properties.noMatchingWorkspaces": "No se encontraron vaults que coincidan",
   "inspector.properties.searchTypes": "Buscar tipos...",
   "inspector.properties.noMatchingTypes": "No hay tipos que coincidan",
   "inspector.properties.yes": "Sí",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Abrir carpeta local",
   "status.vault.cloneGit": "Clonar repositorio Git",
   "status.vault.cloneGettingStarted": "Clonar el vault de introducción",
-  "status.vault.manageWorkspaces": "Administrar espacios de trabajo...",
+  "status.vault.availableHeader": "Vaults disponibles",
+  "status.vault.manageWorkspaces": "Administrar bóvedas",
+  "status.vault.includeWorkspace": "Incluir {label} en el grafo unificado",
   "status.vault.notFound": "No se encontró el almacén: {path}",
   "status.vault.reloading": "Volviendo a cargar el vault...",
   "status.vault.reloadingTooltip": "Volviendo a cargar el repositorio desde el disco",
   "status.vault.remove": "Eliminar {label} de la lista",
-  "workspace.manager.title": "Administrar espacios de trabajo",
-  "workspace.manager.description": "Edite la identidad del espacio de trabajo y elija el destino predeterminado para las notas nuevas.",
+  "status.vault.removeConfirmTitle": "¿Eliminar el repositorio?",
+  "status.vault.removeConfirmMessage": "Esto elimina {label} de la lista de vaults de Tolaria. Los archivos en el disco no se eliminan.",
+  "status.vault.removeConfirmAction": "Eliminar caja fuerte",
+  "workspace.manager.title": "Administrar bóvedas",
+  "workspace.manager.description": "Edite la identidad del almacén y elija el destino predeterminado para las notas nuevas.",
   "workspace.manager.default": "Predeterminado",
   "workspace.manager.makeDefault": "Establecer como predeterminado",
-  "workspace.manager.label": "Etiqueta del espacio de trabajo",
+  "workspace.manager.label": "Etiqueta del almacén",
   "workspace.manager.alias": "Alias estable",
   "workspace.manager.mounted": "Montado en el grafo",
   "status.remote.noneConfigured": "No se ha configurado ningún repositorio remoto",
diff --git a/src/lib/locales/es-ES.json b/src/lib/locales/es-ES.json
index a4020b9e..6d89bdac 100644
--- a/src/lib/locales/es-ES.json
+++ b/src/lib/locales/es-ES.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Extraer del repositorio remoto",
   "command.git.resolveConflicts": "Resolver conflictos",
   "command.git.viewChanges": "Ver cambios pendientes",
+  "git.repository.select": "Repositorio",
   "command.view.editorOnly": "Solo editor",
   "command.view.editorNoteList": "Editor + Lista de notas",
   "command.view.fullLayout": "Diseño completo",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable sigue las versiones promocionadas; Alpha sigue cada push a main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vaults",
+  "settings.workspaces.enable": "Usar varios almacenes al mismo tiempo",
+  "settings.workspaces.enableDescription": "Experimental: cargar los almacenes incluidos en un único grafo. Déjelo desactivado para usar un solo almacén cada vez.",
+  "settings.workspaces.name": "Nombre",
+  "settings.workspaces.label": "Etiqueta",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Nombre del almacén para {label}",
+  "settings.workspaces.labelAria": "Etiqueta de almacén para {label}",
+  "settings.workspaces.slugAria": "Slug del almacén para {label}",
+  "settings.workspaces.nameTooltip": "Nombre para mostrar en menús, ajustes y selectores de caja fuerte.",
+  "settings.workspaces.labelTooltip": "Las iniciales abreviadas que se muestran en las notas, los resultados de búsqueda, las rutas de navegación y las insignias de los almacenes.",
+  "settings.workspaces.slugTooltip": "El prefijo estable utilizado en los enlaces y las relaciones entre cajas fuertes. Por ahora, es de solo lectura para evitar que se rompan las referencias existentes.",
+  "settings.workspaces.color": "Color",
+  "settings.workspaces.removeAria": "Eliminar el almacén {label}",
   "settings.appearance.title": "Apariencia",
   "settings.appearance.description": "Seleccione el modo de color de la aplicación que se utilizará para Tolaria Chrome, las superficies del editor, los menús y los cuadros de diálogo.",
   "settings.theme.label": "Tema",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Añadir propiedad",
   "inspector.properties.deleteProperty": "Eliminar propiedad",
   "inspector.properties.none": "Ninguna",
+  "inspector.properties.workspace": "Caja fuerte",
   "inspector.properties.missingType": "Falta el tipo",
   "inspector.properties.missingTypeAria": "Falta el tipo {type}. Haga clic para crear este tipo.",
+  "inspector.properties.searchWorkspaces": "Buscar almacenes...",
+  "inspector.properties.noMatchingWorkspaces": "No hay ningún repositorio que coincida",
   "inspector.properties.searchTypes": "Buscar tipos…",
   "inspector.properties.noMatchingTypes": "No hay tipos que coincidan",
   "inspector.properties.yes": "Sí",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Abrir carpeta local",
   "status.vault.cloneGit": "Clonar repositorio Git",
   "status.vault.cloneGettingStarted": "Clonar el almacén «Primeros pasos»",
-  "status.vault.manageWorkspaces": "Gestionar espacios de trabajo...",
+  "status.vault.availableHeader": "Cajas fuertes disponibles",
+  "status.vault.manageWorkspaces": "Gestionar almacenes",
+  "status.vault.includeWorkspace": "Incluir {label} en el grafo unificado",
   "status.vault.notFound": "No se ha encontrado el almacén: {path}",
   "status.vault.reloading": "Volviendo a cargar el repositorio...",
   "status.vault.reloadingTooltip": "Recargando el repositorio desde el disco",
   "status.vault.remove": "Eliminar {label} de la lista",
-  "workspace.manager.title": "Gestionar espacios de trabajo",
-  "workspace.manager.description": "Editar la identidad del espacio de trabajo y elegir el destino predeterminado para las notas nuevas.",
+  "status.vault.removeConfirmTitle": "¿Eliminar el almacén?",
+  "status.vault.removeConfirmMessage": "Esta acción eliminará {label} de la lista de almacenes de Tolaria. Los archivos del disco no se eliminan.",
+  "status.vault.removeConfirmAction": "Eliminar almacén",
+  "workspace.manager.title": "Gestionar almacenes",
+  "workspace.manager.description": "Edite la identidad del almacén y elija el destino predeterminado para las notas nuevas.",
   "workspace.manager.default": "Predeterminado",
   "workspace.manager.makeDefault": "Establecer como predeterminado",
-  "workspace.manager.label": "Etiqueta del espacio de trabajo",
+  "workspace.manager.label": "Etiqueta del almacén",
   "workspace.manager.alias": "Alias estable",
   "workspace.manager.mounted": "Montado en el grafo",
   "status.remote.noneConfigured": "No hay ningún repositorio remoto configurado",
diff --git a/src/lib/locales/fr-FR.json b/src/lib/locales/fr-FR.json
index 1d4e1d1f..c6e65bb8 100644
--- a/src/lib/locales/fr-FR.json
+++ b/src/lib/locales/fr-FR.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Extraire depuis le dépôt distant",
   "command.git.resolveConflicts": "Résoudre les conflits",
   "command.git.viewChanges": "Afficher les modifications en attente",
+  "git.repository.select": "Dépôt",
   "command.view.editorOnly": "Éditeur uniquement",
   "command.view.editorNoteList": "Éditeur + liste de notes",
   "command.view.fullLayout": "Mise en page complète",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable suit les versions promues; Alpha suit chaque push vers main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Coffres",
+  "settings.workspaces.enable": "Utiliser plusieurs coffres en même temps",
+  "settings.workspaces.enableDescription": "Expérimental : charger les coffres-forts inclus dans un seul graphique. Désactivez cette option pour utiliser un seul coffre-fort à la fois.",
+  "settings.workspaces.name": "Nom",
+  "settings.workspaces.label": "Étiquette",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Nom du coffre-fort pour {label}",
+  "settings.workspaces.labelAria": "Libellé du coffre-fort pour {label}",
+  "settings.workspaces.slugAria": "Slug du coffre-fort pour {label} }",
+  "settings.workspaces.nameTooltip": "Nom d'affichage apparaissant dans les menus, les paramètres et les sélecteurs de coffre.",
+  "settings.workspaces.labelTooltip": "Initiales abrégées affichées sur les notes, les résultats de recherche, le fil d'Ariane et les badges de coffre-fort.",
+  "settings.workspaces.slugTooltip": "Préfixe stable utilisé dans les liens et les relations entre coffres-forts. Pour l'instant, il est en lecture seule afin d'éviter de casser les références existantes.",
+  "settings.workspaces.color": "Couleur",
+  "settings.workspaces.removeAria": "Supprimer le coffre {label}",
   "settings.appearance.title": "Apparence",
   "settings.appearance.description": "Choisissez le mode de couleur de l'application utilisé pour Tolaria Chrome, les surfaces de l'éditeur, les menus et les boîtes de dialogue.",
   "settings.theme.label": "Thème",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Ajouter une propriété",
   "inspector.properties.deleteProperty": "Supprimer la propriété",
   "inspector.properties.none": "Aucun",
+  "inspector.properties.workspace": "Coffre-fort",
   "inspector.properties.missingType": "Type manquant",
   "inspector.properties.missingTypeAria": "Type {type} manquant. Cliquez pour créer ce type.",
+  "inspector.properties.searchWorkspaces": "Rechercher des coffres…",
+  "inspector.properties.noMatchingWorkspaces": "Aucun coffre-fort correspondant",
   "inspector.properties.searchTypes": "Rechercher des types…",
   "inspector.properties.noMatchingTypes": "Aucun type correspondant",
   "inspector.properties.yes": "Oui",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Ouvrir le dossier local",
   "status.vault.cloneGit": "Cloner le dépôt Git",
   "status.vault.cloneGettingStarted": "Cloner le coffre-fort « Premiers pas »",
-  "status.vault.manageWorkspaces": "Gérer les espaces de travail…",
+  "status.vault.availableHeader": "Coffres-forts disponibles",
+  "status.vault.manageWorkspaces": "Gérer les coffres",
+  "status.vault.includeWorkspace": "Inclure {label} dans le graphe unifié",
   "status.vault.notFound": "Coffre-fort introuvable : {path}",
   "status.vault.reloading": "Rechargement du coffre-fort…",
   "status.vault.reloadingTooltip": "Rechargement du coffre à partir du disque",
   "status.vault.remove": "Supprimer {label} de la liste",
-  "workspace.manager.title": "Gérer les espaces de travail",
-  "workspace.manager.description": "Modifier l'identité de l'espace de travail et choisir la destination par défaut pour les nouvelles notes.",
+  "status.vault.removeConfirmTitle": "Supprimer le coffre ?",
+  "status.vault.removeConfirmMessage": "Cette action supprime {label} de la liste des coffres de Tolaria. Les fichiers présents sur le disque ne sont pas supprimés.",
+  "status.vault.removeConfirmAction": "Supprimer le coffre",
+  "workspace.manager.title": "Gérer les coffres",
+  "workspace.manager.description": "Modifier l'identité du coffre et choisir la destination par défaut pour les nouvelles notes.",
   "workspace.manager.default": "Par défaut",
   "workspace.manager.makeDefault": "Définir par défaut",
-  "workspace.manager.label": "Étiquette de l'espace de travail",
+  "workspace.manager.label": "Étiquette du coffre",
   "workspace.manager.alias": "Alias stable",
   "workspace.manager.mounted": "Monté dans le graphe",
   "status.remote.noneConfigured": "Aucun serveur distant configuré",
diff --git a/src/lib/locales/it-IT.json b/src/lib/locales/it-IT.json
index f382c0dd..8a2a6c6e 100644
--- a/src/lib/locales/it-IT.json
+++ b/src/lib/locales/it-IT.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Esegui il pull dal repository remoto",
   "command.git.resolveConflicts": "Risolvi conflitti",
   "command.git.viewChanges": "Visualizza modifiche in sospeso",
+  "git.repository.select": "Repository",
   "command.view.editorOnly": "Solo editor",
   "command.view.editorNoteList": "Editor + Elenco note",
   "command.view.fullLayout": "Layout completo",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable segue le release promosse; Alpha segue ogni push su main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vault",
+  "settings.workspaces.enable": "Usa più vault contemporaneamente",
+  "settings.workspaces.enableDescription": "Sperimentale: carica i vault inclusi in un unico grafo. Lascia disattivata questa opzione per utilizzare un solo vault alla volta.",
+  "settings.workspaces.name": "Nome",
+  "settings.workspaces.label": "Etichetta",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Nome del vault per {label}",
+  "settings.workspaces.labelAria": "Etichetta del vault per {label}",
+  "settings.workspaces.slugAria": "Slug del vault per {label}",
+  "settings.workspaces.nameTooltip": "Nome visualizzato nei menu, nelle impostazioni e nei selettori di vault.",
+  "settings.workspaces.labelTooltip": "Le iniziali brevi visualizzate su note, risultati di ricerca, breadcrumb e badge dei vault.",
+  "settings.workspaces.slugTooltip": "Prefisso stabile utilizzato nei link e nelle relazioni tra vault. Per il momento è di sola lettura per evitare di compromettere i riferimenti esistenti.",
+  "settings.workspaces.color": "Colore",
+  "settings.workspaces.removeAria": "Rimuovi vault {label}",
   "settings.appearance.title": "Aspetto",
   "settings.appearance.description": "Scegli la modalità colore dell'app da utilizzare per Tolaria Chrome, le interfacce dell'editor, i menu e le finestre di dialogo.",
   "settings.theme.label": "Tema",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Aggiungi proprietà",
   "inspector.properties.deleteProperty": "Elimina proprietà",
   "inspector.properties.none": "Nessuna",
+  "inspector.properties.workspace": "Vault",
   "inspector.properties.missingType": "Tipo mancante",
   "inspector.properties.missingTypeAria": "Tipo {type} mancante. Fai clic per creare questo tipo.",
+  "inspector.properties.searchWorkspaces": "Cerca vault...",
+  "inspector.properties.noMatchingWorkspaces": "Nessun vault corrispondente",
   "inspector.properties.searchTypes": "Cerca tipi...",
   "inspector.properties.noMatchingTypes": "Nessun tipo corrispondente",
   "inspector.properties.yes": "Sì",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Apri cartella locale",
   "status.vault.cloneGit": "Clona repository Git",
   "status.vault.cloneGettingStarted": "Clona il vault Getting Started",
-  "status.vault.manageWorkspaces": "Gestisci gli spazi di lavoro...",
+  "status.vault.availableHeader": "Vault disponibili",
+  "status.vault.manageWorkspaces": "Gestisci vault",
+  "status.vault.includeWorkspace": "Includi {label} nel grafo unificato",
   "status.vault.notFound": "Vault non trovato: {path}",
   "status.vault.reloading": "Ricaricamento del vault in corso...",
   "status.vault.reloadingTooltip": "Ricaricamento del vault dal disco in corso...",
   "status.vault.remove": "Rimuovi {label} dall'elenco",
-  "workspace.manager.title": "Gestisci gli spazi di lavoro",
-  "workspace.manager.description": "Modifica l'identità dell'area di lavoro e scegli la destinazione predefinita per le nuove note.",
+  "status.vault.removeConfirmTitle": "Rimuovere il vault?",
+  "status.vault.removeConfirmMessage": "Questa operazione rimuove {label} dall'elenco dei vault di Tolaria. I file presenti sul disco non vengono eliminati.",
+  "status.vault.removeConfirmAction": "Rimuovi vault",
+  "workspace.manager.title": "Gestisci i vault",
+  "workspace.manager.description": "Modifica l'identità del vault e scegli la destinazione predefinita per le nuove note.",
   "workspace.manager.default": "Predefinito",
   "workspace.manager.makeDefault": "Imposta come predefinito",
-  "workspace.manager.label": "Etichetta dell'area di lavoro",
+  "workspace.manager.label": "Etichetta del vault",
   "workspace.manager.alias": "Alias stabile",
   "workspace.manager.mounted": "Montato nel grafo",
   "status.remote.noneConfigured": "Nessun remoto configurato",
diff --git a/src/lib/locales/ja-JP.json b/src/lib/locales/ja-JP.json
index 5184692a..c5ea7d15 100644
--- a/src/lib/locales/ja-JP.json
+++ b/src/lib/locales/ja-JP.json
@@ -59,6 +59,7 @@
   "command.git.pull": "リモートからプル",
   "command.git.resolveConflicts": "競合を解決",
   "command.git.viewChanges": "保留中の変更を表示",
+  "git.repository.select": "リポジトリ",
   "command.view.editorOnly": "エディターのみ",
   "command.view.editorNoteList": "エディター + メモリスト",
   "command.view.fullLayout": "フルレイアウト",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable は昇格済みリリースを追跡し、Alpha は main へのすべての push を追跡します。",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vaults",
+  "settings.workspaces.enable": "複数のVaultを同時に使用する",
+  "settings.workspaces.enableDescription": "実験的機能：含まれる複数のVaultを1つのグラフに読み込む。一度に1つのボルトのみを使用する場合は、この設定をオフのままにしてください。",
+  "settings.workspaces.name": "名前",
+  "settings.workspaces.label": "ラベル",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "{label} の Vault 名",
+  "settings.workspaces.labelAria": "{label} の Vault ラベル",
+  "settings.workspaces.slugAria": "{label} の Vault スラッグ",
+  "settings.workspaces.nameTooltip": "メニュー、設定、およびボールトセレクターに表示される表示名。",
+  "settings.workspaces.labelTooltip": "ノート、検索結果、ブレッドクラム、およびボルトバッジに表示される短いイニシャル。",
+  "settings.workspaces.slugTooltip": "クロスボルトリンクと関係性で使用される安定したプレフィックス。既存の参照が破損するのを防ぐため、現時点では読み取り専用です。",
+  "settings.workspaces.color": "色",
+  "settings.workspaces.removeAria": "ボールト {label} を削除",
   "settings.appearance.title": "外観",
   "settings.appearance.description": "Tolaria chrome、エディターのサーフェス、メニュー、およびダイアログに使用するアプリのカラーモードを選択します。",
   "settings.theme.label": "テーマ",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "プロパティを追加",
   "inspector.properties.deleteProperty": "プロパティを削除",
   "inspector.properties.none": "なし",
+  "inspector.properties.workspace": "Vault",
   "inspector.properties.missingType": "タイプがありません",
   "inspector.properties.missingTypeAria": "タイプ {type} がありません。クリックしてこのタイプを作成してください。",
+  "inspector.properties.searchWorkspaces": "Vaultを検索...",
+  "inspector.properties.noMatchingWorkspaces": "一致するボールトはありません",
   "inspector.properties.searchTypes": "タイプを検索...",
   "inspector.properties.noMatchingTypes": "一致するタイプはありません",
   "inspector.properties.yes": "はい",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "ローカルフォルダーを開く",
   "status.vault.cloneGit": "Gitリポジトリをクローンする",
   "status.vault.cloneGettingStarted": "Getting Started Vault をクローンする",
-  "status.vault.manageWorkspaces": "ワークスペースを管理...",
+  "status.vault.availableHeader": "利用可能なVault",
+  "status.vault.manageWorkspaces": "Vaultの管理",
+  "status.vault.includeWorkspace": "{label}を統合グラフに含める",
   "status.vault.notFound": "ボールトが見つかりません：{path}",
   "status.vault.reloading": "Vault を再読み込み中...",
   "status.vault.reloadingTooltip": "ディスクから Vault を再読み込み中",
   "status.vault.remove": "{label}をリストから削除",
-  "workspace.manager.title": "ワークスペースの管理",
-  "workspace.manager.description": "ワークスペースのIDを編集し、新しいノートの既定の保存先を選択します。",
+  "status.vault.removeConfirmTitle": "ボールトを削除しますか？",
+  "status.vault.removeConfirmMessage": "これにより、{label}がTolariaのボルトリストから削除されます。ディスク上のファイルは削除されません。",
+  "status.vault.removeConfirmAction": "Vaultを削除",
+  "workspace.manager.title": "Vaultの管理",
+  "workspace.manager.description": "ボルトのIDを編集し、新しいノートの既定の保存先を選択します。",
   "workspace.manager.default": "デフォルト",
   "workspace.manager.makeDefault": "デフォルトに設定",
-  "workspace.manager.label": "Workspace label",
+  "workspace.manager.label": "Vaultラベル",
   "workspace.manager.alias": "Stable alias",
   "workspace.manager.mounted": "グラフにマウント済み",
   "status.remote.noneConfigured": "リモートが設定されていません",
diff --git a/src/lib/locales/ko-KR.json b/src/lib/locales/ko-KR.json
index 709b82d2..15dd4716 100644
--- a/src/lib/locales/ko-KR.json
+++ b/src/lib/locales/ko-KR.json
@@ -59,6 +59,7 @@
   "command.git.pull": "원격에서 가져오기",
   "command.git.resolveConflicts": "충돌 해결",
   "command.git.viewChanges": "보류 중인 변경 사항 보기",
+  "git.repository.select": "저장소",
   "command.view.editorOnly": "편집기만",
   "command.view.editorNoteList": "편집기 + 노트 목록",
   "command.view.fullLayout": "전체 레이아웃",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable은 승격된 릴리스를 따르고, Alpha는 main으로의 모든 푸시를 따릅니다.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vaults",
+  "settings.workspaces.enable": "여러 개의 보관소를 동시에 사용",
+  "settings.workspaces.enableDescription": "실험적 기능: 포함된 보관소를 하나의 그래프로 로드합니다. 한 번에 하나의 보관만 사용하려면 이 옵션을 비활성화하세요.",
+  "settings.workspaces.name": "이름",
+  "settings.workspaces.label": "레이블",
+  "settings.workspaces.slug": "슬러그",
+  "settings.workspaces.nameAria": "{label}에 대한 Vault 이름",
+  "settings.workspaces.labelAria": "{label}에 대한 Vault 레이블",
+  "settings.workspaces.slugAria": "{label}의 보관함 슬러그",
+  "settings.workspaces.nameTooltip": "메뉴, 설정 및 보관함 선택 도구에 표시되는 표시 이름.",
+  "settings.workspaces.labelTooltip": "노트, 검색 결과, 브레드크럼, 및 보관함 배지에 표시되는 짧은 이니셜.",
+  "settings.workspaces.slugTooltip": "Vault 간 링크 및 관계에 사용되는 안정적인 접두사. 기존 참조가 손상되는 것을 방지하기 위해 현재는 읽기 전용입니다.",
+  "settings.workspaces.color": "색상",
+  "settings.workspaces.removeAria": "보관함 {label} 제거",
   "settings.appearance.title": "외관",
   "settings.appearance.description": "Tolaria chrome, 편집기 표면, 메뉴, 대화 상자에 사용되는 앱 색상 모드를 선택하세요.",
   "settings.theme.label": "테마",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "속성 추가",
   "inspector.properties.deleteProperty": "속성 삭제",
   "inspector.properties.none": "없음",
+  "inspector.properties.workspace": "Vault",
   "inspector.properties.missingType": "유형 누락",
   "inspector.properties.missingTypeAria": "{type} 유형이 없습니다. 클릭하여 이 유형을 생성하세요.",
+  "inspector.properties.searchWorkspaces": "Vault 검색...",
+  "inspector.properties.noMatchingWorkspaces": "일치하는 Vault 없음",
   "inspector.properties.searchTypes": "유형 검색...",
   "inspector.properties.noMatchingTypes": "일치하는 유형 없음",
   "inspector.properties.yes": "예",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "로컬 폴더 열기",
   "status.vault.cloneGit": "Git 리포지토리 복제",
   "status.vault.cloneGettingStarted": "Getting Started Vault 복제",
-  "status.vault.manageWorkspaces": "작업 공간 관리...",
+  "status.vault.availableHeader": "사용 가능한 Vault",
+  "status.vault.manageWorkspaces": "Vault 관리",
+  "status.vault.includeWorkspace": "통합 그래프에 {label} 포함",
   "status.vault.notFound": "Vault를 찾을 수 없음: {path}",
   "status.vault.reloading": "Vault 다시 로드 중...",
   "status.vault.reloadingTooltip": "디스크에서 Vault 다시 로드 중",
   "status.vault.remove": "목록에서 {label} 제거",
-  "workspace.manager.title": "작업 공간 관리",
-  "workspace.manager.description": "워크스페이스 ID를 편집하고 새 노트의 기본 저장 위치를 선택하세요.",
+  "status.vault.removeConfirmTitle": "보관함을 제거하시겠습니까?",
+  "status.vault.removeConfirmMessage": "이렇게 하면 Tolaria의 보관함 목록에서 {label}이(가) 제거됩니다. 디스크에 있는 파일은 삭제되지 않습니다.",
+  "status.vault.removeConfirmAction": "Vault 제거",
+  "workspace.manager.title": "Vault 관리",
+  "workspace.manager.description": "보관함 ID를 편집하고 새 노트의 기본 저장 위치를 선택하세요.",
   "workspace.manager.default": "기본값",
   "workspace.manager.makeDefault": "기본으로 설정",
-  "workspace.manager.label": "Workspace label",
+  "workspace.manager.label": "보관함 라벨",
   "workspace.manager.alias": "Stable alias",
   "workspace.manager.mounted": "그래프에 마운트됨",
   "status.remote.noneConfigured": "구성된 원격 없음",
diff --git a/src/lib/locales/pl-PL.json b/src/lib/locales/pl-PL.json
index a3582d74..4949ace9 100644
--- a/src/lib/locales/pl-PL.json
+++ b/src/lib/locales/pl-PL.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Pobierz ze zdalnego repozytorium",
   "command.git.resolveConflicts": "Rozwiąż konflikty",
   "command.git.viewChanges": "Pokaż oczekujące zmiany",
+  "git.repository.select": "Repozytorium",
   "command.view.editorOnly": "Tylko edytor",
   "command.view.editorNoteList": "Edytor + lista notatek",
   "command.view.fullLayout": "Pełny układ",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable śledzi promowane wydania; Alpha śledzi każde wypchnięcie do main.",
   "settings.releaseStable": "Stabilny",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Magazyny",
+  "settings.workspaces.enable": "Korzystaj z wielu skarbców jednocześnie",
+  "settings.workspaces.enableDescription": "Eksperymentalne: załaduj zawarte skarbce do jednego grafu. Pozostaw tę opcję wyłączoną, aby korzystać z jednego skarbca naraz.",
+  "settings.workspaces.name": "Nazwa",
+  "settings.workspaces.label": "Etykieta",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Nazwa skarbca dla {label}",
+  "settings.workspaces.labelAria": "Etykieta skarbca dla {label}",
+  "settings.workspaces.slugAria": "Slug skarbca dla {label}",
+  "settings.workspaces.nameTooltip": "Nazwa wyświetlana w menu, ustawieniach i selektorach skarbców.",
+  "settings.workspaces.labelTooltip": "Skrócone inicjały wyświetlane w notatkach, wynikach wyszukiwania, ścieżkach nawigacyjnych i znacznikach magazynów.",
+  "settings.workspaces.slugTooltip": "Stały prefiks używany w linkach i relacjach między magazynami. Obecnie jest on dostępny tylko do odczytu, aby uniknąć uszkodzenia istniejących odwołań.",
+  "settings.workspaces.color": "Kolor",
+  "settings.workspaces.removeAria": "Usuń skarbiec {label}",
   "settings.appearance.title": "Wygląd",
   "settings.appearance.description": "Wybierz tryb kolorów używany w interfejsie Tolaria, edytorze, menu i oknach dialogowych.",
   "settings.theme.label": "Motyw",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Dodaj właściwość",
   "inspector.properties.deleteProperty": "Usuń właściwość",
   "inspector.properties.none": "Brak",
+  "inspector.properties.workspace": "Magazyn",
   "inspector.properties.missingType": "Brakujący typ",
   "inspector.properties.missingTypeAria": "Brakujący typ {type}. Kliknij, aby utworzyć ten typ.",
+  "inspector.properties.searchWorkspaces": "Szukaj skarbców…",
+  "inspector.properties.noMatchingWorkspaces": "Brak pasujących skarbców",
   "inspector.properties.searchTypes": "Szukaj typów...",
   "inspector.properties.noMatchingTypes": "Brak pasujących typów",
   "inspector.properties.yes": "Tak",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Otwórz lokalny folder",
   "status.vault.cloneGit": "Klonuj repozytorium Git",
   "status.vault.cloneGettingStarted": "Klonuj sejf Wprowadzenie",
-  "status.vault.manageWorkspaces": "Zarządzaj obszarami roboczymi...",
+  "status.vault.availableHeader": "Dostępne skarbce",
+  "status.vault.manageWorkspaces": "Zarządzaj skarbcami",
+  "status.vault.includeWorkspace": "Uwzględnij {label} w ujednoliconym grafie",
   "status.vault.notFound": "Sejf nie znaleziony: {path}",
   "status.vault.reloading": "Przeładowywanie sejfu...",
   "status.vault.reloadingTooltip": "Przeładowywanie sejfu z dysku",
   "status.vault.remove": "Usuń {label} z listy",
-  "workspace.manager.title": "Zarządzaj obszarami roboczymi",
-  "workspace.manager.description": "Edytuj tożsamość obszaru roboczego i wybierz domyślne miejsce docelowe dla nowych notatek.",
+  "status.vault.removeConfirmTitle": "Usunąć skarbiec?",
+  "status.vault.removeConfirmMessage": "Spowoduje to usunięcie {label} z listy skarbców Tolarii. Pliki na dysku nie zostaną usunięte.",
+  "status.vault.removeConfirmAction": "Usuń skarbiec",
+  "workspace.manager.title": "Zarządzaj skarbcami",
+  "workspace.manager.description": "Edytuj tożsamość magazynu i wybierz domyślne miejsce docelowe dla nowych notatek.",
   "workspace.manager.default": "Domyślne",
   "workspace.manager.makeDefault": "Ustaw jako domyślny",
-  "workspace.manager.label": "Etykieta obszaru roboczego",
+  "workspace.manager.label": "Etykieta skarbca",
   "workspace.manager.alias": "Stabilny alias",
   "workspace.manager.mounted": "Zamontowane w grafu",
   "status.remote.noneConfigured": "Brak skonfigurowanego repozytorium zdalnego",
diff --git a/src/lib/locales/pt-BR.json b/src/lib/locales/pt-BR.json
index 004d7627..3beccb77 100644
--- a/src/lib/locales/pt-BR.json
+++ b/src/lib/locales/pt-BR.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Fazer pull do repositório remoto",
   "command.git.resolveConflicts": "Resolver conflitos",
   "command.git.viewChanges": "Exibir alterações pendentes",
+  "git.repository.select": "Repositório",
   "command.view.editorOnly": "Somente editor",
   "command.view.editorNoteList": "Editor + Lista de notas",
   "command.view.fullLayout": "Layout completo",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable acompanha versões promovidas; Alpha acompanha cada push para main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vaults",
+  "settings.workspaces.enable": "Usar vários cofres ao mesmo tempo",
+  "settings.workspaces.enableDescription": "Experimental: carregar os cofres incluídos em um único grafo. Desative esta opção para usar um vault de cada vez.",
+  "settings.workspaces.name": "Nome",
+  "settings.workspaces.label": "Rótulo",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Nome do cofre para {label}",
+  "settings.workspaces.labelAria": "Rótulo do cofre para {label}",
+  "settings.workspaces.slugAria": "Slug do cofre para {label}",
+  "settings.workspaces.nameTooltip": "Nome de exibição mostrado em menus, configurações e seletores de cofre.",
+  "settings.workspaces.labelTooltip": "As iniciais abreviadas exibidas em notas, resultados de busca, breadcrumbs e badges de cofre.",
+  "settings.workspaces.slugTooltip": "O prefixo estável usado em links e relacionamentos entre cofres. Por enquanto, ele é somente leitura para evitar que referências existentes sejam corrompidas.",
+  "settings.workspaces.color": "Cor",
+  "settings.workspaces.removeAria": "Remover cofre {label}",
   "settings.appearance.title": "Aparência",
   "settings.appearance.description": "Escolha o modo de cores do aplicativo usado para o Tolaria Chrome, as superfícies do editor, os menus e as caixas de diálogo.",
   "settings.theme.label": "Tema",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Adicionar propriedade",
   "inspector.properties.deleteProperty": "Excluir propriedade",
   "inspector.properties.none": "Nenhum",
+  "inspector.properties.workspace": "Cofre",
   "inspector.properties.missingType": "Tipo ausente",
   "inspector.properties.missingTypeAria": "Tipo {type} ausente. Clique para criar este tipo.",
+  "inspector.properties.searchWorkspaces": "Buscar cofres...",
+  "inspector.properties.noMatchingWorkspaces": "Nenhum vault correspondente",
   "inspector.properties.searchTypes": "Buscar tipos...",
   "inspector.properties.noMatchingTypes": "Nenhum tipo correspondente",
   "inspector.properties.yes": "Sim",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Abrir pasta local",
   "status.vault.cloneGit": "Clonar repositório Git",
   "status.vault.cloneGettingStarted": "Clonar cofre de introdução",
-  "status.vault.manageWorkspaces": "Gerenciar espaços de trabalho...",
+  "status.vault.availableHeader": "Vaults disponíveis",
+  "status.vault.manageWorkspaces": "Gerenciar cofres",
+  "status.vault.includeWorkspace": "Incluir {label} no grafo unificado",
   "status.vault.notFound": "Cofre não encontrado: {path}",
   "status.vault.reloading": "Recarregando o cofre...",
   "status.vault.reloadingTooltip": "Recarregando o vault a partir do disco",
   "status.vault.remove": "Remover {label} da lista",
-  "workspace.manager.title": "Gerenciar espaços de trabalho",
-  "workspace.manager.description": "Edite a identidade do espaço de trabalho e escolha o destino padrão para novas anotações.",
+  "status.vault.removeConfirmTitle": "Remover cofre?",
+  "status.vault.removeConfirmMessage": "Isso remove {label} da lista de cofres do Tolaria. Os arquivos no disco não são excluídos.",
+  "status.vault.removeConfirmAction": "Remover cofre",
+  "workspace.manager.title": "Gerenciar cofres",
+  "workspace.manager.description": "Edite a identidade do cofre e escolha o destino padrão para novas anotações.",
   "workspace.manager.default": "Padrão",
   "workspace.manager.makeDefault": "Definir como padrão",
-  "workspace.manager.label": "Rótulo do espaço de trabalho",
+  "workspace.manager.label": "Rótulo do cofre",
   "workspace.manager.alias": "Alias estável",
   "workspace.manager.mounted": "Montado no grafo",
   "status.remote.noneConfigured": "Nenhum repositório remoto configurado",
diff --git a/src/lib/locales/pt-PT.json b/src/lib/locales/pt-PT.json
index 516b5ad5..786b2e68 100644
--- a/src/lib/locales/pt-PT.json
+++ b/src/lib/locales/pt-PT.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Efetuar pull do repositório remoto",
   "command.git.resolveConflicts": "Resolver conflitos",
   "command.git.viewChanges": "Ver alterações pendentes",
+  "git.repository.select": "Repositório",
   "command.view.editorOnly": "Apenas editor",
   "command.view.editorNoteList": "Editor + Lista de notas",
   "command.view.fullLayout": "Disposição completa",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable segue lançamentos promovidos; Alpha segue cada push para main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Cofres",
+  "settings.workspaces.enable": "Utilizar vários cofres ao mesmo tempo",
+  "settings.workspaces.enableDescription": "Experimental: carregar os cofres incluídos num único grafo. Deixe esta opção desativada para usar um cofre de cada vez.",
+  "settings.workspaces.name": "Nome",
+  "settings.workspaces.label": "Etiqueta",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Nome do cofre para {label}",
+  "settings.workspaces.labelAria": "Etiqueta do cofre para {label}",
+  "settings.workspaces.slugAria": "Slug do cofre para {label}",
+  "settings.workspaces.nameTooltip": "O nome de apresentação mostrado nos menus, nas definições e nos seletores de cofre.",
+  "settings.workspaces.labelTooltip": "As iniciais abreviadas apresentadas em notas, resultados de pesquisa, breadcrumbs e emblemas de cofre.",
+  "settings.workspaces.slugTooltip": "O prefixo estável utilizado em ligações e relações entre cofres. Por agora, é apenas de leitura para evitar danificar as referências existentes.",
+  "settings.workspaces.color": "Cor",
+  "settings.workspaces.removeAria": "Remover cofre {label}",
   "settings.appearance.title": "Aparência",
   "settings.appearance.description": "Escolha o modo de cor da aplicação utilizado para o Tolaria Chrome, as superfícies do editor, os menus e as caixas de diálogo.",
   "settings.theme.label": "Tema",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Adicionar propriedade",
   "inspector.properties.deleteProperty": "Eliminar propriedade",
   "inspector.properties.none": "Nenhuma",
+  "inspector.properties.workspace": "Cofre",
   "inspector.properties.missingType": "Tipo em falta",
   "inspector.properties.missingTypeAria": "Tipo {type} em falta. Clique para criar este tipo.",
+  "inspector.properties.searchWorkspaces": "Pesquisar cofres...",
+  "inspector.properties.noMatchingWorkspaces": "Nenhum cofre correspondente",
   "inspector.properties.searchTypes": "Pesquisar tipos...",
   "inspector.properties.noMatchingTypes": "Sem tipos correspondentes",
   "inspector.properties.yes": "Sim",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Abrir pasta local",
   "status.vault.cloneGit": "Clonar repositório Git",
   "status.vault.cloneGettingStarted": "Clonar cofre Getting Started",
-  "status.vault.manageWorkspaces": "Gerir espaços de trabalho...",
+  "status.vault.availableHeader": "Cofres disponíveis",
+  "status.vault.manageWorkspaces": "Gerir cofres",
+  "status.vault.includeWorkspace": "Incluir {label} no grafo unificado",
   "status.vault.notFound": "Cofre não encontrado: {path}",
   "status.vault.reloading": "A recarregar o cofre...",
   "status.vault.reloadingTooltip": "A recarregar o cofre a partir do disco",
   "status.vault.remove": "Remover {label} da lista",
-  "workspace.manager.title": "Gerir espaços de trabalho",
-  "workspace.manager.description": "Editar a identidade do espaço de trabalho e escolher o destino predefinido para novas notas.",
+  "status.vault.removeConfirmTitle": "Remover cofre?",
+  "status.vault.removeConfirmMessage": "Isto remove {label} da lista de cofres da Tolaria. Os ficheiros no disco não são eliminados.",
+  "status.vault.removeConfirmAction": "Remover cofre",
+  "workspace.manager.title": "Gerir cofres",
+  "workspace.manager.description": "Edite a identidade do cofre e escolha o destino predefinido para as novas notas.",
   "workspace.manager.default": "Predefinido",
   "workspace.manager.makeDefault": "Definir como predefinido",
-  "workspace.manager.label": "Etiqueta do espaço de trabalho",
+  "workspace.manager.label": "Etiqueta do cofre",
   "workspace.manager.alias": "Alias estável",
   "workspace.manager.mounted": "Montado no grafo",
   "status.remote.noneConfigured": "Nenhum repositório remoto configurado",
diff --git a/src/lib/locales/ru-RU.json b/src/lib/locales/ru-RU.json
index bc207e2b..51609dc8 100644
--- a/src/lib/locales/ru-RU.json
+++ b/src/lib/locales/ru-RU.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Pull from Remote",
   "command.git.resolveConflicts": "Разрешить конфликты",
   "command.git.viewChanges": "Просмотреть ожидающие изменения",
+  "git.repository.select": "Репозиторий",
   "command.view.editorOnly": "Только редактор",
   "command.view.editorNoteList": "Редактор + список заметок",
   "command.view.fullLayout": "Полный макет",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable отслеживает продвигаемые релизы; Alpha отслеживает каждый push в main.",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Хранилища",
+  "settings.workspaces.enable": "Использовать несколько хранилищ одновременно",
+  "settings.workspaces.enableDescription": "Экспериментальная функция: загрузка включенных хранилищ в один граф. Отключите эту опцию, чтобы использовать только один хранилище за раз.",
+  "settings.workspaces.name": "Имя",
+  "settings.workspaces.label": "Метка",
+  "settings.workspaces.slug": "Слаг",
+  "settings.workspaces.nameAria": "Название хранилища для {label}",
+  "settings.workspaces.labelAria": "Метка хранилища для {label}",
+  "settings.workspaces.slugAria": "Слаг хранилища для {label}",
+  "settings.workspaces.nameTooltip": "Отображаемое имя, которое показывается в меню, настройках и селекторах хранилищ.",
+  "settings.workspaces.labelTooltip": "Краткие инициалы, отображаемые в заметках, результатах поиска, навигационных цепочках и значках хранилищ.",
+  "settings.workspaces.slugTooltip": "Стабильный префикс, используемый в ссылках и связях между хранилищами. Пока что он доступен только для чтения, чтобы не нарушить существующие ссылки.",
+  "settings.workspaces.color": "Цвет",
+  "settings.workspaces.removeAria": "Удалить хранилище {label}",
   "settings.appearance.title": "Внешний вид",
   "settings.appearance.description": "Выберите цветовой режим приложения, который будет использоваться для Tolaria Chrome, интерфейса редактора, меню и диалоговых окон.",
   "settings.theme.label": "Тема",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Добавить свойство",
   "inspector.properties.deleteProperty": "Удалить свойство",
   "inspector.properties.none": "Нет",
+  "inspector.properties.workspace": "Хранилище",
   "inspector.properties.missingType": "Отсутствует тип",
   "inspector.properties.missingTypeAria": "Отсутствует тип {type}. Нажмите, чтобы создать этот тип.",
+  "inspector.properties.searchWorkspaces": "Поиск хранилищ...",
+  "inspector.properties.noMatchingWorkspaces": "Нет подходящих хранилищ",
   "inspector.properties.searchTypes": "Поиск типов...",
   "inspector.properties.noMatchingTypes": "Нет подходящих типов",
   "inspector.properties.yes": "Да",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Открыть локальную папку",
   "status.vault.cloneGit": "Клонировать Git-репозиторий",
   "status.vault.cloneGettingStarted": "Клонировать хранилище «Начало работы»",
-  "status.vault.manageWorkspaces": "Управление рабочими пространствами...",
+  "status.vault.availableHeader": "Доступные хранилища",
+  "status.vault.manageWorkspaces": "Управление хранилищами",
+  "status.vault.includeWorkspace": "Включить {label} в объединенный граф",
   "status.vault.notFound": "Хранилище не найдено: {path}",
   "status.vault.reloading": "Перезагрузка хранилища...",
   "status.vault.reloadingTooltip": "Перезагрузка хранилища с диска",
   "status.vault.remove": "Удалить {label} из списка",
-  "workspace.manager.title": "Управление рабочими пространствами",
-  "workspace.manager.description": "Отредактируйте идентификатор рабочего пространства и выберите место по умолчанию для сохранения новых заметок.",
+  "status.vault.removeConfirmTitle": "Удалить хранилище?",
+  "status.vault.removeConfirmMessage": "Это приведет к удалению {label} из списка хранилищ Tolaria. Файлы на диске не удаляются.",
+  "status.vault.removeConfirmAction": "Удалить хранилище",
+  "workspace.manager.title": "Управление хранилищами",
+  "workspace.manager.description": "Отредактируйте идентификатор хранилища и выберите место по умолчанию для новых заметок.",
   "workspace.manager.default": "По умолчанию",
   "workspace.manager.makeDefault": "Сделать по умолчанию",
-  "workspace.manager.label": "Метка рабочего пространства",
+  "workspace.manager.label": "Метка хранилища",
   "workspace.manager.alias": "Стабильный псевдоним",
   "workspace.manager.mounted": "Добавлено в граф",
   "status.remote.noneConfigured": "Ни один удаленный репозиторий не настроен",
diff --git a/src/lib/locales/vi.json b/src/lib/locales/vi.json
index 6318f730..55ecf1b2 100644
--- a/src/lib/locales/vi.json
+++ b/src/lib/locales/vi.json
@@ -59,6 +59,7 @@
   "command.git.pull": "Kéo từ remote",
   "command.git.resolveConflicts": "Giải quyết xung đột",
   "command.git.viewChanges": "Xem các thay đổi đang chờ",
+  "git.repository.select": "Kho lưu trữ",
   "command.view.editorOnly": "Chỉ trình soạn thảo",
   "command.view.editorNoteList": "Trình soạn thảo + danh sách ghi chú",
   "command.view.fullLayout": "Bố cục đầy đủ",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable theo các bản phát hành đã được duyệt; Alpha theo mọi lần đẩy lên main.",
   "settings.releaseStable": "Ổn định",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "Vault",
+  "settings.workspaces.enable": "Sử dụng nhiều vault cùng một lúc",
+  "settings.workspaces.enableDescription": "Thử nghiệm: tải các vault được bao gồm vào một biểu đồ duy nhất. Bỏ chọn tùy chọn này để sử dụng một vault mỗi lần.",
+  "settings.workspaces.name": "Tên",
+  "settings.workspaces.label": "Nhãn",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "Tên vault cho {label}",
+  "settings.workspaces.labelAria": "Nhãn vault cho {label}",
+  "settings.workspaces.slugAria": "Slug vault cho {label}",
+  "settings.workspaces.nameTooltip": "Tên hiển thị được hiển thị trong menu, cài đặt và bộ chọn vault.",
+  "settings.workspaces.labelTooltip": "Tên viết tắt ngắn hiển thị trên ghi chú, kết quả tìm kiếm, đường dẫn điều hướng và huy hiệu kho lưu trữ.",
+  "settings.workspaces.slugTooltip": "Tiền tố ổn định được sử dụng trong các liên kết và mối quan hệ giữa các vault. Hiện tại, tiền tố này ở chế độ chỉ đọc để tránh làm hỏng các tham chiếu hiện có.",
+  "settings.workspaces.color": "Màu",
+  "settings.workspaces.removeAria": "Xóa kho {label}",
   "settings.appearance.title": "Giao diện",
   "settings.appearance.description": "Chọn chế độ màu của ứng dụng dùng cho phần khung Tolaria, vùng soạn thảo, menu và hộp thoại.",
   "settings.theme.label": "Chủ đề",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "Thêm thuộc tính",
   "inspector.properties.deleteProperty": "Xóa thuộc tính",
   "inspector.properties.none": "Không có",
+  "inspector.properties.workspace": "Kho lưu trữ",
   "inspector.properties.missingType": "Thiếu loại",
   "inspector.properties.missingTypeAria": "Thiếu loại {type}. Nhấn để tạo loại này.",
+  "inspector.properties.searchWorkspaces": "Tìm kiếm kho lưu trữ...",
+  "inspector.properties.noMatchingWorkspaces": "Không có kho lưu trữ phù hợp",
   "inspector.properties.searchTypes": "Tìm loại...",
   "inspector.properties.noMatchingTypes": "Không có loại nào khớp",
   "inspector.properties.yes": "Có",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "Mở thư mục cục bộ",
   "status.vault.cloneGit": "Nhân bản kho Git",
   "status.vault.cloneGettingStarted": "Nhân bản kho Getting Started",
-  "status.vault.manageWorkspaces": "Quản lý không gian làm việc...",
+  "status.vault.availableHeader": "Các vault có sẵn",
+  "status.vault.manageWorkspaces": "Quản lý kho",
+  "status.vault.includeWorkspace": "Đưa {label} vào biểu đồ hợp nhất",
   "status.vault.notFound": "Không tìm thấy kho: {path}",
   "status.vault.reloading": "Đang tải lại kho...",
   "status.vault.reloadingTooltip": "Đang tải lại kho từ đĩa",
   "status.vault.remove": "Xóa {label} khỏi danh sách",
-  "workspace.manager.title": "Quản lý không gian làm việc",
-  "workspace.manager.description": "Chỉnh sửa thông tin nhận dạng của không gian làm việc và chọn vị trí mặc định cho các ghi chú mới.",
+  "status.vault.removeConfirmTitle": "Xóa khóa?",
+  "status.vault.removeConfirmMessage": "Thao tác này sẽ xóa {label} khỏi danh sách vault của Tolaria. Các tệp trên ổ đĩa sẽ không bị xóa.",
+  "status.vault.removeConfirmAction": "Xóa kho lưu trữ",
+  "workspace.manager.title": "Quản lý kho",
+  "workspace.manager.description": "Chỉnh sửa thông tin nhận dạng của kho và chọn vị trí mặc định cho các ghi chú mới.",
   "workspace.manager.default": "Mặc định",
   "workspace.manager.makeDefault": "Đặt làm mặc định",
-  "workspace.manager.label": "Nhãn không gian làm việc",
+  "workspace.manager.label": "Nhãn kho lưu trữ",
   "workspace.manager.alias": "Bí danh ổn định",
   "workspace.manager.mounted": "Được gắn trong đồ thị",
   "status.remote.noneConfigured": "Chưa cấu hình remote",
diff --git a/src/lib/locales/zh-CN.json b/src/lib/locales/zh-CN.json
index c70ea06c..45bb8bbc 100644
--- a/src/lib/locales/zh-CN.json
+++ b/src/lib/locales/zh-CN.json
@@ -59,6 +59,7 @@
   "command.git.pull": "从远程拉取",
   "command.git.resolveConflicts": "解决冲突",
   "command.git.viewChanges": "查看待处理更改",
+  "git.repository.select": "仓库",
   "command.view.editorOnly": "仅编辑器",
   "command.view.editorNoteList": "编辑器 + 笔记列表",
   "command.view.fullLayout": "完整布局",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable 跟随推广版本；Alpha 跟随 main 的每次推送。",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "保管库",
+  "settings.workspaces.enable": "同时使用多个 Vault",
+  "settings.workspaces.enableDescription": "实验性功能：将包含的 Vault 加载到一个图中。关闭此选项，即可一次使用一个 Vault。",
+  "settings.workspaces.name": "名称",
+  "settings.workspaces.label": "标签",
+  "settings.workspaces.slug": "别名",
+  "settings.workspaces.nameAria": "{label} 的 Vault 名称",
+  "settings.workspaces.labelAria": "{label} 的保管库标签",
+  "settings.workspaces.slugAria": "{label} 的 Vault 别名（slug）",
+  "settings.workspaces.nameTooltip": "在菜单、设置和 Vault 选择器中显示的显示名称。",
+  "settings.workspaces.labelTooltip": "显示在笔记、搜索结果、面包屑导航和 Vault 标签上的简短首字母缩写。",
+  "settings.workspaces.slugTooltip": "用于跨保管库链接和关系中的稳定前缀。为了避免破坏现有引用，该字段目前为只读。",
+  "settings.workspaces.color": "颜色",
+  "settings.workspaces.removeAria": "删除保管库 {label}",
   "settings.appearance.title": "外观",
   "settings.appearance.description": "选择 Tolaria 界面、编辑器、菜单和对话框使用的颜色模式。",
   "settings.theme.label": "主题",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "添加属性",
   "inspector.properties.deleteProperty": "删除属性",
   "inspector.properties.none": "无",
+  "inspector.properties.workspace": "保管库",
   "inspector.properties.missingType": "缺少类型",
   "inspector.properties.missingTypeAria": "缺少类型 {type}。点击创建这个类型。",
+  "inspector.properties.searchWorkspaces": "搜索 Vault……",
+  "inspector.properties.noMatchingWorkspaces": "没有匹配的 Vault",
   "inspector.properties.searchTypes": "搜索类型...",
   "inspector.properties.noMatchingTypes": "没有匹配的类型",
   "inspector.properties.yes": "是",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "打开本地文件夹",
   "status.vault.cloneGit": "克隆 Git 仓库",
   "status.vault.cloneGettingStarted": "克隆入门仓库",
-  "status.vault.manageWorkspaces": "管理工作空间...",
+  "status.vault.availableHeader": "可用的 Vault",
+  "status.vault.manageWorkspaces": "管理保管库",
+  "status.vault.includeWorkspace": "将 {label} 包含在统一图谱中",
   "status.vault.notFound": "未找到仓库：{path}",
   "status.vault.reloading": "正在重新加载 Vault...",
   "status.vault.reloadingTooltip": "正在从磁盘重新加载 Vault",
   "status.vault.remove": "从列表移除 {label}",
-  "workspace.manager.title": "管理工作空间",
-  "workspace.manager.description": "编辑工作空间标识并选择新笔记的默认目标位置。",
+  "status.vault.removeConfirmTitle": "要删除保管库吗？",
+  "status.vault.removeConfirmMessage": "此操作会将{label}从 Tolaria 的 Vault 列表中删除。磁盘上的文件不会被删除。",
+  "status.vault.removeConfirmAction": "移除保管库",
+  "workspace.manager.title": "管理保管库",
+  "workspace.manager.description": "编辑保管库标识并选择新笔记的默认目标位置。",
   "workspace.manager.default": "默认",
   "workspace.manager.makeDefault": "设为默认",
-  "workspace.manager.label": "工作空间标签",
+  "workspace.manager.label": "保管库标签",
   "workspace.manager.alias": "稳定别名",
   "workspace.manager.mounted": "已挂载到图中",
   "status.remote.noneConfigured": "未配置远程仓库",
diff --git a/src/lib/locales/zh-TW.json b/src/lib/locales/zh-TW.json
index 686008b1..83b040bc 100644
--- a/src/lib/locales/zh-TW.json
+++ b/src/lib/locales/zh-TW.json
@@ -59,6 +59,7 @@
   "command.git.pull": "從遠端拉取",
   "command.git.resolveConflicts": "解決衝突",
   "command.git.viewChanges": "檢視待處理更改",
+  "git.repository.select": "儲存庫",
   "command.view.editorOnly": "僅編輯器",
   "command.view.editorNoteList": "編輯器 + 筆記列表",
   "command.view.fullLayout": "完整佈局",
@@ -108,6 +109,20 @@
   "settings.releaseChannelDescription": "Stable 跟隨推廣版本；Alpha 跟隨 main 的每次推送。",
   "settings.releaseStable": "Stable",
   "settings.releaseAlpha": "Alpha",
+  "settings.workspaces.title": "保管庫",
+  "settings.workspaces.enable": "同時使用多個 Vault",
+  "settings.workspaces.enableDescription": "實驗性功能：將包含的 Vault 載入至同一個圖形中。關閉此功能，即可一次使用一個 Vault。",
+  "settings.workspaces.name": "名稱",
+  "settings.workspaces.label": "標籤",
+  "settings.workspaces.slug": "Slug",
+  "settings.workspaces.nameAria": "{label} 的 Vault 名稱",
+  "settings.workspaces.labelAria": "{label} 的密碼庫標籤",
+  "settings.workspaces.slugAria": "{label} 的 Vault 別名 (slug)",
+  "settings.workspaces.nameTooltip": "在選單、設定和 Vault 選擇器中顯示的顯示名稱。",
+  "settings.workspaces.labelTooltip": "顯示在筆記、搜尋結果、頁面路徑和 Vault 徽章上的縮寫首字母。",
+  "settings.workspaces.slugTooltip": "用於跨 Vault 連結和關係的穩定前置詞。為了避免破壞現有參考，目前為唯讀狀態。",
+  "settings.workspaces.color": "顏色",
+  "settings.workspaces.removeAria": "移除 Vault {label}",
   "settings.appearance.title": "外觀",
   "settings.appearance.description": "選擇 Tolaria 介面、編輯器、選單和對話方塊使用的顏色模式。",
   "settings.theme.label": "主題",
@@ -478,8 +493,11 @@
   "inspector.properties.addProperty": "新增屬性",
   "inspector.properties.deleteProperty": "刪除屬性",
   "inspector.properties.none": "無",
+  "inspector.properties.workspace": "保管庫",
   "inspector.properties.missingType": "缺少型別",
   "inspector.properties.missingTypeAria": "缺少型別 {type}。點選建立這個型別。",
+  "inspector.properties.searchWorkspaces": "搜尋 Vault…",
+  "inspector.properties.noMatchingWorkspaces": "沒有符合條件的 Vault",
   "inspector.properties.searchTypes": "搜尋型別...",
   "inspector.properties.noMatchingTypes": "沒有匹配的型別",
   "inspector.properties.yes": "是",
@@ -521,16 +539,21 @@
   "status.vault.openLocal": "開啟本地資料夾",
   "status.vault.cloneGit": "克隆 Git 倉庫",
   "status.vault.cloneGettingStarted": "克隆入門倉庫",
-  "status.vault.manageWorkspaces": "管理工作空間…",
+  "status.vault.availableHeader": "可用的 Vault",
+  "status.vault.manageWorkspaces": "管理 Vault",
+  "status.vault.includeWorkspace": "將 {label} 包含在統一圖形中",
   "status.vault.notFound": "未找到倉庫：{path}",
   "status.vault.reloading": "正在重新載入 Vault……",
   "status.vault.reloadingTooltip": "正在從磁碟重新載入 Vault",
   "status.vault.remove": "從列表移除 {label}",
-  "workspace.manager.title": "管理工作空間",
-  "workspace.manager.description": "編輯工作空間身分，並選擇新筆記的預設儲存位置。",
+  "status.vault.removeConfirmTitle": "要移除密室嗎？",
+  "status.vault.removeConfirmMessage": "此操作會將 {label} 從 Tolaria 的密室清單中移除。磁碟上的檔案不會被刪除。",
+  "status.vault.removeConfirmAction": "移除 Vault",
+  "workspace.manager.title": "管理密碼庫",
+  "workspace.manager.description": "編輯密碼庫身分，並選擇新筆記的預設儲存位置。",
   "workspace.manager.default": "預設",
   "workspace.manager.makeDefault": "設為預設",
-  "workspace.manager.label": "工作空間標籤",
+  "workspace.manager.label": "保管庫標籤",
   "workspace.manager.alias": "穩定別名",
   "workspace.manager.mounted": "已掛載至圖形中",
   "status.remote.noneConfigured": "未配置遠端倉庫",
diff --git a/src/main.test.ts b/src/main.test.ts
index 17095dfb..6151fe80 100644
--- a/src/main.test.ts
+++ b/src/main.test.ts
@@ -136,6 +136,19 @@ describe('main entrypoint', () => {
     expect(mocks.sentryHandler).toHaveBeenCalledWith(error, { componentStack: '' })
   })
 
+  it('ignores ResizeObserver loop notifications instead of showing the fatal overlay', async () => {
+    await importEntrypoint()
+
+    const error = new Error('ResizeObserver loop completed with undelivered notifications.')
+    window.__tolariaFrontendReady = true
+
+    rootOptions().onRecoverableError?.(error, {})
+    rootOptions().onCaughtError?.(error, { componentStack: '\n    in App' })
+
+    expect(mocks.sentryHandler).not.toHaveBeenCalled()
+    expect(document.getElementById('tolaria-fatal-render-error')).toBeNull()
+  })
+
   it('suppresses recovered BlockNote missing-id render errors from Sentry', async () => {
     await importEntrypoint()
 
diff --git a/src/main.tsx b/src/main.tsx
index 99b2b283..8c2f25d4 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -122,11 +122,52 @@ window.__laputaTest = {
 
 const sentryReactErrorHandler = Sentry.reactErrorHandler()
 
+function isResizeObserverLoopError(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : String(error)
+  return message.includes('ResizeObserver loop completed with undelivered notifications')
+    || message.includes('ResizeObserver loop limit exceeded')
+}
+
+function showFatalRenderError(
+  error: unknown,
+  errorInfo: { componentStack?: string },
+): void {
+  const existing = document.getElementById('tolaria-fatal-render-error')
+  const overlay = existing ?? document.createElement('pre')
+  overlay.id = 'tolaria-fatal-render-error'
+  overlay.style.cssText = [
+    'position:fixed',
+    'inset:24px',
+    'z-index:2147483647',
+    'overflow:auto',
+    'margin:0',
+    'padding:16px',
+    'border-radius:8px',
+    'background:#1f1f1f',
+    'color:#fff',
+    'font:12px/1.45 ui-monospace,SFMono-Regular,Menlo,monospace',
+    'white-space:pre-wrap',
+  ].join(';')
+
+  const message = error instanceof Error ? error.stack ?? error.message : String(error)
+  overlay.textContent = [
+    'Tolaria render error',
+    '',
+    message,
+    '',
+    errorInfo.componentStack ?? '',
+  ].join('\n')
+  document.body.appendChild(overlay)
+}
+
 function captureReactRootError(
   error: unknown,
   errorInfo: { componentStack?: string },
 ): void {
+  if (isResizeObserverLoopError(error)) return
+
   const componentStack = errorInfo.componentStack ?? ''
+  showFatalRenderError(error, { componentStack })
   sentryReactErrorHandler(error, { componentStack })
   reloadFrontendOnceIfStartupFailed()
 }
@@ -136,6 +177,7 @@ function captureRecoverableReactRootError(
   errorInfo: { componentStack?: string },
 ): void {
   const componentStack = errorInfo.componentStack ?? ''
+  if (isResizeObserverLoopError(error)) return
   if (isRecoveredBlockNoteRenderError(error, componentStack)) return
 
   captureReactRootError(error, { componentStack })
diff --git a/src/mock-tauri/mock-handlers.ts b/src/mock-tauri/mock-handlers.ts
index b1acc840..c014d07a 100644
--- a/src/mock-tauri/mock-handlers.ts
+++ b/src/mock-tauri/mock-handlers.ts
@@ -352,6 +352,43 @@ function handleMoveNoteToFolder(args: {
   return { new_path: newPath, updated_files: updatedFiles, failed_updates: 0 }
 }
 
+function handleMoveNoteToWorkspace(args: {
+  source_vault_path: string
+  destination_vault_path: string
+  old_path: string
+  replacement_target?: string | null
+}) {
+  const oldEntry = MOCK_ENTRIES.find(e => e.path === args.old_path)
+  const oldContent = readMockContent({ path: args.old_path })
+  const oldTitle = oldEntry?.title ?? ''
+  const oldFilename = args.old_path.split('/').pop() ?? ''
+  const sourceRoot = args.source_vault_path.replace(/\/+$/, '')
+  const destinationRoot = args.destination_vault_path.replace(/\/+$/, '')
+  const relativePath = args.old_path.startsWith(`${sourceRoot}/`)
+    ? args.old_path.slice(sourceRoot.length + 1)
+    : oldFilename
+  const newPath = `${destinationRoot}/${relativePath}`
+
+  if (newPath === args.old_path) {
+    return { new_path: args.old_path, updated_files: 0, failed_updates: 0 }
+  }
+  if (Object.prototype.hasOwnProperty.call(MOCK_CONTENT, newPath)) {
+    throw new Error('A note with that name already exists')
+  }
+
+  deleteMockContent({ path: args.old_path })
+  writeMockContent({ path: newPath, content: oldContent })
+
+  const oldPathStem = relativePathStem({ path: args.old_path, vaultPath: args.source_vault_path })
+  const newPathStem = args.replacement_target
+    ?? relativePathStem({ path: newPath, vaultPath: args.destination_vault_path })
+  const oldTargets = canonicalRenameTargets({ oldTitle, oldPathStem })
+  const updatedFiles = updateMockRenameReferences({ newPath, newPathStem, oldTargets })
+
+  syncWindowContent()
+  return { new_path: newPath, updated_files: updatedFiles, failed_updates: 0 }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- mock handler map accepts heterogeneous arg types
 export const mockHandlers: Record<string, (args: any) => any> = {
   list_vault: () => MOCK_ENTRIES,
@@ -482,6 +519,7 @@ export const mockHandlers: Record<string, (args: any) => any> = {
   rename_note: handleRenameNote,
   rename_note_filename: handleRenameNoteFilename,
   move_note_to_folder: handleMoveNoteToFolder,
+  move_note_to_workspace: handleMoveNoteToWorkspace,
   clone_repo: (args: { url: string; localPath?: string; local_path?: string }) => {
     const localPath = args.localPath ?? args.local_path ?? ''
     setMockRemoteState(localPath, true)
diff --git a/src/types.ts b/src/types.ts
index 9e735edd..5a6884f6 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -93,6 +93,7 @@ export interface LastCommitInfo {
 export interface ModifiedFile {
   path: string
   relativePath: string
+  vaultPath?: string
   status: 'modified' | 'added' | 'deleted' | 'untracked' | 'renamed'
   addedLines?: number | null
   deletedLines?: number | null
@@ -123,6 +124,7 @@ export interface Settings {
   all_notes_show_pdfs?: boolean | null
   all_notes_show_images?: boolean | null
   all_notes_show_unsupported?: boolean | null
+  multi_workspace_enabled?: boolean | null
 }
 
 export interface GitPullResult {
@@ -261,5 +263,6 @@ export interface ViewFile {
 export interface FolderNode {
   name: string
   path: string
+  rootPath?: string
   children: FolderNode[]
 }
diff --git a/src/utils/ai-agent.ts b/src/utils/ai-agent.ts
index 3616f9bc..501e5f78 100644
--- a/src/utils/ai-agent.ts
+++ b/src/utils/ai-agent.ts
@@ -16,6 +16,7 @@ interface AgentSystemPromptOptions {
   agentDocsPath?: string
   permissionMode?: AiAgentPermissionMode
   agent?: AiAgentId
+  vaultPaths?: string[]
 }
 
 function normalizePromptOptions(
@@ -51,10 +52,23 @@ ${agentDocsPath}
 Start with ${agentDocsPath}/index.md, then use ripgrep over that folder for specific concepts. Prefer bundled docs over guesses for Tolaria behavior.`
 }
 
+function vaultScopeInstructions(vaultPaths?: string[]): string {
+  const roots = (vaultPaths ?? []).map((path) => path.trim()).filter(Boolean)
+  if (roots.length <= 1) {
+    return `You can edit markdown files in the active vault. Keep file operations scoped to that vault unless the user explicitly gives another path.`
+  }
+
+  return [
+    `Multiple Tolaria vaults are active. You can read and edit markdown files in these vault roots:`,
+    roots.map((path) => `- ${path}`).join('\n'),
+    `When using Tolaria MCP tools, pass the target vault path when a relative note path could be ambiguous.`,
+  ].join('\n')
+}
+
 const AGENT_SYSTEM_PREAMBLE = `You are working inside Tolaria, a local-first Markdown knowledge base.
 
 Notes are Markdown files with YAML frontmatter. Organization is primarily expressed through H1 titles, types, properties, wikilinks, and relationships, not folder structure.
-You can edit markdown files in the active vault. Prefer file edit tools for note changes.
+Prefer file edit tools for note changes.
 Use the provided MCP tools for: full-text search (search_notes), vault orientation (get_vault_context), parsed note reading (get_note), and opening notes in the UI (open_note).
 
 When you create or edit a note, call open_note(path) so the user sees it in Tolaria.
@@ -62,9 +76,10 @@ When you mention or reference a note by name, always use [[Note Title]] wikilink
 Be concise and helpful. When you've completed a task, briefly summarize what you did.`
 
 export function buildAgentSystemPrompt(options?: string | AgentSystemPromptOptions): string {
-  const { vaultContext, agentDocsPath, permissionMode, agent } = normalizePromptOptions(options)
+  const { vaultContext, agentDocsPath, permissionMode, agent, vaultPaths } = normalizePromptOptions(options)
   const prompt = [
     AGENT_SYSTEM_PREAMBLE,
+    vaultScopeInstructions(vaultPaths),
     agentDocsInstructions(agentDocsPath),
     permissionModeInstructions(permissionMode, agent),
   ].join('\n\n')
diff --git a/src/utils/gitRepositories.test.ts b/src/utils/gitRepositories.test.ts
new file mode 100644
index 00000000..7879d668
--- /dev/null
+++ b/src/utils/gitRepositories.test.ts
@@ -0,0 +1,74 @@
+import { describe, expect, it } from 'vitest'
+import type { VaultOption } from '../components/status-bar/types'
+import { activeGitRepositories, validGitRepositoryPath } from './gitRepositories'
+
+const vaults: VaultOption[] = [
+  { label: 'Default', path: '/default', available: true, mounted: true },
+  { label: 'Research', path: '/research', available: true, mounted: true },
+  { label: 'Archive', path: '/archive', available: true, mounted: false },
+  { label: 'Missing', path: '/missing', available: false, mounted: true },
+]
+
+describe('activeGitRepositories', () => {
+  it('keeps Git single-repository until multiple workspaces are enabled', () => {
+    expect(activeGitRepositories({
+      defaultVaultPath: '/default',
+      multiWorkspaceEnabled: false,
+      vaults,
+    }).map((repository) => repository.path)).toEqual(['/default'])
+  })
+
+  it('returns default plus mounted available workspaces when enabled', () => {
+    expect(activeGitRepositories({
+      defaultVaultPath: '/default',
+      multiWorkspaceEnabled: true,
+      vaults,
+    }).map((repository) => repository.path)).toEqual(['/default', '/research'])
+  })
+
+  it('includes mounted managed defaults in the repository picker', () => {
+    expect(activeGitRepositories({
+      defaultVaultPath: '/research',
+      multiWorkspaceEnabled: true,
+      vaults: [
+        { ...vaults[0], managedDefault: true },
+        vaults[1],
+      ],
+    }).map((repository) => repository.path)).toEqual(['/research', '/default'])
+  })
+
+  it('keeps the default repository even if its stored mounted flag is false', () => {
+    expect(activeGitRepositories({
+      defaultVaultPath: '/archive',
+      multiWorkspaceEnabled: true,
+      vaults,
+    }).map((repository) => repository.path)).toEqual(['/archive', '/default', '/research'])
+  })
+
+  it('falls back to the path name when native omits a repository label', () => {
+    expect(activeGitRepositories({
+      defaultVaultPath: '/Users/luca/Workspace/laputa',
+      multiWorkspaceEnabled: true,
+      vaults: [{ path: '/Users/luca/Workspace/laputa', available: true, mounted: true } as VaultOption],
+    })).toEqual([{
+      path: '/Users/luca/Workspace/laputa',
+      label: 'laputa',
+      defaultForNewNotes: true,
+    }])
+  })
+})
+
+describe('validGitRepositoryPath', () => {
+  const repositories = [
+    { path: '/default', label: 'Default', defaultForNewNotes: true },
+    { path: '/research', label: 'Research', defaultForNewNotes: false },
+  ]
+
+  it('keeps a selected repository when it is still available', () => {
+    expect(validGitRepositoryPath('/research', repositories, '/default')).toBe('/research')
+  })
+
+  it('falls back to the default repository when selection disappears', () => {
+    expect(validGitRepositoryPath('/missing', repositories, '/default')).toBe('/default')
+  })
+})
diff --git a/src/utils/gitRepositories.ts b/src/utils/gitRepositories.ts
new file mode 100644
index 00000000..8d8a3fa7
--- /dev/null
+++ b/src/utils/gitRepositories.ts
@@ -0,0 +1,80 @@
+import type { VaultOption } from '../components/status-bar/types'
+import { labelFromWorkspacePath, workspaceLabelFromVault } from './workspaces'
+
+export interface GitRepositoryOption {
+  path: string
+  label: string
+  defaultForNewNotes: boolean
+}
+
+interface GitRepositoryOptionsInput {
+  defaultVaultPath: string
+  multiWorkspaceEnabled: boolean
+  vaults: VaultOption[]
+}
+
+function repositoryLabel(vault: Pick<VaultOption, 'label' | 'path'>): string {
+  return workspaceLabelFromVault(vault)
+}
+
+function includeVaultAsActiveRepository(
+  vault: Pick<VaultOption, 'available' | 'managedDefault' | 'mounted' | 'path'>,
+  defaultVaultPath: string,
+): boolean {
+  if (!vault.path.trim()) return false
+  if (vault.available === false) return false
+  if (vault.path === defaultVaultPath) return true
+  return vault.mounted !== false
+}
+
+function addRepository(
+  repositories: Map<string, GitRepositoryOption>,
+  vault: Pick<VaultOption, 'label' | 'path'>,
+  defaultVaultPath: string,
+): void {
+  if (!vault.path.trim() || repositories.has(vault.path)) return
+  repositories.set(vault.path, {
+    path: vault.path,
+    label: repositoryLabel(vault),
+    defaultForNewNotes: vault.path === defaultVaultPath,
+  })
+}
+
+export function activeGitRepositories({
+  defaultVaultPath,
+  multiWorkspaceEnabled,
+  vaults,
+}: GitRepositoryOptionsInput): GitRepositoryOption[] {
+  const repositories = new Map<string, GitRepositoryOption>()
+  const defaultVault = vaults.find((vault) => vault.path === defaultVaultPath)
+  if (defaultVaultPath.trim()) {
+    addRepository(repositories, defaultVault ?? { label: labelFromWorkspacePath(defaultVaultPath), path: defaultVaultPath }, defaultVaultPath)
+  }
+
+  if (!multiWorkspaceEnabled) return [...repositories.values()]
+
+  for (const vault of vaults) {
+    if (includeVaultAsActiveRepository(vault, defaultVaultPath)) {
+      addRepository(repositories, vault, defaultVaultPath)
+    }
+  }
+
+  return [...repositories.values()]
+}
+
+export function validGitRepositoryPath(
+  path: string | null | undefined,
+  repositories: readonly GitRepositoryOption[],
+  fallbackPath: string,
+): string {
+  if (path && repositories.some((repository) => repository.path === path)) return path
+  if (repositories.some((repository) => repository.path === fallbackPath)) return fallbackPath
+  return repositories[0]?.path ?? fallbackPath
+}
+
+export function gitRepositoryLabel(
+  path: string,
+  repositories: readonly GitRepositoryOption[],
+): string {
+  return repositories.find((repository) => repository.path === path)?.label ?? labelFromWorkspacePath(path)
+}
diff --git a/src/utils/noteListHelpers.test.ts b/src/utils/noteListHelpers.test.ts
index a665776b..a72c8dff 100644
--- a/src/utils/noteListHelpers.test.ts
+++ b/src/utils/noteListHelpers.test.ts
@@ -155,6 +155,22 @@ describe('filterEntries', () => {
     expect(result.map((entry) => entry.title)).toEqual(['Root Note', 'config.json'])
   })
 
+  it('keeps same-named folders isolated by selected workspace root', () => {
+    const entries = [
+      makeEntry({ path: '/Users/luca/Personal/projects/personal.md', title: 'Personal Project' }),
+      makeEntry({ path: '/Users/luca/Team/projects/team.md', title: 'Team Project' }),
+      makeEntry({ path: '/Users/luca/Team/archive/team.md', title: 'Team Archive' }),
+    ]
+
+    const result = filterEntries(entries, {
+      kind: 'folder',
+      path: 'projects',
+      rootPath: '/Users/luca/Team',
+    })
+
+    expect(result.map((entry) => entry.title)).toEqual(['Team Project'])
+  })
+
   it('keeps folder browsing independent from All Notes file visibility', () => {
     const entries = [
       makeEntry({ path: '/vault/assets/spec.PDF', filename: 'spec.PDF', title: 'Spec', fileKind: 'binary' }),
diff --git a/src/utils/noteListHelpers.ts b/src/utils/noteListHelpers.ts
index 692d8616..1eec8962 100644
--- a/src/utils/noteListHelpers.ts
+++ b/src/utils/noteListHelpers.ts
@@ -481,6 +481,20 @@ function isDirectRootEntry(entryPath: string, rootPath?: string): boolean {
   return relativePath.length > 0 && !relativePath.includes('/')
 }
 
+function pathRelativeToRoot(entryPath: string, rootPath?: string): string | null {
+  const normalizedRootPath = rootPath ? normalizeFolderPath(rootPath) : ''
+  if (!normalizedRootPath) return normalizeFolderPath(entryPath)
+
+  const normalizedEntryPath = normalizeFolderPath(entryPath)
+  if (!normalizedEntryPath.startsWith(`${normalizedRootPath}/`)) return null
+  return normalizedEntryPath.slice(normalizedRootPath.length + 1)
+}
+
+function isEntryInSelectedFolder(entryPath: string, folderRelPath: string, rootPath?: string): boolean {
+  const relativeEntryPath = pathRelativeToRoot(entryPath, rootPath)
+  return relativeEntryPath ? isInFolder(relativeEntryPath, folderRelPath) : false
+}
+
 function filterRootEntries(entries: VaultEntry[], rootPath: string | undefined, subFilter?: NoteListFilter): VaultEntry[] {
   const rootEntries = entries.filter((entry) => isDirectRootEntry(entry.path, rootPath))
   return subFilter ? applySubFilter(rootEntries, subFilter) : rootEntries.filter(isActive)
@@ -489,7 +503,7 @@ function filterRootEntries(entries: VaultEntry[], rootPath: string | undefined,
 function filterFolderEntries(entries: VaultEntry[], selection: Extract<SidebarSelection, { kind: 'folder' }>, subFilter?: NoteListFilter): VaultEntry[] {
   if (!selection.path) return filterRootEntries(entries, selection.rootPath, subFilter)
   // Folder view shows ALL files (text + binary), not just markdown
-  const folderEntries = entries.filter((entry) => isInFolder(entry.path, selection.path))
+  const folderEntries = entries.filter((entry) => isEntryInSelectedFolder(entry.path, selection.path, selection.rootPath))
   return subFilter ? applySubFilter(folderEntries, subFilter) : folderEntries.filter(isActive)
 }
 
diff --git a/src/utils/rawEditorUtils.test.ts b/src/utils/rawEditorUtils.test.ts
index e2527fb8..015682e5 100644
--- a/src/utils/rawEditorUtils.test.ts
+++ b/src/utils/rawEditorUtils.test.ts
@@ -1,6 +1,6 @@
-import { describe, it, expect } from 'vitest'
+import { describe, it, expect, vi } from 'vitest'
 import type { VaultEntry } from '../types'
-import { buildRawEditorBaseItems, detectYamlError, extractWikilinkQuery, getRawEditorDropdownPosition, replaceActiveWikilinkQuery } from './rawEditorUtils'
+import { buildRawEditorAutocompleteState, buildRawEditorBaseItems, detectYamlError, extractWikilinkQuery, getRawEditorDropdownPosition, replaceActiveWikilinkQuery } from './rawEditorUtils'
 
 describe('extractWikilinkQuery', () => {
   it('returns null when no [[ trigger', () => {
@@ -83,14 +83,15 @@ describe('detectYamlError', () => {
 
 describe('buildRawEditorBaseItems', () => {
   it('includes filename aliases and deduplicates entries by path', () => {
+    const entry = {
+      title: 'Project Alpha',
+      aliases: ['Alpha'],
+      filename: 'project-alpha.md',
+      isA: 'Project',
+      path: 'projects/project-alpha.md',
+    } as VaultEntry
     expect(buildRawEditorBaseItems([
-      {
-        title: 'Project Alpha',
-        aliases: ['Alpha'],
-        filename: 'project-alpha.md',
-        isA: 'Project',
-        path: 'projects/project-alpha.md',
-      },
+      entry,
       {
         title: 'Project Alpha',
         aliases: ['Ignored'],
@@ -103,6 +104,7 @@ describe('buildRawEditorBaseItems', () => {
         title: 'Project Alpha',
         aliases: ['project-alpha', 'Alpha'],
         group: 'Project',
+        entry,
         entryType: 'Project',
         entryTitle: 'Project Alpha',
         path: 'projects/project-alpha.md',
@@ -111,6 +113,70 @@ describe('buildRawEditorBaseItems', () => {
   })
 })
 
+describe('buildRawEditorAutocompleteState', () => {
+  it('uses workspace metadata for display and prefixes inserted cross-workspace links', () => {
+    const personalWorkspace = {
+      id: 'personal',
+      label: 'Personal',
+      alias: 'personal',
+      path: '/personal',
+      shortLabel: 'PE',
+      color: 'blue',
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: true,
+    }
+    const teamWorkspace = {
+      id: 'team',
+      label: 'Team',
+      alias: 'team',
+      path: '/team',
+      shortLabel: 'TE',
+      color: 'green',
+      icon: null,
+      mounted: true,
+      available: true,
+      defaultForNewNotes: false,
+    }
+    const source = {
+      path: '/personal/source.md',
+      filename: 'source.md',
+      title: 'Source',
+      aliases: [],
+      isA: null,
+      workspace: personalWorkspace,
+    } as VaultEntry
+    const target = {
+      path: '/team/projects/alpha.md',
+      filename: 'alpha.md',
+      title: 'Alpha',
+      aliases: [],
+      isA: null,
+      workspace: teamWorkspace,
+    } as VaultEntry
+    const insertTarget = vi.fn()
+    const view = {
+      state: { selection: { main: { head: 0 } } },
+      coordsAtPos: () => ({ bottom: 20, left: 30 }),
+    } as never
+
+    const result = buildRawEditorAutocompleteState({
+      view,
+      baseItems: buildRawEditorBaseItems([source, target]),
+      query: 'Alpha',
+      typeEntryMap: {},
+      onInsertTarget: insertTarget,
+      sourceEntry: source,
+      vaultPath: '/personal',
+    })
+
+    expect(result?.items[0].workspace).toBe(teamWorkspace)
+    result?.items[0].onItemClick()
+    expect(insertTarget).toHaveBeenCalledWith('team/projects/alpha')
+  })
+})
+
 describe('getRawEditorDropdownPosition', () => {
   it('renders above the cursor when there is not enough space below', () => {
     expect(getRawEditorDropdownPosition(
diff --git a/src/utils/rawEditorUtils.ts b/src/utils/rawEditorUtils.ts
index 90a62239..ea6f133d 100644
--- a/src/utils/rawEditorUtils.ts
+++ b/src/utils/rawEditorUtils.ts
@@ -1,5 +1,5 @@
 import type { EditorView } from '@codemirror/view'
-import { attachClickHandlers, enrichSuggestionItems } from './suggestionEnrichment'
+import { attachClickHandlers, enrichSuggestionItems, hasMultipleSuggestionWorkspaces } from './suggestionEnrichment'
 import { deduplicateByPath, preFilterWikilinks } from './wikilinkSuggestions'
 import type { VaultEntry } from '../types'
 import type { WikilinkSuggestionItem } from '../components/WikilinkSuggestionMenu'
@@ -8,6 +8,7 @@ export interface RawEditorBaseItem {
   title: string
   aliases: string[]
   group: string
+  entry?: VaultEntry
   entryType?: string | null
   entryTitle: string
   path: string
@@ -26,6 +27,7 @@ interface RawEditorAutocompleteParams {
   query: string
   typeEntryMap: Record<string, VaultEntry>
   onInsertTarget: (target: string) => void
+  sourceEntry?: VaultEntry
   vaultPath: string
 }
 
@@ -60,6 +62,7 @@ export function buildRawEditorBaseItems(entries: VaultEntry[]): RawEditorBaseIte
     title: entry.title,
     aliases: [...new Set([entry.filename.replace(/\.md$/, ''), ...entry.aliases])],
     group: entry.isA || 'Note',
+    entry,
     entryType: entry.isA,
     entryTitle: entry.title,
     path: entry.path,
@@ -79,14 +82,17 @@ export function buildRawEditorAutocompleteState({
   query,
   typeEntryMap,
   onInsertTarget,
+  sourceEntry,
   vaultPath,
 }: RawEditorAutocompleteParams): RawEditorAutocompleteState | null {
   const coords = getRawEditorCursorCoords(view)
   if (!coords) return null
 
   const candidates = preFilterWikilinks(baseItems, query)
-  const withHandlers = attachClickHandlers(candidates, onInsertTarget, vaultPath)
-  const items = enrichSuggestionItems(withHandlers, query, typeEntryMap)
+  const withHandlers = attachClickHandlers(candidates, onInsertTarget, vaultPath, sourceEntry)
+  const items = enrichSuggestionItems(withHandlers, query, typeEntryMap, {
+    showWorkspace: hasMultipleSuggestionWorkspaces(baseItems),
+  })
 
   return {
     caretTop: coords.top,
diff --git a/src/utils/streamAiAgent.test.ts b/src/utils/streamAiAgent.test.ts
index 0e23babc..7b99aee5 100644
--- a/src/utils/streamAiAgent.test.ts
+++ b/src/utils/streamAiAgent.test.ts
@@ -117,6 +117,7 @@ describe('streamAiAgent', () => {
         message: 'Explain this',
         system_prompt: 'SYSTEM',
         vault_path: '/vault',
+        vault_paths: null,
         permission_mode: 'power_user',
       },
     })
diff --git a/src/utils/streamAiAgent.ts b/src/utils/streamAiAgent.ts
index 4a59f2ad..cfec8e2d 100644
--- a/src/utils/streamAiAgent.ts
+++ b/src/utils/streamAiAgent.ts
@@ -28,6 +28,7 @@ export interface StreamAiAgentRequest {
   message: string
   systemPrompt?: string
   vaultPath: string
+  vaultPaths?: string[]
   permissionMode?: AiAgentPermissionMode
   callbacks: AgentStreamCallbacks
 }
@@ -77,6 +78,7 @@ export async function streamAiAgent(
     message,
     systemPrompt,
     vaultPath,
+    vaultPaths,
     permissionMode,
     callbacks,
   } = request
@@ -115,6 +117,7 @@ export async function streamAiAgent(
         message,
         system_prompt: systemPrompt || null,
         vault_path: vaultPath,
+        vault_paths: vaultPaths && vaultPaths.length > 0 ? vaultPaths : null,
         permission_mode: normalizeAiAgentPermissionMode(permissionMode),
       },
     })
diff --git a/src/utils/suggestionEnrichment.test.ts b/src/utils/suggestionEnrichment.test.ts
index 65aa6ec4..953bf8f2 100644
--- a/src/utils/suggestionEnrichment.test.ts
+++ b/src/utils/suggestionEnrichment.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from 'vitest'
-import { attachClickHandlers, enrichSuggestionItems } from './suggestionEnrichment'
+import { attachClickHandlers, enrichSuggestionItems, hasMultipleSuggestionWorkspaces } from './suggestionEnrichment'
 import type { VaultEntry } from '../types'
 
 vi.mock('@blocknote/core/extensions', () => ({
@@ -69,6 +69,30 @@ describe('attachClickHandlers', () => {
     result[0].onItemClick()
     expect(insertWikilink).toHaveBeenCalledWith('roadmap')
   })
+
+  it('prefixes targets from another workspace with that workspace alias', () => {
+    const insertWikilink = vi.fn()
+    const source = makeEntry({
+      path: '/personal/source.md',
+      filename: 'source.md',
+      title: 'Source',
+      workspace: { id: 'personal', label: 'Personal', alias: 'personal', path: '/personal', shortLabel: 'PE', color: null, icon: null, mounted: true, available: true, defaultForNewNotes: true },
+    })
+    const target = makeEntry({
+      path: '/team/projects/alpha.md',
+      filename: 'alpha.md',
+      title: 'Alpha',
+      workspace: { id: 'team', label: 'Team', alias: 'team', path: '/team', shortLabel: 'TE', color: null, icon: null, mounted: true, available: true, defaultForNewNotes: false },
+    })
+    const candidates = [
+      { title: 'Alpha', aliases: [], group: 'Note', entryTitle: 'Alpha', path: target.path, entry: target },
+    ]
+
+    const result = attachClickHandlers(candidates, insertWikilink, '/personal', source)
+
+    result[0].onItemClick()
+    expect(insertWikilink).toHaveBeenCalledWith('team/projects/alpha')
+  })
 })
 
 describe('enrichSuggestionItems', () => {
@@ -80,6 +104,32 @@ describe('enrichSuggestionItems', () => {
     return { title, aliases: [] as string[], group, entryType, entryTitle: title, path, onItemClick: vi.fn() }
   }
 
+  const personalWorkspace = {
+    id: 'personal',
+    label: 'Personal',
+    alias: 'personal',
+    path: '/personal',
+    shortLabel: 'PE',
+    color: 'blue',
+    icon: null,
+    mounted: true,
+    available: true,
+    defaultForNewNotes: true,
+  }
+
+  const teamWorkspace = {
+    id: 'team',
+    label: 'Team',
+    alias: 'team',
+    path: '/team',
+    shortLabel: 'TE',
+    color: 'green',
+    icon: null,
+    mounted: true,
+    available: true,
+    defaultForNewNotes: false,
+  }
+
   it('filters items by query', () => {
     const items = [makeItem('Alpha', 'Note', '/a.md'), makeItem('Beta', 'Note', '/b.md')]
     const result = enrichSuggestionItems(items, 'alp', {})
@@ -135,4 +185,18 @@ describe('enrichSuggestionItems', () => {
     const result = enrichSuggestionItems(items, 'Refactoring', {})
     expect(result[0].title).toBe('Refactoring')
   })
+
+  it('keeps workspace metadata visible when the filtered results contain one workspace', () => {
+    const items = [
+      { ...makeItem('Alpha', 'Note', '/team/alpha.md'), entry: makeEntry({ path: '/team/alpha.md', workspace: teamWorkspace }) },
+      { ...makeItem('Beta', 'Note', '/personal/beta.md'), entry: makeEntry({ path: '/personal/beta.md', workspace: personalWorkspace }) },
+    ]
+
+    const result = enrichSuggestionItems(items, 'Alpha', {}, {
+      showWorkspace: hasMultipleSuggestionWorkspaces(items),
+    })
+
+    expect(result).toHaveLength(1)
+    expect(result[0].workspace).toBe(teamWorkspace)
+  })
 })
diff --git a/src/utils/suggestionEnrichment.ts b/src/utils/suggestionEnrichment.ts
index f7c331d3..ddbb0528 100644
--- a/src/utils/suggestionEnrichment.ts
+++ b/src/utils/suggestionEnrichment.ts
@@ -5,7 +5,7 @@ import { deduplicateByPath, disambiguateTitles } from './wikilinkSuggestions'
 import { bestSearchRank } from './fuzzyMatch'
 import { filterSuggestionItems } from '@blocknote/core/extensions'
 import type { WikilinkSuggestionItem } from '../components/WikilinkSuggestionMenu'
-import { relativePathStem } from './wikilink'
+import { canonicalWikilinkTargetForEntry, relativePathStem } from './wikilink'
 
 const MAX_RESULTS = 20
 
@@ -16,10 +16,20 @@ interface BaseSuggestionItem {
   entryType?: string | null
   entryTitle: string
   path: string
+  entry?: VaultEntry
+}
+
+interface EnrichSuggestionOptions {
+  showWorkspace?: boolean
+}
+
+export function hasMultipleSuggestionWorkspaces(items: { entry?: VaultEntry }[]): boolean {
+  return new Set(items.map((item) => item.entry?.workspace?.alias).filter(Boolean)).size > 1
 }
 
 /** Build the canonical wikilink target: vault-relative path stem without a default alias. */
-function buildTarget(item: BaseSuggestionItem, vaultPath: string): string {
+function buildTarget(item: BaseSuggestionItem, vaultPath: string, sourceEntry?: VaultEntry): string {
+  if (item.entry) return canonicalWikilinkTargetForEntry(item.entry, vaultPath, sourceEntry)
   return relativePathStem(item.path, vaultPath)
 }
 
@@ -30,10 +40,11 @@ export function attachClickHandlers(
   candidates: BaseSuggestionItem[],
   insertWikilink: (target: string) => void,
   vaultPath: string,
+  sourceEntry?: VaultEntry,
 ) {
   return candidates.map(item => ({
     ...item,
-    onItemClick: () => insertWikilink(buildTarget(item, vaultPath)),
+    onItemClick: () => insertWikilink(buildTarget(item, vaultPath, sourceEntry)),
   }))
 }
 
@@ -42,6 +53,7 @@ export function enrichSuggestionItems(
   items: (BaseSuggestionItem & { onItemClick: () => void })[],
   query: string,
   typeEntryMap: Record<string, VaultEntry>,
+  options: EnrichSuggestionOptions = {},
 ): WikilinkSuggestionItem[] {
   const filtered = filterSuggestionItems(items, query)
   filtered.sort((a, b) =>
@@ -49,7 +61,8 @@ export function enrichSuggestionItems(
   )
   const sliced = filtered.slice(0, MAX_RESULTS)
   const final = disambiguateTitles(deduplicateByPath(sliced))
-  return final.map(({ entryType, ...rest }) => {
+  const showWorkspace = options.showWorkspace ?? hasMultipleSuggestionWorkspaces(final)
+  return final.map(({ entry, entryType, ...rest }) => {
     const noteType = entryType ?? undefined
     const te = noteType ? Reflect.get(typeEntryMap, noteType) as VaultEntry | undefined : undefined
     return {
@@ -58,6 +71,7 @@ export function enrichSuggestionItems(
       typeColor: noteType ? getTypeColor(noteType, te?.color) : undefined,
       typeLightColor: noteType ? getTypeLightColor(noteType, te?.color) : undefined,
       TypeIcon: noteType ? getTypeIcon(noteType, te?.icon) : undefined,
+      workspace: showWorkspace ? entry?.workspace ?? null : null,
     }
   })
 }
diff --git a/src/utils/tauriCsp.test.ts b/src/utils/tauriCsp.test.ts
index 38476620..3e193c0a 100644
--- a/src/utils/tauriCsp.test.ts
+++ b/src/utils/tauriCsp.test.ts
@@ -34,4 +34,16 @@ describe('Tauri Content Security Policy', () => {
 
     expect(csp['connect-src']).toContain('data:')
   })
+
+  it('uses a dev-only CSP that permits Vite React Refresh without weakening production script policy', () => {
+    const config = JSON.parse(readFileSync(`${process.cwd()}/src-tauri/tauri.conf.json`, 'utf8'))
+    const productionCsp = config.app.security.csp as Record<string, string>
+    const devCsp = config.app.security.devCsp as string
+
+    expect(productionCsp['script-src']).not.toContain("'unsafe-inline'")
+    expect(productionCsp['script-src']).not.toContain("'unsafe-eval'")
+    expect(devCsp).toContain("'unsafe-inline'")
+    expect(devCsp).toContain("'unsafe-eval'")
+    expect(devCsp).toContain('ws://localhost:5202')
+  })
 })
diff --git a/src/utils/typeColors.ts b/src/utils/typeColors.ts
index b5c3a3b8..15cb5190 100644
--- a/src/utils/typeColors.ts
+++ b/src/utils/typeColors.ts
@@ -59,6 +59,11 @@ export const ACCENT_COLORS: { key: string; label: string; css: string; cssLight:
   { key: 'gray', label: 'Gray', css: 'var(--accent-gray)', cssLight: 'var(--accent-gray-light)' },
 ]
 
+export const ACCENT_COLOR_PICKER_KEYS = ['red', 'orange', 'yellow', 'green', 'blue', 'purple', 'pink', 'gray'] as const
+export const ACCENT_COLOR_PICKER_COLORS = ACCENT_COLOR_PICKER_KEYS
+  .map((key) => ACCENT_COLORS.find((color) => color.key === key) ?? null)
+  .filter((color): color is typeof ACCENT_COLORS[number] => color !== null)
+
 const COLOR_KEY_TO_CSS: Record<string, string> = Object.fromEntries(
   ACCENT_COLORS.map((c) => [c.key, c.css]),
 )
diff --git a/src/utils/vaultListStore.ts b/src/utils/vaultListStore.ts
index 1bed2932..e08c1a24 100644
--- a/src/utils/vaultListStore.ts
+++ b/src/utils/vaultListStore.ts
@@ -7,6 +7,7 @@ export interface PersistedVaultList {
     label: string
     path: string
     alias?: string | null
+    shortLabel?: string | null
     color?: string | null
     icon?: string | null
     mounted?: boolean | null
@@ -21,6 +22,7 @@ function persistedVaultOption(v: PersistedVaultList['vaults'][number]): VaultOpt
     label: v.label,
     path: v.path,
     alias: v.alias ?? undefined,
+    ...(v.shortLabel ? { shortLabel: v.shortLabel } : {}),
     color: v.color ?? null,
     icon: v.icon ?? null,
     mounted: v.mounted !== false,
@@ -69,6 +71,7 @@ export function saveVaultList(
       label: v.label,
       path: v.path,
       alias: v.alias ?? null,
+      ...(v.shortLabel ? { shortLabel: v.shortLabel } : {}),
       color: v.color ?? null,
       icon: v.icon ?? null,
       mounted: v.mounted !== false,
diff --git a/src/utils/workspaces.test.ts b/src/utils/workspaces.test.ts
new file mode 100644
index 00000000..87daff69
--- /dev/null
+++ b/src/utils/workspaces.test.ts
@@ -0,0 +1,191 @@
+import { describe, expect, it } from 'vitest'
+import type { VaultOption } from '../components/status-bar/types'
+import type { VaultEntry } from '../types'
+import {
+  filterEntriesToVisibleWorkspaces,
+  graphWorkspaceVaults,
+  graphWorkspaceVaultsForLoading,
+  vaultPathForEntry,
+  visibleWorkspacePaths,
+  workspaceIdentityFromVault,
+  writableWorkspacePaths,
+} from './workspaces'
+
+const vaults: VaultOption[] = [
+  { label: 'Personal', path: '/personal', alias: 'personal', available: true, mounted: true },
+  { label: 'Team', path: '/team', alias: 'team', available: true, mounted: true },
+]
+
+describe('graphWorkspaceVaults', () => {
+  it('keeps the graph single-workspace until multiple workspaces are enabled', () => {
+    expect(graphWorkspaceVaults({
+      defaultVaultPath: '/personal',
+      enabled: false,
+      vaults,
+    })).toBeUndefined()
+  })
+
+  it('returns mounted workspaces when multiple workspaces are enabled', () => {
+    expect(graphWorkspaceVaults({
+      defaultVaultPath: '/personal',
+      enabled: true,
+      vaults,
+    })?.map((vault) => vault.path)).toEqual([
+      '/personal',
+      '/team',
+    ])
+  })
+
+  it('includes managed default workspaces when they are mounted', () => {
+    expect(graphWorkspaceVaults({
+      defaultVaultPath: '/team',
+      enabled: true,
+      vaults: [
+        { ...vaults[0], managedDefault: true },
+        vaults[1],
+      ],
+    })?.map((vault) => vault.path)).toEqual([
+      '/personal',
+      '/team',
+    ])
+  })
+})
+
+describe('workspaceIdentityFromVault', () => {
+  it('falls back to the path name when native omits a vault label', () => {
+    const workspace = workspaceIdentityFromVault({
+      path: '/Users/luca/Workspace/laputa',
+    } as VaultOption)
+
+    expect(workspace.label).toBe('laputa')
+    expect(workspace.alias).toBe('laputa')
+    expect(workspace.shortLabel).toBe('LA')
+  })
+
+  it('keeps the slug path-derived when the display name changes', () => {
+    const workspace = workspaceIdentityFromVault({
+      label: 'Personal Main',
+      path: '/Users/luca/Workspace/laputa',
+    } as VaultOption)
+
+    expect(workspace.label).toBe('Personal Main')
+    expect(workspace.alias).toBe('laputa')
+  })
+
+  it('uses a custom short label when one is configured', () => {
+    const workspace = workspaceIdentityFromVault({
+      label: 'Personal Notes',
+      path: '/personal',
+      shortLabel: 'pxl-extra',
+    } as VaultOption)
+
+    expect(workspace.shortLabel).toBe('PXL')
+  })
+})
+
+describe('graphWorkspaceVaultsForLoading', () => {
+  it('loads all available workspaces once multiple workspaces are enabled', () => {
+    const loadingVaults = graphWorkspaceVaultsForLoading({
+      defaultVaultPath: '/personal',
+      enabled: true,
+      vaults: [
+        vaults[0],
+        { ...vaults[1], mounted: false },
+        { label: 'Missing', path: '/missing', available: false, mounted: true },
+      ],
+    })
+
+    expect(loadingVaults?.map((vault) => [vault.path, vault.mounted])).toEqual([
+      ['/personal', true],
+      ['/team', true],
+    ])
+  })
+
+  it('loads managed default workspaces so toggles can reveal them instantly', () => {
+    const loadingVaults = graphWorkspaceVaultsForLoading({
+      defaultVaultPath: '/team',
+      enabled: true,
+      vaults: [
+        { ...vaults[0], managedDefault: true },
+        vaults[1],
+      ],
+    })
+
+    expect(loadingVaults?.map((vault) => vault.path)).toEqual(['/personal', '/team'])
+  })
+
+  it('keeps the graph single-workspace until multiple workspaces are enabled', () => {
+    expect(graphWorkspaceVaultsForLoading({
+      defaultVaultPath: '/personal',
+      enabled: false,
+      vaults,
+    })).toBeUndefined()
+  })
+})
+
+describe('visibleWorkspacePaths', () => {
+  it('keeps the active workspace visible even if its stored toggle is off', () => {
+    expect(visibleWorkspacePaths({
+      defaultVaultPath: '/personal',
+      enabled: true,
+      vaults: [
+        { ...vaults[0], mounted: false },
+        { ...vaults[1], mounted: false },
+      ],
+    })).toEqual(['/personal'])
+  })
+
+  it('returns undefined while multiple workspaces are disabled', () => {
+    expect(visibleWorkspacePaths({
+      defaultVaultPath: '/personal',
+      enabled: false,
+      vaults,
+    })).toBeUndefined()
+  })
+})
+
+describe('filterEntriesToVisibleWorkspaces', () => {
+  const entries = [
+    { path: '/personal/a.md', workspace: { path: '/personal' } },
+    { path: '/team/b.md', workspace: { path: '/team' } },
+    { path: '/legacy/c.md' },
+  ] as VaultEntry[]
+
+  it('filters workspace-backed entries to the selected visible paths', () => {
+    expect(filterEntriesToVisibleWorkspaces(entries, ['/personal']).map((entry) => entry.path)).toEqual([
+      '/personal/a.md',
+      '/legacy/c.md',
+    ])
+  })
+
+  it('returns all entries when no workspace visibility filter is active', () => {
+    expect(filterEntriesToVisibleWorkspaces(entries, undefined)).toBe(entries)
+  })
+})
+
+describe('vaultPathForEntry', () => {
+  it('uses the entry workspace before falling back to the active vault', () => {
+    expect(vaultPathForEntry({ workspace: { path: '/team' } } as VaultEntry, '/personal')).toBe('/team')
+    expect(vaultPathForEntry({ workspace: null } as VaultEntry, '/personal')).toBe('/personal')
+  })
+})
+
+describe('writableWorkspacePaths', () => {
+  it('falls back to the active path when multiple workspaces are disabled', () => {
+    expect(writableWorkspacePaths({
+      defaultVaultPath: '/personal',
+      graphVaults: undefined,
+    })).toEqual(['/personal'])
+  })
+
+  it('excludes unavailable and explicitly unmounted graph workspaces', () => {
+    expect(writableWorkspacePaths({
+      defaultVaultPath: '/personal',
+      graphVaults: [
+        vaults[0],
+        { ...vaults[1], mounted: false },
+        { label: 'Archive', path: '/archive', available: false },
+      ],
+    })).toEqual(['/personal'])
+  })
+})
diff --git a/src/utils/workspaces.ts b/src/utils/workspaces.ts
index 2abc68da..06d582d3 100644
--- a/src/utils/workspaces.ts
+++ b/src/utils/workspaces.ts
@@ -1,15 +1,40 @@
 import type { VaultEntry, WorkspaceIdentity } from '../types'
 import type { VaultOption } from '../components/status-bar/types'
+import { ACCENT_COLOR_PICKER_KEYS } from './typeColors'
 
-export const WORKSPACE_COLORS = ['blue', 'green', 'purple', 'orange', 'red', 'yellow'] as const
+export const WORKSPACE_COLORS = ACCENT_COLOR_PICKER_KEYS
 export type WorkspaceColor = typeof WORKSPACE_COLORS[number]
 
 interface WorkspaceIdentityOptions {
   defaultWorkspacePath?: string | null
 }
 
-function slugifyWorkspaceAlias(value: string): string {
-  const normalized = value
+interface WorkspaceLabelInput {
+  label: string
+}
+
+interface WorkspaceGraphOptions<T> {
+  defaultVaultPath: string
+  enabled: boolean
+  vaults: T[]
+}
+
+interface WorkspaceSetOptions<T> {
+  defaultVaultPath: string
+  vaults: T[]
+}
+
+interface WritableWorkspaceOptions<T> {
+  defaultVaultPath: string
+  graphVaults: T[] | undefined
+}
+
+function stringValue(value: unknown): string {
+  return typeof value === 'string' ? value : ''
+}
+
+function slugifyWorkspaceAlias({ label }: WorkspaceLabelInput): string {
+  const normalized = label
     .trim()
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
@@ -17,38 +42,51 @@ function slugifyWorkspaceAlias(value: string): string {
   return normalized || 'workspace'
 }
 
-export function labelFromWorkspacePath(path: string): string {
-  return path.split(/[\\/]/).filter(Boolean).pop() || 'Workspace'
+export function labelFromWorkspacePath(path: string | null | undefined): string {
+  return stringValue(path).split(/[\\/]/).filter(Boolean).pop() || 'Workspace'
 }
 
-function shortLabelFromLabel(label: string): string {
+function shortLabelFromLabel({ label }: WorkspaceLabelInput): string {
   const words = label.trim().split(/\s+/).filter(Boolean)
   if (words.length === 0) return 'W'
   if (words.length === 1) return words[0].slice(0, 2).toUpperCase()
   return words.slice(0, 2).map((word) => word[0]?.toUpperCase() ?? '').join('')
 }
 
+function workspaceShortLabelFromVault(vault: Pick<VaultOption, 'shortLabel'>, label: string): string {
+  const customShortLabel = stringValue(vault.shortLabel).trim().toUpperCase().slice(0, 3)
+  return customShortLabel || shortLabelFromLabel({ label })
+}
+
 export function workspaceAliasFromOption(vault: Pick<VaultOption, 'alias' | 'label' | 'path'>): string {
-  return slugifyWorkspaceAlias(vault.alias || vault.label || labelFromWorkspacePath(vault.path))
+  const alias = stringValue(vault.alias).trim()
+  return slugifyWorkspaceAlias({
+    label: alias || labelFromWorkspacePath(vault.path),
+  })
+}
+
+export function workspaceLabelFromVault(vault: Pick<VaultOption, 'label' | 'path'>): string {
+  return stringValue(vault.label).trim() || labelFromWorkspacePath(vault.path)
 }
 
 export function workspaceIdentityFromVault(
   vault: VaultOption,
   options: WorkspaceIdentityOptions = {},
 ): WorkspaceIdentity {
-  const label = vault.label.trim() || labelFromWorkspacePath(vault.path)
+  const path = stringValue(vault.path)
+  const label = workspaceLabelFromVault(vault)
   const alias = workspaceAliasFromOption({ ...vault, label })
   return {
     id: alias,
     label,
     alias,
-    path: vault.path,
-    shortLabel: shortLabelFromLabel(label),
+    path,
+    shortLabel: workspaceShortLabelFromVault(vault, label),
     color: vault.color ?? null,
     icon: vault.icon ?? null,
     mounted: vault.mounted !== false,
     available: vault.available !== false,
-    defaultForNewNotes: options.defaultWorkspacePath === vault.path,
+    defaultForNewNotes: options.defaultWorkspacePath === path,
   }
 }
 
@@ -60,6 +98,10 @@ export function workspacePathForEntry(entry: Pick<VaultEntry, 'workspace'>): str
   return entry.workspace?.path
 }
 
+export function vaultPathForEntry(entry: Pick<VaultEntry, 'workspace'>, fallbackVaultPath: string): string {
+  return workspacePathForEntry(entry) ?? fallbackVaultPath
+}
+
 export function workspaceLabelForEntry(entry: Pick<VaultEntry, 'workspace'>): string | null {
   return entry.workspace?.label ?? null
 }
@@ -75,12 +117,88 @@ export function mountedWorkspacePaths(vaults: VaultOption[]): string[] {
     .map((vault) => vault.path)
 }
 
-export function workspacesMountedInGraph<T extends { path: string; available?: boolean; mounted?: boolean; managedDefault?: boolean }>(
-  vaults: T[],
-  activeVaultPath: string,
-): T[] {
+function uniqueWorkspacePaths(paths: string[]): string[] {
+  return [...new Set(paths.filter((path) => path.trim().length > 0))]
+}
+
+export function workspacesMountedInGraph<T extends { path: string; available?: boolean; mounted?: boolean; managedDefault?: boolean }>({
+  defaultVaultPath,
+  vaults,
+}: WorkspaceSetOptions<T>): T[] {
   return vaults.filter((vault) => {
-    if (vault.path === activeVaultPath) return true
-    return vault.available !== false && vault.mounted !== false && vault.managedDefault !== true
+    if (vault.path === defaultVaultPath) return true
+    return vault.available !== false && vault.mounted !== false
   })
 }
+
+export function graphWorkspaceVaults<T extends { path: string; available?: boolean; mounted?: boolean; managedDefault?: boolean }>({
+  defaultVaultPath,
+  enabled,
+  vaults,
+}: WorkspaceGraphOptions<T>): T[] | undefined {
+  if (!enabled) return undefined
+  return workspacesMountedInGraph({ defaultVaultPath, vaults })
+}
+
+function shouldLoadGraphWorkspace(vault: { path: string; available?: boolean; managedDefault?: boolean }): boolean {
+  if (!vault.path.trim()) return false
+  if (vault.available === false) return false
+  return true
+}
+
+function mountedGraphWorkspace<T extends { path: string }>(vault: T): T & { mounted: true } {
+  return { ...vault, mounted: true }
+}
+
+export function graphWorkspaceVaultsForLoading<T extends { path: string; available?: boolean; mounted?: boolean; managedDefault?: boolean }>({
+  defaultVaultPath,
+  enabled,
+  vaults,
+}: WorkspaceGraphOptions<T>): Array<T & { mounted: true }> | undefined {
+  if (!enabled) return undefined
+  const byPath = new Map<string, T & { mounted: true }>()
+  for (const vault of vaults) {
+    if (shouldLoadGraphWorkspace(vault)) {
+      byPath.set(vault.path, mountedGraphWorkspace(vault))
+    }
+  }
+  if (defaultVaultPath.trim() && !byPath.has(defaultVaultPath)) {
+    byPath.set(defaultVaultPath, { path: defaultVaultPath, mounted: true } as T & { mounted: true })
+  }
+  return [...byPath.values()]
+}
+
+export function visibleWorkspacePaths({
+  defaultVaultPath,
+  enabled,
+  vaults,
+}: WorkspaceGraphOptions<VaultOption>): string[] | undefined {
+  if (!enabled) return undefined
+  return uniqueWorkspacePaths([defaultVaultPath, ...mountedWorkspacePaths(vaults)])
+}
+
+export function filterEntriesToVisibleWorkspaces(
+  entries: VaultEntry[],
+  visiblePaths: readonly string[] | undefined,
+): VaultEntry[] {
+  if (!visiblePaths) return entries
+  const visiblePathSet = new Set(visiblePaths)
+  return entries.filter((entry) => {
+    const workspacePath = workspacePathForEntry(entry)
+    return !workspacePath || visiblePathSet.has(workspacePath)
+  })
+}
+
+function isWritableWorkspace(workspace: { available?: boolean; mounted?: boolean }): boolean {
+  return workspace.available !== false && workspace.mounted !== false
+}
+
+export function writableWorkspacePaths<T extends { path: string; available?: boolean; mounted?: boolean }>({
+  defaultVaultPath,
+  graphVaults,
+}: WritableWorkspaceOptions<T>): string[] {
+  const workspaces: Array<{ path: string; available?: boolean; mounted?: boolean }> = graphVaults ?? [{ path: defaultVaultPath }]
+  return workspaces
+    .filter(isWritableWorkspace)
+    .map((workspace) => workspace.path)
+}
diff --git a/tests/smoke/mounted-workspaces-unified-graph.spec.ts b/tests/smoke/mounted-workspaces-unified-graph.spec.ts
index f994b496..492da415 100644
--- a/tests/smoke/mounted-workspaces-unified-graph.spec.ts
+++ b/tests/smoke/mounted-workspaces-unified-graph.spec.ts
@@ -136,6 +136,7 @@ async function installMountedWorkspaceMocks(page: Page): Promise<void> {
           hidden_defaults: [],
         })
         ref.save_vault_list = () => null
+        ref.get_settings = () => ({ multi_workspace_enabled: true })
         ref.get_default_vault_path = () => data.gettingStartedPath
         ref.check_vault_exists = (args?: Record<string, unknown>) =>
           args?.path === data.primaryVaultPath || args?.path === data.researchVaultPath
@@ -193,6 +194,8 @@ test('mounted workspaces share the graph across note list, quick open, and searc
 
   await page.goto('/', { waitUntil: 'domcontentloaded' })
 
+  await page.getByText('All Notes', { exact: true }).click()
+
   const noteList = page.getByTestId('note-list-container')
   await expect(noteList.getByText('Primary Signal').first()).toBeVisible()
   await expect(noteList.getByText('Research Beacon').first()).toBeVisible()
@@ -201,13 +204,17 @@ test('mounted workspaces share the graph across note list, quick open, and searc
 
   await openQuickOpen(page)
   await page.locator(QUICK_OPEN_INPUT).fill('Beacon')
-  await expect(page.getByTestId('quick-open-palette').getByText('Research Lab / Research Beacon')).toBeVisible()
+  const quickOpen = page.getByTestId('quick-open-palette')
+  await expect(quickOpen.getByText('Research Beacon')).toBeVisible()
+  await expect(quickOpen.getByTestId('note-search-workspace-badge').filter({ hasText: 'RL' })).toBeVisible()
   await page.keyboard.press('Escape')
 
   await openGlobalSearch(page)
   await page.locator(GLOBAL_SEARCH_INPUT).fill(SEARCH_NEEDLE)
-  await expect(page.getByText('Field Notes / Primary Signal')).toBeVisible({ timeout: 5_000 })
-  await expect(page.getByText('Research Lab / Research Beacon')).toBeVisible()
+  await expect(page.getByText('Primary Signal')).toBeVisible({ timeout: 5_000 })
+  await expect(page.getByText('Research Beacon')).toBeVisible()
+  await expect(page.getByTestId('search-result-workspace-badge').filter({ hasText: 'FN' })).toBeVisible()
+  await expect(page.getByTestId('search-result-workspace-badge').filter({ hasText: 'RL' })).toBeVisible()
 
   const searchCalls = await page.evaluate(() => (window as MockWindow).__mountedWorkspaceSearchCalls ?? [])
   expect(new Set(searchCalls)).toEqual(new Set([PRIMARY_VAULT_PATH, RESEARCH_VAULT_PATH]))
diff --git a/vite.config.ts b/vite.config.ts
index 1983a59e..954ed46d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -938,6 +938,10 @@ export default defineConfig({
     environment: 'jsdom',
     setupFiles: ['./src/test/setup.ts'],
     include: ['src/**/*.{test,spec}.{ts,tsx}'],
+    // The full jsdom suite is heavy enough that unconstrained worker fan-out can
+    // starve UI tests on local dev machines. Keep the default hook path stable,
+    // while still allowing CI or one-off runs to opt into a different cap.
+    maxWorkers: process.env.VITEST_MAX_WORKERS ?? 4,
     testTimeout: 10_000,
     coverage: {
       provider: 'v8',