Add Grep passthru output aliases

Author: SqlRush

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

@@ -208,6 +208,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：Grep 路径过滤现在支持 ripgrep 风格 `--glob`/`-g` 和 `--type`/`-t` aliases，执行和 structured content 都统一使用归一化后的 glob/type 过滤值。
 - 本轮补充：Grep `glob`/`--glob`/`-g` 路径过滤现在支持 ripgrep 风格 `!pattern` 排除规则，可与正向 glob、逗号/空白多 pattern 和 brace alternation 组合；只有排除规则时默认包含未被排除的路径。
 - 本轮补充：Grep 搜索现在支持 ripgrep 风格 `text`/`--text`/`-a`，可显式把二进制扩展名文件按文本读取参与匹配，structured content 会回传 `text` 状态；`-a` 同样兼容 quoted semantic boolean。
+- 本轮补充：Grep content 输出现在支持 ripgrep 风格 `passthru`/`passthrough`/`--passthru`/`--passthrough`，可输出被搜索文件的全部行并保留匹配行标记；启用后按官方语义覆盖 context 行数，quoted semantic boolean 同样兼容。
 - 本轮补充：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

@@ -135,6 +135,7 @@ Covered behavior:
 - `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` glob filtering now accepts ripgrep-style negated `!pattern` rules, including combinations with positive patterns, comma/whitespace splitting, and brace-expanded globs.
 - `Grep` now accepts `text`/`--text`/`-a` to search binary-extension files as text while preserving the default binary-extension skip behavior.
