genaicode 0.6.0 → 0.7.0

package/dist/prompt/prompt-service.context-optimization.test.js

@@ -0,0 +1,212 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { promptService } from './prompt-service.js';
+import * as vertexAi from '../ai-service/vertex-ai.js';
+import * as vertexAiClaude from '../ai-service/vertex-ai-claude.js';
+import * as chatGpt from '../ai-service/chat-gpt.js';
+import * as anthropic from '../ai-service/anthropic.js';
+import * as cliParams from '../cli/cli-params.js';
+import * as dalleService from '../ai-service/dall-e.js';
+import * as vertexAiImagen from '../ai-service/vertex-ai-imagen.js';
+import { getCodeGenPrompt } from './prompt-codegen.js';
+import { mockData, mockResponses, testConfigs } from './prompt-service.test-utils.js';
+// Mock all external dependencies
+vi.mock('../ai-service/vertex-ai-claude.js', () => ({ generateContent: vi.fn() }));
+vi.mock('../ai-service/vertex-ai.js', () => ({ generateContent: vi.fn() }));
+vi.mock('../ai-service/chat-gpt.js', () => ({ generateContent: vi.fn() }));
+vi.mock('../ai-service/anthropic.js', () => ({ generateContent: vi.fn() }));
+vi.mock('../ai-service/dall-e.js', () => ({ generateImage: vi.fn() }));
+vi.mock('../ai-service/vertex-ai-imagen.js', () => ({ generateImage: vi.fn() }));
+vi.mock('../cli/cli-params.js', () => ({
+    disableExplanations: true,
+    explicitPrompt: false,
+    allowFileCreate: false,
+    allowFileDelete: false,
+    allowDirectoryCreate: false,
+    allowFileMove: false,
+    verbosePrompt: false,
+    disableContextOptimization: false,
+    vision: false,
+    imagen: false,
+    temperature: 0.7,
+    cheap: false,
+    askQuestion: false,
+}));
+vi.mock('../files/cache-file.js');
+vi.mock('../files/find-files.js', () => ({
+    getSourceFiles: () => [],
+    getImageAssetFiles: () => [],
+}));
+vi.mock('../files/read-files.js', () => ({
+    getSourceCode: () => ({}),
+    getImageAssets: vi.fn(() => ({})),
+}));
+vi.mock('../main/config.js', () => ({
+    rootDir: '/mocked/root/dir',
+    rcConfig: {
+        rootDir: '/mocked/root/dir',
+        extensions: ['.js', '.ts', '.tsx', '.jsx'],
+    },
+    importantContext: {},
+}));
+const GENERATE_CONTENT_FNS = {
+    'vertex-ai-claude': vertexAiClaude.generateContent,
+    'vertex-ai': vertexAi.generateContent,
+    'ai-studio': vertexAi.generateContent,
+    anthropic: anthropic.generateContent,
+    'chat-gpt': chatGpt.generateContent,
+};
+const GENERATE_IMAGE_FNS = {
+    'dall-e': dalleService.generateImage,
+    'vertex-ai': vertexAiImagen.generateImage,
+};
+describe('promptService - Context Optimization', () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+        vi.mocked(cliParams).dryRun = false;
+        vi.mocked(cliParams).vision = false;
+        vi.mocked(cliParams).imagen = undefined;
+        vi.mocked(cliParams).explicitPrompt = 'testx';
+    });
+    it('should handle context optimization when enabled', async () => {
+        vi.mocked(cliParams).aiService = 'vertex-ai';
+        vi.mocked(cliParams).disableContextOptimization = false;
+        const mockCodegenSummary = [
+            {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: mockData.paths.test, updateToolName: 'updateFile', prompt: 'Generate file' }],
+                    contextPaths: [mockData.paths.context1, mockData.paths.context2],
+                    explanation: 'Mock summary with context',
+                },
+            },
+        ];
+        // Setup mocks for the entire flow
+        vi.mocked(vertexAi.generateContent)
+            // First mock for codegenPlanning
+            .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+            // Second mock for codegenSummary
+            .mockResolvedValueOnce(mockCodegenSummary)
+            // Third mock for the actual update
+            .mockResolvedValueOnce(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("Updated with context");'));
+        await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({
+            ...testConfigs.baseConfig,
+            disableContextOptimization: false,
+        }));
+        expect(vertexAi.generateContent).toHaveBeenCalledTimes(3);
+        const firstCall = vi.mocked(vertexAi.generateContent).mock.calls[0];
+        expect(firstCall[0]).toEqual(expect.arrayContaining([
+            expect.objectContaining({
+                type: 'user',
+                functionResponses: [
+                    expect.objectContaining({
+                        name: 'getSourceCode',
+                        content: expect.any(String),
+                    }),
+                ],
+            }),
+        ]));
+    });
+    it('should not include context paths when context optimization is disabled', async () => {
+        vi.mocked(cliParams).aiService = 'vertex-ai';
+        vi.mocked(cliParams).disableContextOptimization = true;
+        const mockCodegenSummary = [
+            {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: mockData.paths.test, updateToolName: 'updateFile', prompt: 'Generate file' }],
+                    contextPaths: [mockData.paths.context1, mockData.paths.context2],
+                    explanation: 'Mock summary without context optimization',
+                },
+            },
+        ];
+        // Setup mocks for the entire flow
+        vi.mocked(vertexAi.generateContent)
+            // First mock for codegenPlanning
+            .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+            // Second mock for codegenSummary
+            .mockResolvedValueOnce(mockCodegenSummary)
+            // Third mock for the actual update
+            .mockResolvedValueOnce(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("Updated without context optimization");'));
+        await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({
+            ...testConfigs.baseConfig,
+            disableContextOptimization: true,
+        }));
+        expect(vertexAi.generateContent).toHaveBeenCalledTimes(3);
+        const firstCall = vi.mocked(vertexAi.generateContent).mock.calls[0];
+        expect(firstCall[0]).not.toEqual(expect.arrayContaining([
+            expect.objectContaining({
+                type: 'user',
+                functionResponses: [
+                    expect.objectContaining({
+                        name: 'getSourceCode',
+                        content: expect.stringContaining('context1.js'),
+                    }),
+                ],
+            }),
+        ]));
+    });
+    it('should handle context optimization with multiple file updates', async () => {
+        vi.mocked(cliParams).aiService = 'vertex-ai';
+        vi.mocked(cliParams).disableContextOptimization = false;
+        const mockCodegenSummary = [
+            {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [
+                        { filePath: `${mockData.paths.root}/test1.js`, updateToolName: 'updateFile', prompt: 'Generate file 1' },
+                        { filePath: `${mockData.paths.root}/test2.js`, updateToolName: 'updateFile', prompt: 'Generate file 2' },
+                    ],
+                    contextPaths: [mockData.paths.context1, mockData.paths.context2],
+                    explanation: 'Mock summary with multiple files',
+                },
+            },
+        ];
+        // Setup mocks for the entire flow
+        vi.mocked(vertexAi.generateContent)
+            // First mock for codegenPlanning
+            .mockResolvedValueOnce(mockResponses.mockPlanningResponse(`${mockData.paths.root}/test1.js`))
+            // Second mock for codegenSummary
+            .mockResolvedValueOnce(mockCodegenSummary)
+            // Third and fourth mocks for the actual updates
+            .mockResolvedValueOnce(mockResponses.mockUpdateFile(`${mockData.paths.root}/test1.js`, 'console.log("File 1");'))
+            .mockResolvedValueOnce(mockResponses.mockUpdateFile(`${mockData.paths.root}/test2.js`, 'console.log("File 2");'));
+        const result = await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({
+            ...testConfigs.baseConfig,
+            disableContextOptimization: false,
+        }));
+        expect(vertexAi.generateContent).toHaveBeenCalledTimes(4);
+        expect(result).toEqual([
+            ...mockResponses.mockUpdateFile(`${mockData.paths.root}/test1.js`, 'console.log("File 1");'),
+            ...mockResponses.mockUpdateFile(`${mockData.paths.root}/test2.js`, 'console.log("File 2");'),
+        ]);
+    });
+    it('should handle empty context paths array', async () => {
+        vi.mocked(cliParams).aiService = 'vertex-ai';
+        vi.mocked(cliParams).disableContextOptimization = false;
+        const mockCodegenSummary = [
+            {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [{ filePath: mockData.paths.test, updateToolName: 'updateFile', prompt: 'Generate file' }],
+                    contextPaths: [], // Empty context paths
+                    explanation: 'Mock summary with no context',
+                },
+            },
+        ];
+        // Setup mocks for the entire flow
+        vi.mocked(vertexAi.generateContent)
+            // First mock for codegenPlanning
+            .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+            // Second mock for codegenSummary
+            .mockResolvedValueOnce(mockCodegenSummary)
+            // Third mock for the actual update
+            .mockResolvedValueOnce(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("No context needed");'));
+        const result = await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({
+            ...testConfigs.baseConfig,
+            disableContextOptimization: false,
+        }));
+        expect(vertexAi.generateContent).toHaveBeenCalledTimes(3);
+        expect(result).toEqual(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("No context needed");'));
+    });
+});
+//# sourceMappingURL=prompt-service.context-optimization.test.js.map

