claude-dev-env 1.82.0 → 1.84.0

package/skills/autoconverge/workflow/converge.copilot-gate.test.mjs

@@ -18,9 +18,10 @@ function functionBody(functionName) {
 const productionModule = new Function(
   `${functionBody('classifyCopilotOutcome')}\n` +
     `${functionBody('resolveCopilotDown')}\n` +
-    'return { classifyCopilotOutcome, resolveCopilotDown };',
+    `${functionBody('resolveReviewerDown')}\n` +
+    'return { classifyCopilotOutcome, resolveCopilotDown, resolveReviewerDown };',
 )();
-const { classifyCopilotOutcome, resolveCopilotDown } = productionModule;
+const { classifyCopilotOutcome, resolveCopilotDown, resolveReviewerDown } = productionModule;
 
 function copilotResult(overrides) {
   return {
@@ -72,7 +73,7 @@ test('Copilot findings route to a fix when Copilot is reachable and not down', (
 
 test('COPILOT_SCHEMA carries a required down field', () => {
   const schemaStart = convergeSource.indexOf('const COPILOT_SCHEMA =');
-  const schemaEnd = convergeSource.indexOf('const HEAD_SCHEMA =');
+  const schemaEnd = convergeSource.indexOf('const REVIEWER_AVAILABILITY_SCHEMA =');
   assert.notEqual(schemaStart, -1, 'expected COPILOT_SCHEMA to exist');
   const schemaSource = convergeSource.slice(schemaStart, schemaEnd);
   assert.match(schemaSource, /down:\s*\{\s*type:\s*'boolean'/);
@@ -281,7 +282,7 @@ test('the mark-ready task in runGeneralUtilityTask opts the unflagged convergenc
   );
 });
 
-test('the COPILOT phase short-circuits on input.copilotDisabled before spawning the gate agent', () => {
+test('the COPILOT phase short-circuits on the unified reviewer-down gate before spawning the gate agent', () => {
   const copilotPhaseStart = convergeSource.indexOf("if (phase === 'COPILOT') {");
   assert.notEqual(copilotPhaseStart, -1, 'expected a COPILOT phase block');
   const gateCallIndex = convergeSource.indexOf('await runCopilotGate(head)', copilotPhaseStart);
@@ -289,8 +290,8 @@ test('the COPILOT phase short-circuits on input.copilotDisabled before spawning
   const beforeGate = convergeSource.slice(copilotPhaseStart, gateCallIndex);
   assert.match(
     beforeGate,
-    /if \(input\.copilotDisabled\)/,
-    'expected the quota pre-check bypass to guard the COPILOT phase before any gate agent spawns',
+    /if \(resolveReviewerDown\(reviewerAvailability\?\.copilot, input\.copilotDisabled \|\| false\)\)/,
+    'expected the unified resolveReviewerDown gate — fed by the reviewer-availability probe or the input override — to guard the COPILOT phase before any gate agent spawns',
   );
   assert.match(beforeGate, /copilotDown = true/, 'expected the bypass to mark copilotDown');
   assert.match(beforeGate, /copilotNote =/, 'expected the bypass to set a copilotNote');
@@ -298,6 +299,16 @@ test('the COPILOT phase short-circuits on input.copilotDisabled before spawning
   assert.match(beforeGate, /continue/, 'expected the bypass to continue without spawning the gate agent');
 });
 
+test('the COPILOT phase pre-spawn gate skips the gate agent via input.copilotDisabled with no probe entry', () => {
+  const isDownFromInput = resolveReviewerDown(undefined, true);
+  assert.equal(isDownFromInput, true, 'expected the input override alone to report Copilot down with no probe entry');
+});
+
+test('the COPILOT phase pre-spawn gate skips the gate agent via a probe down entry with no input override', () => {
+  const isDownFromProbe = resolveReviewerDown({ down: true, reason: 'copilot-quota: out of premium-interaction quota' }, false);
+  assert.equal(isDownFromProbe, true, 'expected a probe entry reporting down to skip the gate agent with no input override set');
+});
+
 test('copilotDown initializes from input.copilotDisabled so the pre-check decision carries into the loop', () => {
   assert.match(
     convergeSource,
@@ -308,8 +319,11 @@ test('copilotDown initializes from input.copilotDisabled so the pre-check decisi
 
 test('a copilotDisabled run reaches FINALIZE with --copilot-down', () => {
   const copilotPhaseStart = convergeSource.indexOf("if (phase === 'COPILOT') {");
-  const bypassStart = convergeSource.indexOf('if (input.copilotDisabled)', copilotPhaseStart);
-  assert.notEqual(bypassStart, -1, 'expected an input.copilotDisabled bypass in the COPILOT phase');
+  const bypassStart = convergeSource.indexOf(
+    'if (resolveReviewerDown(reviewerAvailability?.copilot, input.copilotDisabled || false))',
+    copilotPhaseStart,
+  );
+  assert.notEqual(bypassStart, -1, 'expected the unified resolveReviewerDown bypass in the COPILOT phase');
   const bypassBlock = convergeSource.slice(bypassStart, bypassStart + 800);
   assert.match(bypassBlock, /copilotDown = true/, 'expected the bypass to set copilotDown');
   assert.match(bypassBlock, /phase = 'FINALIZE'/, 'expected the bypass to advance to FINALIZE');
@@ -373,7 +387,7 @@ test('openStandardsFollowUpOnce gates spawnStandardsFollowUp behind the run-once
   );
   assert.match(
     onceBody,
-    /await spawnStandardsFollowUp\(head, findings, sourceLabel, wasStandardsHardeningPrOpened\)/,
+    /await spawnStandardsFollowUp\(head, findings, sourceLabel, wasStandardsHardeningPrOpened, deferredReviewerFlags\)/,
     'expected the helper to pass the remembered hardening state into the spawn so an already-opened PR is never re-opened',
   );
   assert.match(
@@ -511,8 +525,8 @@ test('a second standards-only round never re-opens a hardening PR after the firs
   };
   const runtime = loadStandardsFollowUpRuntime(recordedCalls, issueFailedHardeningStaged);
 
-  const firstRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'converge-round');
-  const secondRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'copilot');
+  const firstRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'converge-round', { copilotDisabled: false, bugbotDisabled: false });
+  const secondRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'copilot', { copilotDisabled: false, bugbotDisabled: false });
 
   const hardeningCommitCalls = recordedCalls.filter((call) => call.task === 'hardening-commit').length;
   assert.equal(
@@ -545,8 +559,8 @@ test('a hardening-commit that opens a PR but returns an unparseable URL still la
   const unparseableUrlHardeningCommitResult = { hardeningPrUrl: 'draft-hardening-pr-opened', summary: 'opened' };
   const runtime = loadStandardsFollowUpRuntime(recordedCalls, issueFailedHardeningStaged, unparseableUrlHardeningCommitResult);
 
-  const firstRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'converge-round');
-  const secondRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'copilot');
+  const firstRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'converge-round', { copilotDisabled: false, bugbotDisabled: false });
+  const secondRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'copilot', { copilotDisabled: false, bugbotDisabled: false });
 
   const hardeningCommitCalls = recordedCalls.filter((call) => call.task === 'hardening-commit').length;
   assert.equal(
@@ -575,8 +589,8 @@ test('a hardening-commit that opens no PR (empty hardeningPrUrl) leaves the run-
   const noPrHardeningCommitResult = { hardeningPrUrl: '', summary: 'no PR opened' };
   const runtime = loadStandardsFollowUpRuntime(recordedCalls, issueFailedHardeningStaged, noPrHardeningCommitResult);
 
-  const firstRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'converge-round');
-  const secondRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'copilot');
+  const firstRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'converge-round', { copilotDisabled: false, bugbotDisabled: false });
+  const secondRoundHardeningPr = await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1 }], 'copilot', { copilotDisabled: false, bugbotDisabled: false });
 
   const hardeningCommitCalls = recordedCalls.filter((call) => call.task === 'hardening-commit').length;
   assert.equal(
@@ -603,8 +617,8 @@ test('a later standards-only round resolves its own review threads after the fol
   };
   const runtime = loadStandardsFollowUpRuntime(recordedCalls, issueFiledNoHardening);
 
-  await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1, replyToCommentId: null }], 'converge-round');
-  await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'b.py', line: 2, replyToCommentId: 42 }], 'copilot');
+  await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1, replyToCommentId: null }], 'converge-round', { copilotDisabled: false, bugbotDisabled: false });
+  await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'b.py', line: 2, replyToCommentId: 42 }], 'copilot', { copilotDisabled: false, bugbotDisabled: false });
 
   const standardsEditCalls = recordedCalls.filter((call) => call.task === 'standards-edit');
   assert.equal(standardsEditCalls.length, 1, 'expected the follow-up issue to be filed exactly once across the run');
