genaicode 0.10.0 → 0.10.2
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.
- package/dist/ai-service/ai-studio.js +69 -70
- package/dist/ai-service/ai-studio.js.map +1 -1
- package/dist/ai-service/common-types.d.ts +1 -0
- package/dist/ai-service/common.js +3 -0
- package/dist/ai-service/common.js.map +1 -1
- package/dist/help-docs/genaicode-help-document.d.ts +1 -1
- package/dist/help-docs/genaicode-help-document.js +1 -0
- package/dist/help-docs/genaicode-help-document.js.map +1 -1
- package/dist/main/common/user-actions.d.ts +1 -1
- package/dist/main/config-types.d.ts +1 -0
- package/dist/main/config.js +8 -1
- package/dist/main/config.js.map +1 -1
- package/dist/main/ui/common/api-types.d.ts +25 -0
- package/dist/main/ui/frontend/assets/index-DWyCD84H.js +2015 -0
- package/dist/main/ui/frontend/index.html +1 -1
- package/dist/prompt/function-calling-validate.d.ts +2 -1
- package/dist/prompt/function-calling-validate.js +2 -2
- package/dist/prompt/function-calling-validate.js.map +1 -1
- package/dist/prompt/function-calling.js +5 -2
- package/dist/prompt/function-calling.js.map +1 -1
- package/dist/prompt/function-defs/ask-question.d.ts +1 -0
- package/dist/prompt/function-defs/ask-question.js +33 -1
- package/dist/prompt/function-defs/ask-question.js.map +1 -1
- package/dist/prompt/function-defs/compound-action-list.d.ts +7 -0
- package/dist/prompt/function-defs/compound-action-list.js +38 -0
- package/dist/prompt/function-defs/compound-action-list.js.map +1 -0
- package/dist/prompt/function-defs/compound-action.d.ts +2 -0
- package/dist/prompt/function-defs/compound-action.js +43 -0
- package/dist/prompt/function-defs/compound-action.js.map +1 -0
- package/dist/prompt/function-defs/conversation-graph.d.ts +6 -6
- package/dist/prompt/limits.js +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-compound-action.d.ts +20 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-compound-action.js +253 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-compound-action.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-conversation-graph.d.ts +6 -7
- package/dist/prompt/steps/step-ask-question/handlers/handle-conversation-graph.js +406 -178
- package/dist/prompt/steps/step-ask-question/handlers/handle-conversation-graph.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-explore-external-directories.js +4 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-explore-external-directories.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-read-external-files.js +5 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-read-external-files.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/handlers/handle-request-git-context.d.ts +3 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-request-git-context.js +184 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-request-git-context.js.map +1 -0
- package/dist/prompt/steps/step-ask-question/handlers/handle-update-file.js +8 -12
- package/dist/prompt/steps/step-ask-question/handlers/handle-update-file.js.map +1 -1
- package/dist/prompt/steps/step-ask-question/step-ask-question-types.d.ts +25 -1
- package/dist/prompt/steps/step-ask-question/step-ask-question.d.ts +2 -0
- package/dist/prompt/steps/step-ask-question/step-ask-question.js +2 -0
- package/dist/prompt/steps/step-ask-question/step-ask-question.js.map +1 -1
- package/dist/prompt/steps/step-validate-recover.js +3 -3
- package/dist/prompt/steps/step-validate-recover.js.map +1 -1
- package/dist/prompt/systemprompt.d.ts +1 -1
- package/dist/prompt/systemprompt.js +7 -2
- package/dist/prompt/systemprompt.js.map +1 -1
- package/package.json +4 -3
- package/dist/main/ui/frontend/assets/index-BlVGo0E6.js +0 -1902
|
@@ -1 +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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"}
|
|
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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"}
|
|
@@ -12,6 +12,7 @@ import { getFunctionDefs } from '../../../function-calling.js';
|
|
|
12
12
|
const SYNTHESIS_FILE_COUNT_THRESHOLD = 10;
|
|
13
13
|
registerActionHandler('exploreExternalDirectories', handleExploreExternalDirectories);
|
|
14
14
|
export async function handleExploreExternalDirectories({ askQuestionCall, options, prompt, generateContentFn, }) {
|
|
15
|
+
putSystemMessage('Generating arguments for explore external directories action...');
|
|
15
16
|
// 1. Infer arguments using LLM
|
|
16
17
|
const inferencePrompt = [
|
|
17
18
|
...prompt,
|
|
@@ -40,6 +41,7 @@ export async function handleExploreExternalDirectories({ askQuestionCall, option
|
|
|
40
41
|
const requestedDirectories = directories;
|
|
41
42
|
const reason = inferredReason;
|
|
42
43
|
const executorParams = { depth, ...restParams }; // Includes recursive, searchPhrases, maxResults if provided
|
|
44
|
+
putSystemMessage('Inferred arguments for explore external directories action.', executorParams);
|
|
43
45
|
if (!requestedDirectories || requestedDirectories.length === 0 || !reason || typeof depth !== 'number' || depth < 0) {
|
|
44
46
|
let errorMsg = 'Missing or invalid arguments after inferring for exploreExternalDirectories action.';
|
|
45
47
|
if (!requestedDirectories || requestedDirectories.length === 0)
|
|
@@ -113,6 +115,7 @@ export async function handleExploreExternalDirectories({ askQuestionCall, option
|
|
|
113
115
|
const confirmationResult = await askUserForConfirmation(confirmationMessage, false, options);
|
|
114
116
|
if (confirmationResult.confirmed) {
|
|
115
117
|
try {
|
|
118
|
+
putSystemMessage('Exploring external directory...');
|
|
116
119
|
const filePaths = await exploreDirectories({
|
|
117
120
|
directories: externalDirsToExplore,
|
|
118
121
|
// Pass validated executorParams
|
|
@@ -144,7 +147,7 @@ export async function handleExploreExternalDirectories({ askQuestionCall, option
|
|
|
144
147
|
const synthesizedText = synthesisResult.find((part) => part.type === 'text')?.text;
|
|
145
148
|
if (synthesizedText) {
|
|
146
149
|
userResponse.synthesis = synthesizedText;
|
|
147
|
-
putSystemMessage(`Synthesis complete
|
|
150
|
+
putSystemMessage(`Synthesis complete.`, { synthesizedText });
|
|
148
151
|
}
|
|
149
152
|
else {
|
|
150
153
|
putSystemMessage('Synthesis failed: No text content returned from LLM.');
|
package/dist/prompt/steps/step-ask-question/handlers/handle-explore-external-directories.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-explore-external-directories.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-explore-external-directories.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"handle-explore-external-directories.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-explore-external-directories.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export async function handleReadExternalFiles({ askQuestionCall, options, genera
|
|
|
15
15
|
let requestedFilePaths;
|
|
16
16
|
let reason;
|
|
17
17
|
let inferredCallId;
|
|
18
|
+
putSystemMessage('Generating arguments for reading external files action...');
|
|
18
19
|
try {
|
|
19
20
|
const inferencePrompt = [
|
|
20
21
|
...prompt,
|
|
@@ -40,6 +41,7 @@ export async function handleReadExternalFiles({ askQuestionCall, options, genera
|
|
|
40
41
|
requestedFilePaths = inferredCall.args.externalFilePaths;
|
|
41
42
|
reason = inferredCall.args.reason;
|
|
42
43
|
inferredCallId = inferredCall.id;
|
|
44
|
+
putSystemMessage('Generated arguments for reading external files', inferredCall.args);
|
|
43
45
|
if (!requestedFilePaths || requestedFilePaths.length === 0 || !reason) {
|
|
44
46
|
putSystemMessage('Missing filePaths or reason after inferring arguments for readExternalFiles action.');
|
|
45
47
|
return { breakLoop: false, items: [] };
|
|
@@ -78,6 +80,7 @@ export async function handleReadExternalFiles({ askQuestionCall, options, genera
|
|
|
78
80
|
}
|
|
79
81
|
// 4. Process confirmed external files or mark as denied
|
|
80
82
|
if (confirmed) {
|
|
83
|
+
putSystemMessage('Reading external files...', externalFilesToConfirm);
|
|
81
84
|
for (const absolutePath of externalFilesToConfirm) {
|
|
82
85
|
try {
|
|
83
86
|
const content = readFileContent(absolutePath);
|
|
@@ -101,8 +104,10 @@ export async function handleReadExternalFiles({ askQuestionCall, options, genera
|
|
|
101
104
|
});
|
|
102
105
|
}
|
|
103
106
|
}
|
|
107
|
+
putSystemMessage('Finished reading external files.', { fileResults });
|
|
104
108
|
}
|
|
105
109
|
else if (externalFilesToConfirm.length > 0) {
|
|
110
|
+
putSystemMessage('User denied access to external files.');
|
|
106
111
|
// User denied access for the batch
|
|
107
112
|
for (const absolutePath of externalFilesToConfirm) {
|
|
108
113
|
fileResults.push({ filePath: absolutePath, result: 'access denied by the user' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-read-external-files.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-read-external-files.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"handle-read-external-files.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-read-external-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { ActionHandler } from '../step-ask-question-types.js';
|
|
2
|
+
export declare const GIT_CONTEXT_INSTRUCTION_PROMPT = "\n You need to call the 'requestGitContext' function. Please determine the appropriate arguments based on the user's request.\n Parameters:\n - requestType (required): Choose one of 'commits', 'fileChanges', 'blame', or 'fileDiff'.\n - 'commits': Get recent commit history for the entire repository.\n - 'fileChanges': Get commit history specifically for the given 'filePath'.\n - 'blame': Get line-by-line authorship information (git blame) for the given 'filePath'.\n - 'fileDiff': Get the changes made to a specific 'filePath' in a given 'commitHash'.\n - filePath (absolute, required for 'fileChanges', 'blame', and 'fileDiff'): The absolute path to the file within the project. IMPORTANT: Ensure the provided filePath is absolute and is inside of the project root and exists within the project directory structure.\n - commitHash (required for 'blame' and 'fileDiff'): A specific commit hash to focus the request.\n - count (required for 'commits' and 'fileChanges'): The maximum number of commits to retrieve (applies mainly to 'commits' and 'fileChanges').\n\n Analyze the user's request and provide the arguments accurately.\n ";
|
|
3
|
+
export declare const handleRequestGitContext: ActionHandler;
|
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
import simpleGit from 'simple-git';
|
|
2
|
+
import { rcConfig } from '../../../../main/config.js';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { getFunctionDefs } from '../../../function-calling.js';
|
|
5
|
+
import { ModelType } from '../../../../ai-service/common-types.js'; // Import PromptItem
|
|
6
|
+
import { putSystemMessage } from '../../../../main/common/content-bus.js';
|
|
7
|
+
import { registerActionHandler } from '../step-ask-question-handlers.js';
|
|
8
|
+
// Helper function to format log output
|
|
9
|
+
function formatLog(log) {
|
|
10
|
+
return log.all
|
|
11
|
+
.map((commit) => `- ${commit.hash.substring(0, 7)} by ${commit.author_name} on ${commit.date}: ${commit.message}`)
|
|
12
|
+
.join('\n');
|
|
13
|
+
}
|
|
14
|
+
// Helper function to format blame output
|
|
15
|
+
function formatBlame(blame) {
|
|
16
|
+
// Basic formatting, could be enhanced
|
|
17
|
+
return `\nBlame Output:\n${blame}`;
|
|
18
|
+
}
|
|
19
|
+
// Helper function to format diff output
|
|
20
|
+
function formatDiff(diff) {
|
|
21
|
+
return `\nDiff Output:\n${diff}`;
|
|
22
|
+
}
|
|
23
|
+
// Define the detailed instruction prompt for the LLM
|
|
24
|
+
export const GIT_CONTEXT_INSTRUCTION_PROMPT = `
|
|
25
|
+
You need to call the 'requestGitContext' function. Please determine the appropriate arguments based on the user's request.
|
|
26
|
+
Parameters:
|
|
27
|
+
- requestType (required): Choose one of 'commits', 'fileChanges', 'blame', or 'fileDiff'.
|
|
28
|
+
- 'commits': Get recent commit history for the entire repository.
|
|
29
|
+
- 'fileChanges': Get commit history specifically for the given 'filePath'.
|
|
30
|
+
- 'blame': Get line-by-line authorship information (git blame) for the given 'filePath'.
|
|
31
|
+
- 'fileDiff': Get the changes made to a specific 'filePath' in a given 'commitHash'.
|
|
32
|
+
- filePath (absolute, required for 'fileChanges', 'blame', and 'fileDiff'): The absolute path to the file within the project. IMPORTANT: Ensure the provided filePath is absolute and is inside of the project root and exists within the project directory structure.
|
|
33
|
+
- commitHash (required for 'blame' and 'fileDiff'): A specific commit hash to focus the request.
|
|
34
|
+
- count (required for 'commits' and 'fileChanges'): The maximum number of commits to retrieve (applies mainly to 'commits' and 'fileChanges').
|
|
35
|
+
|
|
36
|
+
Analyze the user's request and provide the arguments accurately.
|
|
37
|
+
`;
|
|
38
|
+
export const handleRequestGitContext = async ({ askQuestionCall, options, generateContentFn, prompt, }) => {
|
|
39
|
+
putSystemMessage('Handling git context action.');
|
|
40
|
+
// Create a temporary prompt array including the instruction
|
|
41
|
+
const inferencePrompt = [
|
|
42
|
+
...prompt,
|
|
43
|
+
{ type: 'user', text: GIT_CONTEXT_INSTRUCTION_PROMPT }, // Add instruction as a user message
|
|
44
|
+
];
|
|
45
|
+
const [requestGitContextCall] = // Use the temporary prompt with instructions for this specific call
|
|
46
|
+
(await generateContentFn(inferencePrompt, // Use the temporary prompt with the instruction
|
|
47
|
+
{
|
|
48
|
+
functionDefs: getFunctionDefs(),
|
|
49
|
+
requiredFunctionName: 'requestGitContext',
|
|
50
|
+
temperature: 0.7,
|
|
51
|
+
modelType: ModelType.CHEAP,
|
|
52
|
+
expectedResponseType: { text: false, functionCall: true, media: false },
|
|
53
|
+
}, options))
|
|
54
|
+
.filter((item) => item.type === 'functionCall')
|
|
55
|
+
.map((item) => item.functionCall);
|
|
56
|
+
if (!requestGitContextCall?.args) {
|
|
57
|
+
putSystemMessage('No valid git context call found after inference.');
|
|
58
|
+
// Add the original assistant message back, but indicate failure
|
|
59
|
+
prompt.push({
|
|
60
|
+
type: 'assistant',
|
|
61
|
+
text: askQuestionCall.args?.message ?? '',
|
|
62
|
+
}, {
|
|
63
|
+
type: 'user',
|
|
64
|
+
text: 'Could not determine the correct parameters for the Git request based on your message.',
|
|
65
|
+
});
|
|
66
|
+
return {
|
|
67
|
+
breakLoop: false,
|
|
68
|
+
items: [],
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
putSystemMessage('Obtained git context parameters', requestGitContextCall);
|
|
72
|
+
// Add the original assistant message and the inferred function call to the main prompt
|
|
73
|
+
prompt.push({
|
|
74
|
+
type: 'assistant',
|
|
75
|
+
text: askQuestionCall.args?.message ?? '',
|
|
76
|
+
functionCalls: [requestGitContextCall],
|
|
77
|
+
});
|
|
78
|
+
const args = requestGitContextCall.args;
|
|
79
|
+
const git = simpleGit(rcConfig.rootDir);
|
|
80
|
+
let responseContent = '';
|
|
81
|
+
let errorMessage = '';
|
|
82
|
+
try {
|
|
83
|
+
const isRepo = await git.checkIsRepo();
|
|
84
|
+
if (!isRepo) {
|
|
85
|
+
throw new Error('The project directory is not a Git repository.');
|
|
86
|
+
}
|
|
87
|
+
// Common validation for file path
|
|
88
|
+
const validateFilePath = (requiredFor) => {
|
|
89
|
+
if (!args.filePath) {
|
|
90
|
+
throw new Error(`filePath is required for ${requiredFor} request.`);
|
|
91
|
+
}
|
|
92
|
+
if (!path.isAbsolute(args.filePath)) {
|
|
93
|
+
throw new Error(`filePath must be an absolute path for ${requiredFor} request.`);
|
|
94
|
+
}
|
|
95
|
+
const absoluteFilePath = args.filePath;
|
|
96
|
+
if (!absoluteFilePath.startsWith(rcConfig.rootDir)) {
|
|
97
|
+
throw new Error(`Access denied: filePath is outside the project root for ${requiredFor} request.`);
|
|
98
|
+
}
|
|
99
|
+
return absoluteFilePath;
|
|
100
|
+
};
|
|
101
|
+
// Common validation for commit hash
|
|
102
|
+
const validateCommitHash = (requiredFor) => {
|
|
103
|
+
if (!args.commitHash) {
|
|
104
|
+
throw new Error(`commitHash is required for ${requiredFor} request.`);
|
|
105
|
+
}
|
|
106
|
+
return args.commitHash;
|
|
107
|
+
};
|
|
108
|
+
switch (args.requestType) {
|
|
109
|
+
case 'commits': {
|
|
110
|
+
const logOptions = {};
|
|
111
|
+
if (args.count && args.count > 0) {
|
|
112
|
+
logOptions['--max-count'] = args.count;
|
|
113
|
+
}
|
|
114
|
+
const log = await git.log(logOptions);
|
|
115
|
+
responseContent = `Recent commits:\n${formatLog(log)}`;
|
|
116
|
+
break;
|
|
117
|
+
}
|
|
118
|
+
case 'fileChanges': {
|
|
119
|
+
const absoluteFilePath = validateFilePath('fileChanges');
|
|
120
|
+
const logOptions = { file: absoluteFilePath };
|
|
121
|
+
if (args.count && args.count > 0) {
|
|
122
|
+
logOptions['--max-count'] = args.count;
|
|
123
|
+
}
|
|
124
|
+
const log = await git.log(logOptions);
|
|
125
|
+
responseContent = `Changes for ${args.filePath}:\n${formatLog(log)}`;
|
|
126
|
+
break;
|
|
127
|
+
}
|
|
128
|
+
case 'blame': {
|
|
129
|
+
const absoluteFilePath = validateFilePath('blame');
|
|
130
|
+
const blameCommandArgs = ['blame'];
|
|
131
|
+
if (args.commitHash) {
|
|
132
|
+
// Include the commit hash in the command arguments before the file path
|
|
133
|
+
blameCommandArgs.push(args.commitHash);
|
|
134
|
+
}
|
|
135
|
+
// Use '--' to clearly separate the commit/options from the file path
|
|
136
|
+
blameCommandArgs.push('--', absoluteFilePath);
|
|
137
|
+
const blame = await git.raw(...blameCommandArgs);
|
|
138
|
+
responseContent = `Blame for ${args.filePath}${args.commitHash ? ` at commit ${args.commitHash.substring(0, 7)}` : ''}:\n${formatBlame(blame)}`;
|
|
139
|
+
break;
|
|
140
|
+
}
|
|
141
|
+
case 'fileDiff': {
|
|
142
|
+
const absoluteFilePath = validateFilePath('fileDiff');
|
|
143
|
+
const commitHash = validateCommitHash('fileDiff');
|
|
144
|
+
// Use commitHash~1...commitHash to get the diff for that specific commit
|
|
145
|
+
const diff = await git.diff([`${commitHash}~1..${commitHash}`, '--', absoluteFilePath]);
|
|
146
|
+
responseContent = `Diff for ${args.filePath} at commit ${commitHash.substring(0, 7)}:\n${formatDiff(diff)}`;
|
|
147
|
+
break;
|
|
148
|
+
}
|
|
149
|
+
default: {
|
|
150
|
+
// Should be caught by function call validation, but handle defensively
|
|
151
|
+
throw new Error(`Invalid requestType received: ${args.requestType}`);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
console.error('Error fetching Git context:', error);
|
|
157
|
+
errorMessage =
|
|
158
|
+
error instanceof Error
|
|
159
|
+
? `Error fetching Git context: ${error.message}`
|
|
160
|
+
: 'An unknown error occurred while fetching Git context.';
|
|
161
|
+
}
|
|
162
|
+
putSystemMessage('Git context response', {
|
|
163
|
+
responseContent,
|
|
164
|
+
errorMessage,
|
|
165
|
+
});
|
|
166
|
+
// Add the function response (result or error) to the main prompt
|
|
167
|
+
prompt.push({
|
|
168
|
+
type: 'user',
|
|
169
|
+
functionResponses: [
|
|
170
|
+
{
|
|
171
|
+
name: 'requestGitContext', // Use the actual function name
|
|
172
|
+
call_id: requestGitContextCall.id,
|
|
173
|
+
content: errorMessage || responseContent,
|
|
174
|
+
isError: !!errorMessage,
|
|
175
|
+
},
|
|
176
|
+
],
|
|
177
|
+
});
|
|
178
|
+
return {
|
|
179
|
+
breakLoop: false,
|
|
180
|
+
items: [],
|
|
181
|
+
};
|
|
182
|
+
};
|
|
183
|
+
registerActionHandler('requestGitContext', handleRequestGitContext);
|
|
184
|
+
//# sourceMappingURL=handle-request-git-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handle-request-git-context.js","sourceRoot":"","sources":["../../../../../src/prompt/steps/step-ask-question/handlers/handle-request-git-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,20 +70,16 @@ export async function handleUpdateFile({ askQuestionCall, options, prompt, gener
|
|
|
70
70
|
const file = getSourceCode({ filterPaths: [filePath], forceAll: true }, options)[filePath];
|
|
71
71
|
if (!file || !('content' in file) || !file.content) {
|
|
72
72
|
// TODO: In this corner case we should probably retry the operation but prefix it with getSourceCode
|
|
73
|
+
prompt.push({
|
|
74
|
+
type: 'assistant',
|
|
75
|
+
text: askQuestionCall.args?.message ?? '',
|
|
76
|
+
}, {
|
|
77
|
+
type: 'user',
|
|
78
|
+
text: 'The file does not exist or is empty or its content is not present in the context.',
|
|
79
|
+
});
|
|
73
80
|
return {
|
|
74
81
|
breakLoop: false,
|
|
75
|
-
items: [
|
|
76
|
-
{
|
|
77
|
-
assistant: {
|
|
78
|
-
type: 'assistant',
|
|
79
|
-
text: askQuestionCall.args.message,
|
|
80
|
-
},
|
|
81
|
-
user: {
|
|
82
|
-
type: 'user',
|
|
83
|
-
text: 'The file does not exist or is empty or its content is not present in the context.',
|
|
84
|
-
},
|
|
85
|
-
},
|
|
86
|
-
],
|
|
82
|
+
items: [],
|
|
87
83
|
};
|
|
88
84
|
}
|
|
89
85
|
putSystemMessage(`The assistant has generated new content for file ${filePath}.`, {
|
|
@@ -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":"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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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"}
|
|
@@ -5,7 +5,7 @@ import { PromptItemImage } from '../../../ai-service/common-types.js';
|
|
|
5
5
|
import { FunctionCall } from '../../../ai-service/common-types.js';
|
|
6
6
|
import { CodegenOptions } from '../../../main/codegen-types.js';
|
|
7
7
|
import { PluginActionType } from '../../../ai-service/service-configurations-types.js';
|
|
8
|
-
export type ActionType = 'codeGeneration' | 'sendMessage' | 'generateImage' | 'requestPermissions' | 'readExternalFiles' | 'requestFilesContent' | 'removeFilesFromContext' | 'exploreExternalDirectories' | 'confirmCodeGeneration' | 'endConversation' | 'contextOptimization' | 'contextCompression' | 'searchCode' | 'lint' | 'updateFile' | 'performAnalysis' | 'createFile' | 'pullAppContext' | 'genaicodeHelp' | 'pushAppContext' | 'reasoningInference' | 'requestFilesFragments' | 'conversationGraph' | PluginActionType;
|
|
8
|
+
export type ActionType = 'codeGeneration' | 'sendMessage' | 'generateImage' | 'requestPermissions' | 'readExternalFiles' | 'requestFilesContent' | 'removeFilesFromContext' | 'exploreExternalDirectories' | 'confirmCodeGeneration' | 'endConversation' | 'contextOptimization' | 'contextCompression' | 'searchCode' | 'lint' | 'updateFile' | 'performAnalysis' | 'createFile' | 'pullAppContext' | 'genaicodeHelp' | 'pushAppContext' | 'reasoningInference' | 'requestFilesFragments' | 'requestGitContext' | 'conversationGraph' | 'compoundAction' | PluginActionType;
|
|
9
9
|
type AskQuestionArgs = {
|
|
10
10
|
actionType: ActionType;
|
|
11
11
|
message: string;
|
|
@@ -124,11 +124,35 @@ export type ReasoningInferenceResponseArgs = {
|
|
|
124
124
|
/** The reasoning tokens provided by the model */
|
|
125
125
|
reasoning: string;
|
|
126
126
|
};
|
|
127
|
+
export type RequestGitContextArgs = {
|
|
128
|
+
requestType: 'commits' | 'fileChanges' | 'blame' | 'fileDiff';
|
|
129
|
+
filePath?: string;
|
|
130
|
+
commitHash?: string;
|
|
131
|
+
count?: number;
|
|
132
|
+
};
|
|
127
133
|
export type LintResult = {
|
|
128
134
|
success: boolean;
|
|
129
135
|
stdout?: string;
|
|
130
136
|
stderr?: string;
|
|
131
137
|
};
|
|
138
|
+
/**
|
|
139
|
+
* Represents a single action within a compound action batch.
|
|
140
|
+
*/
|
|
141
|
+
export interface CompoundActionItem {
|
|
142
|
+
/** The name of the operation to execute (e.g., 'createFile', 'updateFile'). */
|
|
143
|
+
name: string;
|
|
144
|
+
/** The parameters required by the specified actionName. */
|
|
145
|
+
args: Record<string, unknown>;
|
|
146
|
+
}
|
|
147
|
+
/**
|
|
148
|
+
* Arguments for the internal `compoundActionList` function call.
|
|
149
|
+
*/
|
|
150
|
+
export type CompoundActionListArgs = {
|
|
151
|
+
/** An array of actions to be executed as part of a compound operation. */
|
|
152
|
+
actions: CompoundActionItem[];
|
|
153
|
+
/** Summary of the actions to be performed. */
|
|
154
|
+
summary?: string;
|
|
155
|
+
};
|
|
132
156
|
export type AskQuestionCall = FunctionCall<AskQuestionArgs>;
|
|
133
157
|
export type PerformAnalysisCall = FunctionCall<PerformAnalysisArgs>;
|
|
134
158
|
export type AnalysisResultCall = FunctionCall<AnalysisResultArgs>;
|
|
@@ -27,4 +27,6 @@ import './handlers/handle-send-message.js';
|
|
|
27
27
|
import './handlers/handle-update-file.js';
|
|
28
28
|
import './handlers/handle-read-external-files.js';
|
|
29
29
|
import './handlers/handle-explore-external-directories.js';
|
|
30
|
+
import './handlers/handle-request-git-context.js';
|
|
31
|
+
import './handlers/handle-compound-action.js';
|
|
30
32
|
export declare function executeStepAskQuestion(generateContentFn: GenerateContentFunction, generateImageFn: GenerateImageFunction, prompt: PromptItem[], functionDefs: FunctionDef[], waitIfPaused: () => Promise<void>, temperature: number, options: CodegenOptions): Promise<FunctionCall[]>;
|
|
@@ -26,6 +26,8 @@ import './handlers/handle-send-message.js';
|
|
|
26
26
|
import './handlers/handle-update-file.js';
|
|
27
27
|
import './handlers/handle-read-external-files.js';
|
|
28
28
|
import './handlers/handle-explore-external-directories.js';
|
|
29
|
+
import './handlers/handle-request-git-context.js';
|
|
30
|
+
import './handlers/handle-compound-action.js';
|
|
29
31
|
export async function executeStepAskQuestion(generateContentFn, generateImageFn, prompt, functionDefs, waitIfPaused, temperature, options) {
|
|
30
32
|
putSystemMessage('Allowing the assistant to ask a question...');
|
|
31
33
|
while (!abortController?.signal.aborted) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-ask-question.js","sourceRoot":"","sources":["../../../../src/prompt/steps/step-ask-question/step-ask-question.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,sCAAsC,CAAC;AAC9C,OAAO,8CAA8C,CAAC;AACtD,OAAO,0CAA0C,CAAC;AAClD,OAAO,2CAA2C,CAAC;AACnD,OAAO,yCAAyC,CAAC;AACjD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,uCAAuC,CAAC;AAC/C,OAAO,qCAAqC,CAAC;AAC7C,OAAO,qCAAqC,CAAC;AAC7C,OAAO,2BAA2B,CAAC;AACnC,OAAO,uCAAuC,CAAC;AAC/C,OAAO,uCAAuC,CAAC;AAC/C,OAAO,uCAAuC,CAAC;AAC/C,OAAO,0CAA0C,CAAC;AAClD,OAAO,gDAAgD,CAAC;AACxD,OAAO,4CAA4C,CAAC;AACpD,OAAO,8CAA8C,CAAC;AACtD,OAAO,0CAA0C,CAAC;AAClD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,mCAAmC,CAAC;AAC3C,OAAO,kCAAkC,CAAC;AAC1C,OAAO,0CAA0C,CAAC;AAClD,OAAO,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"step-ask-question.js","sourceRoot":"","sources":["../../../../src/prompt/steps/step-ask-question/step-ask-question.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,sCAAsC,CAAC;AAC9C,OAAO,8CAA8C,CAAC;AACtD,OAAO,0CAA0C,CAAC;AAClD,OAAO,2CAA2C,CAAC;AACnD,OAAO,yCAAyC,CAAC;AACjD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,uCAAuC,CAAC;AAC/C,OAAO,qCAAqC,CAAC;AAC7C,OAAO,qCAAqC,CAAC;AAC7C,OAAO,2BAA2B,CAAC;AACnC,OAAO,uCAAuC,CAAC;AAC/C,OAAO,uCAAuC,CAAC;AAC/C,OAAO,uCAAuC,CAAC;AAC/C,OAAO,0CAA0C,CAAC;AAClD,OAAO,gDAAgD,CAAC;AACxD,OAAO,4CAA4C,CAAC;AACpD,OAAO,8CAA8C,CAAC;AACtD,OAAO,0CAA0C,CAAC;AAClD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,mCAAmC,CAAC;AAC3C,OAAO,kCAAkC,CAAC;AAC1C,OAAO,0CAA0C,CAAC;AAClD,OAAO,mDAAmD,CAAC;AAC3D,OAAO,0CAA0C,CAAC;AAClD,OAAO,sCAAsC,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,iBAA0C,EAC1C,eAAsC,EACtC,MAAoB,EACpB,YAA2B,EAC3B,YAAiC,EACjC,WAAmB,EACnB,OAAuB;IAEvB,gBAAgB,CAAC,6CAA6C,CAAC,CAAC;IAEhE,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,sHAAsH;YACtH,MAAM,cAAc,GAAG,eAAe,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;YACnD,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAChH,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC,KAAK,CAAC,GAAG,GAAG,cAAc,CAAC;YAEjE,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,MAAM;YACR,CAAC;YAED,IAAI,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;gBAClC,mBAAmB,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;YAC3G,CAAC;YAED,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC;YACpD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;gBACnD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;oBACjC,eAAe;oBACf,MAAM;oBACN,OAAO;oBACP,iBAAiB;oBACjB,eAAe;oBACf,YAAY;iBACb,CAAC,CAAC;gBAEH,yFAAyF;gBACzF,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3C,IAAI,QAAQ,EAAE,IAAI,EAAE,IAAI,IAAI,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;oBACnD,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC/G,CAAC;gBAED,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEpF,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;oBACrB,OAAO,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;gBACjC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;gBACjD,MAAM;YACR,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,gBAAgB,CAAC,sBAAsB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACjG,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,sEAAsE,CAAC,CAAC;IACzF,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,iBAA0C,EAC1C,MAAoB,EACpB,YAA2B,EAC3B,WAAmB,EACnB,OAAuB;IAEvB,MAAM,kBAAkB,GAAwB;QAC9C,MAAM;QACN;YACE,YAAY;YACZ,oBAAoB,EAAE,aAAa;YACnC,WAAW;YACX,SAAS,EAAE,SAAS,CAAC,KAAK;YAC1B,oBAAoB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;SACxE;QACD,OAAO;KACR,CAAC;IACF,MAAM,iBAAiB,GAAG,CAAC,MAAM,iBAAiB,CAAC,GAAG,kBAAkB,CAAC,CAAC;SACvE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC;SAC9C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACpC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAgC,CAAC;AACtG,CAAC"}
|
|
@@ -9,7 +9,7 @@ export async function validateAndRecoverSingleResult([prompt, { functionDefs, re
|
|
|
9
9
|
}
|
|
10
10
|
let calls = result.filter((item) => item.type === 'functionCall').map((item) => item.functionCall);
|
|
11
11
|
let call = calls[0];
|
|
12
|
-
const validatorError = validateFunctionCall(call, requiredFunctionName, calls, rootDir);
|
|
12
|
+
const validatorError = validateFunctionCall(call, requiredFunctionName, calls, rootDir, functionDefs);
|
|
13
13
|
if (validatorError) {
|
|
14
14
|
console.log('Invalid function call', call, validatorError);
|
|
15
15
|
if (!call) {
|
|
@@ -49,12 +49,12 @@ export async function validateAndRecoverSingleResult([prompt, { functionDefs, re
|
|
|
49
49
|
calls = result.filter((item) => item.type === 'functionCall').map((item) => item.functionCall);
|
|
50
50
|
console.log('Recover result:', result);
|
|
51
51
|
if (calls?.length === 1) {
|
|
52
|
-
let recoveryError = validateFunctionCall(calls[0], requiredFunctionName, calls, rootDir);
|
|
52
|
+
let recoveryError = validateFunctionCall(calls[0], requiredFunctionName, calls, rootDir, functionDefs);
|
|
53
53
|
if (recoveryError) {
|
|
54
54
|
console.log("Use more expensive recovery method, because we couldn't recover.");
|
|
55
55
|
result = await generateContentFn(prompt, { functionDefs, requiredFunctionName, temperature, modelType: ModelType.DEFAULT }, options);
|
|
56
56
|
calls = result.filter((item) => item.type === 'functionCall').map((item) => item.functionCall);
|
|
57
|
-
recoveryError = validateFunctionCall(calls?.[0], requiredFunctionName, calls, rootDir);
|
|
57
|
+
recoveryError = validateFunctionCall(calls?.[0], requiredFunctionName, calls, rootDir, functionDefs);
|
|
58
58
|
assert(!recoveryError, 'Recovery failed');
|
|
59
59
|
}
|
|
60
60
|
console.log('Recovery was successful');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-validate-recover.js","sourceRoot":"","sources":["../../../src/prompt/steps/step-validate-recover.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,OAAO,CAAsB,EACtG,MAA6B,EAC7B,iBAA0C,EAC1C,UAAkB,QAAQ,CAAC,OAAO;IAElC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,mBAAmB;QACnB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEnG,IAAI,IAAI,GAA6B,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"step-validate-recover.js","sourceRoot":"","sources":["../../../src/prompt/steps/step-validate-recover.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,OAAO,CAAsB,EACtG,MAA6B,EAC7B,iBAA0C,EAC1C,UAAkB,QAAQ,CAAC,OAAO;IAElC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,mBAAmB;QACnB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEnG,IAAI,IAAI,GAA6B,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IACtG,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;YACtC,IAAI,oBAAoB,KAAK,WAAW,EAAE,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;gBACjD,oBAAoB,GAAG,YAAY,CAAC;YACtC,CAAC;QACH,CAAC;QAED,MAAM,GAAG;YACP,GAAG,MAAM;YACT,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,IAAI,CAAC,EAAE;YAC5C;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,8GAA8G;gBACpH,iBAAiB,EAAE;oBACjB;wBACE,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,OAAO,EAAE,IAAI,CAAC,EAAE;wBAChB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;wBACnE,OAAO,EAAE,IAAI;qBACd;iBACF;aACF;SACF,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QACpC,IAAI,SAAS,KAAK,SAAS,CAAC,KAAK,EAAE,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,GAAG,MAAM,iBAAiB,CAC9B,MAAM,EACN;YACE,YAAY;YACZ,oBAAoB;YACpB,WAAW;YACX,SAAS,EAAE,SAAS,CAAC,KAAK;YAC1B,oBAAoB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;SACxE,EACD,OAAO,CACR,CAAC;QACF,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/F,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAEvC,IAAI,KAAK,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,aAAa,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;YACvG,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;gBAChF,MAAM,GAAG,MAAM,iBAAiB,CAC9B,MAAM,EACN,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE,EACjF,OAAO,CACR,CAAC;gBACF,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC/F,aAAa,GAAG,oBAAoB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;gBACrG,MAAM,CAAC,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACzC,CAAC;aAAM,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { CodegenOptions } from '../main/codegen-types.js';
|
|
2
2
|
import { RcConfig } from '../main/config-types.js';
|
|
3
3
|
/** Generates a system prompt with the codegen prompt merged */
|
|
4
|
-
export declare function getSystemPrompt({ rootDir, importantContext }: Pick<RcConfig, 'rootDir' | 'importantContext'>, options: Omit<CodegenOptions, 'aiService'>): string;
|
|
4
|
+
export declare function getSystemPrompt({ rootDir, importantContext, featuresEnabled }: Pick<RcConfig, 'rootDir' | 'importantContext' | 'featuresEnabled'>, options: Omit<CodegenOptions, 'aiService'>): string;
|