revert: drop @vscode/ripgrep require attempt for now

Diagnostic from a Windows VS Code stable 1.121.0 install (see #248
review thread) showed that require("@vscode/ripgrep") throws — VS
Code's extHost interceptor aliases the require to
@vscode/ripgrep-universal, but that package isn't installed on
builds that haven't completed the package-rename migration (which
includes current stable). The path-probe fallback in the diagnostic
test build was what actually resolved ripgrep on that install.

Reverts to the prior shape: hardcoded paths covering both the
@vscode/ripgrep and @vscode/ripgrep-universal layouts under
vscode.env.appRoot. Also drops the @vscode/ripgrep devDep, the
esbuild external entry, the loadRipgrep wrapper file, and the tests
that mocked it — all dead with the revert.

VS Code's package-rename migration will be tracked in a separate
issue; once it lands across stable + Insiders the require approach
can be revisited with empirical evidence of which mechanism VS Code
expects 3rd-party extensions to use.

Author: 0xMink

pnpm-lock.yaml

@@ -126,7 +126,7 @@ async function main() {
 		// global-agent must be external because it dynamically patches Node.js http/https modules
 		// which breaks when bundled. It needs access to the actual Node.js module instances.
 		// undici must be bundled because our VSIX is packaged with `--no-dependencies`.
-		external: ["vscode", "esbuild", "global-agent", "@vscode/ripgrep"],
+		external: ["vscode", "esbuild", "global-agent"],
 	}
 
 	/**

src/esbuild.mjs

@@ -554,7 +554,6 @@
 		"@types/tmp": "^0.2.6",
 		"@types/turndown": "^5.0.5",
 		"@types/vscode": "^1.84.0",
-		"@vscode/ripgrep": "^1.17.0",
 		"@vscode/test-electron": "^2.5.2",
 		"@vscode/vsce": "3.3.2",
 		"ai": "^6.0.75",

src/package.json

@@ -1,20 +1,17 @@
 // npx vitest run src/services/ripgrep/__tests__/index.spec.ts
 
+import path from "path"
 import { vi, describe, it, expect, beforeEach } from "vitest"
 
 import { truncateLine, getBinPath } from "../index"
+import { fileExistsAtPath } from "../../../utils/fs"
 
-const ripgrepMock = vi.hoisted(() => ({ value: undefined as string | undefined, throws: false }))
-
-vi.mock("@vscode/ripgrep", () => ({
-	get rgPath() {
-		if (ripgrepMock.throws) {
-			throw new Error("simulated @vscode/ripgrep failure")
-		}
-		return ripgrepMock.value
-	},
+vi.mock("../../../utils/fs", () => ({
+	fileExistsAtPath: vi.fn(),
 }))
 
+const mockFileExists = vi.mocked(fileExistsAtPath)
+
 describe("Ripgrep line truncation", () => {
 	// The default MAX_LINE_LENGTH is 500 in the implementation
 	const MAX_LINE_LENGTH = 500
@@ -63,34 +60,32 @@ describe("Ripgrep line truncation", () => {
 })
 
 describe("getBinPath", () => {
-	beforeEach(() => {
-		ripgrepMock.value = undefined
-		ripgrepMock.throws = false
-	})
-
-	it("returns the rgPath exported by @vscode/ripgrep", async () => {
-		ripgrepMock.value = "/path/to/rg"
+	const appRoot = "/fake/vscode/appRoot"
+	const binName = process.platform.startsWith("win") ? "rg.exe" : "rg"
+	const platformDir = `${process.platform}-${process.arch}`
 
-		expect(await getBinPath("/ignored")).toBe("/path/to/rg")
+	beforeEach(() => {
+		mockFileExists.mockReset()
+		mockFileExists.mockResolvedValue(false)
 	})
 
-	it("rewrites node_modules.asar to node_modules.asar.unpacked", async () => {
-		ripgrepMock.value = "/app/node_modules.asar/@vscode/ripgrep-universal/bin/win32-x64/rg.exe"
+	it("resolves ripgrep from the classic @vscode/ripgrep layout", async () => {
+		const rg = path.join(appRoot, "node_modules/@vscode/ripgrep/bin", binName)
+		mockFileExists.mockImplementation(async (p: string) => p === rg)
 
-		expect(await getBinPath("/ignored")).toBe(
-			"/app/node_modules.asar.unpacked/@vscode/ripgrep-universal/bin/win32-x64/rg.exe",
-		)
+		expect(await getBinPath(appRoot)).toBe(rg)
 	})
 
-	it("returns undefined when rgPath is not exported", async () => {
-		ripgrepMock.value = undefined
+	it("resolves ripgrep from the @vscode/ripgrep-universal layout (VS Code Insiders)", async () => {
+		const rg = path.join(appRoot, "node_modules/@vscode/ripgrep-universal/bin", platformDir, binName)
+		mockFileExists.mockImplementation(async (p: string) => p === rg)
 
-		expect(await getBinPath("/ignored")).toBeUndefined()
+		expect(await getBinPath(appRoot)).toBe(rg)
 	})
 
-	it("returns undefined when rgPath resolution throws", async () => {
-		ripgrepMock.throws = true
+	it("returns undefined when ripgrep cannot be found", async () => {
+		mockFileExists.mockResolvedValue(false)
 
-		expect(await getBinPath("/ignored")).toBeUndefined()
+		expect(await getBinPath(appRoot)).toBeUndefined()
 	})
 })

src/services/ripgrep/__tests__/index.spec.ts

@@ -5,12 +5,13 @@ import * as readline from "readline"
 import * as vscode from "vscode"
 
 import { RooIgnoreController } from "../../core/ignore/RooIgnoreController"
+import { fileExistsAtPath } from "../../utils/fs"
 /*
 This file provides functionality to perform regex searches on files using ripgrep.
 Inspired by: https://github.com/DiscreteTom/vscode-ripgrep-utils
 
 Key components:
-1. getBinPath: Resolves the ripgrep binary via the `@vscode/ripgrep` package — VS Code's require interceptor aliases it to the bundled binary at runtime.
+1. getBinPath: Locates the ripgrep binary (in the VS Code install, or on the system PATH).
 2. execRipgrep: Executes the ripgrep command and returns the output.
 3. regexSearchFiles: The main function that performs regex searches on files.
    - Parameters:
@@ -50,6 +51,11 @@ rel/path/to/helper.ts
 const isWindows = process.platform.startsWith("win")
 const binName = isWindows ? "rg.exe" : "rg"
 
+// VS Code's @vscode/ripgrep-universal package (used by recent VS Code builds,
+// including the Insiders staged-install layout) nests the binary under
+// bin/<platform>-<arch>/ rather than directly in bin/.
+const ripgrepUniversalBinDir = `bin/${process.platform}-${process.arch}`
+
 interface SearchFileResult {
 	file: string
 	searchResults: SearchResult[]
@@ -79,27 +85,28 @@ export function truncateLine(line: string, maxLength: number = MAX_LINE_LENGTH):
 	return line.length > maxLength ? line.substring(0, maxLength) + " [truncated...]" : line
 }
 /**
- * Get the path to the ripgrep binary.
+ * Get the path to the ripgrep binary shipped inside the VS Code installation.
  *
- * Imports `@vscode/ripgrep` and returns its `rgPath` export. In the extension
- * host this import is intercepted by VS Code (see microsoft/vscode
- * `src/vs/workbench/api/common/extHostRequireInterceptor.ts`) and aliased to
- * VS Code's own `@vscode/ripgrep-universal`, so we inherit whatever ripgrep
- * VS Code ships with — including the Insiders staged-install layout that the
- * old hardcoded path list missed (microsoft/vscode#252063). The
- * `node_modules.asar` → `node_modules.asar.unpacked` substitution mirrors
- * VS Code's own resolution in `src/vs/base/node/ripgrep.ts`.
+ * Both the long-standing `@vscode/ripgrep` layout and the newer
+ * `@vscode/ripgrep-universal` layout are checked — the latter is what VS Code
+ * Insiders' staged-install builds use (see microsoft/vscode#252063).
  *
- * The `vscodeAppRoot` parameter is retained for API stability and ignored.
- * Returns `undefined` if `@vscode/ripgrep` is unavailable.
+ * Returns `undefined` when ripgrep cannot be located.
  */
