Support visual vim line joins

Author: SqlRush

docs/cc-100-roadmap.md

@@ -742,6 +742,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：TUI Vim prompt editing 增加 normal-mode `gJ` raw line join，不插入/规范化空格，并接入 dot-repeat。
 
+本轮补充：TUI Vim prompt editing 增加 visual/visual-line `J`/`gJ` 行拼接，支持选择范围内的 whitespace-normalized join 和 raw join，并沿用 undo、`gv` selection 记忆和 dot-repeat change 记录。
+
 本轮补充：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

@@ -237,6 +237,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：TUI Vim prompt editing 支持 normal-mode `gv` 重新进入上一次 characterwise/linewise visual selection，后续 visual operator 会复用恢复出的选择范围。
 - 本轮补充：TUI Vim prompt editing 增加 `gu`/`gU`/`g~` case-conversion operator，复用 motion、linewise、find/till、text-object 和 dot-repeat operator 管线，并保持大小写转换不写入 yank register。
 - 本轮补充：TUI Vim prompt editing 增加 normal-mode `gJ` raw line join，不插入/规范化空格，并接入 dot-repeat。
+- 本轮补充：TUI Vim prompt editing 增加 visual/visual-line `J`/`gJ` 行拼接，支持选择范围内的 whitespace-normalized join 和 raw join，并沿用 undo、`gv` selection 记忆和 dot-repeat change 记录。
 - 本轮补充：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

@@ -234,6 +234,7 @@ M7 progress now includes:
 - `internal/tui`: Vim prompt editing now supports normal-mode `gv` reselecting the previous characterwise or linewise visual selection before applying another visual operator.
 - `internal/tui`: Vim prompt editing now includes `gu`/`gU`/`g~` case-conversion operators across motion, linewise, find/till, text-object, and dot-repeat paths without updating the yank register.
 - `internal/tui`: Vim prompt editing now includes normal-mode `gJ` raw line joins that do not insert or normalize whitespace and can be dot-repeated.
