Merge pull request #2204 from ualtinok/fix/glob-directory-prefix

fix(glob): use cwd-relative search for ripgrep to fix directory prefix patterns
This commit is contained in:
YeonGyu-Kim 2026-02-28 13:27:00 +09:00 committed by GitHub
commit 2478b28e71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions

View File

@ -1,3 +1,4 @@
import { resolve } from "node:path"
import { spawn } from "bun" import { spawn } from "bun"
import { import {
resolveGrepCli, resolveGrepCli,
@ -119,10 +120,9 @@ async function runRgFilesInternal(
if (isRg) { if (isRg) {
const args = buildRgArgs(options) const args = buildRgArgs(options)
const paths = options.paths?.length ? options.paths : ["."] cwd = options.paths?.[0] || "."
args.push(...paths) args.push(".")
command = [cli.path, ...args] command = [cli.path, ...args]
cwd = undefined
} else if (isWindows) { } else if (isWindows) {
command = buildPowerShellCommand(options) command = buildPowerShellCommand(options)
cwd = undefined cwd = undefined
@ -177,7 +177,7 @@ async function runRgFilesInternal(
let filePath: string let filePath: string
if (isRg) { if (isRg) {
filePath = line filePath = cwd ? resolve(cwd, line) : line
} else if (isWindows) { } else if (isWindows) {
filePath = line.trim() filePath = line.trim()
} else { } else {

View File

@ -29,12 +29,11 @@ export function createGlobTools(ctx: PluginInput): Record<string, ToolDefinition
const runtimeCtx = context as Record<string, unknown> const runtimeCtx = context as Record<string, unknown>
const dir = typeof runtimeCtx.directory === "string" ? runtimeCtx.directory : ctx.directory const dir = typeof runtimeCtx.directory === "string" ? runtimeCtx.directory : ctx.directory
const searchPath = args.path ? resolve(dir, args.path) : dir const searchPath = args.path ? resolve(dir, args.path) : dir
const paths = [searchPath]
const result = await runRgFiles( const result = await runRgFiles(
{ {
pattern: args.pattern, pattern: args.pattern,
paths, paths: [searchPath],
}, },
cli cli
) )