genaicode 0.6.1 → 0.8.0

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

@@ -0,0 +1,242 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { executeStepEnsureContext } from './step-ensure-context';
+import { getSourceCode } from '../../files/read-files';
+import { putSystemMessage } from '../../main/common/content-bus';
+import { StepResult } from './steps-types';
+import '../../files/find-files.js';
+import { importantContext } from '../../main/config.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('../../main/config.js', () => ({
+    rootDir: '/test',
+    rcConfig: {
+        rootDir: '/test',
+        extensions: ['.js', '.ts', '.tsx', '.jsx'],
+    },
+    importantContext: {
+        files: ['/test/important.ts'],
+    },
+}));
+describe('executeStepEnsureContext', () => {
+    const mockOptions = {
+        aiService: 'vertex-ai',
+        askQuestion: false,
+    };
+    beforeEach(() => {
+        vi.clearAllMocks();
+        importantContext.files = ['/test/important.ts'];
+    });
+    describe('Path extraction from codegenSummary', () => {
+        it('should extract paths from fileUpdates and contextPaths', async () => {
+            const mockCodegenSummary = {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: '/test/file1.ts' }, { filePath: '/test/file2.ts' }],
+                    contextPaths: ['/test/context1.ts', '/test/context2.ts'],
+                    explanation: 'test',
+                },
+            };
+            vi.mocked(getSourceCode).mockReturnValue({
+                '/test/file1.ts': { content: 'content1' },
+                '/test/file2.ts': { content: 'content2' },
+                '/test/context1.ts': { content: 'context1' },
+                '/test/context2.ts': { content: 'context2' },
+                '/test/important.ts': { content: 'important' },
+            });
+            const prompt = [];
+            const result = await executeStepEnsureContext(prompt, mockCodegenSummary, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(getSourceCode).toHaveBeenCalledWith(expect.objectContaining({
+                filterPaths: expect.arrayContaining([
+                    '/test/file1.ts',
+                    '/test/file2.ts',
+                    '/test/context1.ts',
+                    '/test/context2.ts',
+                    '/test/important.ts',
+                ]),
+            }), mockOptions);
+        });
+        it('should handle empty fileUpdates and contextPaths', async () => {
+            importantContext.files = [];
+            const mockCodegenSummary = {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [],
+                    contextPaths: [],
+                    explanation: 'test',
+                },
+            };
+            vi.mocked(getSourceCode).mockReturnValue({});
+            const prompt = [];
+            const result = await executeStepEnsureContext(prompt, mockCodegenSummary, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(putSystemMessage).toHaveBeenCalledWith(expect.stringContaining('No paths to ensure'));
+        });
+    });
+    describe('Context checking in conversation', () => {
+        it('should identify files already in context', async () => {
+            const mockCodegenSummary = {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: '/test/file1.ts' }],
+                    contextPaths: ['/test/context1.ts'],
+                    explanation: 'test',
+                },
+            };
+            const prompt = [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify({
+                                '/test': {
+                                    'file1.ts': { content: 'existing content' },
+                                },
+                            }),
+                        },
+                    ],
+                },
+            ];
+            vi.mocked(getSourceCode).mockReturnValue({
+                '/test/context1.ts': { content: 'context1' },
+                '/test/important.ts': { content: 'important' },
+            });
+            const result = await executeStepEnsureContext(prompt, mockCodegenSummary, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(getSourceCode).toHaveBeenCalledWith(expect.objectContaining({
+                filterPaths: expect.arrayContaining(['/test/context1.ts', '/test/important.ts']),
+            }), mockOptions);
+        });
+        it('should handle both content and summary in context', async () => {
+            const mockCodegenSummary = {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: '/test/file1.ts' }],
+                    contextPaths: ['/test/context1.ts'],
+                    explanation: 'test',
+                },
+            };
+            const prompt = [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: JSON.stringify({
+                                '/test': {
+                                    'file1.ts': { content: 'existing content' },
+                                    'context1.ts': { summary: 'summary only' },
+                                },
+                            }),
+                        },
+                    ],
+                },
+            ];
+            vi.mocked(getSourceCode).mockReturnValue({
+                '/test/context1.ts': { content: 'context1' },
+                '/test/important.ts': { content: 'important' },
+            });
+            const result = await executeStepEnsureContext(prompt, mockCodegenSummary, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(getSourceCode).toHaveBeenCalledWith(expect.objectContaining({
+                filterPaths: expect.arrayContaining(['/test/context1.ts', '/test/important.ts']),
+            }), mockOptions);
+        });
+    });
+    describe('getSourceCode appending', () => {
+        it('should append getSourceCode call/response for missing files', async () => {
+            const mockCodegenSummary = {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: '/test/new1.ts' }],
+                    contextPaths: ['/test/new2.ts'],
+                    explanation: 'test',
+                },
+            };
+            const prompt = [];
+            vi.mocked(getSourceCode).mockReturnValue({
+                '/test/new1.ts': { content: 'new1' },
+                '/test/new2.ts': { content: 'new2' },
+                '/test/important.ts': { content: 'important' },
+            });
+            await executeStepEnsureContext(prompt, mockCodegenSummary, mockOptions);
+            expect(prompt).toHaveLength(2);
+            expect(prompt[0].type).toBe('assistant');
+            expect(prompt[0].functionCalls?.[0].name).toBe('getSourceCode');
+            expect(prompt[1].type).toBe('user');
+            expect(prompt[1].functionResponses?.[0].name).toBe('getSourceCode');
+            expect(JSON.parse(prompt[1].functionResponses?.[0].content ?? '')).toEqual({
+                '/test': {
+                    'new1.ts': { content: 'new1' },
+                    'new2.ts': { content: 'new2' },
+                    'important.ts': { content: 'important' },
+                },
+            });
+        });
+    });
+    describe('Edge cases and error handling', () => {
+        it('should handle invalid getSourceCode responses in context', async () => {
+            console.warn = vi.fn();
+            const mockCodegenSummary = {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: '/test/file1.ts' }],
+                    contextPaths: [],
+                    explanation: 'test',
+                },
+            };
+            const prompt = [
+                {
+                    type: 'user',
+                    functionResponses: [
+                        {
+                            name: 'getSourceCode',
+                            content: 'invalid json',
+                        },
+                    ],
+                },
+            ];
+            vi.mocked(getSourceCode).mockReturnValue({
+                '/test/file1.ts': { content: 'content1' },
+                '/test/important.ts': { content: 'important' },
+            });
+            const result = await executeStepEnsureContext(prompt, mockCodegenSummary, mockOptions);
+            expect(result).toBe(StepResult.CONTINUE);
+            expect(console.warn).toHaveBeenCalledWith('Failed to parse getSourceCode response:', expect.any(Error));
+        });
+        it('should handle missing args in codegenSummary', async () => {
+            const mockCodegenSummary = {
+                name: 'codegenSummary',
+                args: {},
+            };
+            const prompt = [];
+            const result = await executeStepEnsureContext(prompt, mockCodegenSummary, mockOptions);
+            expect(result).toEqual(StepResult.BREAK);
+        });
+        it('should handle getSourceCode errors', async () => {
+            const mockCodegenSummary = {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: '/test/file1.ts' }],
+                    contextPaths: [],
+                    explanation: 'test',
+                },
+            };
+            vi.mocked(getSourceCode).mockImplementation(() => {
+                throw new Error('Mock error');
+            });
+            const prompt = [];
+            const result = await executeStepEnsureContext(prompt, mockCodegenSummary, mockOptions);
+            expect(result).toBe(StepResult.BREAK);
+            expect(putSystemMessage).toHaveBeenCalledWith('Error: Context completeness check failed. This is unexpected.');
+        });
+    });
+});
+//# sourceMappingURL=step-ensure-context.test.js.map

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

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

