Merge pull request #592 from wgqqqqq/workspace-search-flashgrep-multiarch

Add gated workspace search and multi-arch flashgrep resources

Author: GCWing

resources/flashgrep/README.md

@@ -2,7 +2,11 @@ Place the prebuilt `flashgrep` daemon binary in this directory.
 
 Expected filenames:
 
-- macOS/Linux: `flashgrep`
-- Windows: `flashgrep.exe`
+- macOS x86_64: `flashgrep-x86_64-apple-darwin`
+- macOS arm64: `flashgrep-aarch64-apple-darwin`
+- Linux x86_64: `flashgrep-x86_64-unknown-linux-gnu`
+- Linux arm64: `flashgrep-aarch64-unknown-linux-gnu`
+- Windows x86_64: `flashgrep-x86_64-pc-windows-msvc.exe`
+- Windows arm64: `flashgrep-aarch64-pc-windows-msvc.exe`
 
 BitFun dev/build scripts load the daemon from this repository-relative path.

resources/flashgrep/flashgrep …flashgrep/flashgrep-aarch64-apple-darwinresources/flashgrep/flashgrep renamed to resources/flashgrep/flashgrep-aarch64-apple-darwin resources/flashgrep/flashgrep renamed to resources/flashgrep/flashgrep-aarch64-apple-darwin

@@ -544,26 +544,49 @@ async function startDesktopPreview() {
   await new Promise(() => {});
 }
 
-function flashgrepBinaryName() {
-  return process.platform === 'win32' ? 'flashgrep.exe' : 'flashgrep';
+function flashgrepBinaryNames() {
+  if (process.platform === 'win32' && process.arch === 'x64') {
+    return ['flashgrep-x86_64-pc-windows-msvc.exe'];
+  }
+  if (process.platform === 'win32' && process.arch === 'arm64') {
+    return ['flashgrep-aarch64-pc-windows-msvc.exe'];
+  }
+  if (process.platform === 'darwin' && process.arch === 'x64') {
+    return ['flashgrep-x86_64-apple-darwin'];
+  }
+  if (process.platform === 'darwin' && process.arch === 'arm64') {
+    return ['flashgrep-aarch64-apple-darwin'];
+  }
+  if (process.platform === 'linux' && process.arch === 'x64') {
+    return ['flashgrep-x86_64-unknown-linux-gnu'];
+  }
+  if (process.platform === 'linux' && process.arch === 'arm64') {
+    return ['flashgrep-aarch64-unknown-linux-gnu'];
+  }
+  return [process.platform === 'win32' ? 'flashgrep.exe' : 'flashgrep'];
 }
 
-function flashgrepBinaryPath() {
-  return path.join(ROOT_DIR, 'resources', 'flashgrep', flashgrepBinaryName());
+function flashgrepBinaryName() {
+  return flashgrepBinaryNames()[0];
 }
 
 function ensureFlashgrepBinary() {
-  const binaryPath = flashgrepBinaryPath();
-  if (!fs.existsSync(binaryPath)) {
-    return {
-      ok: false,
-      error: new Error(
-        `flashgrep binary not found: ${binaryPath}. Put the prebuilt daemon binary at resources/flashgrep/${flashgrepBinaryName()}`
-      ),
-    };
+  for (const binaryName of flashgrepBinaryNames()) {
+    const binaryPath = path.join(ROOT_DIR, 'resources', 'flashgrep', binaryName);
+    if (!fs.existsSync(binaryPath)) {
+      continue;
+    }
+    return { ok: true, binaryPath };
   }
 
-  return { ok: true, binaryPath };
+  return {
+    ok: false,
+    error: new Error(
+      `flashgrep binary not found for ${process.platform}/${process.arch}. Expected one of: ${flashgrepBinaryNames()
+        .map((name) => `resources/flashgrep/${name}`)
+        .join(', ')}`
+    ),
+  };
 }
 
 async function ensureFlashgrepBundleResource() {
@@ -685,7 +708,7 @@ async function main() {
     if (mode === 'desktop') {
       await ensureDesktopOpenSslIfNeeded();
       const desktopDir = path.join(ROOT_DIR, 'src/apps/desktop');
-      const tauriConfig = path.join(desktopDir, 'tauri.conf.json');
+      const tauriConfig = path.join(desktopDir, 'tauri.dev.conf.json');
       if (process.platform === 'win32') {
         // Running the generated .cmd shim directly via spawn is flaky on Windows.
         // Use cmd.exe with an explicit args array so the desktop app directory

resources/flashgrep/flashgrep-aarch64-pc-windows-msvc.exe

@@ -6,24 +6,52 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const ROOT = join(__dirname, '..');
 const RESOURCE_DIR = join(ROOT, 'resources', 'flashgrep');
 
+export function flashgrepBinaryNames() {
+  if (process.platform === 'win32' && process.arch === 'x64') {
+    return ['flashgrep-x86_64-pc-windows-msvc.exe'];
+  }
+  if (process.platform === 'win32' && process.arch === 'arm64') {
+    return ['flashgrep-aarch64-pc-windows-msvc.exe'];
+  }
+  if (process.platform === 'darwin' && process.arch === 'x64') {
+    return ['flashgrep-x86_64-apple-darwin'];
+  }
+  if (process.platform === 'darwin' && process.arch === 'arm64') {
+    return ['flashgrep-aarch64-apple-darwin'];
+  }
+  if (process.platform === 'linux' && process.arch === 'x64') {
+    return ['flashgrep-x86_64-unknown-linux-gnu'];
+  }
+  if (process.platform === 'linux' && process.arch === 'arm64') {
+    return ['flashgrep-aarch64-unknown-linux-gnu'];
+  }
+  return [process.platform === 'win32' ? 'flashgrep.exe' : 'flashgrep'];
+}
+
 export function flashgrepBinaryName() {
-  return process.platform === 'win32' ? 'flashgrep.exe' : 'flashgrep';
+  return flashgrepBinaryNames()[0];
 }
 
 export function flashgrepBinaryPath() {
   return join(RESOURCE_DIR, flashgrepBinaryName());
 }
 
 export function ensureFlashgrepBinary() {
-  const binaryPath = flashgrepBinaryPath();
-  if (!existsSync(binaryPath)) {
-    throw new Error(
-      `flashgrep binary not found: ${binaryPath}. Put the prebuilt daemon binary at resources/flashgrep/${flashgrepBinaryName()}`
-    );
-  }
+  for (const binaryName of flashgrepBinaryNames()) {
+    const binaryPath = join(RESOURCE_DIR, binaryName);
+    if (!existsSync(binaryPath)) {
+      continue;
+    }
 
-  if (process.platform !== 'win32') {
-    chmodSync(binaryPath, statSync(binaryPath).mode | 0o111);
+    if (process.platform !== 'win32') {
+      chmodSync(binaryPath, statSync(binaryPath).mode | 0o111);
+    }
+    return binaryPath;
   }
-  return binaryPath;
+
+  throw new Error(
+    `flashgrep binary not found for ${process.platform}/${process.arch}. Expected one of: ${flashgrepBinaryNames()
+      .map((name) => `resources/flashgrep/${name}`)
+      .join(', ')}`
+  );
 }