npm - genaicode - Versions diffs - 0.9.2 → 0.9.4 - Mend

genaicode 0.9.2 → 0.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (104) hide show

package/dist/prompt/steps/step-ask-question/handlers/handle-request-files-content.js ADDED Viewed

@@ -0,0 +1,134 @@
+import { ModelType } from '../../../../ai-service/common-types.js';
+import { refreshFiles } from '../../../../files/find-files.js';
+import { getSourceCode } from '../../../../files/read-files.js';
+import { getExpandedContextPaths } from '../../../../files/source-code-utils.js';
+import { putSystemMessage } from '../../../../main/common/content-bus.js';
+import { getFunctionDefs } from '../../../function-calling.js';
+import { isFileContentAlreadyProvided, categorizeLegitimateFiles } from './file-request-utils.js';
+export async function handleRequestFilesContent({ askQuestionCall, options, prompt, generateContentFn, }) {
+    let requestFilesContentCall = await generateRequestFilesContentCall(generateContentFn, prompt, askQuestionCall, options, ModelType.CHEAP);
+    if (!requestFilesContentCall) {
+        return {
+            breakLoop: true,
+            items: [],
+        };
+    }
+    let requestedFiles = getExpandedContextPaths(requestFilesContentCall.args?.filePaths ?? [], options);
+    putSystemMessage('Requesting files content', {
+        requestedFiles,
+        expandedRequestedFiles: requestedFiles.filter((file) => !requestFilesContentCall?.args?.filePaths?.includes(file)),
+    });
+    // Check which files are already provided in the conversation history
+    const alreadyProvidedFiles = requestedFiles.filter((file) => isFileContentAlreadyProvided(file, prompt));
+    if (alreadyProvidedFiles.length === requestedFiles.length) {
+        putSystemMessage('All requested files are already provided');
+        // All requested files are already provided
+        prompt.push({
+            type: 'assistant',
+            text: askQuestionCall.args?.message ?? '',
+            functionCalls: [requestFilesContentCall],
+        }, {
+            type: 'user',
+            text: 'The requested file contents are already provided in the conversation history.',
+            functionResponses: [
+                {
+                    name: 'requestFilesContent',
+                    call_id: requestFilesContentCall.id,
+                    content: JSON.stringify({ filePaths: requestedFiles }),
+                },
+            ],
+            cache: true,
+        });
+        return { breakLoop: false, items: [] };
+    }
+    // Filter out already provided files
+    requestedFiles = requestedFiles.filter((file) => !isFileContentAlreadyProvided(file, prompt));
+    // the request may be caused be an appearance of a new file, so lets refresh
+    refreshFiles();
+    let { legitimateFiles, illegitimateFiles } = categorizeLegitimateFiles(requestedFiles);
+    if (illegitimateFiles.length > 0) {
+        requestFilesContentCall = await generateRequestFilesContentCall(generateContentFn, prompt, askQuestionCall, options,
+        // use non cheap mode, as maybe the cheap mode didn't provide correct files
+        ModelType.DEFAULT);
+        if (!requestFilesContentCall) {
+            return {
+                breakLoop: true,
+                items: [],
+            };
+        }
+        requestedFiles = requestFilesContentCall.args?.filePaths ?? [];
+        const categorized = categorizeLegitimateFiles(requestedFiles);
+        legitimateFiles = categorized.legitimateFiles;
+        illegitimateFiles = categorized.illegitimateFiles;
+    }
+    const sourceCallId = (askQuestionCall.id ?? askQuestionCall.name) + '_source';
+    const assistant = {
+        type: 'assistant',
+        text: askQuestionCall.args?.message ?? '',
+        functionCalls: [
+            requestFilesContentCall,
+            { name: 'getSourceCode', id: sourceCallId, args: { filePaths: legitimateFiles } },
+        ],
+    };
+    const sourceCode = getSourceCode({ filterPaths: legitimateFiles, forceAll: true, ignoreImportantFiles: true }, options);
+    const user = {
+        type: 'user',
+        text: (alreadyProvidedFiles.length > 0
+            ? // TODO: Maybe reference to some specific getSourceCode call id
+                `Some files were already provided in the conversation history:
+${alreadyProvidedFiles.map((path) => `- ${path}`).join('\n')}
+Providing content for the remaining files:
+${requestedFiles.map((path) => `- ${path}`).join('\n')}`
+            : `All requested file contents have been provided:
+${legitimateFiles.map((path) => `- ${path}`).join('\n')}`) +
+            (illegitimateFiles.length > 0
+                ? `\n\nSome files are not legitimate and their content cannot be provided:
+${illegitimateFiles.map((path) => `- ${path}`).join('\n')}`
+                : ''),
+        data: { legitimateFiles, illegitimateFiles },
+        functionResponses: [
+            {
+                name: 'requestFilesContent',
+                call_id: requestFilesContentCall.id,
+                content: JSON.stringify({ filePaths: legitimateFiles }),
+            },
+            {
+                name: 'getSourceCode',
+                call_id: sourceCallId,
+                content: JSON.stringify(sourceCode),
+            },
+        ],
+        cache: true,
+    };
+    putSystemMessage('Providing files content', {
+        requestedFiles,
+        legitimateFiles,
+        illegitimateFiles,
+    });
+    prompt.push(assistant, user);
+    return { breakLoop: false, items: [] };
+}
+export async function generateRequestFilesContentCall(generateContentFn, prompt, askQuestionCall, options, modelType) {
+    const req = [
+        [
+            ...prompt,
+            {
+                type: 'assistant',
+                text: askQuestionCall.args?.message ?? '',
+            },
+            {
+                type: 'user',
+                text: 'Yes, you can request the files contents.',
+            },
+        ],
+        getFunctionDefs(),
+        'requestFilesContent',
+        0.7,
+        modelType,
+        options,
+    ];
+    const [requestFilesContentCall] = (await generateContentFn(...req));
+    return requestFilesContentCall;
+}
+//# sourceMappingURL=handle-request-files-content.js.map