@@ -1,8 +1,8 @@
 import { GenerateContentFunction } from '../../ai-service/common.js';
 import { CodegenOptions } from '../../main/codegen-types.js';
-import { SourceCodeMap } from '../../files/read-files.js';
+import { SourceCodeMap, DependencyInfo } from '../../files/read-files.js';
 export declare function summarizeSourceCode(generateContentFn: GenerateContentFunction, sourceCode: SourceCodeMap, options: CodegenOptions): Promise<void>;
 export declare function getSummary(filePath: string): {
+    dependencies: DependencyInfo[];
     summary: string;
-    tokenCount: number;
 } | undefined;

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

@@ -4,19 +4,48 @@ 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 SUMMARIZATION_PROMPT = `Your role is to summarize content of files in ${MAX_SUMMARY_TOKENS} tokens or fewer. 
-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.
+const MAX_SUMMARY_TOKENS = 10;
+const CACHE_VERSION = 'v6'; // Incremented version for dependency support
+const SUMMARIZATION_PROMPT = `Your role is to summarize content of files in ${MAX_SUMMARY_TOKENS} tokens or fewer while also detecting dependencies. 
+
+For the summary:
+- 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
+- The length of summary should be max ${MAX_SUMMARY_TOKENS} tokens
+
+For dependencies:
+- Identify all import and require statements in the code
+- Detect both local (relative) and external (package) dependencies
+- For local dependencies, include the full resolved path
+- For external dependencies, include the package name
+- Mark dependencies as either 'local' or 'external'
+- Include the original import path as provided in the code
+
+Provide your response using the \`setSummaries\` function with the following structure:
+{
+  "filePath": "absolute/path/to/file",
+  "summary": "concise summary",
+  "dependencies": [
+    {
+      "path": "resolved/path/or/package",
+      "type": "local|external",
+    }
+  ]
+}
+
 The file path must be absolute, exactly the same as you receive in the \`getSourceCode\` function responses.
 `;
