genaicode 0.6.0 → 0.7.0

package/dist/prompt/prompt-service.validation-recovery.test.js

@@ -0,0 +1,263 @@
+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 * as diff from 'diff';
+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('diff');
+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 - Validation and Recovery', () => {
+    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('Invalid Response Recovery', () => {
+        it('should successfully recover from an invalid function call', async () => {
+            vi.mocked(cliParams).aiService = 'vertex-ai';
+            const mockInvalidCall = [
+                {
+                    name: 'codegenSummary',
+                    args: {
+                        files: [{ filePath: mockData.paths.test, updateToolName: 'updateFile' }],
+                        contextPaths: [],
+                        explanation: 'Mock summary',
+                    },
+                },
+            ];
+            const mockValidCall = [
+                {
+                    name: 'codegenSummary',
+                    args: {
+                        fileUpdates: [{ filePath: mockData.paths.test, updateToolName: 'updateFile', prompt: 'Generate file' }],
+                        contextPaths: [],
+                        explanation: 'Mock summary',
+                    },
+                },
+            ];
+            // Setup mocks
+            vi.mocked(vertexAi.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+                // Second mock for invalid codegenSummary
+                .mockResolvedValueOnce(mockInvalidCall)
+                // Third mock for valid codegenSummary
+                .mockResolvedValueOnce(mockValidCall)
+                // Fourth mock for the actual update
+                .mockResolvedValueOnce(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("Recovered response");'));
+            const result = await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt(testConfigs.baseConfig));
+            expect(vertexAi.generateContent).toHaveBeenCalledTimes(4);
+            expect(result).toEqual(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("Recovered response");'));
+        });
+        it('should handle unsuccessful recovery', async () => {
+            vi.mocked(cliParams).aiService = 'vertex-ai';
+            const mockInvalidCall = [
+                {
+                    name: 'updateFile',
+                    args: { filePath: mockData.paths.test, invalidArg: 'This should not be here' },
+                },
+            ];
+            // Setup mocks
+            vi.mocked(vertexAi.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+                // Second mock for codegenSummary
+                .mockResolvedValueOnce([
+                {
+                    name: 'codegenSummary',
+                    args: {
+                        fileUpdates: [{ filePath: mockData.paths.test, updateToolName: 'patchFile', prompt: 'Generate file' }],
+                        contextPaths: [],
+                        explanation: 'Mock summary',
+                    },
+                },
+            ])
+                // Third, fourth, and fifth mocks for failed recovery attempts
+                .mockResolvedValueOnce(mockInvalidCall)
+                .mockResolvedValueOnce(mockInvalidCall)
+                .mockResolvedValueOnce(mockInvalidCall);
+            await expect(promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt(testConfigs.baseConfig))).rejects.toThrow('Recovery failed');
+            expect(vertexAi.generateContent).toHaveBeenCalledTimes(5);
+        });
+        it('should not attempt recovery for multiple valid function calls', async () => {
+            vi.mocked(cliParams).aiService = 'vertex-ai';
+            // Setup mocks
+            vi.mocked(vertexAi.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+                // Second mock for codegenSummary with multiple files
+                .mockResolvedValueOnce([
+                {
+                    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: [],
+                        explanation: 'Mock summary',
+                    },
+                },
+            ])
+                // 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));
+            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");'),
+            ]);
+        });
+    });
+    describe('Patch File Validation', () => {
+        it('should handle invalid patchFile call and retry without patchFile function', async () => {
+            vi.mocked(cliParams).aiService = 'vertex-ai';
+            // Setup mocks
+            vi.mocked(vertexAi.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+                // Second mock for codegenSummary
+                .mockResolvedValueOnce([
+                {
+                    name: 'codegenSummary',
+                    args: {
+                        fileUpdates: [
+                            {
+                                filePath: mockData.paths.test,
+                                updateToolName: 'patchFile',
+                                prompt: 'Generate file',
+                            },
+                        ],
+                        contextPaths: [],
+                        explanation: 'Mock summary',
+                    },
+                },
+            ])
+                // Third mock for invalid patch
+                .mockResolvedValueOnce(mockResponses.mockPatchFile(mockData.paths.test, 'invalid patch'))
+                // Fourth mock for recovery with updateFile
+                .mockResolvedValueOnce(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("Updated content");'));
+            // Mock fs.readFileSync to return some content
+            vi.mocked(fs.readFileSync).mockReturnValue(mockData.fileContent);
+            // Mock diff.applyPatch to fail for the invalid patch
+            vi.mocked(diff.applyPatch).mockReturnValue(false);
+            const result = await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt(testConfigs.baseConfig));
+            expect(vertexAi.generateContent).toHaveBeenCalledTimes(4);
+            expect(fs.readFileSync).toHaveBeenCalledWith(mockData.paths.test, 'utf-8');
+            expect(diff.applyPatch).toHaveBeenCalledWith(mockData.fileContent, 'invalid patch');
+            expect(result).toEqual(mockResponses.mockUpdateFile(mockData.paths.test, 'console.log("Updated content");'));
+        });
+        it('should handle successful patch application', async () => {
+            vi.mocked(cliParams).aiService = 'vertex-ai';
+            const validPatch = `Index: test.js
+===================================================================
+--- test.js
++++ test.js
+@@ -1,1 +1,1 @@
+-Original content
++New content`;
+            // Setup mocks
+            vi.mocked(vertexAi.generateContent)
+                // First mock for codegenPlanning
+                .mockResolvedValueOnce(mockResponses.mockPlanningResponse(mockData.paths.test))
+                // Second mock for codegenSummary
+                .mockResolvedValueOnce([
+                {
+                    name: 'codegenSummary',
+                    args: {
+                        fileUpdates: [
+                            {
+                                filePath: mockData.paths.test,
+                                updateToolName: 'patchFile',
+                                prompt: 'Generate file',
+                            },
+                        ],
+                        contextPaths: [],
+                        explanation: 'Mock summary',
+                    },
+                },
+            ])
+                // Third mock for valid patch
+                .mockResolvedValueOnce(mockResponses.mockPatchFile(mockData.paths.test, validPatch));
+            // Mock fs.readFileSync to return some content
+            vi.mocked(fs.readFileSync).mockReturnValue(mockData.fileContent);
+            // Mock diff.applyPatch to succeed with the valid patch
+            vi.mocked(diff.applyPatch).mockReturnValue('New content');
+            const result = await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt(testConfigs.baseConfig));
+            expect(vertexAi.generateContent).toHaveBeenCalledTimes(3);
+            expect(fs.readFileSync).toHaveBeenCalledWith(mockData.paths.test, 'utf-8');
+            expect(diff.applyPatch).toHaveBeenCalledWith(mockData.fileContent, validPatch);
+            expect(result).toEqual(mockResponses.mockPatchFile(mockData.paths.test, validPatch));
+        });
+    });
+});
+//# sourceMappingURL=prompt-service.validation-recovery.test.js.map

