Bundle ripgrep, write it in the same directory as codebuff bin at runtime

Author: jahooma

cli/src/hooks/use-connection-status.ts

@@ -53,7 +53,7 @@ export const useConnectionStatus = () => {
     }
 
     const checkConnection = async () => {
-      const client = getCodebuffClient()
+      const client = await getCodebuffClient()
       if (!client) {
         if (isMounted) {
           setIsConnected(false)

cli/src/hooks/use-send-message.ts

@@ -531,7 +531,7 @@ export const useSendMessage = ({
       setInputFocused(true)
       inputRef.current?.focus()
 
-      const client = getCodebuffClient()
+      const client = await getCodebuffClient()
 
       if (!client) {
         logger.error(

cli/src/native/ripgrep.ts

@@ -0,0 +1,76 @@
+import path from 'path'
+
+import { getBundledRgPath } from '@codebuff/sdk'
+import { spawnSync } from 'bun'
+
+import { logger } from '../utils/logger'
+
+const getRipgrepPath = async (): Promise<string> => {
+  // In dev mode, use the SDK's bundled ripgrep binary
+  if (!process.env.CODEBUFF_IS_BINARY) {
+    return getBundledRgPath()
+  }
+
+  // Compiled mode - self-extract the embedded binary to the same directory as the current binary
+  const binaryDir = path.dirname(process.execPath)
+  const rgFileName = process.platform === 'win32' ? 'rg.exe' : 'rg'
+  const outPath = path.join(binaryDir, rgFileName)
+
+  // Check if already extracted
+  if (await Bun.file(outPath).exists()) {
+    return outPath
+  }
+
+  // Extract the embedded binary
+  try {
+    // Use require() with literal paths to ensure the binary gets bundled into the compiled CLI
+    // This is necessary for Bun's binary compilation to include the ripgrep binary
+    let embeddedRgPath: string
+    
+    if (process.platform === 'darwin' && process.arch === 'arm64') {
+      embeddedRgPath = require('../../../sdk/dist/vendor/ripgrep/arm64-darwin/rg')
+    } else if (process.platform === 'darwin' && process.arch === 'x64') {
+      embeddedRgPath = require('../../../sdk/dist/vendor/ripgrep/x64-darwin/rg')
+    } else if (process.platform === 'linux' && process.arch === 'arm64') {
+      embeddedRgPath = require('../../../sdk/dist/vendor/ripgrep/arm64-linux/rg')
+    } else if (process.platform === 'linux' && process.arch === 'x64') {
+      embeddedRgPath = require('../../../sdk/dist/vendor/ripgrep/x64-linux/rg')
+    } else if (process.platform === 'win32' && process.arch === 'x64') {
+      embeddedRgPath = require('../../../sdk/dist/vendor/ripgrep/x64-win32/rg.exe')
+    } else {
+      throw new Error(`Unsupported platform: ${process.platform}-${process.arch}`)
+    }
+
+    // Copy SDK's bundled binary to binary directory for portability
+    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 extract ripgrep binary')
+    // Fallback to SDK's bundled ripgrep if extraction fails
+    return getBundledRgPath()
+  }
+}
+
+// Cache the promise to avoid multiple extractions
+let rgPathPromise: Promise<string> | null = null
+
+export const getRgPath = (): Promise<string> => {
+  if (!rgPathPromise) {
+    rgPathPromise = getRipgrepPath()
+  }
+  return rgPathPromise
+}
+
+/**
+ * Reset the cached ripgrep path promise.
+ * Used primarily for testing to force re-extraction.
+ */
+export const resetRgPathCache = (): void => {
+  rgPathPromise = null
+}

cli/src/utils/codebuff-client.ts

@@ -5,6 +5,7 @@ import { getAuthTokenDetails } from './auth'
 import { loadAgentDefinitions } from './load-agent-definitions'
 import { logger } from './logger'
 import { getProjectRoot } from '../project-files'
+import { getRgPath } from '../native/ripgrep'
 
 let clientInstance: CodebuffClient | null = null
 
@@ -16,7 +17,7 @@ export function resetCodebuffClient(): void {
   clientInstance = null
 }
 
-export function getCodebuffClient(): CodebuffClient | null {
+export async function getCodebuffClient(): Promise<CodebuffClient | null> {
   if (!clientInstance) {
     const { token: apiKey, source } = getAuthTokenDetails()
 
@@ -29,6 +30,17 @@ export function getCodebuffClient(): CodebuffClient | null {
     }
 
     const projectRoot = getProjectRoot()
+
+    // Set up ripgrep path for SDK to use
+    if (process.env.CODEBUFF_IS_BINARY) {
+      try {
+        const rgPath = await getRgPath()
+        process.env.CODEBUFF_RG_PATH = rgPath
+      } catch (error) {
+        logger.error(error, 'Failed to set up ripgrep binary for SDK')
+      }
+    }
+
     try {
       const agentDefinitions = loadAgentDefinitions()
       clientInstance = new CodebuffClient({