Add Grep include-zero counts

Author: SqlRush

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

@@ -215,6 +215,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：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 content 输出现在支持 ripgrep 风格 `replace`/`--replace`/`-r` 显示替换，匹配行按 replacement 展示、context 行保持原文，`only_matching` 和 `vimgrep` 输出也保留替换语义。
+- 本轮补充：Grep count 输出现在支持 ripgrep 风格 `include_zero`/`--include-zero`，普通 line count 和 `count_matches` occurrence count 都会输出零命中文件，并兼容 `--no-filename`。
 - 本轮补充：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

@@ -140,6 +140,7 @@ Covered behavior:
 - `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 `replace`/`--replace`/`-r`, applying display-only replacements to matching lines and only-matching/vimgrep output without changing context lines or count/list modes.
+- `Grep` count output now accepts `include_zero`/`--include-zero`, including zero-count files for both line counts and `count_matches` occurrence counts while preserving `--no-filename` output.
 - `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

@@ -55,6 +55,7 @@ var allowedGrepInputKeys = map[string]struct{}{
 	"files_without_match": {}, "filesWithoutMatch": {}, "files-without-match": {}, "--files-without-match": {}, "files_without_matches": {}, "filesWithoutMatches": {}, "files-without-matches": {}, "--files-without-matches": {}, "-L": {},
 	"count": {}, "--count": {}, "-c": {},
 	"count_matches": {}, "countMatches": {}, "count-matches": {}, "--count-matches": {},
+	"include_zero": {}, "includeZero": {}, "include-zero": {}, "--include-zero": {},
 	"no_ignore": {}, "noIgnore": {}, "no-ignore": {}, "--no-ignore": {},
 }
 
@@ -86,6 +87,7 @@ var grepSemanticBooleanKeys = map[string]struct{}{
 	"files_without_match": {}, "filesWithoutMatch": {}, "files-without-match": {}, "--files-without-match": {}, "files_without_matches": {}, "filesWithoutMatches": {}, "files-without-matches": {}, "--files-without-matches": {}, "-L": {},
 	"count": {}, "--count": {}, "-c": {},
 	"count_matches": {}, "countMatches": {}, "count-matches": {}, "--count-matches": {},
+	"include_zero": {}, "includeZero": {}, "include-zero": {}, "--include-zero": {},
 	"no_ignore": {}, "noIgnore": {}, "no-ignore": {}, "--no-ignore": {},
 }
 
