Recognize extended ESC charset selectors

Author: SqlRush

docs/cc-100-roadmap.md

@@ -316,7 +316,7 @@ M7 补充：terminal CSI parser 现在把带参数的 `CSI Pl;Pr s` 解析成 le
 
 M7 补充：terminal CSI parser 现在识别带 intermediate space 的 `CSI Ps SP @` / `CSI Ps SP A` scroll-left/right 序列，避免误解析成 insert-characters 或 cursor-up。
 
-M7 补充：terminal ESC parser 现在把 charset selection (`ESC ( B` / `ESC ) 0`) 解析成结构化 charset action，并在 terminal parser 可见文本管线中消费，避免常见终端 charset 选择序列残留为 unknown。
+M7 补充：terminal ESC parser 现在把 charset selection (`ESC ( B` / `ESC ) 0` / `ESC * B` / `ESC / A` 等) 解析成结构化 charset action，并在 terminal parser 可见文本管线中消费，避免常见终端 charset 选择序列残留为 unknown。
 
 M7 补充：terminal CSI parser 现在把 DEC selective erase `CSI ? Ps J` / `CSI ? Ps K` 标记为 selective display/line erase，和普通 ED/EL 区分开。
 

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

@@ -453,7 +453,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：terminal CSI parser 把 DEC `?69h/l` left/right margin mode 解析成结构化 `leftRightMarginMode` mode action，补齐 scroll-region 相邻的 margin 状态序列。
 - 本轮补充：terminal CSI parser 现在把带参数的 `CSI Pl;Pr s` 解析成 left/right horizontal margin region action，同时保留无参数 `CSI s` save-cursor 语义，和 DEC `?69h/l` margin mode 闭环。
 - 本轮补充：terminal CSI parser 现在识别带 intermediate space 的 `CSI Ps SP @` / `CSI Ps SP A` scroll-left/right 序列，避免误解析成 insert-characters 或 cursor-up。
-- 本轮补充：terminal ESC parser 现在把 charset selection (`ESC ( B` / `ESC ) 0`) 解析成结构化 charset action，并在 terminal parser 可见文本管线中消费，避免常见终端 charset 选择序列残留为 unknown。
+- 本轮补充：terminal ESC parser 现在把 charset selection (`ESC ( B` / `ESC ) 0` / `ESC * B` / `ESC / A` 等) 解析成结构化 charset action，并在 terminal parser 可见文本管线中消费，避免常见终端 charset 选择序列残留为 unknown。
 - 本轮补充：terminal CSI parser 现在把 DEC selective erase `CSI ? Ps J` / `CSI ? Ps K` 标记为 selective display/line erase，和普通 ED/EL 区分开。
 - 本轮补充：terminal CSI parser 现在把 ECMA `CSI Ps N` / `CSI Ps O` 解析成 erase-in-field / erase-in-area action，覆盖 to-end/to-start/all 三种 region。
 - 本轮补充：terminal CSI parser 把 DEC insert/delete columns (`CSI Ps ' }` / `CSI Ps ' ~`) 归入 edit action，避免列编辑控制序列落入 unknown fallback。

docs/first-second-parity-audit.md

@@ -507,7 +507,7 @@ M7 progress now includes:
 - `internal/tui`: key parsing and configurable keybindings now expose `ctrl+space` from raw NUL and Kitty/CSI-u `0u`, `32;5u`, `64;5u`, and `50;5u` forms, with `ctrl-space`/`ctrl-@`/`ctrl-2` and compact `cSpace`/`c@`/`c2` aliases available for user keymaps and scripts.
 - `internal/tui`: key parsing and configurable keybindings now expose Ctrl-backslash, Ctrl-], Ctrl-^/Ctrl-6, and Ctrl-_/Ctrl-/ from raw terminal control bytes and Kitty/CSI-u forms, with symbol, named, and compact aliases available for user keymaps and scripts.
 - `internal/tui`: key parsing and configurable keybindings now expose F1-F12 from common SS3, legacy Linux-console, tilde CSI, and modified CSI function-key sequences, with `f1`, `function-key-1`, and `fn1` style aliases available for user keymaps and scripts.
-- `internal/tui`: terminal ESC parsing now recognizes charset selection sequences such as `ESC ( B` and `ESC ) 0` as structured charset actions and consumes them in visible-text parsing instead of surfacing them as unknown terminal output.
+- `internal/tui`: terminal ESC parsing now recognizes charset selection sequences such as `ESC ( B`, `ESC ) 0`, `ESC * B`, and `ESC / A` as structured charset actions and consumes them in visible-text parsing instead of surfacing them as unknown terminal output.
 - `internal/contracts`/`internal/session`: image content blocks now normalize source aliases such as `mediaType`/`mimeType`/`contentType` and `base64`/`payload`, including top-level image block fields, into canonical `ImageSource` values during transcript resume.
 - `internal/tui`: interaction script single-step JSON now unwraps `step`/`scriptStep`/`interactionStep`/`record`/`entry`/`item`/`event` objects in arrays, JSONL records, and wrapper-object step lists.
 - `internal/tui`: interaction script single-step JSON now also unwraps JSON:API/resource-style `resource`/`node`/`attributes`/`properties`/`attrs` step items, so API fixture arrays and JSONL records can keep step resource envelopes.

internal/tui/terminal_esc.go

