Accept Grep regexp pattern aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -812,6 +812,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：`Grep` count 输出模式现在支持 ripgrep 风格 `count`/`--count`/`-c` 布尔参数，和 `output_mode=count` 统一归一；`--count-matches` 仍仅控制 count 模式下按 occurrence 计数，避免混淆输出模式和计数粒度。
 
+本轮补充：`Grep` 搜索表达式现在除 canonical `pattern` 外，还接受 `regex`、`regexp`、`--regexp` 和 `-e` aliases；执行、校验和 structured content 都统一归一到 canonical `pattern`，便于 SDK/rg 风格调用复用同一工具。
+
 本轮补充：`Grep` 路径过滤现在支持 ripgrep 风格 `--glob`/`-g` 和 `--type`/`-t` aliases，执行和 structured content 都统一使用归一化后的 glob/type 过滤值。
 
 本轮补充：`Grep` 常用布尔参数继续补齐 ripgrep 长参数 aliases，覆盖 `--line-number`、`--ignore-case`、`--fixed-strings`、`--word-regexp`、`--invert-match` 和 `--only-matching`，并兼容 quoted semantic boolean。

docs/first-second-parity-audit.md

@@ -118,7 +118,7 @@ After the first/second batch hardening, the Go rewrite now includes initial `int
 
 Covered behavior:
 
-- `Glob`/`Grep` initial pure-Go file search tools, including recursive `**` glob matching, Glob absolute-pattern base-dir extraction, Glob official pattern/path-only strict schema, Glob/Grep working-directory-relative result paths, Glob default no-ignore/hidden search plus `CLAUDE_CODE_GLOB_NO_IGNORE`/`CLAUDE_CODE_GLOB_HIDDEN` env switches, Grep official VCS metadata directory exclusion (`.git`/`.svn`/`.hg`/`.bzr`/`.jj`/`.sl`), Grep hierarchical `.gitignore`/`.ignore`, Glob oldest-first modified/path sorting, Glob truncated tool-result hinting, regex and fixed-string grep (`fixed_strings`/`-F`), multiline dotall grep, glob/type filtering, Grep glob whitespace/comma multi-pattern and brace alternation, Glob/Grep path existence validation plus Glob directory-only path validation, `output_mode`/`outputMode` `files_with_matches`/`content`/`count` output modes, Grep `count`/`--count`/`-c` count-mode aliases, Grep files_with_matches file-count summaries, Grep count-mode occurrence/file summaries, Grep `--max-columns 500` long matching/context line omission placeholders, `context`/`before_context`/`after_context` and `-C`/`-B`/`-A` content context lines with official precedence and non-content modes ignoring context, `line_numbers`/`lineNumbers`/`-n` line-number control, `max_count`/`maxCount`/`-m` per-file match limiting, `offset`/`head_limit` pagination and content-mode pagination tool-result hinting, default 250-entry Grep head limit, `head_limit=0` unlimited behavior, `ignore_case`/`case_insensitive`/`caseInsensitive`/`-i` case-insensitive search aliases, and quoted semantic string coercion for Grep numeric/boolean inputs.
+- `Glob`/`Grep` initial pure-Go file search tools, including recursive `**` glob matching, Glob absolute-pattern base-dir extraction, Glob official pattern/path-only strict schema, Glob/Grep working-directory-relative result paths, Glob default no-ignore/hidden search plus `CLAUDE_CODE_GLOB_NO_IGNORE`/`CLAUDE_CODE_GLOB_HIDDEN` env switches, Grep official VCS metadata directory exclusion (`.git`/`.svn`/`.hg`/`.bzr`/`.jj`/`.sl`), Grep hierarchical `.gitignore`/`.ignore`, Glob oldest-first modified/path sorting, Glob truncated tool-result hinting, regex and fixed-string grep (`fixed_strings`/`-F`), Grep `regex`/`regexp`/`--regexp`/`-e` pattern aliases, multiline dotall grep, glob/type filtering, Grep glob whitespace/comma multi-pattern and brace alternation, Glob/Grep path existence validation plus Glob directory-only path validation, `output_mode`/`outputMode` `files_with_matches`/`content`/`count` output modes, Grep `count`/`--count`/`-c` count-mode aliases, Grep files_with_matches file-count summaries, Grep count-mode occurrence/file summaries, Grep `--max-columns 500` long matching/context line omission placeholders, `context`/`before_context`/`after_context` and `-C`/`-B`/`-A` content context lines with official precedence and non-content modes ignoring context, `line_numbers`/`lineNumbers`/`-n` line-number control, `max_count`/`maxCount`/`-m` per-file match limiting, `offset`/`head_limit` pagination and content-mode pagination tool-result hinting, default 250-entry Grep head limit, `head_limit=0` unlimited behavior, `ignore_case`/`case_insensitive`/`caseInsensitive`/`-i` case-insensitive search aliases, and quoted semantic string coercion for Grep numeric/boolean inputs.
 - `Bash` initial shell execution, including command/timeout/description validation, `/bin/sh -c` execution, stdout/stderr/exit-code/timeout structured results, dynamic read-only/concurrency-safe/destructive classification, Git diff/log/show/status/ls-files/grep/rev-parse/branch/tag/ls-remote safe-flag validation, Git remote/push/reflog/stash/worktree/merge-base/describe/cat-file/for-each-ref/rev-list/blame/shortlog/config-get argument-aware safety classification, destructive `find -delete/-exec rm` and `xargs rm` classification, safe-wrapper/env prefix normalization for Bash read-only/destructive classification (`time`/`nohup`/`timeout`/`nice`/`stdbuf`/`env`), destructive command detection after temporary environment assignments, permission-rule matching through the existing tool permission adapter, background command start, same-session `BashOutput` reads, and `KillBash` cancellation.
 - `TodoWrite` initial todo state, including full-list writes, status/priority validation, duplicate-id rejection, one `in_progress` guard, structured result payloads, tool metadata state storage, and session-scoped local persistence/restore.
 - `WebFetch` initial URL fetch behavior, including URL/timeout/max-byte validation, HTTP GET, HEAD preflight, metadata/raw `skipWebFetchPreflight` skip-preflight, binary preflight GET skipping from content type or attachment filename, text/binary detection, truncation, non-2xx error marking, structured result payloads, HTML-to-text rendering, prompt-focused excerpts, prompt phrase scoring/metadata, and `WebFetch(domain:...)` permission-rule adaptation.

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": {}, "--glob": {}, "-g": {}, "type": {}, "--type": {}, "-t": {}, "output_mode": {}, "outputMode": {}, "limit": {},
+	"pattern": {}, "regex": {}, "regexp": {}, "--regexp": {}, "-e": {}, "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": {}, "line-number": {}, "--line-number": {}, "-n": {},
@@ -70,6 +70,10 @@ type globInput struct {
 
 type grepInput struct {
 	Pattern                 string `json:"pattern"`
+	Regex                   string `json:"regex,omitempty"`
+	Regexp                  string `json:"regexp,omitempty"`
+	LongRegexp              string `json:"--regexp,omitempty"`
+	ShortRegexp             string `json:"-e,omitempty"`
 	Path                    string `json:"path,omitempty"`
 	Glob                    string `json:"glob,omitempty"`
 	LongGlob                string `json:"--glob,omitempty"`
@@ -241,10 +245,13 @@ func NewGrepTool() tool.Tool {
 			ConcurrencySafe: true,
 			Strict:          true,
 			InputSchema: contracts.JSONSchema{
-				"type":     "object",
-				"required": []any{"pattern"},
+				"type": "object",
 				"properties": map[string]any{
 					"pattern":     map[string]any{"type": "string"},
+					"regex":       map[string]any{"type": "string"},
+					"regexp":      map[string]any{"type": "string"},
+					"--regexp":    map[string]any{"type": "string"},
+					"-e":          map[string]any{"type": "string"},
 					"path":        map[string]any{"type": "string"},
 					"glob":        map[string]any{"type": "string"},
 					"--glob":      map[string]any{"type": "string"},
@@ -376,7 +383,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/-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 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/--only-matching matched-text output. 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 fixed_strings/-F/--fixed-strings for literal matching, word_regexp/-w/--word-regexp for whole-word matches, ignore_case/-i/--ignore-case for case-insensitive search, 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 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/--only-matching matched-text output. 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 fixed_strings/-F/--fixed-strings for literal matching, word_regexp/-w/--word-regexp for whole-word matches, ignore_case/-i/--ignore-case for case-insensitive search, 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,
@@ -446,7 +453,7 @@ func validateGrep(ctx tool.Context, raw json.RawMessage) error {
 	if err != nil {
 		return err
 	}
-	if strings.TrimSpace(input.Pattern) == "" {
+	if strings.TrimSpace(grepPattern(input)) == "" {
 		return fmt.Errorf("pattern is required")
 	}
 	if _, err := compileGrepPattern(input); err != nil {
@@ -560,7 +567,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		Content: content,
 		StructuredContent: map[string]any{
 			"type":                "grep",
-			"pattern":             input.Pattern,
+			"pattern":             grepPattern(input),
 			"path":                input.Path,
 			"glob":                globFilter,
 			"type_filter":         typeFilter,
@@ -1219,8 +1226,17 @@ func normalizedGrepOutputMode(input grepInput) string {
 	return mode
 }
 
+func grepPattern(input grepInput) string {
+	for _, pattern := range []string{input.Pattern, input.Regex, input.Regexp, input.LongRegexp, input.ShortRegexp} {
+		if strings.TrimSpace(pattern) != "" {
+			return pattern
+		}
+	}
+	return ""
+}
+
 func compileGrepPattern(input grepInput) (*regexp.Regexp, error) {
-	pattern := input.Pattern
+	pattern := grepPattern(input)
 	if grepFixedStrings(input) {
 		pattern = regexp.QuoteMeta(pattern)
 	}

internal/tools/file/tools_test.go

@@ -1317,6 +1317,46 @@ func TestGrepToolOutputModesAndGlobFilter(t *testing.T) {
 		t.Fatalf("content result = %#v", contentResult.Content)
 	}
 
+	regexpAliasResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_regexp_alias",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"--regexp":"Alpha","glob":"**/*.go","output_mode":"content"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if regexpAliasResult.Content != "src/a.go:2:func Alpha() {}\nsrc/c.go:2:func AlphaBeta() {}" ||
+		regexpAliasResult.StructuredContent["pattern"] != "Alpha" {
+		t.Fatalf("regexp alias result = %#v", regexpAliasResult)
+	}
+
+	regexAliasResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_regex_alias",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"regex":"Beta","glob":"**/*.go"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if regexAliasResult.Content != "Found 1 file\nsrc/c.go" ||
+		regexAliasResult.StructuredContent["pattern"] != "Beta" {
+		t.Fatalf("regex alias result = %#v", regexAliasResult)
+	}
+
+	shortRegexpAliasResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_short_regexp_alias",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"-e":"Alpha","glob":"**/*.go","output_mode":"count"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantRegexpAliasCount := "src/a.go:1\nsrc/c.go:1\n\nFound 2 total occurrences across 2 files."
+	if shortRegexpAliasResult.Content != wantRegexpAliasCount ||
+		shortRegexpAliasResult.StructuredContent["pattern"] != "Alpha" {
+		t.Fatalf("short regexp alias result = %#v", shortRegexpAliasResult)
+	}
+
 	countResult, err := executor.Execute(ctx, contracts.ToolUse{
 		ID:    "toolu_grep_count",
 		Name:  "Grep",