@machina.ai/cell-cli-core 1.0.21-rc3 → 1.2.2-rc1

package/dist/src/utils/partUtils.test.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect } from 'vitest';
-import { partToString, getResponseText } from './partUtils.js';
+import { partToString, getResponseText, flatMapTextParts, appendToLastTextPart, } from './partUtils.js';
 const mockResponse = (parts) => ({
     candidates: parts
         ? [{ content: { parts: parts, role: 'model' }, index: 0 }]
@@ -125,6 +125,117 @@ describe('partUtils', () => {
             const result = mockResponse([]);
             expect(getResponseText(result)).toBeNull();
         });
+        it('should return null if the first candidate has no content property', () => {
+            const response = {
+                candidates: [
+                    {
+                        index: 0,
+                    },
+                ],
+                promptFeedback: { safetyRatings: [] },
+                text: undefined,
+                data: undefined,
+                functionCalls: undefined,
+                executableCode: undefined,
+                codeExecutionResult: undefined,
+            };
+            expect(getResponseText(response)).toBeNull();
+        });
+    });
+    describe('flatMapTextParts', () => {
+        // A simple async transform function that splits a string into character parts.
+        const splitCharsTransform = async (text) => text.split('').map((char) => ({ text: char }));
+        it('should return an empty array for empty input', async () => {
+            const result = await flatMapTextParts([], splitCharsTransform);
+            expect(result).toEqual([]);
+        });
+        it('should transform a simple string input', async () => {
+            const result = await flatMapTextParts('hi', splitCharsTransform);
+            expect(result).toEqual([{ text: 'h' }, { text: 'i' }]);
+        });
+        it('should transform a single text part object', async () => {
+            const result = await flatMapTextParts({ text: 'cat' }, splitCharsTransform);
+            expect(result).toEqual([{ text: 'c' }, { text: 'a' }, { text: 't' }]);
+        });
+        it('should transform an array of text parts and flatten the result', async () => {
+            // A transform that duplicates the text to test the "flatMap" behavior.
+            const duplicateTransform = async (text) => [
+                { text: `${text}` },
+                { text: `${text}` },
+            ];
+            const parts = [{ text: 'a' }, { text: 'b' }];
+            const result = await flatMapTextParts(parts, duplicateTransform);
+            expect(result).toEqual([
+                { text: 'a' },
+                { text: 'a' },
+                { text: 'b' },
+                { text: 'b' },
+            ]);
+        });
+        it('should pass through non-text parts unmodified', async () => {
+            const nonTextPart = { functionCall: { name: 'do_stuff' } };
+            const result = await flatMapTextParts(nonTextPart, splitCharsTransform);
+            expect(result).toEqual([nonTextPart]);
+        });
+        it('should handle a mix of text and non-text parts in an array', async () => {
+            const nonTextPart = {
+                inlineData: { mimeType: 'image/jpeg', data: '' },
+            };
+            const parts = [{ text: 'go' }, nonTextPart, ' stop'];
+            const result = await flatMapTextParts(parts, splitCharsTransform);
+            expect(result).toEqual([
+                { text: 'g' },
+                { text: 'o' },
+                nonTextPart, // Should be passed through
+                { text: ' ' },
+                { text: 's' },
+                { text: 't' },
+                { text: 'o' },
+                { text: 'p' },
+            ]);
+        });
+        it('should handle a transform that returns an empty array', async () => {
+            const removeTransform = async (_text) => [];
+            const parts = [
+                { text: 'remove' },
+                { functionCall: { name: 'keep' } },
+            ];
+            const result = await flatMapTextParts(parts, removeTransform);
+            expect(result).toEqual([{ functionCall: { name: 'keep' } }]);
+        });
+    });
+    describe('appendToLastTextPart', () => {
+        it('should append to an empty prompt', () => {
+            const prompt = [];
+            const result = appendToLastTextPart(prompt, 'new text');
+            expect(result).toEqual([{ text: 'new text' }]);
+        });
+        it('should append to a prompt with a string as the last part', () => {
+            const prompt = ['first part'];
+            const result = appendToLastTextPart(prompt, 'new text');
+            expect(result).toEqual(['first part\n\nnew text']);
+        });
+        it('should append to a prompt with a text part object as the last part', () => {
+            const prompt = [{ text: 'first part' }];
+            const result = appendToLastTextPart(prompt, 'new text');
+            expect(result).toEqual([{ text: 'first part\n\nnew text' }]);
+        });
+        it('should append a new text part if the last part is not a text part', () => {
+            const nonTextPart = { functionCall: { name: 'do_stuff' } };
+            const prompt = [nonTextPart];
+            const result = appendToLastTextPart(prompt, 'new text');
+            expect(result).toEqual([nonTextPart, { text: '\n\nnew text' }]);
+        });
+        it('should not append anything if the text to append is empty', () => {
+            const prompt = ['first part'];
+            const result = appendToLastTextPart(prompt, '');
+            expect(result).toEqual(['first part']);
+        });
+        it('should use a custom separator', () => {
+            const prompt = ['first part'];
+            const result = appendToLastTextPart(prompt, 'new text', '---');
+            expect(result).toEqual(['first part---new text']);
+        });
     });
 });
 //# sourceMappingURL=partUtils.test.js.map