@@ -13,8 +13,13 @@ const (
 	ESCTabSet             = "\x1bH"
 	ESCFinalStart         = 0x30
 	ESCFinalEnd           = 0x7e
-	ESCCharsetSelectLeft  = '('
-	ESCCharsetSelectRight = ')'
+	ESCCharsetSelectG0    = '('
+	ESCCharsetSelectG1    = ')'
+	ESCCharsetSelectG2    = '*'
+	ESCCharsetSelectG3    = '+'
+	ESCCharsetSelectG1Alt = '-'
+	ESCCharsetSelectG2Alt = '.'
+	ESCCharsetSelectG3Alt = '/'
 )
 
 type ESCActionType string
@@ -49,6 +54,9 @@ func ParseESCContent(chars string) (ESCAction, bool) {
 	if chars == "" {
 		return ESCAction{}, false
 	}
+	if isESCCharsetSelector(chars[0]) && len(chars) >= 2 {
+		return ESCAction{Type: ESCActionCharset, CharsetSlot: chars[0], CharsetDesignator: chars[1], Sequence: ESCPrefix + chars}, true
+	}
 	switch chars[0] {
 	case 'c':
 		return ESCAction{Type: ESCActionReset}, true
@@ -64,10 +72,16 @@ func ParseESCContent(chars string) (ESCAction, bool) {
 		return ESCAction{Type: ESCActionCursor, Cursor: CSICursorAction{Type: CSICursorActionNextLine, Count: 1}}, true
 	case 'H':
 		return ESCAction{Type: ESCActionCursor, Cursor: CSICursorAction{Type: CSICursorActionTabSet}}, true
-	case ESCCharsetSelectLeft, ESCCharsetSelectRight:
-		if len(chars) >= 2 {
-			return ESCAction{Type: ESCActionCharset, CharsetSlot: chars[0], CharsetDesignator: chars[1], Sequence: ESCPrefix + chars}, true
-		}
 	}
 	return ESCAction{Type: ESCActionUnknown, Sequence: ESCPrefix + chars}, true
 }
+
+func isESCCharsetSelector(b byte) bool {
+	switch b {
+	case ESCCharsetSelectG0, ESCCharsetSelectG1, ESCCharsetSelectG2, ESCCharsetSelectG3,
+		ESCCharsetSelectG1Alt, ESCCharsetSelectG2Alt, ESCCharsetSelectG3Alt:
+		return true
+	default:
+		return false
+	}
+}

internal/tui/terminal_parser_test.go

@@ -47,9 +47,11 @@ func TestTerminalVisibleTextUsesParserAndPreservesRawBell(t *testing.T) {
 		"\x1b^pm\x1b\\" +
 		"e" +
 		"\x1b(B" +
+		"\x1b*B" +
 		"\x1bXsos\x07" +
 		"f" +
 		"\x1b)0" +
+		"\x1b/A" +
 		"\x07"
 	if got := TerminalVisibleText(input); got != "aredbcdef\x07" {
 		t.Fatalf("visible = %q", got)

internal/tui/terminal_sequence_test.go

@@ -79,6 +79,10 @@ func TestParseTerminalSequenceDispatchesActions(t *testing.T) {
 	if !ok || charset.Type != TerminalSequenceESC || charset.ESC.Type != ESCActionCharset || charset.ESC.CharsetSlot != '(' || charset.ESC.CharsetDesignator != 'B' {
 		t.Fatalf("charset esc dispatch = %#v ok=%v", charset, ok)
 	}
+	extendedCharset, ok := ParseTerminalSequence("\x1b*B")
+	if !ok || extendedCharset.Type != TerminalSequenceESC || extendedCharset.ESC.Type != ESCActionCharset || extendedCharset.ESC.CharsetSlot != '*' || extendedCharset.ESC.CharsetDesignator != 'B' {
+		t.Fatalf("extended charset esc dispatch = %#v ok=%v", extendedCharset, ok)
+	}
 	if text, ok := ParseTerminalSequence("plain"); ok || text.Type != "" {
 		t.Fatalf("plain dispatch = %#v ok=%v", text, ok)
 	}

internal/tui/tui_test.go

@@ -5743,9 +5743,24 @@ func TestParseESCSequenceActions(t *testing.T) {
 	if action, ok := ParseESCContent(""); ok || action.Type != "" {
 		t.Fatalf("empty esc content parsed = %#v", action)
 	}
-	charset, ok := ParseESCSequence("\x1b(B")
-	if !ok || charset.Type != ESCActionCharset || charset.CharsetSlot != '(' || charset.CharsetDesignator != 'B' {
-		t.Fatalf("charset selection = %#v ok=%v", charset, ok)
+	charsetCases := []struct {
+		seq        string
+		slot       byte
+		designator byte
+	}{
+		{seq: "\x1b(B", slot: '(', designator: 'B'},
+		{seq: "\x1b)0", slot: ')', designator: '0'},
+		{seq: "\x1b*B", slot: '*', designator: 'B'},
+		{seq: "\x1b+0", slot: '+', designator: '0'},
+		{seq: "\x1b-A", slot: '-', designator: 'A'},
+		{seq: "\x1b.A", slot: '.', designator: 'A'},
+		{seq: "\x1b/A", slot: '/', designator: 'A'},
+	}
+	for _, tc := range charsetCases {
+		charset, ok := ParseESCSequence(tc.seq)
+		if !ok || charset.Type != ESCActionCharset || charset.CharsetSlot != tc.slot || charset.CharsetDesignator != tc.designator {
+			t.Fatalf("charset selection for %q = %#v ok=%v", tc.seq, charset, ok)
+		}
 	}
 
 	reset, ok := ParseESCSequence(ESCResetSequence)