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
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
|
import { mkdtemp, rm } from "fs/promises";
import { join } from "path";
import { tmpdir } from "os";
import { getRepoPath, getDefaultBranch } from "../git/repository";
export interface RepairResult {
repaired: boolean;
repairs: Repair[];
commitSha: string | null;
}
export interface Repair {
file: string;
type: string;
description: string;
linesChanged: number;
}
async function exec(
cmd: string[],
cwd: string,
stdin?: string,
extraEnv?: Record<string, string>
): Promise<{ stdout: string; stderr: string; exitCode: number }> {
const proc = Bun.spawn(cmd, {
cwd,
stdout: "pipe",
stderr: "pipe",
stdin: stdin !== undefined ? "pipe" : undefined,
env: {
...process.env,
GIT_AUTHOR_NAME: "gluecron[bot]",
GIT_AUTHOR_EMAIL: "bot@gluecron.com",
GIT_COMMITTER_NAME: "gluecron[bot]",
GIT_COMMITTER_EMAIL: "bot@gluecron.com",
...extraEnv,
},
});
if (stdin !== undefined && proc.stdin) {
proc.stdin.write(new TextEncoder().encode(stdin));
proc.stdin.end();
}
const stdout = await new Response(proc.stdout).text();
const stderr = await new Response(proc.stderr).text();
const exitCode = await proc.exited;
return { stdout: stdout.trim(), stderr: stderr.trim(), exitCode };
}
function looksLikeSha(s: string): boolean {
return /^[0-9a-f]{40}$/.test(s);
}
export async function autoRepair(
owner: string,
repo: string,
ref: string
): Promise<RepairResult> {
const repoDir = getRepoPath(owner, repo);
const repairs: Repair[] = [];
const { stdout: fileList } = await exec(
["git", "ls-tree", "-r", "--name-only", ref],
repoDir
);
const files = fileList.split("\n").filter(Boolean);
const modifications: Map<string, string> = new Map();
const gitignoreFile = files.find((f) => f === ".gitignore");
if (gitignoreFile) {
const { stdout: content } = await exec(
["git", "show", `${ref}:.gitignore`],
repoDir
);
const essentialEntries = [
"node_modules/",
".env",
".env.local",
".DS_Store",
"dist/",
];
const lines = content.split("\n");
const missing = essentialEntries.filter(
(entry) => !lines.some((l) => l.trim() === entry)
);
if (missing.length > 0) {
const newContent = content.trimEnd() + "\n\n# Auto-added by gluecron\n" + missing.join("\n") + "\n";
modifications.set(".gitignore", newContent);
repairs.push({
file: ".gitignore",
type: "gitignore",
description: `Added missing entries: ${missing.join(", ")}`,
linesChanged: missing.length,
});
}
} else if (files.includes("package.json")) {
const newContent = `# Auto-generated by gluecron
node_modules/
dist/
.env
.env.local
.env.*.local
*.log
.DS_Store
coverage/
.cache/
`;
modifications.set(".gitignore", newContent);
repairs.push({
file: ".gitignore",
type: "gitignore",
description: "Created .gitignore with standard entries",
linesChanged: 10,
});
}
const textExtensions = /\.(ts|tsx|js|jsx|json|md|txt|yaml|yml|toml|css|html|py|rb|go|rs|java|sh|sql)$/;
const textFiles = files.filter((f) => textExtensions.test(f)).slice(0, 50);
for (const filePath of textFiles) {
const { stdout: content, exitCode } = await exec(
["git", "show", `${ref}:${filePath}`],
repoDir
);
if (exitCode !== 0) continue;
let modified = content;
let changes = 0;
const lines = modified.split("\n");
const trimmed = lines.map((line) => {
const trimmedLine = line.replace(/[\t ]+$/, "");
if (trimmedLine !== line) changes++;
return trimmedLine;
});
modified = trimmed.join("\n");
if (modified.length > 0 && !modified.endsWith("\n")) {
modified += "\n";
changes++;
}
if (modified !== content) {
modifications.set(filePath, modified);
repairs.push({
file: filePath,
type: "whitespace",
description: `Fixed ${changes} whitespace issue${changes > 1 ? "s" : ""}`,
linesChanged: changes,
});
}
}
for (const filePath of textFiles) {
if (filePath.includes("test") || filePath.includes("spec")) continue;
if (filePath.endsWith(".md") || filePath.endsWith(".txt")) continue;
const existing = modifications.get(filePath);
const { stdout: rawContent } = await exec(
["git", "show", `${ref}:${filePath}`],
repoDir
);
const content = existing || rawContent;
let modified = content;
let secretsFound = 0;
modified = modified.replace(
/((?:AKIA|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16})/g,
(match) => {
secretsFound++;
return "process.env.AWS_ACCESS_KEY_ID";
}
);
if (secretsFound > 0 && modified !== content) {
modifications.set(filePath, modified);
repairs.push({
file: filePath,
type: "secret-masking",
description: `Masked ${secretsFound} hardcoded secret${secretsFound > 1 ? "s" : ""}`,
linesChanged: secretsFound,
});
}
}
const jsonFiles = files.filter((f) => f.endsWith(".json")).slice(0, 20);
for (const filePath of jsonFiles) {
const existing = modifications.get(filePath);
const { stdout: rawContent } = await exec(
["git", "show", `${ref}:${filePath}`],
repoDir
);
const content = existing || rawContent;
try {
JSON.parse(content);
} catch {
let fixed = content;
fixed = fixed.replace(/,(\s*[}\]])/g, "$1");
try {
const parsed = JSON.parse(fixed);
const reformatted = JSON.stringify(parsed, null, 2) + "\n";
modifications.set(filePath, reformatted);
repairs.push({
file: filePath,
type: "json-fix",
description: "Fixed JSON syntax (trailing commas, formatting)",
linesChanged: 1,
});
} catch {
}
}
}
if (modifications.size === 0) {
return { repaired: false, repairs: [], commitSha: null };
}
const tmpIndexDir = await mkdtemp(join(tmpdir(), "gluecron-repair-"));
const gitEnv = { GIT_INDEX_FILE: join(tmpIndexDir, "index") };
try {
const readTree = await exec(["git", "read-tree", ref], repoDir, undefined, gitEnv);
if (readTree.exitCode !== 0) {
console.error(
`[autorepair] ${owner}/${repo}@${ref}: git read-tree failed (exit ${readTree.exitCode}): ${readTree.stderr} — aborting, no commit made.`
);
return { repaired: false, repairs: [], commitSha: null };
}
const modeByPath = new Map<string, string>();
for (const line of (await exec(["git", "ls-tree", "-r", ref], repoDir)).stdout.split("\n")) {
const match = line.match(/^(\d+) blob [0-9a-f]+\t(.+)$/);
if (match) modeByPath.set(match[2], match[1]);
}
for (const [path, content] of modifications) {
const hashed = await exec(["git", "hash-object", "-w", "--stdin"], repoDir, content);
if (hashed.exitCode !== 0 || !looksLikeSha(hashed.stdout)) {
console.error(
`[autorepair] ${owner}/${repo}@${ref}: git hash-object failed for ${path} (exit ${hashed.exitCode}): ${hashed.stderr} — aborting, no commit made.`
);
return { repaired: false, repairs: [], commitSha: null };
}
const mode = modeByPath.get(path) ?? "100644";
const staged = await exec(
["git", "update-index", "--add", "--cacheinfo", `${mode},${hashed.stdout},${path}`],
repoDir,
undefined,
gitEnv
);
if (staged.exitCode !== 0) {
console.error(
`[autorepair] ${owner}/${repo}@${ref}: git update-index failed for ${path} (exit ${staged.exitCode}): ${staged.stderr} — aborting, no commit made.`
);
return { repaired: false, repairs: [], commitSha: null };
}
}
const writeTree = await exec(["git", "write-tree"], repoDir, undefined, gitEnv);
if (writeTree.exitCode !== 0 || !looksLikeSha(writeTree.stdout)) {
console.error(
`[autorepair] ${owner}/${repo}@${ref}: git write-tree failed (exit ${writeTree.exitCode}): ${writeTree.stderr} — aborting, no commit made.`
);
return { repaired: false, repairs: [], commitSha: null };
}
const newTreeSha = writeTree.stdout;
const parent = await exec(["git", "rev-parse", ref], repoDir);
if (parent.exitCode !== 0 || !looksLikeSha(parent.stdout)) {
console.error(
`[autorepair] ${owner}/${repo}@${ref}: git rev-parse failed (exit ${parent.exitCode}): ${parent.stderr} — aborting, no commit made.`
);
return { repaired: false, repairs: [], commitSha: null };
}
const parentSha = parent.stdout;
const originalFileCount = files.length;
const newFileCount = (await exec(["git", "ls-tree", "-r", "--name-only", newTreeSha], repoDir)).stdout
.split("\n")
.filter(Boolean).length;
if (newFileCount < originalFileCount) {
console.error(
`[autorepair] ${owner}/${repo}@${ref}: refusing to commit — new tree has ${newFileCount} files, original had ${originalFileCount}. This should never happen; aborting with no commit made.`
);
return { repaired: false, repairs: [], commitSha: null };
}
const repairSummary = repairs
.map((r) => `- ${r.file}: ${r.description}`)
.join("\n");
const commitMsg = `fix: auto-repair by gluecron\n\n${repairs.length} automatic repair${repairs.length > 1 ? "s" : ""}:\n${repairSummary}\n\nThis commit was created automatically by gluecron's repair engine.`;
const commit = await exec(["git", "commit-tree", newTreeSha, "-p", parentSha, "-m", commitMsg], repoDir);
if (commit.exitCode !== 0 || !looksLikeSha(commit.stdout)) {
console.error(
`[autorepair] ${owner}/${repo}@${ref}: git commit-tree failed (exit ${commit.exitCode}): ${commit.stderr} — aborting, no commit made.`
);
return { repaired: false, repairs: [], commitSha: null };
}
const commitSha = commit.stdout;
const updateRef = await exec(
["git", "update-ref", `refs/heads/${ref}`, commitSha, parentSha],
repoDir
);
if (updateRef.exitCode !== 0) {
console.error(
`[autorepair] ${owner}/${repo}@${ref}: git update-ref failed (exit ${updateRef.exitCode}): ${updateRef.stderr} — repair commit ${commitSha.slice(0, 7)} was created but NOT applied to the branch.`
);
return { repaired: false, repairs: [], commitSha: null };
}
console.log(
`[autorepair] ${owner}/${repo}@${ref}: ${repairs.length} repairs committed as ${commitSha.slice(0, 7)}`
);
return { repaired: true, repairs, commitSha };
} finally {
await rm(tmpIndexDir, { recursive: true, force: true }).catch(() => {});
}
}
|