Support vim named registers

Author: SqlRush

docs/cc-100-roadmap.md

@@ -760,6 +760,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：TUI Vim prompt editing 将 `/`、`?`、`n` 和 `N` 接入 visual/visual-line 模式，搜索会临时进入 search prompt、Enter 后恢复 selection 并移动 active end，Esc 取消时保留原 visual selection。
 
+本轮补充：TUI Vim prompt editing 增加 named register 前缀，支持 normal/operator/visual 路径里的 `"{reg}` yank/delete/paste、uppercase register append、black-hole register no-op，以及普通移动命令后清理未使用的 register selection。
+
 本轮补充：prompt history 写入现在保留 image pasted-content 的 media type、filename、dimensions 和 image-cache source path 元数据，同时继续不把 inline base64 image bytes 或 text-paste hash 写进图片历史记录。
 
 本轮补充：prompt history 读取旧 image pasted-content 记录时，如果缺少 source path 但对应 session 的 image-cache 文件仍存在，会自动补回 source path 并刷新内存 image path cache。

docs/claude-code-go-rewrite-plan.md

@@ -246,6 +246,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：TUI Vim prompt editing 增加 prompt-local `/` 和 `?` 搜索模式，支持 Enter 执行、Esc 取消、Backspace 编辑查询、wraparound 匹配，以及 `n`/`N` 重复上一搜索方向或反向搜索。
 - 本轮补充：TUI Vim prompt editing 将 `/` 和 `?` 搜索接入 operator motion，支持 `d/search`、`c?search`、搜索 count、取消清理 pending 状态，以及 search operator 的 dot-repeat 记录。
 - 本轮补充：TUI Vim prompt editing 将 `/`、`?`、`n` 和 `N` 接入 visual/visual-line 模式，搜索会临时进入 search prompt、Enter 后恢复 selection 并移动 active end，Esc 取消时保留原 visual selection。
+- 本轮补充：TUI Vim prompt editing 增加 named register 前缀，支持 normal/operator/visual 路径里的 `"{reg}` yank/delete/paste、uppercase register append、black-hole register no-op，以及普通移动命令后清理未使用的 register selection。
 - 本轮补充：prompt history 写入现在保留 image pasted-content 的 media type、filename、dimensions 和 image-cache source path 元数据，同时继续不把 inline base64 image bytes 或 text-paste hash 写进图片历史记录。
 - 本轮补充：prompt history 读取旧 image pasted-content 记录时，如果缺少 source path 但对应 session 的 image-cache 文件仍存在，会自动补回 source path 并刷新内存 image path cache。
 - 本轮补充：interaction script key 字段现在接受 DOM-style key event object，可从 `key`/`code`（包括 `Numpad*`、扩展数字区括号/hash/backspace 和标点 key code）、旧式 `keyIdentifier`、数字 `keyCode`/`which`/`charCode`（包括标点和数字区运算符）、`keypress.which` 字符码、`ctrlKey`/`altKey`/`metaKey`/`shiftKey` 和 `modifiers` 数组还原现有 key 名，wrapper payload 中的 key event 也可驱动脚本回放。

docs/first-second-parity-audit.md

@@ -243,6 +243,7 @@ M7 progress now includes:
 - `internal/tui`: Vim prompt editing now includes prompt-local `/` and `?` search modes with Enter execution, Escape cancellation, Backspace query editing, wraparound matching, and `n`/`N` repeat or reverse-repeat search.
 - `internal/tui`: Vim prompt editing now treats `/` and `?` as operator motions for actions such as `d/search` and `c?search`, including search counts, pending-state cleanup on cancel, register updates, and dot-repeat recording for search operators.
 - `internal/tui`: Vim prompt editing now supports `/`, `?`, `n`, and `N` in visual and visual-line modes, returning from the search prompt to the active selection on Enter and preserving the original selection on Escape cancellation.
