Support vim prompt marks

Author: SqlRush

docs/cc-100-roadmap.md

@@ -750,6 +750,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：TUI Vim prompt editing 增加 normal-mode `R` replace mode，输入会从当前 cursor 开始覆盖现有字符、超过文本尾部时追加，并接入 undo 与 dot-repeat。
 
+本轮补充：TUI Vim prompt editing 增加 prompt-local marks，支持 `m{mark}` 设置位置、`` `{mark}` 精确跳转、`'{mark}` 跳到 mark 所在行首，并支持 `d`/`c`/`y` 等 operator 以 mark 作为 motion。
+
 本轮补充：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

@@ -241,6 +241,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：TUI Vim prompt editing 增加 visual/visual-line `p`/`P` 粘贴替换 selection，支持 characterwise 和 linewise register，替换出的文本会回写 unnamed register，并避免行选择替换到末尾时留下额外空行。
 - 本轮补充：TUI Vim prompt editing 增加 visual/visual-line `r{char}` selection 替换，按选区把非换行字符替换为目标字符，保留行结构、接入 undo，并让 `gv` 能重选替换前的 visual range。
 - 本轮补充：TUI Vim prompt editing 增加 normal-mode `R` replace mode，输入会从当前 cursor 开始覆盖现有字符、超过文本尾部时追加，并接入 undo 与 dot-repeat。
+- 本轮补充：TUI Vim prompt editing 增加 prompt-local marks，支持 `m{mark}` 设置位置、`` `{mark}` 精确跳转、`'{mark}` 跳到 mark 所在行首，并支持 `d`/`c`/`y` 等 operator 以 mark 作为 motion。
 - 本轮补充：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

@@ -238,6 +238,7 @@ M7 progress now includes:
 - `internal/tui`: Vim prompt editing now includes visual and visual-line `p`/`P` paste-over-selection behavior for characterwise and linewise registers, updating the unnamed register with the replaced text and avoiding extra trailing blank lines for end-of-buffer line replacements.
 - `internal/tui`: Vim prompt editing now includes visual and visual-line `r{char}` selection replacement, replacing non-newline characters while preserving line structure, supporting undo, and remembering the previous visual range for `gv`.
 - `internal/tui`: Vim prompt editing now includes normal-mode `R` replace mode, overwriting from the current cursor, appending past the end of text, and supporting undo plus dot-repeat.
+- `internal/tui`: Vim prompt editing now includes prompt-local marks with `m{mark}`, exact `` `{mark}` jumps, linewise `'{mark}` jumps, and mark-based operator motions for `d`/`c`/`y` style operators.
 - `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

@@ -76,6 +76,8 @@ type REPLScreen struct {
 	VimLastVisualCursor   int
 	VimLastVisualLinewise bool
 	VimLastVisualValid    bool
+	VimMarks              map[rune]int
+	VimPendingMark        rune
 	Focused               bool
 	ReverseSearch         ReverseSearchState
 	StashedPrompt         *PromptStash

internal/tui/tui_test.go

@@ -4165,6 +4165,39 @@ func TestREPLScreenVimJKLineMotionsAndOperators(t *testing.T) {
 	if screen.Prompt.Text != "one" || screen.VimRegister != "two\nthree\n" {
 		t.Fatalf("after dk screen = %#v", screen)
 	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "alpha beta gamma")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"0", "w", "m", "a", "$", "`", "a"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.Prompt.Cursor != len([]rune("alpha ")) {