@@ -633,8 +647,8 @@ test('a reuse-path standards round carrying no review threads spawns no thread-r
   };
   const runtime = loadStandardsFollowUpRuntime(recordedCalls, issueFiledNoHardening);
 
-  await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1, replyToCommentId: null }], 'converge-round');
-  await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'b.py', line: 2, replyToCommentId: null }], 'copilot');
+  await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'a.py', line: 1, replyToCommentId: null }], 'converge-round', { copilotDisabled: false, bugbotDisabled: false });
+  await runtime.openStandardsFollowUpOnce('sha1', [{ file: 'b.py', line: 2, replyToCommentId: null }], 'copilot', { copilotDisabled: false, bugbotDisabled: false });
 
   const resolveCalls = recordedCalls.filter((call) => call.task === 'standards-resolve-threads');
   assert.equal(
@@ -644,3 +658,25 @@ test('a reuse-path standards round carrying no review threads spawns no thread-r
   );
 });
 
+test('resolveReviewerDown is the single reviewer-down gate; resolveBugbotDown no longer exists', () => {
+  assert.doesNotMatch(
+    convergeSource,
+    /function resolveBugbotDown\(/,
+    'expected resolveBugbotDown to be removed in favor of the shared resolveReviewerDown gate',
+  );
+  assert.match(convergeSource, /function resolveReviewerDown\(/, 'expected the shared resolveReviewerDown gate to exist');
+});
+
+test('resolveReviewerDown reports down when the input override is set, even with an available probe entry', () => {
+  assert.equal(resolveReviewerDown({ down: false, reason: 'available' }, true), true);
+});
+
+test('resolveReviewerDown reports available (fail-open) when the probe entry is missing and no input override is set', () => {
+  assert.equal(resolveReviewerDown(null, false), false);
+  assert.equal(resolveReviewerDown(undefined, false), false);
+});
+
+test('resolveReviewerDown reports available when the probe entry explicitly reports available', () => {
+  assert.equal(resolveReviewerDown({ down: false, reason: 'available' }, false), false);
+});
+

package/skills/autoconverge/workflow/converge.merge-conflict.test.mjs

@@ -39,7 +39,7 @@ test('the git agent handles merge-conflict checks with a Monitor-based poll', ()
     /do not edit, commit, push, or rebase|read only/i,
     'expected the git agent merge check to be read-only',
   );
-  assert.match(gitBody, /MERGE_CONFLICT_SCHEMA/, 'expected the git agent to return MERGE_CONFLICT_SCHEMA');
+  assert.match(gitBody, /PREFLIGHT_GIT_SCHEMA/, 'expected the git agent to return PREFLIGHT_GIT_SCHEMA');
   assert.match(gitBody, /Monitor tool/, 'expected a Monitor-based poll delay, not a foreground sleep');
 });
 
