opencode-vim 0.0.11 → 0.0.13

package/bun.lock

@@ -5,13 +5,14 @@
     "": {
       "name": "opencode-vim",
       "dependencies": {
-        "@opentui/core": "^0.2.1",
-        "@opentui/solid": "^0.2.1",
+        "@opentui/core": "^0.2.6",
+        "@opentui/keymap": "^0.2.6",
+        "@opentui/solid": "^0.2.6",
         "@vimee/core": "^0.3.0",
         "solid-js": "^1.9.12",
       },
       "devDependencies": {
-        "@opencode-ai/plugin": "1.14.30",
+        "@opencode-ai/plugin": "1.14.44",
       },
     },
   },
@@ -94,25 +95,27 @@
 
     "@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3", "", { "os": "win32", "cpu": "x64" }, "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ=="],
 
-    "@opencode-ai/plugin": ["@opencode-ai/plugin@1.14.30", "", { "dependencies": { "@opencode-ai/sdk": "1.14.30", "effect": "4.0.0-beta.57", "zod": "4.1.8" }, "peerDependencies": { "@opentui/core": ">=0.1.105", "@opentui/solid": ">=0.1.105" }, "optionalPeers": ["@opentui/core", "@opentui/solid"] }, "sha512-O1y6qR349R5XJtB76Vx4TO/uvLkqNvdsgxtj2ZpWoygb3rtrkuVMiBsrcL2WfuyyaLJnPmbnkeigcdm42r09Hg=="],
+    "@opencode-ai/plugin": ["@opencode-ai/plugin@1.14.44", "", { "dependencies": { "@opencode-ai/sdk": "1.14.44", "effect": "4.0.0-beta.59", "zod": "4.1.8" }, "peerDependencies": { "@opentui/core": ">=0.2.6", "@opentui/keymap": ">=0.2.6", "@opentui/solid": ">=0.2.6" }, "optionalPeers": ["@opentui/core", "@opentui/keymap", "@opentui/solid"] }, "sha512-7uqSJWaDuP9GNvdUJ57E8AX0WNVP4C8PyCIJ2qvjtucjw6DFT/ErjXDXUrRiqwK3omImXRlTDb32xP9IMfk0dw=="],
 
-    "@opencode-ai/sdk": ["@opencode-ai/sdk@1.14.30", "", { "dependencies": { "cross-spawn": "7.0.6" } }, "sha512-OgPEDvALekHZIjByo/okJ699aLPn+XtsVxgZxUqE8TlzAG7TtskMGFl0fro8O0T2p+nkOT/LstnKGbECvc0+YA=="],
+    "@opencode-ai/sdk": ["@opencode-ai/sdk@1.14.44", "", { "dependencies": { "cross-spawn": "7.0.6" } }, "sha512-hpMCYhwEWk2B1b9THHYy5GRlrCJ9g67pvSyLt9O2b2pYj0HE6v8MeVOhg6ucn2T4QBIoVJ3ZDWnh7ApaeunNWg=="],
 
