opencode-vim 0.0.9 → 0.0.10

package/package.json

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

package/src/modules/vim/index.tsx

@@ -2,6 +2,7 @@
 import type { KeyEvent, ParsedKey } from "@opentui/core"
 import { useKeyboard } from "@opentui/solid"
 import { onCleanup } from "solid-js"
+import type { Accessor } from "solid-js"
 import type { PromptContext, PromptModule } from "../../prompt/types"
 import { applyVimCursorStyle, focusedInput } from "./actions"
 import type { VimConfig } from "./config"
@@ -13,7 +14,7 @@ import { createVimState } from "./state"
 import { createVimeeAdapter } from "./vimee"
 import { VimStatus } from "./view"
 
-export function createVimModule(options?: unknown): PromptModule {
+export function createVimModule(options?: unknown, enabled: Accessor<boolean> = () => true): PromptModule {
     const config = createVimConfig(options)
     const log = createVimLog(config)
     const state = createVimState(config.defaultMode, log)
@@ -26,15 +27,15 @@ export function createVimModule(options?: unknown): PromptModule {
             log("module.setup", { kind: ctx.kind, sessionID: ctx.sessionID, workspaceID: ctx.workspaceID })
         },
         renderAbove(ctx) {
-            return <VimKeyboard ctx={ctx} config={config} state={state} log={log} />
+            return <VimKeyboard ctx={ctx} config={config} state={state} enabled={enabled} log={log} />
         },
         renderRight(ctx) {
-            return <VimStatus mode={state.mode} pending={() => readablePending(state.pending())} theme={ctx.api.theme.current} pendingDisplayDelay={config.pendingDisplayDelay} disabled={ctx.disabled} log={log} requestRender={ctx.requestRender} />
+            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} />
         },
     }
 }
 
-function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: ReturnType<typeof createVimState>; log: VimLog }) {
+function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: ReturnType<typeof createVimState>; enabled: Accessor<boolean>; log: VimLog }) {
     let cursorStyleMode = ""
     const vimee = createVimeeAdapter(props.state, props.config, props.log)
     props.log("keyboard.mount", { kind: props.ctx.kind })
@@ -53,8 +54,8 @@ function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: Retu
             pending: props.state.pending(),
         })
 
-        if (props.ctx.disabled || props.ctx.visible === false) {
-            props.log("keyboard.skip", { disabled: props.ctx.disabled, visible: props.ctx.visible })
+        if (!props.enabled() || props.ctx.disabled || props.ctx.visible === false) {
+            props.log("keyboard.skip", { enabled: props.enabled(), disabled: props.ctx.disabled, visible: props.ctx.visible })
             return
         }
 

package/src/modules/vim/view.tsx

@@ -10,6 +10,7 @@ const STATUS_SYNC_MS = 50
 type VimStatusProps = {
     mode: Accessor<VimMode>
     pending: Accessor<string | undefined>
+    enabled: Accessor<boolean>
     theme: PromptContext["api"]["theme"]["current"]
     pendingDisplayDelay?: number
     disabled?: boolean
@@ -20,6 +21,7 @@ type VimStatusProps = {
 export function VimStatus(props: VimStatusProps) {
     const [mode, setMode] = createSignal(props.mode())
     const [pending, setPending] = createSignal<string | undefined>()
+    const [enabled, setEnabled] = createSignal(props.enabled())
     let pendingTimer: ReturnType<typeof setTimeout> | undefined
     let scheduledPending: string | undefined
 
@@ -33,6 +35,13 @@ export function VimStatus(props: VimStatusProps) {
             props.requestRender?.()
         }
 
+        const nextEnabled = props.enabled()
+        if (enabled() !== nextEnabled) {
+            props.log?.("status.enabled", { from: enabled(), to: nextEnabled })
+            setEnabled(nextEnabled)
+            props.requestRender?.()
+        }
+
         syncPending(nextPending)
     }
 
@@ -44,8 +53,8 @@ export function VimStatus(props: VimStatusProps) {
 
     return (
         <box paddingLeft={1} paddingRight={1} flexDirection="row">
-            {pending() ? <text fg={props.theme.info}>{pending()} </text> : undefined}
-            <text fg={props.disabled ? props.theme.textMuted : mode() === "insert" ? props.theme.success : props.theme.warning}>{modeLabel(mode())}</text>
+            {enabled() && pending() ? <text fg={props.theme.info}>{pending()} </text> : undefined}
+            {enabled() ? <text fg={props.disabled ? props.theme.textMuted : mode() === "insert" ? props.theme.success : props.theme.warning}>{modeLabel(mode())}</text> : undefined}
         </box>
     )
 

package/src/plugin.tsx

@@ -1,5 +1,6 @@
 /** @jsxImportSource @opentui/solid */
 import type { TuiPlugin, TuiPluginApi, TuiPluginModule } from "@opencode-ai/plugin/tui"
+import { createSignal } from "solid-js"
 import { PromptRoot } from "./prompt/root"
 import type { PromptModule } from "./prompt/types"
 import { createVimModule } from "./modules/vim"
@@ -7,6 +8,23 @@ import { createSnippetsModule } from "./modules/snippets"
 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"}` })
+        },
+    }])
+
     if (readAutoUpdate(options)) {
         let timer: Timer | undefined
         api.lifecycle.onDispose(() => {
@@ -29,7 +47,7 @@ const tui: TuiPlugin = async (api, options, meta) => {
 
         const modules: PromptModule[] = []
         if (hasSnippetsPlugin(api)) modules.push(createSnippetsModule())
-        modules.push(createVimModule(options))
+        modules.push(createVimModule(options, vimEnabled))
         moduleCache.set(key, modules)
         return modules
     }