+		t.Fatalf("cursor after `a = %d", screen.Prompt.Cursor)
+	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "one\ntwo\nthree")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"g", "g", "j", "l", "m", "a", "G", "'", "a"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.Prompt.Cursor != len([]rune("one\n")) {
+		t.Fatalf("cursor after 'a = %d", screen.Prompt.Cursor)
+	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "one\ntwo\nthree\nfour")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"g", "g", "j", "m", "a", "G", "d", "'", "a"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.Prompt.Text != "one" || screen.VimRegister != "two\nthree\nfour\n" || !screen.VimRegisterLinewise {
+		t.Fatalf("after d'a screen = %#v", screen)
+	}
 }
 
 func TestREPLScreenVimEditCommands(t *testing.T) {

internal/tui/vim.go

@@ -36,6 +36,7 @@ type vimRecordedChange struct {
 	Object   rune
 	Dir      rune
 	Below    bool
+	Linewise bool
 }
 
 func (s *REPLScreen) SetVimEnabled(enabled bool) {
@@ -150,6 +151,9 @@ func (s *REPLScreen) applyVimNormalRune(r rune) ScreenEvent {
 	if s.VimPendingTextObject != 0 {
 		return s.applyVimTextObject(r)
 	}
+	if s.VimPendingMark != 0 {
+		return s.applyVimMark(r)
+	}
 	if s.VimPendingG {
 		return s.applyVimG(r)
 	}
@@ -195,6 +199,9 @@ func (s *REPLScreen) applyVimNormalRune(r rune) ScreenEvent {
 		s.VimPendingCount = count
 	case 'G':
 		s.Prompt.goToLine(vimGTargetLine(s.Prompt.lineCount(), count))
+	case 'm', '`', '\'':
+		s.VimPendingMark = r
+		s.VimPendingCount = count
 	case '>', '<':
 		s.VimPendingIndent = r
 		s.VimPendingCount = count
@@ -555,6 +562,10 @@ func (s *REPLScreen) applyVimOperator(r rune) ScreenEvent {
 		s.VimPendingOperator = operator
 		s.VimPendingTextObject = r
 		s.VimPendingCount = count
+	case '`', '\'':
+		s.VimPendingOperator = operator
+		s.VimPendingMark = r
+		s.VimPendingCount = count
 	case 'G':
 		s.applyVimLineMotionOperator(operator, vimGTargetLine(s.Prompt.lineCount(), count), 'G', count)
 	case 'g':
@@ -671,6 +682,48 @@ func (s *REPLScreen) applyVimTextObject(obj rune) ScreenEvent {
 	return ScreenEvent{}
 }
 
+func (s *REPLScreen) applyVimMark(mark rune) ScreenEvent {
+	action := s.VimPendingMark
+	operator := s.VimPendingOperator
+	count := s.VimPendingCount
+	s.clearVimPending()
+	if !isVimMarkRune(mark) {
+		return ScreenEvent{}
+	}
+	switch action {
+	case 'm':
+		if s.VimMarks == nil {
+			s.VimMarks = make(map[rune]int)
+		}
+		s.VimMarks[mark] = s.Prompt.clampCursor(s.Prompt.Cursor)
+	case '`', '\'':
+		target, ok := s.VimMarks[mark]
+		if !ok {
+			return ScreenEvent{}
+		}
+		linewise := action == '\''
+		if operator != 0 {
+			s.applyVimMarkOperator(operator, mark, target, linewise, count)
+			return ScreenEvent{}
+		}
+		if linewise {
+			s.Prompt.goToLine(s.Prompt.lineIndexAtCursor(target) + 1)
+			return ScreenEvent{}
+		}
+		s.Prompt.Cursor = s.Prompt.clampCursor(target)
+	}
+	return ScreenEvent{}
+}
+
+func (s *REPLScreen) applyVimMarkOperator(operator rune, mark rune, target int, linewise bool, count int) {
+	start, end, ok := s.Prompt.markMotionRange(target, linewise)
+	if !ok {
+		return
+	}
+	s.applyVimRangeOperator(operator, start, end, linewise)
+	s.recordVimChange(vimRecordedChange{Kind: "operatorMark", Operator: operator, Target: mark, Count: count, Linewise: linewise})
+}
+
 func (s *REPLScreen) applyVimCharMotion(target rune) ScreenEvent {
 	motion := s.VimPendingCharMotion
 	operator := s.VimPendingOperator
@@ -1057,6 +1110,12 @@ func (s *REPLScreen) replayVimLastChange() {
 			return
 		}
 		s.applyVimRangeOperator(change.Operator, start, end, false)
+	case "operatorMark":
+		target, ok := s.VimMarks[change.Target]
+		if !ok {
+			return
+		}
+		s.applyVimMarkOperator(change.Operator, change.Target, target, change.Linewise, change.Count)
 	}
 }
 
@@ -1086,6 +1145,7 @@ func (s *REPLScreen) clearVimPending() {
 	s.VimPendingTextObject = 0
 	s.VimPendingG = false
 	s.VimPendingIndent = 0
+	s.VimPendingMark = 0
 	s.VimPendingCount = 0
 	s.VimCount = 0
 	s.VimPendingReplace = false
@@ -1132,6 +1192,10 @@ func isVimCountRune(r rune) bool {
 	return r >= '0' && r <= '9'
 }
 
+func isVimMarkRune(r rune) bool {
+	return r >= 'A' && r <= 'Z' || r >= 'a' && r <= 'z'
+}
+
 func applyN(count int, fn func()) {
 	if count <= 0 {
 		count = 1
@@ -1358,6 +1422,25 @@ func (p *PromptState) lineMotionRange(targetLine int) (int, int, bool) {
 	return start, end, true
 }
 
+func (p *PromptState) markMotionRange(target int, linewise bool) (int, int, bool) {
+	target = p.clampCursor(target)
+	if linewise {
+		return p.lineMotionRange(p.lineIndexAtCursor(target) + 1)
+	}
+	start := p.clampCursor(p.Cursor)
+	end := target
+	runes := []rune(p.Text)
+	if end >= start {
+		if end < len(runes) {
+			end++
+		}
+	} else if start < len(runes) {
+		start++
+	}
+	start, end, _, ok := orderedRange(start, end, false)
+	return start, end, ok
+}
+
 func (p *PromptState) lineRange(count int) (int, int) {
 	if count <= 0 {
 		count = 1