-    "@opentui/core": ["@opentui/core@0.2.1", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.2.1", "@opentui/core-darwin-x64": "0.2.1", "@opentui/core-linux-arm64": "0.2.1", "@opentui/core-linux-x64": "0.2.1", "@opentui/core-win32-arm64": "0.2.1", "@opentui/core-win32-x64": "0.2.1" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-tXFD2NeznXzZa02yOsQ/D0o/06GBqVrPR7VdmgqI+ZChcS7NY/QgNQGgAZUditW2vezFcxlgTqoCgQaZFqRfGQ=="],
+    "@opentui/core": ["@opentui/core@0.2.6", "", { "dependencies": { "bun-ffi-structs": "0.2.2", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.2.6", "@opentui/core-darwin-x64": "0.2.6", "@opentui/core-linux-arm64": "0.2.6", "@opentui/core-linux-x64": "0.2.6", "@opentui/core-win32-arm64": "0.2.6", "@opentui/core-win32-x64": "0.2.6" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-dBpMaWVM7wtW2/2TlGPrkPjg6gOL3MVU/5XXk+U1LDJB8L4q4NeYWVdzfAVNcEvgmuuCy/cVqdY2D4ei+e7MMg=="],
 
-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.2.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-vT8rgeNdkzD84wCcS5zmrSVFgR/SjeVr+2FNM/icTjwKh9Jq3cY6UY7/EFck3PRjrmanNu4zw7W5lFKSpMxnPQ=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.2.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-hR5nsxNj+059utzenTCF0kealUlibON6fLuebFUCGM/5kJnqa+shIh0XbUDFm0+F47vqVUgZufBdUuieQZIbvQ=="],
 
-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.2.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-HAH1KeTejs0Z+RChNsNImI1eOlYJabKeAEvLtnn1aiHxvJFpzdAi6d/VrG5WFcxAem6TVRtnKN46gXff26lkig=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.2.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-pJ/bH4WC/mbBaakM1YdH6TVo67jhy0KPd61bCz97w0I/PJGr8fmNKvhmMt/AwyFgOQi3FYZiEKLMpGdvUcSsrQ=="],
 
-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.2.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-447FI6xolsKbG1eH3hpNGQhQ/8M6FDJIgpiJhX9XXvZGO7vEyN6efyqqIzRF+quafqF69+rT3qK70S1svjwVKA=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.2.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-9Pnd3kOxig8ii+/IqYheOPEgferylsQA0L6tKBnHQ9jRlCJOcu0Rv65Jepueh212vevdV9DzPURJnhejG06J6g=="],
 
-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.2.1", "", { "os": "linux", "cpu": "x64" }, "sha512-Xdds+HnAbFiylTdxyYhRxPFPnrHm75KTi7QCA1JHU3lb8Sfwrxv3nlYtFhEV798y4osafsghL20Nq5mqVPjizQ=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.2.6", "", { "os": "linux", "cpu": "x64" }, "sha512-458Mx9tBzEPzfft8cSt5ZaIpEepoxBXBOL6AUVmDTKWaZ3uouraPcEKraGAyvOTDQp2XDI3R8c/2GdaR77FaUQ=="],
 
-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.2.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-VEuqX9OSFpw960mibe4OXVmnE43V/VYwB61zoxD5uw7L3jgCiOfrf+W2TuFbcRAgtTD35MypJ53fYxmUcVZc8g=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.2.6", "", { "os": "win32", "cpu": "arm64" }, "sha512-BDUrdrT1RCcVnQoHJmUut4y811jDBAEtc6GJFB4Gs265Be8SrTjVCus6p2fSQ7j9sZQ1OcjO+5+4NkheSZICDQ=="],
 
-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.2.1", "", { "os": "win32", "cpu": "x64" }, "sha512-ywwRbyjPPEbNe3da+ez4NxIaJWQ79sA2gdepuHKUVdmdxsevdRpAxOHkEpJNtiVvphPc/On9EsP25Hmn5gjYxg=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.2.6", "", { "os": "win32", "cpu": "x64" }, "sha512-SUYAzRJ9TSoD2Qt8kn6FJz6dbTrFEPVig5mScB4zFGgGQO/Bbod2/Q31vLS/IQrX+FDb67WaErD+kuMCnMPPLA=="],
 
-    "@opentui/solid": ["@opentui/solid@0.2.1", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.2.1", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-/vlW9SmcqkarbMwB4JaIwwS3ovo42DSwAnyM04pjJVhG7DzKKwdUzozQMRgvEDZZ7oGYQRvHyVAfL8GCLh0AZw=="],
+    "@opentui/keymap": ["@opentui/keymap@0.2.6", "", { "dependencies": { "@opentui/core": "0.2.6" }, "peerDependencies": { "@opentui/react": "0.2.6", "@opentui/solid": "0.2.6", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-+6OYuedrFCKVo4ryGFNwws++2VOmPcXU3PwpY0mP47gYQY2nvQ+etWIs2Y7r5eMIqUfxVCldkKsrzcEcA4tb/A=="],
+
+    "@opentui/solid": ["@opentui/solid@0.2.6", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.2.6", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-2y225WlOGi/fCaajkxBmLyVW8Cr+OmhowHdvrYcz5w2kBD15sKbJLIYu1G9DxceirT1uIyasGy2TGzRRcVkTDg=="],
 
     "@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
@@ -134,7 +137,7 @@
 
     "browserslist": ["browserslist@4.28.2", "", { "dependencies": { "baseline-browser-mapping": "^2.10.12", "caniuse-lite": "^1.0.30001782", "electron-to-chromium": "^1.5.328", "node-releases": "^2.0.36", "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" } }, "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg=="],
 
-    "bun-ffi-structs": ["bun-ffi-structs@0.1.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-Lh1oQAYHDcnesJauieA4UNkWGXY9hYck7OA5IaRwE3Bp6K2F2pJSNYqq+hIy7P3uOvo3km3oxS8304g5gDMl/w=="],
+    "bun-ffi-structs": ["bun-ffi-structs@0.2.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-N/ZWtyN0piZlrXQT7TO0V+q952orYqkfhXRXM1Hcbb+R3QSiBH4vLnib187Mrs1H7pWIYECAmPeapGYDOMCl+w=="],
 
     "caniuse-lite": ["caniuse-lite@1.0.30001791", "", {}, "sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ=="],
 
@@ -150,7 +153,7 @@
 
     "diff": ["diff@9.0.0", "", {}, "sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw=="],
 
-    "effect": ["effect@4.0.0-beta.57", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.6.0", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.9", "multipasta": "^0.2.7", "toml": "^4.1.1", "uuid": "^13.0.0", "yaml": "^2.8.3" } }, "sha512-rg32VgXnLKaPRs9tbRDaZ5jxmzNY7ojXt85gSHGUTwdlbWH5Ik+OCUY2q14TXliygPGoHwCAvNWS4bQJOqf00g=="],
+    "effect": ["effect@4.0.0-beta.59", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.6.0", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.9", "multipasta": "^0.2.7", "toml": "^4.1.1", "uuid": "^13.0.0", "yaml": "^2.8.3" } }, "sha512-xyUDLeHSe8d6lWGOvR6Fgn2HL6gYeTZ/S4Jzk9uc4ZUxMPPsNZlNXrvk0C7/utQFzeX7uAWcVnG2BjbA0SRoAA=="],
 
     "electron-to-chromium": ["electron-to-chromium@1.5.345", "", {}, "sha512-F9JXQGiMrz6yVNPI2qOVPvB9HzjH5cGzhs8oJ6A28V5L/YnzN/0KsuiibqF+F1Fd9qxFzD1BUnYSd8JfULxTwg=="],
 

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "opencode-vim",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "exports": {
     "./tui": {
       "import": "./tui.tsx"
     }
   },
   "dependencies": {
-    "@opentui/core": "^0.2.1",
-    "@opentui/solid": "^0.2.1",
+    "@opentui/core": "^0.2.6",
+    "@opentui/keymap": "^0.2.6",
+    "@opentui/solid": "^0.2.6",
     "solid-js": "^1.9.12",
     "@vimee/core": "^0.3.0"
   },
   "devDependencies": {
-    "@opencode-ai/plugin": "1.14.30"
+    "@opencode-ai/plugin": "1.14.44"
   }
 }