+- `Grep` content output now accepts `passthru`/`passthrough`/`--passthru`/`--passthrough`, printing all searched lines while preserving matched-line markers and overriding context counts.
 - `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.
 - `Read`/`Edit` now coerce quoted semantic strings for `offset`/`limit` and `replace_all`, including whole-decimal numeric strings such as `"2.0"` for integer fields while keeping fractional values rejected.
 - `Bash`/`BashOutput` now coerce quoted semantic strings for `timeout`, `run_in_background`/`runInBackground`, and `tail_lines`/`tailLines`, matching official SDK-style number/boolean inputs without relaxing unknown-field validation.

internal/tools/file/search_tools.go

@@ -43,6 +43,7 @@ var allowedGrepInputKeys = map[string]struct{}{
 	"word_regexp": {}, "wordRegexp": {}, "word-regexp": {}, "--word-regexp": {}, "-w": {},
 	"invert_match": {}, "invertMatch": {}, "invert-match": {}, "--invert-match": {}, "-v": {},
 	"only_matching": {}, "onlyMatching": {}, "only-matching": {}, "--only-matching": {}, "-o": {},
+	"passthru": {}, "passthrough": {}, "--passthru": {}, "--passthrough": {},
 	"files_with_match": {}, "filesWithMatch": {}, "files-with-match": {}, "--files-with-match": {}, "files_with_matches": {}, "filesWithMatches": {}, "files-with-matches": {}, "--files-with-matches": {}, "-l": {},
 	"files_without_match": {}, "filesWithoutMatch": {}, "files-without-match": {}, "--files-without-match": {}, "files_without_matches": {}, "filesWithoutMatches": {}, "files-without-matches": {}, "--files-without-matches": {}, "-L": {},
 	"count": {}, "--count": {}, "-c": {},
@@ -68,6 +69,7 @@ var grepSemanticBooleanKeys = map[string]struct{}{
 	"word_regexp": {}, "wordRegexp": {}, "word-regexp": {}, "--word-regexp": {}, "-w": {},
 	"invert_match": {}, "invertMatch": {}, "invert-match": {}, "--invert-match": {}, "-v": {},
 	"only_matching": {}, "onlyMatching": {}, "only-matching": {}, "--only-matching": {}, "-o": {},
+	"passthru": {}, "passthrough": {}, "--passthru": {}, "--passthrough": {},
 	"files_with_match": {}, "filesWithMatch": {}, "files-with-match": {}, "--files-with-match": {}, "files_with_matches": {}, "filesWithMatches": {}, "files-with-matches": {}, "--files-with-matches": {}, "-l": {},
 	"files_without_match": {}, "filesWithoutMatch": {}, "files-without-match": {}, "--files-without-match": {}, "files_without_matches": {}, "filesWithoutMatches": {}, "files-without-matches": {}, "--files-without-matches": {}, "-L": {},
 	"count": {}, "--count": {}, "-c": {},
@@ -175,6 +177,10 @@ type grepInput struct {
 	OnlyMatchingDash        bool   `json:"only-matching,omitempty"`
 	LongOnlyMatching        bool   `json:"--only-matching,omitempty"`
 	ShortOnlyMatching       bool   `json:"-o,omitempty"`
+	Passthru                bool   `json:"passthru,omitempty"`
+	Passthrough             bool   `json:"passthrough,omitempty"`
+	LongPassthru            bool   `json:"--passthru,omitempty"`
+	LongPassthrough         bool   `json:"--passthrough,omitempty"`
 	FilesWithMatch          bool   `json:"files_with_match,omitempty"`
 	FilesWithMatchAlt       bool   `json:"filesWithMatch,omitempty"`
 	FilesWithMatchDash      bool   `json:"files-with-match,omitempty"`
@@ -239,6 +245,7 @@ type grepOptions struct {
 	Multiline     bool
 	InvertMatch   bool
 	OnlyMatching  bool
+	Passthru      bool
 	CountMatches  bool
 	ColumnNumbers bool
 	Text          bool
@@ -396,6 +403,10 @@ func NewGrepTool() tool.Tool {
 					"only-matching":    map[string]any{"type": "boolean"},
 					"--only-matching":  map[string]any{"type": "boolean"},
 					"-o":               map[string]any{"type": "boolean"},
+					"passthru":         map[string]any{"type": "boolean"},
+					"passthrough":      map[string]any{"type": "boolean"},
+					"--passthru":       map[string]any{"type": "boolean"},
+					"--passthrough":    map[string]any{"type": "boolean"},
 					"files_with_match": map[string]any{
 						"type": "boolean",
 					},
@@ -462,7 +473,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, 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 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, 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, offset, head_limit pagination, max_count/-m per-file match limiting, max_columns/--max-columns long-line omission, only_matching/-o/--only-matching matched-text output, and passthru/--passthru/--passthrough all-line 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 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, 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,
@@ -614,12 +625,18 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		before = 0
 		after = 0
 	}
-	onlyMatching := grepOnlyMatching(input) && mode == "content" && !grepInvertMatch(input)
+	invertMatch := grepInvertMatch(input)
+	onlyMatching := grepOnlyMatching(input) && mode == "content" && !invertMatch
 	if onlyMatching {
 		before = 0
 		after = 0
 	}
-	countMatches := grepCountMatches(input) && mode == "count" && !grepInvertMatch(input)
+	passthru := grepPassthru(input) && mode == "content" && !onlyMatching
+	if passthru {
+		before = 0
+		after = 0
+	}
+	countMatches := grepCountMatches(input) && mode == "count" && !invertMatch
 	sortMode, sortReverse, sortExplicit, err := grepSort(input)
 	if err != nil {
 		return contracts.ToolResult{}, err
@@ -634,8 +651,9 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		AfterContext:  after,
 		LineNumbers:   grepLineNumbers(input, mode),
 		Multiline:     grepMultiline(input),
-		InvertMatch:   grepInvertMatch(input),
+		InvertMatch:   invertMatch,
 		OnlyMatching:  onlyMatching,
+		Passthru:      passthru,
 		CountMatches:  countMatches,
 		ColumnNumbers: grepColumnNumbers(input),
 		Text:          grepText(input),
@@ -679,8 +697,9 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 			"fixed_strings":       grepFixedStrings(input),
 			"text":                options.Text,
 			"word_regexp":         grepWordRegexp(input),
-			"invert_match":        grepInvertMatch(input),
+			"invert_match":        invertMatch,
 			"only_matching":       onlyMatching,
+			"passthru":            passthru,
 			"files_with_matches":  mode == "files_with_matches",
 			"files_without_match": mode == "files_without_matches",
 			"count":               mode == "count",
@@ -970,6 +989,11 @@ func grepFileMatches(path string, content string, expr *regexp.Regexp, options g
 	} else {
 		markLineMatches(lines, expr, options.MaxCount, options.BeforeContext, options.AfterContext, options.InvertMatch, matched, included)
 	}
+	if options.Passthru {
+		for i := range lines {
+			included[i] = true
+		}
+	}
 	matches := make([]grepMatch, 0, len(included))
 	for i := range lines {
 		if !included[i] {
@@ -1556,6 +1580,13 @@ func grepOnlyMatching(input grepInput) bool {
 		input.ShortOnlyMatching
 }
 
+func grepPassthru(input grepInput) bool {
+	return input.Passthru ||
+		input.Passthrough ||
+		input.LongPassthru ||
+		input.LongPassthrough
+}
+
 func grepMultiline(input grepInput) bool {
 	return input.Multiline ||
 		input.LongMultiline ||

internal/tools/file/tools_test.go

@@ -1802,6 +1802,38 @@ func TestGrepToolContentContextAndPagination(t *testing.T) {
 		t.Fatalf("short context structured content = %#v", shortContextResult.StructuredContent)
 	}
 
+	passthruResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_passthru",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"content","--passthru":true,"context":1}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if passthruResult.Content != wantContext ||
+		passthruResult.StructuredContent["passthru"] != true ||
+		passthruResult.StructuredContent["before_context"] != 0 ||
+		passthruResult.StructuredContent["after_context"] != 0 {
+		t.Fatalf("passthru result = %#v", passthruResult)
+	}
+	passthruMatches := passthruResult.StructuredContent["matches"].([]map[string]any)
+	if len(passthruMatches) != 6 || passthruMatches[0]["matched"] != false || passthruMatches[1]["matched"] != true {
+		t.Fatalf("passthru structured matches = %#v", passthruMatches)
+	}
+
+	passthroughResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_passthrough_alias",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"content","passthrough":"true","head_limit":1}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantPassthrough := "a.txt-1-one\n\n[Showing results with pagination = limit: 1]"
+	if passthroughResult.Content != wantPassthrough || passthroughResult.StructuredContent["passthru"] != true {
+		t.Fatalf("passthrough alias result = %#v", passthroughResult)
+	}
+
 	pagedResult, err := executor.Execute(ctx, contracts.ToolUse{
 		ID:    "toolu_grep_paged",
 		Name:  "Grep",