@playcademy/sandbox 0.3.17-beta.33 → 0.3.17-beta.35

package/dist/cli.js

@@ -1330,7 +1330,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.3.17-beta.33",
+    version: "0.3.17-beta.35",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -30433,6 +30433,31 @@ function resolveAdminEventTime(data) {
   }
   return toAttributionEventTime(data.date);
 }
+function validateMasteryAdjustment(delta, currentMastered, masterableUnits) {
+  if (delta < 0 && currentMastered + delta < 0) {
+    throw new ValidationError(`Adjustment would go below 0. Current: ${currentMastered}, adjustment: ${delta}`);
+  }
+  if (delta < 0 && typeof masterableUnits === "number" && masterableUnits > 0 && currentMastered > masterableUnits && currentMastered + delta > masterableUnits) {
+    const minDelta = masterableUnits - currentMastered;
+    throw new ValidationError(`Adjustment must reduce mastery to at most ${masterableUnits}. Current: ${currentMastered}/${masterableUnits}, minimum adjustment: ${minDelta}`);
+  }
+  if (delta > 0 && typeof masterableUnits === "number" && masterableUnits > 0) {
+    if (currentMastered >= masterableUnits) {
+      throw new ValidationError(`Mastery is already at maximum (${currentMastered}/${masterableUnits}). Only negative adjustments are allowed.`);
+    }
+    if (currentMastered + delta > masterableUnits) {
+      const remaining = masterableUnits - currentMastered;
+      throw new ValidationError(`Adjustment would exceed maximum. Current: ${currentMastered}/${masterableUnits}, max adjustment: +${remaining}`);
+    }
+  }
+}
+function compareEnrollmentsByRecency(a, b) {
+  const dateCompare = (b.beginDate ?? "").localeCompare(a.beginDate ?? "");
+  if (dateCompare !== 0) {
+    return dateCompare;
+  }
+  return (b.dateLastModified ?? "").localeCompare(a.dateLastModified ?? "");
+}
 var init_timeback_admin_util = __esm(() => {
   init_errors();
 });
@@ -30785,17 +30810,6 @@ class TimebackAdminService {
     }
     return this.deps.timeback;
   }
