opencode-vim-navigation 0.1.3 → 0.1.5

package/README.md

@@ -7,6 +7,13 @@ scrollback—while keeping your prompt draft safe.
 Press **Ctrl+Q** to switch between INPUT and NAV. A compact, right-aligned
 mode label appears on a divider immediately above the prompt.
 
+When the native plan-review form is the only pending form, Ctrl+Q also enters
+NAV even though the prompt does not own focus. Navigation scrolls the session
+transcript behind the form; NAV consumes Enter, Escape, and all other
+non-navigation keys so they cannot approve, cancel, or edit the form. Press
+Ctrl+Q again to return to the form. Permission prompts and unrelated forms
+continue to own their keys and block NAV.
+
 ## Compatibility
 
 Tested with **OpenCode 2.1.4**. This uses OpenCode V2's TUI plugin API, not the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-vim-navigation",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Modal Vim-style transcript navigation for the OpenCode terminal UI",
   "license": "MIT",
   "author": "Raaghav Arya",
@@ -17,11 +17,20 @@
     "registry": "https://registry.npmjs.org/"
   },
   "type": "module",
-  "keywords": ["opencode", "opencode-plugin", "tui", "vim", "navigation"],
+  "keywords": [
+    "opencode",
+    "opencode-plugin",
+    "tui",
+    "vim",
+    "navigation"
+  ],
   "exports": {
     "./tui": "./tui.ts"
   },