package/dist/prompt/prompt-service.validation-recovery.test.js.map

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

package/dist/prompt/static-prompts.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Static prompts used in the prompt-service module.
+ * These prompts are used in the initial conversation with the AI service.
+ */
+/** Initial greeting from the user */
+export declare const INITIAL_GREETING = "Hello, GenAIcode!";
+/** Assistant's response asking for source code and other assets */
+export declare const REQUEST_SOURCE_CODE = "Hello there! I guess you have a task for me today. Before we start, could you please provide me with: \n      - the current source code of your application\n      - the image assets (if available)\n      - and conversational history (if available)\n      \n      Thanks";
+/** User's response when providing source code and assets */
+export declare const SOURCE_CODE_RESPONSE = "Sure, here is the application source code, image assets, and the history.";
+/** Assistant's acknowledgment after receiving source code */
+export declare const READY_TO_ASSIST = "Thank you, I'm ready to assist you with your request.";
+/** Assistant's response when generating code */
+export declare const CODEGEN_SUMMARY_PROMPT = "Planning phase completed. Now please create the code generation summary.";
+/** Template for partial prompt when requesting changes for a specific file */
+export declare const getPartialPromptTemplate: (path: string) => string;

package/dist/prompt/static-prompts.js

@@ -0,0 +1,22 @@
+/**
+ * Static prompts used in the prompt-service module.
+ * These prompts are used in the initial conversation with the AI service.
+ */
+/** Initial greeting from the user */
+export const INITIAL_GREETING = 'Hello, GenAIcode!';
+/** Assistant's response asking for source code and other assets */
+export const REQUEST_SOURCE_CODE = `Hello there! I guess you have a task for me today. Before we start, could you please provide me with: 
+      - the current source code of your application
+      - the image assets (if available)
+      - and conversational history (if available)
+      
+      Thanks`;
+/** User's response when providing source code and assets */
+export const SOURCE_CODE_RESPONSE = 'Sure, here is the application source code, image assets, and the history.';
+/** Assistant's acknowledgment after receiving source code */
+export const READY_TO_ASSIST = "Thank you, I'm ready to assist you with your request.";
+/** Assistant's response when generating code */
+export const CODEGEN_SUMMARY_PROMPT = 'Planning phase completed. Now please create the code generation summary.';
+/** Template for partial prompt when requesting changes for a specific file */
+export const getPartialPromptTemplate = (path) => `Please now generate update for the \`${path}\` file using appropriate tools according to code generation summary.`;
+//# sourceMappingURL=static-prompts.js.map

