Support Grep line number control

Author: SqlRush

docs/cc-100-roadmap.md

@@ -512,7 +512,7 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 - 文本版 `Read`、PDF text/page-selection 初版（含常见 Page/Contents 间接对象、Pages/Kids 页序、FlateDecode 文本流和 UTF-16 BOM 字符串）、PNG/JPEG/GIF/WebP image Read、Jupyter notebook cell 渲染初版、Read 大文本 tool-result budget 截断/落盘、`Write`、`Edit` 初版已完成。
 - 已覆盖读前写、mtime stale guard、唯一匹配、`replace_all`、Write/Edit structured diff hunks、`.claude/settings.json`/`settings.local.json` 写前 JSON/语义校验、team-memory secret guard、Read 去重、跨 tool round read-state。
 - `Bash` 初版已完成，支持 command/timeout/description 输入校验、`/bin/sh -c` 执行、stdout/stderr/exit code/timeout 结构化结果、动态 read-only/concurrency-safe/destructive 分类、Git branch/tag/remote/push 参数级安全分类、`find -delete/-exec rm` 与 `xargs rm` 破坏性分类、权限规则接入、后台启动、同会话 `BashOutput` 输出读取和 `KillBash` 取消。
-- `Glob`/`Grep` 纯 Go 初版已完成，支持 `**` 递归 glob、基础 ignored dirs、层级 `.gitignore`/`.ignore`、mtime/path 排序、Grep regex/fixed string (`fixed_strings`/`-F`)、glob/type 过滤、`output_mode`/`outputMode` 的 `files_with_matches`/`content`/`count` 输出模式、`context`/`before_context`/`after_context` 和 `-C`/`-B`/`-A` 上下文行、`offset`/`head_limit` 分页和大小写不敏感搜索。
+- `Glob`/`Grep` 纯 Go 初版已完成，支持 `**` 递归 glob、基础 ignored dirs、层级 `.gitignore`/`.ignore`、mtime/path 排序、Grep regex/fixed string (`fixed_strings`/`-F`)、glob/type 过滤、`output_mode`/`outputMode` 的 `files_with_matches`/`content`/`count` 输出模式、`context`/`before_context`/`after_context` 和 `-C`/`-B`/`-A` 上下文行、`-n` line-number 控制、`offset`/`head_limit` 分页和大小写不敏感搜索。
 - `TodoWrite` 初版已完成，支持完整 todo list 写入、状态/优先级校验、重复 id 拒绝、单个 `in_progress` 约束、结构化结果、tool metadata 状态保存和 session-scoped 本地持久化/恢复。
 - `WebFetch` 初版已完成，支持 URL/timeout/max_bytes 输入校验、HTTP GET、HEAD preflight、metadata/raw `skipWebFetchPreflight` skip-preflight、二进制 preflight 跳过 GET、文本/二进制判定、截断、非 2xx error 标记、结构化结果、HTML-to-text rendering、prompt-focused excerpt 和 `WebFetch(domain:...)` 权限规则适配。
 - `WebSearch` HTML 搜索适配初版已完成，支持 query/max_results/timeout/domain filters 输入校验、可注入搜索 endpoint、DuckDuckGo HTML 链接解析、DuckDuckGo result snippet 抽取、domain allow/block 过滤、结构化结果和 query 权限规则匹配。

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

@@ -168,7 +168,7 @@ test/parity/                 # golden tests against TS/official behavior
 
 - Read/Edit/Write 初版已落地，覆盖文本 Read、PDF text/page-selection 初版（含常见 Page/Contents 间接对象、Pages/Kids 页序、FlateDecode 文本流和 UTF-16 BOM 字符串）、PNG/JPEG/GIF/WebP image Read、Jupyter notebook cell 渲染初版、Read 大文本 tool-result budget 截断/落盘、read-before-write、mtime stale guard、唯一匹配、`replace_all`、Write/Edit structured diff hunks、`.claude/settings.json`/`settings.local.json` 写前 JSON/语义校验、team-memory secret guard、Read 去重和跨 tool round read-state。
 - Bash 初版已落地，覆盖 command/timeout/description 输入校验、`/bin/sh -c` 执行、stdout/stderr/exit code/timeout 结构化结果、动态 read-only/concurrency-safe/destructive 分类、Git branch/tag/remote/push 参数级安全分类、`find -delete/-exec rm` 与 `xargs rm` 破坏性分类、权限规则接入、后台启动、同会话 `BashOutput` 输出读取和 `KillBash` 取消；完整 shell parser、真实 sandbox、interrupt、后台任务完整生命周期和官方 golden 仍需继续补。
