Add Grep sort-files alias

Author: SqlRush

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

@@ -232,6 +232,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：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` 会在排序后应用。
 - 本轮补充：Grep 结果排序现在支持 ripgrep 风格 `sort`/`--sort` 和 `sortr`/`--sortr` 参数，覆盖 `path`/`modified`/`none` 及常见别名；显式排序会作用于 files/content/count 输出，structured content 会回传实际 sort、reverse 和 explicit 状态。
+- 本轮补充：Grep 结果排序现在支持 ripgrep deprecated `sort_files`/`sortFiles`/`sort-files`/`--sort-files` aliases，统一映射到显式 `sort=path`，并兼容 quoted semantic boolean。
 - 本轮补充：Glob/Grep 搜索遍历现在会读取 permission context 中的 `Read(...)` deny 规则，并把对应 basename/path/directory pattern 作为额外 ignore rule，避免被禁止读取的文件出现在搜索结果中。
 - 本轮补充：Bash `grep`/`rg` read-only 分类现在会把 pattern-file 参数 `-f FILE`、`-fFILE` 和 `--file=FILE` 当作路径读取处理，缺值、绝对路径和 `..` 路径不再进入 read-only fast path。
 - 本轮补充：Bash/PowerShell read-only 分类会先校验 tokenizer 视角的语法完整性，未闭合 quote 或末尾 escape/line-continuation 不再进入只读 fast path。

docs/first-second-parity-audit.md

@@ -134,7 +134,7 @@ Covered behavior:
 - `Grep` content output now accepts `column`/`column_numbers`/`columnNumbers`/`column-number`/`--column`, emitting `path:line:column:text` for matching lines while preserving context-line formatting and structured column metadata.
 - `Grep` files-with-matches output now mirrors the official modified-time sort: newest files first, path tie-breaker, and pagination applied after sorting.
 - `Grep` now accepts ripgrep-style file listing through `files`/`--files` and `output_mode:"files"`, not requiring a pattern and listing paths after traversal, ignore, glob/iglob, type/type-not, hidden, and binary/text filters without reading file contents.
-- `Grep` now accepts ripgrep-style result ordering through `sort`/`--sort` and `sortr`/`--sortr`, covering path, modified-time, and none ordering for files/content/count modes with structured sort metadata.
+- `Grep` now accepts ripgrep-style result ordering through `sort`/`--sort`, `sortr`/`--sortr`, and deprecated `sort_files`/`--sort-files`, covering path, modified-time, and none ordering for files/content/count modes with structured sort metadata.
 - `Grep` now accepts ripgrep-style negative type filtering through `type_not`/`typeNot`/`type-not`/`--type-not`/`-T`, applying it after any positive `type` filter and preserving structured filter metadata.
 - `Grep` now accepts ripgrep-style case-insensitive glob filtering through `iglob`/`--iglob`, sharing positive and `!` negative glob rule semantics with `glob` while preserving structured filter metadata.
 - `Grep` glob filtering now accepts ripgrep-style negated `!pattern` rules, including combinations with positive patterns, comma/whitespace splitting, and brace-expanded globs.

internal/tools/file/search_tools.go

@@ -44,7 +44,7 @@ var allowedGrepInputKeys = map[string]struct{}{
 	"no_context_separator": {}, "noContextSeparator": {}, "no-context-separator": {}, "--no-context-separator": {},
 	"byte_offset": {}, "byteOffset": {}, "byte-offset": {}, "--byte-offset": {}, "-b": {},
 	"hidden": {}, "--hidden": {}, "no_hidden": {}, "noHidden": {}, "no-hidden": {}, "--no-hidden": {},
-	"sort": {}, "--sort": {}, "sortr": {}, "--sortr": {},
+	"sort": {}, "--sort": {}, "sortr": {}, "--sortr": {}, "sort_files": {}, "sortFiles": {}, "sort-files": {}, "--sort-files": {},
 	"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": {},
 	"column": {}, "column_numbers": {}, "columnNumbers": {}, "column-number": {}, "--column": {},
@@ -83,6 +83,7 @@ var grepSemanticBooleanKeys = map[string]struct{}{
 	"no_context_separator": {}, "noContextSeparator": {}, "no-context-separator": {}, "--no-context-separator": {},
 	"byte_offset": {}, "byteOffset": {}, "byte-offset": {}, "--byte-offset": {}, "-b": {},
 	"hidden": {}, "--hidden": {}, "no_hidden": {}, "noHidden": {}, "no-hidden": {}, "--no-hidden": {},
+	"sort_files": {}, "sortFiles": {}, "sort-files": {}, "--sort-files": {},
 	"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": {},
@@ -210,6 +211,10 @@ type grepInput struct {
 	LongSort                  string  `json:"--sort,omitempty"`
 	SortReverse               string  `json:"sortr,omitempty"`
 	LongSortReverse           string  `json:"--sortr,omitempty"`
+	SortFiles                 bool    `json:"sort_files,omitempty"`
+	SortFilesAlt              bool    `json:"sortFiles,omitempty"`
+	SortFilesDash             bool    `json:"sort-files,omitempty"`
+	LongSortFiles             bool    `json:"--sort-files,omitempty"`
 	Context                   *int    `json:"context,omitempty"`
 	ShortContext              *int    `json:"-C,omitempty"`
 	BeforeContext             *int    `json:"before_context,omitempty"`
@@ -539,8 +544,12 @@ func NewGrepTool() tool.Tool {
 					"--sortr": map[string]any{
 						"type": "string", "enum": []any{"path", "name", "file", "modified", "mtime", "modtime", "time", "none"},
 					},
-					"context": map[string]any{"type": "integer"},
-					"-C":      map[string]any{"type": "integer"},
+					"sort_files":   map[string]any{"type": "boolean"},
+					"sortFiles":    map[string]any{"type": "boolean"},
+					"sort-files":   map[string]any{"type": "boolean"},
+					"--sort-files": map[string]any{"type": "boolean"},
+					"context":      map[string]any{"type": "integer"},
+					"-C":           map[string]any{"type": "integer"},
 					"before_context": map[string]any{
 						"type": "integer",
 					},
@@ -697,7 +706,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, files_with_matches, files_without_matches, content, or count; glob/-g/--glob, iglob/--iglob, type/-t/--type, and type_not/-T/--type-not optionally filter file paths. glob and iglob accept whitespace/comma-separated patterns, negation, 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, byte_offset/--byte-offset/-b byte offset output, -H/--with-filename and -I/--no-filename filename prefix control, heading/--heading grouped file headings, path_separator/--path-separator display path separator control, null/--null NUL path terminators/separators, field_match_separator/--field-match-separator and field_context_separator/--field-context-separator output field separators, context_separator/--context-separator and no_context_separator/--no-context-separator context group separator 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, trim/--trim leading-whitespace trimming, and hidden/--hidden or no_hidden/--no-hidden hidden file traversal control. Use files/--files to list files that would be searched without requiring pattern, 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
+			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, files_with_matches, files_without_matches, content, or count; glob/-g/--glob, iglob/--iglob, type/-t/--type, and type_not/-T/--type-not optionally filter file paths. glob and iglob accept whitespace/comma-separated patterns, negation, 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, byte_offset/--byte-offset/-b byte offset output, -H/--with-filename and -I/--no-filename filename prefix control, heading/--heading grouped file headings, path_separator/--path-separator display path separator control, null/--null NUL path terminators/separators, field_match_separator/--field-match-separator and field_context_separator/--field-context-separator output field separators, context_separator/--context-separator and no_context_separator/--no-context-separator context group separator 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, trim/--trim leading-whitespace trimming, and hidden/--hidden or no_hidden/--no-hidden hidden file traversal control. Use files/--files to list files that would be searched without requiring pattern, 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; --sort-files is accepted as a path-sort alias. 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,
@@ -1000,6 +1009,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 			"sort":                    grepStructuredSortMode(options),
 			"sort_reverse":            grepStructuredSortReverse(options),
 			"sort_explicit":           sortExplicit,
+			"sort_files":              grepSortFiles(input),
 			"truncated":               truncated,
 		},
 	}, nil
@@ -1851,6 +1861,9 @@ func grepSort(input grepInput) (string, bool, bool, error) {
 		mode, err := normalizeGrepSortMode(raw)
 		return mode, false, true, err
 	}
+	if grepSortFiles(input) {
+		return "path", false, true, nil
+	}
 	return "", false, false, nil
 }
 
@@ -1879,6 +1892,13 @@ func firstNonEmpty(values ...string) string {
 	return ""
 }
 
+func grepSortFiles(input grepInput) bool {
+	return input.SortFiles ||
+		input.SortFilesAlt ||
+		input.SortFilesDash ||
+		input.LongSortFiles
+}
+
 func sortGrepMatches(matches []grepMatch, options grepOptions) {
 	if options.SortExplicit && options.SortMode == "none" {
 		return

internal/tools/file/tools_test.go

@@ -1681,6 +1681,21 @@ func TestGrepToolSortAliases(t *testing.T) {
 		t.Fatalf("path sort result = %#v", pathResult)
 	}
 
+	sortFilesResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_sort_files",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","--sort-files":"true"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if sortFilesResult.Content != "Found 3 files\na.txt\nm.txt\nz.txt" ||
+		sortFilesResult.StructuredContent["sort"] != "path" ||
+		sortFilesResult.StructuredContent["sort_files"] != true ||
+		sortFilesResult.StructuredContent["sort_explicit"] != true {
+		t.Fatalf("sort-files result = %#v", sortFilesResult)
+	}
+
 	reversePathResult, err := executor.Execute(ctx, contracts.ToolUse{
 		ID:    "toolu_grep_sort_reverse_path",
 		Name:  "Grep",