fix(ripgrep): support @vscode/ripgrep >=1.18 platform-package layout (#1024)

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

@@ -10,7 +10,20 @@ vi.mock("../../../utils/fs", () => ({
 	fileExistsAtPath: vi.fn(),
 }))
 
+vi.mock("fs", () => ({
+	existsSync: vi.fn(),
+}))
+
+vi.mock("module", () => ({
+	createRequire: vi.fn(),
+}))
+
+import * as fs from "fs"
+import { createRequire } from "module"
+
 const mockFileExists = vi.mocked(fileExistsAtPath)
+const mockExistsSync = vi.mocked(fs.existsSync)
+const mockCreateRequire = vi.mocked(createRequire)
 
 describe("Ripgrep line truncation", () => {
 	// The default MAX_LINE_LENGTH is 500 in the implementation
@@ -67,6 +80,9 @@ describe("getBinPath", () => {
 	beforeEach(() => {
 		mockFileExists.mockReset()
 		mockFileExists.mockResolvedValue(false)
+		mockExistsSync.mockReset()
+		mockExistsSync.mockReturnValue(false)
+		mockCreateRequire.mockReset()
 	})
 
 	it("resolves ripgrep from the classic @vscode/ripgrep layout", async () => {
@@ -95,4 +111,29 @@ describe("getBinPath", () => {
 
 		expect(await getBinPath(appRoot)).toBeUndefined()
 	})
+
+	// Regression test for https://github.com/Zoo-Code-Org/Zoo-Code/issues/1024
+	// VS Code 1.130+ ships @vscode/ripgrep >=1.18, where the binary lives in a
+	// platform-specific optional package resolved via the wrapper's package.json.
+	// None of the six hardcoded candidate paths match this layout, so getBinPath
+	// returns undefined on affected Windows installs, causing every task to hang.
+	it("resolves ripgrep via the @vscode/ripgrep >=1.18 platform-package layout", async () => {
+		const platformBin = `/vscode/ripgrep-${process.platform}-${process.arch}/bin/${binName}`
+
+		// All static candidates miss.
+		mockFileExists.mockResolvedValue(false)
+
+		// Simulate @vscode/ripgrep wrapper manifest existing and resolving to the platform bin.
+		mockExistsSync.mockReturnValue(true)
+		const mockRequireFromWrapper = { resolve: vi.fn().mockReturnValue(platformBin) }
+		const mockRequireFromApp = { resolve: vi.fn().mockReturnValue("/vscode/ripgrep/index.js") }
+		mockCreateRequire
+			.mockReturnValueOnce(mockRequireFromApp as unknown as NodeRequire)
+			.mockReturnValueOnce(mockRequireFromWrapper as unknown as NodeRequire)
+
+		// The resolved platform bin exists on disk.
+		mockFileExists.mockImplementation(async (p: string) => p === platformBin)
+
+		expect(await getBinPath(appRoot)).toBe(platformBin)
+	})
 })

src/services/ripgrep/index.ts

@@ -1,6 +1,8 @@
 import * as childProcess from "child_process"
+import * as fs from "fs"
 import * as path from "path"
 import * as readline from "readline"
+import { createRequire } from "module"
 
 import * as vscode from "vscode"
 
@@ -104,19 +106,41 @@ export function ripgrepCandidatePaths(vscodeAppRoot: string): readonly string[]
 	]
 }
 
+/**
+ * Resolves ripgrep for @vscode/ripgrep >=1.18, which ships the binary inside a
+ * platform-specific optional package (e.g. @vscode/ripgrep-win32-x64) rather
+ * than directly in @vscode/ripgrep/bin/. VS Code 1.130+ uses this layout.
+ */
+export function resolvePlatformRipgrepPath(vscodeAppRoot: string): string | undefined {
+	try {
+		const wrapperManifest = path.join(vscodeAppRoot, "node_modules", "@vscode", "ripgrep", "package.json")
+		if (!fs.existsSync(wrapperManifest)) return undefined
+		const requireFromApp = createRequire(path.join(vscodeAppRoot, "package.json"))
+		const wrapperEntry = requireFromApp.resolve("@vscode/ripgrep")
+		const requireFromWrapper = createRequire(wrapperEntry)
+		return requireFromWrapper.resolve(`@vscode/ripgrep-${process.platform}-${process.arch}/bin/${binName}`)
+	} catch {
+		return undefined
+	}
+}
+
 /**
  * Get the path to the ripgrep binary shipped inside the VS Code installation.
  *
- * 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).
+ * Checks the long-standing @vscode/ripgrep and @vscode/ripgrep-universal static
+ * layouts first, then falls back to the @vscode/ripgrep >=1.18 platform-package
+ * layout used by VS Code 1.130+ (see microsoft/vscode#252063).
  *
  * Returns `undefined` when ripgrep cannot be located.
  */
 export async function getBinPath(vscodeAppRoot: string): Promise<string | undefined> {
 	for (const candidate of ripgrepCandidatePaths(vscodeAppRoot)) {
 		if (await fileExistsAtPath(candidate)) return candidate
 	}
+
+	const platformPackagePath = resolvePlatformRipgrepPath(vscodeAppRoot)
+	if (platformPackagePath && (await fileExistsAtPath(platformPackagePath))) return platformPackagePath
+
 	return undefined
 }