fix: scope the bundled ripgrep path to platform and arch

The published VSIX is universal but copyRipgrep bundled only the build host's rg. Because rg (no extension) is the binary name on both Linux and macOS, a macOS user could resolve a Linux-built dist/bin/rg and execute an incompatible binary. Bundle and resolve the binary under dist/bin/<platform>-<arch>/ so the fallback is used only on a host matching the bundled binary.

Author: 0xMink

.github/workflows/marketplace-publish.yml

@@ -63,7 +63,7 @@ jobs:
           grep -q "extension/webview-ui/build/assets/index.js" /tmp/zoo-code-vsix-contents.txt
           grep -q "extension/assets/codicons/codicon.ttf" /tmp/zoo-code-vsix-contents.txt
           grep -q "extension/assets/vscode-material-icons/icons/3d.svg" /tmp/zoo-code-vsix-contents.txt
-          grep -q "extension/dist/bin/rg" /tmp/zoo-code-vsix-contents.txt
+          grep -qE "extension/dist/bin/[^/]+/rg" /tmp/zoo-code-vsix-contents.txt
 
       - name: Validate packaged manifest identity
         run: |

src/esbuild.mjs

@@ -89,15 +89,19 @@ async function main() {
 			name: "copyRipgrep",
 			setup(build) {
 				build.onEnd(async () => {
-					// Copy the ripgrep binary into dist/bin/ so it ships inside the
-					// VSIX. getBinPath() in src/services/ripgrep/index.ts falls back
-					// to this bundled copy when ripgrep cannot be located in the VS
-					// Code installation (e.g. VS Code Insiders' staged-install layout).
+					// Copy the ripgrep binary into dist/bin/<platform>-<arch>/ so it
+					// ships inside the universal VSIX. getBinPath() in
+					// src/services/ripgrep/index.ts falls back to this bundled copy
+					// when ripgrep cannot be located in the VS Code installation
+					// (e.g. VS Code Insiders' staged-install layout). The
+					// <platform>-<arch> subfolder keeps the runtime fallback from
+					// picking a binary built for a different OS (the name `rg` is
+					// shared by Linux and macOS).
 					const { rgPath } = await import("@vscode/ripgrep")
 					if (!rgPath) {
 						throw new Error("[copyRipgrep] @vscode/ripgrep did not provide rgPath")
 					}
-					const rgDestDir = path.join(distDir, "bin")
+					const rgDestDir = path.join(distDir, "bin", `${process.platform}-${process.arch}`)
 					fs.mkdirSync(rgDestDir, { recursive: true })
 					const rgDest = path.join(rgDestDir, path.basename(rgPath))
 					fs.copyFileSync(rgPath, rgDest)

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

@@ -92,4 +92,11 @@ describe("getBinPath bundled-ripgrep fallback", () => {
 
 		expect(result).toBeUndefined()
 	})
+
+	it("scopes the bundled ripgrep path to the current platform and arch", () => {
+		// Guards the universal VSIX from handing a wrong-OS binary to the
+		// fallback: the path must carry a <platform>-<arch> segment so a
+		// macOS host never resolves a Linux-built `dist/bin/rg`.
+		expect(bundledRgPath).toContain(path.join("bin", `${process.platform}-${process.arch}`))
+	})
 })

src/services/ripgrep/index.ts

@@ -82,12 +82,18 @@ export function truncateLine(line: string, maxLength: number = MAX_LINE_LENGTH):
 /**
  * Path to the ripgrep binary bundled inside the extension itself.
  *
- * esbuild copies the platform `rg`/`rg.exe` into `dist/bin/` at build time
- * (see the `copyRipgrep` plugin in esbuild.mjs). At runtime this module is
- * bundled into `dist/extension.js`, so `__dirname` is the extension's `dist/`
- * directory.
+ * esbuild copies the platform `rg`/`rg.exe` into `dist/bin/<platform>-<arch>/`
+ * at build time (see the `copyRipgrep` plugin in esbuild.mjs). At runtime this
+ * module is bundled into `dist/extension.js`, so `__dirname` is the extension's
+ * `dist/` directory.
+ *
+ * The `<platform>-<arch>` segment is required: the published VSIX is universal
+ * but carries only the build host's binary. Without it, a macOS user would
+ * resolve a Linux-built `dist/bin/rg` (the binary name `rg` is shared by Linux
+ * and macOS) and execute an incompatible binary. With it, the fallback resolves
+ * only on a host matching the bundled binary.
  */
-export const bundledRgPath = path.join(__dirname, "bin", binName)
+export const bundledRgPath = path.join(__dirname, "bin", `${process.platform}-${process.arch}`, binName)
 
 /**
  * Get the path to the ripgrep binary.