opencode-vim 0.0.5 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-vim",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "exports": {
     "./tui": {
       "import": "./tui.tsx"

package/src/modules/vim/index.tsx

@@ -111,7 +111,7 @@ function readablePending(sequence: string) {
 
 function passThroughKey(event: KeyEvent, key: string, mode: string) {
     if (mode !== "normal") return false
-    return event.super === true || isArrowKey(key) || key === "<CR>"
+    return event.super === true || isArrowKey(key) || key === "<CR>" || key === "<C-c>"
 }
 
 function preparePassThroughKey(ctx: PromptContext, key: string, mode: string) {
@@ -123,7 +123,7 @@ function preparePassThroughKey(ctx: PromptContext, key: string, mode: string) {
 
 function sendNavigationKey(event: KeyEvent, ctx: PromptContext, key: string, mode: string) {
     if (mode !== "normal") return false
-    const forwarded = navigationKey(key)
+    const forwarded = commandNavigationKey(ctx, key)
     if (!forwarded) return false
 
     event.preventDefault()
@@ -132,6 +132,26 @@ function sendNavigationKey(event: KeyEvent, ctx: PromptContext, key: string, mod
     return true
 }
 
+function commandNavigationKey(ctx: PromptContext, key: string): ParsedKey | undefined {
+    if (!isPromptFocused(ctx)) return navigationKey(key)
+    if (!isSlashCommandToken(ctx)) return undefined
+    if (key === "j") return arrowKey("down", "\u001B[B")
+    if (key === "k") return arrowKey("up", "\u001B[A")
+    return undefined
+}
+
+function isPromptFocused(ctx: PromptContext) {
+    return ctx.prompt()?.focused === true && !!focusedInput(ctx)
+}
+
+function isSlashCommandToken(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)))
+}
+
 function navigationKey(key: string): ParsedKey | undefined {
     if (key === "h") return arrowKey("left", "\u001B[D")
     if (key === "j") return arrowKey("down", "\u001B[B")
@@ -156,6 +176,6 @@ function arrowKey(name: string, sequence: string): ParsedKey {
         raw: sequence,
         eventType: "press",
         source: "raw",
-        super: true,
+        super: false,
     }
 }

package/src/update.ts

@@ -1,11 +1,12 @@
 import { rm } from "node:fs/promises"
-import { dirname, join } from "node:path"
+import { basename, dirname, join } from "node:path"
 import { fileURLToPath } from "node:url"
 import type { TuiPluginMeta } from "@opencode-ai/plugin/tui"
 
 type PackageJson = {
     name?: string
     version?: string
+    dependencies?: Record<string, string>
 }
 
 type UpdateResult =
@@ -25,8 +26,9 @@ export async function checkAutoUpdate(meta: TuiPluginMeta, signal: AbortSignal):
     const latest = await fetchLatestVersion(pkg.name, signal)
     if (!latest || !isVersionNewer(latest, pkg.version)) return { updated: false }
 
+    const removeDir = await updateRemoveDir(packageDir, pkg.name)
     try {
-        await rm(packageDir, { recursive: true, force: true })
+        await rm(removeDir, { recursive: true, force: true })
     } catch {
         return { updated: false, error: "remove_failed", name: pkg.name, current: pkg.version, latest }
     }
@@ -47,6 +49,15 @@ async function findPackageDir() {
     }
 }
 
+async function updateRemoveDir(packageDir: string, name: string) {
+    const nodeModulesDir = dirname(packageDir)
+    if (basename(nodeModulesDir) !== "node_modules") return packageDir
+
+    const wrapperDir = dirname(nodeModulesDir)
+    const wrapperPkg = await readPackageJson(join(wrapperDir, "package.json"))
+    return wrapperPkg?.dependencies?.[name] ? wrapperDir : packageDir
+}
+
 async function readPackageJson(path: string): Promise<PackageJson | undefined> {
     try {
         const file = Bun.file(path)