genaicode 0.6.1 → 0.7.0

package/dist/prompt/steps/step-context-optimization.test.js

@@ -0,0 +1,456 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { executeStepContextOptimization } from './step-context-optimization';
+import { getSourceCode } from '../../files/read-files';
+import { StepResult } from './steps-types';
+import { putSystemMessage } from '../../main/common/content-bus';
+import '../../main/config.js';
+import '../../files/find-files.js';
+// Mock dependencies
+vi.mock('../../files/read-files');
+vi.mock('../../files/find-files.js', () => ({
+    getSourceFiles: () => [],
+    getImageAssetFiles: () => [],
+    refreshFiles: () => null,
+}));
+vi.mock('../../main/common/content-bus');
+vi.mock('../token-estimator', () => ({
+    estimateTokenCount: vi.fn((content) => {
+        // Simple mock implementation that returns length of content as token count
+        return content ? content.length : 0;
+    }),
+}));
+vi.mock('./step-summarization', () => ({
+    getSummary: vi.fn().mockReturnValue({ summary: 'Test summary' }),
+}));
+vi.mock('../../main/config.js', () => ({
+    rootDir: '/test',
+    rcConfig: {
+        rootDir: '/test',
+        extensions: ['.js', '.ts', '.tsx', '.jsx'],
+    },
+    importantContext: {},
+    sourceExtensions: ['.ts'],
+}));
+describe('executeStepContextOptimization', () => {
+    const mockGenerateContentFn = vi.fn();
+    const mockOptions = {
+        aiService: 'vertex-ai',
+    };
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockGenerateContentFn.mockReset();
+    });
+    describe('Source code tree transformation', () => {
+        it('should correctly transform source code between flat and tree structures', async () => {
+            // Mock source code data
+            const mockSourceCode = {
+                '/test/file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+                '/test/file2.ts': { content: 'content2' },
+            };
+            const mockSourceCodeTree = {
+                '/test': {
+                    'file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+                    'file2.ts': { content: 'content2' },
+                },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+            // Mock optimization response with high relevance scores
+            mockGenerateContentFn.mockResolvedValueOnce([
+                {
+                    name: 'optimizeContext',
+                    args: {
+                        userPrompt: 'test prompt',
+                        optimizedContext: [
+                            { filePath: '/test/file1.ts', relevance: 0.9 },
+                            { filePath: '/test/file2.ts', relevance: 0.8 },
+                        ],
+                    },
+                },
+            ]);
+            const result = await executeStepContextOptimization(mockGenerateContentFn, [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify(mockSourceCodeTree),
+                        },
+                    ],
+                },
+            ], mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(putSystemMessage).toHaveBeenCalledWith('Context optimization in progress.', expect.arrayContaining([
+                ['/test/file1.ts', 0.9],
+                ['/test/file2.ts', 0.8],
+            ]));
+        });
+        it('should handle empty source code tree', async () => {
+            const emptySourceCode = {};
+            const emptySourceCodeTree = {};
+            vi.mocked(getSourceCode).mockReturnValue(emptySourceCode);
+            mockGenerateContentFn.mockResolvedValueOnce([
+                {
+                    name: 'optimizeContext',
+                    args: {
+                        userPrompt: 'test prompt',
+                        optimizedContext: [],
+                    },
+                },
+            ]);
+            const result = await executeStepContextOptimization(mockGenerateContentFn, [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify(emptySourceCodeTree),
+                        },
+                    ],
+                },
+            ], mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(putSystemMessage).toHaveBeenCalledWith('Context optimization is not needed, because the code base is small.');
+        });
+    });
+    describe('Multiple getSourceCode responses handling', () => {
+        it('should clear previous getSourceCode responses while preserving structure', async () => {
+            const mockSourceCode = {
+                '/test/file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+            };
+            const mockSourceCodeTree = {
+                '/test': {
+                    'file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+                },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+            mockGenerateContentFn.mockResolvedValueOnce([
+                {
+                    name: 'optimizeContext',
+                    args: {
+                        userPrompt: 'test prompt',
+                        optimizedContext: [{ filePath: '/test/file1.ts', relevance: 0.9 }],
+                    },
+                },
+            ]);
+            const prompt = [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify({ '/test': { 'old-file.ts': { content: 'old content' } } }),
+                        },
+                    ],
+                },
+                {
+                    type: 'assistant',
+                    text: 'Some response',
+                },
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify(mockSourceCodeTree),
+                        },
+                    ],
+                },
+            ];
+            const result = await executeStepContextOptimization(mockGenerateContentFn, prompt, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            // Verify that previous responses were cleared
+            expect(JSON.parse(prompt[0].functionResponses[0].content)).toEqual({});
+            // Verify that structure was preserved
+            expect(prompt[0].type).toBe('user');
+            expect(prompt[0].functionResponses[0].name).toBe('getSourceCode');
+            // Verify that non-getSourceCode items were preserved
+            expect(prompt[1].type).toBe('assistant');
+            expect(prompt[1].text).toBe('Some response');
+        });
+        it('should handle multiple responses with different content', async () => {
+            const mockSourceCode = {
+                '/test/file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+                '/test/file2.ts': { content: 'content2' },
+            };
+            const mockSourceCodeTree = {
+                '/test': {
+                    'file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+                    'file2.ts': { content: 'content2' },
+                },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+            mockGenerateContentFn.mockResolvedValueOnce([
+                {
+                    name: 'optimizeContext',
+                    args: {
+                        userPrompt: 'test prompt',
+                        optimizedContext: [
+                            { filePath: '/test/file1.ts', relevance: 0.9 },
+                            { filePath: '/test/file2.ts', relevance: 0.8 },
+                        ],
+                    },
+                },
+            ]);
+            const prompt = [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify({ '/test': { 'file1.ts': { content: 'old content 1' } } }),
+                        },
+                    ],
+                },
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify({ '/test': { 'file2.ts': { content: 'old content 2' } } }),
+                        },
+                    ],
+                },
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify(mockSourceCodeTree),
+                        },
+                    ],
+                },
+            ];
+            const result = await executeStepContextOptimization(mockGenerateContentFn, prompt, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            // Verify that all previous responses were cleared
+            prompt.slice(0, -1).forEach((item) => {
+                if (item.type === 'user' && item.functionResponses) {
+                    const response = item.functionResponses.find((r) => r.name === 'getSourceCode');
+                    expect(JSON.parse(response.content)).toEqual({});
+                }
+            });
+        });
+        it('should handle edge case with no getSourceCode responses', async () => {
+            const mockSourceCode = {
+                '/test/file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+            const prompt = [
+                {
+                    type: 'user',
+                    text: 'Some user message',
+                },
+                {
+                    type: 'assistant',
+                    text: 'Some assistant response',
+                },
+            ];
+            const result = await executeStepContextOptimization(mockGenerateContentFn, prompt, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            // Verify that the prompt structure remains unchanged
+            expect(prompt).toHaveLength(2);
+            expect(prompt[0].type).toBe('user');
+            expect(prompt[0].text).toBe('Some user message');
+            expect(prompt[1].type).toBe('assistant');
+            expect(prompt[1].text).toBe('Some assistant response');
+        });
+        it('should handle edge case with empty functionResponses', async () => {
+            const mockSourceCode = {
+                '/test/file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+            const prompt = [
+                {
+                    type: 'user',
+                    functionResponses: [],
+                },
+                {
+                    type: 'user',
+                    functionResponses: undefined,
+                },
+            ];
+            const result = await executeStepContextOptimization(mockGenerateContentFn, prompt, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            // Verify that the prompt structure remains unchanged
+            expect(prompt).toHaveLength(2);
+            expect(prompt[0].type).toBe('user');
+            expect(prompt[0].functionResponses).toEqual([]);
+            expect(prompt[1].type).toBe('user');
+            expect(prompt[1].functionResponses).toBeUndefined();
+        });
+    });
+    describe('Context optimization process', () => {
+        it('should optimize context based on relevance scores', async () => {
+            const mockSourceCode = {
+                '/test/high-relevance.ts': { content: 'important content' + Array.from(Array(10000).keys()).join(',') },
+                '/test/medium-relevance.ts': { content: 'somewhat important' },
+                '/test/low-relevance.ts': { content: 'not important' },
+            };
+            const mockSourceCodeTree = {
+                '/test': {
+                    'high-relevance.ts': { content: 'important content' },
+                    'medium-relevance.ts': { content: 'somewhat important' },
+                    'low-relevance.ts': { content: 'not important' },
+                },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+            mockGenerateContentFn.mockResolvedValueOnce([
+                {
+                    name: 'optimizeContext',
+                    args: {
+                        userPrompt: 'test prompt',
+                        optimizedContext: [
+                            { filePath: '/test/high-relevance.ts', relevance: 0.9 },
+                            { filePath: '/test/medium-relevance.ts', relevance: 0.6 },
+                            { filePath: '/test/low-relevance.ts', relevance: 0.2 },
+                        ],
+                    },
+                },
+            ]);
+            const result = await executeStepContextOptimization(mockGenerateContentFn, [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify(mockSourceCodeTree),
+                        },
+                    ],
+                },
+            ], mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(putSystemMessage).toHaveBeenCalledWith('Context optimization in progress.', expect.arrayContaining([
+                ['/test/high-relevance.ts', 0.9],
+                ['/test/medium-relevance.ts', 0.6],
+            ]));
+            // Low relevance file should not be included
+            expect(putSystemMessage).not.toHaveBeenCalledWith('Context optimization in progress.', expect.arrayContaining(['/test/low-relevance.ts', 0.2]));
+        });
+        it('should handle optimization failure gracefully', async () => {
+            const mockSourceCode = {
+                '/test/file.ts': { content: 'test content'.repeat(1000) }, // Make it large enough to trigger optimization
+            };
+            const mockSourceCodeTree = {
+                '/test': {
+                    'file.ts': { content: 'test content'.repeat(1000) },
+                },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+            mockGenerateContentFn.mockResolvedValueOnce([
+                {
+                    name: 'optimizeContext',
+                    args: {
+                        userPrompt: 'test prompt',
+                        optimizedContext: [], // Empty context indicates optimization failure
+                    },
+                },
+            ]);
+            const result = await executeStepContextOptimization(mockGenerateContentFn, [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify(mockSourceCodeTree),
+                        },
+                    ],
+                },
+            ], mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(putSystemMessage).toHaveBeenCalledWith('Warning: Context optimization failed to produce useful summaries for all batches. Proceeding with current context.');
+        });
+    });
+    describe('Edge cases and error handling', () => {
+        beforeEach(() => {
+            const mockSourceCode = {
+                '/test/file1.ts': { content: 'content1' + Array.from(Array(10000).keys()).join(',') },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+        });
+        it('should handle missing source code response', async () => {
+            const result = await executeStepContextOptimization(mockGenerateContentFn, [], // Empty prompt array
+            mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(putSystemMessage).not.toHaveBeenCalledWith('Context optimization in progress.');
+        });
+        it('should handle invalid JSON in source code response', async () => {
+            await expect(executeStepContextOptimization(mockGenerateContentFn, [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: 'invalid json',
+                        },
+                    ],
+                },
+            ], mockOptions)).rejects.toThrow('Unexpected token');
+        });
+        it('should handle errors during optimization process', async () => {
+            vi.mocked(getSourceCode).mockImplementation(() => {
+                throw new Error('Unexpected error');
+            });
+            await expect(executeStepContextOptimization(mockGenerateContentFn, [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: '{}',
+                        },
+                    ],
+                },
+            ], mockOptions)).rejects.toThrow('Unexpected error');
+        });
+    });
+    describe('Token count handling', () => {
+        it('should respect MAX_TOTAL_TOKENS limit', async () => {
+            // Create source code that exceeds token limit
+            const largeContent = 'a'.repeat(12000); // Exceeds MAX_TOTAL_TOKENS (10000)
+            const smallContent = 'b'.repeat(3000);
+            const mockSourceCode = {
+                '/test/large-file.ts': { content: largeContent },
+                '/test/small-file.ts': { content: smallContent },
+            };
+            const mockSourceCodeTree = {
+                '/test': {
+                    'large-file.ts': { content: largeContent },
+                    'small-file.ts': { content: smallContent },
+                },
+            };
+            vi.mocked(getSourceCode).mockReturnValue(mockSourceCode);
+            mockGenerateContentFn.mockResolvedValueOnce([
+                {
+                    name: 'optimizeContext',
+                    args: {
+                        userPrompt: 'test prompt',
+                        optimizedContext: [
+                            { filePath: '/test/large-file.ts', relevance: 0.9 },
+                            { filePath: '/test/small-file.ts', relevance: 0.8 },
+                        ],
+                    },
+                },
+            ]);
+            const result = await executeStepContextOptimization(mockGenerateContentFn, [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify(mockSourceCodeTree),
+                        },
+                    ],
+                },
+            ], mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(putSystemMessage).toHaveBeenCalledWith('Context optimization completed successfully.', expect.objectContaining({
+                tokensBefore: expect.any(Number),
+                tokensAfter: expect.any(Number),
+                contentTokenCount: expect.any(Number),
+                summaryTokenCount: expect.any(Number),
+                percentageReduced: expect.stringContaining('%'),
+            }));
+        });
+    });
+});
+//# sourceMappingURL=step-context-optimization.test.js.map

