-
-
Notifications
You must be signed in to change notification settings - Fork 5
Expand file tree
/
Copy pathcommit.js
More file actions
283 lines (243 loc) · 6.65 KB
/
commit.js
File metadata and controls
283 lines (243 loc) · 6.65 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
import process from 'node:process';
import {AIProvider} from '../providers/ai-provider.js';
import {
getChangedFiles,
stageFile,
stageAll,
unstageFile,
getDiff,
commit,
isGitRepository,
isCommitterSet,
} from '../utils/git.js';
import {
showSuccess,
showError,
showWarning,
showInfo,
confirmCommit,
} from '../utils/ui.js';
import {getAuthMode, getConvention} from '../utils/config-manager.js';
/**
* Main commit command logic
* Handles file-by-file and all-files workflows
*/
export async function commitCommand(options = {}) {
try {
// Check if in git repository
if (!(await isGitRepository())) {
showError('Not a git repository.');
console.log('Please run this command inside a git repository.');
process.exit(1);
}
// Check if committer is set
if (!(await isCommitterSet())) {
showError('Git user not configured.');
console.log('Please configure git user:');
console.log(' git config user.name "Your Name"');
console.log(' git config user.email "your.email@example.com"');
process.exit(1);
}
// Check authentication
const authMode = getAuthMode();
if (!authMode) {
showError('Not authenticated.');
console.log('');
console.log('Please authenticate first:');
console.log(' magicc auth copilot # Recommended');
console.log(' magicc auth openai <key> # Legacy');
process.exit(1);
}
// Initialize AI provider
const aiProvider = new AIProvider({
authMode,
model: options.model,
});
// Route to appropriate workflow
if (options.all) {
await processAllFiles(aiProvider, options);
} else if (options.file) {
await processFile(options.file, aiProvider, options);
} else {
await processFilesInteractively(aiProvider, options);
}
} catch (error) {
showError(`Commit failed: ${error.message}`);
process.exit(1);
}
}
export async function processAllFiles(aiProvider, options = {}) {
showInfo('Processing all files together...');
// Stage all changes
await stageAll();
// Get full diff
const diff = await getDiff();
if (!diff) {
showWarning('No changes to commit.');
return;
}
// Generate commit message
showInfo('Generating commit message...');
const message = await aiProvider.generateCommitMessage(diff, null, options);
// Confirm and commit
const result = await confirmCommit(message);
if (result.action === 'accept') {
const success = await commit(result.message);
if (success) {
showSuccess('Changes committed successfully!');
console.log(`📝 ${result.message}`);
} else {
showError('Failed to commit changes.');
}
} else if (result.action === 'skip') {
showInfo('Commit cancelled.');
}
}
/* eslint-disable no-await-in-loop */
export async function processFilesInteractively(aiProvider, options = {}) {
showInfo('Processing files interactively (file-by-file)...');
console.log('');
const files = await getChangedFiles();
if (files.length === 0) {
showWarning('No changes to commit.');
return;
}
console.log(`Found ${files.length} changed file(s).\n`);
let committed = 0;
let skipped = 0;
for (const file of files) {
console.log(`\n📄 Processing: ${file}`);
// Stage the file
await stageFile(file);
// Get diff for this file
const diff = await getDiff(file);
if (!diff) {
showWarning(`No diff for ${file}, skipping...`);
await unstageFile(file);
skipped++;
continue;
}
let currentConvention = options.convention || getConvention();
let fileProcessed = false;
let attempts = 0;
const maxAttempts = 5;
while (!fileProcessed && attempts < maxAttempts) {
try {
const message = await aiProvider.generateCommitMessage(diff, file, {
...options,
convention: currentConvention,
});
const result = await confirmCommit(message, file, currentConvention);
switch (result.action) {
case 'accept': {
const success = await commit(result.message);
if (success) {
showSuccess(`Committed: ${file}`);
console.log(`📝 ${result.message}`);
committed++;
} else {
showError(`Failed to commit ${file}`);
await unstageFile(file);
skipped++;
}
fileProcessed = true;
break;
}
case 'regenerate': {
currentConvention = result.convention;
attempts++;
// Loop continues to regenerate
break;
}
case 'skip': {
showInfo(`Skipped: ${file}`);
await unstageFile(file);
skipped++;
fileProcessed = true;
break;
}
// No default
}
} catch (error) {
showError(`Error processing ${file}: ${error.message}`);
await unstageFile(file);
skipped++;
fileProcessed = true;
}
}
// Check if max attempts reached without processing
if (!fileProcessed && attempts >= maxAttempts) {
showWarning(
`Maximum regeneration attempts (${maxAttempts}) reached for ${file}`,
);
await unstageFile(file);
skipped++;
}
}
// Show summary
console.log('\n' + '═'.repeat(50));
console.log('📊 Summary:');
console.log(` ✅ Committed: ${committed} file(s)`);
console.log(` ⏭️ Skipped: ${skipped} file(s)`);
console.log('═'.repeat(50) + '\n');
}
export async function processFile(filePath, aiProvider, options = {}) {
showInfo(`Processing single file: ${filePath}`);
console.log('');
// Stage the file
const staged = await stageFile(filePath);
if (!staged) {
showError(`Failed to stage ${filePath}`);
return;
}
// Get diff
const diff = await getDiff(filePath);
if (!diff) {
showWarning(`No changes in ${filePath}`);
await unstageFile(filePath);
return;
}
let currentConvention = options.convention || getConvention();
let attempts = 0;
const maxAttempts = 5;
while (attempts < maxAttempts) {
showInfo('Generating commit message...');
try {
const message = await aiProvider.generateCommitMessage(diff, filePath, {
...options,
convention: currentConvention,
});
const result = await confirmCommit(message, filePath, currentConvention);
switch (result.action) {
case 'accept': {
const success = await commit(result.message);
if (success) {
showSuccess('Changes committed successfully!');
console.log(`📝 ${result.message}`);
} else {
showError('Failed to commit changes.');
}
return;
}
case 'regenerate': {
currentConvention = result.convention;
attempts++;
continue;
}
case 'skip': {
showInfo('Commit cancelled.');
await unstageFile(filePath);
return;
}
// No default
}
} catch (error) {
showError(`Error: ${error.message}`);
await unstageFile(filePath);
return;
}
}
showWarning('Maximum regeneration attempts reached.');
await unstageFile(filePath);
}
/* eslint-enable no-await-in-loop */