flavor-code 1.3.8 → 1.3.9

package/dist/{app-OLOUQDIG.js → app-XAV5LRM7.js}

@@ -16,7 +16,7 @@ import {
   redactErrorText,
   transcriptReducer,
   withTimeout
-} from "./chunk-GAQJZBOF.js";
+} from "./chunk-M3U2JICC.js";
 import "./chunk-IG4Z23CL.js";
 import {
   Box_default,

package/dist/{chunk-EJCI3VB5.js → chunk-D4334NAE.js}

@@ -4,7 +4,7 @@ import {
   message,
   redactErrorText,
   redactSecrets
-} from "./chunk-GAQJZBOF.js";
+} from "./chunk-M3U2JICC.js";
 
 // src/rpc/server.ts
 import { createInterface } from "readline";

package/dist/{chunk-GAQJZBOF.js → chunk-M3U2JICC.js}

@@ -1984,6 +1984,7 @@ var FILE_TYPE_EXTENSIONS = {
 var GlobInput = z.object({
   pattern: z.string().min(1),
   path: z.string().min(1).describe('Workspace-relative search directory. Use JSON null, not the string "null", for the workspace root.').nullable().optional(),
+  includeIgnored: z.boolean().describe("Include files excluded by .gitignore or .ignore. Git metadata remains excluded.").nullable().optional(),
   limit: z.coerce.number().int().positive().max(1e5).nullable().optional()
 });
 var GrepInput = z.object({
@@ -1991,6 +1992,7 @@ var GrepInput = z.object({
   path: z.string().min(1).describe('Workspace-relative search path. Use JSON null, not the string "null", for the workspace root.').nullable().optional(),
   glob: z.string().min(1).nullable().optional(),
   fileType: z.enum(FILE_TYPES).nullable().optional(),
+  includeIgnored: z.boolean().describe("Include files excluded by .gitignore or .ignore. Git metadata remains excluded.").nullable().optional(),
   context: z.coerce.number().int().nonnegative().max(100).nullable().optional(),
   limit: z.coerce.number().int().positive().max(1e5).nullable().optional()
 });
@@ -2004,23 +2006,26 @@ function createGlobTool(workspace, options = {}) {
     paths: (input) => [scope(root, searchPath(input.path))],
     summarize: (input) => {
       const path = searchPath(input.path);
-      return path ? `pattern: "${input.pattern}" in ${path}` : `pattern: "${input.pattern}"`;
+      const ignored2 = input.includeIgnored === true ? " (including ignored files)" : "";
+      return (path ? `pattern: "${input.pattern}" in ${path}` : `pattern: "${input.pattern}"`) + ignored2;
     },
     execute: async (input, signal) => {
       const limit = input.limit ?? options.defaultLimit ?? DEFAULT_RESULT_LIMIT;
       const start = scope(root, searchPath(input.path));
+      if (isGitMetadataPath(root, start)) return { matches: [], truncated: false };
       const matcher = globRegex(input.pattern);
       const ignoreBudget = createIgnoreBudget(resources);
+      const includeIgnored = input.includeIgnored === true;
       let paths;
       if (options.forceNode === true) {
-        paths = await nodeFiles(root, start, signal, (path) => matcher.test(path), limit + 1, resources, ignoreBudget);
+        paths = await nodeFiles(root, start, signal, (path) => matcher.test(path), limit + 1, resources, ignoreBudget, includeIgnored);
       } else {
         try {
-          paths = await rgFiles(root, start, input.pattern, signal, options.rgPath ?? bundledRgPath, options.rgArgsPrefix ?? [], limit + 1, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget);
+          paths = await rgFiles(root, start, input.pattern, signal, options.rgPath ?? bundledRgPath, options.rgArgsPrefix ?? [], limit + 1, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget, includeIgnored);
         } catch (error) {
           if (signal.aborted) throw signal.reason;
           if (!(error instanceof SearchSpawnError) || !error.fallbackSafe) throw error;
-          paths = await nodeFiles(root, start, signal, (path) => matcher.test(path), limit + 1, resources, createIgnoreBudget(resources));
+          paths = await nodeFiles(root, start, signal, (path) => matcher.test(path), limit + 1, resources, createIgnoreBudget(resources), includeIgnored);
         }
       }
       const matches = paths.filter((path) => matcher.test(path)).sort(comparePaths);
@@ -2040,24 +2045,27 @@ function createGrepTool(workspace, options = {}) {
       const path = searchPath(input.path);
       const where = path ? ` in ${path}` : "";
       const kind = input.fileType ? ` [${input.fileType}]` : "";
-      return `pattern: /${input.pattern}/${kind}${where}`;
+      const ignored2 = input.includeIgnored === true ? " (including ignored files)" : "";
+      return `pattern: /${input.pattern}/${kind}${where}${ignored2}`;
     },
     execute: async (input, signal) => {
       const expression = new RegExp(input.pattern);
       const limit = input.limit ?? options.defaultLimit ?? DEFAULT_RESULT_LIMIT;
       const context = input.context ?? 0;
       const start = await resolveGrepPath(root, searchPath(input.path));
+      if (isGitMetadataPath(root, start)) return { matches: [], truncated: false };
       const ignoreBudget = createIgnoreBudget(resources);
+      const includeIgnored = input.includeIgnored === true;
       let matches;
       if (options.forceNode === true) {
-        matches = await nodeGrep(root, start, input.glob ?? void 0, input.fileType ?? void 0, expression, context, signal, limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget);
+        matches = await nodeGrep(root, start, input.glob ?? void 0, input.fileType ?? void 0, expression, context, signal, limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget, includeIgnored);
       } else {
         try {
           matches = await rgGrep(root, start, input, context, signal, options.rgPath ?? bundledRgPath, options.rgArgsPrefix ?? [], limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget);
         } catch (error) {
           if (signal.aborted) throw signal.reason;
           if (!(error instanceof SearchSpawnError) || !error.fallbackSafe) throw error;
-          matches = await nodeGrep(root, start, input.glob ?? void 0, input.fileType ?? void 0, expression, context, signal, limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, createIgnoreBudget(resources));
+          matches = await nodeGrep(root, start, input.glob ?? void 0, input.fileType ?? void 0, expression, context, signal, limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, createIgnoreBudget(resources), includeIgnored);
         }
       }
       matches.sort(compareGrepMatches);
@@ -2065,10 +2073,10 @@ function createGrepTool(workspace, options = {}) {
     }
   };
 }
-async function rgFiles(root, start, pattern, signal, executable, argsPrefix, limit, maxBytes, resources, ignoreBudget) {
+async function rgFiles(root, start, pattern, signal, executable, argsPrefix, limit, maxBytes, resources, ignoreBudget, includeIgnored) {
   const target = relative4(root, start) || ".";
   const matcher = globRegex(pattern);
-  const ignoreLayers = await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
+  const ignoreLayers = includeIgnored ? [] : await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
   const paths = [];
   const parser = delimitedParser(0, (record) => {
     if (record.length === 0) return true;
@@ -2077,7 +2085,10 @@ async function rgFiles(root, start, pattern, signal, executable, argsPrefix, lim
     retainTopK(paths, path, limit, comparePaths);
     return true;
   });
-  const output = await runStreaming(executable, [...argsPrefix, "--files", "--null", "--sort", "path", "--hidden", "--glob", "!.git", "--glob", pattern, "--", target], root, signal, maxBytes, parser);
+  const args = [...argsPrefix, "--files", "--null", "--sort", "path", "--hidden", "--glob", "!.git", "--glob", "!.git/**"];
+  if (includeIgnored) args.push("--no-ignore");
+  args.push("--glob", pattern, "--", target);
+  const output = await runStreaming(executable, args, root, signal, maxBytes, parser);
   if (!output.stoppedEarly && output.code !== 0 && output.code !== 1) throw new Error(output.stderr || `ripgrep exited with ${output.code}`);
   parser.finish();
   return paths;
@@ -2087,12 +2098,13 @@ async function rgGrep(root, start, input, context, signal, executable, argsPrefi
   if (input.fileType !== void 0 && input.fileType !== null && typeExtensions === void 0) {
     throw new Error(`Unsupported file type: ${input.fileType}`);
   }
-  const args = ["--json", "--line-number", "--column", "--sort", "path", "--hidden", "--glob", "!.git", "--max-filesize", String(maxFileBytes), "--context", String(context)];
+  const args = ["--json", "--line-number", "--column", "--sort", "path", "--hidden", "--glob", "!.git", "--glob", "!.git/**", "--max-filesize", String(maxFileBytes), "--context", String(context)];
+  if (input.includeIgnored === true) args.push("--no-ignore");
   if (input.glob !== void 0 && input.glob !== null) args.push("--glob", input.glob);
   else for (const extension of typeExtensions ?? []) args.push("--glob", `*${extension}`);
   args.push("--regexp", input.pattern, "--", relative4(root, start) || ".");
   const matches = [];
-  const ignoreLayers = await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
+  const ignoreLayers = input.includeIgnored === true ? [] : await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
   const parser = delimitedParser(10, (record) => {
     if (record.length === 0) return true;
     const event = JSON.parse(decodeUtf8(record, "ripgrep JSON"));
@@ -2147,8 +2159,8 @@ async function hydrateContext(root, matches, context, signal, maxFileBytes, maxT
     }
   }
 }
-async function nodeGrep(root, start, glob, type, expression, context, signal, maxMatches, maxFileBytes, maxSearchBytes, resources, ignoreBudget) {
-  const files = await nodeFiles(root, start, signal, () => true, resources.maxDiscoveredFiles + 1, resources, ignoreBudget);
+async function nodeGrep(root, start, glob, type, expression, context, signal, maxMatches, maxFileBytes, maxSearchBytes, resources, ignoreBudget, includeIgnored) {
+  const files = await nodeFiles(root, start, signal, () => true, resources.maxDiscoveredFiles + 1, resources, ignoreBudget, includeIgnored);
   if (files.length > resources.maxDiscoveredFiles) throw new Error(`Aggregate discovered file limit of ${resources.maxDiscoveredFiles} exceeded`);
   const matcher = glob === void 0 ? void 0 : globRegex(glob);
   const extension = type === void 0 ? void 0 : typeExtension(type);
@@ -2190,23 +2202,25 @@ async function nodeGrep(root, start, glob, type, expression, context, signal, ma
   }
   return matches;
 }
-async function nodeFiles(root, start, signal, accept, limit, resources, ignoreBudget) {
+async function nodeFiles(root, start, signal, accept, limit, resources, ignoreBudget, includeIgnored) {
   const ignores = [];
   const output = [];
   const delta = relative4(root, start);
   const segments = delta === "" ? [] : delta.split(sep4);
   let ancestor = root;
-  for (let index = 0; index < segments.length; index += 1) {
-    noteIgnoreDirectory(ignoreBudget);
-    await loadIgnoreFiles(ancestor, normalizedRelative(root, ancestor), ignores, ignoreBudget, signal);
-    ancestor = resolve4(ancestor, segments[index]);
+  if (!includeIgnored) {
+    for (let index = 0; index < segments.length; index += 1) {
+      noteIgnoreDirectory(ignoreBudget);
+      await loadIgnoreFiles(ancestor, normalizedRelative(root, ancestor), ignores, ignoreBudget, signal);
+      ancestor = resolve4(ancestor, segments[index]);
+    }
   }
   async function walk(directory) {
     abort(signal);
     const relativeDirectory = normalizedRelative(root, directory);
     const ruleCount = ignores.length;
     noteIgnoreDirectory(ignoreBudget);
-    await loadIgnoreFiles(directory, relativeDirectory, ignores, ignoreBudget, signal);
+    if (!includeIgnored) await loadIgnoreFiles(directory, relativeDirectory, ignores, ignoreBudget, signal);
     const handle = await opendir(directory);
     const entries = [];
     for await (const entry2 of handle) {
@@ -2219,7 +2233,7 @@ async function nodeFiles(root, start, signal, accept, limit, resources, ignoreBu
       abort(signal);
       const absolute = resolve4(directory, entry2.name);
       const path = normalizedRelative(root, absolute);
-      if (entry2.name === ".git" || ignored(path, entry2.isDirectory(), ignores)) continue;
+      if (entry2.name === ".git" || !includeIgnored && ignored(path, entry2.isDirectory(), ignores)) continue;
       if (entry2.isDirectory()) await walk(absolute);
       else if (entry2.isFile() && accept(path)) output.push(path);
       if (output.length >= limit) break;
@@ -2388,6 +2402,9 @@ function normalizedRelative(root, path) {
 function normalizePath(path) {
   return path.replaceAll("\\", "/");
 }
+function isGitMetadataPath(root, path) {
+  return normalizedRelative(root, path).split("/").some((segment) => segment.toLowerCase() === ".git");
+}
 function comparePaths(a, b) {
   return a < b ? -1 : a > b ? 1 : 0;
 }
@@ -13965,8 +13982,8 @@ function toolsSection(toolNames) {
   addToolRule(rules, toolNames, "Write", "Use `Write` to create a file only when a new file is necessary.");
   addToolRule(rules, toolNames, "Edit", "Use `Edit` for precise replacements in existing files. Before editing, read the file and copy `oldText` verbatim from its actual current content \u2014 exact characters matter, including quote style (full-width vs ASCII) and version strings. Include enough surrounding lines to make the match unique.");
   addToolRule(rules, toolNames, "ApplyPatch", "Use `ApplyPatch` only when an edit genuinely spans multiple regions of one file; hunks may relocate only when their exact context has one unique nearby match. Prefer `Edit` for a single small replacement \u2014 it is easier to get right.");
-  addToolRule(rules, toolNames, "Glob", "Use `Glob` to find files by path pattern instead of shell directory crawling. Confirm the exact path before reading, searching, or editing; the search scope is limited to the workspace, so never pass absolute paths outside it.");
-  addToolRule(rules, toolNames, "Grep", "Use `Grep` to search file contents instead of shell text-search commands.");
+  addToolRule(rules, toolNames, "Glob", "Use `Glob` to find files by path pattern instead of shell directory crawling. Confirm the exact path before reading, searching, or editing; the search scope is limited to the workspace, so never pass absolute paths outside it. Set `includeIgnored: true` only when the user explicitly asks to inspect ignored files or an ignored path is required for the task.");
+  addToolRule(rules, toolNames, "Grep", "Use `Grep` to search file contents instead of shell text-search commands. Set `includeIgnored: true` only when the user explicitly asks to inspect ignored files or an ignored path is required for the task.");
   addToolRule(rules, toolNames, "Shell", "Use `Shell` for builds, tests, Git inspection, and commands without a dedicated tool. Keep commands scoped, non-interactive, and easy to audit.");
   addToolRule(rules, toolNames, "LspFindRefs", "Use `LspFindRefs` to find all references to a symbol using the Language Server Protocol. Prefer this over Grep when you need precise semantic results.");
   addToolRule(rules, toolNames, "LspHover", "Use `LspHover` to get type information and documentation for a symbol at a cursor position.");

package/dist/cli.js

@@ -3,7 +3,7 @@ import { createRequire } from "node:module"; const require = createRequire(impor
 import {
   FlavorRpcServer,
   TraceRecorder
-} from "./chunk-EJCI3VB5.js";
+} from "./chunk-D4334NAE.js";
 import {
   staticTaskLines
 } from "./chunk-KKIBYDJI.js";
@@ -23,7 +23,7 @@ import {
   packageVersion,
   redactErrorText,
   runPalBroker
-} from "./chunk-GAQJZBOF.js";
+} from "./chunk-M3U2JICC.js";
 import {
   McpServerConfigSchema,
   McpServerNameSchema,
@@ -877,7 +877,7 @@ async function runInteractiveCli(props) {
   const [{ render, AlternateScreen }, { createElement }, { App }] = await Promise.all([
     import("./claude-ink-ORUA7GWG.js"),
     import("react"),
-    import("./app-OLOUQDIG.js")
+    import("./app-XAV5LRM7.js")
   ]);
   const instance = await render(createElement(
     AlternateScreen,

package/dist/desktop/main.js

@@ -14603,8 +14603,8 @@ function toolsSection(toolNames) {
   addToolRule(rules, toolNames, "Write", "Use `Write` to create a file only when a new file is necessary.");
   addToolRule(rules, toolNames, "Edit", "Use `Edit` for precise replacements in existing files. Before editing, read the file and copy `oldText` verbatim from its actual current content \u2014 exact characters matter, including quote style (full-width vs ASCII) and version strings. Include enough surrounding lines to make the match unique.");
   addToolRule(rules, toolNames, "ApplyPatch", "Use `ApplyPatch` only when an edit genuinely spans multiple regions of one file; hunks may relocate only when their exact context has one unique nearby match. Prefer `Edit` for a single small replacement \u2014 it is easier to get right.");
-  addToolRule(rules, toolNames, "Glob", "Use `Glob` to find files by path pattern instead of shell directory crawling. Confirm the exact path before reading, searching, or editing; the search scope is limited to the workspace, so never pass absolute paths outside it.");
-  addToolRule(rules, toolNames, "Grep", "Use `Grep` to search file contents instead of shell text-search commands.");
+  addToolRule(rules, toolNames, "Glob", "Use `Glob` to find files by path pattern instead of shell directory crawling. Confirm the exact path before reading, searching, or editing; the search scope is limited to the workspace, so never pass absolute paths outside it. Set `includeIgnored: true` only when the user explicitly asks to inspect ignored files or an ignored path is required for the task.");
+  addToolRule(rules, toolNames, "Grep", "Use `Grep` to search file contents instead of shell text-search commands. Set `includeIgnored: true` only when the user explicitly asks to inspect ignored files or an ignored path is required for the task.");
   addToolRule(rules, toolNames, "Shell", "Use `Shell` for builds, tests, Git inspection, and commands without a dedicated tool. Keep commands scoped, non-interactive, and easy to audit.");
   addToolRule(rules, toolNames, "LspFindRefs", "Use `LspFindRefs` to find all references to a symbol using the Language Server Protocol. Prefer this over Grep when you need precise semantic results.");
   addToolRule(rules, toolNames, "LspHover", "Use `LspHover` to get type information and documentation for a symbol at a cursor position.");
@@ -17897,6 +17897,7 @@ var FILE_TYPE_EXTENSIONS = {
 var GlobInput = z30.object({
   pattern: z30.string().min(1),
   path: z30.string().min(1).describe('Workspace-relative search directory. Use JSON null, not the string "null", for the workspace root.').nullable().optional(),
+  includeIgnored: z30.boolean().describe("Include files excluded by .gitignore or .ignore. Git metadata remains excluded.").nullable().optional(),
   limit: z30.coerce.number().int().positive().max(1e5).nullable().optional()
 });
 var GrepInput = z30.object({
@@ -17904,6 +17905,7 @@ var GrepInput = z30.object({
   path: z30.string().min(1).describe('Workspace-relative search path. Use JSON null, not the string "null", for the workspace root.').nullable().optional(),
   glob: z30.string().min(1).nullable().optional(),
   fileType: z30.enum(FILE_TYPES).nullable().optional(),
+  includeIgnored: z30.boolean().describe("Include files excluded by .gitignore or .ignore. Git metadata remains excluded.").nullable().optional(),
   context: z30.coerce.number().int().nonnegative().max(100).nullable().optional(),
   limit: z30.coerce.number().int().positive().max(1e5).nullable().optional()
 });
@@ -17917,23 +17919,26 @@ function createGlobTool(workspace, options = {}) {
     paths: (input) => [scope(root, searchPath(input.path))],
     summarize: (input) => {
       const path = searchPath(input.path);
-      return path ? `pattern: "${input.pattern}" in ${path}` : `pattern: "${input.pattern}"`;
+      const ignored2 = input.includeIgnored === true ? " (including ignored files)" : "";
+      return (path ? `pattern: "${input.pattern}" in ${path}` : `pattern: "${input.pattern}"`) + ignored2;
     },
     execute: async (input, signal) => {
       const limit = input.limit ?? options.defaultLimit ?? DEFAULT_RESULT_LIMIT;
       const start = scope(root, searchPath(input.path));
+      if (isGitMetadataPath(root, start)) return { matches: [], truncated: false };
       const matcher = globRegex(input.pattern);
       const ignoreBudget = createIgnoreBudget(resources);
+      const includeIgnored = input.includeIgnored === true;
       let paths;
       if (options.forceNode === true) {
-        paths = await nodeFiles(root, start, signal, (path) => matcher.test(path), limit + 1, resources, ignoreBudget);
+        paths = await nodeFiles(root, start, signal, (path) => matcher.test(path), limit + 1, resources, ignoreBudget, includeIgnored);
       } else {
         try {
-          paths = await rgFiles(root, start, input.pattern, signal, options.rgPath ?? bundledRgPath, options.rgArgsPrefix ?? [], limit + 1, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget);
+          paths = await rgFiles(root, start, input.pattern, signal, options.rgPath ?? bundledRgPath, options.rgArgsPrefix ?? [], limit + 1, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget, includeIgnored);
         } catch (error) {
           if (signal.aborted) throw signal.reason;
           if (!(error instanceof SearchSpawnError) || !error.fallbackSafe) throw error;
-          paths = await nodeFiles(root, start, signal, (path) => matcher.test(path), limit + 1, resources, createIgnoreBudget(resources));
+          paths = await nodeFiles(root, start, signal, (path) => matcher.test(path), limit + 1, resources, createIgnoreBudget(resources), includeIgnored);
         }
       }
       const matches = paths.filter((path) => matcher.test(path)).sort(comparePaths);
@@ -17953,24 +17958,27 @@ function createGrepTool(workspace, options = {}) {
       const path = searchPath(input.path);
       const where = path ? ` in ${path}` : "";
       const kind = input.fileType ? ` [${input.fileType}]` : "";
-      return `pattern: /${input.pattern}/${kind}${where}`;
+      const ignored2 = input.includeIgnored === true ? " (including ignored files)" : "";
+      return `pattern: /${input.pattern}/${kind}${where}${ignored2}`;
     },
     execute: async (input, signal) => {
       const expression = new RegExp(input.pattern);
       const limit = input.limit ?? options.defaultLimit ?? DEFAULT_RESULT_LIMIT;
       const context = input.context ?? 0;
       const start = await resolveGrepPath(root, searchPath(input.path));
+      if (isGitMetadataPath(root, start)) return { matches: [], truncated: false };
       const ignoreBudget = createIgnoreBudget(resources);
+      const includeIgnored = input.includeIgnored === true;
       let matches;
       if (options.forceNode === true) {
-        matches = await nodeGrep(root, start, input.glob ?? void 0, input.fileType ?? void 0, expression, context, signal, limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget);
+        matches = await nodeGrep(root, start, input.glob ?? void 0, input.fileType ?? void 0, expression, context, signal, limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget, includeIgnored);
       } else {
         try {
           matches = await rgGrep(root, start, input, context, signal, options.rgPath ?? bundledRgPath, options.rgArgsPrefix ?? [], limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, ignoreBudget);
         } catch (error) {
           if (signal.aborted) throw signal.reason;
           if (!(error instanceof SearchSpawnError) || !error.fallbackSafe) throw error;
-          matches = await nodeGrep(root, start, input.glob ?? void 0, input.fileType ?? void 0, expression, context, signal, limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, createIgnoreBudget(resources));
+          matches = await nodeGrep(root, start, input.glob ?? void 0, input.fileType ?? void 0, expression, context, signal, limit + 1, options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES, options.maxSearchBytes ?? DEFAULT_MAX_SEARCH_BYTES, resources, createIgnoreBudget(resources), includeIgnored);
         }
       }
       matches.sort(compareGrepMatches);
@@ -17978,10 +17986,10 @@ function createGrepTool(workspace, options = {}) {
     }
   };
 }
-async function rgFiles(root, start, pattern, signal, executable, argsPrefix, limit, maxBytes, resources, ignoreBudget) {
+async function rgFiles(root, start, pattern, signal, executable, argsPrefix, limit, maxBytes, resources, ignoreBudget, includeIgnored) {
   const target = relative17(root, start) || ".";
   const matcher = globRegex(pattern);
-  const ignoreLayers = await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
+  const ignoreLayers = includeIgnored ? [] : await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
   const paths = [];
   const parser = delimitedParser(0, (record3) => {
     if (record3.length === 0) return true;
@@ -17990,7 +17998,10 @@ async function rgFiles(root, start, pattern, signal, executable, argsPrefix, lim
     retainTopK(paths, path, limit, comparePaths);
     return true;
   });
-  const output = await runStreaming(executable, [...argsPrefix, "--files", "--null", "--sort", "path", "--hidden", "--glob", "!.git", "--glob", pattern, "--", target], root, signal, maxBytes, parser);
+  const args = [...argsPrefix, "--files", "--null", "--sort", "path", "--hidden", "--glob", "!.git", "--glob", "!.git/**"];
+  if (includeIgnored) args.push("--no-ignore");
+  args.push("--glob", pattern, "--", target);
+  const output = await runStreaming(executable, args, root, signal, maxBytes, parser);
   if (!output.stoppedEarly && output.code !== 0 && output.code !== 1) throw new Error(output.stderr || `ripgrep exited with ${output.code}`);
   parser.finish();
   return paths;
@@ -18000,12 +18011,13 @@ async function rgGrep(root, start, input, context, signal, executable, argsPrefi
   if (input.fileType !== void 0 && input.fileType !== null && typeExtensions === void 0) {
     throw new Error(`Unsupported file type: ${input.fileType}`);
   }
-  const args = ["--json", "--line-number", "--column", "--sort", "path", "--hidden", "--glob", "!.git", "--max-filesize", String(maxFileBytes), "--context", String(context)];
+  const args = ["--json", "--line-number", "--column", "--sort", "path", "--hidden", "--glob", "!.git", "--glob", "!.git/**", "--max-filesize", String(maxFileBytes), "--context", String(context)];
+  if (input.includeIgnored === true) args.push("--no-ignore");
   if (input.glob !== void 0 && input.glob !== null) args.push("--glob", input.glob);
   else for (const extension2 of typeExtensions ?? []) args.push("--glob", `*${extension2}`);
   args.push("--regexp", input.pattern, "--", relative17(root, start) || ".");
   const matches = [];
-  const ignoreLayers = await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
+  const ignoreLayers = input.includeIgnored === true ? [] : await collectIgnoreLayers(root, start, signal, resources, ignoreBudget);
   const parser = delimitedParser(10, (record3) => {
     if (record3.length === 0) return true;
     const event = JSON.parse(decodeUtf82(record3, "ripgrep JSON"));
@@ -18060,8 +18072,8 @@ async function hydrateContext(root, matches, context, signal, maxFileBytes, maxT
     }
   }
 }
-async function nodeGrep(root, start, glob, type, expression, context, signal, maxMatches, maxFileBytes, maxSearchBytes, resources, ignoreBudget) {
-  const files = await nodeFiles(root, start, signal, () => true, resources.maxDiscoveredFiles + 1, resources, ignoreBudget);
+async function nodeGrep(root, start, glob, type, expression, context, signal, maxMatches, maxFileBytes, maxSearchBytes, resources, ignoreBudget, includeIgnored) {
+  const files = await nodeFiles(root, start, signal, () => true, resources.maxDiscoveredFiles + 1, resources, ignoreBudget, includeIgnored);
   if (files.length > resources.maxDiscoveredFiles) throw new Error(`Aggregate discovered file limit of ${resources.maxDiscoveredFiles} exceeded`);
   const matcher = glob === void 0 ? void 0 : globRegex(glob);
   const extension2 = type === void 0 ? void 0 : typeExtension(type);
@@ -18103,23 +18115,25 @@ async function nodeGrep(root, start, glob, type, expression, context, signal, ma
   }
   return matches;
 }
-async function nodeFiles(root, start, signal, accept, limit, resources, ignoreBudget) {
+async function nodeFiles(root, start, signal, accept, limit, resources, ignoreBudget, includeIgnored) {
   const ignores = [];
   const output = [];
   const delta = relative17(root, start);
   const segments = delta === "" ? [] : delta.split(sep17);
   let ancestor = root;
-  for (let index = 0; index < segments.length; index += 1) {
-    noteIgnoreDirectory(ignoreBudget);
-    await loadIgnoreFiles(ancestor, normalizedRelative(root, ancestor), ignores, ignoreBudget, signal);
-    ancestor = resolve24(ancestor, segments[index]);
+  if (!includeIgnored) {
+    for (let index = 0; index < segments.length; index += 1) {
+      noteIgnoreDirectory(ignoreBudget);
+      await loadIgnoreFiles(ancestor, normalizedRelative(root, ancestor), ignores, ignoreBudget, signal);
+      ancestor = resolve24(ancestor, segments[index]);
+    }
   }
   async function walk(directory) {
     abort(signal);
     const relativeDirectory = normalizedRelative(root, directory);
     const ruleCount = ignores.length;
     noteIgnoreDirectory(ignoreBudget);
-    await loadIgnoreFiles(directory, relativeDirectory, ignores, ignoreBudget, signal);
+    if (!includeIgnored) await loadIgnoreFiles(directory, relativeDirectory, ignores, ignoreBudget, signal);
     const handle = await opendir(directory);
     const entries = [];
     for await (const entry2 of handle) {
@@ -18132,7 +18146,7 @@ async function nodeFiles(root, start, signal, accept, limit, resources, ignoreBu
       abort(signal);
       const absolute = resolve24(directory, entry2.name);
       const path = normalizedRelative(root, absolute);
-      if (entry2.name === ".git" || ignored(path, entry2.isDirectory(), ignores)) continue;
+      if (entry2.name === ".git" || !includeIgnored && ignored(path, entry2.isDirectory(), ignores)) continue;
       if (entry2.isDirectory()) await walk(absolute);
       else if (entry2.isFile() && accept(path)) output.push(path);
       if (output.length >= limit) break;
@@ -18301,6 +18315,9 @@ function normalizedRelative(root, path) {
 function normalizePath(path) {
   return path.replaceAll("\\", "/");
 }
+function isGitMetadataPath(root, path) {
+  return normalizedRelative(root, path).split("/").some((segment) => segment.toLowerCase() === ".git");
+}
 function comparePaths(a, b) {
   return a < b ? -1 : a > b ? 1 : 0;
 }

package/dist/sdk/index.js

@@ -4,7 +4,7 @@ import {
   FlavorRpcServer,
   TraceRecordSchema,
   TraceRecorder
-} from "../chunk-EJCI3VB5.js";
+} from "../chunk-D4334NAE.js";
 import {
   AgentMessageQueue,
   DockerExecutionEnvironment,
@@ -13,7 +13,7 @@ import {
   WorkspaceCheckpointStore,
   buildDockerInvocation,
   createProductionRuntime
-} from "../chunk-GAQJZBOF.js";
+} from "../chunk-M3U2JICC.js";
 import "../chunk-IG4Z23CL.js";
 import "../chunk-RQTYHUMK.js";
 import "../chunk-S32JRDZK.js";

package/dist/tools/search.d.ts

@@ -3,6 +3,7 @@ import type { ToolDefinition } from "./types.js";
 declare const GlobInput: z.ZodObject<{
     pattern: z.ZodString;
     path: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    includeIgnored: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
     limit: z.ZodOptional<z.ZodNullable<z.ZodCoercedNumber<unknown>>>;
 }, z.core.$strip>;
 declare const GrepInput: z.ZodObject<{
@@ -40,6 +41,7 @@ declare const GrepInput: z.ZodObject<{
         xml: "xml";
         yaml: "yaml";
     }>>>;
+    includeIgnored: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
     context: z.ZodOptional<z.ZodNullable<z.ZodCoercedNumber<unknown>>>;
     limit: z.ZodOptional<z.ZodNullable<z.ZodCoercedNumber<unknown>>>;
 }, z.core.$strip>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flavor-code",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "author": "YachuanWzh",
   "type": "module",
   "publishConfig": {