package/src/modules/snippets/index.tsx

@@ -3,9 +3,7 @@ import type { PromptModule } from "../../prompt/types"
 import type { SnippetController } from "./types"
 import { SnippetAutocomplete } from "./view"
 
-export function createSnippetsModule(): PromptModule {
-    const controller: SnippetController = {}
-
+export function createSnippetsModule(controller: SnippetController): PromptModule {
     return {
         id: "snippets",
         order: -10,

package/src/modules/snippets/trigger.ts

@@ -1,16 +1,24 @@
 import type { HashtagTriggerMatch, SnippetInfo } from "./types"
 
-const HASHTAG_TRIGGER = /(^|\s)#([^\s#]*)$/
-
 export function findTrailingHashtagTrigger(input: string): HashtagTriggerMatch | undefined {
-    const match = HASHTAG_TRIGGER.exec(input)
-    if (!match) return undefined
+    let start = -1
+    for (let i = input.length - 1; i >= 0; i--) {
+        const char = input[i]
+        if (char === "#") {
+            start = i
+            break
+        }
+        if (/\s/.test(char)) return undefined
+    }
+
+    if (start < 0) return undefined
+    if (start > 0 && !/\s/.test(input[start - 1])) return undefined
 
-    const query = match[2] ?? ""
+    const query = input.slice(start + 1)
     const token = `#${query}`
 
     return {
-        start: input.length - token.length,
+        start,
         end: input.length,
         query,
         token,

package/src/modules/snippets/types.ts

@@ -46,4 +46,5 @@ export type SnippetController = {
     accept?: () => boolean
     reload?: () => void
     insertTrigger?: () => void
+    navigate?: (delta: number) => boolean
 }

package/src/modules/snippets/view.tsx

@@ -82,11 +82,12 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
     syncInterval = setInterval(() => {
         const ref = props.ctx.prompt()
         if (!ref) {
-            setInput("")
+            if (input()) setInput("")
             setSyncingPrompt(false)
             return
         }
-        setInput(ref.current.input ?? "")
+        const next = ref.current.input ?? ""
+        if (next !== input()) setInput(next)
     }, PROMPT_SYNC_MS)
 
     onCleanup(() => {
@@ -100,6 +101,7 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
         props.controller.accept = undefined
         props.controller.reload = undefined
         props.controller.insertTrigger = undefined
+        props.controller.navigate = undefined
     })
 
     const dialogBlockingInput = () => dialogOpen() || dialogHandoffUntil() > Date.now()
@@ -156,6 +158,27 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
         return item ? chooseItem(item) : false
     }
 
+    const navigate = (delta: number) => {
+        const ref = props.ctx.prompt()
+        if (!ref || !ref.focused || dialogBlockingInput()) return false
+
+        const current = findTrailingHashtagTrigger(ref.current.input)
+        if (!current || dismissed() === current.token) return false
+
+        const value = current.query.trim()
+        const total = optionsForQuery(value).length
+        if (total === 0 && !canCreateForQuery(current.query)) return false
+
+        if (pendingPromptSync) clearTimeout(pendingPromptSync)
+        pendingPromptSync = undefined
+        setInput(ref.current.input)
+        setSyncingPrompt(false)
+        lockKeyboardSelection()
+        setSelected((current) => stepSelection(current, total || 1, delta))
+        props.ctx.requestRender()
+        return true
+    }
+
     const accept = () => {
         const ref = props.ctx.prompt()
         if (!ref) return false
@@ -205,6 +228,14 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
         return false
     }
 
+    const canAcceptSubmit = (ref: TuiPromptRef) => {
+        if (isReloadCommand(ref.current.input)) return true
+        if (dialogBlockingInput()) return true
+
+        const current = findTrailingHashtagTrigger(ref.current.input)
+        return !!current && dismissed() !== current.token
+    }
+
     props.controller.accept = accept
     props.controller.reload = () => {
         const ref = props.ctx.prompt()
@@ -216,6 +247,7 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
         syncPromptInput(ref, insertSnippetTrigger(ref.current.input))
         ref.focus()
     }
+    props.controller.navigate = navigate
 
     createEffect(() => {
         const ref = props.ctx.prompt()
@@ -229,40 +261,45 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
             commandTimer = undefined
             if (disposed) return
 
-            commandDispose = props.ctx.api.command.register(() => [
-                {
-                    title: "Reload snippets",
-                    value: "snippets.reload",
-                    description: "Reload snippet files from disk",
-                    category: "Prompt",
-                    slash: { name: "snippets:reload" },
-                    onSelect() {
-                        void executeReloadInPrompt(ref)
+            commandDispose = props.ctx.api.keymap.registerLayer({
+                commands: [
+                    {
+                        namespace: "palette",
+                        name: "snippets.reload",
+                        title: "Reload snippets",
+                        desc: "Reload snippet files from disk",
+                        category: "Prompt",
+                        slashName: "snippets:reload",
+                        run() {
+                            void executeReloadInPrompt(ref)
+                        },
                     },
-                },
-                {
-                    title: "Insert snippet",
-                    value: "snippets.insert",
-                    description: "Insert a snippet trigger into the prompt",
-                    category: "Prompt",
-                    onSelect() {
-                        syncPromptInput(ref, insertSnippetTrigger(ref.current.input))
-                        ref.focus()
+                    {
+                        namespace: "palette",
+                        name: "snippets.insert",
+                        title: "Insert snippet",
+                        desc: "Insert a snippet trigger into the prompt",
+                        category: "Prompt",
+                        run() {
+                            syncPromptInput(ref, insertSnippetTrigger(ref.current.input))
+                            ref.focus()
+                        },
                     },
-                },
-                {
-                    title: "Accept snippet autocomplete",
-                    value: "snippets.accept",
-                    keybind: "input_submit",
-                    category: "Prompt",
-                    hidden: true,
-                    enabled: ref.focused,
-                    onSelect() {
-                        if (accept()) return
-                        ref.submit()
+                    {
+                        namespace: "palette",
+                        name: "snippets.accept",
+                        title: "Accept snippet autocomplete",
+                        category: "Prompt",
+                        hidden: true,
+                        enabled: () => ref.focused && canAcceptSubmit(ref),
+                        run() {
+                            if (accept()) return
+                            ref.submit()
+                        },
                     },
-                },
-            ])
+                ],
+                bindings: acceptSnippetBindings(props.ctx.api),
+            })
         }, 0)
     })
 
@@ -280,12 +317,7 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
         if (dialogBlockingInput()) return
         if (!visible()) return
 
-        const total = options().length
-        const actionable = total > 0 || canCreate()
-
-        if ((name === "up" || name === "down") && actionable) {
-            lockKeyboardSelection()
-            setSelected((current) => stepSelection(current, total || 1, name === "up" ? -1 : 1))
+        if ((name === "up" || name === "down") && navigate(name === "up" ? -1 : 1)) {
             event.preventDefault()
             event.stopPropagation()
             return
@@ -298,8 +330,8 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
             return
         }
 
-        if (name === "tab" && actionable) {
-            if (total > 0) choose()
+        if (name === "tab" && (options().length > 0 || canCreate())) {
+            if (options().length > 0) choose()
             else void createSnippetDraft()
             event.preventDefault()
             event.stopPropagation()
@@ -559,6 +591,21 @@ function syncPromptInput(prompt: TuiPromptRef, input: string) {
     prompt.set({ input, mode: prompt.current.mode, parts: [...prompt.current.parts] })
 }
 
+function acceptSnippetBindings(api: TuiPluginApi) {
+    const command = "snippets.accept"
+    const title = "Accept snippet autocomplete"
+
+    if (!api.tuiConfig.keybinds.has("input.submit")) {
+        return [{ key: "input_submit", cmd: command, desc: title }]
+    }
+
+    return api.tuiConfig.keybinds.get("input.submit").map((binding) => ({
+        ...binding,
+        cmd: command,
+        desc: binding.desc ?? title,
+    }))
+}
+
 function selectedText(theme: PromptContext["api"]["theme"]["current"]) {
     if (theme.background.a !== 0) return theme.background
     const { r, g, b } = theme.primary

package/src/modules/vim/index.tsx

@@ -4,6 +4,7 @@ import { useKeyboard } from "@opentui/solid"
 import { onCleanup } from "solid-js"
 import type { Accessor } from "solid-js"
 import type { PromptContext, PromptModule } from "../../prompt/types"
+import type { SnippetController } from "../snippets/types"
 import { applyVimCursorStyle, focusedInput } from "./actions"
 import type { VimConfig } from "./config"
 import { createVimConfig } from "./config"
@@ -14,7 +15,7 @@ import { createVimState } from "./state"
 import { createVimeeAdapter } from "./vimee"
 import { VimStatus } from "./view"
 
-export function createVimModule(options?: unknown, enabled: Accessor<boolean> = () => true): PromptModule {
+export function createVimModule(options?: unknown, enabled: Accessor<boolean> = () => true, snippets?: SnippetController): PromptModule {
     const config = createVimConfig(options)
     const log = createVimLog(config)
     const state = createVimState(config.defaultMode, log)
@@ -27,7 +28,7 @@ export function createVimModule(options?: unknown, enabled: Accessor<boolean> =
             log("module.setup", { kind: ctx.kind, sessionID: ctx.sessionID, workspaceID: ctx.workspaceID })
         },
         renderAbove(ctx) {
-            return <VimKeyboard ctx={ctx} config={config} state={state} enabled={enabled} log={log} />
+            return <VimKeyboard ctx={ctx} config={config} state={state} snippets={snippets} enabled={enabled} log={log} />
         },
         renderRight(ctx) {
             return <VimStatus mode={state.mode} pending={() => readablePending(state.pending())} enabled={enabled} theme={ctx.api.theme.current} pendingDisplayDelay={config.pendingDisplayDelay} disabled={ctx.disabled} log={log} requestRender={ctx.requestRender} />
@@ -35,12 +36,19 @@ export function createVimModule(options?: unknown, enabled: Accessor<boolean> =
     }
 }
 
-function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: ReturnType<typeof createVimState>; enabled: Accessor<boolean>; log: VimLog }) {
+function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: ReturnType<typeof createVimState>; snippets?: SnippetController; enabled: Accessor<boolean>; log: VimLog }) {
     let cursorStyleMode = ""
     const vimee = createVimeeAdapter(props.state, props.config, props.log)
+    const preparedEvents = new WeakSet<KeyEvent>()
     props.log("keyboard.mount", { kind: props.ctx.kind })
 
     const cursorStyleTimer = setInterval(syncCursorStyle, 50)
+    const offKeyIntercept = props.ctx.api.keymap.intercept("key", ({ event }) => {
+        if (!props.enabled() || props.ctx.disabled || props.ctx.visible === false) return
+        const key = keyNotation(event)
+        if (!key || !passThroughKey(event, key, props.state.mode())) return
+        if (preparePassThroughKey(props.ctx, key, props.state.mode())) preparedEvents.add(event)
+    }, { priority: 100 })
 
     useKeyboard((event) => {
         props.log("keyboard.event", {
@@ -66,13 +74,11 @@ function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: Retu
         }
 
         if (passThroughKey(event, key, props.state.mode())) {
-            preparePassThroughKey(props.ctx, key, props.state.mode())
-            syncCursorStyle(true)
-            props.ctx.requestRender()
+            if (!preparedEvents.delete(event)) preparePassThroughKey(props.ctx, key, props.state.mode())
             return
         }
 
-        if (sendNavigationKey(event, props.ctx, key, props.state.mode())) {
+        if (sendNavigationKey(event, props.ctx, key, props.state.mode(), props.snippets)) {
             syncCursorStyle(true)
             props.ctx.requestRender()
             return
@@ -82,13 +88,14 @@ function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: Retu
         if (consumed) {
             event.preventDefault()
             event.stopPropagation()
+            syncCursorStyle(true)
+            props.ctx.requestRender()
         }
-        syncCursorStyle(true)
-        props.ctx.requestRender()
     })
 
     onCleanup(() => {
         props.log("keyboard.cleanup", { kind: props.ctx.kind })
+        offKeyIntercept()
         vimee.cleanup()
         clearInterval(cursorStyleTimer)
     })
@@ -116,14 +123,22 @@ function passThroughKey(event: KeyEvent, key: string, mode: string) {
 }
 
 function preparePassThroughKey(ctx: PromptContext, key: string, mode: string) {
-    if (mode !== "normal" || key !== "<CR>") return
+    if (mode !== "normal" || key !== "<CR>") return false
     const input = focusedInput(ctx)
-    if (!input?.plainText || input.cursorOffset === undefined) return
+    if (!input?.plainText || input.cursorOffset === undefined) return false
     input.cursorOffset = Math.min(input.cursorOffset + 1, input.plainText.length)
+    return true
 }
 
-function sendNavigationKey(event: KeyEvent, ctx: PromptContext, key: string, mode: string) {
+function sendNavigationKey(event: KeyEvent, ctx: PromptContext, key: string, mode: string, snippets?: SnippetController) {
     if (mode !== "normal") return false
+    const delta = snippetNavigationDelta(key)
+    if (delta !== 0 && snippets?.navigate?.(delta)) {
+        event.preventDefault()
+        event.stopPropagation()
+        return true
+    }
+
     const forwarded = commandNavigationKey(ctx, key)
     if (!forwarded) return false
 
@@ -133,6 +148,12 @@ function sendNavigationKey(event: KeyEvent, ctx: PromptContext, key: string, mod
     return true
 }
 
+function snippetNavigationDelta(key: string) {
+    if (key === "j") return 1
+    if (key === "k") return -1
+    return 0
+}
+
 function commandNavigationKey(ctx: PromptContext, key: string): ParsedKey | undefined {
     if (!isPromptFocused(ctx)) return navigationKey(key)
     if (!isSlashCommandToken(ctx)) return undefined

package/src/modules/vim/vimee.ts

@@ -10,6 +10,8 @@ import type { createVimState } from "./state"
 
 type VimState = ReturnType<typeof createVimState>
 type HostAction = VimeeAction | { type: "submit" }
+type HostKeybindAction = "normal" | "submit"
+type HostKeybindDefinition = KeybindDefinition & { hostAction?: HostKeybindAction }
 type HostRange = { start: number; end: number }
 
 const YANK_FLASH_MS = 250
@@ -33,11 +35,6 @@ export function createVimeeAdapter(state: VimState, config: VimConfig, log: VimL
             const ref = ctx.prompt()
             if (!ref) return false
 
-            const input = focusedInput(ctx)
-            const text = input?.plainText ?? ref.current.input
-            const offset = clamp(input?.cursorOffset ?? text.length, 0, text.length)
-            const map = mapForHostText(text, input)
-            const cursor = hostPosition(map, offset)
             let vimeeKey = keyForVimee(event, key)
             if (!vimeeKey) return false
 
@@ -46,16 +43,29 @@ export function createVimeeAdapter(state: VimState, config: VimConfig, log: VimL
                 return true
             }
 
-            if (state.mode() === "insert" && key === "<CR>") {
-                cancelPendingInsert(ctx, offset)
-                return false
-            }
-
             if (state.mode() === "insert") {
-                const consumed = handleInsertMode(event, vimeeKey, ctx, map, cursor, offset)
-                return consumed ?? false
+                if (key === "<CR>") {
+                    cancelPendingInsert(ctx)
+                    return false
+                }
+                if (vimeeKey === "Escape") {
+                    cancelPendingInsert(ctx, undefined, false)
+                    enterNormal(ctx)
+                    state.setPending("")
+                    updateTimeout(ctx)
+                    log("vimee.key", { key, mode: vim.mode, phase: vim.phase, cursor: vim.cursor, actions: ["mode-change"] })
+                    return true
+                }
+                return handleInsertKeybind(event, vimeeKey, ctx)
             }
 
+            const input = focusedInput(ctx)
+            const text = input?.plainText ?? ref.current.input
+            const offset = clamp(input?.cursorOffset ?? text.length, 0, text.length)
+
+            const map = mapForHostText(text, input)
+            const cursor = hostPosition(map, offset)
+
             const wasPending = keybinds?.isPending() ?? false
             const pendingBefore = pendingInsert
             sync(map, cursor)
@@ -172,20 +182,8 @@ export function createVimeeAdapter(state: VimState, config: VimConfig, log: VimL
         syncVisualSelection(input, currentMap, ctx)
     }
 
-    function handleInsertMode(event: KeyEvent, key: string, ctx: PromptContext, map: PromptMap, cursor: CursorPosition, offset: number) {
-        if (key === "Escape") {
-            cancelPendingInsert(ctx, offset, false)
-            sync(map, cursor)
-            const result = processKeystroke(key, vim, buffer, event.ctrl, false)
-            vim = result.newCtx
-            applyActions(result.actions as HostAction[], ctx, map)
-            syncMode(state, vim.mode)
-            state.setPending("")
-            log("vimee.key", { key, mode: vim.mode, phase: vim.phase, cursor: vim.cursor, actions: result.actions.map((action) => action.type) })
-            return true
-        }
-
-        if (!keybinds?.hasKeybinds("insert") && !keybinds?.isPending()) return undefined
+    function handleInsertKeybind(event: KeyEvent, key: string, ctx: PromptContext) {
+        if (!keybinds?.hasKeybinds("insert") && !keybinds?.isPending()) return false
 
         const wasPending = keybinds.isPending()
         const pendingBefore = pendingInsert
@@ -198,25 +196,67 @@ export function createVimeeAdapter(state: VimState, config: VimConfig, log: VimL
                 updateTimeout(ctx)
                 return true
             case "matched": {
-                sync(map, cursor)
-                const actions = applyKeybind(resolved.definition, map)
-                applyActions(actions, ctx, map)
-                syncMode(state, vim.mode)
+                if (applyInsertKeybind(resolved.definition, ctx)) {
+                    pendingInsert = ""
+                    state.setPending("")
+                    updateTimeout(ctx)
+                    log("vimee.keybind", { key, mode: vim.mode, phase: vim.phase, cursor: vim.cursor, actions: ["mode-change"] })
+                    return true
+                }
+
+                if (wasPending && pendingBefore) flushPendingInsert(ctx, pendingBefore)
                 pendingInsert = ""
                 state.setPending("")
                 updateTimeout(ctx)
-                log("vimee.keybind", { key, mode: vim.mode, phase: vim.phase, cursor: vim.cursor, actions: actions.map((action) => action.type) })
-                return true
+                log("vimee.keybind.unsupported", { key })
+                return false
             }
             case "none":
-                if (wasPending && pendingBefore) flushPendingInsert(ctx, pendingBefore, offset)
+                if (wasPending && pendingBefore) flushPendingInsert(ctx, pendingBefore)
                 pendingInsert = ""
                 state.setPending("")
                 updateTimeout(ctx)
-                return wasPending ? false : undefined
+                return false
+        }
+    }
+
+    function applyInsertKeybind(definition: KeybindDefinition, ctx: PromptContext) {
+        switch (insertHostAction(definition)) {
+            case "normal":
+                enterNormal(ctx)
+                return true
+            case "submit":
+                ctx.prompt()?.submit()
+                return true
+            default:
+                return false
         }
     }
 
+    function enterNormal(ctx: PromptContext) {
+        const ref = ctx.prompt()
+        const input = focusedInput(ctx)
+        const text = input?.plainText ?? ref?.current.input ?? ""
+        const offset = clamp(input?.cursorOffset ?? text.length, 0, text.length)
+
+        if (input && text.length > 0) {
+            input.cursorOffset = Math.max(0, offset - 1)
+            clampNormalCursor(input)
+        }
+
+        vim = { ...resetContext(vim), mode: "normal", statusMessage: "" }
+        nativeInsertUndoSaved = false
+        syncMode(state, "normal")
+    }
+
+    function insertHostAction(definition: KeybindDefinition): HostKeybindAction | undefined {
+        const action = (definition as HostKeybindDefinition).hostAction
+        if (action) return action
+        if ("execute" in definition) return undefined
+        if (definition.keys === "<Esc>" || definition.keys === "<C-[>" || definition.keys === "Escape") return "normal"
+        return undefined
+    }
+
     function applyKeybind(definition: KeybindDefinition, map: PromptMap) {
         if ("execute" in definition) {
             const actions = definition.execute(vim, buffer) as HostAction[]
@@ -299,12 +339,8 @@ export function createVimeeAdapter(state: VimState, config: VimConfig, log: VimL
         const currentOffset = input?.cursorOffset ?? insertAt
         const next = text.slice(0, insertAt) + value + text.slice(insertAt)
         setInput(ref, next)
-        activeMap = createPromptMap(next, input)
-        rememberMap(activeMap)
-        buffer.replaceContent(activeMap.vimText)
         const nextOffset = currentOffset >= insertAt ? currentOffset + value.length : currentOffset
         if (input) input.cursorOffset = nextOffset
-        vim = { ...vim, cursor: hostPosition(activeMap, nextOffset) }
     }
 
     function cursorOffset(map: PromptMap, position: CursorPosition) {
@@ -553,14 +589,14 @@ function createKeybinds(config: VimConfig, log: VimLog): KeybindMap | undefined
     return count > 0 ? map : undefined
 }
 
-function keybindAction(action: string): KeybindDefinition {
+function keybindAction(action: string): HostKeybindDefinition {
     switch (action) {
         case "normal":
-            return { keys: "<Esc>" }
+            return { keys: "<Esc>", hostAction: "normal" }
         case "insert":
             return { keys: "i" }
         case "submit":
-            return { execute: () => [{ type: "submit" } as unknown as VimeeAction] }
+            return { execute: () => [{ type: "submit" } as unknown as VimeeAction], hostAction: "submit" }
         default:
             return { keys: action }
     }

package/src/plugin.tsx

@@ -5,25 +5,31 @@ import { PromptRoot } from "./prompt/root"
 import type { PromptModule } from "./prompt/types"
 import { createVimModule } from "./modules/vim"
 import { createSnippetsModule } from "./modules/snippets"
+import type { SnippetController } from "./modules/snippets/types"
 import { checkAutoUpdate } from "./update"
 
 const tui: TuiPlugin = async (api, options, meta) => {
     const vimEnabledKey = `${meta.id}:enabled`
     const [vimEnabled, setVimEnabled] = createSignal(api.kv.get(vimEnabledKey, true) === true)
 
-    api.command.register(() => [{
-        title: vimEnabled() ? "Disable Vim Mode" : "Enable Vim Mode",
-        value: "opencode-vim.toggle",
-        description: vimEnabled() ? "Turn off Vim key handling" : "Turn on Vim key handling",
-        category: "Vim",
-        slash: { name: "vim" },
-        onSelect() {
-            const next = !vimEnabled()
-            setVimEnabled(next)
-            api.kv.set(vimEnabledKey, next)
-            api.ui.toast({ variant: "info", message: `Vim mode ${next ? "enabled" : "disabled"}` })
-        },
-    }])
+    api.keymap.registerLayer({
+        commands: [
+            {
+                namespace: "palette",
+                name: "opencode-vim.toggle",
+                title: "Toggle Vim Mode",
+                desc: "Enable or disable Vim key handling",
+                category: "Vim",
+                slashName: "vim",
+                run() {
+                    const next = !vimEnabled()
+                    setVimEnabled(next)
+                    api.kv.set(vimEnabledKey, next)
+                    api.ui.toast({ variant: "info", message: `Vim mode ${next ? "enabled" : "disabled"}` })
+                },
+            },
+        ],
+    })
 
     if (readAutoUpdate(options)) {
         let timer: Timer | undefined
@@ -46,8 +52,9 @@ const tui: TuiPlugin = async (api, options, meta) => {
         if (cached) return cached
 
         const modules: PromptModule[] = []
-        if (hasSnippetsPlugin(api)) modules.push(createSnippetsModule())
-        modules.push(createVimModule(options, vimEnabled))
+        const snippets: SnippetController = {}
+        if (hasSnippetsPlugin(api)) modules.push(createSnippetsModule(snippets))
+        modules.push(createVimModule(options, vimEnabled, snippets))
         moduleCache.set(key, modules)
         return modules
     }