package/dist/src/utils/partUtils.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"partUtils.test.js","sourceRoot":"","sources":["../../../src/utils/partUtils.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"partUtils.test.js","sourceRoot":"","sources":["../../../src/utils/partUtils.test.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/pathReader.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { PartUnion } from '@google/genai';
+import type { Config } from '../config/config.js';
+/**
+ * Reads the content of a file or recursively expands a directory from
+ * within the workspace, returning content suitable for LLM input.
+ *
+ * @param pathStr The path to read (can be absolute or relative).
+ * @param config The application configuration, providing workspace context and services.
+ * @returns A promise that resolves to an array of PartUnion (string | Part).
+ * @throws An error if the path is not found or is outside the workspace.
+ */
+export declare function readPathFromWorkspace(pathStr: string, config: Config): Promise<PartUnion[]>;

package/dist/src/utils/pathReader.js

@@ -0,0 +1,92 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import { glob } from 'glob';
+import { processSingleFileContent } from './fileUtils.js';
+/**
+ * Reads the content of a file or recursively expands a directory from
+ * within the workspace, returning content suitable for LLM input.
+ *
+ * @param pathStr The path to read (can be absolute or relative).
+ * @param config The application configuration, providing workspace context and services.
+ * @returns A promise that resolves to an array of PartUnion (string | Part).
+ * @throws An error if the path is not found or is outside the workspace.
+ */
+export async function readPathFromWorkspace(pathStr, config) {
+    const workspace = config.getWorkspaceContext();
+    const fileService = config.getFileService();
+    let absolutePath = null;
+    if (path.isAbsolute(pathStr)) {
+        if (!workspace.isPathWithinWorkspace(pathStr)) {
+            throw new Error(`Absolute path is outside of the allowed workspace: ${pathStr}`);
+        }
+        absolutePath = pathStr;
+    }
+    else {
+        // Prioritized search for relative paths.
+        const searchDirs = workspace.getDirectories();
+        for (const dir of searchDirs) {
+            const potentialPath = path.resolve(dir, pathStr);
+            try {
+                await fs.access(potentialPath);
+                absolutePath = potentialPath;
+                break; // Found the first match.
+            }
+            catch {
+                // Not found, continue to the next directory.
+            }
+        }
+    }
+    if (!absolutePath) {
+        throw new Error(`Path not found in workspace: ${pathStr}`);
+    }
+    const stats = await fs.stat(absolutePath);
+    if (stats.isDirectory()) {
+        const allParts = [];
+        allParts.push({
+            text: `--- Start of content for directory: ${pathStr} ---\n`,
+        });
+        // Use glob to recursively find all files within the directory.
+        const files = await glob('**/*', {
+            cwd: absolutePath,
+            nodir: true, // We only want files
+            dot: true, // Include dotfiles
+            absolute: true,
+        });
+        const relativeFiles = files.map((p) => path.relative(config.getTargetDir(), p));
+        const filteredFiles = fileService.filterFiles(relativeFiles, {
+            respectGitIgnore: true,
+            respectGeminiIgnore: true,
+        });
+        const finalFiles = filteredFiles.map((p) => path.resolve(config.getTargetDir(), p));
+        for (const filePath of finalFiles) {
+            const relativePathForDisplay = path.relative(absolutePath, filePath);
+            allParts.push({ text: `--- ${relativePathForDisplay} ---\n` });
+            const result = await processSingleFileContent(filePath, config.getTargetDir(), config.getFileSystemService());
+            allParts.push(result.llmContent);
+            allParts.push({ text: '\n' }); // Add a newline for separation
+        }
+        allParts.push({ text: `--- End of content for directory: ${pathStr} ---` });
+        return allParts;
+    }
+    else {
+        // It's a single file, check if it's ignored.
+        const relativePath = path.relative(config.getTargetDir(), absolutePath);
+        const filtered = fileService.filterFiles([relativePath], {
+            respectGitIgnore: true,
+            respectGeminiIgnore: true,
+        });
+        if (filtered.length === 0) {
+            // File is ignored, return empty array to silently skip.
+            return [];
+        }
+        // It's a single file, process it directly.
+        const result = await processSingleFileContent(absolutePath, config.getTargetDir(), config.getFileSystemService());
+        return [result.llmContent];
+    }
+}
+//# sourceMappingURL=pathReader.js.map

package/dist/src/utils/pathReader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pathReader.js","sourceRoot":"","sources":["../../../src/utils/pathReader.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/pathReader.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/utils/pathReader.test.js

@@ -0,0 +1,363 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, afterEach, vi } from 'vitest';
+import mock from 'mock-fs';
+import * as path from 'node:path';
+import { WorkspaceContext } from './workspaceContext.js';
+import { readPathFromWorkspace } from './pathReader.js';
+import { StandardFileSystemService } from '../services/fileSystemService.js';
+// --- Helper for creating a mock Config object ---
+// We use the actual implementations of WorkspaceContext and FileSystemService
+// to test the integration against mock-fs.
+const createMockConfig = (cwd, otherDirs = [], mockFileService) => {
+    const workspace = new WorkspaceContext(cwd, otherDirs);
+    const fileSystemService = new StandardFileSystemService();
+    return {
+        getWorkspaceContext: () => workspace,
+        // TargetDir is used by processSingleFileContent to generate relative paths in errors/output
+        getTargetDir: () => cwd,
+        getFileSystemService: () => fileSystemService,
+        getFileService: () => mockFileService,
+    };
+};
+describe('readPathFromWorkspace', () => {
+    const CWD = path.resolve('/test/cwd');
+    const OTHER_DIR = path.resolve('/test/other');
+    const OUTSIDE_DIR = path.resolve('/test/outside');
+    afterEach(() => {
+        mock.restore();
+        vi.resetAllMocks();
+    });
+    it('should read a text file from the CWD', async () => {
+        mock({
+            [CWD]: {
+                'file.txt': 'hello from cwd',
+            },
+        });
+        const mockFileService = {
+            filterFiles: vi.fn((files) => files),
+        };
+        const config = createMockConfig(CWD, [], mockFileService);
+        const result = await readPathFromWorkspace('file.txt', config);
+        // Expect [string] for text content
+        expect(result).toEqual(['hello from cwd']);
+        expect(mockFileService.filterFiles).toHaveBeenCalled();
+    });
+    it('should read a file from a secondary workspace directory', async () => {
+        mock({
+            [CWD]: {},
+            [OTHER_DIR]: {
+                'file.txt': 'hello from other dir',
+            },
+        });
+        const mockFileService = {
+            filterFiles: vi.fn((files) => files),
+        };
+        const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
+        const result = await readPathFromWorkspace('file.txt', config);
+        expect(result).toEqual(['hello from other dir']);
+    });
+    it('should prioritize CWD when file exists in both CWD and secondary dir', async () => {
+        mock({
+            [CWD]: {
+                'file.txt': 'hello from cwd',
+            },
+            [OTHER_DIR]: {
+                'file.txt': 'hello from other dir',
+            },
+        });
+        const mockFileService = {
+            filterFiles: vi.fn((files) => files),
+        };
+        const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
+        const result = await readPathFromWorkspace('file.txt', config);
+        expect(result).toEqual(['hello from cwd']);
+    });
+    it('should read an image file and return it as inlineData (Part object)', async () => {
+        // Use a real PNG header for robustness
+        const imageData = Buffer.from([
+            0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+        ]);
+        mock({
+            [CWD]: {
+                'image.png': imageData,
+            },
+        });
+        const mockFileService = {
+            filterFiles: vi.fn((files) => files),
+        };
+        const config = createMockConfig(CWD, [], mockFileService);
+        const result = await readPathFromWorkspace('image.png', config);
+        // Expect [Part] for image content
+        expect(result).toEqual([
+            {
+                inlineData: {
+                    mimeType: 'image/png',
+                    data: imageData.toString('base64'),
+                },
+            },
+        ]);
+    });
+    it('should read a generic binary file and return an info string', async () => {
+        // Data that is clearly binary (null bytes)
+        const binaryData = Buffer.from([0x00, 0x01, 0x02, 0x03]);
+        mock({
+            [CWD]: {
+                'data.bin': binaryData,
+            },
+        });
+        const mockFileService = {
+            filterFiles: vi.fn((files) => files),
+        };
+        const config = createMockConfig(CWD, [], mockFileService);
+        const result = await readPathFromWorkspace('data.bin', config);
+        // Expect [string] containing the skip message from fileUtils
+        expect(result).toEqual(['Cannot display content of binary file: data.bin']);
+    });
+    it('should read a file from an absolute path if within workspace', async () => {
+        const absPath = path.join(OTHER_DIR, 'abs.txt');
+        mock({
+            [CWD]: {},
+            [OTHER_DIR]: {
+                'abs.txt': 'absolute content',
+            },
+        });
+        const mockFileService = {
+            filterFiles: vi.fn((files) => files),
+        };
+        const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
+        const result = await readPathFromWorkspace(absPath, config);
+        expect(result).toEqual(['absolute content']);
+    });
+    describe('Directory Expansion', () => {
+        it('should expand a directory and read the content of its files', async () => {
+            mock({
+                [CWD]: {
+                    'my-dir': {
+                        'file1.txt': 'content of file 1',
+                        'file2.md': 'content of file 2',
+                    },
+                },
+            });
+            const mockFileService = {
+                filterFiles: vi.fn((files) => files),
+            };
+            const config = createMockConfig(CWD, [], mockFileService);
+            const result = await readPathFromWorkspace('my-dir', config);
+            // Convert to a single string for easier, order-independent checking
+            const resultText = result
+                .map((p) => {
+                if (typeof p === 'string')
+                    return p;
+                if (typeof p === 'object' && p && 'text' in p)
+                    return p.text;
+                // This part is important for handling binary/image data which isn't just text
+                if (typeof p === 'object' && p && 'inlineData' in p)
+                    return '';
+                return p;
+            })
+                .join('');
+            expect(resultText).toContain('--- Start of content for directory: my-dir ---');
+            expect(resultText).toContain('--- file1.txt ---');
+            expect(resultText).toContain('content of file 1');
+            expect(resultText).toContain('--- file2.md ---');
+            expect(resultText).toContain('content of file 2');
+            expect(resultText).toContain('--- End of content for directory: my-dir ---');
+        });
+        it('should recursively expand a directory and read all nested files', async () => {
+            mock({
+                [CWD]: {
+                    'my-dir': {
+                        'file1.txt': 'content of file 1',
+                        'sub-dir': {
+                            'nested.txt': 'nested content',
+                        },
+                    },
+                },
+            });
+            const mockFileService = {
+                filterFiles: vi.fn((files) => files),
+            };
+            const config = createMockConfig(CWD, [], mockFileService);
+            const result = await readPathFromWorkspace('my-dir', config);
+            const resultText = result
+                .map((p) => {
+                if (typeof p === 'string')
+                    return p;
+                if (typeof p === 'object' && p && 'text' in p)
+                    return p.text;
+                return '';
+            })
+                .join('');
+            expect(resultText).toContain('content of file 1');
+            expect(resultText).toContain('nested content');
+            expect(resultText).toContain(`--- ${path.join('sub-dir', 'nested.txt')} ---`);
+        });
+        it('should handle mixed content and include files from subdirectories', async () => {
+            const imageData = Buffer.from([
+                0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
+            ]);
+            mock({
+                [CWD]: {
+                    'mixed-dir': {
+                        'info.txt': 'some text',
+                        'photo.png': imageData,
+                        'sub-dir': {
+                            'nested.txt': 'this should be included',
+                        },
+                        'empty-sub-dir': {},
+                    },
+                },
+            });
+            const mockFileService = {
+                filterFiles: vi.fn((files) => files),
+            };
+            const config = createMockConfig(CWD, [], mockFileService);
+            const result = await readPathFromWorkspace('mixed-dir', config);
+            // Check for the text part
+            const textContent = result
+                .map((p) => {
+                if (typeof p === 'string')
+                    return p;
+                if (typeof p === 'object' && p && 'text' in p)
+                    return p.text;
+                return ''; // Ignore non-text parts for this assertion
+            })
+                .join('');
+            expect(textContent).toContain('some text');
+            expect(textContent).toContain('this should be included');
+            // Check for the image part
+            const imagePart = result.find((p) => typeof p === 'object' && 'inlineData' in p);
+            expect(imagePart).toEqual({
+                inlineData: {
+                    mimeType: 'image/png',
+                    data: imageData.toString('base64'),
+                },
+            });
+        });
+        it('should handle an empty directory', async () => {
+            mock({
+                [CWD]: {
+                    'empty-dir': {},
+                },
+            });
+            const mockFileService = {
+                filterFiles: vi.fn((files) => files),
+            };
+            const config = createMockConfig(CWD, [], mockFileService);
+            const result = await readPathFromWorkspace('empty-dir', config);
+            expect(result).toEqual([
+                { text: '--- Start of content for directory: empty-dir ---\n' },
+                { text: '--- End of content for directory: empty-dir ---' },
+            ]);
+        });
+    });
+    describe('File Ignoring', () => {
+        it('should return an empty array for an ignored file', async () => {
+            mock({
+                [CWD]: {
+                    'ignored.txt': 'ignored content',
+                },
+            });
+            const mockFileService = {
+                filterFiles: vi.fn(() => []), // Simulate the file being filtered out
+            };
+            const config = createMockConfig(CWD, [], mockFileService);
+            const result = await readPathFromWorkspace('ignored.txt', config);
+            expect(result).toEqual([]);
+            expect(mockFileService.filterFiles).toHaveBeenCalledWith(['ignored.txt'], {
+                respectGitIgnore: true,
+                respectGeminiIgnore: true,
+            });
+        });
+        it('should not read ignored files when expanding a directory', async () => {
+            mock({
+                [CWD]: {
+                    'my-dir': {
+                        'not-ignored.txt': 'visible',
+                        'ignored.log': 'invisible',
+                    },
+                },
+            });
+            const mockFileService = {
+                filterFiles: vi.fn((files) => files.filter((f) => !f.endsWith('ignored.log'))),
+            };
+            const config = createMockConfig(CWD, [], mockFileService);
+            const result = await readPathFromWorkspace('my-dir', config);
+            const resultText = result
+                .map((p) => {
+                if (typeof p === 'string')
+                    return p;
+                if (typeof p === 'object' && p && 'text' in p)
+                    return p.text;
+                return '';
+            })
+                .join('');
+            expect(resultText).toContain('visible');
+            expect(resultText).not.toContain('invisible');
+            expect(mockFileService.filterFiles).toHaveBeenCalled();
+        });
+    });
+    it('should throw an error for an absolute path outside the workspace', async () => {
+        const absPath = path.join(OUTSIDE_DIR, 'secret.txt');
+        mock({
+            [CWD]: {},
+            [OUTSIDE_DIR]: {
+                'secret.txt': 'secrets',
+            },
+        });
+        // OUTSIDE_DIR is not added to the config's workspace
+        const config = createMockConfig(CWD);
+        await expect(readPathFromWorkspace(absPath, config)).rejects.toThrow(`Absolute path is outside of the allowed workspace: ${absPath}`);
+    });
+    it('should throw an error if a relative path is not found anywhere', async () => {
+        mock({
+            [CWD]: {},
+            [OTHER_DIR]: {},
+        });
+        const config = createMockConfig(CWD, [OTHER_DIR]);
+        await expect(readPathFromWorkspace('not-found.txt', config)).rejects.toThrow('Path not found in workspace: not-found.txt');
+    });
+    // mock-fs permission simulation is unreliable on Windows.
+    it.skipIf(process.platform === 'win32')('should return an error string if reading a file with no permissions', async () => {
+        mock({
+            [CWD]: {
+                'unreadable.txt': mock.file({
+                    content: 'you cannot read me',
+                    mode: 0o222, // Write-only
+                }),
+            },
+        });
+        const mockFileService = {
+            filterFiles: vi.fn((files) => files),
+        };
+        const config = createMockConfig(CWD, [], mockFileService);
+        // processSingleFileContent catches the error and returns an error string.
+        const result = await readPathFromWorkspace('unreadable.txt', config);
+        const textResult = result[0];
+        // processSingleFileContent formats errors using the relative path from the target dir (CWD).
+        expect(textResult).toContain('Error reading file unreadable.txt');
+        expect(textResult).toMatch(/(EACCES|permission denied)/i);
+    });
+    it('should return an error string for files exceeding the size limit', async () => {
+        // Mock a file slightly larger than the 20MB limit defined in fileUtils.ts
+        const largeContent = 'a'.repeat(21 * 1024 * 1024); // 21MB
+        mock({
+            [CWD]: {
+                'large.txt': largeContent,
+            },
+        });
+        const mockFileService = {
+            filterFiles: vi.fn((files) => files),
+        };
+        const config = createMockConfig(CWD, [], mockFileService);
+        const result = await readPathFromWorkspace('large.txt', config);
+        const textResult = result[0];
+        // The error message comes directly from processSingleFileContent
+        expect(textResult).toBe('File size exceeds the 20MB limit.');
+    });
+});
+//# sourceMappingURL=pathReader.test.js.map