-  async recordCourseCompletionHistory(client, data) {
-    await client.recordAdminCourseCompletionChange(data).catch((error) => {
-      logger16.error("Failed to record admin course completion history event", {
-        gameId: data.gameId,
-        courseId: data.courseId,
-        studentId: data.studentId,
-        action: data.action,
-        error: error instanceof Error ? error.message : String(error)
-      });
-    });
-  }
   async resolveAdminMutationContext(gameId, courseId, user, studentId, accessLevel = "developer") {
     const client = this.requireClient();
     if (accessLevel === "dashboard") {
@@ -30894,7 +30908,7 @@ class TimebackAdminService {
     if (typeof masterableUnits !== "number" || masterableUnits <= 0) {
       return;
     }
-    return Math.min(100, Math.round(masteredUnits / masterableUnits * 100));
+    return Math.round(masteredUnits / masterableUnits * 100);
   }
   async getMasterableUnits(courseId) {
     const client = this.requireClient();
@@ -30947,6 +30961,7 @@ class TimebackAdminService {
   }
   async getStudentEnrollmentsByCourseId(client, studentId, courseIds, options) {
     const enrollments = new Map;
+    const allEnrollments = new Map;
     const entries = await Promise.all(courseIds.map(async (courseId) => {
       const roster = await client.oneroster.enrollments.listByCourse(courseId, {
         includeInactive: options?.includeInactive,
@@ -30958,28 +30973,30 @@ class TimebackAdminService {
         if (aActive !== bActive) {
           return aActive ? -1 : 1;
         }
-        return (b.enrollment.dateLastModified ?? "").localeCompare(a.enrollment.dateLastModified ?? "");
+        return compareEnrollmentsByRecency(a.enrollment, b.enrollment);
       });
-      return { courseId, match: matches[0] ?? null };
+      return { courseId, matches };
     }));
-    for (const { courseId, match } of entries) {
-      if (match) {
-        enrollments.set(courseId, {
-          id: match.enrollment.sourcedId,
-          status: match.enrollment.status ?? "active",
-          role: match.enrollment.role ?? "student",
-          beginDate: match.enrollment.beginDate ?? null,
-          endDate: match.enrollment.endDate ?? null,
-          course: {
-            id: courseId,
-            title: match.class?.title ?? "",
-            subjects: null,
-            grades: null
-          }
-        });
+    for (const { courseId, matches } of entries) {
+      const records = matches.map((match) => ({
+        id: match.enrollment.sourcedId,
+        status: match.enrollment.status ?? "active",
+        role: match.enrollment.role ?? "student",
+        beginDate: match.enrollment.beginDate ?? null,
+        endDate: match.enrollment.endDate ?? null,
+        course: {
+          id: courseId,
+          title: match.class?.title ?? "",
+          subjects: null,
+          grades: null
+        }
+      }));
+      if (records.length > 0) {
+        enrollments.set(courseId, records[0]);
       }
+      allEnrollments.set(courseId, records);
     }
-    return { enrollments };
+    return { enrollments, allEnrollments };
   }
   async assertStudentEnrolledInCourse(client, studentId, courseId) {
     const enrollments = await client.edubridge.enrollments.listByUser(studentId);
@@ -31066,7 +31083,7 @@ class TimebackAdminService {
       const enrollmentId = rosterEntry.enrollment.sourcedId || null;
       const summary = enrollmentId ? analyticsByEnrollmentId.get(enrollmentId) : undefined;
       const analyticsUnavailable = Boolean(enrollmentId) && summary?.analyticsAvailable !== true;
-      const name3 = rosterEntry.user ? `${rosterEntry.user.givenName} ${rosterEntry.user.familyName}`.trim() : rosterEntry.enrollment.user.sourcedId;
+      const name3 = rosterEntry.user ? `${rosterEntry.user.givenName} ${rosterEntry.user.familyName}`.trim() || "No name specified" : "No name specified";
       const inactive = rosterEntry.enrollment.status === "tobedeleted";
       return {
         studentId: rosterEntry.enrollment.user.sourcedId,
@@ -31111,14 +31128,15 @@ class TimebackAdminService {
       throw new NotFoundError("Timeback integration", gameId);
     }
     const courseIds = new Set(integrations.map((integration) => integration.courseId));
-    const { enrollments: enrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds], {
+    const { enrollments: enrollmentsByCourseId, allEnrollments: allEnrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds], {
       includeInactive: true
     });
     if (enrollmentsByCourseId.size === 0) {
       throw new NotFoundError("Student enrollment", courseId ? `${studentId}:${courseId}` : `${studentId}:${gameId}`);
     }
+    const allEnrollmentIds = [...allEnrollmentsByCourseId.values()].flat().map((enrollment) => enrollment.id);
     const studentProfile = await client.oneroster.users.get(studentId);
-    const analyticsByEnrollmentId = await this.loadEnrollmentAnalyticsSummaries([...enrollmentsByCourseId.values()].map((enrollment) => enrollment.id));
+    const analyticsByEnrollmentId = await this.loadEnrollmentAnalyticsSummaries(allEnrollmentIds);
     const [masterableUnitsByCourse, completionStatusByCourse] = await Promise.all([
       this.getMasterableUnitsByCourse(integrations.map((integration) => integration.courseId)),
       this.getCompletionStatusByCourse(client, integrations.map((integration) => integration.courseId), studentId)
@@ -31129,6 +31147,24 @@ class TimebackAdminService {
       const masterableUnits = masterableUnitsByCourse.get(integration.courseId);
       const analyticsUnavailable = Boolean(enrollment?.id) && summary?.analyticsAvailable !== true;
       const inactive = enrollment?.status === "tobedeleted";
+      const courseEnrollments = allEnrollmentsByCourseId.get(integration.courseId) ?? [];
+      const enrollmentSummaries = courseEnrollments.length > 1 ? courseEnrollments.map((record) => {
+        const recordSummary = analyticsByEnrollmentId.get(record.id);
+        const recordAnalyticsUnavailable = recordSummary?.analyticsAvailable !== true;
+        return {
+          enrollmentId: record.id,
+          status: record.status === "tobedeleted" ? "tobedeleted" : "active",
+          beginDate: record.beginDate,
+          endDate: record.endDate,
+          analyticsUnavailable: recordAnalyticsUnavailable,
+          totalXp: recordSummary?.totalXp ?? 0,
+          todayXp: recordSummary?.todayXp ?? 0,
+          activeTimeSeconds: recordSummary?.activeTimeSeconds ?? 0,
+          masteredUnits: recordSummary?.masteredUnits ?? 0,
+          pctCompleteApp: TimebackAdminService.computeCompletionPct(recordSummary?.masteredUnits ?? 0, masterableUnits),
+          history: recordSummary?.history ?? []
+        };
+      }) : undefined;
       return {
         courseId: integration.courseId,
         title: enrollment?.course.title || `${integration.subject} Grade ${integration.grade}`,
@@ -31144,9 +31180,11 @@ class TimebackAdminService {
         pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits),
         completionStatus: completionStatusByCourse.get(integration.courseId) ?? "none",
         history: summary?.history ?? [],
-        ...inactive ? { inactive } : {}
+        ...inactive ? { inactive } : {},
+        ...enrollmentSummaries ? { enrollments: enrollmentSummaries } : {}
       };
     });
+    courses.sort((a, b) => a.grade - b.grade);
     return {
       student: {
         studentId,
@@ -31246,111 +31284,87 @@ class TimebackAdminService {
     return { status: "ok" };
   }
   async adjustMasteredUnits(data, user) {
-    const { client, sensorUrl, appName, actor } = await this.resolveAdminMutationContext(data.gameId, data.courseId, user, data.studentId);
+    const { client, sensorUrl, appName, actor } = await this.resolveAdminMutationContext(data.gameId, data.courseId, user);
+    let currentMastered = 0;
+    const masterableUnits = await this.getMasterableUnits(data.courseId);
+    if (data.units !== 0) {
+      const enrollment = await this.assertStudentEnrolledInCourse(client, data.studentId, data.courseId);
+      try {
+        const analytics = await client.edubridge.analytics.getEnrollmentFacts(enrollment.id, { timezone: PLATFORM_TIMEZONE });
+        currentMastered = this.summarizeAnalyticsFacts(analytics.facts).masteredUnits;
+      } catch {
+        throw new ValidationError("Unable to validate mastery bounds — analytics unavailable. Please retry.");
+      }
+      validateMasteryAdjustment(data.units, currentMastered, masterableUnits);
+    }
+    const pctCompleteApp = typeof masterableUnits === "number" && masterableUnits > 0 ? Math.min(100, Math.max(0, Math.round((currentMastered + data.units) / masterableUnits * 100))) : undefined;
     await client.recordAdminMasteryAdjustment({
       gameId: data.gameId,
       courseId: data.courseId,
       studentId: data.studentId,
       masteredUnits: data.units,
+      pctCompleteApp,
       eventTime: resolveAdminEventTime(data),
       reason: data.reason,
       actor,
       appName,
       sensorUrl
     });
-    return { status: "ok" };
-  }
-  async toggleCourseCompletion(data, user) {
-    const { client, sensorUrl, appName, actor } = await this.resolveAdminMutationContext(data.gameId, data.courseId, user, data.studentId, "dashboard");
-    const historyClient = client;
-    const ids = deriveSourcedIds(data.courseId);
-    const lineItemId = `${ids.course}-mastery-completion-assessment`;
-    const resultId = `${lineItemId}:${data.studentId}:completion`;
-    await client.oneroster.assessmentLineItems.findOrCreate(lineItemId, {
-      sourcedId: lineItemId,
-      title: "Mastery Completion",
-      status: ONEROSTER_STATUS.active,
-      course: { sourcedId: ids.course },
-      ...ids.componentResource ? { componentResource: { sourcedId: ids.componentResource } } : {}
-    });
-    if (data.action === "complete") {
-      const masterableUnits = await this.getMasterableUnits(data.courseId);
-      if (masterableUnits && masterableUnits > 0) {
-        const enrollment = await this.assertStudentEnrolledInCourse(client, data.studentId, data.courseId);
-        let currentMastered = 0;
-        try {
-          const analytics = await client.edubridge.analytics.getEnrollmentFacts(enrollment.id, { timezone: PLATFORM_TIMEZONE });
-          const summary = this.summarizeAnalyticsFacts(analytics.facts);
-          currentMastered = summary.masteredUnits;
-        } catch {
-          logger16.warn("Failed to load analytics for mastery gap calculation", {
-            studentId: data.studentId,
-            courseId: data.courseId
+    if (typeof masterableUnits === "number" && masterableUnits > 0) {
+      const wasMastered = currentMastered >= masterableUnits;
+      const willBeMastered = currentMastered + data.units >= masterableUnits;
+      if (wasMastered !== willBeMastered) {
+        const ids = deriveSourcedIds(data.courseId);
+        const lineItemId = `${ids.course}-mastery-completion-assessment`;
+        const resultId = `${lineItemId}:${data.studentId}:completion`;
+        if (willBeMastered) {
+          await client.oneroster.assessmentLineItems.findOrCreate(lineItemId, {
+            sourcedId: lineItemId,
+            title: "Mastery Completion",
+            status: ONEROSTER_STATUS.active,
+            course: { sourcedId: ids.course },
+            ...ids.componentResource ? { componentResource: { sourcedId: ids.componentResource } } : {}
           });
-        }
-        const gap = masterableUnits - currentMastered;
-        if (gap > 0) {
-          await client.recordAdminMasteryAdjustment({
-            gameId: data.gameId,
-            courseId: data.courseId,
-            studentId: data.studentId,
-            masteredUnits: gap,
-            reason: "Admin completed course",
-            actor,
-            appName,
-            sensorUrl
+          await client.oneroster.assessmentResults.upsert(resultId, {
+            sourcedId: resultId,
+            status: ONEROSTER_STATUS.active,
+            assessmentLineItem: { sourcedId: lineItemId },
+            student: { sourcedId: data.studentId },
+            score: 100,
+            scoreDate: new Date().toISOString(),
+            scoreStatus: SCORE_STATUS.fullyGraded,
+            inProgress: "false",
+            metadata: {
+              isMasteryCompletion: true,
+              adminAction: true,
+              appName
+            }
           });
+        } else {
+          try {
+            await client.oneroster.assessmentResults.upsert(resultId, {
+              sourcedId: resultId,
+              status: ONEROSTER_STATUS.active,
+              assessmentLineItem: { sourcedId: lineItemId },
+              student: { sourcedId: data.studentId },
+              score: 0,
+              scoreDate: new Date().toISOString(),
+              scoreStatus: SCORE_STATUS.notSubmitted,
+              inProgress: "true",
+              metadata: {
+                isMasteryCompletion: true,
+                adminAction: true,
+                appName
+              }
+            });
+          } catch {
+            logger16.debug("No completion entry to revoke", {
+              studentId: data.studentId,
+              courseId: data.courseId
+            });
+          }
         }
       }
-      await client.oneroster.assessmentResults.upsert(resultId, {
-        sourcedId: resultId,
-        status: ONEROSTER_STATUS.active,
-        assessmentLineItem: { sourcedId: lineItemId },
-        student: { sourcedId: data.studentId },
-        score: 100,
-        scoreDate: new Date().toISOString(),
-        scoreStatus: SCORE_STATUS.fullyGraded,
-        inProgress: "false",
-        metadata: {
-          isMasteryCompletion: true,
-          adminAction: true,
-          appName
-        }
-      });
-      await this.recordCourseCompletionHistory(historyClient, {
-        gameId: data.gameId,
-        courseId: data.courseId,
-        studentId: data.studentId,
-        action: "complete",
-        actor,
-        appName,
-        sensorUrl
-      });
-    } else {
-      await client.oneroster.assessmentResults.upsert(resultId, {
-        sourcedId: resultId,
-        status: ONEROSTER_STATUS.active,
-        assessmentLineItem: { sourcedId: lineItemId },
-        student: { sourcedId: data.studentId },
-        score: 0,
-        scoreDate: new Date().toISOString(),
-        scoreStatus: SCORE_STATUS.notSubmitted,
-        inProgress: "true",
-        metadata: {
-          isMasteryCompletion: true,
-          adminAction: true,
-          appName
-        }
-      });
-      await this.recordCourseCompletionHistory(historyClient, {
-        gameId: data.gameId,
-        courseId: data.courseId,
-        studentId: data.studentId,
-        action: "resume",
-        actor,
-        appName,
-        sensorUrl
-      });
     }
     return { status: "ok" };
   }
@@ -31386,17 +31400,34 @@ class TimebackAdminService {
       });
       return { students: [] };
     }
-    const roster = await client.oneroster.enrollments.listByCourse(courseId, {
+    const fullRoster = await client.oneroster.enrollments.listByCourse(courseId, {
       role: "student",
+      includeInactive: true,
       includeUsers: false
     });
-    const enrolledStudentIds = new Set(roster.map((entry) => entry.enrollment.user.sourcedId));
-    const students = allUsers.filter((entry) => Boolean(entry.sourcedId) && entry.roles?.some((role) => role.role === "student") === true).map((entry) => ({
-      studentId: entry.sourcedId,
-      name: `${entry.givenName || ""} ${entry.familyName || ""}`.trim() || entry.sourcedId,
-      email: entry.email || null,
-      alreadyEnrolled: enrolledStudentIds.has(entry.sourcedId)
-    }));
+    const enrolledStudentIds = new Set(fullRoster.filter((entry) => entry.enrollment.status === "active").map((entry) => entry.enrollment.user.sourcedId));
+    const pastEnrollmentsByStudent = new Map;
+    const inactiveEntries = fullRoster.filter((entry) => entry.enrollment.status === "tobedeleted").toSorted((a, b) => compareEnrollmentsByRecency(a.enrollment, b.enrollment));
+    for (const entry of inactiveEntries) {
+      const studentId = entry.enrollment.user.sourcedId;
+      const list = pastEnrollmentsByStudent.get(studentId) ?? [];
+      list.push({
+        enrollmentId: entry.enrollment.sourcedId,
+        beginDate: entry.enrollment.beginDate ?? null,
+        endDate: entry.enrollment.endDate ?? null
+      });
+      pastEnrollmentsByStudent.set(studentId, list);
+    }
+    const students = allUsers.filter((entry) => Boolean(entry.sourcedId) && entry.roles?.some((role) => role.role === "student") === true).map((entry) => {
+      const past = pastEnrollmentsByStudent.get(entry.sourcedId) ?? [];
+      return {
+        studentId: entry.sourcedId,
+        name: `${entry.givenName || ""} ${entry.familyName || ""}`.trim() || "No name specified",
+        email: entry.email || null,
+        alreadyEnrolled: enrolledStudentIds.has(entry.sourcedId),
+        ...past.length > 0 ? { pastEnrollments: past } : {}
+      };
+    });
     return { students };
   }
   async enrollStudent(data, user) {
@@ -31427,6 +31458,48 @@ class TimebackAdminService {
     client.invalidateEnrollments(data.studentId);
     return { status: "ok" };
   }
+  async reactivateEnrollment(data, user) {
+    const client = this.requireClient();
+    await this.deps.validateGameManagementAccess(user, data.gameId);
+    const integration = await this.deps.db.query.gameTimebackIntegrations.findFirst({
+      where: and(eq(gameTimebackIntegrations.gameId, data.gameId), eq(gameTimebackIntegrations.courseId, data.courseId))
+    });
+    if (!integration) {
+      throw new NotFoundError("Timeback integration", `${data.gameId}:${data.courseId}`);
+    }
+    const enrollment = await client.oneroster.enrollments.get(data.enrollmentId);
+    if (!enrollment) {
+      throw new NotFoundError("Enrollment", data.enrollmentId);
+    }
+    if (enrollment.user.sourcedId !== data.studentId) {
+      throw new ValidationError("Enrollment does not belong to the specified student");
+    }
+    if (enrollment.status === "active") {
+      throw new ValidationError("Enrollment is already active");
+    }
+    const { allEnrollments } = await this.getStudentEnrollmentsByCourseId(client, data.studentId, [data.courseId], { includeInactive: true });
+    const courseEnrollmentIds = new Set((allEnrollments.get(data.courseId) ?? []).map((e) => e.id));
+    if (!courseEnrollmentIds.has(data.enrollmentId)) {
+      throw new ValidationError("Enrollment does not belong to the specified course");
+    }
+    const activeEnrollments = await client.edubridge.enrollments.listByUser(data.studentId);
+    if (activeEnrollments.some((e) => e.course.id === data.courseId)) {
+      throw new ValidationError("Student already has an active enrollment for this course. Unenroll from the current enrollment before reactivating a past one.");
+    }
+    await client.oneroster.enrollments.update(data.enrollmentId, {
+      role: enrollment.role,
+      primary: enrollment.primary,
+      beginDate: enrollment.beginDate,
+      endDate: enrollment.endDate,
+      user: enrollment.user,
+      class: enrollment.class,
+      school: enrollment.school,
+      sourcedId: data.enrollmentId,
+      status: "active"
+    });
+    client.invalidateEnrollments(data.studentId);
+    return { status: "ok" };
+  }
   async getCompletionStatus(client, courseId, studentId) {
     const ids = deriveSourcedIds(courseId);
     const lineItemId = `${ids.course}-mastery-completion-assessment`;
@@ -36517,6 +36590,10 @@ function createOneRosterNamespace(client) {
       }
     },
     enrollments: {
+      get: async (sourcedId) => {
+        const response = await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "GET");
+        return response.enrollment;
+      },
       listByClass: async (classSourcedId, options) => {
         const queryParams = new URLSearchParams;
         const filters = [`class.sourcedId='${escapeFilterValue2(classSourcedId)}'`];
@@ -36594,6 +36671,11 @@ function createOneRosterNamespace(client) {
         }
       },
       create: async (data) => client["request"](ONEROSTER_ENDPOINTS5.enrollments, "POST", { enrollment: data }),
+      update: async (sourcedId, data) => {
+        await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "PUT", {
+          enrollment: data
+        });
+      },
       delete: async (sourcedId) => {
         await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "DELETE");
       }
@@ -36943,6 +37025,7 @@ class AdminEventRecorder {
       defaultActivityId: "playcademy-admin-mastery-adjustment",
       eventKind: "remediation-mastery"
     });
+    const courseUrl = createOneRosterUrls(TIMEBACK_API_URLS5[this.environment]).course(data.courseId);
     await this.caliper.emitActivityEvent({
       studentId: ctx.student.id,
       studentEmail: ctx.student.email,
@@ -36957,32 +37040,13 @@ class AdminEventRecorder {
       appName: ctx.appName,
       sensorUrl: ctx.sensorUrl,
       process: true,
-      generatedExtensions: ctx.metadata,
-      eventExtensions: ctx.metadata
-    });
-  }
-  async recordCourseCompletionChange(data) {
-    const isResume = data.action === "resume";
-    const ctx = await this.prepareAdminEvent({
-      ...data,
-      defaultActivityId: isResume ? "playcademy-admin-course-resumed" : "playcademy-admin-course-completed",
-      reason: "Admin action",
-      eventKind: isResume ? "course-resumed" : "course-completed"
-    });
-    await this.caliper.emitActivityEvent({
-      studentId: ctx.student.id,
-      studentEmail: ctx.student.email,
-      gameId: data.gameId,
-      activityId: ctx.activityId,
-      activityName: isResume ? "Course resumed" : "Course marked complete",
-      courseId: data.courseId,
-      courseName: ctx.courseContext.courseName,
-      subject: ctx.courseContext.subject,
-      appName: ctx.appName,
-      sensorUrl: ctx.sensorUrl,
-      process: false,
       includeAttempt: false,
-      generatedExtensions: ctx.metadata,
+      objectId: `${ctx.sensorUrl.replace(/\/$/, "")}/urn:uuid:${crypto.randomUUID()}`,
+      generatedId: courseUrl,
+      generatedExtensions: {
+        ...ctx.metadata,
+        ...data.pctCompleteApp !== undefined ? { pctCompleteApp: data.pctCompleteApp } : {}
+      },
       eventExtensions: ctx.metadata
     });
   }
@@ -38173,10 +38237,6 @@ class TimebackClient {
     await this._ensureAuthenticated();
     return this.adminEventRecorder.recordMasteryAdjustment(data);
   }
-  async recordAdminCourseCompletionChange(data) {
-    await this._ensureAuthenticated();
-    return this.adminEventRecorder.recordCourseCompletionChange(data);
-  }
   clearCaches() {
     this.cacheManager.clearAll();
   }
@@ -95107,7 +95167,7 @@ function isValidAdminAttributionDate(value) {
   const date4 = new Date(Date.UTC(year3, month - 1, day, 12, 0, 0));
   return date4.getUTCFullYear() === year3 && date4.getUTCMonth() + 1 === month && date4.getUTCDate() === day;
 }
-var TIMEBACK_GRADES, TIMEBACK_SUBJECTS6, TimebackGradeSchema, TimebackSubjectSchema, UpdateTimebackXpRequestSchema, TimebackActivityDataSchema, EndActivityRequestSchema, AdvanceCourseRequestSchema, HeartbeatRequestSchema, PopulateStudentRequestSchema, DerivedPlatformCourseConfigSchema, TimebackBaseConfigSchema, PlatformTimebackSetupRequestSchema, AdminTimebackMutationBaseSchema, AdminAttributionDateSchema, GrantTimebackXpRequestSchema, AdjustTimebackTimeRequestSchema, AdjustTimebackMasteryRequestSchema, ToggleCourseCompletionRequestSchema, EnrollStudentRequestSchema, UnenrollStudentRequestSchema, InsertAssessmentTestSchema, CreateAssessmentRequestSchema, ReorderAssessmentsRequestSchema, ReorderQuestionsRequestSchema;
+var TIMEBACK_GRADES, TIMEBACK_SUBJECTS6, TimebackGradeSchema, TimebackSubjectSchema, UpdateTimebackXpRequestSchema, TimebackActivityDataSchema, EndActivityRequestSchema, AdvanceCourseRequestSchema, HeartbeatRequestSchema, PopulateStudentRequestSchema, DerivedPlatformCourseConfigSchema, TimebackBaseConfigSchema, PlatformTimebackSetupRequestSchema, AdminTimebackMutationBaseSchema, AdminAttributionDateSchema, GrantTimebackXpRequestSchema, AdjustTimebackTimeRequestSchema, AdjustTimebackMasteryRequestSchema, EnrollStudentRequestSchema, UnenrollStudentRequestSchema, ReactivateEnrollmentRequestSchema, InsertAssessmentTestSchema, CreateAssessmentRequestSchema, ReorderAssessmentsRequestSchema, ReorderQuestionsRequestSchema;
 var init_schemas11 = __esm(() => {
   init_drizzle_zod();
   init_esm();
@@ -95278,12 +95338,6 @@ var init_schemas11 = __esm(() => {
     date: AdminAttributionDateSchema.optional(),
     useCurrentTime: exports_external.boolean().optional()
   });
-  ToggleCourseCompletionRequestSchema = exports_external.object({
-    gameId: exports_external.string().uuid(),
-    courseId: exports_external.string().min(1),
-    studentId: exports_external.string().min(1),
-    action: exports_external.enum(["complete", "resume"])
-  });
   EnrollStudentRequestSchema = exports_external.object({
     gameId: exports_external.string().uuid(),
     courseId: exports_external.string().min(1),
@@ -95294,6 +95348,12 @@ var init_schemas11 = __esm(() => {
     courseId: exports_external.string().min(1),
     studentId: exports_external.string().min(1)
   });
+  ReactivateEnrollmentRequestSchema = exports_external.object({
+    gameId: exports_external.string().uuid(),
+    courseId: exports_external.string().min(1),
+    studentId: exports_external.string().min(1),
+    enrollmentId: exports_external.string().min(1)
+  });
   InsertAssessmentTestSchema = createInsertSchema(gameTimebackAssessmentTests).omit({
     id: true,
     createdAt: true
@@ -97473,7 +97533,7 @@ var init_sprite_controller = __esm(() => {
 });
 
 // ../api-core/src/controllers/timeback.controller.ts
-var logger65, getTodayXp, getTotalXp, updateTodayXp, getXpHistory, populateStudent, getUser, getUserById, setupIntegration, getIntegrations, verifyIntegration, getConfig2, deleteIntegrations, endActivity, heartbeat, advanceCourse, getStudentXp, getRoster, getStudentOverview, getStudentActivity, getActivityDetail, grantXp, adjustTime, adjustMastery, toggleCompletion, searchStudents, enrollStudent, unenrollStudent, listAssessments, createAssessment, deleteAssessment, reorderAssessments, reorderQuestions, activateAssessment, deactivateAssessment, listQuestions, createQuestion, updateQuestion, deleteQuestion, getAssessmentBankStatus, destroyAssessmentBank, timeback2;
+var logger65, getTodayXp, getTotalXp, updateTodayXp, getXpHistory, populateStudent, getUser, getUserById, setupIntegration, getIntegrations, verifyIntegration, getConfig2, deleteIntegrations, endActivity, heartbeat, advanceCourse, getStudentXp, getRoster, getStudentOverview, getStudentActivity, getActivityDetail, grantXp, adjustTime, adjustMastery, searchStudents, enrollStudent, unenrollStudent, reactivateEnrollment, listAssessments, createAssessment, deleteAssessment, reorderAssessments, reorderQuestions, activateAssessment, deactivateAssessment, listQuestions, createQuestion, updateQuestion, deleteQuestion, getAssessmentBankStatus, destroyAssessmentBank, timeback2;
 var init_timeback_controller = __esm(() => {
   init_esm();
   init_schemas_index();
@@ -97874,17 +97934,6 @@ var init_timeback_controller = __esm(() => {
     });
     return ctx.services.timebackAdmin.adjustMasteredUnits(body2, ctx.user);
   });
-  toggleCompletion = requireGameManagementAccess(async (ctx) => {
-    const body2 = await parseRequestBody(ctx.request, ToggleCourseCompletionRequestSchema);
-    logger65.debug("Toggling course completion", {
-      requesterId: ctx.user.id,
-      gameId: body2.gameId,
-      courseId: body2.courseId,
-      studentId: body2.studentId,
-      action: body2.action
-    });
-    return ctx.services.timebackAdmin.toggleCourseCompletion(body2, ctx.user);
-  });
   searchStudents = requireGameManagementAccess(async (ctx) => {
     const gameId = ctx.params.gameId;
     const courseId = ctx.params.courseId;
@@ -97920,6 +97969,17 @@ var init_timeback_controller = __esm(() => {
     });
     return ctx.services.timebackAdmin.unenrollStudent(body2, ctx.user);
   });
+  reactivateEnrollment = requireGameManagementAccess(async (ctx) => {
+    const body2 = await parseRequestBody(ctx.request, ReactivateEnrollmentRequestSchema);
+    logger65.debug("Reactivating enrollment", {
+      requesterId: ctx.user.id,
+      gameId: body2.gameId,
+      courseId: body2.courseId,
+      studentId: body2.studentId,
+      enrollmentId: body2.enrollmentId
+    });
+    return ctx.services.timebackAdmin.reactivateEnrollment(body2, ctx.user);
+  });
   listAssessments = requireGameManagementAccess(async (ctx) => {
     const { gameId, courseId } = ctx.params;
     if (!gameId || !courseId) {
@@ -98065,10 +98125,10 @@ var init_timeback_controller = __esm(() => {
     grantXp,
     adjustTime,
     adjustMastery,
-    toggleCompletion,
     searchStudents,
     enrollStudent,
     unenrollStudent,
+    reactivateEnrollment,
     listAssessments,
     createAssessment,
     deleteAssessment,

package/dist/server.js

@@ -1329,7 +1329,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.3.17-beta.33",
+    version: "0.3.17-beta.35",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -30432,6 +30432,31 @@ function resolveAdminEventTime(data) {
   }
   return toAttributionEventTime(data.date);
 }
+function validateMasteryAdjustment(delta, currentMastered, masterableUnits) {
+  if (delta < 0 && currentMastered + delta < 0) {
+    throw new ValidationError(`Adjustment would go below 0. Current: ${currentMastered}, adjustment: ${delta}`);
+  }
+  if (delta < 0 && typeof masterableUnits === "number" && masterableUnits > 0 && currentMastered > masterableUnits && currentMastered + delta > masterableUnits) {
+    const minDelta = masterableUnits - currentMastered;
+    throw new ValidationError(`Adjustment must reduce mastery to at most ${masterableUnits}. Current: ${currentMastered}/${masterableUnits}, minimum adjustment: ${minDelta}`);
+  }
+  if (delta > 0 && typeof masterableUnits === "number" && masterableUnits > 0) {
+    if (currentMastered >= masterableUnits) {
+      throw new ValidationError(`Mastery is already at maximum (${currentMastered}/${masterableUnits}). Only negative adjustments are allowed.`);
+    }
+    if (currentMastered + delta > masterableUnits) {
+      const remaining = masterableUnits - currentMastered;
+      throw new ValidationError(`Adjustment would exceed maximum. Current: ${currentMastered}/${masterableUnits}, max adjustment: +${remaining}`);
+    }
+  }
+}
+function compareEnrollmentsByRecency(a, b) {
+  const dateCompare = (b.beginDate ?? "").localeCompare(a.beginDate ?? "");
+  if (dateCompare !== 0) {
+    return dateCompare;
+  }
+  return (b.dateLastModified ?? "").localeCompare(a.dateLastModified ?? "");
+}
 var init_timeback_admin_util = __esm(() => {
   init_errors();
 });
@@ -30784,17 +30809,6 @@ class TimebackAdminService {
     }
     return this.deps.timeback;
   }
-  async recordCourseCompletionHistory(client, data) {
-    await client.recordAdminCourseCompletionChange(data).catch((error) => {
-      logger16.error("Failed to record admin course completion history event", {
-        gameId: data.gameId,
-        courseId: data.courseId,
-        studentId: data.studentId,
-        action: data.action,
-        error: error instanceof Error ? error.message : String(error)
-      });
-    });
-  }
   async resolveAdminMutationContext(gameId, courseId, user, studentId, accessLevel = "developer") {
     const client = this.requireClient();
     if (accessLevel === "dashboard") {
@@ -30893,7 +30907,7 @@ class TimebackAdminService {
     if (typeof masterableUnits !== "number" || masterableUnits <= 0) {
       return;
     }
-    return Math.min(100, Math.round(masteredUnits / masterableUnits * 100));
+    return Math.round(masteredUnits / masterableUnits * 100);
   }
   async getMasterableUnits(courseId) {
     const client = this.requireClient();
@@ -30946,6 +30960,7 @@ class TimebackAdminService {
   }
   async getStudentEnrollmentsByCourseId(client, studentId, courseIds, options) {
     const enrollments = new Map;
+    const allEnrollments = new Map;
     const entries = await Promise.all(courseIds.map(async (courseId) => {
       const roster = await client.oneroster.enrollments.listByCourse(courseId, {
         includeInactive: options?.includeInactive,
@@ -30957,28 +30972,30 @@ class TimebackAdminService {
         if (aActive !== bActive) {
           return aActive ? -1 : 1;
         }
-        return (b.enrollment.dateLastModified ?? "").localeCompare(a.enrollment.dateLastModified ?? "");
+        return compareEnrollmentsByRecency(a.enrollment, b.enrollment);
       });
-      return { courseId, match: matches[0] ?? null };
+      return { courseId, matches };
     }));
-    for (const { courseId, match } of entries) {
-      if (match) {
-        enrollments.set(courseId, {
-          id: match.enrollment.sourcedId,
-          status: match.enrollment.status ?? "active",
-          role: match.enrollment.role ?? "student",
-          beginDate: match.enrollment.beginDate ?? null,
-          endDate: match.enrollment.endDate ?? null,
-          course: {
-            id: courseId,
-            title: match.class?.title ?? "",
-            subjects: null,
-            grades: null
-          }
-        });
+    for (const { courseId, matches } of entries) {
+      const records = matches.map((match) => ({
+        id: match.enrollment.sourcedId,
+        status: match.enrollment.status ?? "active",
+        role: match.enrollment.role ?? "student",
+        beginDate: match.enrollment.beginDate ?? null,
+        endDate: match.enrollment.endDate ?? null,
+        course: {
+          id: courseId,
+          title: match.class?.title ?? "",
+          subjects: null,
+          grades: null
+        }
+      }));
+      if (records.length > 0) {
+        enrollments.set(courseId, records[0]);
       }
+      allEnrollments.set(courseId, records);
     }
-    return { enrollments };
+    return { enrollments, allEnrollments };
   }
   async assertStudentEnrolledInCourse(client, studentId, courseId) {
     const enrollments = await client.edubridge.enrollments.listByUser(studentId);
@@ -31065,7 +31082,7 @@ class TimebackAdminService {
       const enrollmentId = rosterEntry.enrollment.sourcedId || null;
       const summary = enrollmentId ? analyticsByEnrollmentId.get(enrollmentId) : undefined;
       const analyticsUnavailable = Boolean(enrollmentId) && summary?.analyticsAvailable !== true;
-      const name3 = rosterEntry.user ? `${rosterEntry.user.givenName} ${rosterEntry.user.familyName}`.trim() : rosterEntry.enrollment.user.sourcedId;
+      const name3 = rosterEntry.user ? `${rosterEntry.user.givenName} ${rosterEntry.user.familyName}`.trim() || "No name specified" : "No name specified";
       const inactive = rosterEntry.enrollment.status === "tobedeleted";
       return {
         studentId: rosterEntry.enrollment.user.sourcedId,
@@ -31110,14 +31127,15 @@ class TimebackAdminService {
       throw new NotFoundError("Timeback integration", gameId);
     }
     const courseIds = new Set(integrations.map((integration) => integration.courseId));
-    const { enrollments: enrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds], {
+    const { enrollments: enrollmentsByCourseId, allEnrollments: allEnrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds], {
       includeInactive: true
     });
     if (enrollmentsByCourseId.size === 0) {
       throw new NotFoundError("Student enrollment", courseId ? `${studentId}:${courseId}` : `${studentId}:${gameId}`);
     }
+    const allEnrollmentIds = [...allEnrollmentsByCourseId.values()].flat().map((enrollment) => enrollment.id);
     const studentProfile = await client.oneroster.users.get(studentId);
-    const analyticsByEnrollmentId = await this.loadEnrollmentAnalyticsSummaries([...enrollmentsByCourseId.values()].map((enrollment) => enrollment.id));
+    const analyticsByEnrollmentId = await this.loadEnrollmentAnalyticsSummaries(allEnrollmentIds);
     const [masterableUnitsByCourse, completionStatusByCourse] = await Promise.all([
       this.getMasterableUnitsByCourse(integrations.map((integration) => integration.courseId)),
       this.getCompletionStatusByCourse(client, integrations.map((integration) => integration.courseId), studentId)
@@ -31128,6 +31146,24 @@ class TimebackAdminService {
       const masterableUnits = masterableUnitsByCourse.get(integration.courseId);
       const analyticsUnavailable = Boolean(enrollment?.id) && summary?.analyticsAvailable !== true;
       const inactive = enrollment?.status === "tobedeleted";
+      const courseEnrollments = allEnrollmentsByCourseId.get(integration.courseId) ?? [];
+      const enrollmentSummaries = courseEnrollments.length > 1 ? courseEnrollments.map((record) => {
+        const recordSummary = analyticsByEnrollmentId.get(record.id);
+        const recordAnalyticsUnavailable = recordSummary?.analyticsAvailable !== true;
+        return {
+          enrollmentId: record.id,
+          status: record.status === "tobedeleted" ? "tobedeleted" : "active",
+          beginDate: record.beginDate,
+          endDate: record.endDate,
+          analyticsUnavailable: recordAnalyticsUnavailable,
+          totalXp: recordSummary?.totalXp ?? 0,
+          todayXp: recordSummary?.todayXp ?? 0,
+          activeTimeSeconds: recordSummary?.activeTimeSeconds ?? 0,
+          masteredUnits: recordSummary?.masteredUnits ?? 0,
+          pctCompleteApp: TimebackAdminService.computeCompletionPct(recordSummary?.masteredUnits ?? 0, masterableUnits),
+          history: recordSummary?.history ?? []
+        };
+      }) : undefined;
       return {
         courseId: integration.courseId,
         title: enrollment?.course.title || `${integration.subject} Grade ${integration.grade}`,
@@ -31143,9 +31179,11 @@ class TimebackAdminService {
         pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits),
         completionStatus: completionStatusByCourse.get(integration.courseId) ?? "none",
         history: summary?.history ?? [],
-        ...inactive ? { inactive } : {}
+        ...inactive ? { inactive } : {},
+        ...enrollmentSummaries ? { enrollments: enrollmentSummaries } : {}
       };
     });
+    courses.sort((a, b) => a.grade - b.grade);
     return {
       student: {
         studentId,
@@ -31245,111 +31283,87 @@ class TimebackAdminService {
     return { status: "ok" };
   }
   async adjustMasteredUnits(data, user) {
-    const { client, sensorUrl, appName, actor } = await this.resolveAdminMutationContext(data.gameId, data.courseId, user, data.studentId);
+    const { client, sensorUrl, appName, actor } = await this.resolveAdminMutationContext(data.gameId, data.courseId, user);
+    let currentMastered = 0;
+    const masterableUnits = await this.getMasterableUnits(data.courseId);
+    if (data.units !== 0) {
+      const enrollment = await this.assertStudentEnrolledInCourse(client, data.studentId, data.courseId);
+      try {
+        const analytics = await client.edubridge.analytics.getEnrollmentFacts(enrollment.id, { timezone: PLATFORM_TIMEZONE });
+        currentMastered = this.summarizeAnalyticsFacts(analytics.facts).masteredUnits;
+      } catch {
+        throw new ValidationError("Unable to validate mastery bounds — analytics unavailable. Please retry.");
+      }
+      validateMasteryAdjustment(data.units, currentMastered, masterableUnits);
+    }
+    const pctCompleteApp = typeof masterableUnits === "number" && masterableUnits > 0 ? Math.min(100, Math.max(0, Math.round((currentMastered + data.units) / masterableUnits * 100))) : undefined;
     await client.recordAdminMasteryAdjustment({
       gameId: data.gameId,
       courseId: data.courseId,
       studentId: data.studentId,
       masteredUnits: data.units,
+      pctCompleteApp,
       eventTime: resolveAdminEventTime(data),
       reason: data.reason,
       actor,
       appName,
       sensorUrl
     });
-    return { status: "ok" };
-  }
-  async toggleCourseCompletion(data, user) {
-    const { client, sensorUrl, appName, actor } = await this.resolveAdminMutationContext(data.gameId, data.courseId, user, data.studentId, "dashboard");
-    const historyClient = client;
-    const ids = deriveSourcedIds(data.courseId);
-    const lineItemId = `${ids.course}-mastery-completion-assessment`;
-    const resultId = `${lineItemId}:${data.studentId}:completion`;
-    await client.oneroster.assessmentLineItems.findOrCreate(lineItemId, {
-      sourcedId: lineItemId,
-      title: "Mastery Completion",
-      status: ONEROSTER_STATUS.active,
-      course: { sourcedId: ids.course },
-      ...ids.componentResource ? { componentResource: { sourcedId: ids.componentResource } } : {}
-    });
-    if (data.action === "complete") {
-      const masterableUnits = await this.getMasterableUnits(data.courseId);
-      if (masterableUnits && masterableUnits > 0) {
-        const enrollment = await this.assertStudentEnrolledInCourse(client, data.studentId, data.courseId);
-        let currentMastered = 0;
-        try {
-          const analytics = await client.edubridge.analytics.getEnrollmentFacts(enrollment.id, { timezone: PLATFORM_TIMEZONE });
-          const summary = this.summarizeAnalyticsFacts(analytics.facts);
-          currentMastered = summary.masteredUnits;
-        } catch {
-          logger16.warn("Failed to load analytics for mastery gap calculation", {
-            studentId: data.studentId,
-            courseId: data.courseId
+    if (typeof masterableUnits === "number" && masterableUnits > 0) {
+      const wasMastered = currentMastered >= masterableUnits;
+      const willBeMastered = currentMastered + data.units >= masterableUnits;
+      if (wasMastered !== willBeMastered) {
+        const ids = deriveSourcedIds(data.courseId);
+        const lineItemId = `${ids.course}-mastery-completion-assessment`;
+        const resultId = `${lineItemId}:${data.studentId}:completion`;
+        if (willBeMastered) {
+          await client.oneroster.assessmentLineItems.findOrCreate(lineItemId, {
+            sourcedId: lineItemId,
+            title: "Mastery Completion",
+            status: ONEROSTER_STATUS.active,
+            course: { sourcedId: ids.course },
+            ...ids.componentResource ? { componentResource: { sourcedId: ids.componentResource } } : {}
           });
-        }
-        const gap = masterableUnits - currentMastered;
-        if (gap > 0) {
-          await client.recordAdminMasteryAdjustment({
-            gameId: data.gameId,
-            courseId: data.courseId,
-            studentId: data.studentId,
-            masteredUnits: gap,
-            reason: "Admin completed course",
-            actor,
-            appName,
-            sensorUrl
+          await client.oneroster.assessmentResults.upsert(resultId, {
+            sourcedId: resultId,
+            status: ONEROSTER_STATUS.active,
+            assessmentLineItem: { sourcedId: lineItemId },
+            student: { sourcedId: data.studentId },
+            score: 100,
+            scoreDate: new Date().toISOString(),
+            scoreStatus: SCORE_STATUS.fullyGraded,
+            inProgress: "false",
+            metadata: {
+              isMasteryCompletion: true,
+              adminAction: true,
+              appName
+            }
           });
+        } else {
+          try {
+            await client.oneroster.assessmentResults.upsert(resultId, {
+              sourcedId: resultId,
+              status: ONEROSTER_STATUS.active,
+              assessmentLineItem: { sourcedId: lineItemId },
+              student: { sourcedId: data.studentId },
+              score: 0,
+              scoreDate: new Date().toISOString(),
+              scoreStatus: SCORE_STATUS.notSubmitted,
+              inProgress: "true",
+              metadata: {
+                isMasteryCompletion: true,
+                adminAction: true,
+                appName
+              }
+            });
+          } catch {
+            logger16.debug("No completion entry to revoke", {
+              studentId: data.studentId,
+              courseId: data.courseId
+            });
+          }
         }
       }
-      await client.oneroster.assessmentResults.upsert(resultId, {
-        sourcedId: resultId,
-        status: ONEROSTER_STATUS.active,
-        assessmentLineItem: { sourcedId: lineItemId },
-        student: { sourcedId: data.studentId },
-        score: 100,
-        scoreDate: new Date().toISOString(),
-        scoreStatus: SCORE_STATUS.fullyGraded,
-        inProgress: "false",
-        metadata: {
-          isMasteryCompletion: true,
-          adminAction: true,
-          appName
-        }
-      });
-      await this.recordCourseCompletionHistory(historyClient, {
-        gameId: data.gameId,
-        courseId: data.courseId,
-        studentId: data.studentId,
-        action: "complete",
-        actor,
-        appName,
-        sensorUrl
-      });
-    } else {
-      await client.oneroster.assessmentResults.upsert(resultId, {
-        sourcedId: resultId,
-        status: ONEROSTER_STATUS.active,
-        assessmentLineItem: { sourcedId: lineItemId },
-        student: { sourcedId: data.studentId },
-        score: 0,
-        scoreDate: new Date().toISOString(),
-        scoreStatus: SCORE_STATUS.notSubmitted,
-        inProgress: "true",
-        metadata: {
-          isMasteryCompletion: true,
-          adminAction: true,
-          appName
-        }
-      });
-      await this.recordCourseCompletionHistory(historyClient, {
-        gameId: data.gameId,
-        courseId: data.courseId,
-        studentId: data.studentId,
-        action: "resume",
-        actor,
-        appName,
-        sensorUrl
-      });
     }
     return { status: "ok" };
   }
@@ -31385,17 +31399,34 @@ class TimebackAdminService {
       });
       return { students: [] };
     }
-    const roster = await client.oneroster.enrollments.listByCourse(courseId, {
+    const fullRoster = await client.oneroster.enrollments.listByCourse(courseId, {
       role: "student",
+      includeInactive: true,
       includeUsers: false
     });
-    const enrolledStudentIds = new Set(roster.map((entry) => entry.enrollment.user.sourcedId));
-    const students = allUsers.filter((entry) => Boolean(entry.sourcedId) && entry.roles?.some((role) => role.role === "student") === true).map((entry) => ({
-      studentId: entry.sourcedId,
-      name: `${entry.givenName || ""} ${entry.familyName || ""}`.trim() || entry.sourcedId,
-      email: entry.email || null,
-      alreadyEnrolled: enrolledStudentIds.has(entry.sourcedId)
-    }));
+    const enrolledStudentIds = new Set(fullRoster.filter((entry) => entry.enrollment.status === "active").map((entry) => entry.enrollment.user.sourcedId));
+    const pastEnrollmentsByStudent = new Map;
+    const inactiveEntries = fullRoster.filter((entry) => entry.enrollment.status === "tobedeleted").toSorted((a, b) => compareEnrollmentsByRecency(a.enrollment, b.enrollment));
+    for (const entry of inactiveEntries) {
+      const studentId = entry.enrollment.user.sourcedId;
+      const list = pastEnrollmentsByStudent.get(studentId) ?? [];
+      list.push({
+        enrollmentId: entry.enrollment.sourcedId,
+        beginDate: entry.enrollment.beginDate ?? null,
+        endDate: entry.enrollment.endDate ?? null
+      });
+      pastEnrollmentsByStudent.set(studentId, list);
+    }
+    const students = allUsers.filter((entry) => Boolean(entry.sourcedId) && entry.roles?.some((role) => role.role === "student") === true).map((entry) => {
+      const past = pastEnrollmentsByStudent.get(entry.sourcedId) ?? [];
+      return {
+        studentId: entry.sourcedId,
+        name: `${entry.givenName || ""} ${entry.familyName || ""}`.trim() || "No name specified",
+        email: entry.email || null,
+        alreadyEnrolled: enrolledStudentIds.has(entry.sourcedId),
+        ...past.length > 0 ? { pastEnrollments: past } : {}
+      };
+    });
     return { students };
   }
   async enrollStudent(data, user) {
@@ -31426,6 +31457,48 @@ class TimebackAdminService {
     client.invalidateEnrollments(data.studentId);
     return { status: "ok" };
   }
+  async reactivateEnrollment(data, user) {
+    const client = this.requireClient();
+    await this.deps.validateGameManagementAccess(user, data.gameId);
+    const integration = await this.deps.db.query.gameTimebackIntegrations.findFirst({
+      where: and(eq(gameTimebackIntegrations.gameId, data.gameId), eq(gameTimebackIntegrations.courseId, data.courseId))
+    });
+    if (!integration) {
+      throw new NotFoundError("Timeback integration", `${data.gameId}:${data.courseId}`);
+    }
+    const enrollment = await client.oneroster.enrollments.get(data.enrollmentId);
+    if (!enrollment) {
+      throw new NotFoundError("Enrollment", data.enrollmentId);
+    }
+    if (enrollment.user.sourcedId !== data.studentId) {
+      throw new ValidationError("Enrollment does not belong to the specified student");
+    }
+    if (enrollment.status === "active") {
+      throw new ValidationError("Enrollment is already active");
+    }
+    const { allEnrollments } = await this.getStudentEnrollmentsByCourseId(client, data.studentId, [data.courseId], { includeInactive: true });
+    const courseEnrollmentIds = new Set((allEnrollments.get(data.courseId) ?? []).map((e) => e.id));
+    if (!courseEnrollmentIds.has(data.enrollmentId)) {
+      throw new ValidationError("Enrollment does not belong to the specified course");
+    }
+    const activeEnrollments = await client.edubridge.enrollments.listByUser(data.studentId);
+    if (activeEnrollments.some((e) => e.course.id === data.courseId)) {
+      throw new ValidationError("Student already has an active enrollment for this course. Unenroll from the current enrollment before reactivating a past one.");
+    }
+    await client.oneroster.enrollments.update(data.enrollmentId, {
+      role: enrollment.role,
+      primary: enrollment.primary,
+      beginDate: enrollment.beginDate,
+      endDate: enrollment.endDate,
+      user: enrollment.user,
+      class: enrollment.class,
+      school: enrollment.school,
+      sourcedId: data.enrollmentId,
+      status: "active"
+    });
+    client.invalidateEnrollments(data.studentId);
+    return { status: "ok" };
+  }
   async getCompletionStatus(client, courseId, studentId) {
     const ids = deriveSourcedIds(courseId);
     const lineItemId = `${ids.course}-mastery-completion-assessment`;
@@ -36516,6 +36589,10 @@ function createOneRosterNamespace(client) {
       }
     },
     enrollments: {
+      get: async (sourcedId) => {
+        const response = await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "GET");
+        return response.enrollment;
+      },
       listByClass: async (classSourcedId, options) => {
         const queryParams = new URLSearchParams;
         const filters = [`class.sourcedId='${escapeFilterValue2(classSourcedId)}'`];
@@ -36593,6 +36670,11 @@ function createOneRosterNamespace(client) {
         }
       },
       create: async (data) => client["request"](ONEROSTER_ENDPOINTS5.enrollments, "POST", { enrollment: data }),
+      update: async (sourcedId, data) => {
+        await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "PUT", {
+          enrollment: data
+        });
+      },
       delete: async (sourcedId) => {
         await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "DELETE");
       }
@@ -36942,6 +37024,7 @@ class AdminEventRecorder {
       defaultActivityId: "playcademy-admin-mastery-adjustment",
       eventKind: "remediation-mastery"
     });
+    const courseUrl = createOneRosterUrls(TIMEBACK_API_URLS5[this.environment]).course(data.courseId);
     await this.caliper.emitActivityEvent({
       studentId: ctx.student.id,
       studentEmail: ctx.student.email,
@@ -36956,32 +37039,13 @@ class AdminEventRecorder {
       appName: ctx.appName,
       sensorUrl: ctx.sensorUrl,
       process: true,
-      generatedExtensions: ctx.metadata,
-      eventExtensions: ctx.metadata
-    });
-  }
-  async recordCourseCompletionChange(data) {
-    const isResume = data.action === "resume";
-    const ctx = await this.prepareAdminEvent({
-      ...data,
-      defaultActivityId: isResume ? "playcademy-admin-course-resumed" : "playcademy-admin-course-completed",
-      reason: "Admin action",
-      eventKind: isResume ? "course-resumed" : "course-completed"
-    });
-    await this.caliper.emitActivityEvent({
-      studentId: ctx.student.id,
-      studentEmail: ctx.student.email,
-      gameId: data.gameId,
-      activityId: ctx.activityId,
-      activityName: isResume ? "Course resumed" : "Course marked complete",
-      courseId: data.courseId,
-      courseName: ctx.courseContext.courseName,
-      subject: ctx.courseContext.subject,
-      appName: ctx.appName,
-      sensorUrl: ctx.sensorUrl,
-      process: false,
       includeAttempt: false,
-      generatedExtensions: ctx.metadata,
+      objectId: `${ctx.sensorUrl.replace(/\/$/, "")}/urn:uuid:${crypto.randomUUID()}`,
+      generatedId: courseUrl,
+      generatedExtensions: {
+        ...ctx.metadata,
+        ...data.pctCompleteApp !== undefined ? { pctCompleteApp: data.pctCompleteApp } : {}
+      },
       eventExtensions: ctx.metadata
     });
   }
@@ -38172,10 +38236,6 @@ class TimebackClient {
     await this._ensureAuthenticated();
     return this.adminEventRecorder.recordMasteryAdjustment(data);
   }
-  async recordAdminCourseCompletionChange(data) {
-    await this._ensureAuthenticated();
-    return this.adminEventRecorder.recordCourseCompletionChange(data);
-  }
   clearCaches() {
     this.cacheManager.clearAll();
   }
@@ -95106,7 +95166,7 @@ function isValidAdminAttributionDate(value) {
   const date4 = new Date(Date.UTC(year3, month - 1, day, 12, 0, 0));
   return date4.getUTCFullYear() === year3 && date4.getUTCMonth() + 1 === month && date4.getUTCDate() === day;
 }
-var TIMEBACK_GRADES, TIMEBACK_SUBJECTS6, TimebackGradeSchema, TimebackSubjectSchema, UpdateTimebackXpRequestSchema, TimebackActivityDataSchema, EndActivityRequestSchema, AdvanceCourseRequestSchema, HeartbeatRequestSchema, PopulateStudentRequestSchema, DerivedPlatformCourseConfigSchema, TimebackBaseConfigSchema, PlatformTimebackSetupRequestSchema, AdminTimebackMutationBaseSchema, AdminAttributionDateSchema, GrantTimebackXpRequestSchema, AdjustTimebackTimeRequestSchema, AdjustTimebackMasteryRequestSchema, ToggleCourseCompletionRequestSchema, EnrollStudentRequestSchema, UnenrollStudentRequestSchema, InsertAssessmentTestSchema, CreateAssessmentRequestSchema, ReorderAssessmentsRequestSchema, ReorderQuestionsRequestSchema;
+var TIMEBACK_GRADES, TIMEBACK_SUBJECTS6, TimebackGradeSchema, TimebackSubjectSchema, UpdateTimebackXpRequestSchema, TimebackActivityDataSchema, EndActivityRequestSchema, AdvanceCourseRequestSchema, HeartbeatRequestSchema, PopulateStudentRequestSchema, DerivedPlatformCourseConfigSchema, TimebackBaseConfigSchema, PlatformTimebackSetupRequestSchema, AdminTimebackMutationBaseSchema, AdminAttributionDateSchema, GrantTimebackXpRequestSchema, AdjustTimebackTimeRequestSchema, AdjustTimebackMasteryRequestSchema, EnrollStudentRequestSchema, UnenrollStudentRequestSchema, ReactivateEnrollmentRequestSchema, InsertAssessmentTestSchema, CreateAssessmentRequestSchema, ReorderAssessmentsRequestSchema, ReorderQuestionsRequestSchema;
 var init_schemas11 = __esm(() => {
   init_drizzle_zod();
   init_esm();
@@ -95277,12 +95337,6 @@ var init_schemas11 = __esm(() => {
     date: AdminAttributionDateSchema.optional(),
     useCurrentTime: exports_external.boolean().optional()
   });
-  ToggleCourseCompletionRequestSchema = exports_external.object({
-    gameId: exports_external.string().uuid(),
-    courseId: exports_external.string().min(1),
-    studentId: exports_external.string().min(1),
-    action: exports_external.enum(["complete", "resume"])
-  });
   EnrollStudentRequestSchema = exports_external.object({
     gameId: exports_external.string().uuid(),
     courseId: exports_external.string().min(1),
@@ -95293,6 +95347,12 @@ var init_schemas11 = __esm(() => {
     courseId: exports_external.string().min(1),
     studentId: exports_external.string().min(1)
   });
+  ReactivateEnrollmentRequestSchema = exports_external.object({
+    gameId: exports_external.string().uuid(),
+    courseId: exports_external.string().min(1),
+    studentId: exports_external.string().min(1),
+    enrollmentId: exports_external.string().min(1)
+  });
   InsertAssessmentTestSchema = createInsertSchema(gameTimebackAssessmentTests).omit({
     id: true,
     createdAt: true
@@ -97472,7 +97532,7 @@ var init_sprite_controller = __esm(() => {
 });
 
 // ../api-core/src/controllers/timeback.controller.ts
-var logger65, getTodayXp, getTotalXp, updateTodayXp, getXpHistory, populateStudent, getUser, getUserById, setupIntegration, getIntegrations, verifyIntegration, getConfig2, deleteIntegrations, endActivity, heartbeat, advanceCourse, getStudentXp, getRoster, getStudentOverview, getStudentActivity, getActivityDetail, grantXp, adjustTime, adjustMastery, toggleCompletion, searchStudents, enrollStudent, unenrollStudent, listAssessments, createAssessment, deleteAssessment, reorderAssessments, reorderQuestions, activateAssessment, deactivateAssessment, listQuestions, createQuestion, updateQuestion, deleteQuestion, getAssessmentBankStatus, destroyAssessmentBank, timeback2;
+var logger65, getTodayXp, getTotalXp, updateTodayXp, getXpHistory, populateStudent, getUser, getUserById, setupIntegration, getIntegrations, verifyIntegration, getConfig2, deleteIntegrations, endActivity, heartbeat, advanceCourse, getStudentXp, getRoster, getStudentOverview, getStudentActivity, getActivityDetail, grantXp, adjustTime, adjustMastery, searchStudents, enrollStudent, unenrollStudent, reactivateEnrollment, listAssessments, createAssessment, deleteAssessment, reorderAssessments, reorderQuestions, activateAssessment, deactivateAssessment, listQuestions, createQuestion, updateQuestion, deleteQuestion, getAssessmentBankStatus, destroyAssessmentBank, timeback2;
 var init_timeback_controller = __esm(() => {
   init_esm();
   init_schemas_index();
@@ -97873,17 +97933,6 @@ var init_timeback_controller = __esm(() => {
     });
     return ctx.services.timebackAdmin.adjustMasteredUnits(body2, ctx.user);
   });
-  toggleCompletion = requireGameManagementAccess(async (ctx) => {
-    const body2 = await parseRequestBody(ctx.request, ToggleCourseCompletionRequestSchema);
-    logger65.debug("Toggling course completion", {
-      requesterId: ctx.user.id,
-      gameId: body2.gameId,
-      courseId: body2.courseId,
-      studentId: body2.studentId,
-      action: body2.action
-    });
-    return ctx.services.timebackAdmin.toggleCourseCompletion(body2, ctx.user);
-  });
   searchStudents = requireGameManagementAccess(async (ctx) => {
     const gameId = ctx.params.gameId;
     const courseId = ctx.params.courseId;
@@ -97919,6 +97968,17 @@ var init_timeback_controller = __esm(() => {
     });
     return ctx.services.timebackAdmin.unenrollStudent(body2, ctx.user);
   });
+  reactivateEnrollment = requireGameManagementAccess(async (ctx) => {
+    const body2 = await parseRequestBody(ctx.request, ReactivateEnrollmentRequestSchema);
+    logger65.debug("Reactivating enrollment", {
+      requesterId: ctx.user.id,
+      gameId: body2.gameId,
+      courseId: body2.courseId,
+      studentId: body2.studentId,
+      enrollmentId: body2.enrollmentId
+    });
+    return ctx.services.timebackAdmin.reactivateEnrollment(body2, ctx.user);
+  });
   listAssessments = requireGameManagementAccess(async (ctx) => {
     const { gameId, courseId } = ctx.params;
     if (!gameId || !courseId) {
@@ -98064,10 +98124,10 @@ var init_timeback_controller = __esm(() => {
     grantXp,
     adjustTime,
     adjustMastery,
-    toggleCompletion,
     searchStudents,
     enrollStudent,
     unenrollStudent,
+    reactivateEnrollment,
     listAssessments,
     createAssessment,
     deleteAssessment,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/sandbox",
-    "version": "0.3.17-beta.33",
+    "version": "0.3.17-beta.35",
     "description": "Local development server for Playcademy game development",
     "type": "module",
     "exports": {