+- `internal/tui`: Vim prompt editing now includes visual and visual-line `J`/`gJ` joins across selected line ranges, sharing the normal whitespace-normalized and raw join semantics plus undo, `gv`, and dot-repeat recording.
 - `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/tui_test.go

@@ -4003,6 +4003,43 @@ func TestREPLScreenVimVisualLineOperators(t *testing.T) {
 	if screen.VimMode != VimNormal || screen.Prompt.Text != "one\ntwo\nthree\nfour" || screen.Prompt.Cursor != len([]rune("one\n")) {
 		t.Fatalf("after visual line outdent screen = %#v", screen)
 	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "one\n  two\nthree")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"g", "g", "V", "j", "J"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.VimMode != VimNormal || screen.Prompt.Text != "one two\nthree" || screen.Prompt.Cursor != len([]rune("one")) {
+		t.Fatalf("after visual line J screen = %#v", screen)
+	}
+	screen.ApplyKey(ParseKey("."))
+	if screen.Prompt.Text != "one two three" || screen.Prompt.Cursor != len([]rune("one two")) {
+		t.Fatalf("after visual line J dot-repeat screen = %#v", screen)
+	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "one\n  two\nthree")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"g", "g", "V", "j", "g", "J"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.VimMode != VimNormal || screen.Prompt.Text != "one  two\nthree" || screen.Prompt.Cursor != len([]rune("one")) {
+		t.Fatalf("after visual line gJ screen = %#v", screen)
+	}
+
+	screen = NewREPLScreen(40, 8, nil)
+	screen.SetVimEnabled(true)
+	typePromptText(&screen, "one\n  two\nthree")
+	screen.ApplyKey(ParseKey("\x1b"))
+	for _, seq := range []string{"g", "g", "v", "j", "J"} {
+		screen.ApplyKey(ParseKey(seq))
+	}
+	if screen.VimMode != VimNormal || screen.Prompt.Text != "one two\nthree" || screen.Prompt.Cursor != len([]rune("one")) {
+		t.Fatalf("after visual J screen = %#v", screen)
+	}
 }
 
 func TestREPLScreenVimGLineNavigationAndOperators(t *testing.T) {

internal/tui/vim.go

@@ -311,6 +311,8 @@ func (s *REPLScreen) applyVimVisualRune(r rune) ScreenEvent {
 		s.applyVimVisualToggleCase()
 	case 'u', 'U':
 		s.applyVimVisualChangeCase(r)
+	case 'J':
+		s.applyVimVisualJoin(false)
 	case 'y', 'd', 'c':
 		s.applyVimVisualOperator(r)
 	case 'x':
@@ -341,6 +343,8 @@ func (s *REPLScreen) applyVimVisualG(r rune) ScreenEvent {
 		applyN(count, func() { s.Prompt.moveWordBackwardEnd() })
 	case 'E':
 		applyN(count, func() { s.Prompt.moveWORDBackwardEnd() })
+	case 'J':
+		s.applyVimVisualJoin(true)
 	}
 	return ScreenEvent{}
 }
@@ -444,6 +448,25 @@ func (s *REPLScreen) applyVimVisualChangeCase(op rune) {
 	s.clearVimVisualState()
 }
 
+func (s *REPLScreen) applyVimVisualJoin(raw bool) {
+	start, end, _, ok := s.vimVisualSelectionRange()
+	if !ok {
+		s.exitVimVisual()
+		return
+	}
+	s.rememberVimVisualSelection()
+	s.recordVimUndo()
+	joined := s.Prompt.joinRange(start, end, raw)
+	if joined > 0 {
+		kind := "join"
+		if raw {
+			kind = "joinRaw"
+		}
+		s.recordVimChange(vimRecordedChange{Kind: kind, Count: joined})
+	}
+	s.clearVimVisualState()
+}
+
 func (s *REPLScreen) applyVimOperator(r rune) ScreenEvent {
 	if isVimCountRune(r) && (r != '0' || s.VimCount > 0) {
 		s.VimCount = s.VimCount*10 + int(r-'0')
@@ -1403,58 +1426,82 @@ func (p *PromptState) joinLines(count int) {
 	if count <= 0 {
 		count = 1
 	}
-	lines := strings.Split(p.Text, "\n")
 	current := p.currentLogicalLine()
-	if current >= len(lines)-1 {
-		return
-	}
-	linesToJoin := count
-	if linesToJoin > len(lines)-current-1 {
-		linesToJoin = len(lines) - current - 1
-	}
-	joined := lines[current]
-	cursorPos := len([]rune(joined))
-	for i := 1; i <= linesToJoin; i++ {
-		next := strings.TrimLeftFunc(lines[current+i], unicode.IsSpace)
-		if next == "" {
-			continue
-		}
-		if joined != "" && !strings.HasSuffix(joined, " ") {
-			joined += " "
-		}
-		joined += next
-	}
-	newLines := make([]string, 0, len(lines)-linesToJoin)
-	newLines = append(newLines, lines[:current]...)
-	newLines = append(newLines, joined)
-	newLines = append(newLines, lines[current+linesToJoin+1:]...)
-	p.Text = strings.Join(newLines, "\n")
-	p.Cursor = lineStartOffset(newLines, current) + cursorPos
-	p.resetHistoryCursor()
+	p.joinLineRange(current, current+count, false)
 }
 
 func (p *PromptState) joinLinesRaw(count int) {
 	if count <= 0 {
 		count = 1
 	}
-	lines := strings.Split(p.Text, "\n")
 	current := p.currentLogicalLine()
-	if current >= len(lines)-1 {
-		return
+	p.joinLineRange(current, current+count, true)
+}
+
+func (p *PromptState) joinRange(start int, end int, raw bool) int {
+	lines := strings.Split(p.Text, "\n")
+	if len(lines) == 0 {
+		return 0
 	}
-	linesToJoin := count
-	if linesToJoin > len(lines)-current-1 {
-		linesToJoin = len(lines) - current - 1
+	start = p.clampCursor(start)
+	end = p.clampCursor(end)
+	if end < start {
+		start, end = end, start
+	}
+	inclusiveEnd := end
+	if inclusiveEnd > start {
+		inclusiveEnd--
+	}
+	startLine := p.lineIndexAtCursor(start)
+	endLine := p.lineIndexAtCursor(inclusiveEnd)
+	return p.joinLineRange(startLine, endLine, raw)
+}
+
+func (p *PromptState) joinLineRange(startLine int, endLine int, raw bool) int {
+	lines := strings.Split(p.Text, "\n")
+	if len(lines) == 0 {
+		return 0
+	}
+	if startLine < 0 {
+		startLine = 0
+	}
+	if endLine < startLine {
+		startLine, endLine = endLine, startLine
+	}
+	if startLine >= len(lines) {
+		startLine = len(lines) - 1
+	}
+	if endLine >= len(lines) {
+		endLine = len(lines) - 1
+	}
+	if endLine <= startLine {
+		return 0
+	}
+	linesToJoin := endLine - startLine
+	cursorPos := len([]rune(lines[startLine]))
+	joined := lines[startLine]
+	if raw {
+		joined = strings.Join(lines[startLine:endLine+1], "")
+	} else {
+		for i := startLine + 1; i <= endLine; i++ {
+			next := strings.TrimLeftFunc(lines[i], unicode.IsSpace)
+			if next == "" {
+				continue
+			}
+			if joined != "" && !strings.HasSuffix(joined, " ") {
+				joined += " "
+			}
+			joined += next
+		}
 	}
-	cursorPos := len([]rune(lines[current]))
-	joined := strings.Join(lines[current:current+linesToJoin+1], "")
 	newLines := make([]string, 0, len(lines)-linesToJoin)
-	newLines = append(newLines, lines[:current]...)
+	newLines = append(newLines, lines[:startLine]...)
 	newLines = append(newLines, joined)
-	newLines = append(newLines, lines[current+linesToJoin+1:]...)
+	newLines = append(newLines, lines[endLine+1:]...)
 	p.Text = strings.Join(newLines, "\n")
-	p.Cursor = lineStartOffset(newLines, current) + cursorPos
+	p.Cursor = lineStartOffset(newLines, startLine) + cursorPos
 	p.resetHistoryCursor()
+	return linesToJoin
 }
 
 func (p *PromptState) indentLines(dir rune, count int) {