Skip to content

fix: prevent keepalive from stopping without fixing CI failures #1651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stranske merged 5 commits into from
Feb 24, 2026
Merged

fix: prevent keepalive from stopping without fixing CI failures #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6009556
fix: correct tasksTotal falsy check and stale iteration in keepalive …
claude Feb 24, 2026
f7b8adb
fix: prevent keepalive from stopping without fixing CI failures
claude Feb 24, 2026
7e5a6df
chore: sync template scripts
github-actions[bot] Feb 24, 2026
2cf87a8
fix: address review comments on PR #1651
claude Feb 24, 2026
87ad246
fix: update test to expect gate-cancelled-transient reason
claude Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/__tests__/keepalive-loop.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ test('evaluateKeepaliveLoop treats cancelled gate as transient wait', async () =
core: buildCore(),
});
assert.equal(result.action, 'wait');
assert.equal(result.reason, 'gate-cancelled');
assert.equal(result.reason, 'gate-cancelled-transient');
});

test('evaluateKeepaliveLoop bypasses rate limit cancelled gate', async () => {
Expand Down
71 changes: 54 additions & 17 deletions .github/scripts/keepalive_loop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ function formatWorkLogEntry({
const gate = gateConclusion || '—';
const result = runResult || '—';
const retryFlag = forceRetry ? ' **retry**' : '';
return `| ${iterLabel} | ${ts} | ${agent} | ${actionLabel}${retryFlag} | ${result} | ${files} | ${tasks} | ${tasksComplete}/${tasksTotal || '?'} | ${commitLink} | ${gate} |`;
return `| ${iterLabel} | ${ts} | ${agent} | ${actionLabel}${retryFlag} | ${result} | ${files} | ${tasks} | ${tasksComplete}/${tasksTotal ?? '?'} | ${commitLink} | ${gate} |`;
}

// Maximum number of rows in the work-log table before the oldest entries are
Expand Down Expand Up @@ -2184,9 +2184,12 @@ async function evaluateKeepaliveLoop({ github: rawGithub, context, core, payload
const maxIterations = toNumber(config.max_iterations ?? state.max_iterations, 5);
const failureThreshold = toNumber(config.failure_threshold ?? state.failure_threshold, 3);
const progressReviewThreshold = toNumber(config.progress_review_threshold ?? state.progress_review_threshold, 4);
// Default 3 rounds allows 2 fix attempts before stopping (round 1 = fix,
// round 2 = fix retry, round 3 = stop). Previous default of 2 only
// allowed 1 fix attempt, which was insufficient for multi-issue lint failures.
const completeGateFailureMax = Math.max(
1,
toNumber(config.complete_gate_failure_rounds ?? state.complete_gate_failure_rounds_max, 2),
toNumber(config.complete_gate_failure_rounds ?? state.complete_gate_failure_rounds_max, 3),
);

// Evidence-based productivity tracking
Expand Down Expand Up @@ -2231,9 +2234,14 @@ async function evaluateKeepaliveLoop({ github: rawGithub, context, core, payload
const shouldStopForZeroActivity = persistedConsecutiveZeroActivityRounds >= zeroActivityThreshold;

const prevCompleteGateFailureRounds = toNumber(state.complete_gate_failure_rounds, 0);
const completeGateFailureRounds = allComplete && gateNormalized !== 'success'
// Only increment the complete-gate-failure counter when gate actually failed
// (not when cancelled/pending, which are transient states that shouldn't
// consume the fix budget).
const completeGateFailureRounds = allComplete && gateNormalized === 'failure'
? prevCompleteGateFailureRounds + 1
: 0;
: allComplete && gateNormalized !== 'success'
? prevCompleteGateFailureRounds // preserve count but don't increment for transient states
: 0;

// Track consecutive fix attempts. After fixAttemptMax rounds of trying
// to fix the same gate failure, bypass the gate and continue with tasks.
Expand Down Expand Up @@ -2316,10 +2324,8 @@ async function evaluateKeepaliveLoop({ github: rawGithub, context, core, payload
action = 'stop';
reason = 'no-checklists';
} else if (gateNormalized !== 'success') {
if (allComplete && completeGateFailureRounds >= completeGateFailureMax) {
action = 'stop';
reason = 'complete-gate-failure-max';
} else if (gateNormalized === 'cancelled') {
// Handle cancelled gate first (transient — should not consume fix budget)
if (gateNormalized === 'cancelled') {
if (rateLimitDefer) {
action = 'defer';
reason = 'rate-limit-exhausted';
Expand All @@ -2346,11 +2352,30 @@ async function evaluateKeepaliveLoop({ github: rawGithub, context, core, payload
if (core) core.info(`Force retry enabled: bypassing cancelled gate (rate_limit=${gateRateLimit})`);
} else {
action = 'wait';
reason = 'gate-cancelled';
reason = 'gate-cancelled-transient';
}
}
} else if (allComplete) {
// All tasks complete but gate failing — try to fix CI before stopping.
// This ensures at least one fix attempt is made before giving up, and
// that transient cancelled rounds don't consume the fix budget.
const gateFailure = await classifyGateFailure({ github, context, pr, core });
if (gateFailure.shouldFixMode && consecutiveFixRounds < fixAttemptMax) {
// Fix is possible and we haven't exhausted fix attempts — try to fix
action = 'fix';
reason = `fix-${gateFailure.failureType}`;
if (core) core.info(`All tasks complete, gate failing (${gateFailure.failureType}) — dispatching fix attempt ${consecutiveFixRounds + 1}/${fixAttemptMax}`);
} else if (completeGateFailureRounds >= completeGateFailureMax) {
// Fix attempts exhausted or non-fixable — stop
action = 'stop';
reason = 'complete-gate-failure-max';
} else {
// Non-fixable failure, but haven't hit max rounds yet — wait
action = 'wait';
reason = 'gate-not-success';
}
} else {
// Gate failed - check if failure is rate-limit related vs code quality
// Gate failed with tasks remaining
const gateFailure = await classifyGateFailure({ github, context, pr, core });
if (gateFailure.shouldFixMode && gateNormalized === 'failure' && consecutiveFixRounds >= fixAttemptMax && tasksRemaining) {
// Already tried to fix this gate failure type — continue with tasks.
Expand Down Expand Up @@ -2726,7 +2751,7 @@ async function updateKeepaliveLoopSummary({ github: rawGithub, context, core, in
const prevRounds = toNumber(previousState?.rounds_without_task_completion, 0);
const recalculated = liveTasksCompletedSinceLastRound > 0
? 0
: prevRounds + (iteration > 0 ? 1 : 0);
: prevRounds + (toNumber(previousState?.iteration ?? iteration, 0) > 0 ? 1 : 0);
if (recalculated !== roundsWithoutTaskCompletion) {
core?.info?.(
`[summary] Recalculated rounds_without_task_completion from live counts: ` +
Expand Down Expand Up @@ -2872,19 +2897,31 @@ async function updateKeepaliveLoopSummary({ github: rawGithub, context, core, in
inputs.completeGateFailureRoundsMax ??
inputs.complete_gate_failure_rounds_max ??
previousState?.complete_gate_failure_rounds_max,
2,
3,
),
);
// Increment the complete-gate-failure counter whenever the gate has
// *actually* failed (conclusion === 'failure'), regardless of the chosen
// action. Transient non-failure states (cancelled, pending) preserve the
// counter without incrementing, so infrastructure noise doesn't reset
// progress toward the stop threshold but also doesn't advance it.
const isAgentExecution = AGENT_EXECUTION_ACTIONS.has(action);
const gateActuallyFailed = gateConclusion === 'failure';
const completeGateFailureRounds =
allTasksComplete && gateConclusion && gateConclusion !== 'success'
allTasksComplete && gateActuallyFailed
? previousCompleteGateFailureRounds + 1
: 0;
// Track consecutive fix rounds: increment when action is 'fix', reset otherwise.
// evaluateKeepaliveLoop reads this to bypass gate failures after N fix attempts.
: allTasksComplete && gateConclusion && gateConclusion !== 'success'
? previousCompleteGateFailureRounds // preserve count for non-success, don't increment
: 0;
// Track consecutive fix rounds: increment when action is 'fix', reset only
// on non-wait actions. Wait/skip/defer are transient and should not reset
// the fix counter — the previous fix attempt is still the most recent work.
const previousFixRounds = toNumber(previousState?.consecutive_fix_rounds, 0);
const consecutiveFixRounds = action === 'fix'
? previousFixRounds + 1
: 0;
: isAgentExecution
? 0 // Reset on non-fix agent execution (run/conflict)
: previousFixRounds; // Preserve on wait/skip/stop/defer

// When force_retry was active (user added agent:retry), reset the zero-activity
// counter so the agent gets a clean slate — same intent as the evaluate-step reset.
Expand Down
71 changes: 54 additions & 17 deletions templates/consumer-repo/.github/scripts/keepalive_loop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ function formatWorkLogEntry({
const gate = gateConclusion || '—';
const result = runResult || '—';
const retryFlag = forceRetry ? ' **retry**' : '';
return `| ${iterLabel} | ${ts} | ${agent} | ${actionLabel}${retryFlag} | ${result} | ${files} | ${tasks} | ${tasksComplete}/${tasksTotal || '?'} | ${commitLink} | ${gate} |`;
return `| ${iterLabel} | ${ts} | ${agent} | ${actionLabel}${retryFlag} | ${result} | ${files} | ${tasks} | ${tasksComplete}/${tasksTotal ?? '?'} | ${commitLink} | ${gate} |`;
}

// Maximum number of rows in the work-log table before the oldest entries are
Expand Down Expand Up @@ -2184,9 +2184,12 @@ async function evaluateKeepaliveLoop({ github: rawGithub, context, core, payload
const maxIterations = toNumber(config.max_iterations ?? state.max_iterations, 5);
const failureThreshold = toNumber(config.failure_threshold ?? state.failure_threshold, 3);
const progressReviewThreshold = toNumber(config.progress_review_threshold ?? state.progress_review_threshold, 4);
// Default 3 rounds allows 2 fix attempts before stopping (round 1 = fix,
// round 2 = fix retry, round 3 = stop). Previous default of 2 only
// allowed 1 fix attempt, which was insufficient for multi-issue lint failures.
const completeGateFailureMax = Math.max(
1,
toNumber(config.complete_gate_failure_rounds ?? state.complete_gate_failure_rounds_max, 2),
toNumber(config.complete_gate_failure_rounds ?? state.complete_gate_failure_rounds_max, 3),
);

// Evidence-based productivity tracking
Expand Down Expand Up @@ -2231,9 +2234,14 @@ async function evaluateKeepaliveLoop({ github: rawGithub, context, core, payload
const shouldStopForZeroActivity = persistedConsecutiveZeroActivityRounds >= zeroActivityThreshold;

const prevCompleteGateFailureRounds = toNumber(state.complete_gate_failure_rounds, 0);
const completeGateFailureRounds = allComplete && gateNormalized !== 'success'
// Only increment the complete-gate-failure counter when gate actually failed
// (not when cancelled/pending, which are transient states that shouldn't
// consume the fix budget).
const completeGateFailureRounds = allComplete && gateNormalized === 'failure'
? prevCompleteGateFailureRounds + 1
: 0;
: allComplete && gateNormalized !== 'success'
? prevCompleteGateFailureRounds // preserve count but don't increment for transient states
: 0;

// Track consecutive fix attempts. After fixAttemptMax rounds of trying
// to fix the same gate failure, bypass the gate and continue with tasks.
Expand Down Expand Up @@ -2316,10 +2324,8 @@ async function evaluateKeepaliveLoop({ github: rawGithub, context, core, payload
action = 'stop';
reason = 'no-checklists';
} else if (gateNormalized !== 'success') {
if (allComplete && completeGateFailureRounds >= completeGateFailureMax) {
action = 'stop';
reason = 'complete-gate-failure-max';
} else if (gateNormalized === 'cancelled') {
// Handle cancelled gate first (transient — should not consume fix budget)
if (gateNormalized === 'cancelled') {
if (rateLimitDefer) {
action = 'defer';
reason = 'rate-limit-exhausted';
Expand All @@ -2346,11 +2352,30 @@ async function evaluateKeepaliveLoop({ github: rawGithub, context, core, payload
if (core) core.info(`Force retry enabled: bypassing cancelled gate (rate_limit=${gateRateLimit})`);
} else {
action = 'wait';
reason = 'gate-cancelled';
reason = 'gate-cancelled-transient';
}
}
} else if (allComplete) {
// All tasks complete but gate failing — try to fix CI before stopping.
// This ensures at least one fix attempt is made before giving up, and
// that transient cancelled rounds don't consume the fix budget.
const gateFailure = await classifyGateFailure({ github, context, pr, core });
if (gateFailure.shouldFixMode && consecutiveFixRounds < fixAttemptMax) {
// Fix is possible and we haven't exhausted fix attempts — try to fix
action = 'fix';
reason = `fix-${gateFailure.failureType}`;
if (core) core.info(`All tasks complete, gate failing (${gateFailure.failureType}) — dispatching fix attempt ${consecutiveFixRounds + 1}/${fixAttemptMax}`);
} else if (completeGateFailureRounds >= completeGateFailureMax) {
// Fix attempts exhausted or non-fixable — stop
action = 'stop';
reason = 'complete-gate-failure-max';
} else {
// Non-fixable failure, but haven't hit max rounds yet — wait
action = 'wait';
reason = 'gate-not-success';
}
} else {
// Gate failed - check if failure is rate-limit related vs code quality
// Gate failed with tasks remaining
const gateFailure = await classifyGateFailure({ github, context, pr, core });
if (gateFailure.shouldFixMode && gateNormalized === 'failure' && consecutiveFixRounds >= fixAttemptMax && tasksRemaining) {
// Already tried to fix this gate failure type — continue with tasks.
Expand Down Expand Up @@ -2726,7 +2751,7 @@ async function updateKeepaliveLoopSummary({ github: rawGithub, context, core, in
const prevRounds = toNumber(previousState?.rounds_without_task_completion, 0);
const recalculated = liveTasksCompletedSinceLastRound > 0
? 0
: prevRounds + (iteration > 0 ? 1 : 0);
: prevRounds + (toNumber(previousState?.iteration ?? iteration, 0) > 0 ? 1 : 0);
if (recalculated !== roundsWithoutTaskCompletion) {
core?.info?.(
`[summary] Recalculated rounds_without_task_completion from live counts: ` +
Expand Down Expand Up @@ -2872,19 +2897,31 @@ async function updateKeepaliveLoopSummary({ github: rawGithub, context, core, in
inputs.completeGateFailureRoundsMax ??
inputs.complete_gate_failure_rounds_max ??
previousState?.complete_gate_failure_rounds_max,
2,
3,
),
);
// Increment the complete-gate-failure counter whenever the gate has
// *actually* failed (conclusion === 'failure'), regardless of the chosen
// action. Transient non-failure states (cancelled, pending) preserve the
// counter without incrementing, so infrastructure noise doesn't reset
// progress toward the stop threshold but also doesn't advance it.
const isAgentExecution = AGENT_EXECUTION_ACTIONS.has(action);
const gateActuallyFailed = gateConclusion === 'failure';
const completeGateFailureRounds =
allTasksComplete && gateConclusion && gateConclusion !== 'success'
allTasksComplete && gateActuallyFailed
? previousCompleteGateFailureRounds + 1
: 0;
// Track consecutive fix rounds: increment when action is 'fix', reset otherwise.
// evaluateKeepaliveLoop reads this to bypass gate failures after N fix attempts.
: allTasksComplete && gateConclusion && gateConclusion !== 'success'
? previousCompleteGateFailureRounds // preserve count for non-success, don't increment
: 0;
// Track consecutive fix rounds: increment when action is 'fix', reset only
// on non-wait actions. Wait/skip/defer are transient and should not reset
// the fix counter — the previous fix attempt is still the most recent work.
const previousFixRounds = toNumber(previousState?.consecutive_fix_rounds, 0);
const consecutiveFixRounds = action === 'fix'
? previousFixRounds + 1
: 0;
: isAgentExecution
? 0 // Reset on non-fix agent execution (run/conflict)
: previousFixRounds; // Preserve on wait/skip/stop/defer

// When force_retry was active (user added agent:retry), reset the zero-activity
// counter so the agent gets a clean slate — same intent as the evaluate-step reset.
Expand Down
Loading
Loading