steroids-cli 0.12.9 → 0.12.11
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/commands/tasks-reset.d.ts.map +1 -1
- package/dist/commands/tasks-reset.js +40 -2
- package/dist/commands/tasks-reset.js.map +1 -1
- package/dist/git/submission-resolution.d.ts +5 -0
- package/dist/git/submission-resolution.d.ts.map +1 -1
- package/dist/git/submission-resolution.js +45 -1
- package/dist/git/submission-resolution.js.map +1 -1
- package/dist/runners/orchestrator-loop.d.ts.map +1 -1
- package/dist/runners/orchestrator-loop.js +17 -1
- package/dist/runners/orchestrator-loop.js.map +1 -1
- package/dist/runners/wakeup-global-cleanup.d.ts.map +1 -1
- package/dist/runners/wakeup-global-cleanup.js +26 -6
- package/dist/runners/wakeup-global-cleanup.js.map +1 -1
- package/dist/workspace/git-lifecycle.d.ts +11 -0
- package/dist/workspace/git-lifecycle.d.ts.map +1 -1
- package/dist/workspace/git-lifecycle.js +29 -0
- package/dist/workspace/git-lifecycle.js.map +1 -1
- package/dist/workspace/merge-pipeline.d.ts.map +1 -1
- package/dist/workspace/merge-pipeline.js +14 -4
- package/dist/workspace/merge-pipeline.js.map +1 -1
- package/dist/workspace/remote-branch-cleanup.d.ts +9 -0
- package/dist/workspace/remote-branch-cleanup.d.ts.map +1 -0
- package/dist/workspace/remote-branch-cleanup.js +120 -0
- package/dist/workspace/remote-branch-cleanup.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-reset.d.ts","sourceRoot":"","sources":["../../src/commands/tasks-reset.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"tasks-reset.d.ts","sourceRoot":"","sources":["../../src/commands/tasks-reset.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAMnD,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA+NpF"}
|
|
@@ -10,6 +10,9 @@ const queries_js_1 = require("../database/queries.js");
|
|
|
10
10
|
const output_js_1 = require("../cli/output.js");
|
|
11
11
|
const errors_js_1 = require("../cli/errors.js");
|
|
12
12
|
const global_db_js_1 = require("../runners/global-db.js");
|
|
13
|
+
const git_lifecycle_js_1 = require("../workspace/git-lifecycle.js");
|
|
14
|
+
const pool_js_1 = require("../workspace/pool.js");
|
|
15
|
+
const clone_js_1 = require("../parallel/clone.js");
|
|
13
16
|
async function resetTaskCmd(args, flags) {
|
|
14
17
|
const out = (0, output_js_1.createOutput)({ command: 'tasks', subcommand: 'reset', flags });
|
|
15
18
|
const { values, positionals } = (0, node_util_1.parseArgs)({
|
|
@@ -131,14 +134,49 @@ DESCRIPTION:
|
|
|
131
134
|
out.error(errors_js_1.ErrorCode.GENERAL_ERROR, 'All tasks failed pre-flight or runner termination checks.');
|
|
132
135
|
process.exit(1);
|
|
133
136
|
}
|
|
137
|
+
// 2b. Clean up stale task branches — BEFORE DB transaction.
|
|
138
|
+
// While tasks are still in blocked status, no runner can pick them up.
|
|
139
|
+
// If we cleaned after the transaction (task = pending), a runner could
|
|
140
|
+
// claim the slot between the transaction commit and branch deletion.
|
|
141
|
+
const blockedTasks = fullyValidatedTasks.filter(t => t.status === 'blocked_conflict' || t.status === 'blocked_error');
|
|
142
|
+
if (blockedTasks.length > 0) {
|
|
143
|
+
const projectId = (0, clone_js_1.getProjectHash)(projectPath);
|
|
144
|
+
const { db: globalDb2, close: closeGlobal2 } = (0, global_db_js_1.openGlobalDatabase)();
|
|
145
|
+
try {
|
|
146
|
+
for (const task of blockedTasks) {
|
|
147
|
+
const taskBranch = `steroids/task-${task.id}`;
|
|
148
|
+
// Find slots that are idle OR still bound to this task (SIGKILL'd runner)
|
|
149
|
+
const slots = globalDb2
|
|
150
|
+
.prepare(`SELECT id, slot_path, remote_url, status, task_id
|
|
151
|
+
FROM workspace_pool_slots
|
|
152
|
+
WHERE project_id = ? AND (status = 'idle' OR task_id = ?)`)
|
|
153
|
+
.all(projectId, task.id);
|
|
154
|
+
for (const slot of slots) {
|
|
155
|
+
if (!slot.slot_path || !(0, node_fs_1.existsSync)((0, node_path_1.join)(slot.slot_path, '.git')))
|
|
156
|
+
continue;
|
|
157
|
+
(0, git_lifecycle_js_1.deleteTaskBranchFromSlot)(slot.slot_path, taskBranch, {
|
|
158
|
+
deleteRemote: true,
|
|
159
|
+
remoteUrl: slot.remote_url,
|
|
160
|
+
});
|
|
161
|
+
// Release non-idle slots that were bound to this task
|
|
162
|
+
if (slot.status !== 'idle' && slot.task_id === task.id) {
|
|
163
|
+
(0, pool_js_1.releaseSlot)(globalDb2, slot.id);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
finally {
|
|
169
|
+
closeGlobal2();
|
|
170
|
+
}
|
|
171
|
+
}
|
|
134
172
|
// 3. Atomic Database Transaction across ALL validated tasks
|
|
135
173
|
db.transaction(() => {
|
|
136
174
|
for (const task of fullyValidatedTasks) {
|
|
137
175
|
// Update task status — clear all failure/rejection counters
|
|
138
176
|
// Also clear conflict_count when resetting blocked_conflict tasks
|
|
139
177
|
db.prepare(`UPDATE tasks SET status = 'pending', rejection_count = 0, failure_count = 0, merge_failure_count = 0,
|
|
140
|
-
conflict_count =
|
|
141
|
-
WHERE id = ?`).run(task.
|
|
178
|
+
conflict_count = 0
|
|
179
|
+
WHERE id = ?`).run(task.id);
|
|
142
180
|
// Auto-resolve open disputes
|
|
143
181
|
db.prepare(`UPDATE disputes SET status = 'resolved', resolution = 'custom', resolution_notes = 'Bulk reset via CLI', resolved_at = datetime('now') WHERE task_id = ? AND status = 'open'`).run(task.id);
|
|
144
182
|
// Delete task_locks
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-reset.js","sourceRoot":"","sources":["../../src/commands/tasks-reset.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"tasks-reset.js","sourceRoot":"","sources":["../../src/commands/tasks-reset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
interface WorkstreamSource {
|
|
2
|
+
clonePath: string;
|
|
3
|
+
branchName: string;
|
|
4
|
+
}
|
|
1
5
|
type ResolutionReason = 'no_candidates' | 'not_reachable' | 'workstream_discovery_failed';
|
|
2
6
|
export type SubmissionHashResolution = {
|
|
3
7
|
status: 'resolved';
|
|
@@ -16,6 +20,7 @@ export interface SubmissionCommitHistoryResolution {
|
|
|
16
20
|
attempts: string[];
|
|
17
21
|
reason?: ResolutionReason;
|
|
18
22
|
}
|
|
23
|
+
export declare function getPoolSlotSources(projectPath: string): WorkstreamSource[];
|
|
19
24
|
/**
|
|
20
25
|
* Resolve the latest reachable commit among historical submission candidates.
|
|
21
26
|
* Falls back to parallel workstream clone fetches if the commit is missing locally.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submission-resolution.d.ts","sourceRoot":"","sources":["../../src/git/submission-resolution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"submission-resolution.d.ts","sourceRoot":"","sources":["../../src/git/submission-resolution.ts"],"names":[],"mappings":"AASA,UAAU,gBAAgB;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,gBAAgB,GACjB,eAAe,GACf,eAAe,GACf,6BAA6B,CAAC;AAElC,MAAM,MAAM,wBAAwB,GAChC;IACA,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,iBAAiB,GAAG,kBAAkB,CAAC;IACjD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,GACC;IACA,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEJ,MAAM,WAAW,iCAAiC;IAChD,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B;AAkDD,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAuC1E;AAiED;;;GAGG;AACH,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAAE,GACtB,wBAAwB,CAgB1B;AAED,wBAAgB,0CAA0C,CACxD,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAAE,GACtB,iCAAiC,CAoGnC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getPoolSlotSources = getPoolSlotSources;
|
|
3
4
|
exports.resolveSubmissionCommitWithRecovery = resolveSubmissionCommitWithRecovery;
|
|
4
5
|
exports.resolveSubmissionCommitHistoryWithRecovery = resolveSubmissionCommitHistoryWithRecovery;
|
|
5
6
|
const global_db_js_1 = require("../runners/global-db.js");
|
|
@@ -7,6 +8,7 @@ const node_child_process_1 = require("node:child_process");
|
|
|
7
8
|
const node_crypto_1 = require("node:crypto");
|
|
8
9
|
const node_fs_1 = require("node:fs");
|
|
9
10
|
const node_path_1 = require("node:path");
|
|
11
|
+
const clone_js_1 = require("../parallel/clone.js");
|
|
10
12
|
const status_js_1 = require("./status.js");
|
|
11
13
|
function getProjectRepoId(projectPath) {
|
|
12
14
|
try {
|
|
@@ -35,7 +37,7 @@ function getParallelWorkstreamSources(projectPath) {
|
|
|
35
37
|
for (const row of rows) {
|
|
36
38
|
if (!row.clone_path)
|
|
37
39
|
continue;
|
|
38
|
-
const resolvedClonePath = (
|
|
40
|
+
const resolvedClonePath = getProjectRepoId(row.clone_path);
|
|
39
41
|
if (resolvedClonePath === normalizedProjectPath)
|
|
40
42
|
continue;
|
|
41
43
|
if (!(0, node_fs_1.existsSync)(row.clone_path))
|
|
@@ -52,6 +54,41 @@ function getParallelWorkstreamSources(projectPath) {
|
|
|
52
54
|
return sources;
|
|
53
55
|
});
|
|
54
56
|
}
|
|
57
|
+
function getPoolSlotSources(projectPath) {
|
|
58
|
+
const normalizedProjectPath = getProjectRepoId(projectPath);
|
|
59
|
+
const projectId = (0, clone_js_1.getProjectHash)(normalizedProjectPath);
|
|
60
|
+
return (0, global_db_js_1.withGlobalDatabase)((db) => {
|
|
61
|
+
const rows = db
|
|
62
|
+
.prepare(`
|
|
63
|
+
SELECT slot_path, task_branch
|
|
64
|
+
FROM workspace_pool_slots
|
|
65
|
+
WHERE project_id = ?
|
|
66
|
+
AND slot_path IS NOT NULL
|
|
67
|
+
AND task_branch IS NOT NULL
|
|
68
|
+
`)
|
|
69
|
+
.all(projectId);
|
|
70
|
+
const seen = new Set();
|
|
71
|
+
const sources = [];
|
|
72
|
+
for (const row of rows) {
|
|
73
|
+
if (!row.slot_path || !row.task_branch)
|
|
74
|
+
continue;
|
|
75
|
+
const resolvedSlotPath = getProjectRepoId(row.slot_path);
|
|
76
|
+
if (resolvedSlotPath === normalizedProjectPath)
|
|
77
|
+
continue;
|
|
78
|
+
if (!(0, node_fs_1.existsSync)(row.slot_path))
|
|
79
|
+
continue;
|
|
80
|
+
const key = `${resolvedSlotPath}::${row.task_branch}`;
|
|
81
|
+
if (seen.has(key))
|
|
82
|
+
continue;
|
|
83
|
+
seen.add(key);
|
|
84
|
+
sources.push({
|
|
85
|
+
clonePath: row.slot_path,
|
|
86
|
+
branchName: row.task_branch,
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
return sources;
|
|
90
|
+
});
|
|
91
|
+
}
|
|
55
92
|
function safeRecoveryRef(pathLike) {
|
|
56
93
|
return pathLike.replace(/[^\w.-]/g, '_');
|
|
57
94
|
}
|
|
@@ -161,6 +198,13 @@ function resolveSubmissionCommitHistoryWithRecovery(projectPath, candidateShas)
|
|
|
161
198
|
let sources = [];
|
|
162
199
|
try {
|
|
163
200
|
sources = getParallelWorkstreamSources(projectPath);
|
|
201
|
+
for (const poolSource of getPoolSlotSources(projectPath)) {
|
|
202
|
+
const duplicate = sources.some((source) => (0, node_path_1.resolve)(source.clonePath) === (0, node_path_1.resolve)(poolSource.clonePath) &&
|
|
203
|
+
source.branchName === poolSource.branchName);
|
|
204
|
+
if (!duplicate) {
|
|
205
|
+
sources.push(poolSource);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
164
208
|
}
|
|
165
209
|
catch {
|
|
166
210
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submission-resolution.js","sourceRoot":"","sources":["../../src/git/submission-resolution.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"submission-resolution.js","sourceRoot":"","sources":["../../src/git/submission-resolution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator-loop.d.ts","sourceRoot":"","sources":["../../src/runners/orchestrator-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"orchestrator-loop.d.ts","sourceRoot":"","sources":["../../src/runners/orchestrator-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA6GH,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACvD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAohB7E"}
|
|
@@ -21,6 +21,7 @@ const push_js_1 = require("../git/push.js");
|
|
|
21
21
|
const global_db_js_1 = require("./global-db.js");
|
|
22
22
|
const clone_js_1 = require("../parallel/clone.js");
|
|
23
23
|
const pool_js_1 = require("../workspace/pool.js");
|
|
24
|
+
const git_helpers_js_1 = require("../workspace/git-helpers.js");
|
|
24
25
|
const merge_lock_js_1 = require("../workspace/merge-lock.js");
|
|
25
26
|
const system_pressure_js_1 = require("./system-pressure.js");
|
|
26
27
|
function sleep(ms) {
|
|
@@ -386,7 +387,22 @@ async function runOrchestratorLoop(options) {
|
|
|
386
387
|
// For all other statuses (including after reviewer merge) do a full release.
|
|
387
388
|
const currentSlot = (0, pool_js_1.getSlot)(poolSlotCtx.globalDb, poolSlotCtx.slot.id);
|
|
388
389
|
if (currentSlot?.status === 'awaiting_review') {
|
|
389
|
-
|
|
390
|
+
let durabilityPushFailed = false;
|
|
391
|
+
if (currentSlot.slot_path && currentSlot.task_branch && currentSlot.remote_url) {
|
|
392
|
+
const pushResult = (0, git_helpers_js_1.pushWithRetries)(currentSlot.slot_path, 'origin', currentSlot.task_branch, 2, [2000, 8000], true);
|
|
393
|
+
if (!pushResult.success) {
|
|
394
|
+
durabilityPushFailed = true;
|
|
395
|
+
console.warn(`[pool] Failed to push ${currentSlot.task_branch} before partial release: ${pushResult.error ?? 'unknown error'}`);
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
if (durabilityPushFailed) {
|
|
399
|
+
(0, queries_js_1.incrementTaskFailureCount)(db, task.id);
|
|
400
|
+
(0, queries_js_1.updateTaskStatus)(db, task.id, 'pending', 'orchestrator', 'Returned to pending because task branch push failed before review handoff');
|
|
401
|
+
(0, pool_js_1.releaseSlot)(poolSlotCtx.globalDb, poolSlotCtx.slot.id);
|
|
402
|
+
}
|
|
403
|
+
else {
|
|
404
|
+
(0, pool_js_1.partialReleaseSlot)(poolSlotCtx.globalDb, poolSlotCtx.slot.id);
|
|
405
|
+
}
|
|
390
406
|
}
|
|
391
407
|
else {
|
|
392
408
|
(0, pool_js_1.releaseSlot)(poolSlotCtx.globalDb, poolSlotCtx.slot.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator-loop.js","sourceRoot":"","sources":["../../src/runners/orchestrator-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"orchestrator-loop.js","sourceRoot":"","sources":["../../src/runners/orchestrator-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wakeup-global-cleanup.d.ts","sourceRoot":"","sources":["../../src/runners/wakeup-global-cleanup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wakeup-global-cleanup.d.ts","sourceRoot":"","sources":["../../src/runners/wakeup-global-cleanup.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGpE,UAAU,wBAAwB;IAChC,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,YAAY,CAAC;CACnB;AA0JD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,GAAG,MAAM,CA0ClF;AA4JD,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAYzB"}
|
|
@@ -7,8 +7,10 @@ const node_path_1 = require("node:path");
|
|
|
7
7
|
const node_os_1 = require("node:os");
|
|
8
8
|
const lock_js_1 = require("./lock.js");
|
|
9
9
|
const heartbeat_js_1 = require("./heartbeat.js");
|
|
10
|
+
const lock_js_2 = require("./lock.js");
|
|
10
11
|
const connection_js_1 = require("../database/connection.js");
|
|
11
12
|
const wakeup_runner_js_1 = require("./wakeup-runner.js");
|
|
13
|
+
const remote_branch_cleanup_js_1 = require("../workspace/remote-branch-cleanup.js");
|
|
12
14
|
function cleanupStaleRunnerTaskState(runner) {
|
|
13
15
|
if (!runner.current_task_id || !runner.project_path) {
|
|
14
16
|
return;
|
|
@@ -38,14 +40,31 @@ function cleanupStaleRunners(globalDb, dryRun, log) {
|
|
|
38
40
|
const results = [];
|
|
39
41
|
try {
|
|
40
42
|
const staleRunners = (0, heartbeat_js_1.findStaleRunners)(globalDb);
|
|
41
|
-
|
|
43
|
+
const deadRunners = globalDb.prepare(`SELECT r.id, r.pid, r.heartbeat_at, r.current_task_id,
|
|
44
|
+
COALESCE(ps.project_path, r.project_path) AS project_path,
|
|
45
|
+
r.parallel_session_id
|
|
46
|
+
FROM runners r
|
|
47
|
+
LEFT JOIN parallel_sessions ps ON ps.id = r.parallel_session_id
|
|
48
|
+
WHERE r.status != 'idle'`).all();
|
|
49
|
+
const abandonedById = new Map();
|
|
50
|
+
for (const runner of staleRunners) {
|
|
51
|
+
abandonedById.set(runner.id, runner);
|
|
52
|
+
}
|
|
53
|
+
for (const runner of deadRunners) {
|
|
54
|
+
if (runner.pid !== null && (0, lock_js_2.isProcessAlive)(runner.pid)) {
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
abandonedById.set(runner.id, runner);
|
|
58
|
+
}
|
|
59
|
+
const abandonedRunners = [...abandonedById.values()];
|
|
60
|
+
if (abandonedRunners.length === 0) {
|
|
42
61
|
return results;
|
|
43
62
|
}
|
|
44
|
-
log(`Found ${
|
|
63
|
+
log(`Found ${abandonedRunners.length} abandoned runner(s), cleaning up...`);
|
|
45
64
|
if (!dryRun) {
|
|
46
|
-
for (const runner of
|
|
65
|
+
for (const runner of abandonedRunners) {
|
|
47
66
|
cleanupStaleRunnerTaskState(runner);
|
|
48
|
-
if (runner.pid) {
|
|
67
|
+
if (runner.pid && (0, lock_js_2.isProcessAlive)(runner.pid)) {
|
|
49
68
|
(0, wakeup_runner_js_1.killProcess)(runner.pid);
|
|
50
69
|
}
|
|
51
70
|
globalDb.prepare(`UPDATE workstreams
|
|
@@ -57,8 +76,8 @@ function cleanupStaleRunners(globalDb, dryRun, log) {
|
|
|
57
76
|
}
|
|
58
77
|
results.push({
|
|
59
78
|
action: 'cleaned',
|
|
60
|
-
reason: `Cleaned ${
|
|
61
|
-
staleRunners:
|
|
79
|
+
reason: `Cleaned ${abandonedRunners.length} abandoned runner(s)`,
|
|
80
|
+
staleRunners: abandonedRunners.length,
|
|
62
81
|
});
|
|
63
82
|
}
|
|
64
83
|
catch {
|
|
@@ -311,6 +330,7 @@ async function performWakeupGlobalMaintenance(options) {
|
|
|
311
330
|
await reconcileStaleWorkspaces(globalDb, log);
|
|
312
331
|
cleanupZombieLock(dryRun, log);
|
|
313
332
|
cleanStaleProviderHomes(dryRun, log);
|
|
333
|
+
(0, remote_branch_cleanup_js_1.cleanupStaleRemoteTaskBranches)(dryRun, log);
|
|
314
334
|
await pruneCompletedWorkspaces(globalDb, dryRun, log);
|
|
315
335
|
return results;
|
|
316
336
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wakeup-global-cleanup.js","sourceRoot":"","sources":["../../src/runners/wakeup-global-cleanup.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"wakeup-global-cleanup.js","sourceRoot":"","sources":["../../src/runners/wakeup-global-cleanup.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,17 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import type Database from 'better-sqlite3';
|
|
8
8
|
import type { PoolSlot } from './types.js';
|
|
9
|
+
/**
|
|
10
|
+
* Delete a task branch from a pool slot (local only by default).
|
|
11
|
+
* Uses `git checkout --detach` to avoid "cannot delete checked out branch"
|
|
12
|
+
* without assuming any specific base branch name.
|
|
13
|
+
* Tolerates missing branches. Used after rebase conflict to prevent
|
|
14
|
+
* stale branch reuse on retry.
|
|
15
|
+
*/
|
|
16
|
+
export declare function deleteTaskBranchFromSlot(slotPath: string, taskBranch: string, options?: {
|
|
17
|
+
deleteRemote?: boolean;
|
|
18
|
+
remoteUrl?: string | null;
|
|
19
|
+
}): boolean;
|
|
9
20
|
export type PrepareResult = {
|
|
10
21
|
ok: true;
|
|
11
22
|
startingSha: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-lifecycle.d.ts","sourceRoot":"","sources":["../../src/workspace/git-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAK3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAwB3C,MAAM,MAAM,aAAa,GACrB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACzE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEpD,MAAM,MAAM,eAAe,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GACpC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,gBAAgB,GAAG,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9E,MAAM,MAAM,WAAW,GACnB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAM/E;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,OAAO,GACjB,IAAI,GAAG,SAAS,CAMlB;AAMD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,aAAa,GAAE,MAAM,GAAG,IAAW,EACnC,YAAY,GAAE,MAAM,GAAG,IAAW,GACjC,aAAa,CA8Lf;AAMD;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,eAAe,CAsBjB;AAMD;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAOrD;AAMD;;;GAGG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,GACb,WAAW,CAkLb"}
|
|
1
|
+
{"version":3,"file":"git-lifecycle.d.ts","sourceRoot":"","sources":["../../src/workspace/git-lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAK3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAwB3C;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC9D,OAAO,CAoBT;AAMD,MAAM,MAAM,aAAa,GACrB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACzE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEpD,MAAM,MAAM,eAAe,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GACpC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,gBAAgB,GAAG,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9E,MAAM,MAAM,WAAW,GACnB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAM/E;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,OAAO,GACjB,IAAI,GAAG,SAAS,CAMlB;AAMD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,aAAa,GAAE,MAAM,GAAG,IAAW,EACnC,YAAY,GAAE,MAAM,GAAG,IAAW,GACjC,aAAa,CA8Lf;AAMD;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,eAAe,CAsBjB;AAMD;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAOrD;AAMD;;;GAGG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,GACb,WAAW,CAkLb"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* during coding but never runs branching, reset, push, rebase, or merge.
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.deleteTaskBranchFromSlot = deleteTaskBranchFromSlot;
|
|
9
10
|
exports.verifyBaseRef = verifyBaseRef;
|
|
10
11
|
exports.prepareForTask = prepareForTask;
|
|
11
12
|
exports.postCoderGate = postCoderGate;
|
|
@@ -20,6 +21,34 @@ const pool_js_1 = require("./pool.js");
|
|
|
20
21
|
const clone_js_1 = require("../parallel/clone.js");
|
|
21
22
|
const merge_lock_js_1 = require("./merge-lock.js");
|
|
22
23
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
24
|
+
// Standalone helpers
|
|
25
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
26
|
+
/**
|
|
27
|
+
* Delete a task branch from a pool slot (local only by default).
|
|
28
|
+
* Uses `git checkout --detach` to avoid "cannot delete checked out branch"
|
|
29
|
+
* without assuming any specific base branch name.
|
|
30
|
+
* Tolerates missing branches. Used after rebase conflict to prevent
|
|
31
|
+
* stale branch reuse on retry.
|
|
32
|
+
*/
|
|
33
|
+
function deleteTaskBranchFromSlot(slotPath, taskBranch, options) {
|
|
34
|
+
console.log(`[workspace] Deleting stale task branch ${taskBranch} from ${slotPath}`);
|
|
35
|
+
// Detach HEAD -- works regardless of what branches exist
|
|
36
|
+
(0, git_helpers_js_1.execGit)(slotPath, ['checkout', '--detach'], { tolerateFailure: true });
|
|
37
|
+
// Delete local branch
|
|
38
|
+
const deleted = (0, git_helpers_js_1.execGit)(slotPath, ['branch', '-D', taskBranch], { tolerateFailure: true });
|
|
39
|
+
if (deleted === null) {
|
|
40
|
+
console.warn(`[workspace] WARNING: failed to delete ${taskBranch} from ${slotPath} — stale branch may persist`);
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
// Delete remote only when explicitly requested (manual reset path)
|
|
44
|
+
if (options?.deleteRemote && options?.remoteUrl) {
|
|
45
|
+
(0, git_helpers_js_1.execGit)(slotPath, ['push', 'origin', '--delete', taskBranch], {
|
|
46
|
+
tolerateFailure: true,
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
return true;
|
|
50
|
+
}
|
|
51
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
23
52
|
// Helpers
|
|
24
53
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
25
54
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-lifecycle.js","sourceRoot":"","sources":["../../src/workspace/git-lifecycle.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"git-lifecycle.js","sourceRoot":"","sources":["../../src/workspace/git-lifecycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-pipeline.d.ts","sourceRoot":"","sources":["../../src/workspace/merge-pipeline.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"merge-pipeline.d.ts","sourceRoot":"","sources":["../../src/workspace/merge-pipeline.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAatD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,kBAAkB,GAAG,eAAe,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAC5B,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,GAAG;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,GACvC,kBAAkB,CAuFpB"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
exports.handleMergeFailure = handleMergeFailure;
|
|
9
|
+
const git_lifecycle_js_1 = require("./git-lifecycle.js");
|
|
9
10
|
const queries_js_1 = require("../database/queries.js");
|
|
10
11
|
const pool_js_1 = require("./pool.js");
|
|
11
12
|
const MAX_CONFLICT_COUNT = 3;
|
|
@@ -15,10 +16,9 @@ const MAX_MERGE_FAILURE_COUNT = 3;
|
|
|
15
16
|
* release slot, return task to pending or block.
|
|
16
17
|
*/
|
|
17
18
|
function handleMergeFailure(projectDb, ctx, taskId, mergeResult) {
|
|
18
|
-
//
|
|
19
|
-
(0, pool_js_1.releaseSlot)(ctx.globalDb, ctx.slot.id);
|
|
20
|
-
// Infrastructure failure (e.g. missing remote base branch) — block immediately
|
|
19
|
+
// Infrastructure failure (e.g. missing remote base branch) — block immediately, PRESERVE branch for diagnosis
|
|
21
20
|
if (mergeResult.infrastructure) {
|
|
21
|
+
(0, pool_js_1.releaseSlot)(ctx.globalDb, ctx.slot.id);
|
|
22
22
|
(0, queries_js_1.setTaskBlocked)(projectDb, taskId, 'blocked_error', `Infrastructure failure: ${mergeResult.reason}`);
|
|
23
23
|
return {
|
|
24
24
|
taskBlocked: true,
|
|
@@ -27,6 +27,15 @@ function handleMergeFailure(projectDb, ctx, taskId, mergeResult) {
|
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
if (mergeResult.conflict) {
|
|
30
|
+
// ---- ORDERING CONSTRAINT: delete branch BEFORE releaseSlot ----
|
|
31
|
+
// releaseSlot clears task_branch in DB; we read from the in-memory
|
|
32
|
+
// ctx.slot which still has the value. Once the slot is idle, another
|
|
33
|
+
// runner could claim it, so the branch must be gone first.
|
|
34
|
+
const slot = ctx.slot;
|
|
35
|
+
if (slot.task_branch && slot.slot_path) {
|
|
36
|
+
(0, git_lifecycle_js_1.deleteTaskBranchFromSlot)(slot.slot_path, slot.task_branch);
|
|
37
|
+
}
|
|
38
|
+
(0, pool_js_1.releaseSlot)(ctx.globalDb, ctx.slot.id);
|
|
30
39
|
// Rebase conflict path
|
|
31
40
|
const conflictCount = (0, queries_js_1.incrementTaskConflictCount)(projectDb, taskId);
|
|
32
41
|
if (conflictCount >= MAX_CONFLICT_COUNT) {
|
|
@@ -44,7 +53,8 @@ function handleMergeFailure(projectDb, ctx, taskId, mergeResult) {
|
|
|
44
53
|
reason: `Rebase conflict (attempt ${conflictCount}/${MAX_CONFLICT_COUNT})`,
|
|
45
54
|
};
|
|
46
55
|
}
|
|
47
|
-
// General merge failure
|
|
56
|
+
// General merge failure — PRESERVE branch, only release slot
|
|
57
|
+
(0, pool_js_1.releaseSlot)(ctx.globalDb, ctx.slot.id);
|
|
48
58
|
const mergeFailureCount = (0, queries_js_1.incrementMergeFailureCount)(projectDb, taskId);
|
|
49
59
|
if (mergeFailureCount >= MAX_MERGE_FAILURE_COUNT) {
|
|
50
60
|
(0, queries_js_1.setTaskBlocked)(projectDb, taskId, 'blocked_error', `Merge pipeline failed ${mergeFailureCount} times: ${mergeResult.reason}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-pipeline.js","sourceRoot":"","sources":["../../src/workspace/merge-pipeline.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;
|
|
1
|
+
{"version":3,"file":"merge-pipeline.js","sourceRoot":"","sources":["../../src/workspace/merge-pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { WakeupLogger } from '../runners/wakeup-types.js';
|
|
2
|
+
export interface StaleRemoteBranch {
|
|
3
|
+
branchName: string;
|
|
4
|
+
taskId: string;
|
|
5
|
+
reason: 'merged_completed' | 'terminal_not_completed';
|
|
6
|
+
}
|
|
7
|
+
export declare function identifyStaleBranches(projectPath: string): StaleRemoteBranch[];
|
|
8
|
+
export declare function cleanupStaleRemoteTaskBranches(dryRun: boolean, log: WakeupLogger): number;
|
|
9
|
+
//# sourceMappingURL=remote-branch-cleanup.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-branch-cleanup.d.ts","sourceRoot":"","sources":["../../src/workspace/remote-branch-cleanup.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAgB/D,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,kBAAkB,GAAG,wBAAwB,CAAC;CACvD;AAuCD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAuD9E;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,GAAG,MAAM,CA+BzF"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.identifyStaleBranches = identifyStaleBranches;
|
|
4
|
+
exports.cleanupStaleRemoteTaskBranches = cleanupStaleRemoteTaskBranches;
|
|
5
|
+
const node_fs_1 = require("node:fs");
|
|
6
|
+
const loader_js_1 = require("../config/loader.js");
|
|
7
|
+
const queries_js_1 = require("../database/queries.js");
|
|
8
|
+
const connection_js_1 = require("../database/connection.js");
|
|
9
|
+
const projects_js_1 = require("../runners/projects.js");
|
|
10
|
+
const pool_js_1 = require("./pool.js");
|
|
11
|
+
const git_helpers_js_1 = require("./git-helpers.js");
|
|
12
|
+
const TASK_BRANCH_PREFIX = 'steroids/task-';
|
|
13
|
+
const REMOTE_NAME = 'origin';
|
|
14
|
+
const TERMINAL_TASK_STATUSES = new Set([
|
|
15
|
+
'completed',
|
|
16
|
+
'disputed',
|
|
17
|
+
'failed',
|
|
18
|
+
'skipped',
|
|
19
|
+
'partial',
|
|
20
|
+
'blocked_error',
|
|
21
|
+
'blocked_conflict',
|
|
22
|
+
]);
|
|
23
|
+
function listRemoteTaskBranches(projectPath) {
|
|
24
|
+
const output = (0, git_helpers_js_1.execGit)(projectPath, ['ls-remote', '--heads', REMOTE_NAME, `refs/heads/${TASK_BRANCH_PREFIX}*`], { tolerateFailure: true, timeoutMs: 30_000 });
|
|
25
|
+
if (!output) {
|
|
26
|
+
return [];
|
|
27
|
+
}
|
|
28
|
+
return output
|
|
29
|
+
.split('\n')
|
|
30
|
+
.map((line) => line.trim().split(/\s+/))
|
|
31
|
+
.map(([sha, ref]) => ({ sha: sha ?? '', ref: ref ?? '' }))
|
|
32
|
+
.filter(({ sha, ref }) => sha.length > 0 && ref.startsWith('refs/heads/'))
|
|
33
|
+
.map(({ sha, ref }) => ({
|
|
34
|
+
sha,
|
|
35
|
+
branchName: ref.slice('refs/heads/'.length),
|
|
36
|
+
}))
|
|
37
|
+
.filter(({ branchName }) => branchName.startsWith(TASK_BRANCH_PREFIX));
|
|
38
|
+
}
|
|
39
|
+
function getTaskIdFromBranch(branchName) {
|
|
40
|
+
if (!branchName.startsWith(TASK_BRANCH_PREFIX)) {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
const taskId = branchName.slice(TASK_BRANCH_PREFIX.length).trim();
|
|
44
|
+
return taskId.length > 0 ? taskId : null;
|
|
45
|
+
}
|
|
46
|
+
function identifyStaleBranches(projectPath) {
|
|
47
|
+
if (!(0, node_fs_1.existsSync)(projectPath) || !(0, pool_js_1.resolveRemoteUrl)(projectPath)) {
|
|
48
|
+
return [];
|
|
49
|
+
}
|
|
50
|
+
const branches = listRemoteTaskBranches(projectPath);
|
|
51
|
+
if (branches.length === 0) {
|
|
52
|
+
return [];
|
|
53
|
+
}
|
|
54
|
+
const config = (0, loader_js_1.loadConfig)(projectPath);
|
|
55
|
+
const baseBranch = (0, git_helpers_js_1.resolveBaseBranch)(projectPath, REMOTE_NAME, config.git?.branch ?? null);
|
|
56
|
+
(0, git_helpers_js_1.execGit)(projectPath, ['fetch', REMOTE_NAME, baseBranch], {
|
|
57
|
+
tolerateFailure: true,
|
|
58
|
+
timeoutMs: 120_000,
|
|
59
|
+
});
|
|
60
|
+
const { db, close } = (0, connection_js_1.openDatabase)(projectPath);
|
|
61
|
+
try {
|
|
62
|
+
const staleBranches = [];
|
|
63
|
+
for (const branch of branches) {
|
|
64
|
+
const taskId = getTaskIdFromBranch(branch.branchName);
|
|
65
|
+
if (!taskId)
|
|
66
|
+
continue;
|
|
67
|
+
const task = (0, queries_js_1.getTask)(db, taskId);
|
|
68
|
+
if (!task || !TERMINAL_TASK_STATUSES.has(task.status)) {
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
const remoteBaseRef = `${REMOTE_NAME}/${baseBranch}`;
|
|
72
|
+
if (!(0, git_helpers_js_1.isAncestor)(projectPath, branch.sha, remoteBaseRef)) {
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
75
|
+
if (task.status !== 'completed') {
|
|
76
|
+
staleBranches.push({
|
|
77
|
+
branchName: branch.branchName,
|
|
78
|
+
taskId,
|
|
79
|
+
reason: 'terminal_not_completed',
|
|
80
|
+
});
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
staleBranches.push({
|
|
84
|
+
branchName: branch.branchName,
|
|
85
|
+
taskId,
|
|
86
|
+
reason: 'merged_completed',
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
return staleBranches;
|
|
90
|
+
}
|
|
91
|
+
finally {
|
|
92
|
+
close();
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
function cleanupStaleRemoteTaskBranches(dryRun, log) {
|
|
96
|
+
let deleted = 0;
|
|
97
|
+
for (const project of (0, projects_js_1.getRegisteredProjects)(true)) {
|
|
98
|
+
let staleBranches = [];
|
|
99
|
+
try {
|
|
100
|
+
staleBranches = identifyStaleBranches(project.path);
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
105
|
+
for (const branch of staleBranches) {
|
|
106
|
+
if (!dryRun) {
|
|
107
|
+
const deletedRemote = (0, git_helpers_js_1.execGit)(project.path, ['push', REMOTE_NAME, '--delete', branch.branchName], { tolerateFailure: true, timeoutMs: 120_000 });
|
|
108
|
+
if (deletedRemote === null) {
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
deleted++;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
if (deleted > 0) {
|
|
116
|
+
log(`Deleted ${deleted} stale remote task branch(es)`);
|
|
117
|
+
}
|
|
118
|
+
return deleted;
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=remote-branch-cleanup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-branch-cleanup.js","sourceRoot":"","sources":["../../src/workspace/remote-branch-cleanup.ts"],"names":[],"mappings":"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"}
|