cloving 0.3.5 → 0.3.7
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/README.md +8 -2
- package/dist/cloving_gpt/index.js +1 -1
- package/dist/commands/config.js +2 -2
- package/dist/commands/generate/context.js +3 -3
- package/dist/commands/init.js +3 -218
- package/dist/commands/tokens.js +2 -2
- package/dist/index.js +3 -2
- package/dist/managers/BlockManager.js +125 -0
- package/dist/managers/ChatManager.js +89 -18
- package/dist/managers/ChunkManager.js +12 -0
- package/dist/managers/CodeManager.js +5 -5
- package/dist/managers/InitManager.js +216 -0
- package/dist/managers/ProxyManager.js +11 -3
- package/dist/managers/ReviewManager.js +14 -2
- package/dist/managers/ShellManager.js +7 -2
- package/dist/managers/UnitTestManager.js +3 -3
- package/dist/package.json +1 -1
- package/dist/utils/prompt_utils.js +515 -0
- package/dist/utils/string_utils.js +22 -16
- package/package.json +1 -1
|
@@ -9,13 +9,16 @@ const child_process_1 = require("child_process");
|
|
|
9
9
|
const colors_1 = __importDefault(require("colors"));
|
|
10
10
|
const axios_1 = __importDefault(require("axios"));
|
|
11
11
|
const cli_highlight_1 = __importDefault(require("cli-highlight"));
|
|
12
|
+
const fs_1 = __importDefault(require("fs"));
|
|
13
|
+
const path_1 = __importDefault(require("path"));
|
|
12
14
|
const CommitManager_1 = __importDefault(require("./CommitManager"));
|
|
13
15
|
const ChunkManager_1 = __importDefault(require("./ChunkManager"));
|
|
16
|
+
const BlockManager_1 = __importDefault(require("./BlockManager"));
|
|
14
17
|
const ReviewManager_1 = __importDefault(require("./ReviewManager"));
|
|
15
18
|
const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
|
|
16
19
|
const string_utils_1 = require("../utils/string_utils");
|
|
17
20
|
const config_utils_1 = require("../utils/config_utils");
|
|
18
|
-
const
|
|
21
|
+
const prompt_utils_1 = require("../utils/prompt_utils");
|
|
19
22
|
const specialCommands = [
|
|
20
23
|
'save',
|
|
21
24
|
'commit',
|
|
@@ -45,6 +48,8 @@ class ChatManager {
|
|
|
45
48
|
this.prompt = '';
|
|
46
49
|
this.isProcessing = false;
|
|
47
50
|
this.isSilent = false;
|
|
51
|
+
this.retryCount = 0;
|
|
52
|
+
this.maxRetries = 3;
|
|
48
53
|
this.isSilent = options.silent || false;
|
|
49
54
|
options.stream = true;
|
|
50
55
|
options.silent = true;
|
|
@@ -56,6 +61,7 @@ class ChatManager {
|
|
|
56
61
|
historySize: 1000,
|
|
57
62
|
});
|
|
58
63
|
this.chunkManager = new ChunkManager_1.default();
|
|
64
|
+
this.blockManager = new BlockManager_1.default();
|
|
59
65
|
}
|
|
60
66
|
/**
|
|
61
67
|
* Initializes the ChatManager by loading context files, displaying a welcome message,
|
|
@@ -96,7 +102,7 @@ class ChatManager {
|
|
|
96
102
|
try {
|
|
97
103
|
const response = await axios_1.default.get('https://api.github.com/repos/cloving-ai/cloving-cli/releases/latest');
|
|
98
104
|
const latestVersion = response.data.tag_name;
|
|
99
|
-
const currentVersion = `v${(0,
|
|
105
|
+
const currentVersion = `v${(0, prompt_utils_1.getPackageVersion)()}`;
|
|
100
106
|
if (latestVersion !== currentVersion) {
|
|
101
107
|
console.log(colors_1.default.bgWhite.black(`\n 🚀 A new version of Cloving is available: ${latestVersion} `));
|
|
102
108
|
console.log(colors_1.default.bgWhite.black(` You are currently using version: ${currentVersion} `));
|
|
@@ -136,7 +142,7 @@ class ChatManager {
|
|
|
136
142
|
if (!file)
|
|
137
143
|
continue;
|
|
138
144
|
const previousCount = Object.keys(this.contextFiles).length;
|
|
139
|
-
this.contextFiles = await (0,
|
|
145
|
+
this.contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(file, this.contextFiles, this.options);
|
|
140
146
|
const newCount = Object.keys(this.contextFiles).length;
|
|
141
147
|
const addedCount = newCount - previousCount;
|
|
142
148
|
const totalTokens = this.calculateTotalTokens();
|
|
@@ -299,7 +305,7 @@ class ChatManager {
|
|
|
299
305
|
}
|
|
300
306
|
else {
|
|
301
307
|
for (const filePath of foundFiles) {
|
|
302
|
-
this.contextFiles = await (0,
|
|
308
|
+
this.contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(filePath, this.contextFiles, this.options);
|
|
303
309
|
const content = this.contextFiles[filePath];
|
|
304
310
|
const tokenEstimate = this.estimateTokens(content);
|
|
305
311
|
console.log(`\nAdded ${colors_1.default.bold(colors_1.default.green(filePath))} to this chat session's context (${colors_1.default.yellow(`~${tokenEstimate.toLocaleString()} tokens`)})`);
|
|
@@ -346,7 +352,7 @@ class ChatManager {
|
|
|
346
352
|
const filePath = command.slice(4).trim();
|
|
347
353
|
if (filePath) {
|
|
348
354
|
try {
|
|
349
|
-
this.contextFiles = await (0,
|
|
355
|
+
this.contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(filePath, this.contextFiles, this.options);
|
|
350
356
|
console.log(`\nAdded ${colors_1.default.bold(colors_1.default.green(filePath))} to this chat session's context`);
|
|
351
357
|
this.refreshContext();
|
|
352
358
|
}
|
|
@@ -359,11 +365,23 @@ class ChatManager {
|
|
|
359
365
|
}
|
|
360
366
|
this.rl.prompt();
|
|
361
367
|
}
|
|
362
|
-
refreshContext() {
|
|
363
|
-
|
|
368
|
+
async refreshContext() {
|
|
369
|
+
await this.reloadContextFiles();
|
|
370
|
+
const updatedSystemPrompt = (0, prompt_utils_1.generateCodegenPrompt)(this.contextFiles);
|
|
364
371
|
this.chatHistory[0] = { role: 'user', content: updatedSystemPrompt };
|
|
365
372
|
this.chatHistory[1] = { role: 'assistant', content: 'What would you like to do?' };
|
|
366
373
|
}
|
|
374
|
+
async reloadContextFiles() {
|
|
375
|
+
for (const filePath in this.contextFiles) {
|
|
376
|
+
try {
|
|
377
|
+
const content = await fs_1.default.promises.readFile(path_1.default.resolve(filePath), 'utf8');
|
|
378
|
+
this.contextFiles[filePath] = content;
|
|
379
|
+
}
|
|
380
|
+
catch (error) {
|
|
381
|
+
console.error(`Error reading file ${filePath}:`, error);
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
}
|
|
367
385
|
isRemoveCommand(command) {
|
|
368
386
|
return command.startsWith('rm ');
|
|
369
387
|
}
|
|
@@ -505,7 +523,7 @@ class ChatManager {
|
|
|
505
523
|
this.isProcessing = true;
|
|
506
524
|
this.chunkManager = new ChunkManager_1.default();
|
|
507
525
|
try {
|
|
508
|
-
this.refreshContext();
|
|
526
|
+
await this.refreshContext();
|
|
509
527
|
this.prompt = this.generatePrompt(input);
|
|
510
528
|
this.addChatHistory(this.prompt);
|
|
511
529
|
if (!this.isSilent) {
|
|
@@ -572,25 +590,74 @@ class ChatManager {
|
|
|
572
590
|
addChatHistory(input) {
|
|
573
591
|
this.chatHistory.push({ role: 'user', content: input });
|
|
574
592
|
}
|
|
593
|
+
/**
|
|
594
|
+
* Handles the streaming response from the AI model.
|
|
595
|
+
* This method processes the incoming data chunks, converts them to readable output,
|
|
596
|
+
* and manages the accumulated content.
|
|
597
|
+
*
|
|
598
|
+
* @param responseStream - The stream of response data from the AI model.
|
|
599
|
+
* @param accumulatedContent - A string to accumulate the complete response content.
|
|
600
|
+
*/
|
|
575
601
|
handleResponseStream(responseStream, accumulatedContent) {
|
|
602
|
+
let animationInterval;
|
|
603
|
+
this.blockManager = new BlockManager_1.default();
|
|
604
|
+
this.chunkManager = new ChunkManager_1.default();
|
|
605
|
+
this.blockManager.on('startGeneratingCode', () => {
|
|
606
|
+
process.stdout.write(colors_1.default.gray.bold('\nGenerating code... '));
|
|
607
|
+
let animationIndex = 0;
|
|
608
|
+
const animationChars = ['/', '|', '\\', '-'];
|
|
609
|
+
animationInterval = setInterval(() => {
|
|
610
|
+
process.stdout.write('\b'.repeat(1));
|
|
611
|
+
process.stdout.write(colors_1.default.gray.bold(animationChars[animationIndex]));
|
|
612
|
+
animationIndex = (animationIndex + 1) % animationChars.length;
|
|
613
|
+
}, 100);
|
|
614
|
+
});
|
|
615
|
+
this.blockManager.on('endGeneratingCode', () => {
|
|
616
|
+
clearInterval(animationInterval);
|
|
617
|
+
process.stdout.write('\b'.repeat(100));
|
|
618
|
+
});
|
|
619
|
+
this.blockManager.on('content', (content) => {
|
|
620
|
+
process.stdout.write(content);
|
|
621
|
+
accumulatedContent += content;
|
|
622
|
+
});
|
|
623
|
+
this.blockManager.on('codeBlock', (codeBlock) => {
|
|
624
|
+
process.stdout.write(colors_1.default.gray.bold(`\`\`\`${codeBlock.language} \n`));
|
|
625
|
+
process.stdout.write(colors_1.default.gray.bold(`${codeBlock.currentStart}\n`));
|
|
626
|
+
process.stdout.write((0, cli_highlight_1.default)(codeBlock.currentCode, { language: codeBlock.language }));
|
|
627
|
+
process.stdout.write(colors_1.default.gray.bold('\n=======\n'));
|
|
628
|
+
process.stdout.write((0, cli_highlight_1.default)(codeBlock.newCode, { language: codeBlock.language }));
|
|
629
|
+
process.stdout.write(colors_1.default.gray.bold('\n>>>>>>> NEW\n```'));
|
|
630
|
+
accumulatedContent += codeBlock.raw;
|
|
631
|
+
});
|
|
632
|
+
// Handle content chunks from the ChunkManager
|
|
576
633
|
this.chunkManager.on('content', (buffer) => {
|
|
577
634
|
let convertedStream = this.gpt.convertStream(buffer);
|
|
578
635
|
while (convertedStream !== null) {
|
|
579
636
|
const { output, lastChar } = convertedStream;
|
|
580
|
-
|
|
581
|
-
|
|
637
|
+
// buffer the output to the BlockManager
|
|
638
|
+
this.blockManager.addContent(output);
|
|
639
|
+
// clear the buffer from the ChunkManager
|
|
582
640
|
this.chunkManager.clearBuffer(lastChar);
|
|
641
|
+
// Try to convert the rest of the buffer to a string
|
|
583
642
|
buffer = buffer.slice(lastChar);
|
|
584
643
|
convertedStream = this.gpt.convertStream(buffer);
|
|
585
644
|
}
|
|
586
645
|
});
|
|
646
|
+
// Handle incoming data chunks from the response stream
|
|
587
647
|
responseStream.data.on('data', (chunk) => {
|
|
648
|
+
// Convert the chunk to a string and add it to the ChunkManager
|
|
649
|
+
if (!chunk)
|
|
650
|
+
return;
|
|
651
|
+
// a chunk is a JSON object with different keys depending on the AI service provider
|
|
588
652
|
const chunkString = chunk.toString();
|
|
589
653
|
this.chunkManager.addChunk(chunkString);
|
|
590
654
|
});
|
|
655
|
+
// Handle the end of the response stream
|
|
591
656
|
responseStream.data.on('end', () => {
|
|
657
|
+
// Finalize the response when the stream ends
|
|
592
658
|
this.finalizeResponse(accumulatedContent);
|
|
593
659
|
});
|
|
660
|
+
// Handle any errors in the response stream
|
|
594
661
|
responseStream.data.on('error', (error) => {
|
|
595
662
|
console.error('Error streaming response:', error);
|
|
596
663
|
this.isProcessing = false;
|
|
@@ -605,19 +672,23 @@ class ChatManager {
|
|
|
605
672
|
const currentNewBlocks = (0, string_utils_1.extractCurrentNewBlocks)(accumulatedContent);
|
|
606
673
|
const [canApply, summary] = await (0, string_utils_1.checkBlocksApplicability)(currentNewBlocks);
|
|
607
674
|
if (!canApply) {
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
this.
|
|
611
|
-
resolve(answer.trim().toLowerCase());
|
|
612
|
-
});
|
|
613
|
-
});
|
|
614
|
-
if (reviewPrompt.startsWith('y') || reviewPrompt === '') {
|
|
675
|
+
if (this.retryCount < this.maxRetries) {
|
|
676
|
+
console.log(`\n\n${summary}\n\n${colors_1.default.yellow.bold('WARNING')} Some of the provided code blocks could not be automatically applied. Retrying (Attempt ${this.retryCount + 1}/${this.maxRetries})...\n`);
|
|
677
|
+
this.retryCount++;
|
|
615
678
|
this.processUserInput(`Some of the provided code blocks could not be applied,
|
|
616
679
|
please match the existing code with a few more lines of context and make sure it is a character for character exact match.
|
|
680
|
+
Never use "rest of the existing code" or "rest of the code" in your response, instead break the code block into smaller blocks.
|
|
617
681
|
|
|
618
682
|
${summary}`);
|
|
619
683
|
return;
|
|
620
684
|
}
|
|
685
|
+
else {
|
|
686
|
+
console.log(`\n\n${colors_1.default.red.bold('ERROR')} Failed to generate a diff that could be cleanly applied after ${this.maxRetries} attempts. Please review the changes manually and try again.\n`);
|
|
687
|
+
this.retryCount = 0; // Reset the retry count for future attempts
|
|
688
|
+
}
|
|
689
|
+
}
|
|
690
|
+
else {
|
|
691
|
+
this.retryCount = 0; // Reset the retry count on successful application
|
|
621
692
|
}
|
|
622
693
|
}
|
|
623
694
|
process.stdout.write(`
|
|
@@ -655,7 +726,7 @@ You can follow up with another request or:
|
|
|
655
726
|
}
|
|
656
727
|
const promptTokens = Math.ceil(this.prompt.length / 4).toLocaleString();
|
|
657
728
|
const statusMessage = error.response?.data?.statusMessage;
|
|
658
|
-
console.error(colors_1.default.red(`\nError (${errorNumber})
|
|
729
|
+
console.error(colors_1.default.red(`\nError (${errorNumber}) while submitting the prompt to the AI API\n\n${statusMessage}\n`));
|
|
659
730
|
this.isProcessing = false;
|
|
660
731
|
this.rl.prompt();
|
|
661
732
|
}
|
|
@@ -1,12 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const events_1 = require("events");
|
|
4
|
+
// A chunk is a JSON object with different keys depending on the AI service provider
|
|
5
|
+
//
|
|
6
|
+
// Some providers produce single response in a single chunk
|
|
7
|
+
//
|
|
8
|
+
// Others produce multiple responses in a single chunk
|
|
9
|
+
//
|
|
10
|
+
// This Chunk Manager's job is to buffer the chunks and emit them as a single string
|
|
11
|
+
// without automatically clearing the buffer until clearBuffer is called.
|
|
12
|
+
// That way, the consumer of the chunk can process it and clear the buffer after
|
|
13
|
+
// they have received enough data.
|
|
4
14
|
class ChunkManager extends events_1.EventEmitter {
|
|
5
15
|
constructor() {
|
|
6
16
|
super(...arguments);
|
|
7
17
|
this.buffer = '';
|
|
8
18
|
}
|
|
9
19
|
addChunk(chunk) {
|
|
20
|
+
if (!chunk)
|
|
21
|
+
return;
|
|
10
22
|
this.buffer += chunk;
|
|
11
23
|
this.emit('content', this.buffer);
|
|
12
24
|
}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const prompts_1 = require("@inquirer/prompts");
|
|
7
7
|
const cli_highlight_1 = __importDefault(require("cli-highlight"));
|
|
8
8
|
const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
|
|
9
|
-
const
|
|
9
|
+
const prompt_utils_1 = require("../utils/prompt_utils");
|
|
10
10
|
const string_utils_1 = require("../utils/string_utils");
|
|
11
11
|
class CodeManager {
|
|
12
12
|
constructor(options) {
|
|
@@ -19,7 +19,7 @@ class CodeManager {
|
|
|
19
19
|
try {
|
|
20
20
|
if (this.options.files) {
|
|
21
21
|
for (const file of this.options.files) {
|
|
22
|
-
this.contextFiles = await (0,
|
|
22
|
+
this.contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(file, this.contextFiles, this.options);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
@@ -29,7 +29,7 @@ class CodeManager {
|
|
|
29
29
|
message: `Enter the relative path of a file or directory you would like to include as context (or press enter to continue):`,
|
|
30
30
|
});
|
|
31
31
|
if (contextFile) {
|
|
32
|
-
this.contextFiles = await (0,
|
|
32
|
+
this.contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(contextFile, this.contextFiles, this.options);
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
35
|
includeMoreFiles = false;
|
|
@@ -70,7 +70,7 @@ ${summary}`);
|
|
|
70
70
|
}
|
|
71
71
|
async generateCode(userPrompt) {
|
|
72
72
|
if (this.chatHistory.length === 0) {
|
|
73
|
-
const systemPrompt = (0,
|
|
73
|
+
const systemPrompt = (0, prompt_utils_1.generateCodegenPrompt)(this.contextFiles);
|
|
74
74
|
this.chatHistory.push({ role: 'user', content: systemPrompt });
|
|
75
75
|
this.chatHistory.push({ role: 'assistant', content: 'What would you like to do?' });
|
|
76
76
|
}
|
|
@@ -127,7 +127,7 @@ ${summary}`);
|
|
|
127
127
|
message: 'Enter the relative path of a file or directory you would like to include as context (or press enter to continue):',
|
|
128
128
|
});
|
|
129
129
|
if (contextFile) {
|
|
130
|
-
this.contextFiles = await (0,
|
|
130
|
+
this.contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(contextFile, this.contextFiles, this.options);
|
|
131
131
|
}
|
|
132
132
|
else {
|
|
133
133
|
includeMoreFiles = false;
|
|
@@ -0,0 +1,216 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const fs_1 = __importDefault(require("fs"));
|
|
7
|
+
const os_1 = __importDefault(require("os"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const colors_1 = __importDefault(require("colors"));
|
|
10
|
+
const ignore_1 = __importDefault(require("ignore"));
|
|
11
|
+
const fs_2 = require("fs");
|
|
12
|
+
const prompts_1 = require("@inquirer/prompts");
|
|
13
|
+
const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
|
|
14
|
+
const string_utils_1 = require("../utils/string_utils");
|
|
15
|
+
const config_utils_1 = require("../utils/config_utils");
|
|
16
|
+
const prompt_utils_1 = require("../utils/prompt_utils");
|
|
17
|
+
class InitManager {
|
|
18
|
+
constructor(options) {
|
|
19
|
+
this.options = options;
|
|
20
|
+
this.chatHistory = [];
|
|
21
|
+
this.options.silent = (0, config_utils_1.getConfig)(this.options).globalSilent || false;
|
|
22
|
+
this.gpt = new cloving_gpt_1.default(this.options);
|
|
23
|
+
this.chatHistory.push({
|
|
24
|
+
role: 'system',
|
|
25
|
+
content: prompt_utils_1.INIT_INSTRUCTIONS,
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Initializes the InitManager by collecting special file contents, checking for dependencies,
|
|
30
|
+
* and processing the AI response for the project details.
|
|
31
|
+
*
|
|
32
|
+
* @return {Promise<void>} A promise that resolves when the initialization is complete.
|
|
33
|
+
*/
|
|
34
|
+
async initialize() {
|
|
35
|
+
const specialFileContents = (0, prompt_utils_1.collectSpecialFileContents)();
|
|
36
|
+
const specialFileNames = Object.keys(specialFileContents).map((file) => ' - ' + file);
|
|
37
|
+
this.logInitializationMessage(specialFileNames);
|
|
38
|
+
const config = (0, config_utils_1.getConfig)(this.options);
|
|
39
|
+
if (!config || !config?.models) {
|
|
40
|
+
console.error('No cloving configuration found. Please run `cloving config`');
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
if (!(0, prompt_utils_1.checkForSpecialFiles)()) {
|
|
44
|
+
console.error('No dependencies files detected. Please add a dependency file (e.g. package.json, Gemfile, requirements.txt, etc.) to your project and run `cloving init` again.');
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const tempFilePath = path_1.default.join(os_1.default.tmpdir(), `describe_${Date.now()}.tmp`);
|
|
48
|
+
try {
|
|
49
|
+
const limitedFileList = await this.getFilteredFileList();
|
|
50
|
+
const projectDetails = {
|
|
51
|
+
files: limitedFileList,
|
|
52
|
+
specialFiles: specialFileContents,
|
|
53
|
+
};
|
|
54
|
+
const [success, errorMessage] = await this.processAIResponse(projectDetails, tempFilePath);
|
|
55
|
+
if (!success) {
|
|
56
|
+
console.log(errorMessage);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
await this.promptUserForReview();
|
|
60
|
+
// Clean up
|
|
61
|
+
await fs_2.promises.unlink(tempFilePath);
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
console.error('Error describing the project:', error.message);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Checks if a directory exists at the specified path.
|
|
69
|
+
*
|
|
70
|
+
* @param {string} directory - The path of the directory to check.
|
|
71
|
+
* @return {Promise<boolean>} A promise that resolves to true if the directory exists, false otherwise.
|
|
72
|
+
*/
|
|
73
|
+
async directoryExists(directory) {
|
|
74
|
+
try {
|
|
75
|
+
const stats = await fs_2.promises.stat(directory);
|
|
76
|
+
return stats.isDirectory();
|
|
77
|
+
}
|
|
78
|
+
catch (error) {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Returns a filtered list of files, excluding those ignored by the .gitignore file.
|
|
84
|
+
*
|
|
85
|
+
* @return {string[]} A list of file paths, limited to the first 100 files.
|
|
86
|
+
*/
|
|
87
|
+
async getFilteredFileList() {
|
|
88
|
+
const gitignorePath = path_1.default.join(process.cwd(), '.gitignore');
|
|
89
|
+
const ig = (0, ignore_1.default)();
|
|
90
|
+
if (fs_1.default.existsSync(gitignorePath)) {
|
|
91
|
+
const gitignoreContent = fs_1.default.readFileSync(gitignorePath, 'utf-8');
|
|
92
|
+
ig.add(gitignoreContent);
|
|
93
|
+
}
|
|
94
|
+
const fileList = await (0, prompt_utils_1.generateFileList)();
|
|
95
|
+
const filteredFileList = fileList.filter((file) => {
|
|
96
|
+
try {
|
|
97
|
+
return !ig.ignores(file);
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
return filteredFileList.slice(0, 100);
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* Logs the initialization message based on the special file names and silent mode.
|
|
107
|
+
*
|
|
108
|
+
* @param {string[]} specialFileNames - A list of special file names to be analyzed.
|
|
109
|
+
* @return {void} No return value.
|
|
110
|
+
*/
|
|
111
|
+
logInitializationMessage(specialFileNames) {
|
|
112
|
+
if (!this.options.silent) {
|
|
113
|
+
if (specialFileNames.length > 0) {
|
|
114
|
+
console.log(`Cloving will analyze the list of files and the contents of the following files:
|
|
115
|
+
|
|
116
|
+
${specialFileNames.join('\n')}
|
|
117
|
+
|
|
118
|
+
Cloving will send AI a request to summarize the technologies used in this project.
|
|
119
|
+
|
|
120
|
+
This will provide better context for future Cloving requests.`);
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
console.log(`
|
|
124
|
+
This script will analyze the list of files in the current directory using GPT to summarize the
|
|
125
|
+
technologies used. This will provide better context for future Cloving requests.
|
|
126
|
+
`);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
/**
|
|
131
|
+
* Processes the AI response by generating a prompt, sending it to the AI,
|
|
132
|
+
* and saving the response to a temporary file and cloving.json.
|
|
133
|
+
*
|
|
134
|
+
* @param {any} projectDetails - A JSON object describing the project.
|
|
135
|
+
* @param {string} tempFilePath - The path to the temporary file.
|
|
136
|
+
* @param {string} errorMessage - An error message if there was an error.
|
|
137
|
+
* @return {[boolean, string]} A promise that resolves with an array containing a boolean
|
|
138
|
+
* indicating whether the AI response was successfully processed,
|
|
139
|
+
* and a message explaining any errors.
|
|
140
|
+
*/
|
|
141
|
+
async processAIResponse(projectDetails, tempFilePath, errorMessage = '') {
|
|
142
|
+
const prompt = errorMessage !== ''
|
|
143
|
+
? errorMessage
|
|
144
|
+
: `Here is a JSON object describing my project:
|
|
145
|
+
${JSON.stringify(projectDetails, null, 2)}`;
|
|
146
|
+
this.chatHistory.push({ role: 'user', content: prompt });
|
|
147
|
+
const aiChatResponse = await this.gpt.generateText({ prompt, messages: this.chatHistory });
|
|
148
|
+
this.chatHistory.push({ role: 'assistant', content: aiChatResponse });
|
|
149
|
+
let cleanAiChatResponse = (0, string_utils_1.extractJsonMetadata)(aiChatResponse);
|
|
150
|
+
const [validSyntax, syntaxErrorMessage] = this.checkClovingJsonSyntax(cleanAiChatResponse);
|
|
151
|
+
if (!validSyntax) {
|
|
152
|
+
console.log(syntaxErrorMessage);
|
|
153
|
+
console.log('Retrying...');
|
|
154
|
+
return this.processAIResponse(projectDetails, tempFilePath, syntaxErrorMessage);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
await fs_2.promises.writeFile(tempFilePath, cleanAiChatResponse);
|
|
158
|
+
// Save the AI chat response to cloving.json
|
|
159
|
+
await fs_2.promises.writeFile('cloving.json', cleanAiChatResponse);
|
|
160
|
+
console.log(`Project data saved to ${colors_1.default.green.bold('cloving.json')}`);
|
|
161
|
+
return [true, ''];
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* Checks the syntax of the generated cloving.json file.
|
|
166
|
+
*
|
|
167
|
+
* @param {string} cleanAiChatResponse - The cleaned AI chat response.
|
|
168
|
+
* @return {[boolean, string]} An array where the first element is a boolean indicating
|
|
169
|
+
* whether the syntax was valid, and the second element is a
|
|
170
|
+
* message explaining any errors.
|
|
171
|
+
*/
|
|
172
|
+
checkClovingJsonSyntax(cleanAiChatResponse) {
|
|
173
|
+
try {
|
|
174
|
+
JSON.parse(cleanAiChatResponse);
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
return [
|
|
178
|
+
false,
|
|
179
|
+
`${colors_1.default.red.bold('ERROR:')} parsing cloving.json: ${colors_1.default.red.bold(error.message)}`,
|
|
180
|
+
];
|
|
181
|
+
}
|
|
182
|
+
const clovingJson = JSON.parse(cleanAiChatResponse);
|
|
183
|
+
const directoriesToCheck = [
|
|
184
|
+
...clovingJson.languages.map((language) => language.directory),
|
|
185
|
+
...clovingJson.frameworks.map((framework) => framework.directory),
|
|
186
|
+
...clovingJson.testingFrameworks.map((testingFramework) => testingFramework.directory),
|
|
187
|
+
];
|
|
188
|
+
const missingDirectories = directoriesToCheck.filter((directory) => !fs_1.default.existsSync(directory));
|
|
189
|
+
if (missingDirectories.length > 0) {
|
|
190
|
+
return [
|
|
191
|
+
false,
|
|
192
|
+
`${colors_1.default.red.bold('ERROR:')} The following directories were not found: ${colors_1.default.red.bold(missingDirectories.join(', '))}`,
|
|
193
|
+
];
|
|
194
|
+
}
|
|
195
|
+
return [true, ''];
|
|
196
|
+
}
|
|
197
|
+
/**
|
|
198
|
+
* Prompts the user to review the generated data if the `silent` option is not set.
|
|
199
|
+
* If the user confirms, reads the content of 'cloving.json' and logs it to the console.
|
|
200
|
+
*
|
|
201
|
+
* @return {Promise<void>} A promise that resolves when the review is complete.
|
|
202
|
+
*/
|
|
203
|
+
async promptUserForReview() {
|
|
204
|
+
if (!this.options.silent) {
|
|
205
|
+
const reviewAnswer = await (0, prompts_1.confirm)({
|
|
206
|
+
message: 'Do you want to review the generated data?',
|
|
207
|
+
default: true,
|
|
208
|
+
});
|
|
209
|
+
if (reviewAnswer) {
|
|
210
|
+
const clovingJsonContent = await fs_2.promises.readFile('cloving.json', 'utf-8');
|
|
211
|
+
console.log(clovingJsonContent);
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
exports.default = InitManager;
|
|
@@ -10,8 +10,17 @@ const path_1 = __importDefault(require("path"));
|
|
|
10
10
|
const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
|
|
11
11
|
const ChunkManager_1 = __importDefault(require("./ChunkManager"));
|
|
12
12
|
const config_utils_1 = require("../utils/config_utils");
|
|
13
|
-
const
|
|
13
|
+
const prompt_utils_1 = require("../utils/prompt_utils");
|
|
14
14
|
class ProxyManager {
|
|
15
|
+
/**
|
|
16
|
+
* Creates an instance of ProxyManager.
|
|
17
|
+
* @param {ClovingGPTOptions} options - Configuration options for the ProxyManager.
|
|
18
|
+
* @description
|
|
19
|
+
* Initializes the ProxyManager with the given options. It sets up:
|
|
20
|
+
* - A ClovingGPT instance with silent and stream options enabled
|
|
21
|
+
* - An Express application with JSON body parsing
|
|
22
|
+
* - A ChunkManager for handling streaming responses
|
|
23
|
+
*/
|
|
15
24
|
constructor(options) {
|
|
16
25
|
this.options = options;
|
|
17
26
|
this.contextFiles = {};
|
|
@@ -42,7 +51,7 @@ class ProxyManager {
|
|
|
42
51
|
.stat(filePath)
|
|
43
52
|
.then((stat) => stat.isDirectory())
|
|
44
53
|
.catch(() => false)) {
|
|
45
|
-
const dirFiles = await (0,
|
|
54
|
+
const dirFiles = await (0, prompt_utils_1.getAllFilesInDirectory)(filePath);
|
|
46
55
|
expandedFiles = expandedFiles.concat(dirFiles.map((f) => path_1.default.relative(process.cwd(), f)));
|
|
47
56
|
}
|
|
48
57
|
else {
|
|
@@ -121,7 +130,6 @@ ${content}`;
|
|
|
121
130
|
res.write(`${dataToSend}\n\n`);
|
|
122
131
|
convertedStreams = [];
|
|
123
132
|
}
|
|
124
|
-
this.chunkManager.clearBuffer(lastChar);
|
|
125
133
|
buffer = buffer.slice(lastChar);
|
|
126
134
|
convertedStream = this.gpt.convertStream(buffer);
|
|
127
135
|
}
|
|
@@ -11,7 +11,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
11
11
|
const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
|
|
12
12
|
const git_utils_1 = require("../utils/git_utils");
|
|
13
13
|
const string_utils_1 = require("../utils/string_utils");
|
|
14
|
-
const
|
|
14
|
+
const prompt_utils_1 = require("../utils/prompt_utils");
|
|
15
15
|
const config_utils_1 = require("../utils/config_utils");
|
|
16
16
|
class ReviewManager {
|
|
17
17
|
constructor(options) {
|
|
@@ -21,6 +21,11 @@ class ReviewManager {
|
|
|
21
21
|
this.options = options;
|
|
22
22
|
this.gpt = new cloving_gpt_1.default(options);
|
|
23
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* Loads the context files specified in the options. If directories are provided,
|
|
26
|
+
* it expands them to include all files within. The contents of each file are
|
|
27
|
+
* stored in the `contextFiles` object for later use.
|
|
28
|
+
*/
|
|
24
29
|
async loadContextFiles() {
|
|
25
30
|
if (this.options.files) {
|
|
26
31
|
let expandedFiles = [];
|
|
@@ -30,7 +35,7 @@ class ReviewManager {
|
|
|
30
35
|
.stat(filePath)
|
|
31
36
|
.then((stat) => stat.isDirectory())
|
|
32
37
|
.catch(() => false)) {
|
|
33
|
-
const dirFiles = await (0,
|
|
38
|
+
const dirFiles = await (0, prompt_utils_1.getAllFilesInDirectory)(filePath);
|
|
34
39
|
expandedFiles = expandedFiles.concat(dirFiles.map((f) => path_1.default.relative(process.cwd(), f)));
|
|
35
40
|
}
|
|
36
41
|
else {
|
|
@@ -50,6 +55,13 @@ class ReviewManager {
|
|
|
50
55
|
}
|
|
51
56
|
}
|
|
52
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* Generates a review prompt based on the current chat history and options.
|
|
60
|
+
* If no chat history exists, it initializes it with a system prompt and a request
|
|
61
|
+
* for user input. The prompt includes a structured example response for code review.
|
|
62
|
+
*
|
|
63
|
+
* @returns {string} The generated review prompt.
|
|
64
|
+
*/
|
|
53
65
|
generateReviewPrompt() {
|
|
54
66
|
if (this.chatHistory.length === 0) {
|
|
55
67
|
let systemPrompt = `### Example of a well-structured response
|
|
@@ -8,7 +8,7 @@ const copy_paste_1 = __importDefault(require("copy-paste"));
|
|
|
8
8
|
const child_process_1 = require("child_process");
|
|
9
9
|
const prompts_1 = require("@inquirer/prompts");
|
|
10
10
|
const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
|
|
11
|
-
const
|
|
11
|
+
const prompt_utils_1 = require("../utils/prompt_utils");
|
|
12
12
|
const string_utils_1 = require("../utils/string_utils");
|
|
13
13
|
const config_utils_1 = require("../utils/config_utils");
|
|
14
14
|
class ShellManager {
|
|
@@ -27,7 +27,7 @@ Please briefly explain how this shell script works.`;
|
|
|
27
27
|
}
|
|
28
28
|
async generateShell(prompt) {
|
|
29
29
|
if (this.chatHistory.length === 0) {
|
|
30
|
-
const systemPrompt = (0,
|
|
30
|
+
const systemPrompt = (0, prompt_utils_1.generateShellPrompt)();
|
|
31
31
|
this.chatHistory.push({ role: 'user', content: systemPrompt });
|
|
32
32
|
this.chatHistory.push({ role: 'assistant', content: 'What would you like to do?' });
|
|
33
33
|
}
|
|
@@ -40,9 +40,14 @@ Please briefly explain how this shell script works.`;
|
|
|
40
40
|
console.log((0, cli_highlight_1.default)(generatedShellWithoutShebang));
|
|
41
41
|
}
|
|
42
42
|
async handleUserAction(response, prompt) {
|
|
43
|
+
let { exec } = this.options;
|
|
43
44
|
this.chatHistory.push({ role: 'assistant', content: response });
|
|
44
45
|
const generatedShell = (0, string_utils_1.extractMarkdown)(response);
|
|
45
46
|
const generatedShellWithoutShebang = generatedShell.replace(/^#!.*?\s/, '');
|
|
47
|
+
if (exec) {
|
|
48
|
+
(0, child_process_1.execSync)(generatedShellWithoutShebang, { stdio: 'inherit' });
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
46
51
|
const action = await (0, prompts_1.select)({
|
|
47
52
|
message: 'What would you like to do?',
|
|
48
53
|
choices: [
|
|
@@ -8,7 +8,7 @@ const child_process_1 = require("child_process");
|
|
|
8
8
|
const cli_highlight_1 = __importDefault(require("cli-highlight"));
|
|
9
9
|
const prompts_1 = require("@inquirer/prompts");
|
|
10
10
|
const git_utils_1 = require("../utils/git_utils");
|
|
11
|
-
const
|
|
11
|
+
const prompt_utils_1 = require("../utils/prompt_utils");
|
|
12
12
|
const config_utils_1 = require("../utils/config_utils");
|
|
13
13
|
const string_utils_1 = require("../utils/string_utils");
|
|
14
14
|
const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
|
|
@@ -197,7 +197,7 @@ Also, list any test files that might be relevant to these files.`;
|
|
|
197
197
|
## List of Files
|
|
198
198
|
${(files || []).join('\n')}
|
|
199
199
|
|
|
200
|
-
${
|
|
200
|
+
${prompt_utils_1.CODEGEN_INSTRUCTIONS}
|
|
201
201
|
|
|
202
202
|
## Context
|
|
203
203
|
|
|
@@ -221,7 +221,7 @@ ${await (0, git_utils_1.getGitDiff)()}
|
|
|
221
221
|
|
|
222
222
|
${context.join('\n\n')}
|
|
223
223
|
|
|
224
|
-
${
|
|
224
|
+
${prompt_utils_1.CODEGEN_INSTRUCTIONS}
|
|
225
225
|
|
|
226
226
|
## Prompt
|
|
227
227
|
|