steroids-cli 0.10.57 → 0.10.59
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/README.md +11 -2
- package/dist/commands/coder-noop-submission.d.ts +8 -0
- package/dist/commands/coder-noop-submission.d.ts.map +1 -0
- package/dist/commands/coder-noop-submission.js +49 -0
- package/dist/commands/coder-noop-submission.js.map +1 -0
- package/dist/commands/commit-recovery.d.ts +2 -0
- package/dist/commands/commit-recovery.d.ts.map +1 -0
- package/dist/commands/commit-recovery.js +5 -0
- package/dist/commands/commit-recovery.js.map +1 -0
- package/dist/commands/llm.js +1 -1
- package/dist/commands/loop-phases-coder-decision.d.ts.map +1 -1
- package/dist/commands/loop-phases-coder-decision.js +25 -3
- package/dist/commands/loop-phases-coder-decision.js.map +1 -1
- package/dist/commands/loop-phases-coder.d.ts.map +1 -1
- package/dist/commands/loop-phases-coder.js +3 -9
- package/dist/commands/loop-phases-coder.js.map +1 -1
- package/dist/commands/loop-phases-helpers.d.ts +6 -0
- package/dist/commands/loop-phases-helpers.d.ts.map +1 -1
- package/dist/commands/loop-phases-helpers.js +31 -0
- package/dist/commands/loop-phases-helpers.js.map +1 -1
- package/dist/commands/loop-phases-reviewer-resolution.d.ts +1 -0
- package/dist/commands/loop-phases-reviewer-resolution.d.ts.map +1 -1
- package/dist/commands/loop-phases-reviewer-resolution.js +109 -64
- package/dist/commands/loop-phases-reviewer-resolution.js.map +1 -1
- package/dist/commands/loop-phases-reviewer.d.ts.map +1 -1
- package/dist/commands/loop-phases-reviewer.js +8 -17
- package/dist/commands/loop-phases-reviewer.js.map +1 -1
- package/dist/commands/reviewer-preflight.d.ts +10 -0
- package/dist/commands/reviewer-preflight.d.ts.map +1 -0
- package/dist/commands/reviewer-preflight.js +72 -0
- package/dist/commands/reviewer-preflight.js.map +1 -0
- package/dist/commands/runners-parallel.js +1 -1
- package/dist/commands/submission-transition.d.ts +8 -0
- package/dist/commands/submission-transition.d.ts.map +1 -0
- package/dist/commands/submission-transition.js +69 -0
- package/dist/commands/submission-transition.js.map +1 -0
- package/dist/commands/tasks.d.ts.map +1 -1
- package/dist/commands/tasks.js +37 -8
- package/dist/commands/tasks.js.map +1 -1
- package/dist/config/ai-setup.d.ts.map +1 -1
- package/dist/config/ai-setup.js +2 -0
- package/dist/config/ai-setup.js.map +1 -1
- package/dist/config/loader.d.ts +1 -0
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js.map +1 -1
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +4 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/database/feedback-queries.d.ts +22 -0
- package/dist/database/feedback-queries.d.ts.map +1 -0
- package/dist/database/feedback-queries.js +58 -0
- package/dist/database/feedback-queries.js.map +1 -0
- package/dist/database/queries.d.ts +1 -1
- package/dist/database/queries.js +2 -2
- package/dist/database/schema.d.ts +2 -2
- package/dist/database/schema.d.ts.map +1 -1
- package/dist/database/schema.js +14 -0
- package/dist/database/schema.js.map +1 -1
- package/dist/git/submission-durability.d.ts +14 -0
- package/dist/git/submission-durability.d.ts.map +1 -0
- package/dist/git/submission-durability.js +61 -0
- package/dist/git/submission-durability.js.map +1 -0
- package/dist/orchestrator/post-reviewer.d.ts +1 -1
- package/dist/orchestrator/post-reviewer.d.ts.map +1 -1
- package/dist/orchestrator/post-reviewer.js +17 -22
- package/dist/orchestrator/post-reviewer.js.map +1 -1
- package/dist/orchestrator/reviewer-decision-parser.d.ts +15 -0
- package/dist/orchestrator/reviewer-decision-parser.d.ts.map +1 -0
- package/dist/orchestrator/reviewer-decision-parser.js +40 -0
- package/dist/orchestrator/reviewer-decision-parser.js.map +1 -0
- package/dist/orchestrator/reviewer.d.ts +2 -0
- package/dist/orchestrator/reviewer.d.ts.map +1 -1
- package/dist/orchestrator/reviewer.js +33 -48
- package/dist/orchestrator/reviewer.js.map +1 -1
- package/dist/orchestrator/signal-parser.d.ts +0 -4
- package/dist/orchestrator/signal-parser.d.ts.map +1 -1
- package/dist/orchestrator/signal-parser.js +4 -14
- package/dist/orchestrator/signal-parser.js.map +1 -1
- package/dist/prompts/coder.d.ts +4 -0
- package/dist/prompts/coder.d.ts.map +1 -1
- package/dist/prompts/coder.js +13 -4
- package/dist/prompts/coder.js.map +1 -1
- package/dist/prompts/prompt-helpers.d.ts +9 -0
- package/dist/prompts/prompt-helpers.d.ts.map +1 -1
- package/dist/prompts/prompt-helpers.js +27 -0
- package/dist/prompts/prompt-helpers.js.map +1 -1
- package/dist/prompts/reviewer-template-sections.d.ts +9 -0
- package/dist/prompts/reviewer-template-sections.d.ts.map +1 -0
- package/dist/prompts/reviewer-template-sections.js +260 -0
- package/dist/prompts/reviewer-template-sections.js.map +1 -0
- package/dist/prompts/reviewer.d.ts +6 -0
- package/dist/prompts/reviewer.d.ts.map +1 -1
- package/dist/prompts/reviewer.js +22 -253
- package/dist/prompts/reviewer.js.map +1 -1
- package/dist/runners/wakeup-sanitise.d.ts +1 -0
- package/dist/runners/wakeup-sanitise.d.ts.map +1 -1
- package/dist/runners/wakeup-sanitise.js +36 -7
- package/dist/runners/wakeup-sanitise.js.map +1 -1
- package/migrations/023_add_task_feedback.sql +19 -0
- package/migrations/manifest.json +10 -2
- package/package.json +1 -1
|
@@ -4,11 +4,72 @@
|
|
|
4
4
|
* Extracted from loop-phases-reviewer.ts to keep that file under 500 lines.
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.getArbitrationContractViolation = getArbitrationContractViolation;
|
|
7
8
|
exports.resolveReviewerDecision = resolveReviewerDecision;
|
|
8
9
|
const reviewer_js_1 = require("../orchestrator/reviewer.js");
|
|
9
10
|
const invoke_js_1 = require("../orchestrator/invoke.js");
|
|
10
11
|
const fallback_handler_js_1 = require("../orchestrator/fallback-handler.js");
|
|
11
12
|
const loop_phases_helpers_js_1 = require("./loop-phases-helpers.js");
|
|
13
|
+
const MAX_MULTI_REVIEW_ARBITRATION_ATTEMPTS = 2;
|
|
14
|
+
function mergeRejectNotes(reviewerResults) {
|
|
15
|
+
const rejectors = reviewerResults.filter(r => r.decision === 'reject');
|
|
16
|
+
const checklistSet = new Set();
|
|
17
|
+
for (const result of rejectors) {
|
|
18
|
+
const lines = (result.stdout ?? '').split('\n');
|
|
19
|
+
for (const line of lines) {
|
|
20
|
+
const trimmed = line.trim();
|
|
21
|
+
if (/^[-*]\s*\[\s*[x ]?\s*\]\s+/.test(trimmed)) {
|
|
22
|
+
checklistSet.add(trimmed);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
if (checklistSet.size > 0) {
|
|
27
|
+
return [
|
|
28
|
+
'## Merged Review Findings',
|
|
29
|
+
...Array.from(checklistSet),
|
|
30
|
+
].join('\n');
|
|
31
|
+
}
|
|
32
|
+
// If no structured checklist is present, preserve full rejector outputs.
|
|
33
|
+
return rejectors
|
|
34
|
+
.map((r, i) => `## Reviewer ${i + 1} Reject Notes\n${(r.stdout ?? '').trim()}`)
|
|
35
|
+
.join('\n\n')
|
|
36
|
+
.trim();
|
|
37
|
+
}
|
|
38
|
+
function toDecisionPayload(decision, taskRejectionCount, reasoning, notes, confidence, followUpTasks) {
|
|
39
|
+
const nextStatus = decision === 'approve' ? 'completed' :
|
|
40
|
+
decision === 'reject' ? 'in_progress' :
|
|
41
|
+
decision === 'dispute' ? 'disputed' :
|
|
42
|
+
decision === 'skip' ? 'skipped' : 'review';
|
|
43
|
+
return {
|
|
44
|
+
decision,
|
|
45
|
+
reasoning,
|
|
46
|
+
notes,
|
|
47
|
+
next_status: nextStatus,
|
|
48
|
+
rejection_count: taskRejectionCount,
|
|
49
|
+
confidence,
|
|
50
|
+
push_to_remote: decision === 'approve' || decision === 'dispute',
|
|
51
|
+
repeated_issue: false,
|
|
52
|
+
follow_up_tasks: followUpTasks,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
function getArbitrationContractViolation(parsed, hasReject, hasDispute, hasSkip, hasUndefined, attempt) {
|
|
56
|
+
if (parsed.decision === 'unclear') {
|
|
57
|
+
return `no_decision_token (attempt ${attempt})`;
|
|
58
|
+
}
|
|
59
|
+
if (parsed.decision === 'skip') {
|
|
60
|
+
return `contract_violation_skip_not_allowed (attempt ${attempt})`;
|
|
61
|
+
}
|
|
62
|
+
if (!hasDispute && hasReject && parsed.decision === 'dispute') {
|
|
63
|
+
return `contract_violation_dispute_without_reviewer_dispute (attempt ${attempt})`;
|
|
64
|
+
}
|
|
65
|
+
if ((hasReject || hasDispute || hasSkip || hasUndefined) && parsed.decision === 'approve' && parsed.confidence !== 'high') {
|
|
66
|
+
return `contract_violation_low_confidence_approve (attempt ${attempt})`;
|
|
67
|
+
}
|
|
68
|
+
if (parsed.decision === 'reject' && !parsed.notes.trim()) {
|
|
69
|
+
return `contract_violation_empty_reject_notes (attempt ${attempt})`;
|
|
70
|
+
}
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
12
73
|
/**
|
|
13
74
|
* Resolve a reviewer decision from one or more reviewer results.
|
|
14
75
|
* Handles single-reviewer and multi-reviewer flows, including orchestrator
|
|
@@ -17,7 +78,11 @@ const loop_phases_helpers_js_1 = require("./loop-phases-helpers.js");
|
|
|
17
78
|
async function resolveReviewerDecision(task, projectPath, reviewerResult, reviewerResults, effectiveMultiReviewEnabled, gitContext) {
|
|
18
79
|
let decision;
|
|
19
80
|
if (effectiveMultiReviewEnabled) {
|
|
20
|
-
const
|
|
81
|
+
const resolution = (0, reviewer_js_1.resolveDecision)(reviewerResults);
|
|
82
|
+
const hasReject = reviewerResults.some(r => r.decision === 'reject');
|
|
83
|
+
const hasDispute = reviewerResults.some(r => r.decision === 'dispute');
|
|
84
|
+
const hasSkip = reviewerResults.some(r => r.decision === 'skip');
|
|
85
|
+
const hasUndefined = reviewerResults.some(r => r.decision === undefined);
|
|
21
86
|
const multiContext = {
|
|
22
87
|
task: {
|
|
23
88
|
id: task.id,
|
|
@@ -34,79 +99,59 @@ async function resolveReviewerDecision(task, projectPath, reviewerResult, review
|
|
|
34
99
|
})),
|
|
35
100
|
git_context: gitContext,
|
|
36
101
|
};
|
|
37
|
-
if (
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
const orchestratorOutput = await (0, invoke_js_1.invokeMultiReviewerOrchestrator)(multiContext, projectPath);
|
|
41
|
-
const handler = new fallback_handler_js_1.OrchestrationFallbackHandler();
|
|
42
|
-
decision = handler.parseReviewerOutput(orchestratorOutput);
|
|
102
|
+
if (resolution.route === 'direct') {
|
|
103
|
+
if (resolution.decision === 'unclear') {
|
|
104
|
+
decision = toDecisionPayload('unclear', task.rejection_count, `Multi-reviewer result has no explicit resolvable signal (${reviewerResults.length} reviewers)`, '', 'low');
|
|
43
105
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
rejection_count: task.rejection_count,
|
|
52
|
-
confidence: 'low',
|
|
53
|
-
push_to_remote: false,
|
|
54
|
-
repeated_issue: false,
|
|
55
|
-
};
|
|
106
|
+
else {
|
|
107
|
+
const primaryResult = reviewerResults.find(r => r.decision === resolution.decision) ?? reviewerResults[0];
|
|
108
|
+
const confidence = resolution.decision === 'approve' || resolution.decision === 'skip' ? 'high' : 'medium';
|
|
109
|
+
const notes = resolution.decision === 'reject'
|
|
110
|
+
? (primaryResult?.stdout ?? 'See reviewer output for details')
|
|
111
|
+
: (primaryResult?.notes ?? '');
|
|
112
|
+
decision = toDecisionPayload(resolution.decision, task.rejection_count, `Direct multi-review resolution: ${resolution.decision}`, notes, confidence);
|
|
56
113
|
}
|
|
57
114
|
}
|
|
115
|
+
else if (resolution.route === 'local_reject_merge') {
|
|
116
|
+
decision = toDecisionPayload('reject', task.rejection_count, `All ${reviewerResults.length} reviewers rejected; merged checklist deterministically`, mergeRejectNotes(reviewerResults), 'high');
|
|
117
|
+
}
|
|
58
118
|
else {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
119
|
+
const handler = new fallback_handler_js_1.OrchestrationFallbackHandler();
|
|
120
|
+
let arbitrationResult = null;
|
|
121
|
+
let arbitrationFailureReason = 'unknown';
|
|
122
|
+
for (let attempt = 1; attempt <= MAX_MULTI_REVIEW_ARBITRATION_ATTEMPTS; attempt++) {
|
|
123
|
+
try {
|
|
124
|
+
const orchestratorOutput = await (0, invoke_js_1.invokeMultiReviewerOrchestrator)(multiContext, projectPath);
|
|
125
|
+
const parsed = handler.parseReviewerOutput(orchestratorOutput);
|
|
126
|
+
const contractViolation = getArbitrationContractViolation(parsed, hasReject, hasDispute, hasSkip, hasUndefined, attempt);
|
|
127
|
+
if (contractViolation) {
|
|
128
|
+
arbitrationFailureReason = contractViolation;
|
|
129
|
+
continue;
|
|
130
|
+
}
|
|
131
|
+
arbitrationResult = parsed;
|
|
132
|
+
break;
|
|
133
|
+
}
|
|
134
|
+
catch (error) {
|
|
135
|
+
arbitrationFailureReason = (0, loop_phases_helpers_js_1.summarizeErrorMessage)(error);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
if (arbitrationResult) {
|
|
66
139
|
decision = {
|
|
67
|
-
|
|
68
|
-
reasoning: `Multi-reviewer result is ambiguous (${reviewerResults.length} reviewers, no decisive outcome)`,
|
|
69
|
-
notes: '',
|
|
70
|
-
next_status: 'review',
|
|
140
|
+
...arbitrationResult,
|
|
71
141
|
rejection_count: task.rejection_count,
|
|
72
|
-
|
|
73
|
-
|
|
142
|
+
next_status: arbitrationResult.decision === 'approve' ? 'completed' :
|
|
143
|
+
arbitrationResult.decision === 'reject' ? 'in_progress' :
|
|
144
|
+
arbitrationResult.decision === 'dispute' ? 'disputed' :
|
|
145
|
+
arbitrationResult.decision === 'skip' ? 'skipped' : 'review',
|
|
146
|
+
push_to_remote: arbitrationResult.decision === 'approve' || arbitrationResult.decision === 'dispute',
|
|
74
147
|
repeated_issue: false,
|
|
75
148
|
};
|
|
76
149
|
}
|
|
150
|
+
else if (hasReject && !hasDispute) {
|
|
151
|
+
decision = toDecisionPayload('reject', task.rejection_count, `FALLBACK: arbitration failed (${arbitrationFailureReason}); applying safe reject fallback`, mergeRejectNotes(reviewerResults), 'low');
|
|
152
|
+
}
|
|
77
153
|
else {
|
|
78
|
-
|
|
79
|
-
// For reject: parsed notes are often a weak single-line extraction; fall back to raw
|
|
80
|
-
// stdout (capped) so the coder gets the actual rejection checklist.
|
|
81
|
-
// For approve/skip/dispute: short notes or empty string is fine.
|
|
82
|
-
const notesForDecision = finalDecision === 'reject'
|
|
83
|
-
? (primaryResult?.notes && primaryResult.notes !== 'See reviewer output for details'
|
|
84
|
-
? primaryResult.notes
|
|
85
|
-
: (primaryResult?.stdout?.slice(-3000) ?? 'See reviewer output for details'))
|
|
86
|
-
: (primaryResult?.notes ?? '');
|
|
87
|
-
// approve/skip = full consensus → high
|
|
88
|
-
// dispute = any-one-disputes (not all), reject = single-rejector → both medium
|
|
89
|
-
const confidenceForDecision = finalDecision === 'approve' || finalDecision === 'skip' ? 'high' : 'medium';
|
|
90
|
-
const reasoningForDecision = finalDecision === 'approve' || finalDecision === 'skip'
|
|
91
|
-
? `All ${reviewerResults.length} reviewers agreed: ${finalDecision}`
|
|
92
|
-
: finalDecision === 'dispute'
|
|
93
|
-
? `Reviewer escalated to dispute (${reviewerResults.length} reviewers)`
|
|
94
|
-
: `Single-rejector reject, needsMerge=false (${reviewerResults.length} reviewers)`;
|
|
95
|
-
const nextStatusForDecision = finalDecision === 'approve' ? 'completed' :
|
|
96
|
-
finalDecision === 'reject' ? 'in_progress' :
|
|
97
|
-
finalDecision === 'dispute' ? 'disputed' :
|
|
98
|
-
finalDecision === 'skip' ? 'skipped' : 'review';
|
|
99
|
-
decision = {
|
|
100
|
-
decision: finalDecision,
|
|
101
|
-
reasoning: reasoningForDecision,
|
|
102
|
-
notes: notesForDecision,
|
|
103
|
-
next_status: nextStatusForDecision,
|
|
104
|
-
rejection_count: task.rejection_count,
|
|
105
|
-
confidence: confidenceForDecision,
|
|
106
|
-
// skip does not push in the runtime switch-case; field is currently unused but set accurately
|
|
107
|
-
push_to_remote: finalDecision === 'approve' || finalDecision === 'dispute',
|
|
108
|
-
repeated_issue: false,
|
|
109
|
-
};
|
|
154
|
+
decision = toDecisionPayload('dispute', task.rejection_count, `FALLBACK: arbitration failed (${arbitrationFailureReason}); escalating to dispute`, 'ARBITRATION_FAILED: Unable to resolve multi-review disagreement deterministically.', 'low');
|
|
110
155
|
}
|
|
111
156
|
}
|
|
112
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop-phases-reviewer-resolution.js","sourceRoot":"","sources":["../../src/commands/loop-phases-reviewer-resolution.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"loop-phases-reviewer-resolution.js","sourceRoot":"","sources":["../../src/commands/loop-phases-reviewer-resolution.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AA8EH,0EAwBC;AAOD,0DAwNC;AAnUD,6DAGqC;AACrC,yDAGmC;AACnC,6EAAmF;AAMnF,qEAGkC;AAElC,MAAM,qCAAqC,GAAG,CAAC,CAAC;AAEhD,SAAS,gBAAgB,CAAC,eAAiC;IACzD,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;IACvE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IAEvC,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5B,IAAI,4BAA4B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/C,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO;YACL,2BAA2B;YAC3B,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;SAC5B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IAED,yEAAyE;IACzE,OAAO,SAAS;SACb,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;SAC9E,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,iBAAiB,CACxB,QAAiD,EACjD,kBAA0B,EAC1B,SAAiB,EACjB,KAAa,EACb,UAAqD,EACrD,aAA8D;IAE9D,MAAM,UAAU,GACd,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QACtC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YACvC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBACrC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE7C,OAAO;QACL,QAAQ;QACR,SAAS;QACT,KAAK;QACL,WAAW,EAAE,UAAU;QACvB,eAAe,EAAE,kBAAkB;QACnC,UAAU;QACV,cAAc,EAAE,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS;QAChE,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,aAAa;KAC/B,CAAC;AACJ,CAAC;AAED,SAAgB,+BAA+B,CAC7C,MAAmC,EACnC,SAAkB,EAClB,UAAmB,EACnB,OAAgB,EAChB,YAAqB,EACrB,OAAe;IAEf,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,8BAA8B,OAAO,GAAG,CAAC;IAClD,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QAC/B,OAAO,gDAAgD,OAAO,GAAG,CAAC;IACpE,CAAC;IACD,IAAI,CAAC,UAAU,IAAI,SAAS,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9D,OAAO,gEAAgE,OAAO,GAAG,CAAC;IACpF,CAAC;IACD,IAAI,CAAC,SAAS,IAAI,UAAU,IAAI,OAAO,IAAI,YAAY,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;QAC1H,OAAO,sDAAsD,OAAO,GAAG,CAAC;IAC1E,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QACzD,OAAO,kDAAkD,OAAO,GAAG,CAAC;IACtE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,uBAAuB,CAC3C,IAA4D,EAC5D,WAAmB,EACnB,cAA0C,EAC1C,eAAiC,EACjC,2BAAoC,EACpC,UAKC;IAED,IAAI,QAAqC,CAAC;IAE1C,IAAI,2BAA2B,EAAE,CAAC;QAChC,MAAM,UAAU,GAAG,IAAA,6BAAe,EAAC,eAAe,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC;QACjE,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;QAEzE,MAAM,YAAY,GAAyB;YACzC,IAAI,EAAE;gBACJ,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,eAAe,EAAE,IAAI,CAAC,eAAe;aACtC;YACD,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC1C,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,SAAS;gBACjC,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,SAAS;gBAC3B,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,SAAS;gBACjC,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,WAAW,EAAE,CAAC,CAAC,QAAQ;aACxB,CAAC,CAAC;YACH,WAAW,EAAE,UAAU;SACxB,CAAC;QAEF,IAAI,UAAU,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAClC,IAAI,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACtC,QAAQ,GAAG,iBAAiB,CAC1B,SAAS,EACT,IAAI,CAAC,eAAe,EACpB,4DAA4D,eAAe,CAAC,MAAM,aAAa,EAC/F,EAAE,EACF,KAAK,CACN,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,aAAa,GACjB,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;gBACtF,MAAM,UAAU,GACd,UAAU,CAAC,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAC1F,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,KAAK,QAAQ;oBAC5C,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,IAAI,iCAAiC,CAAC;oBAC9D,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;gBACjC,QAAQ,GAAG,iBAAiB,CAC1B,UAAU,CAAC,QAAQ,EACnB,IAAI,CAAC,eAAe,EACpB,mCAAmC,UAAU,CAAC,QAAQ,EAAE,EACxD,KAAK,EACL,UAAU,CACX,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,UAAU,CAAC,KAAK,KAAK,oBAAoB,EAAE,CAAC;YACrD,QAAQ,GAAG,iBAAiB,CAC1B,QAAQ,EACR,IAAI,CAAC,eAAe,EACpB,OAAO,eAAe,CAAC,MAAM,yDAAyD,EACtF,gBAAgB,CAAC,eAAe,CAAC,EACjC,MAAM,CACP,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,GAAG,IAAI,kDAA4B,EAAE,CAAC;YACnD,IAAI,iBAAiB,GAAuC,IAAI,CAAC;YACjE,IAAI,wBAAwB,GAAG,SAAS,CAAC;YAEzC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,qCAAqC,EAAE,OAAO,EAAE,EAAE,CAAC;gBAClF,IAAI,CAAC;oBACH,MAAM,kBAAkB,GAAG,MAAM,IAAA,2CAA+B,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC;oBAC5F,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;oBAC/D,MAAM,iBAAiB,GAAG,+BAA+B,CACvD,MAAM,EACN,SAAS,EACT,UAAU,EACV,OAAO,EACP,YAAY,EACZ,OAAO,CACR,CAAC;oBACF,IAAI,iBAAiB,EAAE,CAAC;wBACtB,wBAAwB,GAAG,iBAAiB,CAAC;wBAC7C,SAAS;oBACX,CAAC;oBACD,iBAAiB,GAAG,MAAM,CAAC;oBAC3B,MAAM;gBACR,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,wBAAwB,GAAG,IAAA,8CAAqB,EAAC,KAAK,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YAED,IAAI,iBAAiB,EAAE,CAAC;gBACtB,QAAQ,GAAG;oBACT,GAAG,iBAAiB;oBACpB,eAAe,EAAE,IAAI,CAAC,eAAe;oBACrC,WAAW,EACT,iBAAiB,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;wBACxD,iBAAiB,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;4BACzD,iBAAiB,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gCACvD,iBAAiB,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;oBAC9D,cAAc,EAAE,iBAAiB,CAAC,QAAQ,KAAK,SAAS,IAAI,iBAAiB,CAAC,QAAQ,KAAK,SAAS;oBACpG,cAAc,EAAE,KAAK;iBACtB,CAAC;YACJ,CAAC;iBAAM,IAAI,SAAS,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpC,QAAQ,GAAG,iBAAiB,CAC1B,QAAQ,EACR,IAAI,CAAC,eAAe,EACpB,iCAAiC,wBAAwB,kCAAkC,EAC3F,gBAAgB,CAAC,eAAe,CAAC,EACjC,KAAK,CACN,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,iBAAiB,CAC1B,SAAS,EACT,IAAI,CAAC,eAAe,EACpB,iCAAiC,wBAAwB,0BAA0B,EACnF,oFAAoF,EACpF,KAAK,CACN,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,uBAAuB;QACvB,MAAM,OAAO,GAAoB;YAC/B,IAAI,EAAE;gBACJ,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,eAAe,EAAE,IAAI,CAAC,eAAe;aACtC;YACD,eAAe,EAAE;gBACf,MAAM,EAAE,cAAe,CAAC,MAAM;gBAC9B,MAAM,EAAE,cAAe,CAAC,MAAM;gBAC9B,SAAS,EAAE,cAAe,CAAC,QAAQ;gBACnC,SAAS,EAAE,cAAe,CAAC,QAAQ;gBACnC,WAAW,EAAE,cAAe,CAAC,QAAQ;aACtC;YACD,WAAW,EAAE,UAAU;SACxB,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,IAAA,sCAA0B,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAClF,MAAM,OAAO,GAAG,IAAI,kDAA4B,EAAE,CAAC;YACnD,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;YAE3D,sFAAsF;YACtF,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACpC,MAAM,cAAc,GAAG,cAAc,EAAE,MAAM,IAAI,EAAE,CAAC;gBACpD,MAAM,gBAAgB,GAAG,OAAO,CAAC,+BAA+B,CAAC,cAAc,CAAC,CAAC;gBACjF,IAAI,gBAAgB,EAAE,CAAC;oBACrB,QAAQ,GAAG;wBACT,QAAQ,EAAE,gBAAgB;wBAC1B,SAAS,EAAE,mEAAmE,gBAAgB,CAAC,WAAW,EAAE,EAAE;wBAC9G,KAAK,EAAE,cAAc;wBACrB,WAAW,EACT,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;4BAC9C,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;gCAC/C,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;oCAC7C,gBAAgB,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;wBACpD,eAAe,EAAE,IAAI,CAAC,eAAe;wBACrC,UAAU,EAAE,QAAQ;wBACpB,cAAc,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBACzE,cAAc,EAAE,KAAK;qBACtB,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;YACxD,MAAM,mBAAmB,GAAG,MAAM,IAAA,oDAA2B,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAElF,MAAM,OAAO,GAAG,IAAI,kDAA4B,EAAE,CAAC;YACnD,MAAM,cAAc,GAAG,cAAc,EAAE,MAAM,IAAI,EAAE,CAAC;YACpD,MAAM,gBAAgB,GAAG,OAAO,CAAC,+BAA+B,CAAC,cAAc,CAAC,CAAC;YACjF,MAAM,aAAa,GAAG,mBAAmB;gBACvC,CAAC,CAAC,GAAG,mBAAmB,CAAC,IAAI,KAAK,mBAAmB,CAAC,OAAO,EAAE;gBAC/D,CAAC,CAAC,IAAA,8CAAqB,EAAC,KAAK,CAAC,CAAC;YAEjC,IAAI,gBAAgB,EAAE,CAAC;gBACrB,QAAQ,GAAG;oBACT,QAAQ,EAAE,gBAAgB;oBAC1B,SAAS,EAAE,kCAAkC,aAAa,sCAAsC,gBAAgB,CAAC,WAAW,EAAE,EAAE;oBAChI,KAAK,EAAE,cAAc;oBACrB,WAAW,EACT,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;wBAC9C,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;4BAC/C,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gCAC7C,gBAAgB,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;oBACpD,eAAe,EAAE,IAAI,CAAC,eAAe;oBACrC,UAAU,EAAE,KAAK;oBACjB,cAAc,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;oBACzE,cAAc,EAAE,KAAK;iBACtB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG;oBACT,QAAQ,EAAE,SAAS;oBACnB,SAAS,EAAE,kCAAkC,aAAa,oBAAoB;oBAC9E,KAAK,EAAE,0BAA0B;oBACjC,WAAW,EAAE,QAAQ;oBACrB,eAAe,EAAE,IAAI,CAAC,eAAe;oBACrC,UAAU,EAAE,KAAK;oBACjB,cAAc,EAAE,KAAK;oBACrB,cAAc,EAAE,KAAK;iBACtB,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop-phases-reviewer.d.ts","sourceRoot":"","sources":["../../src/commands/loop-phases-reviewer.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,
|
|
1
|
+
{"version":3,"file":"loop-phases-reviewer.d.ts","sourceRoot":"","sources":["../../src/commands/loop-phases-reviewer.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAUR,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAU9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAMxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,OAAO,EACL,iBAAiB,EAIjB,sBAAsB,EAMvB,MAAM,0BAA0B,CAAC;AA0DlC,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EACzC,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,QAAQ,UAAQ,EAChB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,UAAU,GAAE,MAAe,EAC3B,UAAU,CAAC,EAAE,iBAAiB,EAC9B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CA8XxC"}
|
|
@@ -5,7 +5,6 @@ const queries_js_1 = require("../database/queries.js");
|
|
|
5
5
|
const reviewer_js_1 = require("../orchestrator/reviewer.js");
|
|
6
6
|
const push_js_1 = require("../git/push.js");
|
|
7
7
|
const status_js_1 = require("../git/status.js");
|
|
8
|
-
const submission_resolution_js_1 = require("../git/submission-resolution.js");
|
|
9
8
|
const loop_phases_reviewer_resolution_js_1 = require("./loop-phases-reviewer-resolution.js");
|
|
10
9
|
const loader_js_1 = require("../config/loader.js");
|
|
11
10
|
const branch_resolver_js_1 = require("../git/branch-resolver.js");
|
|
@@ -15,6 +14,7 @@ const git_lifecycle_js_1 = require("../workspace/git-lifecycle.js");
|
|
|
15
14
|
const pool_js_1 = require("../workspace/pool.js");
|
|
16
15
|
const merge_pipeline_js_1 = require("../workspace/merge-pipeline.js");
|
|
17
16
|
const loop_phases_helpers_js_1 = require("./loop-phases-helpers.js");
|
|
17
|
+
const reviewer_preflight_js_1 = require("./reviewer-preflight.js");
|
|
18
18
|
/**
|
|
19
19
|
* Create follow-up tasks based on reviewer decision.
|
|
20
20
|
* This is extracted to keep runReviewerPhase under 500 lines.
|
|
@@ -73,17 +73,11 @@ async function runReviewerPhase(db, task, projectPath, jsonMode = false, coordin
|
|
|
73
73
|
if (poolSlotContext) {
|
|
74
74
|
(0, pool_js_1.updateSlotStatus)(poolSlotContext.globalDb, poolSlotContext.slot.id, 'review_active');
|
|
75
75
|
}
|
|
76
|
-
const
|
|
77
|
-
if (
|
|
78
|
-
const attemptsText = submissionResolution.attempts.join(' | ') || 'none';
|
|
79
|
-
(0, queries_js_1.updateTaskStatus)(db, task.id, 'in_progress', 'orchestrator', `[commit_recovery] Missing reachable submission hash (${submissionResolution.reason}; attempts: ${attemptsText}). ` +
|
|
80
|
-
`Treating task as resubmission. Coder must output exact line: SUBMISSION_COMMIT: <sha> for the commit that implements the task.`);
|
|
81
|
-
if (!jsonMode) {
|
|
82
|
-
console.log('\n⟳ Reviewer hash missing; returning task to coder for hash resubmission');
|
|
83
|
-
}
|
|
76
|
+
const preflight = (0, reviewer_preflight_js_1.runReviewerSubmissionPreflight)(db, task, effectiveProjectPath, jsonMode);
|
|
77
|
+
if (!preflight.ok) {
|
|
84
78
|
return;
|
|
85
79
|
}
|
|
86
|
-
const submissionCommitSha =
|
|
80
|
+
const submissionCommitSha = preflight.submissionCommitSha;
|
|
87
81
|
const phaseConfig = (0, loader_js_1.loadConfig)(projectPath);
|
|
88
82
|
const multiReviewEnabled = (0, reviewer_js_1.isMultiReviewEnabled)(phaseConfig);
|
|
89
83
|
let effectiveMultiReviewEnabled = multiReviewEnabled;
|
|
@@ -192,13 +186,10 @@ async function runReviewerPhase(db, task, projectPath, jsonMode = false, coordin
|
|
|
192
186
|
if (decision.decision === 'unclear') {
|
|
193
187
|
const consecutiveParseFallbackRetries = (0, loop_phases_helpers_js_1.countConsecutiveUnclearEntries)(db, task.id) + 1;
|
|
194
188
|
if (consecutiveParseFallbackRetries >= loop_phases_helpers_js_1.MAX_ORCHESTRATOR_PARSE_RETRIES) {
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
const isZeroOutputTimeout = !!reviewerResult?.timedOut &&
|
|
200
|
-
!reviewerResult?.stdout?.trim() &&
|
|
201
|
-
!reviewerResult?.stderr?.trim();
|
|
189
|
+
const timeoutCandidates = effectiveMultiReviewEnabled
|
|
190
|
+
? reviewerResults
|
|
191
|
+
: (reviewerResult ? [reviewerResult] : []);
|
|
192
|
+
const isZeroOutputTimeout = timeoutCandidates.some(r => !!r?.timedOut && !r?.stdout?.trim() && !r?.stderr?.trim());
|
|
202
193
|
if (isZeroOutputTimeout) {
|
|
203
194
|
disputeErrorCode = 'REVIEWER_ZERO_OUTPUT_TIMEOUT';
|
|
204
195
|
decision = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop-phases-reviewer.js","sourceRoot":"","sources":["../../src/commands/loop-phases-reviewer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"loop-phases-reviewer.js","sourceRoot":"","sources":["../../src/commands/loop-phases-reviewer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { getTask } from '../database/queries.js';
|
|
2
|
+
import type { openDatabase } from '../database/connection.js';
|
|
3
|
+
export type ReviewerSubmissionPreflightResult = {
|
|
4
|
+
ok: true;
|
|
5
|
+
submissionCommitSha: string;
|
|
6
|
+
} | {
|
|
7
|
+
ok: false;
|
|
8
|
+
};
|
|
9
|
+
export declare function runReviewerSubmissionPreflight(db: ReturnType<typeof openDatabase>['db'], task: NonNullable<ReturnType<typeof getTask>>, effectiveProjectPath: string, jsonMode?: boolean): ReviewerSubmissionPreflightResult;
|
|
10
|
+
//# sourceMappingURL=reviewer-preflight.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reviewer-preflight.d.ts","sourceRoot":"","sources":["../../src/commands/reviewer-preflight.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAIR,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAM9D,MAAM,MAAM,iCAAiC,GACzC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC;AAElB,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EACzC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,EAC7C,oBAAoB,EAAE,MAAM,EAC5B,QAAQ,UAAQ,GACf,iCAAiC,CAuFnC"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runReviewerSubmissionPreflight = runReviewerSubmissionPreflight;
|
|
4
|
+
const queries_js_1 = require("../database/queries.js");
|
|
5
|
+
const submission_resolution_js_1 = require("../git/submission-resolution.js");
|
|
6
|
+
const submission_durability_js_1 = require("../git/submission-durability.js");
|
|
7
|
+
const loop_phases_helpers_js_1 = require("./loop-phases-helpers.js");
|
|
8
|
+
const commit_recovery_js_1 = require("./commit-recovery.js");
|
|
9
|
+
function runReviewerSubmissionPreflight(db, task, effectiveProjectPath, jsonMode = false) {
|
|
10
|
+
const submissionCandidates = (0, queries_js_1.getSubmissionCommitShas)(db, task.id);
|
|
11
|
+
const latestSubmissionAudit = db
|
|
12
|
+
.prepare(`SELECT commit_sha, metadata
|
|
13
|
+
FROM audit
|
|
14
|
+
WHERE task_id = ?
|
|
15
|
+
AND to_status = 'review'
|
|
16
|
+
AND commit_sha IS NOT NULL
|
|
17
|
+
ORDER BY created_at DESC, id DESC
|
|
18
|
+
LIMIT 1`)
|
|
19
|
+
.get(task.id);
|
|
20
|
+
let latestSubmissionMetadata = null;
|
|
21
|
+
if (latestSubmissionAudit?.metadata) {
|
|
22
|
+
try {
|
|
23
|
+
latestSubmissionMetadata = JSON.parse(latestSubmissionAudit.metadata);
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
latestSubmissionMetadata = null;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
const durableRefState = (0, submission_durability_js_1.readDurableSubmissionRef)(effectiveProjectPath, task.id);
|
|
30
|
+
const latestAuditCommitSha = latestSubmissionAudit?.commit_sha ?? null;
|
|
31
|
+
if (latestSubmissionMetadata?.durable_ref && durableRefState && latestAuditCommitSha) {
|
|
32
|
+
const durableShaMatchesAudit = durableRefState.sha === latestAuditCommitSha;
|
|
33
|
+
const durableShaMatchesMetadata = !latestSubmissionMetadata.durable_ref_sha ||
|
|
34
|
+
latestSubmissionMetadata.durable_ref_sha === durableRefState.sha;
|
|
35
|
+
if (durableShaMatchesAudit && durableShaMatchesMetadata) {
|
|
36
|
+
const deduped = [durableRefState.sha, ...submissionCandidates.filter((sha) => sha !== durableRefState.sha)];
|
|
37
|
+
submissionCandidates.splice(0, submissionCandidates.length, ...deduped);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
(0, queries_js_1.addAuditEntry)(db, task.id, task.status, task.status, 'orchestrator', {
|
|
41
|
+
actorType: 'orchestrator',
|
|
42
|
+
notes: `[integrity] Durable ref mismatch: ref=${durableRefState.sha}, latest_audit=${latestAuditCommitSha}. Falling back to submission history.`,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const submissionResolution = (0, submission_resolution_js_1.resolveSubmissionCommitWithRecovery)(effectiveProjectPath, submissionCandidates);
|
|
47
|
+
const latestCandidate = submissionCandidates[0] ?? null;
|
|
48
|
+
const allUnreachable = submissionResolution.status !== 'resolved';
|
|
49
|
+
const latestMissingWithOlderReachable = submissionResolution.status === 'resolved' &&
|
|
50
|
+
latestCandidate !== null &&
|
|
51
|
+
submissionResolution.sha !== latestCandidate;
|
|
52
|
+
if (allUnreachable || latestMissingWithOlderReachable) {
|
|
53
|
+
const recoveryAttempts = (0, loop_phases_helpers_js_1.countCommitRecoveryAttempts)(db, task.id) + 1;
|
|
54
|
+
const reasonTag = allUnreachable ? 'all_submissions_unreachable' : 'latest_missing_with_older_reachable';
|
|
55
|
+
const attemptsText = submissionResolution.attempts.join(' | ') || 'none';
|
|
56
|
+
if (recoveryAttempts >= commit_recovery_js_1.COMMIT_RECOVERY_MAX_ATTEMPTS) {
|
|
57
|
+
(0, queries_js_1.updateTaskStatus)(db, task.id, 'disputed', 'orchestrator', `[commit_recovery] Escalating after ${recoveryAttempts} attempts (${reasonTag}; attempts: ${attemptsText}).`);
|
|
58
|
+
if (!jsonMode) {
|
|
59
|
+
console.log('\n✗ Commit recovery cap reached; task escalated to disputed.');
|
|
60
|
+
}
|
|
61
|
+
return { ok: false };
|
|
62
|
+
}
|
|
63
|
+
(0, queries_js_1.updateTaskStatus)(db, task.id, 'in_progress', 'orchestrator', `[commit_recovery] ${reasonTag} (${submissionResolution.status === 'resolved' ? 'resolved_with_stale_latest' : submissionResolution.reason}; attempts: ${attemptsText}). ` +
|
|
64
|
+
`Treating task as resubmission. Coder must output exact line: SUBMISSION_COMMIT: <sha> for the commit that implements the task.`);
|
|
65
|
+
if (!jsonMode) {
|
|
66
|
+
console.log('\n⟳ Reviewer preflight blocked due to unhealthy submission chain; returning to coder.');
|
|
67
|
+
}
|
|
68
|
+
return { ok: false };
|
|
69
|
+
}
|
|
70
|
+
return { ok: true, submissionCommitSha: submissionResolution.sha };
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=reviewer-preflight.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reviewer-preflight.js","sourceRoot":"","sources":["../../src/commands/reviewer-preflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -127,7 +127,7 @@ function buildParallelRunPlan(projectPath, maxClonesOverride) {
|
|
|
127
127
|
.prepare(`SELECT section_id as sectionId, COUNT(*) as count
|
|
128
128
|
FROM tasks
|
|
129
129
|
WHERE section_id IN (${sections.map(() => '?').join(',')})
|
|
130
|
-
AND status NOT IN ('completed', 'skipped', 'failed', 'partial', 'blocked_error', 'blocked_conflict')
|
|
130
|
+
AND status NOT IN ('completed', 'disputed', 'skipped', 'failed', 'partial', 'blocked_error', 'blocked_conflict')
|
|
131
131
|
GROUP BY section_id`)
|
|
132
132
|
.all(...sections.map((section) => section.id));
|
|
133
133
|
const pendingMap = new Map(pendingRows.map((row) => [row.sectionId, row.count]));
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { openDatabase } from '../database/connection.js';
|
|
2
|
+
export declare function submitForReviewWithDurableRef(db: ReturnType<typeof openDatabase>['db'], taskId: string, actor: string, projectPath: string, commitSha: string, notes: string): {
|
|
3
|
+
ok: true;
|
|
4
|
+
} | {
|
|
5
|
+
ok: false;
|
|
6
|
+
error: string;
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=submission-transition.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"submission-transition.d.ts","sourceRoot":"","sources":["../../src/commands/submission-transition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAQ9D,wBAAgB,6BAA6B,CAC3C,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EACzC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GACZ;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAsE7C"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.submitForReviewWithDurableRef = submitForReviewWithDurableRef;
|
|
4
|
+
const node_crypto_1 = require("node:crypto");
|
|
5
|
+
const queries_js_1 = require("../database/queries.js");
|
|
6
|
+
const submission_durability_js_1 = require("../git/submission-durability.js");
|
|
7
|
+
function submitForReviewWithDurableRef(db, taskId, actor, projectPath, commitSha, notes) {
|
|
8
|
+
const latestSubmission = db
|
|
9
|
+
.prepare(`SELECT metadata
|
|
10
|
+
FROM audit
|
|
11
|
+
WHERE task_id = ?
|
|
12
|
+
AND to_status = 'review'
|
|
13
|
+
ORDER BY created_at DESC, id DESC
|
|
14
|
+
LIMIT 1`)
|
|
15
|
+
.get(taskId);
|
|
16
|
+
const previousDurable = (0, submission_durability_js_1.readDurableSubmissionRef)(projectPath, taskId);
|
|
17
|
+
let previousSequence = 0;
|
|
18
|
+
if (latestSubmission?.metadata) {
|
|
19
|
+
try {
|
|
20
|
+
const parsed = JSON.parse(latestSubmission.metadata);
|
|
21
|
+
previousSequence = parsed.submission_sequence ?? 0;
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
previousSequence = 0;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
const nextSequence = previousSequence + 1;
|
|
28
|
+
const invocationToken = (0, node_crypto_1.randomUUID)();
|
|
29
|
+
const durableRef = (0, submission_durability_js_1.getSubmissionDurableRef)(taskId);
|
|
30
|
+
const refWrite = (0, submission_durability_js_1.writeDurableSubmissionRef)(projectPath, taskId, commitSha, previousDurable?.sha ?? null);
|
|
31
|
+
if (!refWrite.ok) {
|
|
32
|
+
return { ok: false, error: refWrite.error };
|
|
33
|
+
}
|
|
34
|
+
const writeTransition = db.transaction(() => {
|
|
35
|
+
(0, queries_js_1.updateTaskStatus)(db, taskId, 'review', actor, notes, commitSha);
|
|
36
|
+
const metadata = JSON.stringify({
|
|
37
|
+
submission_sequence: nextSequence,
|
|
38
|
+
durable_ref: durableRef,
|
|
39
|
+
durable_ref_sha: commitSha,
|
|
40
|
+
invocation_token: invocationToken,
|
|
41
|
+
});
|
|
42
|
+
db.prepare(`UPDATE audit
|
|
43
|
+
SET metadata = ?
|
|
44
|
+
WHERE id = (
|
|
45
|
+
SELECT id FROM audit
|
|
46
|
+
WHERE task_id = ?
|
|
47
|
+
AND to_status = 'review'
|
|
48
|
+
ORDER BY created_at DESC, id DESC
|
|
49
|
+
LIMIT 1
|
|
50
|
+
)`).run(metadata, taskId);
|
|
51
|
+
});
|
|
52
|
+
try {
|
|
53
|
+
writeTransition();
|
|
54
|
+
return { ok: true };
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
if (previousDurable?.sha) {
|
|
58
|
+
void (0, submission_durability_js_1.writeDurableSubmissionRef)(projectPath, taskId, previousDurable.sha, commitSha);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
(0, submission_durability_js_1.deleteDurableSubmissionRef)(projectPath, taskId);
|
|
62
|
+
}
|
|
63
|
+
return {
|
|
64
|
+
ok: false,
|
|
65
|
+
error: error instanceof Error ? error.message : String(error),
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=submission-transition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"submission-transition.js","sourceRoot":"","sources":["../../src/commands/submission-transition.ts"],"names":[],"mappings":";;AAUA,sEA6EC;AAvFD,6CAAyC;AACzC,uDAA0D;AAE1D,8EAKyC;AAEzC,SAAgB,6BAA6B,CAC3C,EAAyC,EACzC,MAAc,EACd,KAAa,EACb,WAAmB,EACnB,SAAiB,EACjB,KAAa;IAEb,MAAM,gBAAgB,GAAG,EAAE;SACxB,OAAO,CACN;;;;;eAKS,CACV;SACA,GAAG,CAAC,MAAM,CAA4C,CAAC;IAC1D,MAAM,eAAe,GAAG,IAAA,mDAAwB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACtE,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,gBAAgB,EAAE,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAqC,CAAC;YACzF,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,IAAI,CAAC,CAAC;QACrD,CAAC;QAAC,MAAM,CAAC;YACP,gBAAgB,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,gBAAgB,GAAG,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,IAAA,wBAAU,GAAE,CAAC;IACrC,MAAM,UAAU,GAAG,IAAA,kDAAuB,EAAC,MAAM,CAAC,CAAC;IAEnD,MAAM,QAAQ,GAAG,IAAA,oDAAyB,EACxC,WAAW,EACX,MAAM,EACN,SAAS,EACT,eAAe,EAAE,GAAG,IAAI,IAAI,CAC7B,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,MAAM,eAAe,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;QAC1C,IAAA,6BAAgB,EAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;YAC9B,mBAAmB,EAAE,YAAY;YACjC,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,SAAS;YAC1B,gBAAgB,EAAE,eAAe;SAClC,CAAC,CAAC;QACH,EAAE,CAAC,OAAO,CACR;;;;;;;;SAQG,CACJ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,eAAe,EAAE,CAAC;QAClB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,eAAe,EAAE,GAAG,EAAE,CAAC;YACzB,KAAK,IAAA,oDAAyB,EAAC,WAAW,EAAE,MAAM,EAAE,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACtF,CAAC;aAAM,CAAC;YACN,IAAA,qDAA0B,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAClD,CAAC;QACD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC9D,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/commands/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/commands/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAmJnD,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAsEpF"}
|