@@ -12,7 +12,7 @@ Two components live here, and they are built to work together:
 
 | Folder | What it is | Version |
 | --- | --- | --- |
-| [`wpcredits-program-manager/`](wpcredits-program-manager/) | The plugin. All of the program logic: roles, access levels, the Airtable sync, the Report Cards, the call calendar, the feedback surveys, email. | 1.117.3 |
+| [`wpcredits-program-manager/`](wpcredits-program-manager/) | The plugin. All of the program logic: roles, access levels, the Airtable sync, the Report Cards, the call calendar, the feedback surveys, email. | 1.117.4 |
 | [`wpcredits-theme/`](wpcredits-theme/) | The block theme. The landing page, the branded login, and the skin that turns the plugin's markup into the dashboard people actually use. Frames every page with the [official wordpress.org header and footer](../WordPress.org%20Global%20Header%20and%20Footer). | 1.24.7 |
 
 The theme is the front end for the plugin and does not add program data or behaviour of its own.
 
@@ -362,6 +362,10 @@ public static function has( $id ) { return isset( $GLOBALS['inst_rows'][ (string
 class WPCPM_Roster_Index {
 	const NEVER_SHOWN = array( 'SPAM', 'Duplicated' );
 	public static function read( $id ) { return isset( $GLOBALS['rosters'][ (string) $id ] ) ? $GLOBALS['rosters'][ (string) $id ] : array( 'v' => 4, 'read' => 0, 'rows' => array() ); }
+	// The real predicate, word for word: a tracked student is waiting only with neither a mentor
+	// on the Students row nor a joined report record (WPCredits#222). The roster's groups() and
+	// programs() below share it, which is what keeps the two counts from drifting apart again.
+	public static function is_waiting( array $row ) { return empty( $row['reports'] ) && empty( $row['has_mentor'] ); }
 	public static function rows( $id ) { return self::read( $id )['rows']; }
 }
 class WPCPM_Countries {
@@ -854,6 +858,16 @@ function capture( $fn ) { ob_start(); call_user_func( $fn ); return (string) ob_
 ck( 'one row per institution with somebody in progress', array_column( $programs['rows'], 'record' ), array( $A ) );
 ck( 'with the count, the breakdown by label, the waiting and the distinct mentors', array( $programs['rows'][0]['in_progress'], $programs['rows'][0]['by_status'], $programs['rows'][0]['waiting'], $programs['rows'][0]['mentors'] ), array( 3, array( 'WordPress Credits Program 150h' => 1, 'Developer Track' => 1, 'WordPress Credits Program 50h' => 1 ), 1, 1 ) );
 ck( 'the earliest and latest end among those in progress', array( $programs['rows'][0]['earliest'], $programs['rows'][0]['latest'] ), array( '2026-11-30', '2026-12-15' ) );
+
+// A mentor on the Students row whose report record the email join never found (WPCredits#222):
+// the roster files her under Current, so this count must not call her waiting - and the
+// Mentors column must not read 0 beside her either. The index carries no mentor ID, so a
+// nameless assigned mentor counts as one mentor of her own.
+$GLOBALS['rosters'][ $A ]['rows'][] = array( 'record_id' => 'recS0000000000008', 'status' => 'In Sensei', 'start' => $in_early, 'end' => '2026-12-10', 'reports' => array(), 'mentor_name' => '', 'has_mentor' => true );
+$with_222 = WPCPM_Administrators_Cards::programs();
+ck( 'a mentored student the join missed is in progress and not waiting', array( $with_222['rows'][0]['in_progress'], $with_222['rows'][0]['waiting'] ), array( 4, 1 ) );
+ck( 'and counts as a mentor though the join never brought a name', $with_222['rows'][0]['mentors'], 2 );
+array_pop( $GLOBALS['rosters'][ $A ]['rows'] );
 ck( 'the agreement state and the latest report state ride along', array( $programs['rows'][0]['agreement'], $programs['rows'][0]['report'] ), array( 'accepted', 'draft' ) );
 ck( 'an institution with nobody in progress is counted, not listed', $programs['quiet'], 1 );
 // The oldest non-zero read, not the newest: "how old are these numbers" is honestly answered
 
@@ -548,9 +548,17 @@ public static function roster_url( $cohort = '' ) {
 ck( 'Ada is in Current', has( group_rows( $html, 'current' ), 'Ada Example' ), true );
 ck( 'so is Bo', has( group_rows( $html, 'current' ), 'Bo Example' ), true );
 ck( 'Bo is not waiting', has( group_rows( $html, 'waiting' ), 'Bo Example' ), false );
-ck( 'and his row says a mentor is assigned but the report record is missing',
-	has( group_rows( $html, 'current' ), 'A mentor is assigned. The report record has not been created yet.' ), true );
+// "Has not reached this page" rather than "has not been created": in the #222 shape the record
+// exists and the address join missed it, and telling a school it was never created is untrue.
+ck( 'and his row says a mentor is assigned but the report record has not reached the page',
+	has( group_rows( $html, 'current' ), 'A mentor is assigned. The report record has not reached this page yet.' ), true );
+ck( 'the old sentence, which claimed the record was never created, is gone', has( $html, 'has not been created yet' ), false );
 ck( 'Cy is waiting with no mentor at all', has( group_rows( $html, 'waiting' ), 'No mentor yet.' ), true );
+// The two notes state the rule the groups are built on, both signals named: a report record
+// with no mentor link left on the Students row is still Current, so "with a mentor assigned"
+// alone would promise a name the mentor cell then denies.
+ck( 'the Current note names both signals', has( $html, 'On the program now, with a mentor assigned or a report record already created.' ), true );
+ck( 'and the Waiting note says neither is there', has( $html, 'Signed up, with no mentor assigned and no report record yet.' ), true );
 // Every group is a disclosure, so the same chevron is on every row of the page. The two a
 // school works from start open; the two it reads rarely start closed. The group, not its
 // students: since the roster became the Mentor Report Card's component every student is a
@@ -672,8 +680,18 @@ public static function roster_url( $cohort = '' ) {
  * @param string $group Which group's first card to read.
  * @return string|null The cell's text, or null when the card has no hours row at all.
  */
-function hours_of( $html, $group = 'current' ) {
-	if ( ! preg_match( '/wpcpm-roster__row--reports-hours">.*?<td class="wpcpm-mentee__value"[^>]*>(.*?)<\/td>/s', group_rows( $html, $group ), $m ) ) {
+function hours_of( $html, $group = 'current', $name = '' ) {
+	$rows = group_rows( $html, $group );
+
+	// One student's card, when asked for by name, rather than whichever card comes first.
+	if ( '' !== $name ) {
+		$rows = '';
+		foreach ( explode( '<details class="wpcpm-mentee__disclosure', group_rows( $html, $group ) ) as $card ) {
+			if ( false !== strpos( $card, '>' . $name . '<' ) ) { $rows = $card; }
+		}
+	}
+
+	if ( ! preg_match( '/wpcpm-roster__row--reports-hours">.*?<td class="wpcpm-mentee__value"[^>]*>(.*?)<\/td>/s', $rows, $m ) ) {
 		return null;
 	}
 
@@ -713,7 +731,8 @@ function ada_program( array $changes = array() ) {
 // target comes from has to fall back to the Students row's own status.
 $GLOBALS['index'][ $A ]['rows']['recSTU00000000002']['hours'] = '12';
 
-ck( 'a student with no account gets their hours off the index', has( group_rows( render(), 'current' ), '12 of 150' ), true );
+ck( 'a student with no account gets their hours off the index', hours_of( render(), 'current', 'Bo Example' ), '12 of 150' );
+ck( 'and they are his, not the first card\'s', hours_of( render(), 'current', 'Ada Example' ), 'Not recorded' );
 
 // The 50-hour track is a different denominator, from the same map, and the value is fractional:
 // 6.2 is a real count on the live base, and an intval() anywhere would print 6.
 
@@ -451,5 +451,13 @@ function row( $record_id, $email, array $extra = array() ) {
 ck( 'with the prefix escaped', $GLOBALS['queries'][0]['args'][0], 'wpcpm\\_roster\\_%' );
 ck( 'against the options table', false !== strpos( $GLOBALS['queries'][0]['sql'], 'wp_options' ), true );
 
+echo "\n=== is_waiting(): either signal is a mentor (WPCredits#222) ===\n";
+
+ck( 'the predicate is the index\'s, so groups() and the Administrators count read one rule', method_exists( 'WPCPM_Roster_Index', 'is_waiting' ), true );
+ck( 'neither a mentor nor a report record is waiting', WPCPM_Roster_Index::is_waiting( array( 'has_mentor' => false, 'reports' => array() ) ), true );
+ck( 'a mentor on the Students row is not, though the join found no report', WPCPM_Roster_Index::is_waiting( array( 'has_mentor' => true, 'reports' => array() ) ), false );
+ck( 'a joined report record is not, though the Students row names no mentor', WPCPM_Roster_Index::is_waiting( array( 'has_mentor' => false, 'reports' => array( 'recR000000000001' ) ) ), false );
+ck( 'a row from before the key existed falls back to the report alone', WPCPM_Roster_Index::is_waiting( array( 'reports' => array() ) ), true );
+
 printf( "\n%s (%d checks)\n", $fail ? sprintf( '%d FAILURE(S)', $fail ) : 'ALL PASS', $total );
 exit( $fail ? 1 : 0 );
@@ -738,8 +738,8 @@ Layout, for a settled institution: identity header from the pipeline index, fall
 
 | Group | Rows | Note |
 | --- | --- | --- |
-| Current | status in `tracked_statuses()['active']` and `reports` non-empty | the account-bearing students |
-| Waiting for a mentor | status in `['active']` and `reports` empty | imported and legacy rows alike, with `has_mentor` so "a mentor is assigned but no report record exists" reads differently from "no mentor yet" |
+| Current | status in `tracked_statuses()['active']` and a mentor signal: `has_mentor` (the link on the Students row) or `reports` non-empty | since 1.117.4 (WPCredits#222): the reports list is joined by email alone, so a student whose two rows carry different addresses arrived with a mentor and an empty list and was called waiting while her own card named her mentor |
+| Waiting for a mentor | status in `['active']` with neither `has_mentor` nor a `reports` row, `WPCPM_Roster_Index::is_waiting()`, the one predicate the Administrators Dashboard's count reads too | imported and legacy rows alike; the mentor cell still tells "a mentor is assigned, the report record has not reached this page yet" apart from "no mentor yet" |
 | Finished | status in `['past']` | collapsed |
 | Did not start | `Not moving forward`, `Fail`, empty | counted, collapsed, named honestly: the applicants who never began, which is the question institutions ask first |
 
 
@@ -78,7 +78,7 @@ From `WPCPM_Institution_Request::open()`: institution, the note, opened date, ag
 Two parts from one calculation, `WPCPM_Administrators_Dashboard::programs()`, which walks every institution in the pipeline index with a roster and, for each roster row, reads only `status`, `start`, `end` and `mentor`:
 
 - **Totals strip, one tile per track** (`WPCPM_Program::track()`: `150h`, `50h`, `dev`): students in progress, signed up this semester, finished this semester. "This semester" is `WPCPM_Cohort::current()`; the numbers come from `WPCPM_Cohort::participation()` per institution, summed, so the strip and the semester report count the same thing the same way.
-- **One row per institution with at least one student in progress**, sorted by institution name: institution (a link to its dashboard through the switcher), students in progress with a breakdown by status label, mentors assigned (distinct mentor record IDs across the in-progress rows) and rows waiting for a mentor, earliest and latest end date among in-progress rows, agreement summary state (`WPCPM_Institution_Agreement::summary()`), latest semester report state (`draft`, `approved`, or none). Institutions with nobody in progress are counted in one closing line ("12 more institutions with no student in progress") and not listed.
+- **One row per institution with at least one student in progress**, sorted by institution name: institution (a link to its dashboard through the switcher), students in progress with a breakdown by status label, mentors assigned (distinct mentor names across the in-progress rows, plus one for each row whose mentor link the reports join never named, since the index carries no mentor ID) and rows waiting for a mentor (`WPCPM_Roster_Index::is_waiting()`, the roster's own rule: neither a mentor link nor a joined report record, since 1.117.4), earliest and latest end date among in-progress rows, agreement summary state (`WPCPM_Institution_Agreement::summary()`), latest semester report state (`draft`, `approved`, or none). Institutions with nobody in progress are counted in one closing line ("12 more institutions with no student in progress") and not listed.
 
 The calculation reads options only, never Airtable, and prints the roster read time it found, the way the roster strip does, so a manager knows how old the numbers are.
 
 
@@ -274,16 +274,7 @@ public static function groups( $record_id, $cohort = '' ) {
 			}
 
 			if ( in_array( $status, $active, true ) ) {
-				// **Either signal is a mentor.** `reports` is the Students Reports rows behind
-				// this student, and the automation that creates one fires on a mentor being
-				// assigned; `has_mentor` is the assignment itself, read off the Students row.
-				// The reports list is joined by email alone, so a student whose two rows carry
-				// different addresses, or whose address is filed under a second institution,
-				// arrives here with a mentor and an empty list. Grouping on `reports` alone put
-				// that student under "Waiting for a mentor" while her own card named her mentor
-				// (WPCredits#222). The mentor cell still tells "no report record yet" apart.
-				$waiting = empty( $row['reports'] ) && empty( $row['has_mentor'] );
-				$groups[ $waiting ? 'waiting' : 'current' ][ $key ] = $row;
+				$groups[ self::is_waiting( $row ) ? 'waiting' : 'current' ][ $key ] = $row;
 				continue;
 			}
 
@@ -298,6 +289,30 @@ public static function groups( $record_id, $cohort = '' ) {
 		return $groups;
 	}
 
+	/**
+	 * Whether a tracked current student is still waiting for a mentor.
+	 *
+	 * **Either signal is a mentor.** `reports` is the Students Reports rows behind this
+	 * student, and the automation that creates one fires on a mentor being assigned;
+	 * `has_mentor` is the assignment itself, read off the Students row. The reports list is
+	 * joined by email alone, so a student whose two rows carry different addresses, or whose
+	 * address is filed under a second institution, arrives here with a mentor and an empty
+	 * list. Grouping on `reports` alone put that student under "Waiting for a mentor" while
+	 * her own card named her mentor (WPCredits#222). Waiting is having neither.
+	 *
+	 * One predicate, here, because `groups()` and the Administrators Dashboard's "Waiting for
+	 * a mentor" count both answer this question, and two copies of the rule is how two screens
+	 * come to disagree. The mentor cell still tells "a mentor is assigned, no report record has
+	 * reached this page" apart from "no mentor yet"; that is the screen's job, not this one's.
+	 *
+	 * @param array $row A row in the index shape. A row from before `has_mentor` existed reads
+	 *                   as having no mentor link, which is the old rule and the safe one.
+	 * @return bool
+	 */
+	public static function is_waiting( array $row ) {
+		return empty( $row['reports'] ) && empty( $row['has_mentor'] );
+	}
+
 	/**
 	 * The institution's students whose Students row the site could not find.
 	 *
 
@@ -992,15 +992,22 @@ public static function programs() {
 						++$tracks[ $track ]['in_progress'];
 					}
 
-					// The roster's rule (`WPCPM_Roster_Index::groups()`), so the two counts agree.
-					if ( empty( $row['reports'] ) && empty( $row['has_mentor'] ) ) {
+					// The roster's own predicate, so this count and `groups()` cannot disagree.
+					if ( WPCPM_Roster_Index::is_waiting( $row ) ) {
 						++$waiting;
 					}
 
 					$mentor = isset( $row['mentor_name'] ) ? trim( (string) $row['mentor_name'] ) : '';
 
 					if ( '' !== $mentor ) {
 						$mentors[ $mentor ] = true;
+					} elseif ( ! empty( $row['has_mentor'] ) ) {
+						// A mentor on the Students row whose name never arrived: the name rides on
+						// the reports join, and the join missed (WPCredits#222). The index holds no
+						// mentor ID, so the row counts as one mentor of its own. "1 in progress, 0
+						// mentors, 0 waiting" is a contradiction; two such rows sharing a mentor is
+						// the rarer error, and the address fix removes it.
+						$mentors[ 'row:' . ( isset( $row['record_id'] ) ? (string) $row['record_id'] : (string) count( $mentors ) ) ] = true;
 					}
 
 					if ( '' !== $end ) {
 
@@ -723,8 +723,8 @@ private static function render_group( $key, $label, array $rows, array $columns,
 	 */
 	private static function group_note( $key ) {
 		$notes = array(
-			'current'     => __( 'On the program now, with a mentor assigned.', 'wpcredits-program-manager' ),
-			'waiting'     => __( 'Signed up, with no mentor assigned yet.', 'wpcredits-program-manager' ),
+			'current'     => __( 'On the program now, with a mentor assigned or a report record already created.', 'wpcredits-program-manager' ),
+			'waiting'     => __( 'Signed up, with no mentor assigned and no report record yet.', 'wpcredits-program-manager' ),
 			'finished'    => __( 'Mentoring has finished. Their details are kept for reference.', 'wpcredits-program-manager' ),
 			'not_started' => __( 'Applicants who never began the program.', 'wpcredits-program-manager' ),
 		);
@@ -1199,7 +1199,10 @@ private static function days_cell( $end ) {
 	 *
 	 * "A mentor is assigned" and "no mentor yet" are different answers to the school's
 	 * question, and design spec 7.5 asks for both: the first is waiting on the automation
-	 * that creates the report record, the second is waiting on the program.
+	 * that creates the report record, or on the sync's join by email finding one that exists
+	 * under another address (WPCredits#222); the second is waiting on the program. Either way
+	 * the record has not reached this page, and that is what the sentence says: "has not been
+	 * created" claimed to know which, and for the #222 shape it was wrong.
 	 *
 	 * @param string $name       The mentor's name from the cached card, if there is one.
 	 * @param bool   $has_mentor  Whether the Students row links a mentor.
@@ -1226,7 +1229,7 @@ private static function mentor_cell( $name, $has_mentor, $has_report = false ) {
 			esc_html(
 				$has_report
 					? __( 'A mentor is assigned. Their name has not reached this page yet.', 'wpcredits-program-manager' )
-					: __( 'A mentor is assigned. The report record has not been created yet.', 'wpcredits-program-manager' )
+					: __( 'A mentor is assigned. The report record has not reached this page yet.', 'wpcredits-program-manager' )
 			)
 		);
 	}