genaicode 0.3.0 → 0.4.1

package/dist/prompt/function-defs/read-history.js

@@ -0,0 +1,14 @@
+export const readHistory = {
+    name: 'readHistory',
+    description: 'This function reads the history from the cache and returns it as a string.',
+    parameters: {
+        type: 'object',
+        properties: {
+            dateTime: {
+                type: 'string',
+            },
+        },
+        required: [],
+    },
+};
+//# sourceMappingURL=read-history.js.map

package/dist/prompt/function-defs/read-history.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"read-history.js","sourceRoot":"","sources":["../../../src/prompt/function-defs/read-history.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,4EAA4E;IACzF,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;aACf;SACF;QACD,QAAQ,EAAE,EAAE;KACb;CACF,CAAC"}

package/dist/prompt/function-defs/set-summaries.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Function definition for setSummaries
+ */
+export declare const setSummaries: {
+    readonly name: "setSummaries";
+    readonly description: "Use this function to save summaries of files";
+    readonly parameters: {
+        readonly type: "object";
+        readonly properties: {
+            readonly summaries: {
+                readonly type: "array";
+                readonly description: "An array of results, each corresponding to an analyzed file, containing the absolute file path, and a brief summary.";
+                readonly items: {
+                    readonly type: "object";
+                    readonly properties: {
+                        readonly filePath: {
+                            readonly type: "string";
+                            readonly description: "The absolute file path of the analyzed file.";
+                        };
+                        readonly summary: {
+                            readonly type: "string";
+                            readonly description: "A summary of the file's content, highlighting its main purpose, functionality, or details which may be useful for context optimization.";
+                        };
+                    };
+                    readonly required: readonly ["filePath", "summary"];
+                };
+            };
+        };
+        readonly required: readonly ["summaries"];
+    };
+};

package/dist/prompt/function-defs/set-summaries.js

@@ -0,0 +1,32 @@
+/**
+ * Function definition for setSummaries
+ */
+export const setSummaries = {
+    name: 'setSummaries',
+    description: 'Use this function to save summaries of files',
+    parameters: {
+        type: 'object',
+        properties: {
+            summaries: {
+                type: 'array',
+                description: 'An array of results, each corresponding to an analyzed file, containing the absolute file path, and a brief summary.',
+                items: {
+                    type: 'object',
+                    properties: {
+                        filePath: {
+                            type: 'string',
+                            description: 'The absolute file path of the analyzed file.',
+                        },
+                        summary: {
+                            type: 'string',
+                            description: "A summary of the file's content, highlighting its main purpose, functionality, or details which may be useful for context optimization.",
+                        },
+                    },
+                    required: ['filePath', 'summary'],
+                },
+            },
+        },
+        required: ['summaries'],
+    },
+};
+//# sourceMappingURL=set-summaries.js.map

package/dist/prompt/function-defs/set-summaries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"set-summaries.js","sourceRoot":"","sources":["../../../src/prompt/function-defs/set-summaries.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,8CAA8C;IAC3D,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,SAAS,EAAE;gBACT,IAAI,EAAE,OAAO;gBACb,WAAW,EACT,sHAAsH;gBACxH,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACV,QAAQ,EAAE;4BACR,IAAI,EAAE,QAAQ;4BACd,WAAW,EAAE,8CAA8C;yBAC5D;wBACD,OAAO,EAAE;4BACP,IAAI,EAAE,QAAQ;4BACd,WAAW,EACT,yIAAyI;yBAC5I;qBACF;oBACD,QAAQ,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC;iBAClC;aACF;SACF;QACD,QAAQ,EAAE,CAAC,WAAW,CAAC;KACxB;CACO,CAAC"}

