fix: address final review nits (stale doc, test rigor, retry budget)

- sync-intake-to-roster.js: update parseIntakeIssue's docstring to list
  all fields it now returns (enrollment_repo/enrollment_issue_number
  were added without updating the comment).
- challenge-progression-conflict-practice.test.js: pass delayMs=0
  consistently, and tighten the first test's comment assertion so it
  can no longer pass via the fallback comment's text coincidentally
  also containing the PR number.
- challenge-progression.js: give GitHub's async mergeable_state
  computation a slightly larger window (5 attempts instead of 3, same
  2s spacing) before falling back to manual conflict-creation
  instructions, reducing false alarms under real latency.

Author: GitHub Workshop Bot

.github/scripts/__tests__/challenge-progression-conflict-practice.test.js

@@ -84,7 +84,7 @@ test('opens a branch, two conflicting edits, a PR, and comments the issue', asyn
 
   const issueComments = calls.filter((c) => c.method === 'POST' && c.route === '/repos/org/room/issues/11/comments');
   assert.equal(issueComments.length, 1);
-  assert.match(issueComments[0].body.body, /#99/);
+  assert.match(issueComments[0].body.body, /practice PR is ready/);
 });
 
 test('is idempotent: does nothing when a practice PR already exists in any state', async () => {
@@ -132,7 +132,7 @@ test('never throws: progression survives a seeding failure', async () => {
     throw new Error('boom: no network');
   };
 
-  await assert.doesNotReject(ensureMergeConflictPractice(11, request));
+  await assert.doesNotReject(ensureMergeConflictPractice(11, request, 0));
 });
 
 test('falls back to manual instructions when the practice PR never registers as conflicting', async () => {

.github/scripts/provisioning/sync-intake-to-roster.js

@@ -34,8 +34,9 @@ const { parseRoster, serializeRoster, findLearner, upsertLearner, isValidHandle
 const INTAKE_TITLE_PREFIX = '[ENROLL-INTAKE]';
 
 /**
- * Extract { github_handle, registered_at } from an intake issue, or null when
- * the issue is not a parseable intake record.
+ * Extract the learner handle, registration time, intake issue number, and
+ * enrollment issue reference (enrollment_repo/enrollment_issue_number) from an
+ * intake issue, or null when the issue is not a parseable intake record.
  */
 function parseIntakeIssue(issue) {
   if (!issue || typeof issue.title !== 'string') return null;

learning-room/.github/scripts/challenge-progression.js

@@ -388,7 +388,7 @@ const CONFLICT_BRANCH = 'challenge-7/conflict-practice';
 const CONFLICT_FILE = 'docs/welcome.md';
 const CONFLICT_ANCHOR = '<!-- challenge-7-conflict-anchor -->';
 const CONFLICT_PR_TITLE = 'Challenge 7 practice: resolve this merge conflict';
-const CONFLICT_VERIFY_ATTEMPTS = 3;
+const CONFLICT_VERIFY_ATTEMPTS = 5;
 const CONFLICT_VERIFY_DELAY_MS = 2000;
 
 async function findOpenOrPastPullRequest(branch, request = githubRequest) {