claude-dev-env 2.4.0 → 2.7.0

package/skills/autoconverge/workflow/converge.mjs

@@ -381,7 +381,7 @@ function runCodeEditorTask(task, context) {
       `You are the COMMIT step opening the environment-hardening PR (${context.sourceLabel}) for the change staged in ${context.hardeningRepoPath} on branch ${context.hardeningBranch}. The edit step left the hooks/rules edits in the working tree and the verify step passed, so a verifier verdict already binds to this exact working tree. Do NOT touch the PR's own branch.\n\n` +
         `Rules:\n` +
         `- Make NO further file edits of any kind. Any edit changes the surface and invalidates the verdict that unlocks the commit gate, so the push would be blocked. Only commit and push what is already there.\n` +
-        `- In ${context.hardeningRepoPath}: make ONE commit of the staged hooks/rules change on branch ${context.hardeningBranch}, push it, then open a DRAFT PR. The PR body references the follow-up issue ${context.issueUrl || '(none)'} and states the PR hardens the environment so the deferred violation classes are blocked at Write/Edit time. Honor the gh-body-file rule: write a BOM-free temp file and pass --body-file.\n` +
+        `- In ${context.hardeningRepoPath}: make ONE commit of the staged hooks/rules change on branch ${context.hardeningBranch}, push it, then open a DRAFT PR. The PR body references the follow-up issue ${context.issueUrl || '(none)'} and states the PR hardens the environment so the deferred violation classes are blocked at Write/Edit time. Honor the gh-cli-conventions rule: write a BOM-free temp file and pass --body-file.\n` +
         `- Title the PR as a Conventional Commit — a type prefix (feat, fix, chore, docs, refactor, perf, ci, style, test, build, revert), an optional scope in parentheses, then a colon and a short summary, e.g. "feat(hooks): block the deferred violation class". The target repo's CI validates the PR title as a semantic commit and rejects a non-conforming title.\n\n` +
         `Return the full https URL of the DRAFT hardening PR in hardeningPrUrl (empty string when no PR was opened) and a one-line summary.`,
       { label, phase: 'Converge', schema: HARDENING_COMMIT_SCHEMA, agentType: 'clean-coder', ...TIERS.sonnetMedium },
@@ -2276,6 +2276,101 @@ function isStandardsOnlyRound(findings) {
   return findings.length > 0 && findings.every((each) => each.category === 'code-standard')
 }
 
+/**
+ * Decide whether a review phase surfaced ONLY P2 findings — pure low-severity
+ * items with no P0/P1 mixed in. Such a phase still applies the fixes once, then
+ * treats the fixed HEAD as clean for that phase and advances forward rather than
+ * re-converging the same phase.
+ * @param {Array<object>} findings already-deduped findings for the phase
+ * @returns {boolean} true when every finding is severity P2
+ */
+function isP2OnlyFindings(findings) {
+  return findings.length > 0 && findings.every((each) => each.severity === 'P2')
+}
+
+/**
+ * Map the phase that just finished a P2-only fix onto the next phase to enter
+ * on the fixed HEAD. Pure P2 never returns to CONVERGE; each gate advances
+ * forward only.
+ *
+ * ::
+ *
+ *   nextPhaseAfterP2OnlyFix('CONVERGE')  -> 'BUGBOT'
+ *   nextPhaseAfterP2OnlyFix('BUGBOT')    -> 'COPILOT'
+ *   nextPhaseAfterP2OnlyFix('COPILOT')   -> 'CODEX'
+ *   nextPhaseAfterP2OnlyFix('CODEX')     -> 'FINALIZE'
+ *
+ * @param {string} currentPhase the phase that just applied the P2-only fixes
+ * @returns {string} the next phase name
+ */
+function nextPhaseAfterP2OnlyFix(currentPhase) {
+  const nextPhaseByCurrent = {
+    CONVERGE: 'BUGBOT',
+    BUGBOT: 'COPILOT',
+    COPILOT: 'CODEX',
+  }
+  return nextPhaseByCurrent[currentPhase] || 'FINALIZE'
+}
+
+/**
+ * Apply P2-only findings once and report whether the fixed HEAD advanced.
+ * Shared by the four phase branches that fix pure-P2 findings then advance
+ * forward without re-converging.
+ *
+ * ::
+ *
+ *   await applyP2OnlyFix(head, findings, 'bugbot', 'bugbot gate', 'bugbot fix lens')
+ *   -> { progressed: true, newSha: '<fixed>', blocker: null }
+ *
+ * @param {string} head PR HEAD SHA the findings were raised against
+ * @param {Array<object>} findings P2-only findings for this phase
+ * @param {string} sourceLabel short label passed to applyFixes
+ * @param {string} stallSubject noun phrase for the resolvedWithoutCommit stall message
+ * @param {string} noPushSubject subject for the no-push stall message
+ * @returns {Promise<{progressed: boolean, newSha: string, blocker: string|null}>} fix outcome
+ */
+async function applyP2OnlyFix(head, findings, sourceLabel, stallSubject, noPushSubject) {
+  const fixResult = await applyFixes(head, findings, sourceLabel)
+  const hadThreadBearingFinding = findings.some((each) => collectFindingThreadIds(each).length > 0)
+  const fixProgress = detectFixProgress(fixResult, head, hadThreadBearingFinding)
+  if (fixProgress.progressed) {
+    return { progressed: true, newSha: fixProgress.newSha, blocker: null }
+  }
+  const blocker =
+    fixResult?.resolvedWithoutCommit === true && !hadThreadBearingFinding
+      ? `fix stalled: ${stallSubject} raised ${findings.length} in-memory finding(s) with no GitHub thread, the fix judged them all stale (resolvedWithoutCommit) and moved no code on HEAD ${head} — re-raising would loop to the iteration cap`
+      : `${noPushSubject} landed no push for ${findings.length} finding(s) on HEAD ${head}`
+  return { progressed: false, newSha: head, blocker }
+}
+
+/**
+ * Route after a successful P2-only fix. HEAD-bound CLEAN/review stamps are
+ * SHA-specific: a push that moves HEAD must re-enter CONVERGE so those stamps
+ * rebuild. A no-push progress (resolvedWithoutCommit) advances to the next
+ * phase on the same HEAD.
+ *
+ * ::
+ *
+ *   routeAfterP2OnlyFix('aaa', {newSha: 'bbb'}, 'COPILOT')
+ *   -> {fixedHead: 'bbb', nextPhase: 'CONVERGE', didMoveHead: true}
+ *   routeAfterP2OnlyFix('aaa', {newSha: 'aaa'}, 'COPILOT')
+ *   -> {fixedHead: 'aaa', nextPhase: 'COPILOT', didMoveHead: false}
+ *
+ * @param {string} priorHead HEAD SHA before the P2-only fix
+ * @param {{newSha: string}} p2Fix successful applyP2OnlyFix result
+ * @param {string} advancePhase phase to enter when HEAD did not move
+ * @returns {{fixedHead: string, nextPhase: string, didMoveHead: boolean}} routing
+ */
+function routeAfterP2OnlyFix(priorHead, p2Fix, advancePhase) {
+  const fixedHead = p2Fix.newSha
+  const didMoveHead =
+    normalizeShaForComparison(fixedHead) !== normalizeShaForComparison(priorHead)
+  if (didMoveHead) {
+    return { fixedHead, nextPhase: 'CONVERGE', didMoveHead: true }
+  }
+  return { fixedHead, nextPhase: advancePhase, didMoveHead: false }
+}
+
 /**
  * Decide whether a standards-only round should file the follow-up fix issue and
  * open the environment-hardening PR. Standards findings are deferred rather than
@@ -2660,6 +2755,23 @@ while (iterations < CONFIG.maxIterations) {
       phase = 'BUGBOT'
       continue
     }
+    if (isP2OnlyFindings(findings)) {
+      resetNoLensRounds()
+      const advancePhase = nextPhaseAfterP2OnlyFix('CONVERGE')
+      log(`Round ${rounds}: ${findings.length} P2-only finding(s) — fixing once then routing from CONVERGE`)
+      const p2Fix = await applyP2OnlyFix(head, findings, 'converge-round', 'converge round', 'fix lens')
+      if (!p2Fix.progressed) {
+        blocker = p2Fix.blocker
+        break
+      }
+      const p2Route = routeAfterP2OnlyFix(head, p2Fix, advancePhase)
+      head = p2Route.fixedHead
+      phase = p2Route.nextPhase
+      if (p2Route.didMoveHead) {
+        log(`Round ${rounds}: P2-only fix moved HEAD — re-converging so HEAD-bound stamps rebuild`)
+      }
+      continue
+    }
     if (findings.length > 0) {
       resetNoLensRounds()
       log(`Round ${rounds}: ${findings.length} finding(s) — applying fixes`)
@@ -2732,6 +2844,23 @@ while (iterations < CONFIG.maxIterations) {
         phase = 'COPILOT'
         continue
       }
+      if (isP2OnlyFindings(bugbotOutcome.findings)) {
+        const advancePhase = nextPhaseAfterP2OnlyFix('BUGBOT')
+        log(`Bugbot raised ${bugbotOutcome.findings.length} P2-only finding(s) — fixing once then routing from BUGBOT`)
+        const p2Fix = await applyP2OnlyFix(head, bugbotOutcome.findings, 'bugbot', 'bugbot gate', 'bugbot fix lens')
+        if (!p2Fix.progressed) {
+          blocker = p2Fix.blocker
+          break
+        }
+        const p2Route = routeAfterP2OnlyFix(head, p2Fix, advancePhase)
+        head = p2Route.fixedHead
+        bugbotDown = false
+        phase = p2Route.nextPhase
+        if (p2Route.didMoveHead) {
+          log('Bugbot P2-only fix moved HEAD — re-converging so HEAD-bound stamps rebuild')
+        }
+        continue
+      }
       log(`Bugbot raised ${bugbotOutcome.findings.length} finding(s) — fixing and re-converging`)
       const fixResult = await applyFixes(head, bugbotOutcome.findings, 'bugbot')
       const hadThreadBearingFinding = bugbotOutcome.findings.some((each) => collectFindingThreadIds(each).length > 0)
@@ -2813,6 +2942,22 @@ while (iterations < CONFIG.maxIterations) {
         phase = 'CODEX'
         continue
       }
+      if (isP2OnlyFindings(roundFindings)) {
+        const advancePhase = nextPhaseAfterP2OnlyFix('COPILOT')
+        log(`Copilot raised ${roundFindings.length} P2-only finding(s) — fixing once then routing from COPILOT`)
+        const p2Fix = await applyP2OnlyFix(head, roundFindings, 'copilot', 'copilot round', 'copilot fix lens')
+        if (!p2Fix.progressed) {
+          blocker = p2Fix.blocker
+          break
+        }
+        const p2Route = routeAfterP2OnlyFix(head, p2Fix, advancePhase)
+        head = p2Route.fixedHead
+        phase = p2Route.nextPhase
+        if (p2Route.didMoveHead) {
+          log('Copilot P2-only fix moved HEAD — re-converging so HEAD-bound stamps rebuild')
+        }
+        continue
+      }
       log(`Copilot raised ${roundFindings.length} finding(s) — fixing and re-converging`)
       const fixResult = await applyFixes(head, roundFindings, 'copilot')
       const hadThreadBearingFinding = roundFindings.some((each) => collectFindingThreadIds(each).length > 0)
@@ -2873,6 +3018,28 @@ while (iterations < CONFIG.maxIterations) {
         phase = 'FINALIZE'
         continue
       }
+      if (isP2OnlyFindings(codexOutcome.findings)) {
+        const advancePhase = nextPhaseAfterP2OnlyFix('CODEX')
+        log(`Codex raised ${codexOutcome.findings.length} P2-only finding(s) — fixing once then routing from CODEX`)
+        const p2Fix = await applyP2OnlyFix(head, codexOutcome.findings, 'codex', 'codex gate', 'codex fix lens')
+        if (!p2Fix.progressed) {
+          blocker = p2Fix.blocker
+          break
+        }
+        const p2Route = routeAfterP2OnlyFix(head, p2Fix, advancePhase)
+        head = p2Route.fixedHead
+        if (p2Route.didMoveHead) {
+          log('Codex P2-only fix moved HEAD — re-converging so HEAD-bound stamps rebuild')
+          codexDown = false
+          codexCleanAt = null
+          phase = p2Route.nextPhase
+          continue
+        }
+        codexDown = false
+        codexCleanAt = head
+        phase = p2Route.nextPhase
+        continue
+      }
       log(`Codex raised ${codexOutcome.findings.length} finding(s) — fixing and re-converging`)
       const fixResult = await applyFixes(head, codexOutcome.findings, 'codex')
       const hadThreadBearingFinding = codexOutcome.findings.some((each) => collectFindingThreadIds(each).length > 0)

package/skills/autoconverge/workflow/converge.p2-advance.test.mjs

@@ -0,0 +1,202 @@
+import { test } from 'node:test';
+import { strict as assert } from 'node:assert';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
+
+const workflowDirectory = dirname(fileURLToPath(import.meta.url));
+const convergeSource = readFileSync(join(workflowDirectory, 'converge.mjs'), 'utf8');
+
+function functionBody(functionName) {
+  const functionStart = convergeSource.indexOf(`function ${functionName}(`);
+  assert.notEqual(functionStart, -1, `expected ${functionName} to exist`);
+  const nextFunctionStart = convergeSource.indexOf('\nfunction ', functionStart + 1);
+  const functionEnd = nextFunctionStart === -1 ? convergeSource.length : nextFunctionStart;
+  return convergeSource.slice(functionStart, functionEnd);
+}
+
+const productionModule = new Function(
+  `const SHA_COMPARISON_PREFIX_LENGTH = 7;\n` +
+    `${functionBody('normalizeShaForComparison')}\n` +
+    `${functionBody('isP2OnlyFindings')}\n` +
+    `${functionBody('nextPhaseAfterP2OnlyFix')}\n` +
+    `${functionBody('routeAfterP2OnlyFix')}\n` +
+    'return { isP2OnlyFindings, nextPhaseAfterP2OnlyFix, routeAfterP2OnlyFix };',
+)();
+
+const { isP2OnlyFindings, nextPhaseAfterP2OnlyFix, routeAfterP2OnlyFix } = productionModule;
+
+function finding(overrides) {
+  return {
+    file: 'a.py',
+    line: 1,
+    severity: 'P2',
+    category: 'bug',
+    title: 't',
+    detail: 'd',
+    replyToCommentId: null,
+    ...overrides,
+  };
+}
+
+function phaseBranch(phaseMarker) {
+  const phaseStart = convergeSource.indexOf(phaseMarker);
+  assert.notEqual(phaseStart, -1, `expected ${phaseMarker} to exist`);
+  const nextPhaseStart = convergeSource.indexOf('\n  if (phase === ', phaseStart + 1);
+  const phaseEnd = nextPhaseStart === -1 ? convergeSource.length : nextPhaseStart;
+  return convergeSource.slice(phaseStart, phaseEnd);
+}
+
+test('isP2OnlyFindings is false for an empty findings list', () => {
+  assert.equal(isP2OnlyFindings([]), false);
+});
+
+test('isP2OnlyFindings is true when every finding is severity P2', () => {
+  assert.equal(isP2OnlyFindings([finding(), finding({ file: 'b.py', line: 2 })]), true);
+});
+
+test('isP2OnlyFindings is false when a P1 is mixed in with P2 findings', () => {
+  assert.equal(isP2OnlyFindings([finding(), finding({ severity: 'P1' })]), false);
+});
+
+test('isP2OnlyFindings is false when every finding is severity P1', () => {
+  assert.equal(isP2OnlyFindings([finding({ severity: 'P1' })]), false);
+});
+
+test('isP2OnlyFindings is false when a finding is missing severity', () => {
+  assert.equal(isP2OnlyFindings([{ file: 'a.py', line: 1, category: 'bug' }]), false);
+});
+
+test('nextPhaseAfterP2OnlyFix advances CONVERGE to BUGBOT', () => {
+  assert.equal(nextPhaseAfterP2OnlyFix('CONVERGE'), 'BUGBOT');
+});
+
+test('nextPhaseAfterP2OnlyFix advances BUGBOT to COPILOT', () => {
+  assert.equal(nextPhaseAfterP2OnlyFix('BUGBOT'), 'COPILOT');
+});
+
+test('nextPhaseAfterP2OnlyFix advances COPILOT to CODEX', () => {
+  assert.equal(nextPhaseAfterP2OnlyFix('COPILOT'), 'CODEX');
+});
+
+test('nextPhaseAfterP2OnlyFix advances CODEX to FINALIZE', () => {
+  assert.equal(nextPhaseAfterP2OnlyFix('CODEX'), 'FINALIZE');
+});
+
+test('routeAfterP2OnlyFix re-converges when the fix moved HEAD', () => {
+  const route = routeAfterP2OnlyFix('aaa111', { newSha: 'bbb222' }, 'COPILOT');
+  assert.equal(route.didMoveHead, true);
+  assert.equal(route.fixedHead, 'bbb222');
+  assert.equal(route.nextPhase, 'CONVERGE');
+});
+
+test('routeAfterP2OnlyFix advances when HEAD is unchanged', () => {
+  const route = routeAfterP2OnlyFix('aaa111', { newSha: 'aaa111' }, 'COPILOT');
+  assert.equal(route.didMoveHead, false);
+  assert.equal(route.fixedHead, 'aaa111');
+  assert.equal(route.nextPhase, 'COPILOT');
+});
+
+test('nextPhaseAfterP2OnlyFix uses an in-function lookup map', () => {
+  const body = functionBody('nextPhaseAfterP2OnlyFix');
+  assert.match(body, /nextPhaseByCurrent/);
+  assert.match(body, /CONVERGE:\s*'BUGBOT'/);
+  assert.match(body, /BUGBOT:\s*'COPILOT'/);
+  assert.match(body, /COPILOT:\s*'CODEX'/);
+});
+
+test('applyP2OnlyFix runs applyFixes then detectFixProgress in order', () => {
+  const body = functionBody('applyP2OnlyFix');
+  const applyIndex = body.indexOf('applyFixes(head, findings, sourceLabel)');
+  const detectIndex = body.indexOf('detectFixProgress(fixResult, head, hadThreadBearingFinding)');
+  assert.notEqual(applyIndex, -1, 'expected applyFixes in applyP2OnlyFix');
+  assert.notEqual(detectIndex, -1, 'expected detectFixProgress in applyP2OnlyFix');
+  assert.ok(applyIndex < detectIndex, 'applyFixes must precede detectFixProgress');
+  assert.match(body, /collectFindingThreadIds/);
+});
+
+test('CONVERGE places the P2-only branch between standards-only and generic fix', () => {
+  const convergeBranch = phaseBranch("if (phase === 'CONVERGE')");
+  const standardsIndex = convergeBranch.indexOf('isStandardsOnlyRound(findings)');
+  const p2OnlyIndex = convergeBranch.indexOf('isP2OnlyFindings(findings)');
+  const genericFixIndex = convergeBranch.indexOf("finding(s) — applying fixes");
+  assert.notEqual(standardsIndex, -1, 'expected the standards-only branch');
+  assert.notEqual(p2OnlyIndex, -1, 'expected the P2-only branch');
+  assert.notEqual(genericFixIndex, -1, 'expected the generic fix branch');
+  assert.ok(standardsIndex < p2OnlyIndex, 'standards-only must precede P2-only');
+  assert.ok(p2OnlyIndex < genericFixIndex, 'P2-only must precede generic fix');
+});
+
+test('CONVERGE P2-only branch fixes once and routes via routeAfterP2OnlyFix', () => {
+  const convergeBranch = phaseBranch("if (phase === 'CONVERGE')");
+  const p2Start = convergeBranch.indexOf('isP2OnlyFindings(findings)');
+  const genericFixStart = convergeBranch.indexOf("finding(s) — applying fixes");
+  const p2Branch = convergeBranch.slice(p2Start, genericFixStart);
+  assert.match(p2Branch, /P2-only/);
+  assert.match(p2Branch, /applyP2OnlyFix\(head, findings, 'converge-round'/);
+  assert.match(p2Branch, /routeAfterP2OnlyFix\(head, p2Fix, advancePhase\)/);
+  assert.match(p2Branch, /nextPhaseAfterP2OnlyFix\('CONVERGE'\)/);
+  assert.match(p2Branch, /head = p2Route\.fixedHead/);
+  assert.match(p2Branch, /phase = p2Route\.nextPhase/);
+  assert.doesNotMatch(p2Branch, /head = null/);
+});
+
+test('BUGBOT P2-only branch routes through routeAfterP2OnlyFix', () => {
+  const bugbotBranch = phaseBranch("if (phase === 'BUGBOT')");
+  const standardsIndex = bugbotBranch.indexOf('isStandardsOnlyRound(bugbotOutcome.findings)');
+  const p2OnlyIndex = bugbotBranch.indexOf('isP2OnlyFindings(bugbotOutcome.findings)');
+  const genericFixIndex = bugbotBranch.indexOf('fixing and re-converging');
+  assert.ok(standardsIndex < p2OnlyIndex, 'standards-only must precede P2-only on BUGBOT');
+  assert.ok(p2OnlyIndex < genericFixIndex, 'P2-only must precede generic re-converge on BUGBOT');
+  const p2Branch = bugbotBranch.slice(p2OnlyIndex, genericFixIndex);
+  assert.match(p2Branch, /P2-only/);
+  assert.match(p2Branch, /nextPhaseAfterP2OnlyFix\('BUGBOT'\)/);
+  assert.match(p2Branch, /applyP2OnlyFix\(head, bugbotOutcome\.findings, 'bugbot'/);
+  assert.match(p2Branch, /routeAfterP2OnlyFix\(head, p2Fix, advancePhase\)/);
+  assert.match(p2Branch, /phase = p2Route\.nextPhase/);
+});
+
+test('COPILOT P2-only branch routes through routeAfterP2OnlyFix', () => {
+  const copilotBranch = phaseBranch("if (phase === 'COPILOT')");
+  const standardsIndex = copilotBranch.indexOf('isStandardsOnlyRound(roundFindings)');
+  const p2OnlyIndex = copilotBranch.indexOf('isP2OnlyFindings(roundFindings)');
+  const genericFixIndex = copilotBranch.indexOf('fixing and re-converging');
+  assert.ok(standardsIndex < p2OnlyIndex, 'standards-only must precede P2-only on COPILOT');
+  assert.ok(p2OnlyIndex < genericFixIndex, 'P2-only must precede generic re-converge on COPILOT');
+  const p2Branch = copilotBranch.slice(p2OnlyIndex, genericFixIndex);
+  assert.match(p2Branch, /P2-only/);
+  assert.match(p2Branch, /nextPhaseAfterP2OnlyFix\('COPILOT'\)/);
+  assert.match(p2Branch, /applyP2OnlyFix\(head, roundFindings, 'copilot'/);
+  assert.match(p2Branch, /routeAfterP2OnlyFix\(head, p2Fix, advancePhase\)/);
+  assert.match(p2Branch, /phase = p2Route\.nextPhase/);
+});
+
+test('CODEX P2-only branch routes through routeAfterP2OnlyFix and stamps codexCleanAt only when HEAD is stable', () => {
+  const codexBranch = phaseBranch("if (phase === 'CODEX')");
+  const standardsIndex = codexBranch.indexOf('isStandardsOnlyRound(codexOutcome.findings)');
+  const p2OnlyIndex = codexBranch.indexOf('isP2OnlyFindings(codexOutcome.findings)');
+  const genericFixIndex = codexBranch.indexOf('fixing and re-converging');
+  assert.ok(standardsIndex < p2OnlyIndex, 'standards-only must precede P2-only on CODEX');
+  assert.ok(p2OnlyIndex < genericFixIndex, 'P2-only must precede generic re-converge on CODEX');
+  const p2Branch = codexBranch.slice(p2OnlyIndex, genericFixIndex);
+  assert.match(p2Branch, /P2-only/);
+  assert.match(p2Branch, /nextPhaseAfterP2OnlyFix\('CODEX'\)/);
+  assert.match(p2Branch, /applyP2OnlyFix\(head, codexOutcome\.findings, 'codex'/);
+  assert.match(p2Branch, /routeAfterP2OnlyFix\(head, p2Fix, advancePhase\)/);
+  assert.match(p2Branch, /codexCleanAt = head/);
+  assert.match(p2Branch, /didMoveHead/);
+});
+
+test('generic fix branches still re-converge for mixed or P0/P1 findings', () => {
+  const bugbotBranch = phaseBranch("if (phase === 'BUGBOT')");
+  const genericStart = bugbotBranch.indexOf('fixing and re-converging');
+  const genericBranch = bugbotBranch.slice(genericStart);
+  assert.match(genericBranch, /phase = 'CONVERGE'/);
+  assert.match(genericBranch, /head = null/);
+
+  const copilotBranch = phaseBranch("if (phase === 'COPILOT')");
+  const copilotGenericStart = copilotBranch.indexOf('fixing and re-converging');
+  const copilotGeneric = copilotBranch.slice(copilotGenericStart);
+  assert.match(copilotGeneric, /phase = 'CONVERGE'/);
+  assert.match(copilotGeneric, /head = null/);
+});

package/skills/autoconverge/workflow/fixtures/wf_run/subagents/workflows/wf_881252e6-700/agent-a11d903476b803493.jsonl

@@ -1,2 +1,2 @@
-{"type": "user", "uuid": "a11d903476b803493-u", "message": {"role": "user", "content": "Return the structured result."}}
-{"type": "assistant", "uuid": "a11d903476b803493-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a11d903476b803493", "name": "StructuredOutput", "input": {"sha": "7c2f420c4d5b7c83aa47f93d99a0f1420e3373c4", "clean": false, "findings": [{"file": "src/exports/core/export_runner.py", "line": 96, "severity": "P2", "title": "New inline log string literal flagged by Magic-values rule", "detail": "Copilot (CodingGuidelineID 1000000, \"Magic values & configuration\"): the new log message at this line introduces a new string literal in production code. Prefer reusing an existing configured UI message (e.g. web_editor_config.ui_messages.msg_detected_version) instead of adding a new inline literal.", "replyToCommentId": 3407912224}, {"file": "src/web/services/os_generation_ssot.py", "line": 265, "severity": "P2", "title": "New inline warning string literal flagged by Magic-values rule", "detail": "Copilot (CodingGuidelineID 1000000, \"Magic values & configuration\"): read_current_version_name_or_none() adds a new inline warning string in production code. Per repo convention, extract this message into a shared config constant (in src/shared/web_automation/config/) so future callers reuse it consistently.", "replyToCommentId": 3407912234}], "blocker": null}}]}}
+{"type": "user", "uuid": "a11d903476b803493-u", "message": {"role": "user", "content": "Return the structured result."}}
+{"type": "assistant", "uuid": "a11d903476b803493-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a11d903476b803493", "name": "StructuredOutput", "input": {"sha": "7c2f420c4d5b7c83aa47f93d99a0f1420e3373c4", "clean": false, "findings": [{"file": "src/exports/core/export_runner.py", "line": 96, "severity": "P2", "title": "New inline log string literal flagged by Magic-values rule", "detail": "Copilot (CodingGuidelineID 1000000, \"Magic values & configuration\"): the new log message at this line introduces a new string literal in production code. Prefer reusing an existing configured UI message (e.g. web_editor_config.ui_messages.msg_detected_version) instead of adding a new inline literal.", "replyToCommentId": 3407912224}, {"file": "src/web/services/os_generation_ssot.py", "line": 265, "severity": "P2", "title": "New inline warning string literal flagged by Magic-values rule", "detail": "Copilot (CodingGuidelineID 1000000, \"Magic values & configuration\"): read_current_version_name_or_none() adds a new inline warning string in production code. Per repo convention, extract this message into a shared config constant (in src/shared/web_automation/config/) so future callers reuse it consistently.", "replyToCommentId": 3407912234}], "blocker": null}}]}}

package/skills/autoconverge/workflow/fixtures/wf_run/subagents/workflows/wf_881252e6-700/agent-a26213978adeef6fb.jsonl

@@ -1,2 +1,2 @@
-{"type": "user", "uuid": "a26213978adeef6fb-u", "message": {"role": "user", "content": "Return the structured result."}}
-{"type": "assistant", "uuid": "a26213978adeef6fb-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a26213978adeef6fb", "name": "StructuredOutput", "input": {"newSha": "620382f766c4731ba92eefeb30bdbb9d0bcd4c90", "pushed": true, "resolvedWithoutCommit": false, "summary": "Fixed all 11 Copilot findings in one commit (620382f7): renamed banned `result` to `skip_path` in test_resume_skip_export.py and added `-> None` return annotations to the test functions across test_resume_skip_export.py, test_stp_path_selection.py, test_version_export_guards.py, and test_import_isolation.py; all 9 affected tests pass; pushed to fix/example-feature, posted 11 inline replies, and all 11 review threads are resolved."}}]}}
+{"type": "user", "uuid": "a26213978adeef6fb-u", "message": {"role": "user", "content": "Return the structured result."}}
+{"type": "assistant", "uuid": "a26213978adeef6fb-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a26213978adeef6fb", "name": "StructuredOutput", "input": {"newSha": "620382f766c4731ba92eefeb30bdbb9d0bcd4c90", "pushed": true, "resolvedWithoutCommit": false, "summary": "Fixed all 11 Copilot findings in one commit (620382f7): renamed banned `result` to `skip_path` in test_resume_skip_export.py and added `-> None` return annotations to the test functions across test_resume_skip_export.py, test_stp_path_selection.py, test_version_export_guards.py, and test_import_isolation.py; all 9 affected tests pass; pushed to fix/example-feature, posted 11 inline replies, and all 11 review threads are resolved."}}]}}

package/skills/autoconverge/workflow/fixtures/wf_run/subagents/workflows/wf_881252e6-700/agent-a3def0d15ed9d9110.jsonl

@@ -1,2 +1,2 @@
-{"type": "user", "uuid": "a3def0d15ed9d9110-u", "message": {"role": "user", "content": "Return the structured result."}}
-{"type": "assistant", "uuid": "a3def0d15ed9d9110-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a3def0d15ed9d9110", "name": "StructuredOutput", "input": {"sha": "6a5169ef635ddb841e6f0465a309691ff77f033e", "clean": false, "blocker": null, "findings": [{"file": "src/exports/tests/test_resume_skip_export.py", "line": 35, "severity": "P2", "title": "Banned identifier `result` in test", "detail": "Naming guideline (CodingGuidelineID 1000000): newly introduced identifier `result` is banned; rename to a descriptive name such as `existing_apk_path` or `skip_path`.", "replyToCommentId": 3407883689}, {"file": "src/exports/tests/test_resume_skip_export.py", "line": 47, "severity": "P2", "title": "Banned identifier `result` in test", "detail": "Naming guideline (CodingGuidelineID 1000000): newly introduced identifier `result` is banned; rename to a descriptive name such as `existing_apk_path` or `skip_path`.", "replyToCommentId": 3407883707}, {"file": "src/logging/tests/test_import_isolation.py", "line": 33, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883713}, {"file": "src/logging/tests/test_import_isolation.py", "line": 43, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883717}, {"file": "src/exports/tests/test_version_export_guards.py", "line": 37, "severity": "P2", "title": "Missing return type annotation on async test", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added async test is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883723}, {"file": "src/exports/tests/test_version_export_guards.py", "line": 74, "severity": "P2", "title": "Missing return type annotation on async test", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added async test is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883727}, {"file": "src/exports/tests/test_stp_path_selection.py", "line": 19, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883731}, {"file": "src/exports/tests/test_stp_path_selection.py", "line": 31, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883736}, {"file": "src/exports/tests/test_stp_path_selection.py", "line": 43, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883740}, {"file": "src/exports/tests/test_resume_skip_export.py", "line": 21, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883749}, {"file": "src/exports/tests/test_resume_skip_export.py", "line": 38, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883755}]}}]}}
+{"type": "user", "uuid": "a3def0d15ed9d9110-u", "message": {"role": "user", "content": "Return the structured result."}}
+{"type": "assistant", "uuid": "a3def0d15ed9d9110-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a3def0d15ed9d9110", "name": "StructuredOutput", "input": {"sha": "6a5169ef635ddb841e6f0465a309691ff77f033e", "clean": false, "blocker": null, "findings": [{"file": "src/exports/tests/test_resume_skip_export.py", "line": 35, "severity": "P2", "title": "Banned identifier `result` in test", "detail": "Naming guideline (CodingGuidelineID 1000000): newly introduced identifier `result` is banned; rename to a descriptive name such as `existing_apk_path` or `skip_path`.", "replyToCommentId": 3407883689}, {"file": "src/exports/tests/test_resume_skip_export.py", "line": 47, "severity": "P2", "title": "Banned identifier `result` in test", "detail": "Naming guideline (CodingGuidelineID 1000000): newly introduced identifier `result` is banned; rename to a descriptive name such as `existing_apk_path` or `skip_path`.", "replyToCommentId": 3407883707}, {"file": "src/logging/tests/test_import_isolation.py", "line": 33, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883713}, {"file": "src/logging/tests/test_import_isolation.py", "line": 43, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883717}, {"file": "src/exports/tests/test_version_export_guards.py", "line": 37, "severity": "P2", "title": "Missing return type annotation on async test", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added async test is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883723}, {"file": "src/exports/tests/test_version_export_guards.py", "line": 74, "severity": "P2", "title": "Missing return type annotation on async test", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added async test is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883727}, {"file": "src/exports/tests/test_stp_path_selection.py", "line": 19, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883731}, {"file": "src/exports/tests/test_stp_path_selection.py", "line": 31, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883736}, {"file": "src/exports/tests/test_stp_path_selection.py", "line": 43, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883740}, {"file": "src/exports/tests/test_resume_skip_export.py", "line": 21, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883749}, {"file": "src/exports/tests/test_resume_skip_export.py", "line": 38, "severity": "P2", "title": "Missing return type annotation on test function", "detail": "Repository guideline (CodingGuidelineID 1000000 \u2014 Types): newly added test function is missing an explicit return type annotation. Add `-> None`.", "replyToCommentId": 3407883755}]}}]}}

package/skills/autoconverge/workflow/fixtures/wf_run/subagents/workflows/wf_881252e6-700/agent-a41f41b1b708ee3b7.jsonl

@@ -1,2 +1,2 @@
-{"type": "user", "uuid": "a41f41b1b708ee3b7-u", "message": {"role": "user", "content": "Return the structured result."}}
-{"type": "assistant", "uuid": "a41f41b1b708ee3b7-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a41f41b1b708ee3b7", "name": "StructuredOutput", "input": {"sha": "7c2f420c4d5b7c83aa47f93d99a0f1420e3373c4", "clean": true, "findings": [], "blocker": null}}]}}
+{"type": "user", "uuid": "a41f41b1b708ee3b7-u", "message": {"role": "user", "content": "Return the structured result."}}
+{"type": "assistant", "uuid": "a41f41b1b708ee3b7-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a41f41b1b708ee3b7", "name": "StructuredOutput", "input": {"sha": "7c2f420c4d5b7c83aa47f93d99a0f1420e3373c4", "clean": true, "findings": [], "blocker": null}}]}}

package/skills/autoconverge/workflow/fixtures/wf_run/subagents/workflows/wf_881252e6-700/agent-a758b880abecc3ff7.jsonl

@@ -1,2 +1,2 @@
-{"type": "user", "uuid": "a758b880abecc3ff7-u", "message": {"role": "user", "content": "Return the structured result."}}
-{"type": "assistant", "uuid": "a758b880abecc3ff7-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a758b880abecc3ff7", "name": "StructuredOutput", "input": {"newSha": "7c2f420c4d5b7c83aa47f93d99a0f1420e3373c4", "pushed": false, "resolvedWithoutCommit": true, "summary": "Both Copilot magic-value findings were already fixed at HEAD 7c2f420c (export_runner.py uses web_editor_config.ui_messages.msg_detected_version; os_generation_ssot.py uses os_generation_ssot_constants.unavailable_warning_template); posted inline replies and resolved both review threads (PRRT_kwDORiaSZc6JUqSw, PRRT_kwDORiaSZc6JUqS6)."}}]}}
+{"type": "user", "uuid": "a758b880abecc3ff7-u", "message": {"role": "user", "content": "Return the structured result."}}
+{"type": "assistant", "uuid": "a758b880abecc3ff7-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a758b880abecc3ff7", "name": "StructuredOutput", "input": {"newSha": "7c2f420c4d5b7c83aa47f93d99a0f1420e3373c4", "pushed": false, "resolvedWithoutCommit": true, "summary": "Both Copilot magic-value findings were already fixed at HEAD 7c2f420c (export_runner.py uses web_editor_config.ui_messages.msg_detected_version; os_generation_ssot.py uses os_generation_ssot_constants.unavailable_warning_template); posted inline replies and resolved both review threads (PRRT_kwDORiaSZc6JUqSw, PRRT_kwDORiaSZc6JUqS6)."}}]}}

package/skills/autoconverge/workflow/fixtures/wf_run/subagents/workflows/wf_881252e6-700/agent-a8897b89656b1bd16.jsonl

@@ -1,2 +1,2 @@
-{"type": "user", "uuid": "a8897b89656b1bd16-u", "message": {"role": "user", "content": "Return the structured result."}}
-{"type": "assistant", "uuid": "a8897b89656b1bd16-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a8897b89656b1bd16", "name": "StructuredOutput", "input": {"newSha": "7c2f420c4d5b7c83aa47f93d99a0f1420e3373c4", "pushed": true, "resolvedWithoutCommit": false, "summary": "Fixed both Copilot magic-value findings on PR #211: export_runner.py now reuses web_editor_config.ui_messages.msg_detected_version, and os_generation_ssot.py references a new os_generation_ssot_constants.unavailable_warning_template. Added a behavioral TDD test, committed (7c2f420c) and pushed; posted inline replies to both comments (3407912224, 3407912234) and resolved both review threads (PRRT_kwDORiaSZc6JUqSw, PRRT_kwDORiaSZc6JUqS6)."}}]}}
+{"type": "user", "uuid": "a8897b89656b1bd16-u", "message": {"role": "user", "content": "Return the structured result."}}
+{"type": "assistant", "uuid": "a8897b89656b1bd16-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_a8897b89656b1bd16", "name": "StructuredOutput", "input": {"newSha": "7c2f420c4d5b7c83aa47f93d99a0f1420e3373c4", "pushed": true, "resolvedWithoutCommit": false, "summary": "Fixed both Copilot magic-value findings on PR #211: export_runner.py now reuses web_editor_config.ui_messages.msg_detected_version, and os_generation_ssot.py references a new os_generation_ssot_constants.unavailable_warning_template. Added a behavioral TDD test, committed (7c2f420c) and pushed; posted inline replies to both comments (3407912224, 3407912234) and resolved both review threads (PRRT_kwDORiaSZc6JUqSw, PRRT_kwDORiaSZc6JUqS6)."}}]}}

package/skills/autoconverge/workflow/fixtures/wf_run/subagents/workflows/wf_881252e6-700/agent-abd463d744a1437bc.jsonl

@@ -1,2 +1,2 @@
-{"type": "user", "uuid": "abd463d744a1437bc-u", "message": {"role": "user", "content": "Return the structured result."}}
-{"type": "assistant", "uuid": "abd463d744a1437bc-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_abd463d744a1437bc", "name": "StructuredOutput", "input": {"sha": "6a5169ef635ddb841e6f0465a309691ff77f033e", "clean": true, "down": false, "findings": []}}]}}
+{"type": "user", "uuid": "abd463d744a1437bc-u", "message": {"role": "user", "content": "Return the structured result."}}
+{"type": "assistant", "uuid": "abd463d744a1437bc-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_abd463d744a1437bc", "name": "StructuredOutput", "input": {"sha": "6a5169ef635ddb841e6f0465a309691ff77f033e", "clean": true, "down": false, "findings": []}}]}}

package/skills/autoconverge/workflow/fixtures/wf_run/subagents/workflows/wf_881252e6-700/agent-ad19d027ae8ee1816.jsonl

@@ -1,2 +1,2 @@
-{"type": "user", "uuid": "ad19d027ae8ee1816-u", "message": {"role": "user", "content": "Return the structured result."}}
-{"type": "assistant", "uuid": "ad19d027ae8ee1816-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_ad19d027ae8ee1816", "name": "StructuredOutput", "input": {"sha": "620382f766c4731ba92eefeb30bdbb9d0bcd4c90", "clean": false, "findings": [{"file": "src/exports/core/export_runner.py", "line": 94, "severity": "P2", "title": "New inline log string literal in production code", "detail": "Copilot (CodingGuidelineID 1000000, Magic values & configuration): the new log message at this line introduces a new string literal in production code. Prefer reusing an existing configured UI message (e.g., web_editor_config.ui_messages.msg_detected_version) instead of adding a new inline literal here.", "replyToCommentId": 3407912224}, {"file": "src/web/services/os_generation_ssot.py", "line": 266, "severity": "P2", "title": "New inline warning string literal in read_current_version_name_or_none()", "detail": "Copilot (CodingGuidelineID 1000000, Magic values & configuration): read_current_version_name_or_none() adds a new inline warning string in production code. Per repo convention, extract this message into a shared config constant (in src/shared/web_automation/config/) so future callers reuse it consistently.", "replyToCommentId": 3407912234}], "blocker": null}}]}}
+{"type": "user", "uuid": "ad19d027ae8ee1816-u", "message": {"role": "user", "content": "Return the structured result."}}
+{"type": "assistant", "uuid": "ad19d027ae8ee1816-a", "message": {"role": "assistant", "content": [{"type": "tool_use", "id": "toolu_ad19d027ae8ee1816", "name": "StructuredOutput", "input": {"sha": "620382f766c4731ba92eefeb30bdbb9d0bcd4c90", "clean": false, "findings": [{"file": "src/exports/core/export_runner.py", "line": 94, "severity": "P2", "title": "New inline log string literal in production code", "detail": "Copilot (CodingGuidelineID 1000000, Magic values & configuration): the new log message at this line introduces a new string literal in production code. Prefer reusing an existing configured UI message (e.g., web_editor_config.ui_messages.msg_detected_version) instead of adding a new inline literal here.", "replyToCommentId": 3407912224}, {"file": "src/web/services/os_generation_ssot.py", "line": 266, "severity": "P2", "title": "New inline warning string literal in read_current_version_name_or_none()", "detail": "Copilot (CodingGuidelineID 1000000, Magic values & configuration): read_current_version_name_or_none() adds a new inline warning string in production code. Per repo convention, extract this message into a shared config constant (in src/shared/web_automation/config/) so future callers reuse it consistently.", "replyToCommentId": 3407912234}], "blocker": null}}]}}