Support grep filter flag aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -784,6 +784,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：`Grep` 文件列表输出现在显式支持 `files_with_match(es)`/`filesWithMatch(es)`/`files-with-match(es)`/`--files-with-match(es)`/`-l`，并接受 `output_mode` 的 `files_with_match` alias，统一归一为 `files_with_matches`。
 
+本轮补充：`Grep` 路径过滤现在支持 ripgrep 风格 `--glob`/`-g` 和 `--type`/`-t` aliases，执行和 structured content 都统一使用归一化后的 glob/type 过滤值。
+
 本轮补充：`Grep` 搜索现在支持 `no_ignore`/`noIgnore`/`no-ignore`/`--no-ignore`，可跳过 `.gitignore`/`.ignore` 规则，同时继续排除 VCS metadata 目录并保留 `Read(...)` deny 额外 ignore 保护；`--no-ignore` 兼容 quoted boolean。
 
 本轮补充：`Grep` 的 `files_with_matches` 输出现在按官方行为使用文件修改时间倒序排序，mtime 相同再按路径排序；分页和 `head_limit` 会在排序后应用。

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

@@ -188,6 +188,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：Grep 长行省略阈值现在支持 `max_columns`/`maxColumns`/`max-columns`/`--max-columns`，默认保持 500，传 `0` 可关闭省略，quoted semantic number 同样兼容。
 - 本轮补充：Grep 文件列表输出现在支持 `files_without_match`/`filesWithoutMatch`/`files-without-match`/`--files-without-match`/`-L`，也接受 `output_mode` 的 `files_without_match(es)`，用于列出不含匹配的文件并兼容 quoted boolean。
 - 本轮补充：Grep 文件列表输出现在显式支持 `files_with_match(es)`/`filesWithMatch(es)`/`files-with-match(es)`/`--files-with-match(es)`/`-l`，并接受 `output_mode` 的 `files_with_match` alias，统一归一为 `files_with_matches`。
+- 本轮补充：Grep 路径过滤现在支持 ripgrep 风格 `--glob`/`-g` 和 `--type`/`-t` aliases，执行和 structured content 都统一使用归一化后的 glob/type 过滤值。
 - 本轮补充：Grep 搜索现在支持 `no_ignore`/`noIgnore`/`no-ignore`/`--no-ignore`，可跳过 `.gitignore`/`.ignore` 规则，同时继续排除 VCS metadata 目录并保留 Read deny 额外 ignore 保护；`--no-ignore` 兼容 quoted boolean。
 - 本轮补充：Grep 的 `files_with_matches` 输出现在按官方行为使用文件修改时间倒序排序，mtime 相同再按路径排序；分页和 `head_limit` 会在排序后应用。
 - 本轮补充：Glob/Grep 搜索遍历现在会读取 permission context 中的 `Read(...)` deny 规则，并把对应 basename/path/directory pattern 作为额外 ignore rule，避免被禁止读取的文件出现在搜索结果中。

internal/tools/file/search_tools.go

