add yy to copymode

Author: BrettKulp

README.md

@@ -94,6 +94,7 @@ Works similarly to tmux copy mode within opencode tui.
 - Navigate with `h` `j` `k` `l` or arrow keys (`Left` `Down` `Up` `Right`).
 - Press `v` / `V` to start character-wise or line-wise selection.
 - `y` yanks to the vim register.
+- `yy` yanks the current line and exits copy mode.
 - `Enter` copies to the system clipboard.
 - `Escape` exits visual mode, `q` exits copy mode.
 - `z` `zt` `zz` `zb` adjust copy-mode scroll positioning.

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx

@@ -93,6 +93,7 @@ export type PromptProps = {
     exit: () => void
     visual: (mode: "char" | "line") => void
     yank: () => { text: string; linewise: boolean } | null
+    yankLine: () => { text: string; linewise: boolean } | null
     copy: () => Promise<void> | void
     isVisual: () => boolean
     exitVisual: () => void
@@ -514,10 +515,17 @@ export function Prompt(props: PromptProps) {
     copyExitVisual() {
       props.copy?.exitVisual()
     },
+    copyExit() {
+      props.copy?.exit()
+    },
     copyYank() {
       const reg = props.copy?.yank()
       if (reg) setVimRegister(reg, true)
     },
+    copyYankLine() {
+      const reg = props.copy?.yankLine()
+      if (reg) setVimRegister(reg, true)
+    },
     copyCopy() {
       return props.copy?.copy()
     },

packages/opencode/src/cli/cmd/tui/component/vim/vim-handler.ts

@@ -83,7 +83,9 @@ export function createVimHandler(input: {
   copy?: (action: VimCopyMove) => void
   copyVisual?: (mode: "char" | "line") => void
   copyExitVisual?: () => void
+  copyExit?: () => void
   copyYank?: () => void
+  copyYankLine?: () => void
   copyCopy?: () => void
   copyIsVisual?: () => boolean
   copyJump?: (action: VimJump) => void
@@ -1011,8 +1013,25 @@ export function createVimHandler(input: {
     }
 
     if (key === "y") {
-      input.copyYank?.()
-      input.state.setMode("normal")
+      // If in visual mode, yank selection and exit (original y behavior)
+      if (input.copyIsVisual?.()) {
+        input.copyYank?.()
+        input.state.setMode("normal")
+        event.preventDefault()
+        return true
+      }
+      // Not in visual mode - handle yy for yanking current line
+      if (input.state.pending() === "y") {
+        input.state.clearPending()
+        input.copyYankLine?.()
+        setTimeout(() => {
+          input.state.setMode("normal")
+          input.copyExit?.()
+        }, 150)
+        event.preventDefault()
+        return true
+      }
+      input.state.setPending("y")
       event.preventDefault()
       return true
     }
@@ -1227,6 +1246,11 @@ export function createVimHandler(input: {
       return true
     }
 
+    // Clear y pending if no handler matched
+    if (input.state.pending() === "y") {
+      input.state.clearPending()
+    }
+
     return false
   }
 

packages/opencode/src/cli/cmd/tui/routes/session/copy-mode.ts

@@ -59,6 +59,7 @@ export function createCopyMode(input: {
   toBottom: () => void
 }) {
   const [state, setState] = createSignal<CopyState>({ ...empty })
+  const [yankLineFlash, setYankLineFlash] = createSignal<number | undefined>(undefined)
 
   // --- row building ---
 
@@ -329,6 +330,7 @@ export function createCopyMode(input: {
   }
 
   function exit() {
+    setYankLineFlash(undefined)
     setState({ ...empty })
     input.toBottom()
   }
@@ -484,6 +486,23 @@ export function createCopyMode(input: {
     return { text, linewise: false }
   }
 
+  function yankLine() {
+    const list = rows()
+    const s = state()
+    const row = list[s.idx]
+    if (!row) return null
+    const cache = new Map(
+      input
+        .scroll()
+        .getChildren()
+        .map((c) => [c.id, c]),
+    )
+    const text = signedText(row, cache)
+    setYankLineFlash(s.idx)
+    setTimeout(() => setYankLineFlash(undefined), 150)
+    return { text, linewise: true }
+  }
+
   async function copy() {
     const text = selectionText()
     if (!text) return
@@ -593,7 +612,36 @@ export function createCopyMode(input: {
 
   const highlights = createMemo(() => {
     const s = state()
-    if (!s.visual || !s.anchor) return new Map<string, CopyHighlight[]>()
+    const flashIdx = yankLineFlash()
+    const out = new Map<string, CopyHighlight[]>()
+
+    // Handle yy flash highlight
+    if (flashIdx !== undefined) {
+      const list = rows()
+      const row = list[flashIdx]
+      if (row) {
+        const cache = new Map(
+          input
+            .scroll()
+            .getChildren()
+            .map((c) => [c.id, c]),
+        )
+        const text = rowText(row, cache) || ""
+        const min = copyMin(row, cache)
+        const max = text.length > 0 ? min + text.length - 1 : min
+        const cur = out.get(row.id) ?? []
+        cur.push({
+          line: row.line,
+          left: min,
+          right: max,
+          text: text.slice(Math.max(0, min - min), Math.max(0, max - min + 1)),
+        })
+        out.set(row.id, cur)
+      }
+    }
+
+    // Handle visual mode highlights
+    if (!s.visual || !s.anchor) return out
     const list = rows()
     const cache = new Map(
       input
@@ -605,7 +653,6 @@ export function createCopyMode(input: {
     const h = { idx: s.idx, col: s.col }
     const start = a.idx <= h.idx ? a : h
     const end = a.idx <= h.idx ? h : a
-    const out = new Map<string, CopyHighlight[]>()
     for (let i = start.idx; i <= end.idx; i++) {
       const r = list[i]
       if (!r) continue
@@ -634,6 +681,7 @@ export function createCopyMode(input: {
       exit,
       visual,
       yank,
+      yankLine,
       copy,
       isVisual: () => !!state().visual,
       exitVisual,
@@ -653,6 +701,7 @@ export function createCopyMode(input: {
     },
     row,
     highlights,
+    yankLineFlash: () => yankLineFlash(),
     active: () => state().active,
     clamp,
     state,

packages/opencode/test/cli/tui/vim-motions.test.ts

@@ -186,6 +186,7 @@ function createHandler(
   const copyVisualCalls: Array<"char" | "line"> = []
   const copyScrollCalls: Array<"center" | "top" | "bottom"> = []
   let copyYanks = 0
+  let copyYankLines = 0
   let copyCopies = 0
   let copyExitVisuals = 0
 
@@ -306,6 +307,10 @@ function createHandler(
       copyYanks++
       state.setRegister({ text: options?.copy?.text ?? "picked", linewise: false })
     },
+    copyYankLine() {
+      copyYankLines++
+      state.setRegister({ text: options?.copy?.text ?? "picked line", linewise: true })
+    },
     copyCopy() {
       copyCopies++
     },
@@ -388,6 +393,7 @@ function createHandler(
     copyVisualCalls,
     copyScrollCalls,
     copyYanks: () => copyYanks,
+    copyYankLines: () => copyYankLines,
     copyCopies: () => copyCopies,
     copyExitVisuals: () => copyExitVisuals,
     copyCol,
@@ -4362,6 +4368,29 @@ describe("copy mode", () => {
     expect(ctx.state.mode()).toBe("normal")
   })
 
+  test("yy yanks current line and exits copy mode", async () => {
+    const ctx = createHandler("abc", { mode: "copy", copy: { text: "picked line" } })
+
+    const first = createEvent("y")
+    expect(ctx.handler.handleKey(first.event)).toBe(true)
+    expect(first.prevented()).toBe(true)
+    expect(ctx.copyYankLines()).toBe(0)
+    expect(ctx.state.pending()).toBe("y")
+
+    const second = createEvent("y")
+    expect(ctx.handler.handleKey(second.event)).toBe(true)
+    expect(second.prevented()).toBe(true)
+    expect(ctx.copyYankLines()).toBe(1)
+    expect(ctx.copyYanks()).toBe(0)
+    expect(ctx.copyCopies()).toBe(0)
+    expect(ctx.state.register()).toEqual({ text: "picked line", linewise: true })
+    expect(ctx.state.pending()).toBe("")
+
+    // Wait for setTimeout to complete
+    await new Promise((resolve) => setTimeout(resolve, 200))
+    expect(ctx.state.mode()).toBe("normal")
+  })
+
   test("return copies selection to clipboard path and exits copy mode", () => {
     const ctx = createHandler("abc", { mode: "copy", copy: { isVisual: true } })