-- Glob/Grep 纯 Go 初版已落地，覆盖 `**` 递归 glob、基础 ignored dirs、层级 `.gitignore`/`.ignore`、mtime/path 排序、Grep regex/fixed string (`fixed_strings`/`-F`)、glob/type 过滤、`output_mode`/`outputMode` 的 `files_with_matches`/`content`/`count` 输出模式、`context`/`before_context`/`after_context` 及 `-C`/`-B`/`-A` 上下文行、`offset`/`head_limit` 分页和大小写不敏感搜索；完整 ripgrep parity 和剩余输出参数仍需继续补。
+- Glob/Grep 纯 Go 初版已落地，覆盖 `**` 递归 glob、基础 ignored dirs、层级 `.gitignore`/`.ignore`、mtime/path 排序、Grep regex/fixed string (`fixed_strings`/`-F`)、glob/type 过滤、`output_mode`/`outputMode` 的 `files_with_matches`/`content`/`count` 输出模式、`context`/`before_context`/`after_context` 及 `-C`/`-B`/`-A` 上下文行、`-n` line-number 控制、`offset`/`head_limit` 分页和大小写不敏感搜索；完整 ripgrep parity 和剩余输出参数仍需继续补。
 - TodoWrite 初版已落地，覆盖完整 todo list 写入、状态/优先级校验、重复 id 拒绝、单个 `in_progress` 约束、结构化结果、tool metadata 状态保存和 session-scoped 本地持久化/恢复；TUI 同步和官方 golden 仍需继续补。
 - WebFetch 初版已落地，覆盖 URL/timeout/max_bytes 输入校验、HTTP GET、HEAD preflight、metadata/raw `skipWebFetchPreflight` skip-preflight、二进制 preflight 跳过 GET、文本/二进制判定、截断、非 2xx error 标记、结构化结果、HTML-to-text rendering、prompt-focused excerpt 和 `WebFetch(domain:...)` 权限规则适配；browser 渲染、完整 prompt-aware summarization 和官方 golden 仍需继续补。
 - WebSearch HTML 搜索适配初版已落地，覆盖 query/max_results/timeout/domain filters 输入校验、可注入搜索 endpoint、DuckDuckGo HTML 链接解析、DuckDuckGo result snippet 抽取、domain allow/block 过滤、结构化结果和 query 权限规则匹配；官方搜索后端、ranking parity 和 golden 仍需继续补。

docs/first-second-parity-audit.md

