Add Grep vimgrep output mode

Author: SqlRush

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

@@ -212,6 +212,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：Grep content 输出现在支持 ripgrep 风格 `trim`/`--trim` 和 `no_trim`/`--no-trim`，会删除每条已打印文本行开头的 ASCII 空白，同时保留原始匹配列号；quoted semantic boolean 同样兼容。
 - 本轮补充：Grep 长行输出现在支持 ripgrep 风格 `max_columns_preview`/`--max-columns-preview` 和 `no_max_columns_preview`/`--no-max-columns-preview`，会在 `max_columns` 触发时输出截断预览加官方 omitted-end 后缀；quoted semantic boolean 同样兼容。
 - 本轮补充：Grep 搜索现在支持 ripgrep 风格 `line_regexp`/`line-regexp`/`--line-regexp`/`-x`，将 pattern 限定为整行匹配，并按官方语义优先于 `word_regexp`；fixed-string、multiline 和 quoted semantic boolean 组合均兼容。
+- 本轮补充：Grep content 输出现在支持 ripgrep 风格 `vimgrep`/`--vimgrep`，匹配行按每个匹配重复输出 `path:line:column:text`，context 行保持单行输出，并兼容 `-N`、`only_matching` 和 quoted semantic boolean。
 - 本轮补充：Grep 常用布尔参数继续补齐 ripgrep 长参数 aliases，覆盖 `--line-number`、`--ignore-case`、`--fixed-strings`、`--word-regexp`、`--invert-match` 和 `--only-matching`，并兼容 quoted semantic boolean。
 - 本轮补充：Grep multiline 搜索现在支持 ripgrep 风格 `-U`、`--multiline`、`multiline-dotall` 和 `--multiline-dotall` aliases，统一映射到既有跨行 dotall 匹配逻辑并兼容 quoted semantic boolean。
 - 本轮补充：Grep 搜索现在支持 `no_ignore`/`noIgnore`/`no-ignore`/`--no-ignore`，可跳过 `.gitignore`/`.ignore` 规则，同时继续排除 VCS metadata 目录并保留 Read deny 额外 ignore 保护；`--no-ignore` 兼容 quoted boolean。

docs/first-second-parity-audit.md

@@ -137,6 +137,7 @@ Covered behavior:
 - `Grep` now accepts `text`/`--text`/`-a` to search binary-extension files as text while preserving the default binary-extension skip behavior.
 - `Grep` now accepts `line_regexp`/`line-regexp`/`--line-regexp`/`-x` to require whole-line matches, with fixed-string and word-regexp precedence covered.
 - `Grep` content output now accepts `passthru`/`passthrough`/`--passthru`/`--passthrough`, printing all searched lines while preserving matched-line markers and overriding context counts.
+- `Grep` content output now accepts `vimgrep`/`--vimgrep`, repeating matching lines once per match with column metadata while preserving context-line output and `-N` formatting.
 - `Grep` content output now accepts `trim`/`--trim` plus `no_trim`/`--no-trim`, trimming leading ASCII whitespace from printed line text while preserving original match columns.
 - `Grep` long-line output now accepts `max_columns_preview`/`--max-columns-preview` plus `no_max_columns_preview`/`--no-max-columns-preview`, showing a ripgrep-style truncated preview when `max_columns` is exceeded.
 - `Glob`/`Grep` traversal now applies `Read(...)` deny rules from the permission context as extra search ignore rules, hiding denied basename, path, and directory patterns from search results.

internal/tools/file/search_tools.go

