@machina.ai/cell-cli-core 1.13.0-rc5 → 1.16.0-rc2

package/dist/src/tools/ripGrep.test.js

@@ -7,7 +7,7 @@ import { describe, it, expect, beforeEach, afterEach, afterAll, vi, } from 'vite
 import { canUseRipgrep, RipGrepTool, ensureRgPath } from './ripGrep.js';
 import path from 'node:path';
 import fs from 'node:fs/promises';
-import os, { EOL } from 'node:os';
+import os from 'node:os';
 import { Storage } from '../config/storage.js';
 import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
 import { spawn } from 'node:child_process';
@@ -215,19 +215,19 @@ describe('RipGrepTool', () => {
             expect(grepTool.validateToolParams(params)).toBeNull();
         });
         it('should return null for valid params (pattern and path)', () => {
-            const params = { pattern: 'hello', path: '.' };
+            const params = { pattern: 'hello', dir_path: '.' };
             expect(grepTool.validateToolParams(params)).toBeNull();
         });
         it('should return null for valid params (pattern, path, and include)', () => {
             const params = {
                 pattern: 'hello',
-                path: '.',
+                dir_path: '.',
                 include: '*.txt',
             };
             expect(grepTool.validateToolParams(params)).toBeNull();
         });
         it('should return error if pattern is missing', () => {
-            const params = { path: '.' };
+            const params = { dir_path: '.' };
             expect(grepTool.validateToolParams(params)).toBe(`params must have required property 'pattern'`);
         });
         it('should return null for what would be an invalid regex pattern', () => {
@@ -237,28 +237,57 @@ describe('RipGrepTool', () => {
         it('should return error if path does not exist', () => {
             const params = {
                 pattern: 'hello',
-                path: 'nonexistent',
+                dir_path: 'nonexistent',
             };
             // Check for the core error message, as the full path might vary
-            expect(grepTool.validateToolParams(params)).toContain('Failed to access path stats for');
+            expect(grepTool.validateToolParams(params)).toContain('Path does not exist');
             expect(grepTool.validateToolParams(params)).toContain('nonexistent');
         });
-        it('should return error if path is a file, not a directory', async () => {
+        it('should allow path to be a file', async () => {
             const filePath = path.join(tempRootDir, 'fileA.txt');
-            const params = { pattern: 'hello', path: filePath };
-            expect(grepTool.validateToolParams(params)).toContain(`Path is not a directory: ${filePath}`);
+            const params = {
+                pattern: 'hello',
+                dir_path: filePath,
+            };
+            expect(grepTool.validateToolParams(params)).toBeNull();
         });
     });
     describe('execute', () => {
         it('should find matches for a simple pattern in all files', async () => {
             mockSpawn.mockImplementationOnce(createMockSpawn({
-                outputData: `fileA.txt:1:hello world${EOL}fileA.txt:2:second line with world${EOL}sub/fileC.txt:1:another world in sub dir${EOL}`,
+                outputData: JSON.stringify({
+                    type: 'match',
+                    data: {
+                        path: { text: 'fileA.txt' },
+                        line_number: 1,
+                        lines: { text: 'hello world\n' },
+                    },
+                }) +
+                    '\n' +
+                    JSON.stringify({
+                        type: 'match',
+                        data: {
+                            path: { text: 'fileA.txt' },
+                            line_number: 2,
+                            lines: { text: 'second line with world\n' },
+                        },
+                    }) +
+                    '\n' +
+                    JSON.stringify({
+                        type: 'match',
+                        data: {
+                            path: { text: 'sub/fileC.txt' },
+                            line_number: 1,
+                            lines: { text: 'another world in sub dir\n' },
+                        },
+                    }) +
+                    '\n',
                 exitCode: 0,
             }));
             const params = { pattern: 'world' };
             const invocation = grepTool.build(params);
             const result = await invocation.execute(abortSignal);
-            expect(result.llmContent).toContain('Found 3 matches for pattern "world" in the workspace directory');
+            expect(result.llmContent).toContain('Found 3 matches for pattern "world" in path "."');
             expect(result.llmContent).toContain('File: fileA.txt');
             expect(result.llmContent).toContain('L1: hello world');
             expect(result.llmContent).toContain('L2: second line with world');
@@ -269,10 +298,17 @@ describe('RipGrepTool', () => {
         it('should find matches in a specific path', async () => {
             // Setup specific mock for this test - searching in 'sub' should only return matches from that directory
             mockSpawn.mockImplementationOnce(createMockSpawn({
-                outputData: `fileC.txt:1:another world in sub dir${EOL}`,
+                outputData: JSON.stringify({
+                    type: 'match',
+                    data: {
+                        path: { text: 'fileC.txt' },
+                        line_number: 1,
+                        lines: { text: 'another world in sub dir\n' },
+                    },
+                }) + '\n',
                 exitCode: 0,
             }));
-            const params = { pattern: 'world', path: 'sub' };
+            const params = { pattern: 'world', dir_path: 'sub' };
             const invocation = grepTool.build(params);
             const result = await invocation.execute(abortSignal);
             expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
@@ -283,13 +319,20 @@ describe('RipGrepTool', () => {
         it('should find matches with an include glob', async () => {
             // Setup specific mock for this test
             mockSpawn.mockImplementationOnce(createMockSpawn({
-                outputData: `fileB.js:2:function baz() { return "hello"; }${EOL}`,
+                outputData: JSON.stringify({
+                    type: 'match',
+                    data: {
+                        path: { text: 'fileB.js' },
+                        line_number: 2,
+                        lines: { text: 'function baz() { return "hello"; }\n' },
+                    },
+                }) + '\n',
                 exitCode: 0,
             }));
             const params = { pattern: 'hello', include: '*.js' };
             const invocation = grepTool.build(params);
             const result = await invocation.execute(abortSignal);
-            expect(result.llmContent).toContain('Found 1 match for pattern "hello" in the workspace directory (filter: "*.js"):');
+            expect(result.llmContent).toContain('Found 1 match for pattern "hello" in path "." (filter: "*.js"):');
             expect(result.llmContent).toContain('File: fileB.js');
             expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
             expect(result.returnDisplay).toBe('Found 1 match');
@@ -316,7 +359,14 @@ describe('RipGrepTool', () => {
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
                         // Only return match from the .js file in sub directory
-                        onData(Buffer.from(`another.js:1:const greeting = "hello";${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'another.js' },
+                                line_number: 1,
+                                lines: { text: 'const greeting = "hello";\n' },
+                            },
+                        }) + '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -326,7 +376,7 @@ describe('RipGrepTool', () => {
             });
             const params = {
                 pattern: 'hello',
-                path: 'sub',
+                dir_path: 'sub',
                 include: '*.js',
             };
             const invocation = grepTool.build(params);
@@ -344,7 +394,7 @@ describe('RipGrepTool', () => {
             const params = { pattern: 'nonexistentpattern' };
             const invocation = grepTool.build(params);
             const result = await invocation.execute(abortSignal);
-            expect(result.llmContent).toContain('No matches found for pattern "nonexistentpattern" in the workspace directory.');
+            expect(result.llmContent).toContain('No matches found for pattern "nonexistentpattern" in path ".".');
             expect(result.returnDisplay).toBe('No matches found');
         });
         it('should return an error from ripgrep for invalid regex pattern', async () => {
@@ -378,7 +428,14 @@ describe('RipGrepTool', () => {
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
                         // Return match for the regex pattern
-                        onData(Buffer.from(`fileB.js:1:const foo = "bar";${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'fileB.js' },
+                                line_number: 1,
+                                lines: { text: 'const foo = "bar";\n' },
+                            },
+                        }) + '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -389,7 +446,7 @@ describe('RipGrepTool', () => {
             const params = { pattern: 'foo.*bar' }; // Matches 'const foo = "bar";'
             const invocation = grepTool.build(params);
             const result = await invocation.execute(abortSignal);
-            expect(result.llmContent).toContain('Found 1 match for pattern "foo.*bar" in the workspace directory:');
+            expect(result.llmContent).toContain('Found 1 match for pattern "foo.*bar" in path ".":');
             expect(result.llmContent).toContain('File: fileB.js');
             expect(result.llmContent).toContain('L1: const foo = "bar";');
         });
@@ -414,7 +471,24 @@ describe('RipGrepTool', () => {
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
                         // Return case-insensitive matches for 'HELLO'
-                        onData(Buffer.from(`fileA.txt:1:hello world${EOL}fileB.js:2:function baz() { return "hello"; }${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'fileA.txt' },
+                                line_number: 1,
+                                lines: { text: 'hello world\n' },
+                            },
+                        }) +
+                            '\n' +
+                            JSON.stringify({
+                                type: 'match',
+                                data: {
+                                    path: { text: 'fileB.js' },
+                                    line_number: 2,
+                                    lines: { text: 'function baz() { return "hello"; }\n' },
+                                },
+                            }) +
+                            '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -425,14 +499,14 @@ describe('RipGrepTool', () => {
             const params = { pattern: 'HELLO' };
             const invocation = grepTool.build(params);
             const result = await invocation.execute(abortSignal);
-            expect(result.llmContent).toContain('Found 2 matches for pattern "HELLO" in the workspace directory:');
+            expect(result.llmContent).toContain('Found 2 matches for pattern "HELLO" in path ".":');
             expect(result.llmContent).toContain('File: fileA.txt');
             expect(result.llmContent).toContain('L1: hello world');
             expect(result.llmContent).toContain('File: fileB.js');
             expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
         });
         it('should throw an error if params are invalid', async () => {
-            const params = { path: '.' }; // Invalid: pattern missing
+            const params = { dir_path: '.' }; // Invalid: pattern missing
             expect(() => grepTool.build(params)).toThrow(/params must have required property 'pattern'/);
         });
         it('should throw an error if ripgrep is not available', async () => {
@@ -447,7 +521,7 @@ describe('RipGrepTool', () => {
         });
     });
     describe('multi-directory workspace', () => {
-        it('should search across all workspace directories when no path is specified', async () => {
+        it('should search only CWD when no path is specified (default behavior)', async () => {
             // Create additional directory with test files
             const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), 'grep-tool-second-'));
             await fs.writeFile(path.join(secondDir, 'other.txt'), 'hello from second directory\nworld in second');
@@ -483,19 +557,55 @@ describe('RipGrepTool', () => {
                     if (callCount === 1) {
                         // First directory (tempRootDir)
                         outputData =
-                            [
-                                'fileA.txt:1:hello world',
-                                'fileA.txt:2:second line with world',
-                                'sub/fileC.txt:1:another world in sub dir',
-                            ].join(EOL) + EOL;
+                            JSON.stringify({
+                                type: 'match',
+                                data: {
+                                    path: { text: 'fileA.txt' },
+                                    line_number: 1,
+                                    lines: { text: 'hello world\n' },
+                                },
+                            }) +
+                                '\n' +
+                                JSON.stringify({
+                                    type: 'match',
+                                    data: {
+                                        path: { text: 'fileA.txt' },
+                                        line_number: 2,
+                                        lines: { text: 'second line with world\n' },
+                                    },
+                                }) +
+                                '\n' +
+                                JSON.stringify({
+                                    type: 'match',
+                                    data: {
+                                        path: { text: 'sub/fileC.txt' },
+                                        line_number: 1,
+                                        lines: { text: 'another world in sub dir\n' },
+                                    },
+                                }) +
+                                '\n';
                     }
                     else if (callCount === 2) {
                         // Second directory (secondDir)
                         outputData =
-                            [
-                                'other.txt:2:world in second',
-                                'another.js:1:function world() { return "test"; }',
-                            ].join(EOL) + EOL;
+                            JSON.stringify({
+                                type: 'match',
+                                data: {
+                                    path: { text: 'other.txt' },
+                                    line_number: 2,
+                                    lines: { text: 'world in second\n' },
+                                },
+                            }) +
+                                '\n' +
+                                JSON.stringify({
+                                    type: 'match',
+                                    data: {
+                                        path: { text: 'another.js' },
+                                        line_number: 1,
+                                        lines: { text: 'function world() { return "test"; }\n' },
+                                    },
+                                }) +
+                                '\n';
                     }
                     if (stdoutDataHandler && outputData) {
                         stdoutDataHandler(Buffer.from(outputData));
@@ -510,19 +620,19 @@ describe('RipGrepTool', () => {
             const params = { pattern: 'world' };
             const invocation = multiDirGrepTool.build(params);
             const result = await invocation.execute(abortSignal);
-            // Should find matches in both directories
-            expect(result.llmContent).toContain('Found 5 matches for pattern "world"');
+            // Should find matches in CWD only (default behavior now)
+            expect(result.llmContent).toContain('Found 3 matches for pattern "world" in path "."');
             // Matches from first directory
             expect(result.llmContent).toContain('fileA.txt');
             expect(result.llmContent).toContain('L1: hello world');
             expect(result.llmContent).toContain('L2: second line with world');
             expect(result.llmContent).toContain('fileC.txt');
             expect(result.llmContent).toContain('L1: another world in sub dir');
-            // Matches from both directories
-            expect(result.llmContent).toContain('other.txt');
-            expect(result.llmContent).toContain('L2: world in second');
-            expect(result.llmContent).toContain('another.js');
-            expect(result.llmContent).toContain('L1: function world()');
+            // Should NOT find matches from second directory
+            expect(result.llmContent).not.toContain('other.txt');
+            expect(result.llmContent).not.toContain('world in second');
+            expect(result.llmContent).not.toContain('another.js');
+            expect(result.llmContent).not.toContain('function world()');
             // Clean up
             await fs.rm(secondDir, { recursive: true, force: true });
             mockSpawn.mockClear();
@@ -557,7 +667,14 @@ describe('RipGrepTool', () => {
                     const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === 'data')?.[1];
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
-                        onData(Buffer.from(`fileC.txt:1:another world in sub dir${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'fileC.txt' },
+                                line_number: 1,
+                                lines: { text: 'another world in sub dir\n' },
+                            },
+                        }) + '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -567,7 +684,7 @@ describe('RipGrepTool', () => {
             });
             const multiDirGrepTool = new RipGrepTool(multiDirConfig);
             // Search only in the 'sub' directory of the first workspace
-            const params = { pattern: 'world', path: 'sub' };
+            const params = { pattern: 'world', dir_path: 'sub' };
             const invocation = multiDirGrepTool.build(params);
             const result = await invocation.execute(abortSignal);
             // Should only find matches in the specified sub directory
@@ -627,7 +744,10 @@ describe('RipGrepTool', () => {
     });
     describe('error handling and edge cases', () => {
         it('should handle workspace boundary violations', () => {
-            const params = { pattern: 'test', path: '../outside' };
+            const params = {
+                pattern: 'test',
+                dir_path: '../outside',
+            };
             expect(() => grepTool.build(params)).toThrow(/Path validation failed/);
         });
         it('should handle empty directories gracefully', async () => {
@@ -656,7 +776,7 @@ describe('RipGrepTool', () => {
                 }, 0);
                 return mockProcess;
             });
-            const params = { pattern: 'test', path: 'empty' };
+            const params = { pattern: 'test', dir_path: 'empty' };
             const invocation = grepTool.build(params);
             const result = await invocation.execute(abortSignal);
             expect(result.llmContent).toContain('No matches found');
@@ -714,7 +834,14 @@ describe('RipGrepTool', () => {
                     const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === 'data')?.[1];
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
-                        onData(Buffer.from(`${specialFileName}:1:hello world with special chars${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: specialFileName },
+                                line_number: 1,
+                                lines: { text: 'hello world with special chars\n' },
+                            },
+                        }) + '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -751,7 +878,14 @@ describe('RipGrepTool', () => {
                     const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === 'data')?.[1];
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
-                        onData(Buffer.from(`a/b/c/d/e/deep.txt:1:content in deep directory${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'a/b/c/d/e/deep.txt' },
+                                line_number: 1,
+                                lines: { text: 'content in deep directory\n' },
+                            },
+                        }) + '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -788,7 +922,14 @@ describe('RipGrepTool', () => {
                     const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === 'data')?.[1];
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
-                        onData(Buffer.from(`code.js:1:function getName() { return "test"; }${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'code.js' },
+                                line_number: 1,
+                                lines: { text: 'function getName() { return "test"; }\n' },
+                            },
+                        }) + '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -823,7 +964,33 @@ describe('RipGrepTool', () => {
                     const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === 'data')?.[1];
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
-                        onData(Buffer.from(`case.txt:1:Hello World${EOL}case.txt:2:hello world${EOL}case.txt:3:HELLO WORLD${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'case.txt' },
+                                line_number: 1,
+                                lines: { text: 'Hello World\n' },
+                            },
+                        }) +
+                            '\n' +
+                            JSON.stringify({
+                                type: 'match',
+                                data: {
+                                    path: { text: 'case.txt' },
+                                    line_number: 2,
+                                    lines: { text: 'hello world\n' },
+                                },
+                            }) +
+                            '\n' +
+                            JSON.stringify({
+                                type: 'match',
+                                data: {
+                                    path: { text: 'case.txt' },
+                                    line_number: 3,
+                                    lines: { text: 'HELLO WORLD\n' },
+                                },
+                            }) +
+                            '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -859,7 +1026,14 @@ describe('RipGrepTool', () => {
                     const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === 'data')?.[1];
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
-                        onData(Buffer.from(`special.txt:1:Price: $19.99${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'special.txt' },
+                                line_number: 1,
+                                lines: { text: 'Price: $19.99\n' },
+                            },
+                        }) + '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -899,7 +1073,24 @@ describe('RipGrepTool', () => {
                     const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === 'data')?.[1];
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
-                        onData(Buffer.from(`test.ts:1:typescript content${EOL}test.tsx:1:tsx content${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'test.ts' },
+                                line_number: 1,
+                                lines: { text: 'typescript content\n' },
+                            },
+                        }) +
+                            '\n' +
+                            JSON.stringify({
+                                type: 'match',
+                                data: {
+                                    path: { text: 'test.tsx' },
+                                    line_number: 1,
+                                    lines: { text: 'tsx content\n' },
+                                },
+                            }) +
+                            '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -941,7 +1132,14 @@ describe('RipGrepTool', () => {
                     const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === 'data')?.[1];
                     const onClose = mockProcess.on.mock.calls.find((call) => call[0] === 'close')?.[1];
                     if (onData) {
-                        onData(Buffer.from(`src/main.ts:1:source code${EOL}`));
+                        onData(Buffer.from(JSON.stringify({
+                            type: 'match',
+                            data: {
+                                path: { text: 'src/main.ts' },
+                                line_number: 1,
+                                lines: { text: 'source code\n' },
+                            },
+                        }) + '\n'));
                     }
                     if (onClose) {
                         onClose(0);
@@ -959,11 +1157,135 @@ describe('RipGrepTool', () => {
             expect(result.llmContent).not.toContain('other.ts');
         });
     });
+    describe('advanced search options', () => {
+        it('should handle case_sensitive parameter', async () => {
+            // Case-insensitive search (default)
+            mockSpawn.mockImplementationOnce(createMockSpawn({
+                outputData: JSON.stringify({
+                    type: 'match',
+                    data: {
+                        path: { text: 'fileA.txt' },
+                        line_number: 1,
+                        lines: { text: 'hello world\n' },
+                    },
+                }) + '\n',
+                exitCode: 0,
+            }));
+            let params = { pattern: 'HELLO' };
+            let invocation = grepTool.build(params);
+            let result = await invocation.execute(abortSignal);
+            expect(mockSpawn).toHaveBeenLastCalledWith(expect.anything(), expect.arrayContaining(['--ignore-case']), expect.anything());
+            expect(result.llmContent).toContain('Found 1 match for pattern "HELLO"');
+            expect(result.llmContent).toContain('L1: hello world');
+            // Case-sensitive search
+            mockSpawn.mockImplementationOnce(createMockSpawn({
+                outputData: JSON.stringify({
+                    type: 'match',
+                    data: {
+                        path: { text: 'fileA.txt' },
+                        line_number: 1,
+                        lines: { text: 'HELLO world\n' },
+                    },
+                }) + '\n',
+                exitCode: 0,
+            }));
+            params = { pattern: 'HELLO', case_sensitive: true };
+            invocation = grepTool.build(params);
+            result = await invocation.execute(abortSignal);
+            expect(mockSpawn).toHaveBeenLastCalledWith(expect.anything(), expect.not.arrayContaining(['--ignore-case']), expect.anything());
+            expect(result.llmContent).toContain('Found 1 match for pattern "HELLO"');
+            expect(result.llmContent).toContain('L1: HELLO world');
+        });
+        it('should handle fixed_strings parameter', async () => {
+            mockSpawn.mockImplementationOnce(createMockSpawn({
+                outputData: JSON.stringify({
+                    type: 'match',
+                    data: {
+                        path: { text: 'fileA.txt' },
+                        line_number: 1,
+                        lines: { text: 'hello.world\n' },
+                    },
+                }) + '\n',
+                exitCode: 0,
+            }));
+            const params = {
+                pattern: 'hello.world',
+                fixed_strings: true,
+            };
+            const invocation = grepTool.build(params);
+            const result = await invocation.execute(abortSignal);
+            expect(mockSpawn).toHaveBeenLastCalledWith(expect.anything(), expect.arrayContaining(['--fixed-strings']), expect.anything());
+            expect(result.llmContent).toContain('Found 1 match for pattern "hello.world"');
+            expect(result.llmContent).toContain('L1: hello.world');
+        });
+        it('should handle no_ignore parameter', async () => {
+            mockSpawn.mockImplementationOnce(createMockSpawn({
+                outputData: JSON.stringify({
+                    type: 'match',
+                    data: {
+                        path: { text: 'ignored.log' },
+                        line_number: 1,
+                        lines: { text: 'secret log entry\n' },
+                    },
+                }) + '\n',
+                exitCode: 0,
+            }));
+            const params = { pattern: 'secret', no_ignore: true };
+            const invocation = grepTool.build(params);
+            const result = await invocation.execute(abortSignal);
+            // Should have --no-ignore
+            expect(mockSpawn).toHaveBeenLastCalledWith(expect.anything(), expect.arrayContaining(['--no-ignore']), expect.anything());
+            // Should NOT have default excludes when no_ignore is true
+            expect(mockSpawn).toHaveBeenLastCalledWith(expect.anything(), expect.not.arrayContaining(['--glob', '!node_modules']), expect.anything());
+            expect(result.llmContent).toContain('Found 1 match for pattern "secret"');
+            expect(result.llmContent).toContain('File: ignored.log');
+            expect(result.llmContent).toContain('L1: secret log entry');
+        });
+        it('should handle context parameters', async () => {
+            mockSpawn.mockImplementationOnce(createMockSpawn({
+                outputData: JSON.stringify({
+                    type: 'match',
+                    data: {
+                        path: { text: 'fileA.txt' },
+                        line_number: 2,
+                        lines: { text: 'second line with world\n' },
+                        lines_before: [{ text: 'hello world\n' }],
+                        lines_after: [
+                            { text: 'third line\n' },
+                            { text: 'fourth line\n' },
+                        ],
+                    },
+                }) + '\n',
+                exitCode: 0,
+            }));
+            const params = {
+                pattern: 'world',
+                context: 1,
+                after: 2,
+                before: 1,
+            };
+            const invocation = grepTool.build(params);
+            const result = await invocation.execute(abortSignal);
+            expect(mockSpawn).toHaveBeenLastCalledWith(expect.anything(), expect.arrayContaining([
+                '--context',
+                '1',
+                '--after-context',
+                '2',
+                '--before-context',
+                '1',
+            ]), expect.anything());
+            expect(result.llmContent).toContain('Found 1 match for pattern "world"');
+            expect(result.llmContent).toContain('File: fileA.txt');
+            expect(result.llmContent).toContain('L2: second line with world');
+            // Note: Ripgrep JSON output for context lines doesn't include line numbers for context lines directly
+            // The current parsing only extracts the matched line, so we only assert on that.
+        });
+    });
     describe('getDescription', () => {
         it('should generate correct description with pattern only', () => {
             const params = { pattern: 'testPattern' };
             const invocation = grepTool.build(params);
-            expect(invocation.getDescription()).toBe("'testPattern'");
+            expect(invocation.getDescription()).toBe("'testPattern' within ./");
         });
         it('should generate correct description with pattern and include', () => {
             const params = {
@@ -971,21 +1293,21 @@ describe('RipGrepTool', () => {
                 include: '*.ts',
             };
             const invocation = grepTool.build(params);
-            expect(invocation.getDescription()).toBe("'testPattern' in *.ts");
+            expect(invocation.getDescription()).toBe("'testPattern' in *.ts within ./");
         });
         it('should generate correct description with pattern and path', async () => {
             const dirPath = path.join(tempRootDir, 'src', 'app');
             await fs.mkdir(dirPath, { recursive: true });
             const params = {
                 pattern: 'testPattern',
-                path: path.join('src', 'app'),
+                dir_path: path.join('src', 'app'),
             };
             const invocation = grepTool.build(params);
             // The path will be relative to the tempRootDir, so we check for containment.
             expect(invocation.getDescription()).toContain("'testPattern' within");
             expect(invocation.getDescription()).toContain(path.join('src', 'app'));
         });
-        it('should indicate searching across all workspace directories when no path specified', () => {
+        it('should use ./ when no path is specified (defaults to CWD)', () => {
             // Create a mock config with multiple directories
             const multiDirConfig = {
                 getTargetDir: () => tempRootDir,
@@ -995,7 +1317,7 @@ describe('RipGrepTool', () => {
             const multiDirGrepTool = new RipGrepTool(multiDirConfig);
             const params = { pattern: 'testPattern' };
             const invocation = multiDirGrepTool.build(params);
-            expect(invocation.getDescription()).toBe("'testPattern' across all workspace directories");
+            expect(invocation.getDescription()).toBe("'testPattern' within ./");
         });
         it('should generate correct description with pattern, include, and path', async () => {
             const dirPath = path.join(tempRootDir, 'src', 'app');
@@ -1003,14 +1325,17 @@ describe('RipGrepTool', () => {
             const params = {
                 pattern: 'testPattern',
                 include: '*.ts',
-                path: path.join('src', 'app'),
+                dir_path: path.join('src', 'app'),
             };
             const invocation = grepTool.build(params);
             expect(invocation.getDescription()).toContain("'testPattern' in *.ts within");
             expect(invocation.getDescription()).toContain(path.join('src', 'app'));
         });
         it('should use ./ for root path in description', () => {
-            const params = { pattern: 'testPattern', path: '.' };
+            const params = {
+                pattern: 'testPattern',
+                dir_path: '.',
+            };
             const invocation = grepTool.build(params);
             expect(invocation.getDescription()).toBe("'testPattern' within ./");
         });