+- `internal/tui`: Vim prompt editing now supports `"{reg}` named register prefixes across normal/operator/visual yank, delete, and paste paths, including uppercase append registers, black-hole no-op handling, and cleanup of unused register selections after non-register commands.
 - `internal/session`: prompt history now persists image pasted-content metadata such as media type, filename, dimensions, and image-cache source path while still omitting inline base64 image bytes and text-paste hashes for images.
 - `internal/session`: prompt history loading now backfills missing image source paths from existing per-session image-cache files and refreshes the in-memory image path cache when those files exist.
 - `internal/tui`: interaction script key fields now accept DOM-style key event objects with `key`/`code` including `Numpad*`, extended numpad paren/hash/backspace codes, and punctuation key codes, legacy `keyIdentifier`, numeric `keyCode`/`which`/`charCode` including punctuation and numpad operators, `keypress.which` char-code replay, modifier booleans such as `ctrlKey`/`altKey`/`metaKey`/`shiftKey`, and modifier arrays, including wrapper payloads and modifier-only event filtering.

internal/tui/screen.go

@@ -69,6 +69,9 @@ type REPLScreen struct {
 	VimReplayingChange    bool
 	VimRegister           string
 	VimRegisterLinewise   bool
+	VimRegisters          map[rune]vimRegisterValue
+	VimPendingRegister    bool
+	VimActiveRegister     rune
 	VimUndoStack          []vimPromptSnapshot
 	VimVisualAnchor       int
 	VimVisualLinewise     bool

internal/tui/tui_test.go

@@ -3768,6 +3768,63 @@ func TestREPLScreenVimYankPasteRegister(t *testing.T) {
 	}
 }
 