@@ -105,7 +105,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, basic ignored directories, hierarchical `.gitignore`/`.ignore`, modified-time/path sorting, regex and fixed-string grep (`fixed_strings`/`-F`), glob/type filtering, `output_mode`/`outputMode` `files_with_matches`/`content`/`count` output modes, `context`/`before_context`/`after_context` and `-C`/`-B`/`-A` content context lines, `offset`/`head_limit` pagination, and case-insensitive search aliases.
+- `Glob`/`Grep` initial pure-Go file search tools, including recursive `**` glob matching, basic ignored directories, hierarchical `.gitignore`/`.ignore`, modified-time/path sorting, regex and fixed-string grep (`fixed_strings`/`-F`), glob/type filtering, `output_mode`/`outputMode` `files_with_matches`/`content`/`count` output modes, `context`/`before_context`/`after_context` and `-C`/`-B`/`-A` content context lines, `-n` line-number control, `offset`/`head_limit` pagination, and case-insensitive search aliases.
 - `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 branch/tag/remote/push argument-aware safety classification, destructive `find -delete/-exec rm` and `xargs rm` classification, 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, text/binary detection, truncation, non-2xx error marking, structured result payloads, HTML-to-text rendering, prompt-focused excerpts, and `WebFetch(domain:...)` permission-rule adaptation.

internal/tools/file/search_tools.go

@@ -40,6 +40,7 @@ type grepInput struct {
 	AfterContext       *int   `json:"after_context,omitempty"`
 	AfterContextAlt    *int   `json:"afterContext,omitempty"`
 	ShortAfterContext  *int   `json:"-A,omitempty"`
+	ShortLineNumbers   *bool  `json:"-n,omitempty"`
 	CaseInsensitive    bool   `json:"case_insensitive,omitempty"`
 	CaseInsensitiveAlt bool   `json:"caseInsensitive,omitempty"`
 	ShortIgnoreCase    bool   `json:"-i,omitempty"`
@@ -68,6 +69,7 @@ type grepOptions struct {
 	Offset        int
 	BeforeContext int
 	AfterContext  int
+	LineNumbers   bool
 }
 
 func NewGlobTool() tool.Tool {
@@ -134,6 +136,7 @@ func NewGrepTool() tool.Tool {
 					},
 					"afterContext":     map[string]any{"type": "integer"},
 					"-A":               map[string]any{"type": "integer"},
+					"-n":               map[string]any{"type": "boolean"},
 					"case_insensitive": map[string]any{"type": "boolean"},
 					"caseInsensitive":  map[string]any{"type": "boolean"},
 					"-i":               map[string]any{"type": "boolean"},
@@ -144,7 +147,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, content, or count; glob and type optionally filter file paths. content mode supports context, before_context, after_context, -C, -B, -A, offset, and head_limit pagination. Use fixed_strings or -F for literal matching.", nil
+			return "Searches text files under path using a regular expression or fixed string. output_mode may be files_with_matches, content, or count; glob and type optionally filter file paths. content mode supports context, before_context, after_context, -C, -B, -A, -n line-number control, offset, and head_limit pagination. Use fixed_strings or -F for literal matching.", nil
 		},
 		ValidateFunc:    validateGrep,
 		CallFunc:        callGrep,
@@ -266,12 +269,13 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 		Offset:        grepOffset(input),
 		BeforeContext: before,
 		AfterContext:  after,
+		LineNumbers:   grepLineNumbers(input, mode),
 	}
 	matches, totalMatches, truncated, err := collectGrepMatches(root, input.Glob, input.Type, expr, options)
 	if err != nil {
 		return contracts.ToolResult{}, err
 	}
-	content := formatGrepMatches(matches, mode)
+	content := formatGrepMatches(matches, options)
 	if content == "" {
 		content = "No matches found"
 	}
@@ -290,6 +294,7 @@ func callGrep(ctx tool.Context, raw json.RawMessage, _ tool.ProgressSink) (contr
 			"limit":            options.Limit,
 			"before_context":   options.BeforeContext,
 			"after_context":    options.AfterContext,
+			"line_numbers":     options.LineNumbers,
 			"case_insensitive": grepCaseInsensitive(input),
 			"fixed_strings":    grepFixedStrings(input),
 			"truncated":        truncated,
@@ -310,7 +315,7 @@ func decodeGrep(raw json.RawMessage) (grepInput, error) {
 	if err := decodeStrict(raw, map[string]struct{}{
 		"pattern": {}, "path": {}, "glob": {}, "type": {}, "output_mode": {}, "outputMode": {}, "limit": {},
 		"head_limit": {}, "headLimit": {}, "offset": {},
-		"context": {}, "-C": {}, "before_context": {}, "beforeContext": {}, "-B": {}, "after_context": {}, "afterContext": {}, "-A": {},
+		"context": {}, "-C": {}, "before_context": {}, "beforeContext": {}, "-B": {}, "after_context": {}, "afterContext": {}, "-A": {}, "-n": {},
 		"case_insensitive": {}, "caseInsensitive": {}, "-i": {},
 		"fixed_strings": {}, "fixedStrings": {}, "-F": {},
 	}, &input); err != nil {
@@ -462,10 +467,10 @@ func countMatchedLines(matches []grepMatch) int {
 	return count
 }
 
-func formatGrepMatches(matches []grepMatch, mode string) string {
+func formatGrepMatches(matches []grepMatch, options grepOptions) string {
 	lines := make([]string, 0, len(matches))
 	for _, match := range matches {
-		switch mode {
+		switch options.Mode {
 		case "files_with_matches":
 			lines = append(lines, match.Path)
 		case "count":
@@ -475,7 +480,11 @@ func formatGrepMatches(matches []grepMatch, mode string) string {
 			if !match.Matched {
 				separator = "-"
 			}
-			lines = append(lines, fmt.Sprintf("%s%s%d%s%s", match.Path, separator, match.Line, separator, match.Text))
+			if options.LineNumbers {
+				lines = append(lines, fmt.Sprintf("%s%s%d%s%s", match.Path, separator, match.Line, separator, match.Text))
+			} else {
+				lines = append(lines, fmt.Sprintf("%s%s%s", match.Path, separator, match.Text))
+			}
 		}
 	}
 	return strings.Join(lines, "\n")
@@ -528,6 +537,16 @@ func grepFixedStrings(input grepInput) bool {
 	return input.FixedStrings || input.FixedStringsAlt || input.ShortFixedStrings
 }
 
+func grepLineNumbers(input grepInput, mode string) bool {
+	if mode != "content" {
+		return false
+	}
+	if input.ShortLineNumbers == nil {
+		return true
+	}
+	return *input.ShortLineNumbers
+}
+
 func grepTypeExtensions(typeFilter string) ([]string, error) {
 	typeFilter = strings.TrimSpace(strings.TrimPrefix(typeFilter, "."))
 	if typeFilter == "" {

internal/tools/file/tools_test.go

@@ -880,6 +880,18 @@ func TestGrepToolContentContextAndPagination(t *testing.T) {
 		t.Fatalf("structured context matches = %#v", matches)
 	}
 
+	noLineNumberResult, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_grep_no_line_numbers",
+		Name:  "Grep",
+		Input: json.RawMessage(`{"pattern":"Needle","output_mode":"content","-n":false,"head_limit":1}`),
+	}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if noLineNumberResult.Content != "a.txt:Needle first" || noLineNumberResult.StructuredContent["line_numbers"] != false {
+		t.Fatalf("no-line-number content = %#v", noLineNumberResult)
+	}
+
 	shortContextResult, err := executor.Execute(ctx, contracts.ToolUse{
 		ID:    "toolu_grep_short_context",
 		Name:  "Grep",