@@ -252,6 +254,10 @@ type grepInput struct {
 	CountMatchesAlt         bool    `json:"countMatches,omitempty"`
 	CountMatchesDash        bool    `json:"count-matches,omitempty"`
 	LongCountMatches        bool    `json:"--count-matches,omitempty"`
+	IncludeZero             bool    `json:"include_zero,omitempty"`
+	IncludeZeroAlt          bool    `json:"includeZero,omitempty"`
+	IncludeZeroDash         bool    `json:"include-zero,omitempty"`
+	LongIncludeZero         bool    `json:"--include-zero,omitempty"`
 	NoIgnore                bool    `json:"no_ignore,omitempty"`
 	NoIgnoreAlt             bool    `json:"noIgnore,omitempty"`
 	NoIgnoreDash            bool    `json:"no-ignore,omitempty"`
@@ -299,6 +305,7 @@ type grepOptions struct {
 	Passthru      bool
 	Trim          bool
 	CountMatches  bool
+	IncludeZero   bool
 	ColumnNumbers bool
 	Text          bool
 	SortMode      string
@@ -544,6 +551,10 @@ func NewGrepTool() tool.Tool {
 					"countMatches":    map[string]any{"type": "boolean"},
 					"count-matches":   map[string]any{"type": "boolean"},
 					"--count-matches": map[string]any{"type": "boolean"},
+					"include_zero":    map[string]any{"type": "boolean"},
+					"includeZero":     map[string]any{"type": "boolean"},
+					"include-zero":    map[string]any{"type": "boolean"},
+					"--include-zero":  map[string]any{"type": "boolean"},
 					"no_ignore":       map[string]any{"type": "boolean"},
 					"noIgnore":        map[string]any{"type": "boolean"},
 					"no-ignore":       map[string]any{"type": "boolean"},
@@ -561,7 +572,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, -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, replace/--replace/-r display-only replacement, 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, replace/--replace/-r display-only replacement, 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 and include_zero/--include-zero to include zero-count files. 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,
@@ -727,6 +738,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 	}
 	trim := grepTrim(input) && mode == "content"
 	countMatches := grepCountMatches(input) && mode == "count" && !invertMatch
+	includeZero := grepIncludeZero(input) && mode == "count"
 	replace, hasReplace := grepReplacement(input)
 	if mode != "content" {
 		replace = ""
@@ -756,6 +768,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		Passthru:      passthru,
 		Trim:          trim,
 		CountMatches:  countMatches,
+		IncludeZero:   includeZero,
 		ColumnNumbers: grepColumnNumbers(input),
 		Text:          grepText(input),
 		SortMode:      sortMode,
@@ -813,6 +826,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 			"files_without_match": mode == "files_without_matches",
 			"count":               mode == "count",
 			"count_matches":       countMatches,
+			"include_zero":        includeZero,
 			"no_ignore":           noIgnore,
 			"multiline":           grepMultiline(input),
 			"sort":                grepStructuredSortMode(options),
@@ -1007,6 +1021,9 @@ func collectGrepMatches(root string, displayRoot string, glob string, typeFilter
 			return nil
 		}
 		if len(lineMatches) == 0 {
+			if options.Mode == "count" && options.IncludeZero {
+				matches = append(matches, grepMatch{Path: displayRel, Count: 0, ModUnix: info.ModTime().UnixNano()})
+			}
 			return nil
 		}
 		switch options.Mode {
@@ -1850,6 +1867,10 @@ func grepCountMatches(input grepInput) bool {
 	return input.CountMatches || input.CountMatchesAlt || input.CountMatchesDash || input.LongCountMatches
 }
 
+func grepIncludeZero(input grepInput) bool {
+	return input.IncludeZero || input.IncludeZeroAlt || input.IncludeZeroDash || input.LongIncludeZero
+}
+
 func grepNoIgnore(input grepInput) bool {
 	return input.NoIgnore || input.NoIgnoreAlt || input.NoIgnoreDash || input.LongNoIgnore
 }

internal/tools/file/tools_test.go

@@ -2089,6 +2089,73 @@ func TestGrepToolFilenameControls(t *testing.T) {
 	}
 }
 
+func TestGrepToolIncludeZero(t *testing.T) {
+	dir := t.TempDir()
+	if err := os.WriteFile(filepath.Join(dir, "a.txt"), []byte("Needle Needle\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(dir, "b.txt"), []byte("none\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	executor := fileExecutor(t)
+	ctx := fileToolContext(dir)
+
+	countResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_include_zero_count",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"count","include_zero":true,"sort":"path"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantCount := "a.txt:1\nb.txt:0\n\nFound 1 total occurrence across 2 files."
+	if countResult.Content != wantCount || countResult.StructuredContent["include_zero"] != true {
+		t.Fatalf("include-zero count result = %#v", countResult)
+	}
+
+	countMatchesResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_include_zero_count_matches",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"count","count_matches":true,"--include-zero":"true","sort":"path"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantCountMatches := "a.txt:2\nb.txt:0\n\nFound 2 total occurrences across 2 files."
+	if countMatchesResult.Content != wantCountMatches ||
+		countMatchesResult.StructuredContent["count_matches"] != true ||
+		countMatchesResult.StructuredContent["include_zero"] != true {
+		t.Fatalf("include-zero count-matches result = %#v", countMatchesResult)
+	}
+
+	noFilenameResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_include_zero_no_filename",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"count","include-zero":true,"--no-filename":true,"sort":"path"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantNoFilename := "1\n0\n\nFound 1 total occurrence across 2 files."
+	if noFilenameResult.Content != wantNoFilename ||
+		noFilenameResult.StructuredContent["with_filename"] != false ||
+		noFilenameResult.StructuredContent["include_zero"] != true {
+		t.Fatalf("include-zero no-filename result = %#v", noFilenameResult)
+	}
+
+	contentResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_include_zero_content_ignored",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"content","--include-zero":true,"sort":"path"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if contentResult.Content != "a.txt:1:Needle Needle" || contentResult.StructuredContent["include_zero"] != false {
+		t.Fatalf("include-zero content result = %#v", contentResult)
+	}
+}
+
 func TestGrepToolTrim(t *testing.T) {
 	dir := t.TempDir()
 	content := strings.Join([]string{