Revert brandon's change to npm-app/src/native/ripgrep.ts, which fixes code_search

Author: jahooma

npm-app/src/native/ripgrep.ts

@@ -1,49 +1,51 @@
 import { mkdirSync } from 'fs'
 import path from 'path'
 
+import { rgPath as vscodeRgPath } from '@vscode/ripgrep'
 import { spawnSync } from 'bun'
-import { getBundledRgPath } from '@codebuff/sdk'
 
 import { CONFIG_DIR } from '../credentials'
 import { logger } from '../utils/logger'
 
 const getRipgrepPath = async (): Promise<string> => {
-  let bundledRgPath: string
-  try {
-    bundledRgPath = getBundledRgPath()
-  } catch (error) {
-    logger.error({ error }, 'Failed to resolve bundled ripgrep path')
-    throw error
-  }
-
-  // In dev mode, use the bundled path directly
+  // In dev mode, use the vscode ripgrep binary
   if (!process.env.IS_BINARY) {
-    return bundledRgPath
+    return vscodeRgPath
   }
 
-  // Compiled mode - stage the bundled binary in the config directory
+  // Compiled mode - self-extract the embedded binary
   const rgFileName = process.platform === 'win32' ? 'rg.exe' : 'rg'
   const outPath = path.join(CONFIG_DIR, rgFileName)
 
+  // Check if already extracted
+  if (await Bun.file(outPath).exists()) {
+    return outPath
+  }
+
+  // Extract the embedded binary
   try {
-    if (await Bun.file(outPath).exists()) {
-      return outPath
-    }
+    // Use require() on a static string path to make sure rg is included in the compiled binary
+    const embeddedRgPath =
+      process.platform === 'win32'
+        ? require('../../../node_modules/@vscode/ripgrep/bin/rg.exe')
+        : require('../../../node_modules/@vscode/ripgrep/bin/rg')
 
+    // Create cache directory
     mkdirSync(path.dirname(outPath), { recursive: true })
-    await Bun.write(outPath, await Bun.file(bundledRgPath).arrayBuffer())
 
+    // Copy embedded binary to cache location
+    await Bun.write(outPath, await Bun.file(embeddedRgPath).arrayBuffer())
+
+    // Make executable on Unix systems
     if (process.platform !== 'win32') {
       spawnSync(['chmod', '+x', outPath])
     }
 
     return outPath
   } catch (error) {
-    logger.error(
-      { error },
-      'Failed to stage bundled ripgrep binary, using fallback path',
-    )
-    return bundledRgPath
+    logger.error({ error }, 'Failed to extract ripgrep binary')
+    // Fallback to vscode ripgrep if extraction fails
+    return vscodeRgPath
   }
 }