@@ -27,7 +27,7 @@ const grepOmittedLongContextLine = "[Omitted long context line]"
 var semanticNumberLiteralRE = regexp.MustCompile(`^-?\d+(\.\d+)?$`)
 
 var allowedGrepInputKeys = map[string]struct{}{
-	"pattern": {}, "path": {}, "glob": {}, "type": {}, "output_mode": {}, "outputMode": {}, "limit": {},
+	"pattern": {}, "path": {}, "glob": {}, "--glob": {}, "-g": {}, "type": {}, "--type": {}, "-t": {}, "output_mode": {}, "outputMode": {}, "limit": {},
 	"head_limit": {}, "headLimit": {}, "offset": {}, "max_count": {}, "maxCount": {}, "-m": {},
 	"max_columns": {}, "maxColumns": {}, "max-columns": {}, "--max-columns": {},
 	"context": {}, "-C": {}, "before_context": {}, "beforeContext": {}, "-B": {}, "after_context": {}, "afterContext": {}, "-A": {}, "line_numbers": {}, "lineNumbers": {}, "-n": {},
@@ -70,7 +70,11 @@ type grepInput struct {
 	Pattern                 string `json:"pattern"`
 	Path                    string `json:"path,omitempty"`
 	Glob                    string `json:"glob,omitempty"`
+	LongGlob                string `json:"--glob,omitempty"`
+	ShortGlob               string `json:"-g,omitempty"`
 	Type                    string `json:"type,omitempty"`
+	LongType                string `json:"--type,omitempty"`
+	ShortType               string `json:"-t,omitempty"`
 	OutputMode              string `json:"output_mode,omitempty"`
 	OutputModeAlt           string `json:"outputMode,omitempty"`
 	Limit                   *int   `json:"limit,omitempty"`
@@ -225,7 +229,11 @@ func NewGrepTool() tool.Tool {
 					"pattern":     map[string]any{"type": "string"},
 					"path":        map[string]any{"type": "string"},
 					"glob":        map[string]any{"type": "string"},
+					"--glob":      map[string]any{"type": "string"},
+					"-g":          map[string]any{"type": "string"},
 					"type":        map[string]any{"type": "string"},
+					"--type":      map[string]any{"type": "string"},
+					"-t":          map[string]any{"type": "string"},
 					"output_mode": map[string]any{"type": "string", "enum": []any{"files_with_match", "files_with_matches", "files_without_match", "files_without_matches", "content", "count"}},
 					"outputMode":  map[string]any{"type": "string", "enum": []any{"files_with_match", "files_with_matches", "files_without_match", "files_without_matches", "content", "count"}},
 					"limit":       map[string]any{"type": "integer"},
@@ -330,7 +338,7 @@ func NewGrepTool() tool.Tool {
 			},
 		},
 		PromptFunc: func(tool.PromptContext) (string, error) {
-			return "Searches text files under path using a regular expression or fixed string. output_mode may be files_with_matches, files_without_matches, content, or count; glob and 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 control, offset, head_limit pagination, max_count/-m per-file match limiting, max_columns/--max-columns long-line omission, and only_matching/-o matched-text output. Use files_with_matches or -l to list files with matches, and files_without_match or -L to list files without matches. Count mode supports count_matches/--count-matches for occurrence counts. Use fixed_strings or -F for literal matching, word_regexp or -w for whole-word matches, and invert_match or -v 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. 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 control, offset, head_limit pagination, max_count/-m per-file match limiting, max_columns/--max-columns long-line omission, and only_matching/-o matched-text output. Use files_with_matches or -l to list files with matches, and files_without_match or -L to list files without matches. Count mode supports count_matches/--count-matches for occurrence counts. Use fixed_strings or -F for literal matching, word_regexp or -w for whole-word matches, and invert_match or -v 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,
@@ -445,7 +453,7 @@ func validateGrep(ctx tool.Context, raw json.RawMessage) error {
 	if input.LongMaxColumns != nil && *input.LongMaxColumns < 0 {
 		return fmt.Errorf("max_columns must be non-negative")
 	}
-	if _, err := grepTypeExtensions(input.Type); err != nil {
+	if _, err := grepTypeExtensions(grepTypeFilter(input)); err != nil {
 		return err
 	}
 	before, after := grepContextLines(input)
@@ -500,7 +508,9 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		CountMatches:  countMatches,
 	}
 	noIgnore := grepNoIgnore(input)
-	matches, totalMatches, truncated, err := collectGrepMatches(root, displayRoot, input.Glob, input.Type, expr, options, grepWalkOptions(ctx, root, noIgnore))
+	globFilter := grepGlobFilter(input)
+	typeFilter := grepTypeFilter(input)
+	matches, totalMatches, truncated, err := collectGrepMatches(root, displayRoot, globFilter, typeFilter, expr, options, grepWalkOptions(ctx, root, noIgnore))
 	if err != nil {
 		return contracts.ToolResult{}, err
 	}
@@ -514,8 +524,8 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 			"type":                "grep",
 			"pattern":             input.Pattern,
 			"path":                input.Path,
-			"glob":                input.Glob,
-			"type_filter":         input.Type,
+			"glob":                globFilter,
+			"type_filter":         typeFilter,
 			"output_mode":         mode,
 			"matches":             grepStructuredMatches(matches, mode),
 			"total_matches":       totalMatches,
@@ -1186,6 +1196,26 @@ func compileGrepPattern(input grepInput) (*regexp.Regexp, error) {
 	return regexp.Compile(pattern)
 }
 
+func grepGlobFilter(input grepInput) string {
+	if strings.TrimSpace(input.Glob) != "" {
+		return input.Glob
+	}
+	if strings.TrimSpace(input.LongGlob) != "" {
+		return input.LongGlob
+	}
+	return input.ShortGlob
+}
+
+func grepTypeFilter(input grepInput) string {
+	if strings.TrimSpace(input.Type) != "" {
+		return input.Type
+	}
+	if strings.TrimSpace(input.LongType) != "" {
+		return input.LongType
+	}
+	return input.ShortType
+}
+
 func grepCaseInsensitive(input grepInput) bool {
 	return input.IgnoreCase || input.CaseInsensitive || input.CaseInsensitiveAlt || input.ShortIgnoreCase
 }

internal/tools/file/tools_test.go

@@ -1412,6 +1412,32 @@ func TestGrepToolOutputModesAndGlobFilter(t *testing.T) {
 		t.Fatalf("multi glob result = %#v", multiGlobResult.Content)
 	}
 
+	longGlobResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_long_glob",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Alpha","--glob":"**/*.txt"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if longGlobResult.Content != "Found 1 file\nsrc/b.txt" ||
+		longGlobResult.StructuredContent["glob"] != "**/*.txt" {
+		t.Fatalf("long glob result = %#v", longGlobResult)
+	}
+
+	shortGlobResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_short_glob",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Alpha","-g":"**/*.txt"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if shortGlobResult.Content != "Found 1 file\nsrc/b.txt" ||
+		shortGlobResult.StructuredContent["glob"] != "**/*.txt" {
+		t.Fatalf("short glob result = %#v", shortGlobResult)
+	}
+
 	braceGlobResult, err := executor.Execute(ctx, contracts.ToolUse{
 		ID:    "toolu_grep_brace_glob",
 		Name:  "Grep",
@@ -2117,6 +2143,30 @@ func TestGrepToolTypeFilter(t *testing.T) {
 		t.Fatalf("javascript type result = %#v", jsResult.Content)
 	}
 
+	longTypeResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_long_type",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","--type":"javascript"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if longTypeResult.Content != "Found 1 file\nsrc/c.jsx" || longTypeResult.StructuredContent["type_filter"] != "javascript" {
+		t.Fatalf("long type result = %#v", longTypeResult)
+	}
+
+	shortTypeResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_short_type",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","-t":"go"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if shortTypeResult.Content != "Found 1 file\nsrc/a.go" || shortTypeResult.StructuredContent["type_filter"] != "go" {
+		t.Fatalf("short type result = %#v", shortTypeResult)
+	}
+
 	_, err = executor.Execute(ctx, contracts.ToolUse{
 		ID:    "toolu_grep_bad_type",
 		Name:  "Grep",