diff --git a/docs/website/.vitepress/config.mts b/docs/website/.vitepress/config.mts
index 228e043e..b9e9b9f5 100644
--- a/docs/website/.vitepress/config.mts
+++ b/docs/website/.vitepress/config.mts
@@ -121,6 +121,7 @@ export default defineConfig({
items: [
{ text: 'Overview', link: '/documentation/' },
{ text: 'Command Palette', link: '/documentation/command-palette' },
+ { text: 'Search', link: '/documentation/search' },
{ text: 'Storage', link: '/documentation/storage' },
{ text: 'Sync', link: '/documentation/sync' },
{ text: 'Imports', link: '/documentation/imports' },
@@ -138,7 +139,6 @@ export default defineConfig({
{ text: 'Library', link: '/documentation/code/library' },
{ text: 'Folders', link: '/documentation/code/folders' },
{ text: 'Tags', link: '/documentation/code/tags' },
- { text: 'Search', link: '/documentation/code/search' },
],
},
{
@@ -156,7 +156,6 @@ export default defineConfig({
{ text: 'Mermaid', link: '/documentation/notes/mermaid' },
{ text: 'Mindmap', link: '/documentation/notes/mindmap' },
{ text: 'Presentation', link: '/documentation/notes/presentation' },
- { text: 'Search', link: '/documentation/notes/search' },
],
},
{
diff --git a/docs/website/documentation/code/index.md b/docs/website/documentation/code/index.md
index 222b8acf..2f66b034 100644
--- a/docs/website/documentation/code/index.md
+++ b/docs/website/documentation/code/index.md
@@ -58,7 +58,7 @@ Folders can have a default language, so new snippets inside that folder start wi
### Search
-[Search](/documentation/code/search) finds snippets by title or content across your library when you remember part of the code but not where you saved it.
+[Search](/documentation/search) finds snippets by title or content and narrows the current folder, tag, or library view when one is selected.
## Editor Tools
diff --git a/docs/website/documentation/code/search.md b/docs/website/documentation/code/search.md
deleted file mode 100644
index 2cdb9f61..00000000
--- a/docs/website/documentation/code/search.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Code Search
-description: "Search the entire massCode snippet library by title or content to quickly find saved code across folders."
----
-
-# Search
-
-Search helps you find snippets by title or content across your entire library. Use it when you remember part of the code but not where you saved it.
-
-- Select **"File"** > **"Find"** from the menu bar.
-- Click the search field at the top of the second column.
-- Press Cmd+F on macOS or Ctrl+F on Windows or Linux.
diff --git a/docs/website/documentation/command-palette.md b/docs/website/documentation/command-palette.md
index 911f54eb..1f228261 100644
--- a/docs/website/documentation/command-palette.md
+++ b/docs/website/documentation/command-palette.md
@@ -26,6 +26,8 @@ The palette searches by title across searchable content:
Search results are ranked with your recent usage, so items you open often move higher over time.
+Palette search also supports space scopes. In massCode 5.6 and later, it can also use tag and folder filters. See [Search](/documentation/search#search-from-the-command-palette) for the full search workflow.
+
## Run Commands
Commands create new content or open app-level actions without switching spaces first.
@@ -51,19 +53,6 @@ Use command mode when you want to run an action instead of opening existing cont
Press Esc to leave command mode and return to the full palette.
-## Search In A Space
-
-Use space mode when you want to search only one part of massCode.
-
-1. Open the palette.
-2. Type `@`.
-3. Select a space, such as **Code**, **Notes**, or **HTTP**.
-4. Type your search query.
-
-You can also type the scope directly, for example `@code auth` or `@notes release`.
-
-Press Esc to leave the active scope and return to the full palette.
-
## Create From Search
If a search has no exact match, the palette can create a new item from the query.
diff --git a/docs/website/documentation/index.md b/docs/website/documentation/index.md
index f376a81f..3e8ec1d9 100644
--- a/docs/website/documentation/index.md
+++ b/docs/website/documentation/index.md
@@ -9,6 +9,8 @@ massCode is a free and open source developer workspace for code snippets, markdo
Switch between Spaces using the rail on the left side of the app, or use the [Command Palette](/documentation/command-palette) to jump to spaces, content, and actions from the keyboard.
+Use [Search](/documentation/search) to narrow the current list in Code, Notes, or HTTP, or to build filtered searches from the Command Palette.
+
## Code
diff --git a/docs/website/documentation/notes/search.md b/docs/website/documentation/notes/search.md
deleted file mode 100644
index 91b31bf8..00000000
--- a/docs/website/documentation/notes/search.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Notes Search
-description: "Search note titles and content in massCode Notes to quickly find documents by topic across your library."
----
-
-# Search
-
-Search helps you find notes by title or content across the current Notes library. Use it when you remember the topic but not the folder.
-
-- Click the search field at the top of the second column.
-- Press Cmd+F on macOS or Ctrl+F on Windows or Linux.
diff --git a/docs/website/documentation/search.md b/docs/website/documentation/search.md
new file mode 100644
index 00000000..1b2a34cf
--- /dev/null
+++ b/docs/website/documentation/search.md
@@ -0,0 +1,111 @@
+---
+title: Search
+description: "Search snippets, notes, HTTP requests, spaces, and commands in massCode with scoped list search and Command Palette filters."
+---
+
+# Search
+
+massCode has two search flows:
+
+- Use the search field above a list to narrow the current space.
+- Use the Command Palette to search across the app and add filters with the keyboard.
+
+## Search the current list
+
+The search field above a list searches the items in that space:
+
+- Code searches snippets.
+- Notes searches notes.
+- HTTP searches requests.
+
+Click the search field at the top of the list, or press Cmd+F on macOS and Ctrl+F on Windows and Linux.
+
+List search respects the current sidebar context. If you select a folder, tag, or library view first, the search field narrows that selection instead of searching the whole space.
+
+Examples:
+
+- Select a Code tag, then search to find matching snippets inside that tag.
+- Select a Notes folder, then search to find matching notes in that folder.
+- Open Favorites, Trash, Tasks, Today, or Upcoming in Notes, then search inside that view.
+- Select an HTTP folder, then search for matching requests inside that folder.
+
+Clearing the search text keeps the same sidebar selection active.
+
+## Search from the Command Palette
+
+Open the Command Palette with Cmd+P on macOS or Ctrl+P on Windows and Linux.
+
+The palette can search:
+
+- snippets
+- notes
+- HTTP requests
+- spaces
+- commands
+- recently opened items
+
+Results are ranked with recent usage, so items you open often move higher over time.
+
+## Scope the palette to a space
+
+Use `@` to search in one space.
+
+1. Open the palette.
+2. Type `@`.
+3. Select **Code**, **Notes**, or **HTTP**.
+4. Type your search query.
+
+You can also type the scope directly:
+
+- `@code auth`
+- `@notes release`
+- `@http webhook`
+
+Press Esc to leave the active scope and return to the full palette.
+
+## Add filters in the palette
+
+
+
+Use filter tokens when you want to narrow Command Palette search by folder or tag.
+
+### Tags
+
+Type `#` to show tag suggestions. Select a tag to add it as a chip.
+
+Examples:
+
+- `@code #vue composable`
+- `@notes #backend migration`
+
+Tags are available in Code and Notes.
+
+### Folders
+
+Type `/` to show folder suggestions. Select a folder to add it as a chip.
+
+Examples:
+
+- `@code /Shell docker`
+- `@notes /Development backend`
+- `@http /Webhooks stripe`
+
+Nested folders can be selected by path, such as `/Work/API`.
+
+## Work with search chips
+
+The palette shows active scope and filters as chips in the input.
+
+- Click the `x` on a chip to remove that scope or filter.
+- Press Backspace in an empty input to remove one chip at a time.
+- Removing a filter recalculates the search without clearing the remaining query.
+
+You can combine a space, a folder, a tag, and text query when the combination applies to that space.
+
+Example:
+
+```text
+Notes /Development #backend migration
+```
+
+This searches Notes for `migration` inside the Development folder with the backend tag.