package/dist/prompt/prompt-service.context-optimization.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-service.context-optimization.test.js","sourceRoot":"","sources":["../../src/prompt/prompt-service.context-optimization.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,cAAc,MAAM,mCAAmC,CAAC;AACpE,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,YAAY,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,cAAc,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAEtF,iCAAiC;AACjC,EAAE,CAAC,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACnF,EAAE,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AAC5E,EAAE,CAAC,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3E,EAAE,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AAC5E,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACvE,EAAE,CAAC,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACjF,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,mBAAmB,EAAE,IAAI;IACzB,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,KAAK;IACtB,eAAe,EAAE,KAAK;IACtB,oBAAoB,EAAE,KAAK;IAC3B,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,0BAA0B,EAAE,KAAK;IACjC,MAAM,EAAE,KAAK;IACb,MAAM,EAAE,KAAK;IACb,WAAW,EAAE,GAAG;IAChB,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAClC,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,cAAc,EAAE,GAAG,EAAE,CAAC,EAAE;IACxB,kBAAkB,EAAE,GAAG,EAAE,CAAC,EAAE;CAC7B,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IACzB,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;CAClC,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,OAAO,EAAE,kBAAkB;IAC3B,QAAQ,EAAE;QACR,OAAO,EAAE,kBAAkB;QAC3B,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC;KAC3C;IACD,gBAAgB,EAAE,EAAE;CACrB,CAAC,CAAC,CAAC;AAEJ,MAAM,oBAAoB,GAAmD;IAC3E,kBAAkB,EAAE,cAAc,CAAC,eAAe;IAClD,WAAW,EAAE,QAAQ,CAAC,eAAe;IACrC,WAAW,EAAE,QAAQ,CAAC,eAAe;IACrC,SAAS,EAAE,SAAS,CAAC,eAAe;IACpC,UAAU,EAAE,OAAO,CAAC,eAAe;CAC3B,CAAC;AAEX,MAAM,kBAAkB,GAA8C;IACpE,QAAQ,EAAE,YAAY,CAAC,aAAa;IACpC,WAAW,EAAE,cAAc,CAAC,aAAa;CACjC,CAAC;AAEX,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;IACpD,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC;QACpC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC;QACpC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC;QACxC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,cAAc,GAAG,OAAO,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,GAAG,WAAW,CAAC;QAC7C,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,0BAA0B,GAAG,KAAK,CAAC;QAExD,MAAM,kBAAkB,GAAG;YACzB;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE;oBACJ,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;oBACvG,YAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;oBAChE,WAAW,EAAE,2BAA2B;iBACzC;aACF;SACF,CAAC;QAEF,kCAAkC;QAClC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;YACjC,iCAAiC;aAChC,qBAAqB,CAAC,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/E,iCAAiC;aAChC,qBAAqB,CAAC,kBAAkB,CAAC;YAC1C,mCAAmC;aAClC,qBAAqB,CAAC,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,sCAAsC,CAAC,CAAC,CAAC;QAEpH,MAAM,aAAa,CACjB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,CAAC;YACf,GAAG,WAAW,CAAC,UAAU;YACzB,0BAA0B,EAAE,KAAK;SAClC,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC1B,MAAM,CAAC,eAAe,CAAC;YACrB,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,MAAM;gBACZ,iBAAiB,EAAE;oBACjB,MAAM,CAAC,gBAAgB,CAAC;wBACtB,IAAI,EAAE,eAAe;wBACrB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;qBAC5B,CAAC;iBACH;aACF,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;QACtF,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,GAAG,WAAW,CAAC;QAC7C,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,0BAA0B,GAAG,IAAI,CAAC;QAEvD,MAAM,kBAAkB,GAAG;YACzB;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE;oBACJ,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;oBACvG,YAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;oBAChE,WAAW,EAAE,2CAA2C;iBACzD;aACF;SACF,CAAC;QAEF,kCAAkC;QAClC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;YACjC,iCAAiC;aAChC,qBAAqB,CAAC,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/E,iCAAiC;aAChC,qBAAqB,CAAC,kBAAkB,CAAC;YAC1C,mCAAmC;aAClC,qBAAqB,CACpB,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,sDAAsD,CAAC,CAC1G,CAAC;QAEJ,MAAM,aAAa,CACjB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,CAAC;YACf,GAAG,WAAW,CAAC,UAAU;YACzB,0BAA0B,EAAE,IAAI;SACjC,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAC9B,MAAM,CAAC,eAAe,CAAC;YACrB,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,MAAM;gBACZ,iBAAiB,EAAE;oBACjB,MAAM,CAAC,gBAAgB,CAAC;wBACtB,IAAI,EAAE,eAAe;wBACrB,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;qBAChD,CAAC;iBACH;aACF,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC7E,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,GAAG,WAAW,CAAC;QAC7C,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,0BAA0B,GAAG,KAAK,CAAC;QAExD,MAAM,kBAAkB,GAAG;YACzB;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE;oBACJ,WAAW,EAAE;wBACX,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB,EAAE;wBACxG,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB,EAAE;qBACzG;oBACD,YAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;oBAChE,WAAW,EAAE,kCAAkC;iBAChD;aACF;SACF,CAAC;QAEF,kCAAkC;QAClC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;YACjC,iCAAiC;aAChC,qBAAqB,CAAC,aAAa,CAAC,oBAAoB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,CAAC;YAC7F,iCAAiC;aAChC,qBAAqB,CAAC,kBAAkB,CAAC;YAC1C,gDAAgD;aAC/C,qBAAqB,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,wBAAwB,CAAC,CAAC;aAChH,qBAAqB,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAC;QAEpH,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,CAAC;YACf,GAAG,WAAW,CAAC,UAAU;YACzB,0BAA0B,EAAE,KAAK;SAClC,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,GAAG,aAAa,CAAC,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,wBAAwB,CAAC;YAC5F,GAAG,aAAa,CAAC,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,wBAAwB,CAAC;SAC7F,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,GAAG,WAAW,CAAC;QAC7C,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,0BAA0B,GAAG,KAAK,CAAC;QAExD,MAAM,kBAAkB,GAAG;YACzB;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE;oBACJ,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;oBACvG,YAAY,EAAE,EAAE,EAAE,sBAAsB;oBACxC,WAAW,EAAE,8BAA8B;iBAC5C;aACF;SACF,CAAC;QAEF,kCAAkC;QAClC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;YACjC,iCAAiC;aAChC,qBAAqB,CAAC,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/E,iCAAiC;aAChC,qBAAqB,CAAC,kBAAkB,CAAC;YAC1C,mCAAmC;aAClC,qBAAqB,CAAC,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,mCAAmC,CAAC,CAAC,CAAC;QAEjH,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,CAAC;YACf,GAAG,WAAW,CAAC,UAAU;YACzB,0BAA0B,EAAE,KAAK;SAClC,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,mCAAmC,CAAC,CAAC,CAAC;IACjH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/prompt/prompt-service.image-handling.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/prompt/prompt-service.image-handling.test.js

