agentxchain 2.155.45 → 2.155.46
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/package.json +1 -1
- package/src/lib/run-loop.js +58 -1
package/package.json
CHANGED
package/src/lib/run-loop.js
CHANGED
|
@@ -36,7 +36,7 @@ import {
|
|
|
36
36
|
} from './runner-interface.js';
|
|
37
37
|
|
|
38
38
|
import { runAdmissionControl } from './admission-control.js';
|
|
39
|
-
import { appendFileSync, mkdirSync, writeFileSync } from 'fs';
|
|
39
|
+
import { appendFileSync, existsSync, mkdirSync, writeFileSync } from 'fs';
|
|
40
40
|
import { join, dirname } from 'path';
|
|
41
41
|
import { evaluateApprovalSlaReminders } from './notification-runner.js';
|
|
42
42
|
import { validatePreemptionMarker } from './intake.js';
|
|
@@ -162,6 +162,26 @@ export async function runLoop(root, config, callbacks, options = {}) {
|
|
|
162
162
|
}
|
|
163
163
|
}
|
|
164
164
|
|
|
165
|
+
const failedAcceptanceResult = await reattemptFailedAcceptanceTurn(root, config, state, callbacks, emit, errors);
|
|
166
|
+
if (failedAcceptanceResult) {
|
|
167
|
+
if (failedAcceptanceResult.terminal) {
|
|
168
|
+
return makeResult(
|
|
169
|
+
failedAcceptanceResult.ok,
|
|
170
|
+
failedAcceptanceResult.stop_reason,
|
|
171
|
+
loadState(root, config),
|
|
172
|
+
turnsExecuted,
|
|
173
|
+
turnHistory,
|
|
174
|
+
gatesApproved,
|
|
175
|
+
errors,
|
|
176
|
+
);
|
|
177
|
+
}
|
|
178
|
+
if (failedAcceptanceResult.accepted) {
|
|
179
|
+
turnsExecuted++;
|
|
180
|
+
}
|
|
181
|
+
turnHistory.push(...failedAcceptanceResult.history);
|
|
182
|
+
continue;
|
|
183
|
+
}
|
|
184
|
+
|
|
165
185
|
// ── Determine concurrency mode ────────────────────────────────────────
|
|
166
186
|
const maxConcurrent = getMaxConcurrentTurns(config, state.phase);
|
|
167
187
|
|
|
@@ -490,6 +510,43 @@ function isDispatchableActiveTurn(turn) {
|
|
|
490
510
|
return ['assigned', 'dispatched', 'starting', 'running', 'retrying'].includes(turn?.status);
|
|
491
511
|
}
|
|
492
512
|
|
|
513
|
+
async function reattemptFailedAcceptanceTurn(root, config, state, callbacks, emit, errors) {
|
|
514
|
+
const turn = Object.values(getActiveTurns(state)).find(t => t?.status === 'failed_acceptance');
|
|
515
|
+
if (!turn) return null;
|
|
516
|
+
|
|
517
|
+
const roleId = turn.assigned_role;
|
|
518
|
+
const stagingPath = getTurnStagingResultPath(turn.turn_id);
|
|
519
|
+
if (!existsSync(join(root, stagingPath))) {
|
|
520
|
+
errors.push(`failed_acceptance(${roleId}): missing staged result at ${stagingPath}`);
|
|
521
|
+
return { terminal: true, ok: false, stop_reason: 'blocked', history: [] };
|
|
522
|
+
}
|
|
523
|
+
|
|
524
|
+
const acceptResult = acceptTurn(root, config, { turnId: turn.turn_id });
|
|
525
|
+
if (!acceptResult.ok) {
|
|
526
|
+
errors.push(`acceptTurn(${roleId}): ${acceptResult.error}`);
|
|
527
|
+
return {
|
|
528
|
+
terminal: true,
|
|
529
|
+
ok: false,
|
|
530
|
+
stop_reason: acceptResult.error_code === 'conflict' ? 'conflict_loop' : 'blocked',
|
|
531
|
+
history: [{ role: roleId, turn_id: turn.turn_id, accepted: false, accept_error: acceptResult.error }],
|
|
532
|
+
};
|
|
533
|
+
}
|
|
534
|
+
|
|
535
|
+
const history = [{ role: roleId, turn_id: turn.turn_id, accepted: true }];
|
|
536
|
+
if (callbacks.afterAccept) {
|
|
537
|
+
const afterAcceptResult = await callbacks.afterAccept({ turn, acceptResult });
|
|
538
|
+
if (afterAcceptResult?.ok === false) {
|
|
539
|
+
errors.push(`afterAccept(${roleId}): ${afterAcceptResult.error}`);
|
|
540
|
+
if (afterAcceptResult.state) {
|
|
541
|
+
emit({ type: 'blocked', state: afterAcceptResult.state, reason: 'after_accept_failed' });
|
|
542
|
+
}
|
|
543
|
+
return { terminal: true, ok: false, stop_reason: 'blocked', history };
|
|
544
|
+
}
|
|
545
|
+
}
|
|
546
|
+
emit({ type: 'turn_accepted', turn, role: roleId, state: acceptResult.state });
|
|
547
|
+
return { terminal: false, accepted: true, history };
|
|
548
|
+
}
|
|
549
|
+
|
|
493
550
|
/**
|
|
494
551
|
* Dispatch a single turn and process its result.
|
|
495
552
|
*/
|