-  "files": ["tui.ts", "src/"],
+  "files": [
+    "tui.ts",
+    "src/"
+  ],
   "peerDependencies": {
     "@opentui/core": ">=0.6.8 <0.7.0",
     "@opentui/solid": ">=0.6.8 <0.7.0",

package/src/adapter.mjs

@@ -16,7 +16,7 @@ export function createSetup({ InputRenderable, TextareaRenderable, createElement
       const route = ui.router.current()
       return route.type === "session" ? route.sessionID : undefined
     }
-    const promptFocused = () => {
+    const promptEditor = () => {
       const editor = renderer.currentFocusedEditor
       const traits = editor?.traits
       return editor instanceof TextareaRenderable && !(editor instanceof InputRenderable)
@@ -24,20 +24,50 @@ export function createSetup({ InputRenderable, TextareaRenderable, createElement
         && !traits.status
         && !traits.capture?.includes("navigate") && !traits.capture?.includes("submit")
         && !traits.capture?.includes("autocomplete")
+        ? editor
+        : undefined
     }
-    const blocked = () => {
+    const promptFocused = () => promptEditor() !== undefined
+    let hiddenCursor
+    const restoreCursor = () => {
+      if (!hiddenCursor) return
+      if (!hiddenCursor.editor.isDestroyed) hiddenCursor.editor.showCursor = hiddenCursor.showCursor
+      hiddenCursor = undefined
+    }
+    const syncCursor = (active = nav()) => {
+      const editor = active ? promptEditor() : undefined
+      if (hiddenCursor && hiddenCursor.editor !== editor) restoreCursor()
+      if (editor && !hiddenCursor && editor.showCursor === true && !editor.isDestroyed) {
+        hiddenCursor = { editor, showCursor: true }
+        editor.showCursor = false
+      }
+    }
+    const visibleForms = () => {
       const id = session()
-      if (!id) return false
+      if (!id) return []
       const info = data.session.get(id)
       const location = info?.location ?? context.location
       // Match the host's visible request set: root sessions aggregate their
       // descendants; child sessions show global/location forms only.
-      if (data.session.form.list("global", location)?.length) return true
-      if (info?.parentID) return false
+      const forms = [...(data.session.form.list("global", location) ?? [])]
+      if (info?.parentID) return forms
       const ids = new Set([id, ...data.session.family(id)])
-      return [...ids].some((sessionID) =>
-        data.session.permission.list(sessionID)?.length || data.session.form.list(sessionID)?.length,
-      )
+      for (const sessionID of ids) forms.push(...(data.session.form.list(sessionID) ?? []))
+      return forms
+    }
+    const planReviewForm = () => {
+      const forms = visibleForms()
+      return forms.length > 0 && forms.every((form) => form.metadata?.plugin === "raaghav.plan-review")
+    }
+    const blocked = () => {
+      const id = session()
+      if (!id) return false
+      const info = data.session.get(id)
+      if (info?.parentID) return visibleForms().some((form) => form.metadata?.plugin !== "raaghav.plan-review")
+      const location = info?.location ?? context.location
+      if (data.session.permission.list(id)?.length) return true
+      if (data.session.family(id).some((sessionID) => data.session.permission.list(sessionID)?.length)) return true
+      return visibleForms().some((form) => form.metadata?.plugin !== "raaghav.plan-review")
     }
     const required = ["session.line.up", "session.line.down", "session.page.up", "session.page.down", "session.first", "session.last"]
     const controller = navigation({
@@ -45,6 +75,7 @@ export function createSetup({ InputRenderable, TextareaRenderable, createElement
       mode: keymap.mode,
       promptFocused,
       blocked,
+      planReviewForm,
       ready: () => {
         const commands = new Set(keymap.commands().map((command) => command.id))
         if (required.every((id) => commands.has(id))) return true
@@ -52,9 +83,15 @@ export function createSetup({ InputRenderable, TextareaRenderable, createElement
         return false
       },
       dispatch: (id) => keymap.dispatch(id),
-      changed: setNav,
+      changed: (active) => {
+        setNav(active)
+        syncCursor(active)
+      },
     })
-    const cleanups = [() => controller.leave()]
+    const cleanups = [() => {
+      controller.leave()
+      syncCursor(false)
+    }]
     let cleaned = false
     const cleanup = () => {
       if (cleaned) return
@@ -78,8 +115,10 @@ export function createSetup({ InputRenderable, TextareaRenderable, createElement
           nav()
           session()
           blocked()
+          planReviewForm()
           promptFocused()
           controller.sync()
+          syncCursor()
         })
       })
       cleanups.push(ui.slot({

package/src/navigation.mjs

@@ -6,6 +6,8 @@ export function navigation(context) {
   let pendingG = false
 
   const active = () => popMode !== undefined
+  const planReview = () => context.planReviewForm?.() === true
+  const navigationAllowed = () => !context.blocked?.() && (context.promptFocused() || planReview())
   function leave(follow = false) {
     if (!active()) return
     const release = popMode
@@ -16,8 +18,8 @@ export function navigation(context) {
     if (follow) context.dispatch("session.last")
   }
   function sync() {
-    if (active() && (context.session() !== sessionID || context.blocked?.()
-      || (context.mode.current() === MODE && !context.promptFocused()))) leave()
+    if (active() && (context.session() !== sessionID || !navigationAllowed()
+      || (context.mode.current() === MODE && !context.promptFocused() && !planReview()))) leave()
   }
   function scroll(id) {
     context.dispatch(id)
@@ -28,11 +30,12 @@ export function navigation(context) {
   }
   function key(event) {
     sync()
-    if (!context.session() || context.blocked?.()) return
+    if (!context.session() || !navigationAllowed()) return
     // Dialogs, permission forms, autocomplete, and embedded terminals own their keys.
     const mode = context.mode.current()
-    if (mode !== "base" && mode !== MODE) return
-    if (!context.promptFocused()) {
+    const isPlanReview = planReview()
+    if (mode !== "base" && mode !== MODE && !isPlanReview) return
+    if (!context.promptFocused() && !isPlanReview) {
       if (active()) leave()
       return
     }
@@ -96,7 +99,7 @@ export function navigation(context) {
   function paste(event) {
     sync()
     if (active() && context.mode.current() === MODE) {
-      if (!context.promptFocused()) leave()
+      if (!context.promptFocused() && !planReview()) leave()
       else consume(event)
     }
   }