@@ -0,0 +1,212 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { promptService } from './prompt-service.js';
+import * as vertexAi from '../ai-service/vertex-ai.js';
+import * as vertexAiClaude from '../ai-service/vertex-ai-claude.js';
+import * as chatGpt from '../ai-service/chat-gpt.js';
+import * as anthropic from '../ai-service/anthropic.js';
+import * as cliParams from '../cli/cli-params.js';
+import fs from 'fs';
+import mime from 'mime-types';
+import { getImageAssets } from '../files/read-files.js';
+import * as dalleService from '../ai-service/dall-e.js';
+import * as vertexAiImagen from '../ai-service/vertex-ai-imagen.js';
+import { getCodeGenPrompt } from './prompt-codegen.js';
+import { mockData, mockResponses, testConfigs } from './prompt-service.test-utils.js';
+// Mock all external dependencies
+vi.mock('../ai-service/vertex-ai-claude.js', () => ({ generateContent: vi.fn() }));
+vi.mock('../ai-service/vertex-ai.js', () => ({ generateContent: vi.fn() }));
+vi.mock('../ai-service/chat-gpt.js', () => ({ generateContent: vi.fn() }));
+vi.mock('../ai-service/anthropic.js', () => ({ generateContent: vi.fn() }));
+vi.mock('../ai-service/dall-e.js', () => ({ generateImage: vi.fn() }));
+vi.mock('../ai-service/vertex-ai-imagen.js', () => ({ generateImage: vi.fn() }));
+vi.mock('fs');
+vi.mock('mime-types');
+vi.mock('../cli/cli-params.js', () => ({
+    disableExplanations: true,
+    explicitPrompt: false,
+    allowFileCreate: false,
+    allowFileDelete: false,
+    allowDirectoryCreate: false,
+    allowFileMove: false,
+    verbosePrompt: false,
+    disableContextOptimization: true,
+    vision: false,
+    imagen: false,
+    temperature: 0.7,
+    cheap: false,
+    askQuestion: false,
+}));
+vi.mock('../files/cache-file.js');
+vi.mock('../files/find-files.js', () => ({
+    getSourceFiles: () => [],
+    getImageAssetFiles: () => [],
+}));
+vi.mock('../files/read-files.js', () => ({
+    getSourceCode: () => ({}),
+    getImageAssets: vi.fn(() => ({})),
+}));
+vi.mock('../main/config.js', () => ({
+    rootDir: '/mocked/root/dir',
+    rcConfig: {
+        rootDir: '/mocked/root/dir',
+        extensions: ['.js', '.ts', '.tsx', '.jsx'],
+    },
+    importantContext: {},
+}));
+const GENERATE_CONTENT_FNS = {
+    'vertex-ai-claude': vertexAiClaude.generateContent,
+    'vertex-ai': vertexAi.generateContent,
+    'ai-studio': vertexAi.generateContent,
+    anthropic: anthropic.generateContent,
+    'chat-gpt': chatGpt.generateContent,
+};
+const GENERATE_IMAGE_FNS = {
+    'dall-e': dalleService.generateImage,
+    'vertex-ai': vertexAiImagen.generateImage,
+};
+describe('promptService - Image Handling', () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+        vi.mocked(cliParams).dryRun = false;
+        vi.mocked(cliParams).vision = false;
+        vi.mocked(cliParams).imagen = undefined;
+        vi.mocked(cliParams).disableContextOptimization = true;
+        vi.mocked(cliParams).explicitPrompt = 'testx';
+    });
+    describe('Vision Features', () => {
+        it('should include image assets when vision flag is true', async () => {
+            vi.mocked(cliParams).aiService = 'chat-gpt';
+            vi.mocked(cliParams).vision = true;
+            // Setup mocks
+            vi.mocked(getImageAssets).mockReturnValue(mockData.imageAssets);
+            vi.mocked(chatGpt.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+                // Second mock for codegenSummary
+                .mockResolvedValueOnce(mockResponses.mockCodegenSummary(mockData.paths.test))
+                // Third mock for the actual update
+                .mockResolvedValueOnce(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("Vision test");'));
+            await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt(testConfigs.visionConfig));
+            expect(chatGpt.generateContent).toHaveBeenCalledTimes(3);
+            const calls = vi.mocked(chatGpt.generateContent).mock.calls[0];
+            expect(calls[0]).toEqual(expect.arrayContaining([
+                expect.objectContaining({
+                    type: 'user',
+                    functionResponses: expect.arrayContaining([
+                        { name: 'getImageAssets', content: JSON.stringify(mockData.imageAssets) },
+                    ]),
+                }),
+            ]));
+        });
+        it('should include image data in the prompt when processing files with vision', async () => {
+            vi.mocked(cliParams).aiService = 'chat-gpt';
+            vi.mocked(cliParams).vision = true;
+            const mockCodegenSummary = [
+                {
+                    name: 'codegenSummary',
+                    args: {
+                        fileUpdates: [
+                            {
+                                filePath: mockData.paths.test,
+                                updateToolName: 'updateFile',
+                                contextImageAssets: [`${mockData.paths.root}/image1.png`, `${mockData.paths.root}/image2.jpg`],
+                                prompt: 'Generate file update',
+                            },
+                        ],
+                        contextPaths: [],
+                        explanation: 'Mock summary',
+                    },
+                },
+            ];
+            // Setup mocks
+            vi.mocked(chatGpt.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+                // Second mock for codegenSummary
+                .mockResolvedValueOnce(mockCodegenSummary)
+                // Third mock for the actual update
+                .mockResolvedValueOnce(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("Updated with vision");'));
+            vi.mocked(fs.readFileSync).mockImplementation((path) => `mock-base64-data-for-${path}`);
+            vi.mocked(mime.lookup).mockImplementation((path) => (path.endsWith('.png') ? 'image/png' : 'image/jpeg'));
+            await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt(testConfigs.visionConfig));
+            expect(chatGpt.generateContent).toHaveBeenCalledTimes(3);
+            const secondCall = vi.mocked(chatGpt.generateContent).mock.calls[1];
+            expect(secondCall[0]).toEqual(expect.arrayContaining([
+                expect.objectContaining({
+                    type: 'user',
+                    text: expect.stringContaining('Generate file update'),
+                    images: [
+                        {
+                            path: `${mockData.paths.root}/image1.png`,
+                            base64url: `mock-base64-data-for-${mockData.paths.root}/image1.png`,
+                            mediaType: 'image/png',
+                        },
+                        {
+                            path: `${mockData.paths.root}/image2.jpg`,
+                            base64url: `mock-base64-data-for-${mockData.paths.root}/image2.jpg`,
+                            mediaType: 'image/jpeg',
+                        },
+                    ],
+                }),
+            ]));
+        });
+        it('should not include image assets when vision flag is false', async () => {
+            vi.mocked(cliParams).aiService = 'chat-gpt';
+            vi.mocked(cliParams).vision = false;
+            // Setup mocks
+            vi.mocked(chatGpt.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+                // Second mock for codegenSummary
+                .mockResolvedValueOnce(mockResponses.mockCodegenSummary(mockData.paths.test))
+                // Third mock for the actual update
+                .mockResolvedValueOnce(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("No vision test");'));
+            await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({ ...testConfigs.baseConfig, aiService: 'chat-gpt' }));
+            expect(chatGpt.generateContent).toHaveBeenCalledTimes(3);
+            const calls = vi.mocked(chatGpt.generateContent).mock.calls[0];
+            expect(calls[0]).not.toEqual(expect.arrayContaining([
+                expect.objectContaining({
+                    type: 'user',
+                    text: expect.stringContaining('I should also provide you with a summary of application image assets'),
+                }),
+            ]));
+        });
+    });
+    describe('Image Generation', () => {
+        it('should handle successful image generation', async () => {
+            vi.mocked(cliParams).aiService = 'vertex-ai';
+            vi.mocked(cliParams).imagen = 'dall-e';
+            // Setup mocks
+            vi.mocked(vertexAi.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.image))
+                // Second mock for codegenSummary
+                .mockResolvedValueOnce(mockResponses.mockCodegenSummary(mockData.paths.image, 'generateImage'))
+                // Third mock for the actual image generation
+                .mockResolvedValueOnce(mockResponses.mockGenerateImage(mockData.paths.image));
+            vi.mocked(dalleService.generateImage).mockResolvedValue(mockData.imageGenerationUrl);
+            const result = await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt(testConfigs.imagenConfig));
+            expect(vertexAi.generateContent).toHaveBeenCalledTimes(3);
+            expect(dalleService.generateImage).toHaveBeenCalledWith('A test image', undefined, { width: 256, height: 256 }, false);
+            expect(result).toEqual(expect.arrayContaining(mockResponses.mockDownloadFile(mockData.paths.image, mockData.imageGenerationUrl)));
+        });
+        it('should handle image generation failure', async () => {
+            vi.mocked(cliParams).aiService = 'vertex-ai';
+            vi.mocked(cliParams).imagen = 'dall-e';
+            // Setup mocks
+            vi.mocked(vertexAi.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.image))
+                // Second mock for codegenSummary
+                .mockResolvedValueOnce(mockResponses.mockCodegenSummary(mockData.paths.image, 'generateImage'))
+                // Third mock for the actual image generation
+                .mockResolvedValueOnce(mockResponses.mockGenerateImage(mockData.paths.image));
+            vi.mocked(dalleService.generateImage).mockRejectedValue(new Error('Image generation failed'));
+            const result = await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt(testConfigs.imagenConfig));
+            expect(vertexAi.generateContent).toHaveBeenCalledTimes(3);
+            expect(dalleService.generateImage).toHaveBeenCalledWith('A test image', undefined, { width: 256, height: 256 }, false);
+            expect(result).toEqual(expect.arrayContaining(mockResponses.mockExplanation('Failed to generate image: Image generation failed')));
+        });
+    });
+});
+//# sourceMappingURL=prompt-service.image-handling.test.js.map