package/dist/prompt/steps/step-ask-question/handlers/handle-request-files-content.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/prompt/steps/step-ask-question/handlers/handle-request-files-fragments.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import { GenerateContentFunction } from '../../../../ai-service/common-types.js';
+import { PromptItem } from '../../../../ai-service/common-types.js';
+import { FunctionCall } from '../../../../ai-service/common-types.js';
+import { ModelType } from '../../../../ai-service/common-types.js';
+import { CodegenOptions } from '../../../../main/codegen-types.js';
+import { ActionHandlerProps, ActionResult, AskQuestionCall, RequestFilesFragmentsArgs } from '../step-ask-question-types.js';
+export declare function handleRequestFilesFragments({ askQuestionCall, options, prompt, generateContentFn, }: ActionHandlerProps): Promise<ActionResult>;
+export declare function generateRequestFilesFragmentsCall(generateContentFn: GenerateContentFunction, prompt: PromptItem[], askQuestionCall: AskQuestionCall, options: CodegenOptions, modelType: ModelType): Promise<FunctionCall<RequestFilesFragmentsArgs> | undefined>;

package/dist/prompt/steps/step-ask-question/handlers/handle-request-files-fragments.js ADDED Viewed

@@ -0,0 +1,171 @@
+import { ModelType } from '../../../../ai-service/common-types.js';
+import { generateFileId } from '../../../../files/file-id-utils.js';
+import { getSourceCode } from '../../../../files/read-files.js';
+import { putSystemMessage } from '../../../../main/common/content-bus.js';
+import { getFunctionDefs } from '../../../function-calling.js';
+import { processFileRequests, generateFilesContentPrompt } from './file-request-utils.js';
+export async function handleRequestFilesFragments({ askQuestionCall, options, prompt, generateContentFn, }) {
+    let requestFilesFragmentsCall = await generateRequestFilesFragmentsCall(generateContentFn, prompt, askQuestionCall, options, ModelType.CHEAP);
+    if (!requestFilesFragmentsCall) {
+        return {
+            breakLoop: true,
+            items: [],
+        };
+    }
+    const fragmentPrompt = requestFilesFragmentsCall.args?.fragmentPrompt;
+    if (!fragmentPrompt) {
+        putSystemMessage('No fragment prompt provided');
+        return {
+            breakLoop: true,
+            items: [],
+        };
+    }
+    // Process file requests using the utility function
+    let { requestedFiles, alreadyProvidedFiles, legitimateFiles, illegitimateFiles } = processFileRequests(requestFilesFragmentsCall.args?.filePaths ?? [], prompt, options);
+    if (alreadyProvidedFiles.length === requestedFiles.length) {
+        putSystemMessage('All requested files are already provided');
+        prompt.push({
+            type: 'assistant',
+            text: askQuestionCall.args?.message ?? '',
+            functionCalls: [requestFilesFragmentsCall],
+        }, {
+            type: 'user',
+            text: 'The requested file fragments are already provided in the conversation history.',
+            functionResponses: [
+                {
+                    name: 'requestFilesFragments',
+                    call_id: requestFilesFragmentsCall.id,
+                    content: JSON.stringify({ filePaths: requestedFiles }),
+                },
+            ],
+            cache: true,
+        });
+        return { breakLoop: false, items: [] };
+    }
+    // If there are illegitimate files, try again with non-cheap mode
+    if (illegitimateFiles.length > 0) {
+        requestFilesFragmentsCall = await generateRequestFilesFragmentsCall(generateContentFn, prompt, askQuestionCall, options, ModelType.DEFAULT);
+        if (!requestFilesFragmentsCall) {
+            return {
+                breakLoop: true,
+                items: [],
+            };
+        }
+        const processed = processFileRequests(requestFilesFragmentsCall.args?.filePaths ?? [], prompt, options);
+        requestedFiles = processed.requestedFiles;
+        alreadyProvidedFiles = processed.alreadyProvidedFiles;
+        legitimateFiles = processed.legitimateFiles;
+        illegitimateFiles = processed.illegitimateFiles;
+    }
+    // Get the content of legitimate files
+    const sourceCodeMap = await getSourceCode({ filterPaths: legitimateFiles, forceAll: true, ignoreImportantFiles: true }, options);
+    // Extract fragments from files using LLM
+    const extractedFragments = await extractFragments(sourceCodeMap, fragmentPrompt, generateContentFn, options);
+    const sourceCallId = (askQuestionCall.id ?? askQuestionCall.name) + '_source';
+    const assistant = {
+        type: 'assistant',
+        text: askQuestionCall.args?.message ?? '',
+        functionCalls: [
+            requestFilesFragmentsCall,
+            { name: 'getSourceCode', id: sourceCallId, args: { filePaths: legitimateFiles } },
+        ],
+    };
+    const fragmentsSourceCode = {};
+    for (const fragment of extractedFragments.fragments) {
+        fragmentsSourceCode[fragment.filePath] = {
+            fileId: generateFileId(fragment.filePath),
+            fragments: [fragment.content],
+        };
+    }
+    const user = {
+        type: 'user',
+        text: generateFilesContentPrompt(alreadyProvidedFiles, requestedFiles, legitimateFiles, illegitimateFiles, 'fragments'),
+        data: { legitimateFiles, illegitimateFiles },
+        functionResponses: [
+            {
+                name: 'requestFilesFragments',
+                call_id: requestFilesFragmentsCall.id,
+                content: JSON.stringify({ filePaths: legitimateFiles }),
+            },
+            {
+                name: 'getSourceCode',
+                call_id: sourceCallId,
+                content: JSON.stringify(fragmentsSourceCode),
+            },
+        ],
+        cache: true,
+    };
+    putSystemMessage('Providing files fragments', {
+        requestedFiles,
+        legitimateFiles,
+        illegitimateFiles,
+        fragmentCount: extractedFragments.fragments.length,
+    });
+    prompt.push(assistant, user);
+    return { breakLoop: false, items: [] };
+}
+export async function generateRequestFilesFragmentsCall(generateContentFn, prompt, askQuestionCall, options, modelType) {
+    const [requestFilesFragmentsCall] = (await generateContentFn([
+        ...prompt,
+        {
+            type: 'assistant',
+            text: askQuestionCall.args?.message ?? '',
+        },
+        {
+            type: 'user',
+            text: 'Yes, you can request the file fragments.',
+        },
+    ], getFunctionDefs(), 'requestFilesFragments', 0.7, modelType, options));
+    return requestFilesFragmentsCall;
+}
+/**
+ * Extract fragments from files using LLM with multi-file support
+ */
+async function extractFragments(sourceCodeMap, fragmentPrompt, generateContentFn, options) {
+    const filePaths = Object.keys(sourceCodeMap);
+    try {
+        // Process all files in a single LLM call
+        const [extractFragmentsCall] = (await generateContentFn([
+            {
+                type: 'systemPrompt',
+                systemPrompt: 'You are tasked with extracting relevant fragments from multiple source code files based on a given prompt. ' +
+                    'Analyze each file thoroughly, identify meaningful sections that match the prompt criteria, and provide clear ' +
+                    'explanations for your selections. Each fragment must be attributed to its source file for proper tracking.',
+            },
+            {
+                type: 'assistant',
+                text: 'I will analyze the provided files and extract relevant fragments based on your prompt.',
+                functionCalls: [{ name: 'getSourceCode', args: { filePaths } }],
+            },
+            {
+                type: 'user',
+                text: `Please extract relevant fragments from the provided files.\nExtraction prompt: ${fragmentPrompt}`,
+                functionResponses: [
+                    {
+                        name: 'getSourceCode',
+                        content: JSON.stringify(sourceCodeMap),
+                    },
+                ],
+            },
+        ], getFunctionDefs(), 'extractFileFragments', 0.2, ModelType.CHEAP, options));
+        if (!extractFragmentsCall?.args) {
+            putSystemMessage('Failed to extract fragments');
+            return {
+                filePaths,
+                fragments: [],
+                reasoning: 'Fragment extraction failed',
+            };
+        }
+        putSystemMessage(`Successfully extracted ${extractFragmentsCall.args.fragments.length} fragments from ${filePaths.length} files`);
+        return extractFragmentsCall.args;
+    }
+    catch (error) {
+        putSystemMessage('Error during fragment extraction', { error });
+        return {
+            filePaths,
+            fragments: [],
+            reasoning: `Error during fragment extraction: ${error}`,
+        };
+    }
+}
+//# sourceMappingURL=handle-request-files-fragments.js.map