package/dist/prompt/function-defs/update-history.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Function definition for updateHistory
+ */
+export declare const updateHistory: {
+    readonly name: "updateHistory";
+    readonly description: "Update the history.";
+    readonly parameters: {
+        readonly type: "object";
+        readonly properties: {
+            readonly recentConversationSummary: {
+                readonly type: "string";
+                readonly description: "Summary of recent conversation";
+            };
+            readonly newHistoryContent: {
+                readonly type: "string";
+                readonly description: "The new history content, combination of recent conversation summary, and current history";
+            };
+        };
+        readonly required: readonly ["recentConversationSummary", "newHistoryContent"];
+    };
+};

package/dist/prompt/function-defs/update-history.js

@@ -0,0 +1,22 @@
+/**
+ * Function definition for updateHistory
+ */
+export const updateHistory = {
+    name: 'updateHistory',
+    description: 'Update the history.',
+    parameters: {
+        type: 'object',
+        properties: {
+            recentConversationSummary: {
+                type: 'string',
+                description: 'Summary of recent conversation',
+            },
+            newHistoryContent: {
+                type: 'string',
+                description: 'The new history content, combination of recent conversation summary, and current history',
+            },
+        },
+        required: ['recentConversationSummary', 'newHistoryContent'],
+    },
+};
+//# sourceMappingURL=update-history.js.map

package/dist/prompt/function-defs/update-history.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-history.js","sourceRoot":"","sources":["../../../src/prompt/function-defs/update-history.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,qBAAqB;IAClC,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,yBAAyB,EAAE;gBACzB,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,gCAAgC;aAC9C;YACD,iBAAiB,EAAE;gBACjB,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,0FAA0F;aACxG;SACF;QACD,QAAQ,EAAE,CAAC,2BAA2B,EAAE,mBAAmB,CAAC;KAC7D;CACO,CAAC"}

