Support grep multiline aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -788,6 +788,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：`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。
 
 本轮补充：`Grep` 的 `files_with_matches` 输出现在按官方行为使用文件修改时间倒序排序，mtime 相同再按路径排序；分页和 `head_limit` 会在排序后应用。

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

@@ -190,6 +190,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：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 常用布尔参数继续补齐 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。
 - 本轮补充：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

@@ -32,7 +32,7 @@ var allowedGrepInputKeys = map[string]struct{}{
 	"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": {},
 	"ignore_case": {}, "case_insensitive": {}, "caseInsensitive": {}, "ignore-case": {}, "--ignore-case": {}, "-i": {},
-	"fixed_strings": {}, "fixedStrings": {}, "fixed-strings": {}, "--fixed-strings": {}, "-F": {}, "multiline": {},
+	"fixed_strings": {}, "fixedStrings": {}, "fixed-strings": {}, "--fixed-strings": {}, "-F": {}, "multiline": {}, "--multiline": {}, "multiline-dotall": {}, "--multiline-dotall": {}, "-U": {},
 	"word_regexp": {}, "wordRegexp": {}, "word-regexp": {}, "--word-regexp": {}, "-w": {},
 	"invert_match": {}, "invertMatch": {}, "invert-match": {}, "--invert-match": {}, "-v": {},
 	"only_matching": {}, "onlyMatching": {}, "only-matching": {}, "--only-matching": {}, "-o": {},
@@ -51,7 +51,7 @@ var grepSemanticNumberKeys = map[string]struct{}{
 var grepSemanticBooleanKeys = map[string]struct{}{
 	"line_numbers": {}, "lineNumbers": {}, "line-number": {}, "--line-number": {}, "-n": {},
 	"ignore_case": {}, "case_insensitive": {}, "caseInsensitive": {}, "ignore-case": {}, "--ignore-case": {}, "-i": {},
-	"fixed_strings": {}, "fixedStrings": {}, "fixed-strings": {}, "--fixed-strings": {}, "-F": {}, "multiline": {},
+	"fixed_strings": {}, "fixedStrings": {}, "fixed-strings": {}, "--fixed-strings": {}, "-F": {}, "multiline": {}, "--multiline": {}, "multiline-dotall": {}, "--multiline-dotall": {}, "-U": {},
 	"word_regexp": {}, "wordRegexp": {}, "word-regexp": {}, "--word-regexp": {}, "-w": {},
 	"invert_match": {}, "invertMatch": {}, "invert-match": {}, "--invert-match": {}, "-v": {},
 	"only_matching": {}, "onlyMatching": {}, "only-matching": {}, "--only-matching": {}, "-o": {},
@@ -154,6 +154,10 @@ type grepInput struct {
 	NoIgnoreDash            bool   `json:"no-ignore,omitempty"`
 	LongNoIgnore            bool   `json:"--no-ignore,omitempty"`
 	Multiline               bool   `json:"multiline,omitempty"`
+	LongMultiline           bool   `json:"--multiline,omitempty"`
+	MultilineDotall         bool   `json:"multiline-dotall,omitempty"`
+	LongMultilineDotall     bool   `json:"--multiline-dotall,omitempty"`
+	ShortMultiline          bool   `json:"-U,omitempty"`
 }
 
 type fileSearchMatch struct {
@@ -352,6 +356,14 @@ func NewGrepTool() tool.Tool {
 					"no-ignore":       map[string]any{"type": "boolean"},
 					"--no-ignore":     map[string]any{"type": "boolean"},
 					"multiline":       map[string]any{"type": "boolean"},
+					"--multiline":     map[string]any{"type": "boolean"},
+					"multiline-dotall": map[string]any{
+						"type": "boolean",
+					},
+					"--multiline-dotall": map[string]any{
+						"type": "boolean",
+					},
+					"-U": map[string]any{"type": "boolean"},
 				},
 			},
 		},
@@ -520,7 +532,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		BeforeContext: before,
 		AfterContext:  after,
 		LineNumbers:   grepLineNumbers(input, mode),
-		Multiline:     input.Multiline,
+		Multiline:     grepMultiline(input),
 		InvertMatch:   grepInvertMatch(input),
 		OnlyMatching:  onlyMatching,
 		CountMatches:  countMatches,
@@ -563,7 +575,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 			"files_without_match": mode == "files_without_matches",
 			"count_matches":       countMatches,
 			"no_ignore":           noIgnore,
-			"multiline":           input.Multiline,
+			"multiline":           grepMultiline(input),
 			"truncated":           truncated,
 		},
 	}, nil
@@ -1204,11 +1216,11 @@ func compileGrepPattern(input grepInput) (*regexp.Regexp, error) {
 		pattern = `\b(?:` + pattern + `)\b`
 	}
 	switch {
-	case grepCaseInsensitive(input) && input.Multiline:
+	case grepCaseInsensitive(input) && grepMultiline(input):
 		pattern = "(?is:" + pattern + ")"
 	case grepCaseInsensitive(input):
 		pattern = "(?i:" + pattern + ")"
-	case input.Multiline:
+	case grepMultiline(input):
 		pattern = "(?s:" + pattern + ")"
 	}
 	return regexp.Compile(pattern)
@@ -1275,6 +1287,14 @@ func grepOnlyMatching(input grepInput) bool {
 		input.ShortOnlyMatching
 }
 
+func grepMultiline(input grepInput) bool {
+	return input.Multiline ||
+		input.LongMultiline ||
+		input.MultilineDotall ||
+		input.LongMultilineDotall ||
+		input.ShortMultiline
+}
+
 func grepFilesWithMatches(input grepInput) bool {
 	return input.FilesWithMatch ||
 		input.FilesWithMatchAlt ||

internal/tools/file/tools_test.go

@@ -2160,6 +2160,30 @@ func TestGrepToolMultiline(t *testing.T) {
 		t.Fatalf("multiline structured matches = %#v", matches)
 	}
 
+	shortMultilineResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_multiline_short",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"alpha.*gamma","output_mode":"content","-U":"true"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if shortMultilineResult.Content != want || shortMultilineResult.StructuredContent["multiline"] != true {
+		t.Fatalf("short multiline result = %#v", shortMultilineResult)
+	}
+
+	dotallResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_multiline_dotall",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"alpha.*gamma","output_mode":"content","--multiline-dotall":"true"}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if dotallResult.Content != want || dotallResult.StructuredContent["multiline"] != true {
+		t.Fatalf("multiline-dotall result = %#v", dotallResult)
+	}
+
 	invertResult, err := executor.Execute(ctx, contracts.ToolUse{
 		ID:    "toolu_grep_multiline_invert",
 		Name:  "Grep",