opencode-vim 0.0.22 → 0.0.24

package/docs/keymap-actions.md

@@ -1,213 +1,85 @@
-# Keymap Actions
-
-Each keymap entry maps a key sequence to an action in one Vim mode:
-
-```jsonc
-"keymaps": {
-  "normal": {
-    "q": "command:session.new"
+# Custom Keymaps
+
+Each entry maps a key sequence to an action in one Vim mode. Put `keymaps` inside
+`options.vim` in your plugin's `cli.json` entry; see [Configuration](./configuration.md).
+
+```json
+{
+  "keymaps": {
+    "insert": {
+      "kj": "normal",
+      "<C-s>": "submit"
+    },
+    "normal": {
+      "Y": "y$",
+      "H": "0",
+      "L": "$",
+      "q": "command:session.new"
+    }
   }
 }
 ```
 
-## Modes
-
-| Mode | Keymaps apply while |
-| --- | --- |
-| `insert` | Typing text |
-| `normal` | Navigating and editing |
-| `visual` | Selecting characters |
-| `visual-line` | Selecting lines |
-
-All action types below can be configured in any mode.
+## Modes and actions
 
-## Actions
+Mappings apply while editing the prompt or a search dialog, in `insert`, `normal`,
+`visual`, or `visual-line` mode. They do not replace session-browsing or reader
+bindings; use `sessionKey` to change the session toggle.
 
 | Action | Behavior |
 | --- | --- |
 | `normal` | Enter normal mode |
 | `insert` | Enter insert mode |
-| `submit` | Submit the prompt |
-| `command:<name>` | Dispatch an active OpenCode command |
-| Any other string | Run it as a Vim key sequence, such as `y$` |
+| `submit` | Submit the prompt or confirm the search dialog |
+| `command:<id>` | Dispatch an active OpenCode command |
+| Vim key sequence, such as `y$` | Run those Vim keys |
+
+Insert-mode mappings support only `normal`, `submit`, `command:<id>`, or Escape
+(`"<Esc>"` / `"<C-[>"`). Other editing modes support all action types above.
+
+Mapping sequences are literal: mapping `j` to `j` uses an actual line, while
+mapping it to `gj` uses a wrapped row.
+
+## Key notation
+
+Use printable ASCII characters; uppercase letters represent shifted keys. Use
+`<Space>` instead of a literal space.
+
+Special keys are `<Esc>`, `<CR>`, `<Tab>`, `<BS>`, `<Del>`, `<Space>`, and `<C-a>`
+through `<C-z>`. Ctrl letters must be lowercase: `<C-s>`, not `<C-S>`.
 
-An unmapped `<CR>` submits in normal mode and passes through to OpenCode in insert mode. `<CR>` can be mapped directly or end a sequence, but cannot start a multi-key sequence.
+Examples: `gg`, `kj`, `Y`, `<C-s>`, or `g<CR>`. In JSON, escape a backslash, as in
+`"\\s"` for a backslash followed by `s`.
 
-## OpenCode Commands
+An unmapped `<CR>` submits in normal mode and passes through to OpenCode in insert
+mode. It can be mapped directly or end a sequence, but cannot start a multi-key
+mapping.
 
-Command mappings use the command ID, not a slash command. For example, use `command:session.new`, not `command:/new`.
+`keymapTimeout` sets the wait between keys in a custom mapping; the default is
+500 ms. Unmatched or timed-out insert prefixes become ordinary text.
 
-Commands are provided by OpenCode and installed plugins. They may change between versions and only run when their UI context is active. The commands below are available from a focused prompt in the current OpenCode release.
+## OpenCode commands
 
-### Application
+Use a command ID, not a slash command: `command:session.new`, not `command:/new`.
+Commands run only when available in the current UI context.
 
-| Command | Behavior |
+| Command ID | Behavior |
 | --- | --- |
 | `command.palette.show` | Open the command palette |
-| `session.list` | Open the session list |
 | `session.new` | Start a new session |
-| `session.quick_switch.1` through `.9` | Switch to a numbered recent session |
-| `workspace.copy_path` | Copy the current worktree path |
-| `workspace.list` | Open workspace management |
+| `session.list` | Open the session list |
 | `model.list` | Open model selection |
-| `model.cycle_recent` | Select the next recent model |
-| `model.cycle_recent_reverse` | Select the previous recent model |
-| `model.cycle_favorite` | Select the next favorite model |
-| `model.cycle_favorite_reverse` | Select the previous favorite model |
-| `agent.list` | Open agent selection |
-| `agent.cycle` | Select the next agent |
-| `agent.cycle.reverse` | Select the previous agent |
-| `mcp.list` | Open MCP management |
-| `variant.cycle` | Select the next model variant |
-| `variant.list` | Open variant selection |
-| `provider.connect` | Connect a provider |
-| `console.org.switch` | Switch organizations |
-| `opencode.status` | Open status information |
-| `opencode.debug` | Open debug information |
-| `theme.switch` | Select a theme |
-| `theme.switch_mode` | Toggle light and dark mode |
-| `theme.mode.lock` | Lock automatic theme changes |
-| `help.show` | Open help |
-| `docs.open` | Open OpenCode documentation |
-| `app.exit` | Exit OpenCode |
-| `app.debug` | Toggle the debug overlay |
-| `app.console` | Toggle the renderer console |
-| `app.heap_snapshot` | Write a heap snapshot |
-| `terminal.suspend` | Suspend OpenCode |
-| `terminal.title.toggle` | Toggle terminal title updates |
-| `app.toggle.animations` | Toggle TUI animations |
-| `app.toggle.file_context` | Toggle automatic file context |
-| `app.toggle.diffwrap` | Toggle diff wrapping |
-| `app.toggle.paste_summary` | Toggle pasted-text summaries |
-| `app.toggle.session_directory_filter` | Toggle session directory filtering |
-| `permission.mode` | Toggle permission auto-approval |
-
-### Prompt
-
-| Command | Behavior |
-| --- | --- |
-| `prompt.clear` | Clear the prompt |
-| `prompt.submit` | Submit the prompt |
-| `prompt.editor_context.clear` | Remove attached editor context |
-| `prompt.paste` | Paste clipboard text or an image |
-| `session.interrupt` | Interrupt the active session |
-| `prompt.editor` | Edit the prompt in an external editor |
-| `prompt.skills` | Open skill selection |
-| `workspace.set` | Switch workspace |
-| `session.move` | Move the session to another project |
-| `prompt.stash` | Stash and clear the prompt |
-| `prompt.stash.pop` | Restore the latest prompt stash |
-| `prompt.stash.list` | Open prompt stash selection |
 | `prompt.history.previous` | Load the previous prompt |
 | `prompt.history.next` | Load the next prompt |
+| `opencode-vim.toggle` | Toggle Vim mode |
 
-### Autocomplete
+See [OpenCode's command reference](https://opencode.ai/v2/docs/cli/keybinds) for
+the full list. Installed plugins can register additional commands.
 
-These commands are active while prompt autocomplete is visible.
-
-| Command | Behavior |
-| --- | --- |
-| `prompt.autocomplete.prev` | Select the previous item |
-| `prompt.autocomplete.next` | Select the next item |
-| `prompt.autocomplete.hide` | Hide autocomplete |
-| `prompt.autocomplete.select` | Accept the selected item |
-| `prompt.autocomplete.complete` | Complete or expand the selected item |
+## Troubleshooting
 
-### Input
-
-These commands act on the focused prompt input.
-
-| Command | Behavior |
-| --- | --- |
-| `input.move.left` | Move left |
-| `input.move.right` | Move right |
-| `input.move.up` | Move up |
-| `input.move.down` | Move down |
-| `input.select.left` | Select left |
-| `input.select.right` | Select right |
-| `input.select.up` | Select up |
-| `input.select.down` | Select down |
-| `input.line.home` | Move to logical line start |
-| `input.line.end` | Move to logical line end |
-| `input.select.line.home` | Select to logical line start |
-| `input.select.line.end` | Select to logical line end |
-| `input.visual.line.home` | Move to visual line start |
-| `input.visual.line.end` | Move to visual line end |
-| `input.select.visual.line.home` | Select to visual line start |
-| `input.select.visual.line.end` | Select to visual line end |
-| `input.buffer.home` | Move to the start of the prompt |
-| `input.buffer.end` | Move to the end of the prompt |
-| `input.select.buffer.home` | Select to the start of the prompt |
-| `input.select.buffer.end` | Select to the end of the prompt |
-| `input.delete.line` | Delete the current line |
-| `input.delete.to.line.end` | Delete to line end |
-| `input.delete.to.line.start` | Delete to line start |
-| `input.backspace` | Delete backward |
-| `input.delete` | Delete forward |
-| `input.newline` | Insert a newline |
-| `input.undo` | Undo an edit |
-| `input.redo` | Redo an edit |
-| `input.word.forward` | Move forward one word |
-| `input.word.backward` | Move backward one word |
-| `input.select.word.forward` | Select forward one word |
-| `input.select.word.backward` | Select backward one word |
-| `input.delete.word.forward` | Delete forward one word |
-| `input.delete.word.backward` | Delete backward one word |
-| `input.select.all` | Select the entire prompt |
-| `input.submit` | Submit the prompt input |
-
-### Session
-
-These commands are active in a session.
-
-| Command | Behavior |
-| --- | --- |
-| `session.share` | Share the session or copy its URL |
-| `session.rename` | Rename the session |
-| `session.timeline` | Open the message timeline |
-| `session.fork` | Fork from the timeline |
-| `session.compact` | Summarize the session |
-| `session.unshare` | Stop sharing the session |
-| `session.undo` | Undo the latest user message |
-| `session.redo` | Redo an undone message |
-| `session.sidebar.toggle` | Toggle the session sidebar |
-| `session.toggle.conceal` | Toggle code concealment |
-| `session.toggle.timestamps` | Toggle message timestamps |
-| `session.toggle.thinking` | Toggle expanded thinking |
-| `session.toggle.actions` | Toggle tool action details |
-| `session.toggle.scrollbar` | Toggle the session scrollbar |
-| `session.toggle.generic_tool_output` | Toggle generic tool output |
-| `session.page.up` | Scroll up half a page |
-| `session.page.down` | Scroll down half a page |
-| `session.line.up` | Scroll up one line |
-| `session.line.down` | Scroll down one line |
-| `session.half.page.up` | Scroll up a quarter page |
-| `session.half.page.down` | Scroll down a quarter page |
-| `session.first` | Jump to the first message |
-| `session.last` | Jump to the last message |
-| `session.messages_last_user` | Jump to the latest user message |
-| `session.message.next` | Jump to the next message |
-| `session.message.previous` | Jump to the previous message |
-| `messages.copy` | Copy the latest assistant message |
-| `session.copy` | Copy the session transcript |
-| `session.export` | Export the session transcript |
-| `session.background` | Background active subagents |
-| `session.child.first` | Open the first child session |
-| `session.parent` | Open the parent session |
-| `session.child.next` | Open the next child session |
-| `session.child.previous` | Open the previous child session |
-
-### Plugins
-
-| Command | Behavior | Requirement |
-| --- | --- | --- |
-| `opencode-vim.toggle` | Toggle Vim mode | Always available |
-| `snippets.reload` | Reload snippets | Snippets plugin installed |
-| `snippets.insert` | Open snippet selection | Snippets plugin installed |
-| `snippets.accept` | Accept the active snippet field | Snippets plugin installed |
-| `plugins.list` | Open plugin management | Built-in plugin manager enabled |
-| `plugins.install` | Open plugin installation | Built-in plugin manager enabled |
-| `diff.open` | Open the diff viewer | Built-in diff viewer enabled |
-| `tips.toggle` | Toggle home-screen tips | Home screen visible |
-
-Other plugins can register additional commands. A command that is unavailable in the current context is ignored.
+- Check the mode and whether the action is supported in it.
+- Use the exact key notation above; literal spaces and names such as `<C-S>` or
+  `<Up>` are not supported in custom mapping sequences.
+- Command mappings need an active command in the current context.
+- Enable `debug` in [Configuration](./configuration.md) to inspect rejected mappings.

package/docs/vim-behavior.md

@@ -0,0 +1,93 @@
+# Keybindings and Modes
+
+These are the default bindings. See [Configuration](./configuration.md) to change
+the startup mode, session key, or editing mappings.
+
+## Prompt editing
+
+Starts in insert mode. Press `Esc` to enter normal mode and `i` to type again.
+Use `/vim` to toggle the plugin on or off.
+
+| Key | Behavior |
+| --- | --- |
+| `Esc`, `Ctrl+[` | Enter normal mode |
+| `i`, `a`, `A`, `o`, `O` | Enter insert mode |
+| `h`, `l`, `w`, `b`, `e`, `$`, `0` | Move through the prompt |
+| `j`, `k` | Move through wrapped rows; counts use actual lines |
+| Up, Down | OpenCode's cursor/history navigation |
+| `gj`, `gk`, `g0`, `g^`, `g$` | Move through wrapped screen rows |
+| `x`, `d`, `c`, `y`, `p` | Delete, change, yank, and paste |
+| `u`, `Ctrl+r`, `.` | Undo, redo, and repeat the last change |
+| `v`, `V` | Visual and visual-line selection |
+| `3w`, `diw`, `ci"`, `yiq`, `dip`, `yib` | Counts and text objects |
+| `k`, `j` from an empty prompt | Browse previous and next prompts |
+| `Enter` in normal mode | Submit the prompt |
+| `s` in normal mode | Enter session mode |
+
+Wrapping is visual only. Line commands such as `0`, `$`, `A`, `dd`, `yy`, and `V`
+use actual newline-separated lines. Bare `j`/`k` follow wrapped rows, as in
+LazyVim; counts such as `3j` and operator motions such as `dj` use actual lines.
+`gj`/`gk` always follow wrapped rows, including with counts.
+
+Text objects include words and quotes, plus `iq`/`aq` for the nearest quote pair,
+`ip`/`ap` for paragraphs, and `ib`/`ab` or `iB`/`aB` for parentheses or braces.
+Yanks and cuts (`y`, `d`, `c`, `x`) write to the system clipboard. `p` and `P`
+read its current text, including text copied from another application. Counts,
+linewise puts, undo, and dot repeat still use Vim's editing behavior.
+
+Named registers such as `"ayiw` and `"ap` stay separate from the system clipboard.
+When clipboard access is unavailable, puts use the last copied text shared by
+the prompt, dialogs, and session reader. Over SSH, copying uses the terminal's
+clipboard support; `p` uses this fallback because OpenTUI cannot read the remote
+client's clipboard. Use your terminal's paste shortcut for external text there.
+Use OpenCode's normal paste shortcut for images and attachment handling.
+
+## Session mode
+
+From a session prompt, press `s` in normal mode to browse from the latest item.
+A colored bar marks the selected text block, reasoning block, tool call, or group.
+Visible items are highlighted in place; off-screen items scroll into view.
+
+| Key | Behavior |
+| --- | --- |
+| `j`, `k`, Down, Up | Next / previous item; counts work too |
+| `gg`, `G` | First / last item |
+| `Enter` | Expand/collapse a group, or open an item in a read-only modal |
+| `yy` | Copy selected text; groups copy their summary |
+| `Ctrl+d`, `Ctrl+u` | Scroll down / up |
+| `Ctrl+f`, `Ctrl+b`, Page Down, Page Up | Scroll by larger steps |
+| `Esc`, `Ctrl+[` | Return to the prompt |
+| `s` | Return to the prompt |
+
+A collapsed group is one stop. Expand it to navigate its individual tools or
+reasoning blocks. Tool items expose their displayed details; text items preserve
+their Markdown.
+
+Inside the modal, use Vim motions to move, `v` or `V` to select, and `y` to copy.
+`Esc` cancels a selection or pending motion, then closes the modal. From its normal
+mode, `s` returns directly to the prompt. The modal keeps a snapshot of the item
+while you read it, even if the response is still streaming.
+
+Session yanks go to both the clipboard and the shared fallback, so `p`
+pastes into the prompt. Yanks briefly highlight the copied text. Your prompt text,
+cursor, and undo history are preserved.
+
+## Dialogs
+
+Search dialogs such as `/models` and `Ctrl+P` inherit the prompt's insert/normal
+mode. Type to filter in insert mode; use `j`/`k` to choose items in normal mode.
+`Enter` confirms, and `Esc` in normal mode goes back.
+
+The footer follows the active editor's mode. Closing the dialog restores the
+prompt's mode or the session footer. Prompt and dialog edits have separate undo
+histories.
+
+## Vim compatibility
+
+This is a Vim-style subset powered by `@vimee/core`, with OpenCode-specific
+submission, history, dialogs, and session navigation. Insert-mode typing uses
+OpenCode's native editor. The adapter maps graphemes and cursor positions without
+adding newlines at soft wraps.
+
+For standard Vim terminology, see [Vim's quick reference](https://vimhelp.org/quickref.txt.html)
+and [motion documentation](https://vimhelp.org/motion.txt.html).

package/package.json

@@ -1,16 +1,18 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-vim",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/Tarquinen/opencode-vim"
   },
   "exports": {
-    "./tui": "./tui.tsx"
+    "./tui": "./dist/tui.js"
   },
   "scripts": {
+    "build": "bun scripts/build.ts",
+    "prepack": "bun run build",
     "typecheck": "tsc --noEmit",
     "test": "bun test --conditions=browser --preload @opentui/solid/preload",
     "bench": "bun test/benchmark.ts"
@@ -33,9 +35,7 @@
   "files": [
     "assets/",
     "docs/",
-    "src/",
-    "README.md",
-    "tui.tsx",
-    "view.tsx"
+    "dist/",
+    "README.md"
   ]
 }

package/src/modules/snippets/index.tsx

@@ -1,17 +0,0 @@
-/** @jsxImportSource @opentui/solid */
-import type { PromptModule } from "../../prompt/types"
-import type { SnippetController } from "./types"
-import { SnippetAutocomplete } from "./view"
-
-export function createSnippetsModule(controller: SnippetController): PromptModule {
-    return {
-        id: "snippets",
-        order: -10,
-        onSubmit() {
-            return controller.accept?.() === true
-        },
-        renderAbove(ctx) {
-            return <SnippetAutocomplete ctx={ctx} controller={controller} />
-        },
-    }
-}

package/src/modules/snippets/loader.ts

@@ -1,147 +0,0 @@
-import { basename, join } from "node:path"
-import { mkdir, writeFile } from "node:fs/promises"
-import type { SnippetInfo, SnippetSource } from "./types"
-
-const SNIPPET_EXT = ".md"
-const EMPTY_SNIPPET = `---
-description: ""
----
-
-`
-
-export async function loadSnippets(projectDir?: string) {
-    const registry = new Map<string, SnippetInfo>()
-    const home = process.env.HOME
-
-    if (home) {
-        await loadDir(registry, join(home, ".config/opencode/snippets"), "global")
-        await loadDir(registry, join(home, ".config/opencode/snippet"), "global")
-    }
-
-    if (projectDir) {
-        await loadDir(registry, join(projectDir, ".opencode/snippets"), "project")
-        await loadDir(registry, join(projectDir, ".opencode/snippet"), "project")
-    }
-
-    return listSnippets(registry).sort((left, right) => sourceRank(left) - sourceRank(right) || left.name.localeCompare(right.name))
-}
-
-async function loadDir(registry: Map<string, SnippetInfo>, dir: string, source: SnippetSource) {
-    let entries: string[]
-    try {
-        entries = await Array.fromAsync(new Bun.Glob(`*${SNIPPET_EXT}`).scan({ cwd: dir, onlyFiles: true }))
-    } catch {
-        return
-    }
-
-    for (const entry of entries) {
-        const snippet = await loadFile(join(dir, entry), source)
-        if (snippet) registerSnippet(registry, snippet)
-    }
-}
-
-async function loadFile(filePath: string, source: SnippetSource) {
-    let raw: string
-    try {
-        raw = await Bun.file(filePath).text()
-    } catch {
-        return undefined
-    }
-
-    const parsed = parseFrontmatter(raw)
-    return {
-        name: basename(filePath, SNIPPET_EXT),
-        content: parsed.content.trim(),
-        aliases: normalizeAliases(parsed.data.aliases ?? parsed.data.alias),
-        description: typeof parsed.data.description === "string" ? parsed.data.description : undefined,
-        filePath,
-        source,
-    } satisfies SnippetInfo
-}
-
-export async function ensureSnippetDraft(name: string, projectDir?: string) {
-    const dir = await ensureSnippetsDir(projectDir)
-    const filePath = join(dir, `${name}${SNIPPET_EXT}`)
-    if (!(await Bun.file(filePath).exists())) await writeFile(filePath, EMPTY_SNIPPET)
-    return filePath
-}
-
-async function ensureSnippetsDir(projectDir?: string) {
-    const home = process.env.HOME
-    const dir = projectDir ? join(projectDir, ".opencode/snippet") : home ? join(home, ".config/opencode/snippet") : undefined
-    if (!dir) throw new Error("Unable to resolve snippets directory")
-    await mkdir(dir, { recursive: true })
-    return dir
-}
-
-export function parseFrontmatter(raw: string) {
-    if (!raw.startsWith("---\n")) return { data: {} as Record<string, unknown>, content: raw }
-
-    const end = raw.indexOf("\n---", 4)
-    if (end < 0) return { data: {} as Record<string, unknown>, content: raw }
-
-    return {
-        data: parseYamlish(raw.slice(4, end)),
-        content: raw.slice(end + 4).replace(/^\r?\n/, ""),
-    }
-}
-
-function parseYamlish(input: string) {
-    const data: Record<string, unknown> = {}
-    const lines = input.split(/\r?\n/)
-    let currentList: string | undefined
-
-    for (const line of lines) {
-        const listItem = /^\s*-\s*(.+)$/.exec(line)
-        if (listItem && currentList) {
-            const value = String(listItem[1]).trim()
-            data[currentList] = [...asArray(data[currentList]), unquote(value)]
-            continue
-        }
-
-        const pair = /^([A-Za-z0-9_-]+):\s*(.*)$/.exec(line)
-        if (!pair) continue
-
-        currentList = undefined
-        const key = pair[1]
-        const value = pair[2].trim()
-        if (!value) {
-            data[key] = []
-            currentList = key
-        } else {
-            data[key] = unquote(value)
-        }
-    }
-
-    return data
-}
-
-export function normalizeAliases(value: unknown) {
-    return asArray(value).filter((entry) => typeof entry === "string" && entry.length > 0) as string[]
-}
-
-function asArray(value: unknown) {
-    return Array.isArray(value) ? value : typeof value === "string" ? [value] : []
-}
-
-export function unquote(value: string) {
-    return value.replace(/^['"]|['"]$/g, "")
-}
-
-function registerSnippet(registry: Map<string, SnippetInfo>, snippet: SnippetInfo) {
-    const old = registry.get(snippet.name.toLowerCase())
-    if (old) {
-        for (const alias of old.aliases) registry.delete(alias.toLowerCase())
-    }
-
-    registry.set(snippet.name.toLowerCase(), snippet)
-    for (const alias of snippet.aliases) registry.set(alias.toLowerCase(), snippet)
-}
-
-function listSnippets(registry: Map<string, SnippetInfo>) {
-    return [...new Map([...registry.values()].map((snippet) => [snippet.name, snippet])).values()]
-}
-
-function sourceRank(snippet: SnippetInfo) {
-    return snippet.source === "project" ? 0 : 1
-}

package/src/modules/snippets/search.ts

@@ -1,118 +0,0 @@
-import type { SkillInfo, SnippetInfo } from "./types"
-
-export type HighlightPart = {
-    text: string
-    match: boolean
-}
-
-function normalizeSearchText(input: string) {
-    return input.toLowerCase().replace(/[^a-z0-9]/g, "")
-}
-
-function scoreText(input: string, query: string) {
-    const raw = input.toLowerCase()
-    const compact = normalizeSearchText(input)
-    const needle = query.toLowerCase().trim()
-    const compactNeedle = normalizeSearchText(query)
-
-    if (raw === needle) return 0
-    if (compactNeedle && compact === compactNeedle) return 1
-    if (raw.startsWith(needle)) return 2
-    if (compactNeedle && compact.startsWith(compactNeedle)) return 3
-    if (raw.includes(needle)) return 4
-    if (compactNeedle && compact.includes(compactNeedle)) return 5
-    return Number.POSITIVE_INFINITY
-}
-
-function snippetDescription(snippet: SnippetInfo) {
-    return (snippet.description || snippet.content).replace(/\s+/g, " ").trim()
-}
-
-function scoreSnippet(snippet: SnippetInfo, query: string) {
-    if (!query) return 0
-
-    const nameScore = Math.min(scoreText(snippet.name, query), ...snippet.aliases.map((alias) => scoreText(alias, query)))
-    if (Number.isFinite(nameScore)) return nameScore
-
-    const description = (snippet.description || "").replace(/\s+/g, " ").trim().toLowerCase()
-    const lowerQuery = query.toLowerCase()
-    if (description.startsWith(lowerQuery)) return 6
-    if (description.includes(lowerQuery)) return 7
-    return Number.POSITIVE_INFINITY
-}
-
-function sourceRank(snippet: SnippetInfo) {
-    return snippet.source === "project" ? 0 : 1
-}
-
-export function filterSnippets(snippets: SnippetInfo[], query: string) {
-    const needle = query.trim()
-    return snippets
-        .map((snippet) => ({ snippet, score: scoreSnippet(snippet, needle) }))
-        .filter((entry) => Number.isFinite(entry.score))
-        .sort((left, right) => left.score - right.score || sourceRank(left.snippet) - sourceRank(right.snippet) || left.snippet.name.localeCompare(right.snippet.name))
-        .map((entry) => entry.snippet)
-}
-
-export function matchedAliases(snippet: SnippetInfo, query: string) {
-    const needle = query.trim()
-    if (!needle) return []
-    return snippet.aliases.filter((alias) => Number.isFinite(scoreText(alias, needle)))
-}
-
-export function describeSnippet(snippet: SnippetInfo) {
-    return snippetDescription(snippet)
-}
-
-export function highlightMatches(input: string, query: string): HighlightPart[] {
-    const needle = query.trim().toLowerCase()
-    if (!needle) return [{ text: input, match: false }]
-
-    const lower = input.toLowerCase()
-    const parts: HighlightPart[] = []
-    let cursor = 0
-
-    while (cursor < input.length) {
-        const index = lower.indexOf(needle, cursor)
-        if (index < 0) break
-        if (index > cursor) parts.push({ text: input.slice(cursor, index), match: false })
-        parts.push({ text: input.slice(index, index + needle.length), match: true })
-        cursor = index + needle.length
-    }
-
-    if (parts.length === 0) return [{ text: input, match: false }]
-    if (cursor < input.length) parts.push({ text: input.slice(cursor), match: false })
-    return parts
-}
-
-function skillTag(skill: SkillInfo) {
-    return `skill(${skill.name})`
-}
-
-function scoreSkill(skill: SkillInfo, query: string) {
-    if (!query) return 0
-    const nameScore = Math.min(scoreText(skill.name, query), scoreText(skillTag(skill), query))
-    if (Number.isFinite(nameScore)) return nameScore
-    const description = (skill.description || "").replace(/\s+/g, " ").trim().toLowerCase()
-    const lowerQuery = query.toLowerCase()
-    if (description.startsWith(lowerQuery)) return 6
-    if (description.includes(lowerQuery)) return 7
-    return Number.POSITIVE_INFINITY
-}
-
-function skillSourceRank(skill: SkillInfo) {
-    return skill.source === "project" ? 0 : 1
-}
-
-export function filterSkills(skills: SkillInfo[], query: string) {
-    const needle = query.trim()
-    return skills
-        .map((skill) => ({ skill, score: scoreSkill(skill, needle) }))
-        .filter((entry) => Number.isFinite(entry.score))
-        .sort((left, right) => left.score - right.score || skillSourceRank(left.skill) - skillSourceRank(right.skill) || left.skill.name.localeCompare(right.skill.name))
-        .map((entry) => entry.skill)
-}
-
-export function describeSkill(skill: SkillInfo) {
-    return (skill.description || skill.content).replace(/\s+/g, " ").trim()
-}