package/dist/prompt/steps/step-context-optimization.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"step-context-optimization.test.js","sourceRoot":"","sources":["../../../src/prompt/steps/step-context-optimization.test.ts"],"names":[],"mappings":"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"}

package/dist/prompt/steps/step-generate-image.d.ts

@@ -1,2 +1,9 @@
 import { FunctionCall, GenerateImageFunction } from '../../ai-service/common.js';
-export declare function executeStepGenerateImage(generateImageFn: GenerateImageFunction, generateImageCall: FunctionCall): Promise<FunctionCall>;
+export declare function executeStepGenerateImage(generateImageFn: GenerateImageFunction, generateImageCall: FunctionCall): Promise<FunctionCall<{
+    filePath: string;
+    downloadUrl: string;
+    explanation: string;
+} | {
+    text: string;
+    downloadUrl: undefined;
+}>>;

package/dist/prompt/steps/step-generate-image.js

@@ -22,6 +22,7 @@ export async function executeStepGenerateImage(generateImageFn, generateImageCal
             name: 'explanation',
             args: {
                 text: `Failed to generate image: ${error.message}`,
+                downloadUrl: undefined,
             },
         };
     }

package/dist/prompt/steps/step-generate-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"step-generate-image.js","sourceRoot":"","sources":["../../../src/prompt/steps/step-generate-image.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,eAAsC,EACtC,iBAA+B;IAE/B,MAAM,CAAC,CAAC,CAAC,eAAe,EAAE,8EAA8E,CAAC,CAAC;IAE1G,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAE5E,IAAI,CAAC;QACH,MAAM,EACJ,MAAM,EAAE,WAAW,EACnB,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,MAAM,EACN,KAAK,GACN,GAAG,iBAAiB,CAAC,IAOrB,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC;QAElH,iFAAiF;QACjF,OAAO;YACL,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE;gBACJ,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,iBAAiB;gBAC9B,WAAW,EAAE,6BAA6B;aAC3C;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;QAChD,uDAAuD;QACvD,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE;gBACJ,IAAI,EAAE,6BAA8B,KAAe,CAAC,OAAO,EAAE;aAC9D;SACF,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"step-generate-image.js","sourceRoot":"","sources":["../../../src/prompt/steps/step-generate-image.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,eAAsC,EACtC,iBAA+B;IAc/B,MAAM,CAAC,CAAC,CAAC,eAAe,EAAE,8EAA8E,CAAC,CAAC;IAE1G,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAE5E,IAAI,CAAC;QACH,MAAM,EACJ,MAAM,EAAE,WAAW,EACnB,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,MAAM,EACN,KAAK,GACN,GAAG,iBAAiB,CAAC,IAOrB,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC;QAElH,iFAAiF;QACjF,OAAO;YACL,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE;gBACJ,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,iBAAiB;gBAC9B,WAAW,EAAE,6BAA6B;aAC3C;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;QAChD,uDAAuD;QACvD,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE;gBACJ,IAAI,EAAE,6BAA8B,KAAe,CAAC,OAAO,EAAE;gBAC7D,WAAW,EAAE,SAAS;aACvB;SACF,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/prompt/steps/step-summarization.d.ts

@@ -4,5 +4,4 @@ import { SourceCodeMap } from '../../files/read-files.js';
 export declare function summarizeSourceCode(generateContentFn: GenerateContentFunction, sourceCode: SourceCodeMap, options: CodegenOptions): Promise<void>;
 export declare function getSummary(filePath: string): {
     summary: string;
-    tokenCount: number;
 } | undefined;

package/dist/prompt/steps/step-summarization.js

@@ -4,9 +4,12 @@ import { putSystemMessage } from '../../main/common/content-bus.js';
 import { estimateTokenCount } from '../token-estimator.js';
 import { validateAndRecoverSingleResult } from './step-validate-recover.js';
 const BATCH_SIZE = 50;
-const MAX_SUMMARY_TOKENS = 15;
-const CACHE_VERSION = 'v2';
+const MAX_SUMMARY_TOKENS = 10;
+const CACHE_VERSION = 'v4';
 const SUMMARIZATION_PROMPT = `Your role is to summarize content of files in ${MAX_SUMMARY_TOKENS} tokens or fewer. 
+Fit as much information as possible given the limit, the summary must be understandable for LLM, does not need to be human readable.
+Include as much key information as possible, even if readability and style are sacrificed.
+Do not include information if they can be already derived from the file name or file path.
 Focus on the main purpose or functionality. 
 Provide your response using the \`setSummaries\` function.
 The length of summary should be max ${MAX_SUMMARY_TOKENS} tokens.
@@ -70,6 +73,6 @@ function parseSummarizationResult(result) {
 }
 export function getSummary(filePath) {
     const summary = summaryCache[filePath];
-    return summary ? { summary: summary.summary, tokenCount: summary.tokenCount } : undefined;
+    return summary ? { summary: summary.summary } : undefined;
 }
 //# sourceMappingURL=step-summarization.js.map

package/dist/prompt/steps/step-summarization.js.map

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

package/dist/prompt/steps/step-validate-recover.js

@@ -16,27 +16,36 @@ export async function validateAndRecoverSingleResult([prompt, functionDefs, requ
                 requiredFunctionName = 'updateFile';
             }
         }
-        prompt.push({ type: 'assistant', functionCalls: [call] }, {
-            type: 'user',
-            text: 'Function call was invalid, please analyze the error and respond with corrected function call.',
-            functionResponses: [
-                {
-                    name: call.name,
-                    call_id: call.id,
-                    content: JSON.stringify({ args: call.args, error: validatorError }),
-                    isError: true,
-                },
-            ],
-        });
+        prompt = [
+            ...prompt,
+            { type: 'assistant', functionCalls: [call] },
+            {
+                type: 'user',
+                text: 'Function call was invalid, please analyze the error and respond with corrected function call.',
+                functionResponses: [
+                    {
+                        name: call.name,
+                        call_id: call.id,
+                        content: JSON.stringify({ args: call.args, error: validatorError }),
+                        isError: true,
+                    },
+                ],
+            },
+        ];
         console.log('Trying to recover...');
         if (cheap) {
             console.log('Disabling --cheap for recovery.');
         }
-        result = await generateContentFn(prompt, functionDefs, requiredFunctionName, temperature, false, options);
+        result = await generateContentFn(prompt, functionDefs, requiredFunctionName, temperature, true, options);
         console.log('Recover result:', result);
         if (result?.length === 1) {
-            const recoveryError = validateFunctionCall(result[0], requiredFunctionName);
-            assert(!recoveryError, 'Recovery failed');
+            let recoveryError = validateFunctionCall(result[0], requiredFunctionName);
+            if (recoveryError) {
+                console.log("Use more expensive recovery method, because we couldn't recover.");
+                result = await generateContentFn(prompt, functionDefs, requiredFunctionName, temperature, false, options);
+                recoveryError = validateFunctionCall(result?.[0], requiredFunctionName);
+                assert(!recoveryError, 'Recovery failed');
+            }
             console.log('Recovery was successful');
         }
         else if (result?.length === 0) {

package/dist/prompt/steps/step-validate-recover.js.map

@@ -1 +1 @@
-{"version":3,"file":"step-validate-recover.js","sourceRoot":"","sources":["../../../src/prompt/steps/step-validate-recover.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,CAAC,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAsB,EAC9F,MAAsB,EACtB,iBAA0C;IAE1C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC/C,mBAAmB;QACnB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,IAAI,GAA6B,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IACxE,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;YACtC,IAAI,oBAAoB,KAAK,WAAW,EAAE,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;gBACjD,oBAAoB,GAAG,YAAY,CAAC;YACtC,CAAC;QACH,CAAC;QAED,MAAM,CAAC,IAAI,CACT,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,IAAI,CAAC,EAAE,EAC5C;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,+FAA+F;YACrG,iBAAiB,EAAE;gBACjB;oBACE,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,OAAO,EAAE,IAAI,CAAC,EAAE;oBAChB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;oBACnE,OAAO,EAAE,IAAI;iBACd;aACF;SACF,CACF,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QACpC,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC1G,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAEvC,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAC5E,MAAM,CAAC,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACzC,CAAC;aAAM,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"step-validate-recover.js","sourceRoot":"","sources":["../../../src/prompt/steps/step-validate-recover.ts"],"names":[],"mappings":"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"}

package/dist/prompt/systemprompt.d.ts

@@ -1,3 +1,3 @@
 import { CodegenOptions } from '../main/codegen-types.js';
-/** Generates a system prompt */
-export declare function getSystemPrompt({ verbose, askQuestion, interactive, ui }: CodegenOptions): string;
+/** Generates a system prompt with the codegen prompt merged */
+export declare function getSystemPrompt(options: CodegenOptions): string;