claude-dev-env 1.60.0 → 1.61.0

package/skills/autoconverge/workflow/converge.contract.test.mjs

@@ -14,8 +14,9 @@ const gotchasSource = readFileSync(
 function lensPromptBody(builderName) {
   const builderStart = convergeSource.indexOf(`function ${builderName}(`);
   assert.notEqual(builderStart, -1, `expected ${builderName} to exist`);
-  const nextBuilderStart = convergeSource.indexOf('\nfunction ', builderStart + 1);
-  const builderEnd = nextBuilderStart === -1 ? convergeSource.length : nextBuilderStart;
+  const nextBuilderMatch = /\n(?:async )?function /.exec(convergeSource.slice(builderStart + 1));
+  const builderEnd =
+    nextBuilderMatch === null ? convergeSource.length : builderStart + 1 + nextBuilderMatch.index;
   return convergeSource.slice(builderStart, builderEnd);
 }
 
@@ -67,8 +68,8 @@ test('gotchas doc states parallel lenses must avoid concurrent git operations',
   assert.match(gotchasSource, /fetch.*once.*before/i);
 });
 
-test('repair-convergence filters unresolved threads to bot authors and skips human threads', () => {
-  const repairPrompt = lensPromptBody('repairConvergence');
+test('repair-convergence edit step filters unresolved threads to bot authors and skips human threads', () => {
+  const repairPrompt = lensPromptBody('repairConvergenceEdit');
   assert.match(
     repairPrompt,
     /cursor.*claude.*copilot|copilot.*cursor.*claude|claude.*cursor.*copilot/is,
@@ -81,8 +82,8 @@ test('repair-convergence filters unresolved threads to bot authors and skips hum
   );
 });
 
-test('repair-convergence no longer instructs resolving every unresolved thread without an author filter', () => {
-  const repairPrompt = lensPromptBody('repairConvergence');
+test('repair-convergence edit step no longer instructs resolving every unresolved thread without an author filter', () => {
+  const repairPrompt = lensPromptBody('repairConvergenceEdit');
   assert.doesNotMatch(
     repairPrompt,
     /fetch every thread where isResolved is false/,
@@ -182,25 +183,213 @@ test('the CONVERGE branch re-resolves HEAD from GitHub on every entry', () => {
   assert.notEqual(resolveHeadIndex, -1, 'expected CONVERGE to re-resolve HEAD via resolveHead()');
 });
 
-test('fix prompt resolves threads by PRRT thread node id looked up from the comment databaseId', () => {
-  const fixPrompt = lensPromptBody('applyFixes');
-  assert.match(fixPrompt, /PRRT/, 'expected the thread node id form (PRRT_...) to be named');
+test('fix edit prompt resolves threads by PRRT thread node id looked up from the comment databaseId', () => {
+  const editPrompt = lensPromptBody('applyFixesEdit');
+  assert.match(editPrompt, /PRRT/, 'expected the thread node id form (PRRT_...) to be named');
   assert.match(
-    fixPrompt,
+    editPrompt,
     /databaseId/,
     'expected the GraphQL lookup matching comment databaseId to be named',
   );
   assert.match(
-    fixPrompt,
+    editPrompt,
     /not the numeric comment id/,
     'expected an explicit guard against passing the numeric comment id to resolve_thread',
   );
 });
 
-test('fix prompt does not pass the numeric comment id straight to resolve_thread', () => {
+test('fix edit prompt does not pass the numeric comment id straight to resolve_thread', () => {
   assert.doesNotMatch(
-    lensPromptBody('applyFixes'),
+    lensPromptBody('applyFixesEdit'),
     /then resolve that thread \(use the github MCP pull_request_review_write/,
     'resolve_thread and resolveReviewThread require a PRRT_... thread node id, not the comment id',
   );
 });
+
+test('the fix flow spawns a code-verifier step between the edit step and the commit step', () => {
+  const applyFixesBody = lensPromptBody('applyFixes');
+  const editIndex = applyFixesBody.indexOf('applyFixesEdit(');
+  const verifyIndex = applyFixesBody.indexOf('verifyFixesInWorkingTree(');
+  const commitIndex = applyFixesBody.indexOf('commitVerifiedFixes(');
+  assert.notEqual(editIndex, -1, 'expected applyFixes to call the edit step');
+  assert.notEqual(verifyIndex, -1, 'expected applyFixes to call the verify step');
+  assert.notEqual(commitIndex, -1, 'expected applyFixes to call the commit step');
+  assert.ok(
+    editIndex < verifyIndex && verifyIndex < commitIndex,
+    'expected the order edit -> verify -> commit so the verifier verdict binds the fixed working tree',
+  );
+});
+
+function constantBody(constantName) {
+  const constantStart = convergeSource.indexOf(`const ${constantName} =`);
+  assert.notEqual(constantStart, -1, `expected ${constantName} to exist`);
+  const nextConstantStart = convergeSource.indexOf('\nconst ', constantStart + 1);
+  const constantEnd = nextConstantStart === -1 ? convergeSource.length : nextConstantStart;
+  return convergeSource.slice(constantStart, constantEnd);
+}
+
+test('the shared verdict-fence steps name the binding-hash command and the verdict fence', () => {
+  const fenceSteps = constantBody('VERDICT_FENCE_STEPS');
+  assert.match(fenceSteps, /--manifest-hash/, 'expected the binding-hash command to be named');
+  assert.match(
+    fenceSteps,
+    /verification_verdict_store\.py/,
+    'expected the verdict-store script that computes the binding hash to be named',
+  );
+  assert.match(fenceSteps, /```verdict/, 'expected the verdict fence to be specified');
+  assert.match(fenceSteps, /manifest_sha256/, 'expected the verdict fence to carry manifest_sha256');
+});
+
+test('every verify step reuses the shared verdict-fence steps, uses code-verifier, and forbids edits', () => {
+  for (const verifyFunctionName of [
+    'verifyFixesInWorkingTree',
+    'verifyRepairChanges',
+    'verifyHardeningChanges',
+  ]) {
+    const verifyBody = lensPromptBody(verifyFunctionName);
+    assert.match(
+      verifyBody,
+      /VERDICT_FENCE_STEPS/,
+      `expected ${verifyFunctionName} to reuse the shared VERDICT_FENCE_STEPS`,
+    );
+    assert.match(
+      verifyBody,
+      /agentType:\s*'code-verifier'/,
+      `expected ${verifyFunctionName} to spawn the code-verifier agent type`,
+    );
+    assert.doesNotMatch(
+      verifyBody,
+      /schema:/,
+      `expected ${verifyFunctionName} to pass no schema so its verdict fence stays as assistant text`,
+    );
+    assert.match(
+      verifyBody,
+      /do no edits|make no edits|not edit|no file edits/i,
+      `expected ${verifyFunctionName} to be told to make no edits`,
+    );
+  }
+});
+
+test('the commit step is instructed to make no further file edits', () => {
+  const commitBody = lensPromptBody('commitVerifiedFixes');
+  assert.match(
+    commitBody,
+    /no (?:further |additional )?(?:file )?edits|do not edit|make no edits/i,
+    'expected the commit step to forbid further edits so the verified surface stays bound',
+  );
+  assert.match(
+    commitBody,
+    /agentType:\s*'clean-coder'/,
+    'expected the commit step to use clean-coder',
+  );
+});
+
+test('the repair flow spawns a code-verifier step between the edit step and the commit step', () => {
+  const repairBody = lensPromptBody('repairConvergence');
+  const editIndex = repairBody.indexOf('repairConvergenceEdit(');
+  const verifyIndex = repairBody.indexOf('verifyRepairChanges(');
+  const commitIndex = repairBody.indexOf('commitRepairFixes(');
+  assert.notEqual(editIndex, -1, 'expected repairConvergence to call the edit step');
+  assert.notEqual(verifyIndex, -1, 'expected repairConvergence to call the verify step');
+  assert.notEqual(commitIndex, -1, 'expected repairConvergence to call the commit step');
+  assert.ok(
+    editIndex < verifyIndex && verifyIndex < commitIndex,
+    'expected edit -> verify -> commit so the verifier verdict binds the repaired working tree',
+  );
+  assert.match(
+    repairBody,
+    /verdictPassed\(/,
+    'expected the verify verdict to gate the repair commit step',
+  );
+});
+
+test('the standards-deferral flow spawns a code-verifier step between the edit step and the commit step', () => {
+  const standardsBody = lensPromptBody('spawnStandardsFollowUp');
+  const editIndex = standardsBody.indexOf('standardsFollowUpEdit(');
+  const verifyIndex = standardsBody.indexOf('verifyHardeningChanges(');
+  const commitIndex = standardsBody.indexOf('commitHardeningPr(');
+  assert.notEqual(editIndex, -1, 'expected spawnStandardsFollowUp to call the edit step');
+  assert.notEqual(verifyIndex, -1, 'expected spawnStandardsFollowUp to call the verify step');
+  assert.notEqual(commitIndex, -1, 'expected spawnStandardsFollowUp to call the commit step');
+  assert.ok(
+    editIndex < verifyIndex && verifyIndex < commitIndex,
+    'expected edit -> verify -> commit so the verifier verdict binds the hardening working tree',
+  );
+  assert.match(
+    standardsBody,
+    /verdictPassed\(/,
+    'expected the verify verdict to gate the hardening commit step',
+  );
+});
+
+test('the repair and hardening commit steps forbid further edits and use clean-coder', () => {
+  for (const commitFunctionName of ['commitRepairFixes', 'commitHardeningPr']) {
+    const commitBody = lensPromptBody(commitFunctionName);
+    assert.match(
+      commitBody,
+      /no (?:further |additional )?(?:file )?edits|do not edit|make no edits/i,
+      `expected ${commitFunctionName} to forbid further edits so the verified surface stays bound`,
+    );
+    assert.match(
+      commitBody,
+      /agentType:\s*'clean-coder'/,
+      `expected ${commitFunctionName} to use clean-coder`,
+    );
+  }
+});
+
+test('the standards-deferral edit step stages the hardening change without committing', () => {
+  const editBody = lensPromptBody('standardsFollowUpEdit');
+  assert.match(
+    editBody,
+    /do not commit and do not push|NO commit and NO push|Do NOT commit/i,
+    'expected the standards edit step to leave the hardening change uncommitted',
+  );
+  assert.match(
+    editBody,
+    /agentType:\s*'clean-coder'/,
+    'expected the standards edit step to use clean-coder',
+  );
+});
+
+test('spawnStandardsFollowUp reports whether a hardening PR opened on every path', () => {
+  const body = lensPromptBody('spawnStandardsFollowUp');
+  const falseReturns = body.match(/hardeningPrOpened:\s*false/g) || [];
+  assert.ok(
+    falseReturns.length >= 2,
+    'expected both skip paths (no hardening staged, verify failed) to return hardeningPrOpened:false',
+  );
+  assert.match(
+    body,
+    /hardeningPrOpened:\s*true/,
+    'expected the commit path to return hardeningPrOpened:true',
+  );
+});
+
+test('the standards-deferral note names the hardening PR only when one opened', () => {
+  const noteBody = lensPromptBody('standardsDeferralNote');
+  assert.match(
+    noteBody,
+    /environment-hardening PR/,
+    'expected the opened-PR branch to name the hardening PR',
+  );
+  assert.match(
+    noteBody,
+    /no environment-hardening PR/i,
+    'expected the skip branch to state no hardening PR was opened',
+  );
+});
+
+test('both standards-deferral call sites build standardsNote from the spawnStandardsFollowUp outcome', () => {
+  const callSiteUses = convergeSource.match(/standardsNote = standardsDeferralNote\(/g) || [];
+  assert.equal(
+    callSiteUses.length,
+    2,
+    'expected both standards-deferral call sites to build standardsNote via standardsDeferralNote(...)',
+  );
+  assert.doesNotMatch(
+    convergeSource,
+    /standardsNote = `\$\{[^}]+\} code-standard finding\(s\) deferred to a follow-up fix issue plus an environment-hardening PR/,
+    'expected no unconditional hardening-PR claim in standardsNote',
+  );
+});