package/dist/prompt/steps/step-ask-question/handlers/handle-request-files-fragments.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/prompt/steps/step-ask-question/handlers/handle-request-permissions.d.ts ADDED Viewed

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

package/dist/prompt/steps/step-ask-question/handlers/handle-request-permissions.js ADDED Viewed

@@ -0,0 +1,69 @@
+import { ModelType } from '../../../../ai-service/common-types.js';
+import { askUserForConfirmation } from '../../../../main/common/user-actions.js';
+import { getFunctionDefs } from '../../../function-calling.js';
+export async function handleRequestPermissions({ askQuestionCall, options, prompt, generateContentFn, }) {
+    const [requestPermissionsCall] = (await generateContentFn([
+        ...prompt,
+        {
+            type: 'assistant',
+            text: askQuestionCall.args?.message ?? '',
+        },
+        {
+            type: 'user',
+            text: 'Yes, you can request the permissions.',
+        },
+    ], getFunctionDefs(), 'requestPermissions', 0.7, ModelType.CHEAP, options));
+    if (!requestPermissionsCall) {
+        return {
+            breakLoop: true,
+            items: [],
+        };
+    }
+    const userConfirmation = await askUserForConfirmation('The assistant is requesting additional permissions. Do you want to grant them?', false, options);
+    const user = {
+        type: 'user',
+        text: userConfirmation ? 'Permissions granted.' : 'Permission request denied.',
+        functionResponses: [
+            {
+                name: 'requestPermissions',
+                call_id: requestPermissionsCall.id,
+                content: JSON.stringify({ confirmed: userConfirmation.confirmed }),
+            },
+        ],
+    };
+    if (userConfirmation.confirmed) {
+        updatePermissions(requestPermissionsCall, options);
+    }
+    return {
+        breakLoop: false,
+        items: [
+            {
+                assistant: {
+                    type: 'assistant',
+                    text: askQuestionCall.args?.message ?? '',
+                    functionCalls: [requestPermissionsCall],
+                },
+                user,
+            },
+        ],
+    };
+}
+function updatePermissions(requestPermissionsCall, options) {
+    const permissions = requestPermissionsCall.args;
+    if (permissions) {
+        if ('enableImagen' in permissions && permissions.enableImagen) {
+            options.imagen = options.aiService === 'openai' ? 'dall-e' : 'vertex-ai';
+        }
+        if ('enableVision' in permissions && permissions.enableVision)
+            options.vision = true;
+        if ('allowDirectoryCreate' in permissions && permissions.allowDirectoryCreate)
+            options.allowDirectoryCreate = true;
+        if ('allowFileCreate' in permissions && permissions.allowFileCreate)
+            options.allowFileCreate = true;
+        if ('allowFileDelete' in permissions && permissions.allowFileDelete)
+            options.allowFileDelete = true;
+        if ('allowFileMove' in permissions && permissions.allowFileMove)
+            options.allowFileMove = true;
+    }
+}
+//# sourceMappingURL=handle-request-permissions.js.map