package/dist/prompt/static-prompts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"static-prompts.js","sourceRoot":"","sources":["../../src/prompt/static-prompts.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,qCAAqC;AACrC,MAAM,CAAC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAEpD,mEAAmE;AACnE,MAAM,CAAC,MAAM,mBAAmB,GAAG;;;;;aAKtB,CAAC;AAEd,4DAA4D;AAC5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,2EAA2E,CAAC;AAEhH,6DAA6D;AAC7D,MAAM,CAAC,MAAM,eAAe,GAAG,uDAAuD,CAAC;AAEvF,gDAAgD;AAChD,MAAM,CAAC,MAAM,sBAAsB,GAAG,0EAA0E,CAAC;AAEjH,8EAA8E;AAC9E,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,IAAY,EAAU,EAAE,CAC/D,wCAAwC,IAAI,uEAAuE,CAAC"}

package/dist/prompt/steps/step-ask-question/handlers/cancel-code-generation.js

@@ -7,7 +7,7 @@ export async function handleCancelCodeGeneration({ askQuestionCall }) {
         stepResult: StepResult.BREAK,
         items: [
             {
-                assistant: { type: 'assistant', text: askQuestionCall.args?.content ?? '', functionCalls: [] },
+                assistant: { type: 'assistant', text: askQuestionCall.args?.message ?? '' },
                 user: { type: 'user', text: 'Code generation cancelled.' },
             },
         ],

package/dist/prompt/steps/step-ask-question/handlers/cancel-code-generation.js.map

@@ -1 +1 @@
-{"version":3,"file":"cancel-code-generation.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/cancel-code-generation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,EAAE,eAAe,EAAsB;IACtF,gBAAgB,CAAC,yDAAyD,CAAC,CAAC;IAC5E,OAAO;QACL,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,UAAU,CAAC,KAAK;QAC5B,KAAK,EAAE;YACL;gBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;gBAC9F,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,4BAA4B,EAAE;aAC3D;SACF;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"cancel-code-generation.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/cancel-code-generation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,EAAE,eAAe,EAAsB;IACtF,gBAAgB,CAAC,yDAAyD,CAAC,CAAC;IAC5E,OAAO;QACL,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,UAAU,CAAC,KAAK;QAC5B,KAAK,EAAE;YACL;gBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE;gBAC3E,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,4BAA4B,EAAE;aAC3D;SACF;KACF,CAAC;AACJ,CAAC"}

package/dist/prompt/steps/step-ask-question/handlers/confirm-code-generation.d.ts

@@ -1,2 +1,2 @@
 import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
-export declare function handleConfirmCodeGeneration({ askQuestionCall }: ActionHandlerProps): Promise<ActionResult>;
+export declare function handleConfirmCodeGeneration({ askQuestionCall, options, }: ActionHandlerProps): Promise<ActionResult>;

package/dist/prompt/steps/step-ask-question/handlers/confirm-code-generation.js

@@ -1,8 +1,12 @@
 import { putSystemMessage } from '../../../../main/common/content-bus.js';
 import { askUserForConfirmationWithAnswer } from '../../../../main/common/user-actions.js';
 import { StepResult } from '../../steps-types.js';
-export async function handleConfirmCodeGeneration({ askQuestionCall }) {
+export async function handleConfirmCodeGeneration({ askQuestionCall, options, }) {
     const userConfirmation = await askUserForConfirmationWithAnswer('The assistant is ready to start code generation. Do you want to proceed?', 'Start code generation', 'Continue conversation', true);
+    if (userConfirmation.options?.aiService) {
+        options.aiService = userConfirmation.options.aiService;
+        options.cheap = userConfirmation.options.cheap;
+    }
     if (userConfirmation.confirmed) {
         putSystemMessage('Proceeding with code generation.');
         return {
@@ -10,7 +14,7 @@ export async function handleConfirmCodeGeneration({ askQuestionCall }) {
             stepResult: StepResult.CONTINUE,
             items: [
                 {
-                    assistant: { type: 'assistant', text: askQuestionCall.args?.content ?? '', functionCalls: [] },
+                    assistant: { type: 'assistant', text: askQuestionCall.args?.message ?? '', functionCalls: [] },
                     user: { type: 'user', text: userConfirmation.answer || 'Confirmed. Proceed with code generation.' },
                 },
             ],
@@ -23,11 +27,10 @@ export async function handleConfirmCodeGeneration({ askQuestionCall }) {
             stepResult: StepResult.CONTINUE,
             items: [
                 {
-                    assistant: { type: 'assistant', text: askQuestionCall.args?.content ?? '', functionCalls: [askQuestionCall] },
+                    assistant: { type: 'assistant', text: askQuestionCall.args?.message ?? '' },
                     user: {
                         type: 'user',
                         text: userConfirmation.answer || 'Declined. Please continue the conversation.',
-                        functionResponses: [{ name: 'askQuestion', call_id: askQuestionCall.id ?? '', content: undefined }],
                     },
                 },
             ],

package/dist/prompt/steps/step-ask-question/handlers/confirm-code-generation.js.map

@@ -1 +1 @@
-{"version":3,"file":"confirm-code-generation.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/confirm-code-generation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,EAAE,eAAe,EAAsB;IACvF,MAAM,gBAAgB,GAAG,MAAM,gCAAgC,CAC7D,0EAA0E,EAC1E,uBAAuB,EACvB,uBAAuB,EACvB,IAAI,CACL,CAAC;IACF,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC/B,gBAAgB,CAAC,kCAAkC,CAAC,CAAC;QACrD,OAAO;YACL,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,UAAU,CAAC,QAAQ;YAC/B,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;oBAC9F,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,CAAC,MAAM,IAAI,0CAA0C,EAAE;iBACpG;aACF;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,gBAAgB,CAAC,wCAAwC,CAAC,CAAC;QAC3D,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE,UAAU,CAAC,QAAQ;YAC/B,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,aAAa,EAAE,CAAC,eAAe,CAAC,EAAE;oBAC7G,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,gBAAgB,CAAC,MAAM,IAAI,6CAA6C;wBAC9E,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;qBACpG;iBACF;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"confirm-code-generation.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/confirm-code-generation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,EAChD,eAAe,EACf,OAAO,GACY;IACnB,MAAM,gBAAgB,GAAG,MAAM,gCAAgC,CAC7D,0EAA0E,EAC1E,uBAAuB,EACvB,uBAAuB,EACvB,IAAI,CACL,CAAC;IACF,IAAI,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;QACxC,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC;QACvD,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;IACjD,CAAC;IACD,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC/B,gBAAgB,CAAC,kCAAkC,CAAC,CAAC;QACrD,OAAO;YACL,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,UAAU,CAAC,QAAQ;YAC/B,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;oBAC9F,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,CAAC,MAAM,IAAI,0CAA0C,EAAE;iBACpG;aACF;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,gBAAgB,CAAC,wCAAwC,CAAC,CAAC;QAC3D,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE,UAAU,CAAC,QAAQ;YAC/B,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE;oBAC3E,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,gBAAgB,CAAC,MAAM,IAAI,6CAA6C;qBAC/E;iBACF;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/prompt/steps/step-ask-question/handlers/context-optimization.js

@@ -5,17 +5,19 @@ import { executeStepContextOptimization } from '../../step-context-optimization.
 import { StepResult } from '../../steps-types.js';
 export async function handleContextOptimization({ askQuestionCall, prompt, options, generateContentFn, }) {
     const userConfirmation = await askUserForConfirmation('The assistant suggests optimizing the context to reduce token usage, cost, and latency. Do you want to proceed?', false);
+    if (userConfirmation.options?.aiService) {
+        options.aiService = userConfirmation.options.aiService;
+        options.cheap = userConfirmation.options.cheap;
+    }
     const user = {
         type: 'user',
         text: userConfirmation ? 'Context optimization applied.' : 'Context optimization not applied.',
-        functionResponses: [{ name: 'askQuestion', call_id: askQuestionCall.id ?? '', content: undefined }],
     };
     const assistant = {
         type: 'assistant',
-        text: askQuestionCall.args?.content ?? '',
-        functionCalls: [askQuestionCall],
+        text: askQuestionCall.args?.message ?? '',
     };
-    if (userConfirmation) {
+    if (userConfirmation.confirmed) {
         // the request may be caused be an appearance of a new file, so lets refresh
         refreshFiles();
         // Execute context optimization step

package/dist/prompt/steps/step-ask-question/handlers/context-optimization.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-optimization.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/context-optimization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,EAC9C,eAAe,EACf,MAAM,EACN,OAAO,EACP,iBAAiB,GACE;IACnB,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACnD,iHAAiH,EACjH,KAAK,CACN,CAAC;IAEF,MAAM,IAAI,GAAa;QACrB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,mCAAmC;QAC9F,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;KACpG,CAAC;IAEF,MAAM,SAAS,GAAkB;QAC/B,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE;QACzC,aAAa,EAAE,CAAC,eAAe,CAAC;KACjC,CAAC;IAEF,IAAI,gBAAgB,EAAE,CAAC;QACrB,4EAA4E;QAC5E,YAAY,EAAE,CAAC;QAEf,oCAAoC;QACpC,gBAAgB,CAAC,sCAAsC,CAAC,CAAC;QACzD,MAAM,8BAA8B,CAAC,iBAAiB,EAAE,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACjG,CAAC;IAED,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,UAAU,CAAC,QAAQ;QAC/B,KAAK,EAAE;YACL;gBACE,SAAS;gBACT,IAAI;aACL;SACF;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"context-optimization.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/context-optimization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,EAC9C,eAAe,EACf,MAAM,EACN,OAAO,EACP,iBAAiB,GACE;IACnB,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACnD,iHAAiH,EACjH,KAAK,CACN,CAAC;IAEF,IAAI,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;QACxC,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC;QACvD,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;IACjD,CAAC;IAED,MAAM,IAAI,GAAa;QACrB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,mCAAmC;KAC/F,CAAC;IAEF,MAAM,SAAS,GAAkB;QAC/B,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE;KAC1C,CAAC;IAEF,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC/B,4EAA4E;QAC5E,YAAY,EAAE,CAAC;QAEf,oCAAoC;QACpC,gBAAgB,CAAC,sCAAsC,CAAC,CAAC;QACzD,MAAM,8BAA8B,CAAC,iBAAiB,EAAE,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACjG,CAAC;IAED,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,UAAU,CAAC,QAAQ;QAC/B,KAAK,EAAE;YACL;gBACE,SAAS;gBACT,IAAI;aACL;SACF;KACF,CAAC;AACJ,CAAC"}

package/dist/prompt/steps/step-ask-question/handlers/default-action.js

@@ -5,11 +5,10 @@ export async function handleDefaultAction({ askQuestionCall }) {
         stepResult: StepResult.CONTINUE,
         items: [
             {
-                assistant: { type: 'assistant', text: askQuestionCall.args?.content ?? '', functionCalls: [askQuestionCall] },
+                assistant: { type: 'assistant', text: askQuestionCall.args?.message ?? '' },
                 user: {
                     type: 'user',
                     text: "I don't want to start the code generation yet, let's talk a bit more.",
-                    functionResponses: [{ name: 'askQuestion', call_id: askQuestionCall.id ?? '', content: undefined }],
                 },
             },
         ],

package/dist/prompt/steps/step-ask-question/handlers/default-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"default-action.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/default-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAE,eAAe,EAAsB;IAC/E,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,UAAU,CAAC,QAAQ;QAC/B,KAAK,EAAE;YACL;gBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,aAAa,EAAE,CAAC,eAAe,CAAC,EAAE;gBAC7G,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,uEAAuE;oBAC7E,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;iBACpG;aACF;SACF;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"default-action.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/default-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAE,eAAe,EAAsB;IAC/E,OAAO;QACL,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,UAAU,CAAC,QAAQ;QAC/B,KAAK,EAAE;YACL;gBACE,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE;gBAC3E,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,uEAAuE;iBAC9E;aACF;SACF;KACF,CAAC;AACJ,CAAC"}

package/dist/prompt/steps/step-ask-question/handlers/handle-request-answer-with-image.d.ts

@@ -0,0 +1,2 @@
+import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
+export declare function handleRequestAnswerWithImage({ askQuestionCall, options, generateImageFn, }: ActionHandlerProps): Promise<ActionResult>;

package/dist/prompt/steps/step-ask-question/handlers/handle-request-answer-with-image.js

@@ -0,0 +1,86 @@
+import { askUserForInput } from '../../../../main/common/user-actions.js';
+import { putAssistantMessage, putSystemMessage } from '../../../../main/common/content-bus.js';
+import { StepResult } from '../../steps-types.js';
+import { executeStepGenerateImage } from '../../step-generate-image.js';
+export async function handleRequestAnswerWithImage({ askQuestionCall, options, generateImageFn, }) {
+    if (!options.imagen) {
+        putSystemMessage('Image generation is not enabled. Please enable it using --imagen parameter.');
+        return {
+            breakLoop: true,
+            stepResult: StepResult.BREAK,
+            items: [],
+        };
+    }
+    // Get the image generation request from the args
+    const imageGenerationRequest = askQuestionCall.args?.imageGenerationRequest;
+    if (!imageGenerationRequest?.prompt) {
+        putSystemMessage('Image generation request with prompt is required for requestAnswerWithImage action.');
+        return {
+            breakLoop: true,
+            stepResult: StepResult.BREAK,
+            items: [],
+        };
+    }
+    // Create a temporary file path for the generated image
+    const tempImagePath = `/tmp/question-image-${Date.now()}.png`;
+    // Generate the image using generateImage function call
+    const generateImageCall = {
+        name: 'generateImage',
+        args: {
+            prompt: imageGenerationRequest.prompt,
+            filePath: tempImagePath,
+            width: 1024,
+            height: 1024,
+            explanation: 'Generating image to support the question',
+            ...(imageGenerationRequest.contextImage && { contextImagePath: imageGenerationRequest.contextImage }),
+        },
+    };
+    // Execute image generation
+    const downloadFileCall = await executeStepGenerateImage(generateImageFn, generateImageCall);
+    // If image generation failed, the downloadFileCall will be an explanation
+    if (!downloadFileCall.args?.downloadUrl) {
+        putSystemMessage('Failed to generate image for the question.');
+        return {
+            breakLoop: true,
+            stepResult: StepResult.BREAK,
+            items: [],
+        };
+    }
+    const response = await fetch(downloadFileCall.args?.downloadUrl);
+    const arrayBuffer = await response.arrayBuffer();
+    const buffer = Buffer.from(arrayBuffer);
+    putAssistantMessage('Here is the image to support the question:', generateImageCall.args, [], [
+        {
+            base64url: buffer.toString('base64'),
+            mediaType: 'image/png',
+        },
+    ]);
+    // Get user's response with the image displayed
+    const userText = await askUserForInput('Your answer', askQuestionCall.args?.content ?? '');
+    // Return the conversation items with the generated image
+    return {
+        breakLoop: false,
+        stepResult: StepResult.CONTINUE,
+        items: [
+            {
+                assistant: {
+                    type: 'assistant',
+                    text: askQuestionCall.args?.content ?? '',
+                    functionCalls: [askQuestionCall, generateImageCall, downloadFileCall],
+                },
+                user: {
+                    type: 'user',
+                    text: userText,
+                    functionResponses: [
+                        {
+                            name: 'askQuestion',
+                            call_id: askQuestionCall.id ?? '',
+                            content: undefined,
+                        },
+                    ],
+                },
+            },
+        ],
+    };
+}
+//# sourceMappingURL=handle-request-answer-with-image.js.map

package/dist/prompt/steps/step-ask-question/handlers/handle-request-answer-with-image.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handle-request-answer-with-image.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-request-answer-with-image.ts"],"names":[],"mappings":"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"}

package/dist/prompt/steps/step-ask-question/handlers/handle-send-message-with-image.d.ts

@@ -0,0 +1,2 @@
+import { ActionHandlerProps, ActionResult } from '../step-ask-question-types.js';
+export declare function handleSendMessageWithImage({ askQuestionCall, options, generateContentFn, prompt, generateImageFn, }: ActionHandlerProps): Promise<ActionResult>;