Fix code search case: strip quotes around flag args

Author: jahooma

sdk/src/__tests__/code-search.test.ts

@@ -650,6 +650,70 @@ describe('codeSearch', () => {
       expect(spawnArgs[gFlagIndices[1]! + 1]).toBe('*.tsx')
     })
 
+    it('should strip single quotes from glob pattern arguments (regression: spawn has no shell)', async () => {
+      const searchPromise = codeSearch({
+        projectPath: '/test/project',
+        pattern: 'auth',
+        flags: "-g 'authentication.knowledge.md'",
+      })
+
+      const output = createRgJsonMatch('authentication.knowledge.md', 5, 'auth content')
+
+      mockProcess.stdout.emit('data', Buffer.from(output))
+      mockProcess.emit('close', 0)
+
+      const result = await searchPromise
+      const value = asCodeSearchResult(result[0])
+      expect(value.stdout).toContain('authentication.knowledge.md:')
+
+      // Verify the quotes were stripped before passing to spawn
+      const spawnArgs = mockSpawn.mock.calls[0]![1] as string[]
+      expect(spawnArgs).toContain('authentication.knowledge.md')
+      expect(spawnArgs).not.toContain("'authentication.knowledge.md'")
+    })
+
+    it('should strip double quotes from glob pattern arguments', async () => {
+      const searchPromise = codeSearch({
+        projectPath: '/test/project',
+        pattern: 'import',
+        flags: '-g "*.ts"',
+      })
+
+      const output = createRgJsonMatch('file.ts', 1, 'import foo')
+
+      mockProcess.stdout.emit('data', Buffer.from(output))
+      mockProcess.emit('close', 0)
+
+      const result = await searchPromise
+      const value = asCodeSearchResult(result[0])
+      expect(value.stdout).toContain('file.ts:')
+
+      const spawnArgs = mockSpawn.mock.calls[0]![1] as string[]
+      expect(spawnArgs).toContain('*.ts')
+      expect(spawnArgs).not.toContain('"*.ts"')
+    })
+
+    it('should strip quotes from multiple glob patterns', async () => {
+      const searchPromise = codeSearch({
+        projectPath: '/test/project',
+        pattern: 'import',
+        flags: "-g '*.ts' -g '*.tsx'",
+      })
+
+      const output = createRgJsonMatch('file.tsx', 1, 'import React')
+
+      mockProcess.stdout.emit('data', Buffer.from(output))
+      mockProcess.emit('close', 0)
+
+      await searchPromise
+
+      const spawnArgs = mockSpawn.mock.calls[0]![1] as string[]
+      expect(spawnArgs).toContain('*.ts')
+      expect(spawnArgs).toContain('*.tsx')
+      expect(spawnArgs).not.toContain("'*.ts'")
+      expect(spawnArgs).not.toContain("'*.tsx'")
+    })
+
     it('should not deduplicate flag-argument pairs', async () => {
       const searchPromise = codeSearch({
         projectPath: '/test/project',

sdk/src/tools/code-search.ts

@@ -6,6 +6,7 @@ import { formatCodeSearchOutput } from '../../../common/src/util/format-code-sea
 import { getBundledRgPath } from '../native/ripgrep'
 
 import type { CodebuffToolOutput } from '../../../common/src/tools/list'
+import { Logger } from '@codebuff/common/types/contracts/logger'
 
 // Hidden directories to include in code search by default.
 // These are searched in addition to '.' to ensure important config/workflow files are discoverable.
@@ -27,6 +28,7 @@ export function codeSearch({
   globalMaxResults = 250,
   maxOutputStringLength = 20_000,
   timeoutSeconds = 10,
+  logger,
 }: {
   projectPath: string
   pattern: string
@@ -36,6 +38,7 @@ export function codeSearch({
   globalMaxResults?: number
   maxOutputStringLength?: number
   timeoutSeconds?: number
+  logger?: Logger
 }): Promise<CodebuffToolOutput<'code_search'>> {
   return new Promise((resolve) => {
     let isResolved = false
@@ -61,7 +64,12 @@ export function codeSearch({
 
     // Parse flags - do NOT deduplicate to preserve flag-argument pairs like '-g *.ts'
     // Deduplicating would break up these pairs and cause errors
-    const flagsArray = (flags || '').split(' ').filter(Boolean)
+    // Strip surrounding quotes from each token since spawn() passes args directly
+    // without shell interpretation (e.g. "'foo.md'" → "foo.md")
+    const flagsArray = (flags || '')
+      .split(' ')
+      .filter(Boolean)
+      .map((token) => token.replace(/^['"]|['"]$/g, ''))
 
     // Use JSON output for robust parsing and early stopping
     // --no-config prevents user/system .ripgreprc from interfering
@@ -89,6 +97,9 @@ export function codeSearch({
     ]
 
     const rgPath = getBundledRgPath(import.meta.url)
+    if (logger) {
+      logger.info({ rgPath, args, searchCwd }, 'code-search: Spawning ripgrep process')
+    }
     const childProcess = spawn(rgPath, args, {
       cwd: searchCwd,
       stdio: ['ignore', 'pipe', 'pipe'],
@@ -129,15 +140,15 @@ export function codeSearch({
     const hardKill = () => {
       try {
         childProcess.kill('SIGTERM')
-      } catch {}
+      } catch { }
       // Store timeout reference so it can be cleared if process closes normally
       killTimeoutId = setTimeout(() => {
         try {
           childProcess.kill('SIGKILL')
         } catch {
           try {
             childProcess.kill()
-          } catch {}
+          } catch { }
         }
         killTimeoutId = null
       }, 1000)
@@ -247,7 +258,7 @@ export function codeSearch({
                 const finalOutput =
                   formattedOutput.length > maxOutputStringLength
                     ? formattedOutput.substring(0, maxOutputStringLength) +
-                      '\n\n[Output truncated]'
+                    '\n\n[Output truncated]'
                     : formattedOutput
 
                 const limitReason =
@@ -324,10 +335,10 @@ export function codeSearch({
                   }
                 }
               }
-            } catch {}
+            } catch { }
           }
         }
-      } catch {}
+      } catch { }
 
       // Build final output from collected matches
       const limitedLines: string[] = []
@@ -369,14 +380,14 @@ export function codeSearch({
       const truncatedStdout =
         formattedOutput.length > maxOutputStringLength
           ? formattedOutput.substring(0, maxOutputStringLength) +
-            '\n\n[Output truncated]'
+          '\n\n[Output truncated]'
           : formattedOutput
 
       const truncatedStderr = stderrBuf
         ? stderrBuf +
-          (stderrBuf.length >= Math.floor(maxOutputStringLength / 5)
-            ? '\n\n[Error output truncated]'
-            : '')
+        (stderrBuf.length >= Math.floor(maxOutputStringLength / 5)
+          ? '\n\n[Error output truncated]'
+          : '')
         : ''
 
       settle({