package/dist/prompt/steps/step-ask-question/handlers/handle-request-permissions.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/prompt/steps/step-ask-question/handlers/handle-update-file.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { ModelType } from '../../../../ai-service/common-types.js';
 import { askUserForConfirmationWithAnswer } from '../../../../main/common/user-actions.js';
 import { putSystemMessage, putUserMessage } from '../../../../main/common/content-bus.js';
 import { refreshFiles } from '../../../../files/find-files.js';
-import { generateRequestFilesContentCall } from './request-files-content.js';
+import { generateRequestFilesContentCall } from './handle-request-files-content.js';
 import { executeStepEnsureContext } from '../../step-ensure-context.js';
 export const handleUpdateFile = async ({ askQuestionCall, options, prompt, generateContentFn, }) => {
     putSystemMessage('File update requested.', askQuestionCall);
@@ -31,7 +31,7 @@ export const handleUpdateFile = async ({ askQuestionCall, options, prompt, gener
     if (generateConfirmation.answer) {
         putUserMessage(generateConfirmation.answer);
     }
-    putSystemMessage('Content generation started.', askQuestionCall);
+    putSystemMessage('Content generation started.');
     // Ensure file content is available in the context
     const requestedFilesCall = await generateRequestFilesContentCall(generateContentFn, prompt, askQuestionCall, options, ModelType.CHEAP);
     if (requestedFilesCall) {

package/dist/prompt/steps/step-ask-question/handlers/handle-update-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"handle-update-file.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-update-file.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,IAAI,iBAAiB,EAAE,MAAM,4DAA4D,CAAC;AAE3G,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,+BAA+B,EAAE,MAAM,~~4BAA4B~~,CAAC;~~AAC7E~~,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,MAAM,CAAC,MAAM,gBAAgB,GAAkB,KAAK,EAAE,EACpD,eAAe,EACf,OAAO,EACP,MAAM,EACN,iBAAiB,GAClB,EAAyB,EAAE;IAC1B,gBAAgB,CAAC,wBAAwB,EAAE,eAAe,CAAC,CAAC;IAE5D,+EAA+E;IAC/E,MAAM,oBAAoB,GAAG,MAAM,gCAAgC,CACjE,oHAAoH,EACpH,kBAAkB,EAClB,2BAA2B,EAC3B,KAAK,EACL,OAAO,CACR,CAAC;IAEF,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC;QACpC,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE;gBACL;oBACE,SAAS,EAAE;wBACT,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,eAAe,CAAC,IAAK,CAAC,OAAO;qBACpC;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,wBAAwB,GAAG,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBACxG;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAED,IAAI,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAChC,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,gBAAgB,CAAC,6BAA6B,~~EAAE,eAAe,~~CAAC,CAAC;~~IAEjE~~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"}
1	+ {"version":3,"file":"handle-update-file.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-update-file.ts"],"names":[],"mappings":"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"}

package/dist/prompt/steps/step-ask-question/handlers/request-files-content.js CHANGED Viewed

@@ -4,7 +4,6 @@ import { getSourceCode } from '../../../../files/read-files.js';
 import { getExpandedContextPaths } from '../../../../files/source-code-utils.js';
 import { putSystemMessage } from '../../../../main/common/content-bus.js';
 import { getFunctionDefs } from '../../../function-calling.js';
-import { validateAndRecoverSingleResult } from '../../step-validate-recover.js';
 export async function handleRequestFilesContent({ askQuestionCall, options, prompt, generateContentFn, }) {
     let requestFilesContentCall = await generateRequestFilesContentCall(generateContentFn, prompt, askQuestionCall, options, ModelType.CHEAP);
     if (!requestFilesContentCall) {
@@ -21,6 +20,7 @@ export async function handleRequestFilesContent({ askQuestionCall, options, prom
     // Check which files are already provided in the conversation history
     const alreadyProvidedFiles = requestedFiles.filter((file) => isFileContentAlreadyProvided(file, prompt));
     if (alreadyProvidedFiles.length === requestedFiles.length) {
+        putSystemMessage('All requested files are already provided');
         // All requested files are already provided
         prompt.push({
             type: 'assistant',
@@ -100,6 +100,11 @@ ${illegitimateFiles.map((path) => `- ${path}`).join('\n')}`
         ],
         cache: true,
     };
+    putSystemMessage('Providing files content', {
+        requestedFiles,
+        legitimateFiles,
+        illegitimateFiles,
+    });
     prompt.push(assistant, user);
     return { breakLoop: false, items: [] };
 }
@@ -122,8 +127,7 @@ export async function generateRequestFilesContentCall(generateContentFn, prompt,
         modelType,
         options,
     ];
-    const result = await generateContentFn(...req);
-    const [requestFilesContentCall] = (await validateAndRecoverSingleResult(req, result, generateContentFn));
+    const [requestFilesContentCall] = (await generateContentFn(...req));
     return requestFilesContentCall;
 }
 /**

package/dist/prompt/steps/step-ask-question/handlers/request-files-content.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"request-files-content.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/request-files-content.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;~~AAC~~/D,~~OAAO,EAAE,8BAA8B,EAAE,~~MAAM,~~gCAAgC,~~CAAC~~;AAUhF~~,~~MAAM,CAAC,~~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~~MAAM,GAAG,MAAM,iBAAiB,~~CAAC,~~GAAG,GAAG,CAAC,CAAC;IAC/C,MAAM,CAAC,~~uBAAuB,CAAC,GAAG,CAAC,MAAM,~~8BAA8B~~,CAAC,GAAG,~~EAAE~~,~~MAAM,EAAE,iBAAiB,~~CAAC,~~CAEtG~~,CAAC;IAEF,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAED;;;;;GAKG;AACH,SAAS,4BAA4B,CAAC,QAAgB,EAAE,MAAoB;IAC1E,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACpD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC3D,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAEnD,OAAO,CACL,aAAa,CAAC,QAAQ,CAAC;oBACvB,aAAa,CAAC,QAAQ,CAAC;oBACvB,SAAS,IAAI,aAAa,CAAC,QAAQ,CAAC;oBACpC,aAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,KAAK,IAAI,CACzC,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;gBAC7D,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,yBAAyB,CAAC,cAAwB;IAIzD,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,yEAAyE;IAEzE,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAClC,IAAI,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,CAAC;AAChD,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,OAAO,cAAc,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC7C,CAAC"}
1	+ {"version":3,"file":"request-files-content.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/request-files-content.ts"],"names":[],"mappings":"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"}

package/dist/prompt/steps/step-ask-question/step-ask-question-types.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import { PromptItemImage } from '../../../ai-service/common-types.js';
 import { FunctionCall } from '../../../ai-service/common-types.js';
 import { CodegenOptions } from '../../../main/codegen-types.js';
 import { PluginActionType } from '../../../ai-service/service-configurations-types.js';
-export type ActionType = 'codeGeneration' | 'sendMessage' | 'generateImage' | 'requestPermissions' | 'requestFilesContent' | 'removeFilesFromContext' | 'confirmCodeGeneration' | 'endConversation' | 'contextOptimization' | 'contextCompression' | 'searchCode' | 'lint' | 'updateFile' | 'performAnalysis' | 'createFile' | 'pullAppContext' | 'genaicodeHelp' | 'pushAppContext' | 'reasoningInference' | PluginActionType;
+export type ActionType = 'codeGeneration' | 'sendMessage' | 'generateImage' | 'requestPermissions' | 'requestFilesContent' | 'removeFilesFromContext' | 'confirmCodeGeneration' | 'endConversation' | 'contextOptimization' | 'contextCompression' | 'searchCode' | 'lint' | 'updateFile' | 'performAnalysis' | 'createFile' | 'pullAppContext' | 'genaicodeHelp' | 'pushAppContext' | 'reasoningInference' | 'requestFilesFragments' | PluginActionType;
 type AskQuestionArgs = {
     actionType: ActionType;
     message: string;
@@ -45,6 +45,12 @@ export type RequestPermissionsArgs = Record<'allowDirectoryCreate' | 'allowFileC
 export type RequestFilesContentArgs = {
     filePaths: string[];
 };
+export type RequestFilesFragmentsArgs = {
+    /** Array of file paths to extract fragments from */
+    filePaths: string[];
+    /** Prompt describing what information should be extracted from the files */
+    fragmentPrompt: string;
+};
 export type RemoveFilesFromContextArgs = {
     filePaths: string[];
 };

package/dist/prompt/steps/step-ask-question/step-ask-question.js CHANGED Viewed

@@ -1,18 +1,18 @@
 import { ModelType } from '../../../ai-service/common-types.js';
 import { putAssistantMessage, putSystemMessage, putUserMessage } from '../../../main/common/content-bus.js';
 import { abortController } from '../../../main/common/abort-controller.js';
-import { validateAndRecoverSingleResult } from '../step-validate-recover.js';
-import { handleRequestFilesContent } from './handlers/request-files-content.js';
-import { handleContextOptimization } from './handlers/context-optimization.js';
-import { handleRemoveFilesFromContext } from './handlers/remove-files-from-context.js';
-import { handleRequestPermissions } from './handlers/request-permissions.js';
+import { handleRequestFilesContent } from './handlers/handle-request-files-content.js';
+import { handleContextOptimization } from './handlers/handle-context-optimization.js';
+import { handleRequestFilesFragments } from './handlers/handle-request-files-fragments.js';
+import { handleRemoveFilesFromContext } from './handlers/handle-remove-files-from-context.js';
+import { handleRequestPermissions } from './handlers/handle-request-permissions.js';
 import { handleSendMessage } from './handlers/handle-send-message.js';
 import { handleGenerateImage } from './handlers/handle-generate-image.js';
-import { handleConfirmCodeGeneration } from './handlers/confirm-code-generation.js';
+import { handleConfirmCodeGeneration } from './handlers/handle-confirm-code-generation.js';
 import { handleEndConversation } from './handlers/handle-end-conversation.js';
-import { handleLint } from './handlers/lint.js';
+import { handleLint } from './handlers/handle-lint.js';
 import { getRegisteredActionHandlers } from '../../../main/plugin-loader.js';
-import { handleCodeGeneration } from './handlers/code-generation.js';
+import { handleCodeGeneration } from './handlers/handle-code-generation.js';
 import { handleSearchCode } from './handlers/handle-search-code.js';
 import { handleUpdateFile } from './handlers/handle-update-file.js';
 import { handlePerformAnalysis } from './handlers/handle-perform-analysis.js';
@@ -22,16 +22,20 @@ import { handlePushAppContext } from './handlers/handle-push-app-context.js';
 import { handleReasoningInference } from './handlers/handle-reasoning-inference.js';
 import { handleGenaicodeHelp } from './handlers/handle-genaicode-help.js';
 import { handleContextCompression } from './handlers/handle-context-compression.js';
+import { getUsageMetrics } from '../../../main/common/cost-collector.js';
 export async function executeStepAskQuestion(generateContentFn, generateImageFn, prompt, functionDefs, waitIfPaused, temperature, options) {
     putSystemMessage('Allowing the assistant to ask a question...');
     while (!abortController?.signal.aborted) {
         try {
+            // Calculate context size using the total tokens per day (this is not a perfect metric, but it's a good approximation)
+            const lastTokenCount = getUsageMetrics().total.tpd;
             const askQuestionCall = await getAskQuestionCall(generateContentFn, prompt, functionDefs, temperature, options);
+            const totalTokens = getUsageMetrics().total.tpd - lastTokenCount;
             if (!askQuestionCall) {
                 break;
             }
             if (askQuestionCall.args?.message) {
-                putAssistantMessage(askQuestionCall.args.message, askQuestionCall.args);
+                putAssistantMessage(askQuestionCall.args.message, { ...askQuestionCall.args, contextSize: totalTokens });
             }
             const actionType = askQuestionCall.args?.actionType;
             if (actionType) {
@@ -91,8 +95,7 @@ async function getAskQuestionCall(generateContentFn, prompt, functionDefs, tempe
         ModelType.CHEAP,
         options,
     ];
-    let askQuestionResult = await generateContentFn(...askQuestionRequest);
-    askQuestionResult = await validateAndRecoverSingleResult(askQuestionRequest, askQuestionResult, generateContentFn);
+    const askQuestionResult = await generateContentFn(...askQuestionRequest);
     return askQuestionResult.find((call) => call.name === 'askQuestion');
 }
 function getActionHandler(actionType) {
@@ -107,6 +110,7 @@ function getActionHandler(actionType) {
         endConversation: handleEndConversation,
         confirmCodeGeneration: handleConfirmCodeGeneration,
         requestFilesContent: handleRequestFilesContent,
+        requestFilesFragments: handleRequestFilesFragments,
         requestPermissions: handleRequestPermissions,
         removeFilesFromContext: handleRemoveFilesFromContext,
         sendMessage: handleSendMessage,