@playcademy/sandbox 0.3.17-beta.34 → 0.3.17-beta.36

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.34",
+    version: "0.3.17-beta.36",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -30433,6 +30433,24 @@ 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) {
@@ -30792,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") {
@@ -30901,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();
@@ -31177,6 +31184,7 @@ class TimebackAdminService {
         ...enrollmentSummaries ? { enrollments: enrollmentSummaries } : {}
       };
     });
+    courses.sort((a, b) => a.grade - b.grade);
     return {
       student: {
         studentId,
@@ -31276,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" };
   }
@@ -37041,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,
@@ -37055,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
     });
   }
@@ -38271,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();
   }
@@ -95205,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, ReactivateEnrollmentRequestSchema, 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();
@@ -95376,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),
@@ -97577,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, reactivateEnrollment, 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();
@@ -97978,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;
@@ -98180,7 +98125,6 @@ var init_timeback_controller = __esm(() => {
     grantXp,
     adjustTime,
     adjustMastery,
-    toggleCompletion,
     searchStudents,
     enrollStudent,
     unenrollStudent,

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.34",
+    version: "0.3.17-beta.36",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -30432,6 +30432,24 @@ 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) {
@@ -30791,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") {
@@ -30900,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();
@@ -31176,6 +31183,7 @@ class TimebackAdminService {
         ...enrollmentSummaries ? { enrollments: enrollmentSummaries } : {}
       };
     });
+    courses.sort((a, b) => a.grade - b.grade);
     return {
       student: {
         studentId,
@@ -31275,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" };
   }
@@ -37040,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,
@@ -37054,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
     });
   }
@@ -38270,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();
   }
@@ -95204,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, ReactivateEnrollmentRequestSchema, 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();
@@ -95375,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),
@@ -97576,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, reactivateEnrollment, 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();
@@ -97977,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;
@@ -98179,7 +98124,6 @@ var init_timeback_controller = __esm(() => {
     grantXp,
     adjustTime,
     adjustMastery,
-    toggleCompletion,
     searchStudents,
     enrollStudent,
     unenrollStudent,

package/package.json

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