+func TestREPLScreenVimNamedRegisters(t *testing.T) {
+	screen := NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "alpha beta gamma")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"0", "\"", "a", "y", "w", "$", "\"", "a", "p"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.Prompt.Text != "alpha beta gammaalpha " || screen.VimRegister != "alpha " || screen.VimRegisters['a'].Text != "alpha " || screen.VimRegisters['a'].Linewise {
+		t.Fatalf("after \"ayw \"ap screen = %#v", screen)
+	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "alpha beta")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"0", "\"", "a", "d", "w", "\"", "a", "P"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.Prompt.Text != "alpha beta" || screen.VimRegister != "alpha " || screen.VimRegisters['a'].Text != "alpha " || screen.VimRegisters['a'].Linewise {
+		t.Fatalf("after \"adw \"aP screen = %#v", screen)
+	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "one two three")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"0", "\"", "a", "y", "w", "w", "\"", "A", "y", "w"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.VimRegisters['a'].Text != "one two " || screen.VimRegister != "two " {
+		t.Fatalf("after uppercase append register screen = %#v", screen)
+	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "red blue green")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"0", "w", "v", "e", "\"", "b", "y", "$", "\"", "b", "P"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.Prompt.Text != "red blue greenblue" || screen.VimRegisters['b'].Text != "blue" || screen.VimRegisters['b'].Linewise {
+		t.Fatalf("after visual \"by \"bP screen = %#v", screen)
+	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "alpha beta")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"0", "\"", "a", "l", "y", "w"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if _, ok := screen.VimRegisters['a']; ok {
+		t.Fatalf("register should not persist after non-register command: %#v", screen)
+	}
+}
+
 func TestREPLScreenVimLinewiseYankPaste(t *testing.T) {
 	screen := NewREPLScreen(40, 8, nil)
 	screen.SetVimEnabled(true)

internal/tui/vim.go

@@ -27,6 +27,11 @@ type vimPromptSnapshot struct {
 	PendingSpaceAfterImage bool
 }
 
+type vimRegisterValue struct {
+	Text     string
+	Linewise bool
+}
+
 type vimRecordedChange struct {
 	Kind     string
 	Text     string
@@ -175,6 +180,9 @@ func (s *REPLScreen) applyVimNormalRune(r rune) ScreenEvent {
 	if s.VimPendingMacro != 0 {
 		return s.applyVimMacro(r)
 	}
+	if s.VimPendingRegister {
+		return s.applyVimRegister(r)
+	}
 	if s.VimPendingG {
 		return s.applyVimG(r)
 	}
@@ -193,6 +201,9 @@ func (s *REPLScreen) applyVimNormalRune(r rune) ScreenEvent {
 		return ScreenEvent{}
 	}
 	count := s.takeVimCount()
+	if s.VimActiveRegister != 0 && r != '"' && !vimNormalCommandUsesRegister(r) {
+		defer func() { s.VimActiveRegister = 0 }()
+	}
 	switch r {
 	case 'i':
 		s.enterVimInsert()
@@ -229,6 +240,9 @@ func (s *REPLScreen) applyVimNormalRune(r rune) ScreenEvent {
 	case 'm', '`', '\'':
 		s.VimPendingMark = r
 		s.VimPendingCount = count
+	case '"':
+		s.VimPendingRegister = true
+		s.VimPendingCount = count
 	case 'q', '@':
 		s.VimPendingMacro = r
 		s.VimPendingCount = count
@@ -324,6 +338,9 @@ func (s *REPLScreen) applyVimVisualRune(r rune) ScreenEvent {
 	if s.VimPendingG {
 		return s.applyVimVisualG(r)
 	}
+	if s.VimPendingRegister {
+		return s.applyVimRegister(r)
+	}
 	if isVimCountRune(r) {
 		if r == '0' && s.VimCount == 0 {
 			s.applyVimVisualMotion('0', 1)
@@ -333,6 +350,9 @@ func (s *REPLScreen) applyVimVisualRune(r rune) ScreenEvent {
 		return ScreenEvent{}
 	}
 	count := s.takeVimCount()
+	if s.VimActiveRegister != 0 && r != '"' && !vimVisualCommandUsesRegister(r) {
+		defer func() { s.VimActiveRegister = 0 }()
+	}
 	switch r {
 	case 'v':
 		if s.VimMode == VimVisual {
@@ -354,6 +374,9 @@ func (s *REPLScreen) applyVimVisualRune(r rune) ScreenEvent {
 		s.repeatVimSearch(true, count)
 	case '/', '?':
 		s.enterVimVisualSearch(r == '?', count)
+	case '"':
+		s.VimPendingRegister = true
+		s.VimPendingCount = count
 	case 'g':
 		s.VimPendingG = true
 		s.VimPendingCount = count
@@ -684,7 +707,8 @@ func (s *REPLScreen) applyVimVisualJoin(raw bool) {
 }
 
 func (s *REPLScreen) applyVimVisualPaste() {
-	if s.VimRegister == "" {
+	replacement, registerLinewise, ok := s.takeVimPasteRegister()
+	if !ok {
 		s.exitVimVisual()
 		return
 	}
@@ -693,8 +717,7 @@ func (s *REPLScreen) applyVimVisualPaste() {
 		s.exitVimVisual()
 		return
 	}
-	replacement := s.VimRegister
-	replacementLinewise := s.VimRegisterLinewise || strings.HasSuffix(replacement, "\n")
+	replacementLinewise := registerLinewise || strings.HasSuffix(replacement, "\n")
 	replaced := s.Prompt.rangeText(start, end)
 	s.rememberVimVisualSelection()
 	s.recordVimUndo()
@@ -933,6 +956,25 @@ func (s *REPLScreen) applyVimMacro(target rune) ScreenEvent {
 	return ScreenEvent{}
 }
 
+func (s *REPLScreen) applyVimRegister(target rune) ScreenEvent {
+	count := s.VimPendingCount
+	s.VimPendingRegister = false
+	s.VimPendingCount = 0
+	if !isVimRegisterRune(target) {
+		s.VimActiveRegister = 0
+		return ScreenEvent{}
+	}
+	if target == '"' {
+		s.VimActiveRegister = 0
+	} else {
+		s.VimActiveRegister = target
+	}
+	if count > 1 {
+		s.VimCount = count
+	}
+	return ScreenEvent{}
+}
+
 func (s *REPLScreen) shouldStopVimMacroRecording(key Key) bool {
 	if s.VimRecordingMacro == 0 || s.VimReplayingMacro || s.VimMode != VimNormal {
 		return false
@@ -951,6 +993,7 @@ func (s *REPLScreen) hasVimPendingState() bool {
 		s.VimPendingIndent != 0 ||
 		s.VimPendingMark != 0 ||
 		s.VimPendingMacro != 0 ||
+		s.VimPendingRegister ||
 		s.VimPendingReplace
 }
 
@@ -1127,23 +1170,68 @@ func (s *REPLScreen) setVimRegister(content string, linewise bool) {
 	if linewise && !strings.HasSuffix(content, "\n") {
 		content += "\n"
 	}
+	if s.VimActiveRegister == '_' {
+		s.VimActiveRegister = 0
+		return
+	}
 	s.VimRegister = content
 	s.VimRegisterLinewise = linewise
+	s.writeVimNamedRegister(content, linewise)
+	s.VimActiveRegister = 0
+}
+
+func (s *REPLScreen) writeVimNamedRegister(content string, linewise bool) {
+	register := s.VimActiveRegister
+	if register == 0 || register == '"' || register == '_' || !isVimRegisterRune(register) {
+		return
+	}
+	key := normalizeVimRegister(register)
+	value := vimRegisterValue{Text: content, Linewise: linewise}
+	if isVimUpperRegister(register) {
+		if existing, ok := s.VimRegisters[key]; ok {
+			value.Text = existing.Text + content
+			value.Linewise = existing.Linewise || linewise
+		}
+	}
+	if s.VimRegisters == nil {
+		s.VimRegisters = make(map[rune]vimRegisterValue)
+	}
+	s.VimRegisters[key] = value
 }
 
 func (s *REPLScreen) applyVimPaste(after bool, count int) {
-	if s.VimRegister == "" {
+	register, linewise, ok := s.takeVimPasteRegister()
+	if !ok {
 		return
 	}
 	if count <= 0 {
 		count = 1
 	}
 	s.recordVimUndo()
-	if s.VimRegisterLinewise || strings.HasSuffix(s.VimRegister, "\n") {
-		s.Prompt.pasteLinewise(s.VimRegister, after, count)
+	if linewise || strings.HasSuffix(register, "\n") {
+		s.Prompt.pasteLinewise(register, after, count)
 		return
 	}
-	s.Prompt.pasteCharacterwise(s.VimRegister, after, count)
+	s.Prompt.pasteCharacterwise(register, after, count)
+}
+
+func (s *REPLScreen) takeVimPasteRegister() (string, bool, bool) {
+	register := s.VimActiveRegister
+	s.VimActiveRegister = 0
+	switch {
+	case register == 0 || register == '"':
+		return s.VimRegister, s.VimRegisterLinewise, s.VimRegister != ""
+	case register == '_':
+		return "", false, false
+	case !isVimRegisterRune(register):
+		return "", false, false
+	default:
+		value, ok := s.VimRegisters[normalizeVimRegister(register)]
+		if !ok || value.Text == "" {
+			return "", false, false
+		}
+		return value.Text, value.Linewise, true
+	}
 }
 
 func (s *REPLScreen) applyVimRepeatedCharMotion(count int, reverse bool) {
@@ -1401,6 +1489,7 @@ func (s *REPLScreen) clearVimPending() {
 	s.VimPendingIndent = 0
 	s.VimPendingMark = 0
 	s.VimPendingMacro = 0
+	s.VimPendingRegister = false
 	s.VimPendingCount = 0
 	s.VimCount = 0
 	s.VimPendingReplace = false
@@ -1455,6 +1544,39 @@ func isVimMacroRegisterRune(r rune) bool {
 	return r >= 'A' && r <= 'Z' || r >= 'a' && r <= 'z' || r >= '0' && r <= '9'
 }
 
+func isVimRegisterRune(r rune) bool {
+	return r == '"' || r == '_' || r >= 'A' && r <= 'Z' || r >= 'a' && r <= 'z' || r >= '0' && r <= '9'
+}
+
+func vimNormalCommandUsesRegister(r rune) bool {
+	switch r {
+	case 'd', 'c', 'y', 'Y', 'p', 'P', 's', 'S', 'D', 'C':
+		return true
+	default:
+		return false
+	}
+}
+
+func vimVisualCommandUsesRegister(r rune) bool {
+	switch r {
+	case 'y', 'd', 'c', 'p', 'P', 'x', 's':
+		return true
+	default:
+		return false
+	}
+}
+
+func isVimUpperRegister(r rune) bool {
+	return r >= 'A' && r <= 'Z'
+}
+
+func normalizeVimRegister(r rune) rune {
+	if isVimUpperRegister(r) {
+		return unicode.ToLower(r)
+	}
+	return r
+}
+
 func applyN(count int, fn func()) {
 	if count <= 0 {
 		count = 1