opencode-vim 0.0.13 → 0.0.15

package/bun.lock

@@ -13,6 +13,7 @@
       },
       "devDependencies": {
         "@opencode-ai/plugin": "1.14.44",
+        "@types/bun": "^1.3.14",
       },
     },
   },
@@ -119,6 +120,10 @@
 
     "@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
+    "@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="],
+
+    "@types/node": ["@types/node@25.7.0", "", { "dependencies": { "undici-types": "~7.21.0" } }, "sha512-z+pdZyxE+RTQE9AcboAZCb4otwcrvgHD+GlBpPgn0emDVt0ohrTMhAwlr2Wd9nZ+nihhYFxO2pThz3C5qSu2Eg=="],
+
     "@vimee/core": ["@vimee/core@0.3.0", "", {}, "sha512-aC44fw6HhmjrbJMafAk3oUZIDpFbgNebbDsWwMIFD0WwnOUZPETgzU3HYQetmwz0e38JY3I/g8CJXRQjspgJZw=="],
 
     "ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="],
@@ -139,6 +144,8 @@
 
     "bun-ffi-structs": ["bun-ffi-structs@0.2.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-N/ZWtyN0piZlrXQT7TO0V+q952orYqkfhXRXM1Hcbb+R3QSiBH4vLnib187Mrs1H7pWIYECAmPeapGYDOMCl+w=="],
 
+    "bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="],
+
     "caniuse-lite": ["caniuse-lite@1.0.30001791", "", {}, "sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ=="],
 
     "convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="],
@@ -273,6 +280,8 @@
 
     "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
 
+    "undici-types": ["undici-types@7.21.0", "", {}, "sha512-w9IMgQrz4O0YN1LtB7K5P63vhlIOvC7opSmouCJ+ZywlPAlO9gIkJ+otk6LvGpAs2wg4econaCz3TvQ9xPoyuQ=="],
+
     "update-browserslist-db": ["update-browserslist-db@1.2.3", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w=="],
 
     "uuid": ["uuid@13.0.1", "", { "bin": { "uuid": "dist-node/bin/uuid" } }, "sha512-9ezox2roIft6ExBVTVqibSd5dc5/47Sw/uY6b4SjQUT2TzQ0tltNquWA46y4xPQmdZYqvnio22SgWd41M86+jw=="],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-vim",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "exports": {
     "./tui": {
       "import": "./tui.tsx"
@@ -14,6 +14,7 @@
     "@vimee/core": "^0.3.0"
   },
   "devDependencies": {
-    "@opencode-ai/plugin": "1.14.44"
+    "@opencode-ai/plugin": "1.14.44",
+    "@types/bun": "^1.3.14"
   }
 }

package/src/modules/vim/index.tsx

@@ -156,7 +156,7 @@ function snippetNavigationDelta(key: string) {
 
 function commandNavigationKey(ctx: PromptContext, key: string): ParsedKey | undefined {
     if (!isPromptFocused(ctx)) return navigationKey(key)
-    if (!isSlashCommandToken(ctx)) return undefined
+    if (!isNativeCompletionToken(ctx)) return undefined
     if (key === "j") return arrowKey("down", "\u001B[B")
     if (key === "k") return arrowKey("up", "\u001B[A")
     return undefined
@@ -166,12 +166,12 @@ function isPromptFocused(ctx: PromptContext) {
     return ctx.prompt()?.focused === true && !!focusedInput(ctx)
 }
 
-function isSlashCommandToken(ctx: PromptContext) {
+function isNativeCompletionToken(ctx: PromptContext) {
     const text = ctx.prompt()?.current.input ?? focusedInput(ctx)?.plainText ?? ""
-    if (!text.startsWith("/")) return false
     const input = focusedInput(ctx)
     const offset = Math.max(0, input?.cursorOffset ?? text.length)
-    return !/\s/.test(text.slice(0, Math.min(offset + 1, text.length)))
+    const beforeCursor = text.slice(0, Math.min(offset + 1, text.length))
+    return /^\/\S*$/.test(beforeCursor) || /(?:^|\s)@\S*$/.test(beforeCursor)
 }
 
 function navigationKey(key: string): ParsedKey | undefined {

package/src/prompt/root.tsx

@@ -2,24 +2,37 @@
 import { onCleanup } from "solid-js"
 import type { JSX } from "@opentui/solid"
 import { HostPrompt } from "./host"
-import { sortModules } from "./modules"
-import { createPromptRef } from "./ref"
-import type { PromptRootProps } from "./types"
+import { notifyPromptRef, sortModules } from "./modules"
+import type { PromptContext, PromptRootProps } from "./types"
 
 export function PromptRoot(props: PromptRootProps) {
     const modules = sortModules(props.modules)
     const api = props.api
-    const ctx = createPromptRef(modules, {
+    let current: ReturnType<PromptContext["prompt"]>
+    const ctx: PromptContext = {
         api,
         slot: props.slot,
         kind: props.kind,
-        sessionID: props.sessionID,
-        workspaceID: props.workspaceID,
-        visible: props.visible,
-        disabled: props.disabled,
+        get sessionID() {
+            return props.sessionID
+        },
+        get workspaceID() {
+            return props.workspaceID
+        },
+        get visible() {
+            return props.visible
+        },
+        get disabled() {
+            return props.disabled
+        },
+        prompt: () => current,
+        setPromptRef(ref) {
+            current = ref
+            notifyPromptRef(modules, ref, ctx)
+        },
         submitHost: () => props.onSubmit?.(),
         requestRender: () => api.renderer.requestRender(),
-    })
+    }
 
     const cleanups = modules.flatMap((module) => {
         const cleanup = module.setup?.(ctx)

package/src/prompt/ref.ts

@@ -1,17 +0,0 @@
-import type { TuiPromptRef } from "@opencode-ai/plugin/tui"
-import type { PromptContext, PromptModule } from "./types"
-import { notifyPromptRef } from "./modules"
-
-export function createPromptRef(modules: PromptModule[], ctx: Omit<PromptContext, "prompt" | "setPromptRef">) {
-    let current: TuiPromptRef | undefined
-    const context = {
-        ...ctx,
-        prompt: () => current,
-        setPromptRef(ref: TuiPromptRef | undefined) {
-            current = ref
-            notifyPromptRef(modules, ref, context)
-        },
-    } satisfies PromptContext
-
-    return context
-}