Add Grep filename output controls

Author: SqlRush

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

@@ -213,6 +213,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：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 content/count 输出现在支持 ripgrep 风格 `with_filename`/`--with-filename`/`-H` 和 `no_filename`/`--no-filename`/`-I`，可控制匹配行和计数输出的文件名前缀；文件列表模式仍保留路径输出。
 - 本轮补充：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

@@ -138,6 +138,7 @@ Covered 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 and count output now accept `with_filename`/`--with-filename`/`-H` plus `no_filename`/`--no-filename`/`-I`, while file-list modes continue to emit paths.
 - `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

@@ -33,6 +33,7 @@ var allowedGrepInputKeys = map[string]struct{}{
 	"head_limit": {}, "headLimit": {}, "offset": {}, "max_count": {}, "maxCount": {}, "-m": {},
 	"max_columns": {}, "maxColumns": {}, "max-columns": {}, "--max-columns": {},
 	"max_columns_preview": {}, "maxColumnsPreview": {}, "max-columns-preview": {}, "--max-columns-preview": {}, "no_max_columns_preview": {}, "noMaxColumnsPreview": {}, "no-max-columns-preview": {}, "--no-max-columns-preview": {},
+	"with_filename": {}, "withFilename": {}, "with-filename": {}, "--with-filename": {}, "-H": {}, "no_filename": {}, "noFilename": {}, "no-filename": {}, "--no-filename": {}, "-I": {},
 	"sort": {}, "--sort": {}, "sortr": {}, "--sortr": {},
 	"context": {}, "-C": {}, "before_context": {}, "beforeContext": {}, "-B": {}, "after_context": {}, "afterContext": {}, "-A": {}, "line_numbers": {}, "lineNumbers": {}, "line-number": {}, "--line-number": {}, "-n": {},
 	"no_line_number": {}, "noLineNumber": {}, "no_line_numbers": {}, "noLineNumbers": {}, "no-line-number": {}, "no-line-numbers": {}, "--no-line-number": {}, "-N": {},
@@ -64,6 +65,7 @@ var grepSemanticNumberKeys = map[string]struct{}{
 
 var grepSemanticBooleanKeys = map[string]struct{}{
 	"max_columns_preview": {}, "maxColumnsPreview": {}, "max-columns-preview": {}, "--max-columns-preview": {}, "no_max_columns_preview": {}, "noMaxColumnsPreview": {}, "no-max-columns-preview": {}, "--no-max-columns-preview": {},
+	"with_filename": {}, "withFilename": {}, "with-filename": {}, "--with-filename": {}, "-H": {}, "no_filename": {}, "noFilename": {}, "no-filename": {}, "--no-filename": {}, "-I": {},
 	"line_numbers": {}, "lineNumbers": {}, "line-number": {}, "--line-number": {}, "-n": {},
 	"no_line_number": {}, "noLineNumber": {}, "no_line_numbers": {}, "noLineNumbers": {}, "no-line-number": {}, "no-line-numbers": {}, "--no-line-number": {}, "-N": {},
 	"column": {}, "column_numbers": {}, "columnNumbers": {}, "column-number": {}, "--column": {},
@@ -125,6 +127,16 @@ type grepInput struct {
 	NoMaxColumnsPreviewAlt  bool   `json:"noMaxColumnsPreview,omitempty"`
 	NoMaxColumnsPreviewDash bool   `json:"no-max-columns-preview,omitempty"`
 	LongNoMaxColumnsPreview bool   `json:"--no-max-columns-preview,omitempty"`
+	WithFilename            bool   `json:"with_filename,omitempty"`
+	WithFilenameAlt         bool   `json:"withFilename,omitempty"`
+	WithFilenameDash        bool   `json:"with-filename,omitempty"`
+	LongWithFilename        bool   `json:"--with-filename,omitempty"`
+	ShortWithFilename       bool   `json:"-H,omitempty"`
+	NoFilename              bool   `json:"no_filename,omitempty"`
+	NoFilenameAlt           bool   `json:"noFilename,omitempty"`
+	NoFilenameDash          bool   `json:"no-filename,omitempty"`
+	LongNoFilename          bool   `json:"--no-filename,omitempty"`
+	ShortNoFilename         bool   `json:"-I,omitempty"`
 	Sort                    string `json:"sort,omitempty"`
 	LongSort                string `json:"--sort,omitempty"`
 	SortReverse             string `json:"sortr,omitempty"`
@@ -270,6 +282,7 @@ type grepOptions struct {
 	MaxCount      int
 	MaxColumns    int
 	MaxPreview    bool
+	WithFilename  bool
 	BeforeContext int
 	AfterContext  int
 	LineNumbers   bool
@@ -371,9 +384,19 @@ func NewGrepTool() tool.Tool {
 					"--no-max-columns-preview": map[string]any{
 						"type": "boolean",
 					},
-					"sort":   map[string]any{"type": "string", "enum": []any{"path", "name", "file", "modified", "mtime", "modtime", "time", "none"}},
-					"--sort": map[string]any{"type": "string", "enum": []any{"path", "name", "file", "modified", "mtime", "modtime", "time", "none"}},
-					"sortr":  map[string]any{"type": "string", "enum": []any{"path", "name", "file", "modified", "mtime", "modtime", "time", "none"}},
+					"with_filename":   map[string]any{"type": "boolean"},
+					"withFilename":    map[string]any{"type": "boolean"},
+					"with-filename":   map[string]any{"type": "boolean"},
+					"--with-filename": map[string]any{"type": "boolean"},
+					"-H":              map[string]any{"type": "boolean"},
+					"no_filename":     map[string]any{"type": "boolean"},
+					"noFilename":      map[string]any{"type": "boolean"},
+					"no-filename":     map[string]any{"type": "boolean"},
+					"--no-filename":   map[string]any{"type": "boolean"},
+					"-I":              map[string]any{"type": "boolean"},
+					"sort":            map[string]any{"type": "string", "enum": []any{"path", "name", "file", "modified", "mtime", "modtime", "time", "none"}},
+					"--sort":          map[string]any{"type": "string", "enum": []any{"path", "name", "file", "modified", "mtime", "modtime", "time", "none"}},
+					"sortr":           map[string]any{"type": "string", "enum": []any{"path", "name", "file", "modified", "mtime", "modtime", "time", "none"}},
 					"--sortr": map[string]any{
 						"type": "string", "enum": []any{"path", "name", "file", "modified", "mtime", "modtime", "time", "none"},
 					},
@@ -529,7 +552,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, 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
+			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, -H/--with-filename and -I/--no-filename filename prefix control, 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,
@@ -706,6 +729,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		MaxCount:      grepMaxCount(input),
 		MaxColumns:    grepMaxColumns(input),
 		MaxPreview:    grepMaxColumnsPreview(input),
+		WithFilename:  grepWithFilename(input, mode),
 		BeforeContext: before,
 		AfterContext:  after,
 		LineNumbers:   grepLineNumbers(input, mode),
@@ -749,6 +773,8 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 			"max_count":           options.MaxCount,
 			"max_columns":         options.MaxColumns,
 			"max_columns_preview": options.MaxPreview,
+			"with_filename":       options.WithFilename,
+			"no_filename":         !options.WithFilename && (mode == "content" || mode == "count"),
 			"before_context":      options.BeforeContext,
 			"after_context":       options.AfterContext,
 			"line_numbers":        options.LineNumbers,
@@ -1316,24 +1342,42 @@ func formatGrepMatches(matches []grepMatch, options grepOptions) string {
 		case "files_with_matches", "files_without_matches":
 			lines = append(lines, match.Path)
 		case "count":
-			lines = append(lines, fmt.Sprintf("%s:%d", match.Path, match.Count))
+			if options.WithFilename {
+				lines = append(lines, fmt.Sprintf("%s:%d", match.Path, match.Count))
+			} else {
+				lines = append(lines, fmt.Sprintf("%d", match.Count))
+			}
 		default:
 			separator := ":"
 			if !match.Matched {
 				separator = "-"
 			}
+			if options.WithFilename {
+				if options.LineNumbers {
+					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))
+				}
+				continue
+			}
 			if options.LineNumbers {
 				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))
+					lines = append(lines, fmt.Sprintf("%d%s%d%s%s", 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))
+				lines = append(lines, fmt.Sprintf("%d%s%s", match.Line, separator, match.Text))
+			} else if options.Vimgrep && match.Matched && match.Column > 0 {
+				lines = append(lines, fmt.Sprintf("%d%s%s", match.Column, 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))
+				lines = append(lines, match.Text)
 			}
 		}
 	}
@@ -2002,6 +2046,20 @@ func grepMaxColumnsPreview(input grepInput) bool {
 		input.LongMaxColumnsPreview
 }
 
+func grepWithFilename(input grepInput, mode string) bool {
+	if mode != "content" && mode != "count" {
+		return true
+	}
+	if input.NoFilename ||
+		input.NoFilenameAlt ||
+		input.NoFilenameDash ||
+		input.LongNoFilename ||
+		input.ShortNoFilename {
+		return false
+	}
+	return true
+}
+
 func grepContextLines(input grepInput) (int, int) {
 	if input.Context != nil {
 		return *input.Context, *input.Context

internal/tools/file/tools_test.go

@@ -2009,6 +2009,86 @@ func TestGrepToolVimgrep(t *testing.T) {
 	}
 }
 
+func TestGrepToolFilenameControls(t *testing.T) {
+	dir := t.TempDir()
+	if err := os.WriteFile(filepath.Join(dir, "a.txt"), []byte("before\nNeedle Needle\nafter\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(dir, "b.txt"), []byte("Needle\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	executor := fileExecutor(t)
+	ctx := fileToolContext(dir)
+
+	contentResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_no_filename_content",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","glob":"a.txt","output_mode":"content","--no-filename":"true","context":1}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantContent := "1-before\n2:Needle Needle\n3-after"
+	if contentResult.Content != wantContent ||
+		contentResult.StructuredContent["with_filename"] != false ||
+		contentResult.StructuredContent["no_filename"] != true {
+		t.Fatalf("no-filename content result = %#v", contentResult)
+	}
+
+	countResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_no_filename_count",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"count","no_filename":true}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantCount := "1\n1\n\nFound 2 total occurrences across 2 files."
+	if countResult.Content != wantCount || countResult.StructuredContent["with_filename"] != false {
+		t.Fatalf("no-filename count result = %#v", countResult)
+	}
+
+	vimgrepResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_no_filename_vimgrep",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","glob":"a.txt","output_mode":"content","-I":true,"-N":true,"--vimgrep":true}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantVimgrep := "1:Needle Needle\n8:Needle Needle"
+	if vimgrepResult.Content != wantVimgrep ||
+		vimgrepResult.StructuredContent["with_filename"] != false ||
+		vimgrepResult.StructuredContent["line_numbers"] != false {
+		t.Fatalf("no-filename vimgrep result = %#v", vimgrepResult)
+	}
+
+	filesResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_no_filename_files",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","--files-with-matches":true,"--no-filename":true,"sort":"path"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if filesResult.Content != "Found 2 files\na.txt\nb.txt" || filesResult.StructuredContent["with_filename"] != true {
+		t.Fatalf("no-filename files result = %#v", filesResult)
+	}
+
+	withResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_with_filename",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","glob":"a.txt","output_mode":"content","-H":true,"head_limit":1}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantWith := "a.txt:2:Needle Needle"
+	if withResult.Content != wantWith || withResult.StructuredContent["with_filename"] != true {
+		t.Fatalf("with-filename result = %#v", withResult)
+	}
+}
+
 func TestGrepToolTrim(t *testing.T) {
 	dir := t.TempDir()
 	content := strings.Join([]string{