From 4e70f3b2616efb2581b6ca3fea0763e22909b211 Mon Sep 17 00:00:00 2001
From: Alisa Novikova <62909685+alisa-alisa@users.noreply.github.com>
Date: Thu, 12 Feb 2026 21:42:58 -0800
Subject: [PATCH] Improvements for the search_file_content (isolated for model
 3).

---
 .../coreToolsModelSnapshots.test.ts.snap            |  2 +-
 packages/core/src/tools/definitions/coreTools.ts    | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/tools/definitions/__snapshots__/coreToolsModelSnapshots.test.ts.snap b/packages/core/src/tools/definitions/__snapshots__/coreToolsModelSnapshots.test.ts.snap
index 8aa86f60a7..15f2b7c6e8 100644
--- a/packages/core/src/tools/definitions/__snapshots__/coreToolsModelSnapshots.test.ts.snap
+++ b/packages/core/src/tools/definitions/__snapshots__/coreToolsModelSnapshots.test.ts.snap
@@ -1089,7 +1089,7 @@ exports[`coreTools snapshots for specific models > Model: gemini-3-pro-preview >
 
 exports[`coreTools snapshots for specific models > Model: gemini-3-pro-preview > snapshot for tool: grep_search_ripgrep 1`] = `
 {
-  "description": "Searches for a regular expression pattern within file contents.",
+  "description": "Searches for a regular expression pattern within file contents. This tool is FAST and optimized, powered by ripgrep. PREFERRED over standard \`run_shell_command("grep ...")\` due to better performance and automatic output limiting (max 20k matches).",
   "name": "grep_search",
   "parametersJsonSchema": {
     "properties": {
diff --git a/packages/core/src/tools/definitions/coreTools.ts b/packages/core/src/tools/definitions/coreTools.ts
index 006597ca33..ae64fe61ef 100644
--- a/packages/core/src/tools/definitions/coreTools.ts
+++ b/packages/core/src/tools/definitions/coreTools.ts
@@ -88,7 +88,18 @@ export const RIP_GREP_DEFINITION: ToolDefinition = {
   get base() {
     return DEFAULT_LEGACY_SET.grep_search_ripgrep;
   },
-  overrides: (modelId) => getToolSet(modelId).grep_search_ripgrep,
+  overrides: (modelId: string) => {
+    if (
+      modelId.includes('gemini-3-pro-preview') ||
+      modelId.includes('gemini-3-flash-preview')
+    ) {
+      return {
+        description:
+          'Searches for a regular expression pattern within file contents. This tool is FAST and optimized, powered by ripgrep. PREFERRED over standard `run_shell_command("grep ...")` due to better performance and automatic output limiting (max 20k matches).',
+      };
+    }
+    return undefined;
+  },
 };
 
 export const WEB_SEARCH_DEFINITION: ToolDefinition = {