@@ -53,31 +53,38 @@ test('runCodeEditorTask conflict-edit path rebases onto origin/main and makes no
   );
 });
 
-test('resolveMergeConflicts runs check -> edit -> verify -> commit and gates the push on the verdict', () => {
+test('resolveMergeConflicts runs edit -> verify -> commit and gates the push on the verdict', () => {
   const body = functionBody('resolveMergeConflicts');
-  const checkIndex = body.indexOf("runGitTask('check-merge-conflicts'");
   const editIndex = body.indexOf("runCodeEditorTask('conflict-edit'");
   const verifyIndex = body.indexOf('runVerifierTask(');
   const commitIndex = body.indexOf('commitWithRecovery(');
-  assert.notEqual(checkIndex, -1, 'expected the conflict check to run');
   assert.notEqual(editIndex, -1, 'expected the edit step to run');
   assert.notEqual(verifyIndex, -1, 'expected the verify step to run');
   assert.notEqual(commitIndex, -1, 'expected the commit step to run');
   assert.ok(
-    checkIndex < editIndex && editIndex < verifyIndex && verifyIndex < commitIndex,
-    'expected the order check -> edit -> verify -> commit',
+    editIndex < verifyIndex && verifyIndex < commitIndex,
+    'expected the order edit -> verify -> commit',
   );
   assert.match(body, /verdictPassed\(/, 'expected the verifier verdict to gate the force-push');
+  assert.doesNotMatch(
+    body,
+    /runGitTask\(/,
+    'expected the conflict decision to come from the merged preflight-git probe, with no mergeability agent spawned here',
+  );
 });
 
-test('resolveMergeConflicts rebases only when the check reports a conflict', () => {
+test('resolveMergeConflicts rebases only when the caller-supplied preflight decision reports a conflict', () => {
   const body = functionBody('resolveMergeConflicts');
-  assert.match(body, /isMergeConflicting\(/, 'expected the orchestrator to branch on the conflict decision');
   assert.match(
     body,
-    /if \(!isMergeConflicting\([^)]*\)\) return head/,
+    /if \(!isConflicting\) return head/,
     'expected a clean PR to return the unchanged HEAD without rebasing',
   );
+  assert.match(
+    convergeSource,
+    /resolveMergeConflicts\(preflight\.sha, isMergeConflicting\(preflight\)\)/,
+    'expected the call site to derive the conflict decision from the merged preflight-git result',
+  );
 });
 
 test('the merge-conflict pre-flight runs once before the round loop, ahead of the parallel bug-check lenses', () => {