-const summaryCache = readCache('summaries', { _version: CACHE_VERSION });
+const summaryCache = readCache('summaries', {
+    _version: CACHE_VERSION,
+});
 export async function summarizeSourceCode(generateContentFn, sourceCode, options) {
     const items = Object.entries(sourceCode).map(([path, file]) => ({
         path,
         content: 'content' in file ? file.content : null,
+        dependencies: 'dependencies' in file ? file.dependencies : undefined,
     }));
     await summarizeBatch(generateContentFn, items, options);
 }
@@ -50,11 +79,13 @@ async function summarizeBatch(generateContentFn, items, options) {
         result = await validateAndRecoverSingleResult(request, result, generateContentFn);
         const batchSummaries = parseSummarizationResult(result);
         batchSummaries.forEach((file) => {
-            const content = items.find((item) => item.path === file.filePath)?.content ?? '';
+            const item = items.find((item) => item.path === file.filePath);
+            const content = item?.content ?? '';
             summaryCache[file.filePath] = {
                 tokenCount: estimateTokenCount(content),
                 summary: file.summary,
                 checksum: md5(content),
+                dependencies: file.dependencies ?? item?.dependencies ?? [],
             };
         });
     }
@@ -70,6 +101,11 @@ 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,
+            ...(summary.dependencies && { dependencies: summary.dependencies }),
+        }
+        : 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/steps/steps-types.d.ts

@@ -1,3 +1,4 @@
+import { DependencyInfo } from '../../files/read-files';
 export declare enum StepResult {
     CONTINUE = 0,
     BREAK = 1
@@ -11,6 +12,7 @@ export type SummaryCache = Record<string, {
     tokenCount: number;
     summary: string;
     checksum: string;
+    dependencies: DependencyInfo[];
 }> & {
     _version: string;
 };

package/dist/prompt/steps/steps-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"steps-types.js","sourceRoot":"","sources":["../../../src/prompt/steps/steps-types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,mDAAQ,CAAA;IACR,6CAAK,CAAA;AACP,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}
+{"version":3,"file":"steps-types.js","sourceRoot":"","sources":["../../../src/prompt/steps/steps-types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,mDAAQ,CAAA;IACR,6CAAK,CAAA;AACP,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}

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;