-export async function getBinPath(_vscodeAppRoot: string): Promise<string | undefined> {
-	try {
-		const m = await import("@vscode/ripgrep")
-		return m.rgPath?.replace(/\bnode_modules\.asar\b/, "node_modules.asar.unpacked")
-	} catch {
-		return undefined
+export async function getBinPath(vscodeAppRoot: string): Promise<string | undefined> {
+	const checkPath = async (pkgFolder: string) => {
+		const fullPath = path.join(vscodeAppRoot, pkgFolder, binName)
+		return (await fileExistsAtPath(fullPath)) ? fullPath : undefined
 	}
+
+	return (
+		(await checkPath("node_modules/@vscode/ripgrep/bin/")) ||
+		(await checkPath("node_modules/vscode-ripgrep/bin")) ||
+		(await checkPath("node_modules.asar.unpacked/vscode-ripgrep/bin/")) ||
+		(await checkPath("node_modules.asar.unpacked/@vscode/ripgrep/bin/")) ||
+		(await checkPath(`node_modules/@vscode/ripgrep-universal/${ripgrepUniversalBinDir}`)) ||
+		(await checkPath(`node_modules.asar.unpacked/@vscode/ripgrep-universal/${ripgrepUniversalBinDir}`))
+	)
 }
 
 async function execRipgrep(bin: string, args: string[]): Promise<string> {