@studious-lms/server 1.11.0 → 1.13.0

package/prisma/migrations/20260510183000_add_discussions/migration.sql

@@ -0,0 +1,151 @@
+-- CreateEnum
+CREATE TYPE "DiscussionType" AS ENUM ('DISCUSSION', 'QUESTION', 'ANNOUNCEMENT');
+
+-- AlterTable
+ALTER TABLE "Class" ADD COLUMN "discussionsEnabled" BOOLEAN NOT NULL DEFAULT true;
+ALTER TABLE "Class" ADD COLUMN "studentsCanCreateDiscussions" BOOLEAN NOT NULL DEFAULT true;
+ALTER TABLE "Class" ADD COLUMN "studentsCanReply" BOOLEAN NOT NULL DEFAULT true;
+
+-- AlterTable
+ALTER TABLE "File" ADD COLUMN "discussionId" TEXT;
+ALTER TABLE "File" ADD COLUMN "discussionReplyId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Reaction" ADD COLUMN "discussionId" TEXT;
+ALTER TABLE "Reaction" ADD COLUMN "discussionReplyId" TEXT;
+
+-- CreateTable
+CREATE TABLE "Discussion" (
+    "id" TEXT NOT NULL,
+    "classId" TEXT NOT NULL,
+    "authorId" TEXT NOT NULL,
+    "title" TEXT NOT NULL,
+    "body" TEXT NOT NULL,
+    "type" "DiscussionType" NOT NULL DEFAULT 'DISCUSSION',
+    "isPinned" BOOLEAN NOT NULL DEFAULT false,
+    "isLocked" BOOLEAN NOT NULL DEFAULT false,
+    "allowReplies" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "lastActivityAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Discussion_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "DiscussionReply" (
+    "id" TEXT NOT NULL,
+    "discussionId" TEXT NOT NULL,
+    "authorId" TEXT NOT NULL,
+    "parentId" TEXT,
+    "body" TEXT NOT NULL,
+    "isAcceptedAnswer" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "modifiedAt" TIMESTAMP(3),
+    "deletedAt" TIMESTAMP(3),
+
+    CONSTRAINT "DiscussionReply_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "DiscussionTag" (
+    "id" TEXT NOT NULL,
+    "classId" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "color" TEXT NOT NULL DEFAULT '#3B82F6',
+
+    CONSTRAINT "DiscussionTag_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "DiscussionRead" (
+    "userId" TEXT NOT NULL,
+    "discussionId" TEXT NOT NULL,
+    "lastReadAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "DiscussionRead_pkey" PRIMARY KEY ("userId","discussionId")
+);
+
+-- CreateTable
+CREATE TABLE "_DiscussionToTag" (
+    "A" TEXT NOT NULL,
+    "B" TEXT NOT NULL
+);
+
+-- CreateIndex
+CREATE INDEX "Discussion_classId_isPinned_lastActivityAt_idx" ON "Discussion"("classId", "isPinned", "lastActivityAt");
+
+-- CreateIndex
+CREATE INDEX "Discussion_classId_createdAt_idx" ON "Discussion"("classId", "createdAt");
+
+-- CreateIndex
+CREATE INDEX "DiscussionReply_discussionId_createdAt_idx" ON "DiscussionReply"("discussionId", "createdAt");
+
+-- CreateIndex
+CREATE INDEX "DiscussionReply_parentId_idx" ON "DiscussionReply"("parentId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "DiscussionTag_classId_name_key" ON "DiscussionTag"("classId", "name");
+
+-- CreateIndex
+CREATE INDEX "DiscussionRead_userId_idx" ON "DiscussionRead"("userId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_DiscussionToTag_AB_unique" ON "_DiscussionToTag"("A", "B");
+
+-- CreateIndex
+CREATE INDEX "_DiscussionToTag_B_index" ON "_DiscussionToTag"("B");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Reaction_userId_discussionId_key" ON "Reaction"("userId", "discussionId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Reaction_userId_discussionReplyId_key" ON "Reaction"("userId", "discussionReplyId");
+
+-- CreateIndex
+CREATE INDEX "Reaction_discussionId_idx" ON "Reaction"("discussionId");
+
+-- CreateIndex
+CREATE INDEX "Reaction_discussionReplyId_idx" ON "Reaction"("discussionReplyId");
+
+-- AddForeignKey
+ALTER TABLE "File" ADD CONSTRAINT "File_discussionId_fkey" FOREIGN KEY ("discussionId") REFERENCES "Discussion"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "File" ADD CONSTRAINT "File_discussionReplyId_fkey" FOREIGN KEY ("discussionReplyId") REFERENCES "DiscussionReply"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Discussion" ADD CONSTRAINT "Discussion_classId_fkey" FOREIGN KEY ("classId") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Discussion" ADD CONSTRAINT "Discussion_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionReply" ADD CONSTRAINT "DiscussionReply_discussionId_fkey" FOREIGN KEY ("discussionId") REFERENCES "Discussion"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionReply" ADD CONSTRAINT "DiscussionReply_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionReply" ADD CONSTRAINT "DiscussionReply_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "DiscussionReply"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionTag" ADD CONSTRAINT "DiscussionTag_classId_fkey" FOREIGN KEY ("classId") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionRead" ADD CONSTRAINT "DiscussionRead_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionRead" ADD CONSTRAINT "DiscussionRead_discussionId_fkey" FOREIGN KEY ("discussionId") REFERENCES "Discussion"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Reaction" ADD CONSTRAINT "Reaction_discussionId_fkey" FOREIGN KEY ("discussionId") REFERENCES "Discussion"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Reaction" ADD CONSTRAINT "Reaction_discussionReplyId_fkey" FOREIGN KEY ("discussionReplyId") REFERENCES "DiscussionReply"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_DiscussionToTag" ADD CONSTRAINT "_DiscussionToTag_A_fkey" FOREIGN KEY ("A") REFERENCES "Discussion"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_DiscussionToTag" ADD CONSTRAINT "_DiscussionToTag_B_fkey" FOREIGN KEY ("B") REFERENCES "DiscussionTag"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/schema.prisma

@@ -84,6 +84,12 @@ enum ReactionType {
   HAPPY
 }
 
+enum DiscussionType {
+  DISCUSSION
+  QUESTION
+  ANNOUNCEMENT
+}
+
 enum SubmissionRecommendationState {
   NONE
   OPEN
@@ -227,6 +233,9 @@ model User {
   createdLabChats         LabChat[]            @relation("CreatedLabChats")
   comments                Comment[]
   reactions               Reaction[]
+  discussions             Discussion[]
+  discussionReplies       DiscussionReply[]
+  discussionReads         DiscussionRead[]
 }
 
 model SchoolMembership {
@@ -311,6 +320,12 @@ model Class {
   departmentId      String?
   tags              Tag[]             @relation("ClassTags")
   permissions       Permission[]      @relation("ClassPermissions")
+  discussions       Discussion[]
+  discussionTags    DiscussionTag[]
+
+  discussionsEnabled              Boolean @default(true)
+  studentsCanCreateDiscussions    Boolean @default(true)
+  studentsCanReply                Boolean @default(true)
 
   @@index([schoolId])
   @@index([departmentId])
@@ -422,6 +437,12 @@ model File {
   announcement   Announcement? @relation("AnnouncementAttachments", fields: [announcementId], references: [id], onDelete: Cascade)
   announcementId String?
 
+  discussion   Discussion? @relation("DiscussionFiles", fields: [discussionId], references: [id], onDelete: Cascade)
+  discussionId String?
+
+  discussionReply   DiscussionReply? @relation("DiscussionReplyFiles", fields: [discussionReplyId], references: [id], onDelete: Cascade)
+  discussionReplyId String?
+
   schools School[] @relation("SchoolLogo")
 
   schoolDevelopementProgram   SchoolDevelopementProgram? @relation("SchoolDevelopementProgramSupportingDocumentation", fields: [schoolDevelopementProgramId], references: [id], onDelete: Cascade)
@@ -498,6 +519,7 @@ model Comment {
   parentCommentId           String?
   replies                   Comment[]                @relation("CommentReplies")
   reactions                 Reaction[]
+  isPinned                  Boolean                  @default(false)
   createdAt                 DateTime                 @default(now())
   modifiedAt                DateTime?                @updatedAt
   studentQuestionProgress   StudentQuestionProgress? @relation("StudentQuestionProgressComments", fields: [studentQuestionProgressId], references: [id], onDelete: Cascade)
@@ -507,6 +529,74 @@ model Comment {
   @@index([submissionId])
 }
 
+model Discussion {
+  id             String            @id @default(uuid())
+  class          Class             @relation(fields: [classId], references: [id], onDelete: Cascade)
+  classId        String
+  author         User              @relation(fields: [authorId], references: [id], onDelete: Cascade)
+  authorId       String
+  title          String
+  body           String
+  type           DiscussionType    @default(DISCUSSION)
+  isPinned       Boolean           @default(false)
+  isLocked       Boolean           @default(false)
+  allowReplies   Boolean           @default(true)
+  attachments    File[]            @relation("DiscussionFiles")
+  tags           DiscussionTag[]   @relation("DiscussionToTag")
+  replies        DiscussionReply[]
+  reactions      Reaction[]
+  reads          DiscussionRead[]
+  createdAt      DateTime          @default(now())
+  updatedAt      DateTime          @updatedAt
+  lastActivityAt DateTime          @default(now())
+
+  @@index([classId, isPinned, lastActivityAt])
+  @@index([classId, createdAt])
+}
+
+model DiscussionReply {
+  id               String            @id @default(uuid())
+  discussion       Discussion        @relation(fields: [discussionId], references: [id], onDelete: Cascade)
+  discussionId     String
+  author           User              @relation(fields: [authorId], references: [id], onDelete: Cascade)
+  authorId         String
+  parent           DiscussionReply?  @relation("ReplyTree", fields: [parentId], references: [id], onDelete: Cascade)
+  parentId         String?
+  children         DiscussionReply[] @relation("ReplyTree")
+  body             String
+  attachments      File[]            @relation("DiscussionReplyFiles")
+  reactions        Reaction[]
+  isAcceptedAnswer Boolean           @default(false)
+  createdAt        DateTime          @default(now())
+  modifiedAt       DateTime?         @updatedAt
+  deletedAt        DateTime?
+
+  @@index([discussionId, createdAt])
+  @@index([parentId])
+}
+
+model DiscussionTag {
+  id          String       @id @default(uuid())
+  class       Class        @relation(fields: [classId], references: [id], onDelete: Cascade)
+  classId     String
+  name        String
+  color       String       @default("#3B82F6")
+  discussions Discussion[] @relation("DiscussionToTag")
+
+  @@unique([classId, name])
+}
+
+model DiscussionRead {
+  user         User       @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId       String
+  discussion   Discussion @relation(fields: [discussionId], references: [id], onDelete: Cascade)
+  discussionId String
+  lastReadAt   DateTime   @default(now())
+
+  @@id([userId, discussionId])
+  @@index([userId])
+}
+
 model Reaction {
   id             String        @id @default(uuid())
   type           ReactionType
@@ -516,12 +606,20 @@ model Reaction {
   announcementId String?
   comment        Comment?      @relation(fields: [commentId], references: [id], onDelete: Cascade)
   commentId      String?
+  discussion        Discussion?      @relation(fields: [discussionId], references: [id], onDelete: Cascade)
+  discussionId      String?
+  discussionReply   DiscussionReply? @relation(fields: [discussionReplyId], references: [id], onDelete: Cascade)
+  discussionReplyId String?
   createdAt      DateTime      @default(now())
 
   @@unique([userId, announcementId])
   @@unique([userId, commentId])
+  @@unique([userId, discussionId])
+  @@unique([userId, discussionReplyId])
   @@index([announcementId])
   @@index([commentId])
+  @@index([discussionId])
+  @@index([discussionReplyId])
 }
 
 model Submission {

package/src/index.ts

@@ -58,7 +58,8 @@ app.use(cors({
   },
   credentials: true,
   methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
-  allowedHeaders: ['Content-Type', 'Authorization', 'X-Requested-With', 'x-user'],
+  // Omit allowedHeaders so `cors` echoes `Access-Control-Request-Headers` on preflight.
+  // A fixed list breaks browsers that add headers (e.g. Sentry `baggage`, `sentry-trace`).
   preflightContinue: false,
   optionsSuccessStatus: 204,
 }));
@@ -221,6 +222,38 @@ app.post('/api/pusher/auth', async (req, res) => {
       }
     }
 
+    if (channel_name.startsWith('private-class-') && channel_name.endsWith('-discussions')) {
+      const classId = channel_name
+        .replace('private-class-', '')
+        .replace('-discussions', '');
+      const isMember = await prisma.class.findFirst({
+        where: {
+          id: classId,
+          discussionsEnabled: true,
+          OR: [
+            { students: { some: { id: user.id } } },
+            { teachers: { some: { id: user.id } } },
+            {
+              school: {
+                is: {
+                  memberships: {
+                    some: {
+                      userId: user.id,
+                      role: 'ADMIN',
+                      status: 'ACTIVE',
+                    },
+                  },
+                },
+              },
+            },
+          ],
+        },
+      });
+      if (!isMember) {
+        return res.status(403).json({ error: 'Not a member of this class discussion channel' });
+      }
+    }
+
     // Verify channel access for private-class-* channels
     // if (channel_name.startsWith('private-class-')) {
     //   const classId = channel_name.replace('private-class-', '');
@@ -586,7 +619,11 @@ app.options('/trpc/*', (req, res) => {
     res.setHeader('Access-Control-Allow-Origin', origin);
     res.setHeader('Access-Control-Allow-Credentials', 'true');
     res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
-    res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, X-Requested-With, x-user');
+    const requestedHeaders = req.headers['access-control-request-headers'];
+    if (requestedHeaders) {
+      res.setHeader('Access-Control-Allow-Headers', requestedHeaders);
+      res.setHeader('Vary', 'Origin, Access-Control-Request-Headers');
+    }
   }
   res.sendStatus(204);
 });

package/src/lib/config/cors.ts

@@ -9,6 +9,11 @@ const productionOrigins = [
   'https://www.studious.sh',
   'https://studious.sh',
   'https://dev.studious.sh',
+  // @todo: remove in actual prod
+'http://localhost:3000',
+  'http://localhost:3001',
+  'http://127.0.0.1:3000',
+  'http://127.0.0.1:3001',
 ];
 
 const nonProductionOrigins = [

package/src/lib/config/env.ts

@@ -63,6 +63,8 @@ const fullSchema = baseSchema.extend({
   INFERENCE_API_BASE_URL: z.string().url().optional(),
   OPENAI_API_KEY: z.string().optional(),
   LOG_MODE: z.enum(['normal', 'verbose', 'quiet']).default('normal'),
+  /** Comma/whitespace-separated user UUIDs allowed to call `admin.*` tRPC (required in production). */
+  ADMIN_PANEL_USER_IDS: z.string().optional(),
 });
 
 // Test schema - only require what's needed for tests
@@ -91,6 +93,7 @@ const testSchema = baseSchema.extend({
   OPENAI_API_KEY: z.string().optional(),
   INFERENCE_API_BASE_URL: z.string().url().optional(),
   LOG_MODE: z.enum(['normal', 'verbose', 'quiet']).default('quiet'),
+  ADMIN_PANEL_USER_IDS: z.string().optional(),
 });
 
 // Use test schema in test mode, full schema otherwise

package/src/lib/pusher.ts

@@ -12,6 +12,7 @@ const pusher = new Pusher({
 const chatChannel = (conversationId: string) => `private-conversation-${conversationId}`;
 const worksheetChannel = (worksheetResponseId: string) => `private-worksheet-${worksheetResponseId}`;
 const teacherChannel = (classId: string) => `private-teacher-${classId}`;
+const discussionChannel = (classId: string) => `private-class-${classId}-discussions`;
 /**
  * Per-worksheet job channel used for asynchronous worksheet creation
  * (e.g. PDF → worksheet conversion). Distinct prefix from the student
@@ -19,4 +20,4 @@ const teacherChannel = (classId: string) => `private-teacher-${classId}`;
  */
 const worksheetJobChannel = (worksheetId: string) => `private-worksheet-job-${worksheetId}`;
 
-export { pusher, chatChannel, worksheetChannel, teacherChannel, worksheetJobChannel };
+export { pusher, chatChannel, worksheetChannel, teacherChannel, discussionChannel, worksheetJobChannel };

package/src/models/class.ts

@@ -18,7 +18,6 @@ import {
 const classIncludeForGetAll = {
   assignments: {
     where: {
-      dueDate: { lte: new Date(new Date().setHours(23, 59, 59, 999)) },
       template: false,
     },
     select: {
@@ -26,6 +25,13 @@ const classIncludeForGetAll = {
       title: true,
       type: true,
       dueDate: true,
+      submissions: {
+        select: {
+          studentId: true,
+          submitted: true,
+          returned: true,
+        },
+      },
     },
   },
   students: {
@@ -180,6 +186,9 @@ const classIncludeForGet = {
       },
     },
   },
+  discussionsEnabled: true,
+  studentsCanCreateDiscussions: true,
+  studentsCanReply: true,
 } as const;
 
 const assignmentSelect = {

package/src/models/comment.ts

@@ -11,6 +11,7 @@ export const commentSelect = {
   assignmentId: true,
   submissionId: true,
   parentCommentId: true,
+  isPinned: true,
   createdAt: true,
   modifiedAt: true,
   author: {

package/src/models/conversation.ts

@@ -256,6 +256,18 @@ export function hideConversationMember(userId: string, conversationId: string) {
   });
 }
 
+/** Unhide a conversation for a single member. */
+export function unhideConversationMember(userId: string, conversationId: string) {
+  return prisma.conversationMember.update({
+    where: {
+      userId_conversationId: { userId, conversationId },
+    },
+    data: {
+      hiddenAt: null,
+    },
+  });
+}
+
 /** Remove a member from a conversation. */
 export function deleteConversationMember(userId: string, conversationId: string) {
   return prisma.conversationMember.delete({

package/src/models/worksheet.ts

@@ -22,7 +22,7 @@ export function findWorksheetById(id: string) {
   return prisma.worksheet.findUnique({
     where: { id },
     include: {
-      questions: { orderBy: { createdAt: "asc" as const } },
+      questions: { orderBy: { order: "asc" as const } },
       class: true,
     },
   });
@@ -43,7 +43,7 @@ export function findWorksheetByIdForClassMember(id: string, userId: string) {
       ...worksheetClassMemberWhere(userId),
     },
     include: {
-      questions: { orderBy: { createdAt: "asc" as const } },
+      questions: { orderBy: { order: "asc" as const } },
       class: true,
     },
   });
@@ -57,7 +57,7 @@ export function findWorksheetByIdForTeacher(id: string, userId: string) {
       ...worksheetTeacherWhere(userId),
     },
     include: {
-      questions: { orderBy: { createdAt: "asc" as const } },
+      questions: { orderBy: { order: "asc" as const } },
       class: true,
     },
   });
@@ -273,7 +273,10 @@ export function findSubmissionByIdForWorksheetAccess(
 const worksheetResponseInclude = {
   responses: {
     include: {
-      comments: { select: { id: true } },
+      comments: {
+        select: { id: true, isPinned: true },
+        orderBy: [{ isPinned: "desc" as const }, { createdAt: "asc" as const }],
+      },
     },
   },
 };
@@ -319,7 +322,10 @@ export function createWorksheetResponse(data: {
     include: {
       responses: {
         include: {
-          comments: { select: { id: true } },
+          comments: {
+            select: { id: true, isPinned: true },
+            orderBy: [{ isPinned: "desc" as const }, { createdAt: "asc" as const }],
+          },
         },
       },
     },
@@ -456,6 +462,34 @@ export function findStudentQuestionProgressByIdForTeacherAndResponse(
   });
 }
 
+/**
+ * @returns Student question progress if requester is the answering student (class member) or a
+ *   class teacher / school admin for that worksheet.
+ */
+export function findStudentQuestionProgressByIdForStudentOrTeacher(
+  id: string,
+  userId: string
+) {
+  return prisma.studentQuestionProgress.findFirst({
+    where: {
+      id,
+      OR: [
+        {
+          studentId: userId,
+          question: { worksheet: worksheetClassMemberWhere(userId) },
+        },
+        {
+          question: { worksheet: worksheetTeacherWhere(userId) },
+        },
+      ],
+    },
+    include: {
+      question: true,
+      studentWorksheetResponse: true,
+    },
+  });
+}
+
 /** Update student's question progress. */
 export function updateStudentQuestionProgress(
   id: string,

package/src/pipelines/gradeWorksheet.ts

@@ -22,6 +22,8 @@ const removeAllPreviousAIComments = async (worksheetQuestionProgressId: string)
 
 const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {
 
+    await removeAllPreviousAIComments(worksheetQuestionProgressId);
+
     const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({
         where: { id: worksheetResponseId },
         include: {
@@ -45,17 +47,8 @@ const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQues
     });
 
     if (!studentQuestionProgress) {
-       const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.create({
-        data: {
-            studentId: worksheetResponse.studentId,
-            questionId: worksheetQuestionProgressId,
-            response: '',
-            isCorrect: false,
-            markschemeState: {},
-        },
-       });
-
-        return updatedStudentQuestionProgress;
+        logger.error('Student question progress not found', { worksheetQuestionProgressId });
+        throw new Error('Student question progress not found');
     }
 
     pusher.trigger(worksheetChannel(worksheetResponse.id), `set-pending`, {
@@ -63,9 +56,34 @@ const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQues
     });
 
     const question = studentQuestionProgress.question;
-    const comments = studentQuestionProgress.comments;
     const responseText = studentQuestionProgress.response;
 
+    // Short-circuit for empty responses: award 0 points without calling inference
+    if (!responseText || responseText.trim().length === 0) {
+        const updatedProgress = await prisma.studentQuestionProgress.update({
+            where: { id: studentQuestionProgress.id, status: {
+                not: { in: [JobStatus.CANCELLED] },
+            } },
+            data: {
+                status: JobStatus.COMPLETED,
+                isCorrect: false,
+                points: 0,
+                markschemeState: {},
+                comments: {
+                    create: [{
+                        content: 'No answer provided.',
+                        authorId: getAIUserId(),
+                    }],
+                },
+            },
+        });
+        pusher.trigger(worksheetChannel(worksheetResponse.id), `set-completed`, {
+            id: updatedProgress.id,
+        });
+        return updatedProgress;
+    }
+
+    const comments = studentQuestionProgress.comments;
 
     try {
         const apiResponse = await inference(
@@ -206,7 +224,42 @@ export const gradeWorksheetPipeline = async (worksheetResponseId: string) => {
         throw new Error('Worksheet response not found');
     }
 
-    // Use for...of instead of forEach to properly handle async operations
+    // Find worksheet questions that have no StudentQuestionProgress for this response
+    // and create empty progress records so they get graded (with 0 points).
+    const allQuestions = await prisma.worksheetQuestion.findMany({
+        where: {
+            worksheetId: worksheetResponse.worksheetId,
+            type: {
+                notIn: [WorksheetQuestionType.MULTIPLE_CHOICE, WorksheetQuestionType.TRUE_FALSE],
+            },
+        },
+        select: { id: true },
+    });
+
+    const existingQuestionIds = new Set(
+        worksheetResponse.responses.map((r) => r.questionId),
+    );
+
+    for (const q of allQuestions) {
+        if (existingQuestionIds.has(q.id)) continue;
+
+        const created = await prisma.studentQuestionProgress.create({
+            data: {
+                studentId: worksheetResponse.studentId,
+                questionId: q.id,
+                studentWorksheetResponseId: worksheetResponseId,
+                response: '',
+                isCorrect: false,
+            },
+        });
+
+        worksheetResponse.responses.push({
+            ...created,
+            question: { id: q.id } as any,
+            comments: [],
+        } as any);
+    }
+
     for (const response of worksheetResponse.responses) {
         logger.info('Grading question', { questionId: response.questionId });
 
@@ -293,8 +346,6 @@ export const regradeWorksheetPipeline = async (worksheetResponseId: string, work
         where: { id: worksheetQuestionProgressId },
     });
 
-    await removeAllPreviousAIComments(worksheetQuestionProgressId);
-
     await gradeWorksheetQuestion(worksheetResponseId, worksheetQuestionProgressId);
 
     return updatedStudentQuestionProgress;