package/dist/prompt/limits.js

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import { estimateTokenCount } from './token-estimator.js';
-const SYSTEM_PROMPT_LIMIT = 1000;
-const CODEGEN_PROMPT_LIMIT = 800;
+const SYSTEM_PROMPT_LIMIT = 2700;
+const CODEGEN_PROMPT_LIMIT = 850;
 const SOURCE_CODE_LIMIT = 100000;
 function verifyPromptLimit(promptType, prompt, limit) {
     const tokenCount = estimateTokenCount(prompt);

package/dist/prompt/limits.test.js

@@ -7,8 +7,8 @@ describe('Prompt Limits', () => {
             expect(() => verifySystemPromptLimit(validPrompt)).not.toThrow();
         });
         it('should throw for a prompt exceeding the limit', () => {
-            const invalidPrompt = 'A '.repeat(2000);
-            expect(() => verifySystemPromptLimit(invalidPrompt)).toThrow('Token limit exceeded: 1300 > 1000');
+            const invalidPrompt = 'A '.repeat(5000);
+            expect(() => verifySystemPromptLimit(invalidPrompt)).toThrow('Token limit exceeded: 3250 > 2700');
         });
     });
     describe('verifyCodegenPromptLimit', () => {
@@ -18,7 +18,7 @@ describe('Prompt Limits', () => {
         });
         it('should throw for a prompt exceeding the limit', () => {
             const invalidPrompt = 'B '.repeat(10000);
-            expect(() => verifyCodegenPromptLimit(invalidPrompt)).toThrow('Token limit exceeded: 6500 > 800');
+            expect(() => verifyCodegenPromptLimit(invalidPrompt)).toThrow('Token limit exceeded: 6500 > 850');
         });
     });
     describe('verifySourceCodeLimit', () => {

package/dist/prompt/prompt-codegen.js

@@ -34,28 +34,37 @@ export function getCodeGenPrompt(options) {
         ? 'This is your task: ' + explicitPrompt + '\n\n'
         : codeGenFiles.length > 0
             ? `I have marked some files with the ${CODEGEN_TRIGGER} fragments:\n${codeGenFiles.join('\n')}\nYour task is to generate updates for those files according to the ${CODEGEN_TRIGGER} comments/context.`
-            : `No files are marked with ${CODEGEN_TRIGGER} fragment, so you can consider doing changes in any file${askQuestion ? ', but you should consult me by asking a question first.' : ''}.`;
+            : `No files are marked with the ${CODEGEN_TRIGGER} fragment, so you can consider making changes in any file${askQuestion ? ', but you should consult me by asking a question first.' : ''}.`;
     const codeGenPrompt = `${taskPrompt}
 
-Before proceeding with code generation, please summarize the proposed updates by calling the \`codegenSummary\` function with the appropriate arguments.
+Before proceeding with code generation, please:
 
-Ensure that you include:
+1. **Analyze the task and requirements**.
 
-- **\`explanation\`**: A brief description of the planned changes or reasoning for no changes.
+2. **Use the \`askQuestion\` function** to seek clarification if needed. For analysis requests, use the 'requestAnswer' actionType.
 
-- **\`fileUpdates\`**: A list of proposed file updates, each with required properties:
-  - **\`path\`**: Absolute file path to be updated.
-  - **\`updateToolName\`**: The tool to be used for the update (e.g., \`createFile\`, \`updateFile\`).
-  - **\`prompt\`**: A detailed prompt summarizing the planned changes for this file.
-  - **Other Properties**: Include any other necessary properties as per the \`codegenSummary\` function definition.
+3. **When you believe code changes are necessary**, use the 'confirmCodeGeneration' actionType to confirm with the user before proceeding.
 
-- **\`contextPaths\`**: A list of file paths that should be used as context for the code generation requests.
+4. **Only after confirmation**, summarize the plan of updates by calling the \`codegenSummary\` function with the appropriate arguments.
+
+   - Ensure that you include:
+     - **\`explanation\`**: A brief description of the planned changes or reasoning for no changes.
+     - **\`fileUpdates\`**: A list of proposed file updates, each with required properties:
+       - **\`path\`**: Absolute file path to be updated.
+       - **\`updateToolName\`**: The tool to be used for the update (e.g., \`createFile\`, \`updateFile\`).
+       - **\`prompt\`**: A detailed prompt summarizing the planned changes for this file.
+       - **Other Properties**: Include any other necessary properties as per the \`codegenSummary\` function definition.
+     - **\`contextPaths\`**: A list of file paths that should be used as context for the code generation requests.
+
+5. **Context Optimization**: Utilize the \`contextOptimization\` actionType to manage and optimize the context during code generation tasks. Generate a prompt using the \`contextOptimization\` property to guide the LLM in determining which parts of the context are most relevant to keep, enhancing efficiency and focus.
+
+6. **Check ActionType Selection**: Always verify that the correct \`actionType\` is being used, especially before requesting file content, to ensure the 'requestFilesContent' actionType is applied. This helps maintain vigilance and accuracy in task execution.
 
 ## My Requirements for Task Execution:
 
 ${importantTextPrompts ? `${importantTextPrompts}\n` : ''}
 ${considerAllFiles
-        ? 'You are allowed to modify all files in the application regardless if they contain codegen fragments or not.'
+        ? 'You are allowed to modify all files in the application regardless of whether they contain codegen fragments.'
         : 'Do not modify files which do not contain the fragments.'}
 ${allowFileCreate ? 'You are allowed to create new files.' : 'Do not create new files. (request permission via `askQuestion`)'}
 ${allowFileDelete
@@ -69,7 +78,10 @@ ${vision ? 'You are allowed to analyze image assets.' : 'Do not analyze image as
 ${imagen
         ? 'You are allowed to generate images.'
         : 'You are not allowed to generate images. (request permission via `askQuestion`)'}
-`;
+
+Remember to optimize token usage by reducing context when appropriate during askQuestion conversations. This will help avoid hitting rate limits and improve overall efficiency.
+
+ Start from generating codegen summary, this summary will be used as a context to generate updates, so make sure that it contains useful information.`;
     if (verbose) {
         console.log('Code gen prompt:');
         console.log(codeGenPrompt);
@@ -94,7 +106,7 @@ Lint command stderr:
 ${stderr}
 \`\`\`
 
-Please suggest changes to fix these lint errors.`;
+Please suggest changes to fix these lint errors. Use the 'requestAnswer' actionType if you need any clarifications before proposing fixes.`;
     if (verbose) {
         console.log('Lint fix prompt:');
         console.log(lintFixPrompt);

package/dist/prompt/prompt-codegen.js.map

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

package/dist/prompt/prompt-service-ask-question.test.d.ts

@@ -1,3 +1,4 @@
 import '../cli/cli-params.js';
+import '../files/cache-file.js';
 import '../files/read-files.js';
 import '../files/find-files.js';

package/dist/prompt/prompt-service-ask-question.test.js

@@ -4,6 +4,7 @@ import * as vertexAi from '../ai-service/vertex-ai.js';
 import * as prompts from '@inquirer/prompts';
 import { CancelablePromise } from '@inquirer/type';
 import '../cli/cli-params.js';
+import '../files/cache-file.js';
 import '../files/read-files.js';
 import '../files/find-files.js';
 import { getCodeGenPrompt } from './prompt-codegen.js';
@@ -29,6 +30,7 @@ vi.mock('../cli/cli-params.js', () => ({
     cheap: false,
     askQuestion: true,
 }));
+vi.mock('../files/cache-file.js');
 // Mock find-files module
 vi.mock('../files/find-files.js', () => ({
     getSourceFiles: () => [],
@@ -64,9 +66,8 @@ describe('promptService with askQuestion', () => {
                 name: 'askQuestion',
                 args: {
                     content: 'Do you want to proceed with code generation?',
-                    shouldPrompt: true,
+                    actionType: 'requestAnswer',
                     promptNecessity: 80,
-                    stopCodegen: false,
                 },
             },
         ];
@@ -75,9 +76,8 @@ describe('promptService with askQuestion', () => {
                 name: 'askQuestion',
                 args: {
                     content: 'Ok lets go',
-                    shouldPrompt: false,
+                    actionType: 'startCodeGeneration',
                     promptNecessity: 80,
-                    stopCodegen: false,
                 },
             },
         ];
@@ -113,9 +113,8 @@ describe('promptService with askQuestion', () => {
                 name: 'askQuestion',
                 args: {
                     content: 'Stopping code generation as requested.',
-                    shouldPrompt: false,
                     promptNecessity: 100,
-                    stopCodegen: true,
+                    actionType: 'cancelCodeGeneration',
                 },
             },
         ];
@@ -125,7 +124,7 @@ describe('promptService with askQuestion', () => {
         expect(result).toEqual([]);
         expect(console.log).toHaveBeenCalledWith('Assistant requested to stop code generation. Exiting...', undefined);
     });
-    it('should proceed with code generation when askQuestion returns shouldPrompt: false', async () => {
+    it('should not proceed with code generation when no askQuestion requests', async () => {
         const mockAskQuestionCall = [];
         const mockCodegenSummary = [
             {
@@ -138,12 +137,79 @@ describe('promptService with askQuestion', () => {
             },
         ];
         vi.mocked(vertexAi.generateContent)
+            .mockResolvedValueOnce(mockAskQuestionCall)
             .mockResolvedValueOnce(mockAskQuestionCall)
             .mockResolvedValueOnce(mockCodegenSummary);
         await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({ aiService: 'vertex-ai', disableContextOptimization: true, interactive: true }));
         expect(vertexAi.generateContent).toHaveBeenCalledTimes(2);
         expect(prompts.input).not.toHaveBeenCalled();
-        expect(console.log).toHaveBeenCalledWith('Assistant did not ask a question. Proceeding with code generation.');
+    });
+    it('should handle self-reflection mechanism', async () => {
+        const mockAskQuestionCall = [
+            {
+                name: 'askQuestion',
+                args: {
+                    content: 'Do you want to proceed with code generation?',
+                    actionType: 'requestAnswer',
+                    promptNecessity: 80,
+                },
+            },
+        ];
+        const mockAskQuestionReflectCall = [
+            {
+                name: 'askQuestionReflect',
+                args: {
+                    shouldEscalate: 70,
+                    reason: 'The response requires more advanced processing.',
+                },
+            },
+        ];
+        const mockAskQuestionReflectCall2 = [
+            {
+                name: 'askQuestionReflect',
+                args: {
+                    shouldEscalate: 30,
+                    reason: 'The response is ok.',
+                },
+            },
+        ];
+        const mockAskQuestionCall2 = [
+            {
+                name: 'askQuestion',
+                args: {
+                    content: 'Startin code generation',
+                    actionType: 'startCodeGeneration',
+                    promptNecessity: 80,
+                },
+            },
+        ];
+        const mockCodegenSummary = [
+            {
+                name: 'codegenSummary',
+                args: {
+                    fileUpdates: [],
+                    contextPaths: [],
+                    explanation: 'No updates needed',
+                },
+            },
+        ];
+        vi.mocked(vertexAi.generateContent)
+            .mockResolvedValueOnce(mockAskQuestionCall)
+            .mockResolvedValueOnce(mockAskQuestionReflectCall)
+            .mockResolvedValueOnce(mockAskQuestionCall)
+            .mockResolvedValueOnce(mockAskQuestionCall2)
+            .mockResolvedValueOnce(mockAskQuestionReflectCall2)
+            .mockResolvedValueOnce(mockCodegenSummary);
+        vi.mocked(prompts.input).mockImplementationOnce(() => CancelablePromise.resolve('Yes'));
+        await promptService(GENERATE_CONTENT_FNS, GENERATE_IMAGE_FNS, getCodeGenPrompt({
+            aiService: 'vertex-ai',
+            disableContextOptimization: true,
+            interactive: true,
+            askQuestion: true,
+            selfReflectionEnabled: true,
+        }));
+        expect(vertexAi.generateContent).toHaveBeenCalledTimes(6);
+        expect(console.log).toHaveBeenCalledWith('Received codegen summary, will collect partial updates', expect.any(Object));
     });
 });
 //# sourceMappingURL=prompt-service-ask-question.test.js.map

package/dist/prompt/prompt-service-ask-question.test.js.map

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

package/dist/prompt/prompt-service.d.ts

@@ -17,6 +17,5 @@ declare function prepareMessages(codegen: CodegenPrompt): {
     contextSourceCode: (paths: string[], pathsOnly?: boolean) => string;
     imageAssets: string;
     partialPromptTemplate(path: string): string;
-    invalidFunctionCall: string;
 };
 export {};

package/dist/prompt/prompt-service.js

@@ -13,9 +13,10 @@ import { executeStepContextOptimization } from './steps/step-context-optimizatio
 import { StepResult } from './steps/steps-types.js';
 import { putSystemMessage } from '../main/common/content-bus.js';
 import { handleAiServiceFallback } from './ai-service-fallback.js';
+import { summarizeSourceCode } from './steps/step-summarization.js';
+import { executeStepHistoryUpdate, getCurrentHistory } from './steps/step-history-update.js';
 /** A function that communicates with model using */
 export async function promptService(generateContentFns, generateImageFns, codegenPrompt, waitIfPaused = () => Promise.resolve()) {
-    const messages = prepareMessages(codegenPrompt);
     const generateContentFn = async (...args) => {
         return await handleAiServiceFallback(generateContentFns, codegenPrompt.options.aiService, codegenPrompt.options, ...args);
     };
@@ -23,16 +24,35 @@ export async function promptService(generateContentFns, generateImageFns, codege
         assert(codegenPrompt.options.imagen, 'imagen value must be provided');
         return generateImageFns[codegenPrompt.options.imagen](...args);
     };
-    // First stage: generate code generation summary, which should not take a lot of output tokens
+    const { result, prompt } = await executePromptService(generateContentFn, generateImageFn, codegenPrompt, waitIfPaused);
+    if (codegenPrompt.options.historyEnabled) {
+        await executeStepHistoryUpdate(generateContentFn, prompt, codegenPrompt.options);
+    }
+    return result;
+}
+async function executePromptService(generateContentFn, generateImageFn, codegenPrompt, waitIfPaused = () => Promise.resolve()) {
+    const messages = prepareMessages(codegenPrompt);
+    // First stage: summarize the source code
+    if (!codegenPrompt.options.disableContextOptimization) {
+        await summarizeSourceCode(generateContentFn, getSourceCode({ forceAll: true }, codegenPrompt.options), codegenPrompt.options);
+    }
+    // Second stage: generate code generation summary, which should not take a lot of output tokens
     const getSourceCodeRequest = { name: 'getSourceCode' };
     const prompt = [
         { type: 'systemPrompt', systemPrompt: getSystemPrompt(codegenPrompt.options) },
         { type: 'user', text: messages.suggestSourceCode },
-        { type: 'assistant', text: messages.requestSourceCode, functionCalls: [getSourceCodeRequest] },
+        {
+            type: 'assistant',
+            text: messages.requestSourceCode,
+            functionCalls: [getSourceCodeRequest, ...(codegenPrompt.options.historyEnabled ? [{ name: 'readHistory' }] : [])],
+        },
     ];
     const getSourceCodeResponse = {
         type: 'user',
-        functionResponses: [{ name: 'getSourceCode', content: messages.sourceCode }],
+        functionResponses: [
+            { name: 'getSourceCode', content: messages.sourceCode },
+            ...(codegenPrompt.options.historyEnabled ? [{ name: 'readHistory', content: getCurrentHistory() }] : []),
+        ],
         cache: true,
     };
     prompt.push(getSourceCodeResponse);
@@ -50,17 +70,17 @@ export async function promptService(generateContentFns, generateImageFns, codege
     }
     // Execute the context optimization step
     if (!codegenPrompt.options.disableContextOptimization) {
-        const sourceCode = JSON.parse(messages.sourceCode);
-        const optimizationResult = await executeStepContextOptimization(generateContentFn, prompt, sourceCode, codegenPrompt.options);
+        const optimizationResult = await executeStepContextOptimization(generateContentFn, prompt, codegenPrompt.options);
         if (optimizationResult === StepResult.BREAK) {
-            return [];
+            return { result: [], prompt };
         }
     }
     // Execute the ask question step
-    if (codegenPrompt.options.askQuestion !== false &&
-        (codegenPrompt.options.interactive || codegenPrompt.options.ui) &&
-        (await executeStepAskQuestion(generateContentFn, prompt, functionDefs, codegenPrompt.options.temperature ?? 0.7, codegenPrompt.options.cheap ?? false, messages, codegenPrompt.options)) === StepResult.BREAK) {
-        return [];
+    if (codegenPrompt.options.askQuestion !== false && (codegenPrompt.options.interactive || codegenPrompt.options.ui)) {
+        const askQuestionResult = await executeStepAskQuestion(generateContentFn, prompt, functionDefs, codegenPrompt.options.temperature ?? 0.7, messages, codegenPrompt.options);
+        if (askQuestionResult === StepResult.BREAK) {
+            return { result: [], prompt };
+        }
     }
     else if (codegenPrompt.options.askQuestion === false) {
         console.log('Ask question is not enabled.');
@@ -78,7 +98,7 @@ export async function promptService(generateContentFns, generateImageFns, codege
     if (codegenSummaryRequest) {
         // Second stage: for each file request the actual code updates
         putSystemMessage('Received codegen summary, will collect partial updates', codegenSummaryRequest.args);
-        baseResult = await validateAndRecoverSingleResult(baseRequest, baseResult, messages, generateContentFn);
+        baseResult = await validateAndRecoverSingleResult(baseRequest, baseResult, generateContentFn);
         codegenSummaryRequest = baseResult.find((call) => call.name === 'codegenSummary');
         // Sometimes the result happens to be a string
         assert(Array.isArray(codegenSummaryRequest?.args?.fileUpdates), 'fileUpdates is not an array');
@@ -88,7 +108,7 @@ export async function promptService(generateContentFns, generateImageFns, codege
             // Monkey patch the initial getSourceCode, do not send parts of source code that are consider irrelevant
             getSourceCodeRequest.args = {
                 filePaths: [
-                    ...codegenSummaryRequest.args.fileUpdates.map((file) => file.path),
+                    ...codegenSummaryRequest.args.fileUpdates.map((file) => file.filePath),
                     ...codegenSummaryRequest.args.contextPaths,
                     ...(importantContext.files ?? []),
                 ],
@@ -105,7 +125,7 @@ export async function promptService(generateContentFns, generateImageFns, codege
         });
         const result = [];
         for (const file of codegenSummaryRequest.args.fileUpdates) {
-            putSystemMessage('Collecting partial update for: ' + file.path + ' using tool: ' + file.updateToolName, file);
+            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);
@@ -116,10 +136,10 @@ export async function promptService(generateContentFns, generateImageFns, codege
             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.path);
+                prompt.slice(-1)[0].text = file.prompt ?? messages.partialPromptTemplate(file.filePath);
             }
             else {
-                prompt.push({ type: 'user', text: file.prompt ?? messages.partialPromptTemplate(file.path) });
+                prompt.push({ type: 'user', text: file.prompt ?? messages.partialPromptTemplate(file.filePath) });
             }
             if (codegenPrompt.options.vision && file.contextImageAssets) {
                 prompt.slice(-1)[0].images = file.contextImageAssets.map((path) => ({
@@ -139,7 +159,7 @@ export async function promptService(generateContentFns, generateImageFns, codege
             let partialResult = await generateContentFn(...partialRequest);
             putSystemMessage('Received partial update', partialResult);
             // Validate if function call is compliant with the schema
-            partialResult = await validateAndRecoverSingleResult(partialRequest, partialResult, messages, generateContentFn);
+            partialResult = await validateAndRecoverSingleResult(partialRequest, partialResult, generateContentFn);
             // Handle image generation requests
             const generateImageCall = partialResult.find((call) => call.name === 'generateImage');
             if (generateImageCall) {
@@ -148,21 +168,22 @@ export async function promptService(generateContentFns, generateImageFns, codege
             // Verify if patchFile is one of the functions called, and test if patch is valid and can be applied successfully
             const patchFileCall = partialResult.find((call) => call.name === 'patchFile');
             if (patchFileCall) {
-                partialResult = await executeStepVerifyPatch(patchFileCall.args, generateContentFn, prompt, functionDefs, file.temperature ?? codegenPrompt.options.temperature, file.cheap === true, messages, codegenPrompt.options);
+                partialResult = await executeStepVerifyPatch(patchFileCall.args, generateContentFn, prompt, functionDefs, file.temperature ?? codegenPrompt.options.temperature, file.cheap === true, codegenPrompt.options);
             }
             // add the code gen result to the context, as the subsequent code gen may depend on the result
             prompt.push({ type: 'assistant', functionCalls: partialResult }, {
                 type: 'user',
+                text: 'Update applied.',
                 functionResponses: partialResult.map((call) => ({ name: call.name, call_id: call.id })),
             });
             result.push(...partialResult);
         }
-        return result;
+        return { result, prompt };
     }
     else {
         // This is unexpected, if happens probably means no code updates.
         putSystemMessage('Did not receive codegen summary, returning result.');
-        return baseResult;
+        return { result: baseResult, prompt };
     }
 }
 /**
@@ -182,7 +203,6 @@ function prepareMessages(codegen) {
         partialPromptTemplate(path) {
             return `Thank you for providing the summary, now suggest changes for the \`${path}\` file using appropriate tools.`;
         },
-        invalidFunctionCall: 'Function call was invalid, please analyze the error and respond with corrected function call.',
     };
 }
 //# sourceMappingURL=prompt-service.js.map