@@ -46,6 +46,7 @@ var allowedGrepInputKeys = map[string]struct{}{
 	"line_regexp": {}, "lineRegexp": {}, "line-regexp": {}, "--line-regexp": {}, "-x": {},
 	"invert_match": {}, "invertMatch": {}, "invert-match": {}, "--invert-match": {}, "-v": {},
 	"only_matching": {}, "onlyMatching": {}, "only-matching": {}, "--only-matching": {}, "-o": {},
+	"vimgrep": {}, "--vimgrep": {},
 	"passthru": {}, "passthrough": {}, "--passthru": {}, "--passthrough": {},
 	"trim": {}, "--trim": {}, "no_trim": {}, "noTrim": {}, "no-trim": {}, "--no-trim": {},
 	"files_with_match": {}, "filesWithMatch": {}, "files-with-match": {}, "--files-with-match": {}, "files_with_matches": {}, "filesWithMatches": {}, "files-with-matches": {}, "--files-with-matches": {}, "-l": {},
@@ -75,6 +76,7 @@ var grepSemanticBooleanKeys = map[string]struct{}{
 	"line_regexp": {}, "lineRegexp": {}, "line-regexp": {}, "--line-regexp": {}, "-x": {},
 	"invert_match": {}, "invertMatch": {}, "invert-match": {}, "--invert-match": {}, "-v": {},
 	"only_matching": {}, "onlyMatching": {}, "only-matching": {}, "--only-matching": {}, "-o": {},
+	"vimgrep": {}, "--vimgrep": {},
 	"passthru": {}, "passthrough": {}, "--passthru": {}, "--passthrough": {},
 	"trim": {}, "--trim": {}, "no_trim": {}, "noTrim": {}, "no-trim": {}, "--no-trim": {},
 	"files_with_match": {}, "filesWithMatch": {}, "files-with-match": {}, "--files-with-match": {}, "files_with_matches": {}, "filesWithMatches": {}, "files-with-matches": {}, "--files-with-matches": {}, "-l": {},
@@ -197,6 +199,8 @@ type grepInput struct {
 	OnlyMatchingDash        bool   `json:"only-matching,omitempty"`
 	LongOnlyMatching        bool   `json:"--only-matching,omitempty"`
 	ShortOnlyMatching       bool   `json:"-o,omitempty"`
+	Vimgrep                 bool   `json:"vimgrep,omitempty"`
+	LongVimgrep             bool   `json:"--vimgrep,omitempty"`
 	Passthru                bool   `json:"passthru,omitempty"`
 	Passthrough             bool   `json:"passthrough,omitempty"`
 	LongPassthru            bool   `json:"--passthru,omitempty"`
@@ -272,6 +276,7 @@ type grepOptions struct {
 	Multiline     bool
 	InvertMatch   bool
 	OnlyMatching  bool
+	Vimgrep       bool
 	Passthru      bool
 	Trim          bool
 	CountMatches  bool
@@ -446,6 +451,8 @@ func NewGrepTool() tool.Tool {
 					"only-matching":    map[string]any{"type": "boolean"},
 					"--only-matching":  map[string]any{"type": "boolean"},
 					"-o":               map[string]any{"type": "boolean"},
+					"vimgrep":          map[string]any{"type": "boolean"},
+					"--vimgrep":        map[string]any{"type": "boolean"},
 					"passthru":         map[string]any{"type": "boolean"},
 					"passthrough":      map[string]any{"type": "boolean"},
 					"--passthru":       map[string]any{"type": "boolean"},
@@ -522,7 +529,7 @@ func NewGrepTool() tool.Tool {
 			},
 		},
 		PromptFunc: func(tool.PromptContext) (string, error) {
-			return "Searches text files under path using a regular expression or fixed string. pattern is the canonical search expression; regex/regexp/--regexp/-e are accepted aliases. output_mode may be files_with_matches, files_without_matches, content, or count; glob/-g/--glob and type/-t/--type optionally filter file paths. glob accepts whitespace/comma-separated patterns and brace alternation. content mode supports context, before_context, after_context, -C, -B, -A, -n/--line-number and -N/--no-line-number line-number control, --column column-number output, offset, head_limit pagination, max_count/-m per-file match limiting, max_columns/--max-columns long-line omission, --max-columns-preview long-line previews, only_matching/-o/--only-matching matched-text output, passthru/--passthru/--passthrough all-line output, and trim/--trim leading-whitespace trimming. Use files_with_matches or -l to list files with matches, files_without_match or -L to list files without matches, and count/--count/-c for count mode. Count mode supports count_matches/--count-matches for occurrence counts. Use sort/--sort or sortr/--sortr with path or modified to control result ordering. Use fixed_strings/-F/--fixed-strings for literal matching, text/-a/--text to search binary-extension files as text, word_regexp/-w/--word-regexp for whole-word matches, line_regexp/-x/--line-regexp for whole-line matches, ignore_case/-i/--ignore-case for case-insensitive search, case_sensitive/-s/--case-sensitive to force case-sensitive matching, smart_case/-S/--smart-case for lowercase-only patterns, and invert_match/-v/--invert-match to select non-matching lines. Set no_ignore/--no-ignore to skip .gitignore/.ignore files while still excluding VCS metadata and read-denied paths. Set multiline to allow patterns to span lines with dot matching newlines.", nil
+			return "Searches text files under path using a regular expression or fixed string. pattern is the canonical search expression; regex/regexp/--regexp/-e are accepted aliases. output_mode may be files_with_matches, files_without_matches, content, or count; glob/-g/--glob and type/-t/--type optionally filter file paths. glob accepts whitespace/comma-separated patterns and brace alternation. content mode supports context, before_context, after_context, -C, -B, -A, -n/--line-number and -N/--no-line-number line-number control, --column column-number output, offset, head_limit pagination, max_count/-m per-file match limiting, max_columns/--max-columns long-line omission, --max-columns-preview long-line previews, only_matching/-o/--only-matching matched-text output, vimgrep/--vimgrep per-match line output, passthru/--passthru/--passthrough all-line output, and trim/--trim leading-whitespace trimming. Use files_with_matches or -l to list files with matches, files_without_match or -L to list files without matches, and count/--count/-c for count mode. Count mode supports count_matches/--count-matches for occurrence counts. Use sort/--sort or sortr/--sortr with path or modified to control result ordering. Use fixed_strings/-F/--fixed-strings for literal matching, text/-a/--text to search binary-extension files as text, word_regexp/-w/--word-regexp for whole-word matches, line_regexp/-x/--line-regexp for whole-line matches, ignore_case/-i/--ignore-case for case-insensitive search, case_sensitive/-s/--case-sensitive to force case-sensitive matching, smart_case/-S/--smart-case for lowercase-only patterns, and invert_match/-v/--invert-match to select non-matching lines. Set no_ignore/--no-ignore to skip .gitignore/.ignore files while still excluding VCS metadata and read-denied paths. Set multiline to allow patterns to span lines with dot matching newlines.", nil
 		},
 		NormalizeFunc:   normalizeGrepRawInput,
 		ValidateFunc:    validateGrep,
@@ -680,6 +687,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		before = 0
 		after = 0
 	}
+	vimgrep := grepVimgrep(input) && mode == "content"
 	passthru := grepPassthru(input) && mode == "content" && !onlyMatching
 	if passthru {
 		before = 0
@@ -704,6 +712,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		Multiline:     grepMultiline(input),
 		InvertMatch:   invertMatch,
 		OnlyMatching:  onlyMatching,
+		Vimgrep:       vimgrep,
 		Passthru:      passthru,
 		Trim:          trim,
 		CountMatches:  countMatches,
@@ -753,6 +762,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 			"line_regexp":         grepLineRegexp(input),
 			"invert_match":        invertMatch,
 			"only_matching":       onlyMatching,
+			"vimgrep":             vimgrep,
 			"passthru":            passthru,
 			"trim":                trim,
 			"files_with_matches":  mode == "files_with_matches",
@@ -1049,6 +1059,9 @@ func grepFileMatches(path string, content string, expr *regexp.Regexp, options g
 			included[i] = true
 		}
 	}
+	if options.Vimgrep && !options.InvertMatch {
+		return grepVimgrepMatches(path, lines, expr, matched, included, options)
+	}
 	matches := make([]grepMatch, 0, len(included))
 	for i := range lines {
 		if !included[i] {
@@ -1065,6 +1078,29 @@ func grepFileMatches(path string, content string, expr *regexp.Regexp, options g
 	return matches
 }
 
+func grepVimgrepMatches(path string, lines []string, expr *regexp.Regexp, matched map[int]bool, included map[int]bool, options grepOptions) []grepMatch {
+	matches := make([]grepMatch, 0, len(included))
+	for i := range lines {
+		if !included[i] {
+			continue
+		}
+		text := grepDisplayLine(lines[i], matched[i], options.MaxColumns, options.MaxPreview, options.Trim)
+		if !matched[i] {
+			matches = append(matches, grepMatch{Path: path, Line: i + 1, Text: text, Matched: false})
+			continue
+		}
+		spans := expr.FindAllStringIndex(lines[i], -1)
+		if len(spans) == 0 {
+			matches = append(matches, grepMatch{Path: path, Line: i + 1, Column: 1, Text: text, Matched: true})
+			continue
+		}
+		for _, span := range spans {
+			matches = append(matches, grepMatch{Path: path, Line: i + 1, Column: span[0] + 1, Text: text, Matched: true})
+		}
+	}
+	return matches
+}
+
 func grepLineOnlyMatches(path string, lines []string, expr *regexp.Regexp, maxCount int, maxColumns int, maxPreview bool, trim bool) []grepMatch {
 	var matches []grepMatch
 	matchedLines := 0
@@ -1287,12 +1323,16 @@ func formatGrepMatches(matches []grepMatch, options grepOptions) string {
 				separator = "-"
 			}
 			if options.LineNumbers {
-				if options.ColumnNumbers && match.Matched && match.Column > 0 {
+				if (options.ColumnNumbers || options.Vimgrep) && match.Matched && match.Column > 0 {
 					lines = append(lines, fmt.Sprintf("%s%s%d%s%d%s%s", match.Path, separator, match.Line, separator, match.Column, separator, match.Text))
 					continue
 				}
 				lines = append(lines, fmt.Sprintf("%s%s%d%s%s", match.Path, separator, match.Line, separator, match.Text))
 			} else {
+				if options.Vimgrep && match.Matched && match.Column > 0 {
+					lines = append(lines, fmt.Sprintf("%s%s%d%s%s", match.Path, separator, match.Column, separator, match.Text))
+					continue
+				}
 				lines = append(lines, fmt.Sprintf("%s%s%s", match.Path, separator, match.Text))
 			}
 		}
@@ -1665,6 +1705,10 @@ func grepOnlyMatching(input grepInput) bool {
 		input.ShortOnlyMatching
 }
 
+func grepVimgrep(input grepInput) bool {
+	return input.Vimgrep || input.LongVimgrep
+}
+
 func grepPassthru(input grepInput) bool {
 	return input.Passthru ||
 		input.Passthrough ||

internal/tools/file/tools_test.go

@@ -1951,6 +1951,64 @@ func TestGrepToolColumnNumbers(t *testing.T) {
 	}
 }
 
+func TestGrepToolVimgrep(t *testing.T) {
+	dir := t.TempDir()
+	content := strings.Join([]string{
+		"before",
+		"Needle Needle",
+		"after",
+		"Needle",
+	}, "\n")
+	if err := os.WriteFile(filepath.Join(dir, "hits.txt"), []byte(content), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	executor := fileExecutor(t)
+	ctx := fileToolContext(dir)
+
+	result, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_vimgrep",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"content","--vimgrep":"true","context":1}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := "hits.txt-1-before\nhits.txt:2:1:Needle Needle\nhits.txt:2:8:Needle Needle\nhits.txt-3-after\nhits.txt:4:1:Needle"
+	if result.Content != want || result.StructuredContent["vimgrep"] != true {
+		t.Fatalf("vimgrep result = %#v", result)
+	}
+	matches := result.StructuredContent["matches"].([]map[string]any)
+	if len(matches) != 5 || matches[1]["column"] != 1 || matches[2]["column"] != 8 || matches[3]["matched"] != false {
+		t.Fatalf("vimgrep structured matches = %#v", matches)
+	}
+
+	noLineResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_vimgrep_no_line",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"content","vimgrep":true,"-N":true,"head_limit":2}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantNoLine := "hits.txt:1:Needle Needle\nhits.txt:8:Needle Needle\n\n[Showing results with pagination = limit: 2]"
+	if noLineResult.Content != wantNoLine || noLineResult.StructuredContent["line_numbers"] != false {
+		t.Fatalf("vimgrep no-line result = %#v", noLineResult)
+	}
+
+	onlyResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_vimgrep_only_matching",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"content","--vimgrep":true,"only_matching":true,"head_limit":2}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantOnly := "hits.txt:2:1:Needle\nhits.txt:2:8:Needle\n\n[Showing results with pagination = limit: 2]"
+	if onlyResult.Content != wantOnly || onlyResult.StructuredContent["vimgrep"] != true || onlyResult.StructuredContent["only_matching"] != true {
+		t.Fatalf("vimgrep only-matching result = %#v", onlyResult)
+	}
+}
+
 func TestGrepToolTrim(t *testing.T) {
 	dir := t.TempDir()
 	content := strings.Join([]string{