genaicode 0.9.5 → 0.10.0

package/dist/prompt/steps/step-ask-question/handlers/handle-conversation-graph.js

@@ -75,22 +75,21 @@ registerActionHandler('conversationGraph', handleConversationGraph);
 export async function handleConversationGraph({ askQuestionCall, prompt, options, generateContentFn, generateImageFn, waitIfPaused, }) {
     try {
         const userConfirmation = await askUserForConfirmationWithAnswer('The assistant wants to perform a conversation graph. Do you want to proceed?', 'Run conversation graph', 'Decline', true, options);
+        if (userConfirmation.answer) {
+            putUserMessage(userConfirmation.answer);
+        }
         if (!userConfirmation.confirmed) {
             putSystemMessage('Conversation graph declined.');
+            prompt.push({
+                type: 'assistant',
+                text: askQuestionCall.args?.message ?? '',
+            }, {
+                type: 'user',
+                text: 'Declined conversation graph. ' + (userConfirmation.answer ? `\n\n${userConfirmation.answer}` : ''),
+            });
             return {
                 breakLoop: false,
-                items: [
-                    {
-                        assistant: {
-                            type: 'assistant',
-                            text: askQuestionCall.args?.message ?? '',
-                        },
-                        user: {
-                            type: 'user',
-                            text: 'Declined conversation graph. ' + userConfirmation.answer,
-                        },
-                    },
-                ],
+                items: [],
             };
         }
         putSystemMessage('Generating conversation graph...');
@@ -103,9 +102,21 @@ export async function handleConversationGraph({ askQuestionCall, prompt, options
             },
             {
                 type: 'user',
-                text: CONVERSATION_GRAPH_PROMPT,
+                text: CONVERSATION_GRAPH_PROMPT + (userConfirmation.answer ? `\n\n${userConfirmation.answer}` : ''),
+            },
+        ], {
+            functionDefs: getFunctionDefs(),
+            requiredFunctionName: 'conversationGraph',
+            temperature: 0.7,
+            modelType: ModelType.DEFAULT,
+            expectedResponseType: {
+                text: false,
+                functionCall: true,
+                media: false,
             },
-        ], getFunctionDefs(), 'conversationGraph', 0.7, ModelType.DEFAULT, options));
+        }, options))
+            .filter((item) => item.type === 'functionCall')
+            .map((item) => item.functionCall);
         prompt.push({
             type: 'assistant',
             text: askQuestionCall.args?.message ?? '',
@@ -129,20 +140,17 @@ export async function handleConversationGraph({ askQuestionCall, prompt, options
         // Start with the first node
         let currentNode = nodes.find((node) => node.id === entryNode);
         if (!currentNode) {
+            putSystemMessage('Error occurred during conversation graph execution.');
+            prompt.push({
+                type: 'assistant',
+                text: askQuestionCall.args?.message ?? '',
+            }, {
+                type: 'user',
+                text: 'Error occurred during conversation graph execution.',
+            });
             return {
                 breakLoop: false,
-                items: [
-                    {
-                        assistant: {
-                            type: 'assistant',
-                            text: askQuestionCall.args?.message ?? '',
-                        },
-                        user: {
-                            type: 'user',
-                            text: 'Error occurred during conversation graph execution.',
-                        },
-                    },
-                ],
+                items: [],
             };
         }
         // Track visited nodes to prevent cycles
@@ -154,7 +162,19 @@ export async function handleConversationGraph({ askQuestionCall, prompt, options
             visitedNodes.add(currentNode.id);
             // Execute the current node
             putSystemMessage(`Executing node ${currentNode.id}`, currentNode);
-            const [sendMessage] = (await generateContentFn(prompt, getFunctionDefs(), 'sendMessage', 0.7, ModelType.CHEAP, options));
+            const [sendMessage] = (await generateContentFn(prompt, {
+                functionDefs: getFunctionDefs(),
+                requiredFunctionName: 'sendMessage',
+                temperature: 0.7,
+                modelType: ModelType.CHEAP,
+                expectedResponseType: {
+                    text: false,
+                    functionCall: true,
+                    media: false,
+                },
+            }, options))
+                .filter((item) => item.type === 'functionCall')
+                .map((item) => item.functionCall);
             if (sendMessage.args?.message) {
                 putAssistantMessage(sendMessage.args.message, sendMessage.args);
             }
@@ -186,7 +206,19 @@ export async function handleConversationGraph({ askQuestionCall, prompt, options
                     type: 'user',
                     text: getEdgeEvaluationPrompt(currentNode, outgoingEdges),
                 },
-            ], getFunctionDefs(), 'evaluateEdge', 0.7, ModelType.CHEAP, options));
+            ], {
+                functionDefs: getFunctionDefs(),
+                requiredFunctionName: 'evaluateEdge',
+                temperature: 0.7,
+                modelType: ModelType.CHEAP,
+                expectedResponseType: {
+                    text: false,
+                    functionCall: true,
+                    media: false,
+                },
+            }, options))
+                .filter((item) => item.type === 'functionCall')
+                .map((item) => item.functionCall);
             if (!evaluateEdge.args?.shouldTerminate) {
                 putSystemMessage('Conversation graph traversal terminated.');
                 break;

package/dist/prompt/steps/step-ask-question/handlers/handle-conversation-graph.js.map

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

package/dist/prompt/steps/step-ask-question/handlers/handle-create-file.js

@@ -11,26 +11,23 @@ export async function handleCreateFile({ askQuestionCall, options, prompt, gener
     putSystemMessage('File creation requested.', askQuestionCall);
     // First confirmation: Ask user if they want to proceed with content generation
     const generateConfirmation = await askUserForConfirmationWithAnswer('The assistant suggests generating content for a new file. Do you want to proceed with content generation?', 'Generate content', 'Cancel content generation', false, options);
+    if (generateConfirmation.answer) {
+        putUserMessage(generateConfirmation.answer);
+    }
     if (!generateConfirmation.confirmed) {
+        putSystemMessage('Content generation canceled.');
+        prompt.push({
+            type: 'assistant',
+            text: askQuestionCall.args?.message ?? '',
+        }, {
+            type: 'user',
+            text: 'Canceling file creation.' + (generateConfirmation.answer ? ` ${generateConfirmation.answer}` : ''),
+        });
         return {
             breakLoop: false,
-            items: [
-                {
-                    assistant: {
-                        type: 'assistant',
-                        text: askQuestionCall.args.message,
-                    },
-                    user: {
-                        type: 'user',
-                        text: 'Canceling file creation.' + (generateConfirmation.answer ? ` ${generateConfirmation.answer}` : ''),
-                    },
-                },
-            ],
+            items: [],
         };
     }
-    if (generateConfirmation.answer) {
-        putUserMessage(generateConfirmation.answer);
-    }
     putSystemMessage('Content generation started.');
     const [createFileCall] = (await generateContentFn([
         ...prompt,
@@ -43,7 +40,19 @@ export async function handleCreateFile({ askQuestionCall, options, prompt, gener
             text: 'Ok, please provide the file creation using `createFile` function. Please remember to use absolute file path.' +
                 (generateConfirmation.answer ? ` ${generateConfirmation.answer}` : ''),
         },
-    ], getFunctionDefs(), 'createFile', options.temperature ?? 0.7, ModelType.DEFAULT, options));
+    ], {
+        functionDefs: getFunctionDefs(),
+        requiredFunctionName: 'createFile',
+        temperature: options.temperature ?? 0.7,
+        modelType: ModelType.DEFAULT,
+        expectedResponseType: {
+            text: false,
+            functionCall: true,
+            media: false,
+        },
+    }, options))
+        .filter((item) => item.type === 'functionCall')
+        .map((item) => item.functionCall);
     if (!createFileCall || !createFileCall.args) {
         return {
             breakLoop: true,
@@ -53,20 +62,17 @@ export async function handleCreateFile({ askQuestionCall, options, prompt, gener
     const { filePath } = createFileCall.args;
     const file = getSourceCode({ filterPaths: [filePath], forceAll: true }, options)[filePath];
     if (file && 'content' in file && file.content) {
+        putSystemMessage('File not created. File already exists.', createFileCall);
+        prompt.push({
+            type: 'assistant',
+            text: askQuestionCall.args?.message ?? '',
+        }, {
+            type: 'user',
+            text: 'The file already exists. Please use updateFile function to modify existing files.',
+        });
         return {
             breakLoop: false,
-            items: [
-                {
-                    assistant: {
-                        type: 'assistant',
-                        text: askQuestionCall.args.message,
-                    },
-                    user: {
-                        type: 'user',
-                        text: 'The file already exists. Please use updateFile function to modify existing files.',
-                    },
-                },
-            ],
+            items: [],
         };
     }
     putSystemMessage(`The assistant has generated content for new file ${filePath}.`, {
@@ -75,84 +81,78 @@ export async function handleCreateFile({ askQuestionCall, options, prompt, gener
     });
     // Second confirmation: Ask user if they want to proceed with file creation
     const applyConfirmation = await askUserForConfirmationWithAnswer('The assistant has generated the file content. Do you want to create the file?', 'Create file', 'Cancel file creation', false, options);
+    if (applyConfirmation.answer) {
+        putUserMessage(applyConfirmation.answer);
+    }
     if (!applyConfirmation.confirmed) {
-        return {
-            breakLoop: false,
-            items: [
+        putSystemMessage('File creation rejected.');
+        prompt.push({
+            type: 'assistant',
+            text: askQuestionCall.args.message,
+            functionCalls: [createFileCall],
+        }, {
+            type: 'user',
+            text: 'Rejecting file creation.' + (applyConfirmation.answer ? ` ${applyConfirmation.answer}` : ''),
+            functionResponses: [
                 {
-                    assistant: {
-                        type: 'assistant',
-                        text: askQuestionCall.args.message,
-                        functionCalls: [createFileCall],
-                    },
-                    user: {
-                        type: 'user',
-                        text: 'Rejecting file creation.' + (applyConfirmation.answer ? ` ${applyConfirmation.answer}` : ''),
-                        functionResponses: [
-                            {
-                                name: 'createFile',
-                                call_id: createFileCall.id,
-                                content: '',
-                            },
-                        ],
-                    },
+                    name: 'createFile',
+                    call_id: createFileCall.id,
+                    content: '',
                 },
             ],
+        });
+        return {
+            breakLoop: false,
+            items: [],
         };
     }
     try {
+        putSystemMessage('Applying file creation');
         await executeCreateFile(createFileCall.args, options);
         refreshFiles();
-        return {
-            breakLoop: false,
-            items: [
+        prompt.push({
+            type: 'assistant',
+            text: askQuestionCall.args.message,
+            functionCalls: [createFileCall],
+        }, {
+            type: 'user',
+            text: 'Accepting file creation.' + (applyConfirmation.answer ? ` ${applyConfirmation.answer}` : ''),
+            functionResponses: [
                 {
-                    assistant: {
-                        type: 'assistant',
-                        text: askQuestionCall.args.message,
-                        functionCalls: [createFileCall],
-                    },
-                    user: {
-                        type: 'user',
-                        text: 'Accepting file creation.' + (applyConfirmation.answer ? ` ${applyConfirmation.answer}` : ''),
-                        functionResponses: [
-                            {
-                                name: 'createFile',
-                                call_id: createFileCall.id,
-                                content: '',
-                            },
-                        ],
-                    },
+                    name: 'createFile',
+                    call_id: createFileCall.id,
+                    content: '',
                 },
             ],
+        });
+        return {
+            breakLoop: false,
+            items: [],
         };
     }
     catch (error) {
-        return {
-            breakLoop: false,
-            items: [
+        putSystemMessage('File creation failed.');
+        prompt.push({
+            type: 'assistant',
+            text: askQuestionCall.args.message,
+            functionCalls: [createFileCall],
+        }, {
+            type: 'user',
+            text: 'Accepting file creation.' +
+                (applyConfirmation.answer ? ` ${applyConfirmation.answer}` : '') +
+                ' Unfortunately, the file creation failed: ' +
+                (error instanceof Error ? error.message : 'unknown error'),
+            functionResponses: [
                 {
-                    assistant: {
-                        type: 'assistant',
-                        text: askQuestionCall.args.message,
-                        functionCalls: [createFileCall],
-                    },
-                    user: {
-                        type: 'user',
-                        text: 'Accepting file creation.' +
-                            (applyConfirmation.answer ? ` ${applyConfirmation.answer}` : '') +
-                            ' Unfortunately, the file creation failed: ' +
-                            (error instanceof Error ? error.message : 'unknown error'),
-                        functionResponses: [
-                            {
-                                name: 'createFile',
-                                call_id: createFileCall.id,
-                                content: '',
-                            },
-                        ],
-                    },
+                    name: 'createFile',
+                    call_id: createFileCall.id,
+                    content: '',
                 },
             ],
+        });
+        return {
+            breakLoop: false,
+            items: [],
         };
     }
 }

package/dist/prompt/steps/step-ask-question/handlers/handle-create-file.js.map

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

package/dist/prompt/steps/step-ask-question/handlers/handle-end-conversation.d.ts

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

package/dist/prompt/steps/step-ask-question/handlers/handle-end-conversation.js

@@ -1,32 +1,30 @@
-import { putSystemMessage } from '../../../../main/common/content-bus.js';
+import { putSystemMessage, putUserMessage } from '../../../../main/common/content-bus.js';
 import { askUserForConfirmationWithAnswer } from '../../../../main/common/user-actions.js';
 import { registerActionHandler } from '../step-ask-question-handlers.js';
 registerActionHandler('endConversation', handleEndConversation);
-export async function handleEndConversation({ askQuestionCall, options }) {
+export async function handleEndConversation({ askQuestionCall, prompt, options, }) {
     const userConfirmation = await askUserForConfirmationWithAnswer('Do you want to end the conversation?', 'End conversation', 'Continue conversation', true, options);
+    if (userConfirmation.answer) {
+        putUserMessage(userConfirmation.answer);
+    }
+    prompt.push({
+        type: 'assistant',
+        text: askQuestionCall.args?.message ?? '',
+    }, {
+        type: 'user',
+        text: 'Lets continue the conversation.' + (userConfirmation.answer ? ` ${userConfirmation.answer}` : ''),
+    });
     if (!userConfirmation.confirmed) {
+        putSystemMessage('User declined to end the conversation.');
         return {
             breakLoop: false,
-            items: [
-                {
-                    assistant: { type: 'assistant', text: askQuestionCall.args?.message ?? '' },
-                    user: {
-                        type: 'user',
-                        text: userConfirmation.answer || 'Declined. Please continue the conversation.',
-                    },
-                },
-            ],
+            items: [],
         };
     }
     putSystemMessage('Assistant requested to stop code generation. Exiting...');
     return {
         breakLoop: true,
-        items: [
-            {
-                assistant: { type: 'assistant', text: askQuestionCall.args?.message ?? '' },
-                user: { type: 'user', text: 'Code generation cancelled.' },
-            },
-        ],
+        items: [],
     };
 }
 //# sourceMappingURL=handle-end-conversation.js.map

package/dist/prompt/steps/step-ask-question/handlers/handle-end-conversation.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-end-conversation.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-end-conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,qBAAqB,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,EAAE,eAAe,EAAE,OAAO,EAAsB;IAC1F,MAAM,gBAAgB,GAAG,MAAM,gCAAgC,CAC7D,sCAAsC,EACtC,kBAAkB,EAClB,uBAAuB,EACvB,IAAI,EACJ,OAAO,CACR,CAAC;IAEF,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,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;IAED,gBAAgB,CAAC,yDAAyD,CAAC,CAAC;IAC5E,OAAO;QACL,SAAS,EAAE,IAAI;QACf,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"}
+{"version":3,"file":"handle-end-conversation.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-end-conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAC1F,OAAO,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,qBAAqB,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,EAC1C,eAAe,EACf,MAAM,EACN,OAAO,GACY;IACnB,MAAM,gBAAgB,GAAG,MAAM,gCAAgC,CAC7D,sCAAsC,EACtC,kBAAkB,EAClB,uBAAuB,EACvB,IAAI,EACJ,OAAO,CACR,CAAC;IAEF,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAC5B,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,IAAI,CACT;QACE,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE;KAC1C,EACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,iCAAiC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzG,CACF,CAAC;IAEF,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAChC,gBAAgB,CAAC,wCAAwC,CAAC,CAAC;QAE3D,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,EAAE;SACV,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,yDAAyD,CAAC,CAAC;IAC5E,OAAO;QACL,SAAS,EAAE,IAAI;QACf,KAAK,EAAE,EAAE;KACV,CAAC;AACJ,CAAC"}

package/dist/prompt/steps/step-ask-question/handlers/handle-explore-external-directories.d.ts

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