package/dist/prompt/prompt-service.image-handling.test.js.map

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

package/dist/prompt/prompt-service.js

@@ -16,10 +16,20 @@ import { handleAiServiceFallback } from './ai-service-fallback.js';
 import { summarizeSourceCode } from './steps/step-summarization.js';
 import { executeStepHistoryUpdate, getCurrentHistory } from './steps/step-history-update.js';
 import { executeStepGenerateSummary } from './steps/step-generate-summary.js';
+import { getSourceCodeTree } from '../files/source-code-tree.js';
+import { INITIAL_GREETING, REQUEST_SOURCE_CODE, SOURCE_CODE_RESPONSE, READY_TO_ASSIST, getPartialPromptTemplate, } from './static-prompts.js';
+import { executeStepCodegenPlanning } from './steps/step-codegen-planning.js';
+import { getRegisteredGenerateContentHooks } from '../main/plugin-loader.js';
 /** A function that communicates with model using */
 export async function promptService(generateContentFns, generateImageFns, codegenPrompt, waitIfPaused = () => Promise.resolve()) {
     const generateContentFn = async (...args) => {
-        return await handleAiServiceFallback(generateContentFns, codegenPrompt.options.aiService, codegenPrompt.options, ...args);
+        // Get the base result from the AI service
+        const result = await handleAiServiceFallback(generateContentFns, codegenPrompt.options.aiService, codegenPrompt.options, ...args);
+        // Get registered hooks for the current AI service
+        for (const hook of getRegisteredGenerateContentHooks()) {
+            await hook(args, result);
+        }
+        return result;
     };
     const generateImageFn = (...args) => {
         assert(codegenPrompt.options.imagen, 'imagen value must be provided');
@@ -41,27 +51,35 @@ async function executePromptService(generateContentFn, generateImageFn, codegenP
     const getSourceCodeRequest = { name: 'getSourceCode' };
     const prompt = [
         { type: 'systemPrompt', systemPrompt: getSystemPrompt(codegenPrompt.options) },
-        { type: 'user', text: messages.suggestSourceCode },
+        { type: 'user', text: INITIAL_GREETING },
         {
             type: 'assistant',
-            text: messages.requestSourceCode,
-            functionCalls: [getSourceCodeRequest, ...(codegenPrompt.options.historyEnabled ? [{ name: 'readHistory' }] : [])],
+            text: REQUEST_SOURCE_CODE,
+            functionCalls: [
+                getSourceCodeRequest,
+                ...(codegenPrompt.options.vision ? [{ name: 'getImageAssets' }] : []),
+                ...(codegenPrompt.options.historyEnabled ? [{ name: 'readHistory' }] : []),
+            ],
         },
     ];
     const getSourceCodeResponse = {
         type: 'user',
         functionResponses: [
             { name: 'getSourceCode', content: messages.sourceCode },
+            ...(codegenPrompt.options.vision ? [{ name: 'getImageAssets', content: messages.imageAssets }] : []),
             ...(codegenPrompt.options.historyEnabled ? [{ name: 'readHistory', content: getCurrentHistory() }] : []),
         ],
+        text: SOURCE_CODE_RESPONSE,
         cache: true,
     };
     prompt.push(getSourceCodeResponse);
-    if (codegenPrompt.options.vision) {
-        prompt.slice(-1)[0].text = messages.suggestImageAssets;
-        prompt.push({ type: 'assistant', text: messages.requestImageAssets, functionCalls: [{ name: 'getImageAssets' }] }, { type: 'user', functionResponses: [{ name: 'getImageAssets', content: messages.imageAssets }] });
-    }
-    prompt.slice(-1)[0].text = messages.prompt;
+    prompt.push({
+        type: 'assistant',
+        text: READY_TO_ASSIST,
+    }, {
+        type: 'user',
+        text: codegenPrompt.prompt,
+    });
     // Add uploaded images to the prompt if available
     if (codegenPrompt.options.images && codegenPrompt.options.images.length > 0 && codegenPrompt.options.vision) {
         prompt.slice(-1)[0].images = codegenPrompt.options.images.map((img) => ({
@@ -80,7 +98,7 @@ async function executePromptService(generateContentFn, generateImageFn, codegenP
     }
     // Execute the ask question step
     if (codegenPrompt.options.askQuestion !== false && (codegenPrompt.options.interactive || codegenPrompt.options.ui)) {
-        const askQuestionResult = await executeStepAskQuestion(generateContentFn, prompt, getFunctionDefs(), codegenPrompt.options.temperature ?? 0.7, messages, codegenPrompt.options);
+        const askQuestionResult = await executeStepAskQuestion(generateContentFn, generateImageFn, prompt, getFunctionDefs(), codegenPrompt.options.temperature ?? 0.7, codegenPrompt.options);
         // Summary based on the ask-question conversation history (may be different from the initial summary)
         await executeStepGenerateSummary(generateContentFn, prompt, codegenPrompt.options);
         if (askQuestionResult === StepResult.BREAK) {
@@ -91,6 +109,10 @@ async function executePromptService(generateContentFn, generateImageFn, codegenP
         console.log('Ask question is not enabled.');
         // Also there is no need to generate conversation summary
     }
+    const planningResult = await executeStepCodegenPlanning(generateContentFn, prompt, codegenPrompt.options);
+    if (planningResult === StepResult.BREAK) {
+        return { result: [], prompt };
+    }
     const baseRequest = [
         prompt,
         getFunctionDefs(),
@@ -132,20 +154,14 @@ async function executePromptService(generateContentFn, generateImageFn, codegenP
         const result = [];
         for (const file of codegenSummaryRequest.args.fileUpdates) {
             putSystemMessage('Collecting partial update for: ' + file.filePath + ' using tool: ' + file.updateToolName, file);
-            console.log('- Prompt:', file.prompt);
-            console.log('- Temperature', file.temperature);
-            console.log('- Cheap', file.cheap);
-            if (codegenPrompt.options.vision) {
-                console.log('- Context image assets', file.contextImageAssets);
-            }
             // Check if execution is paused before proceeding
             await waitIfPaused();
             // this is needed, otherwise we will get an error
             if (prompt.slice(-1)[0].type === 'user') {
-                prompt.slice(-1)[0].text = file.prompt ?? messages.partialPromptTemplate(file.filePath);
+                prompt.slice(-1)[0].text = file.prompt ?? getPartialPromptTemplate(file.filePath);
             }
             else {
-                prompt.push({ type: 'user', text: file.prompt ?? messages.partialPromptTemplate(file.filePath) });
+                prompt.push({ type: 'user', text: file.prompt ?? getPartialPromptTemplate(file.filePath) });
             }
             if (codegenPrompt.options.vision && file.contextImageAssets) {
                 prompt.slice(-1)[0].images = file.contextImageAssets.map((path) => ({
@@ -197,18 +213,9 @@ async function executePromptService(generateContentFn, generateImageFn, codegenP
  */
 function prepareMessages(codegen) {
     return {
-        suggestSourceCode: 'I should provide you with application source code.',
-        requestSourceCode: 'Please provide application source code.',
-        suggestImageAssets: 'I should also provide you with a summary of application image assets',
-        requestImageAssets: 'Please provide summary of application image assets.',
-        prompt: codegen.prompt +
-            '\n Start from generating codegen summary, this summary will be used as a context to generate updates, so make sure that it contains useful information.',
-        sourceCode: JSON.stringify(getSourceCode({ taskFile: codegen.options.taskFile }, codegen.options)),
-        contextSourceCode: (paths, pathsOnly = false) => JSON.stringify(Object.fromEntries(Object.entries(getSourceCode({ filterPaths: paths, taskFile: codegen.options.taskFile, forceAll: true }, codegen.options)).filter(([path]) => !pathsOnly || paths.includes(path)))),
+        sourceCode: JSON.stringify(getSourceCodeTree(getSourceCode({ taskFile: codegen.options.taskFile }, codegen.options))),
+        contextSourceCode: (paths, pathsOnly = false) => JSON.stringify(getSourceCodeTree(Object.fromEntries(Object.entries(getSourceCode({ filterPaths: paths, taskFile: codegen.options.taskFile, forceAll: true }, codegen.options)).filter(([path]) => !pathsOnly || paths.includes(path))))),
         imageAssets: JSON.stringify(getImageAssets()),
-        partialPromptTemplate(path) {
-            return `Thank you for providing the summary, now suggest changes for the \`${path}\` file using appropriate tools.`;
-        },
     };
 }
 //# sourceMappingURL=prompt-service.js.map