@studious-lms/server 1.15.0 → 1.16.0

package/src/pipelines/gradeWorksheet.ts

@@ -20,6 +20,63 @@ const removeAllPreviousAIComments = async (worksheetQuestionProgressId: string)
     });
 };
 
+type MarkSchemeItem = { id: string; points: number; description?: string; text?: string };
+
+const gradingResponseSchema = z.object({
+    isCorrect: z.boolean(),
+    points: z.number(),
+    markschemeState: z.array(z.object({
+        id: z.string(),
+        correct: z.boolean(),
+    })),
+    comments: z.array(z.string()),
+    annotations: z.array(z.object({
+        quote: z.string().describe('An exact substring from the student response that is relevant to this criterion.'),
+        markSchemeId: z.string().describe('The id of the mark scheme criterion this quote relates to.'),
+        criterion: z.string().describe('Short label describing what this mark scheme criterion evaluates.'),
+        met: z.boolean().describe('Whether the quoted text satisfies this criterion.'),
+    })).describe('Highlight specific parts of the student response and map each to a mark scheme criterion.'),
+});
+
+function buildGradingPrompt(
+    question: { question: string; answer: string; type: WorksheetQuestionType; points: number; markScheme: unknown },
+    responseText: string,
+): string {
+    const markSchemeItems = Array.isArray(question.markScheme) ? question.markScheme as MarkSchemeItem[] : [];
+    const markSchemeBlock = markSchemeItems.length > 0
+        ? markSchemeItems.map((item, i) =>
+            `  ${i + 1}. [id="${item.id}", ${item.points} pts] ${item.description || item.text || `Criterion ${i + 1}`}`
+        ).join('\n')
+        : '  No mark scheme provided — grade based on correctness and completeness.';
+
+    const maxPoints = question.points || markSchemeItems.reduce((sum, item) => sum + (item.points || 0), 0);
+
+    return `Grade the following student response.
+
+Question type: ${question.type}
+Maximum points: ${maxPoints}
+
+QUESTION:
+${question.question}
+
+CORRECT ANSWER:
+${question.answer || 'No answer key provided.'}
+
+MARK SCHEME:
+${markSchemeBlock}
+
+STUDENT RESPONSE:
+${responseText}
+
+INSTRUCTIONS:
+- Evaluate the student response against each mark scheme criterion.
+- Total points must not exceed ${maxPoints}.
+- For each criterion, find the exact substring in the student's response that is relevant (the "quote" field). Copy the text verbatim — do not paraphrase.
+- If no part of the response addresses a criterion, still include an annotation with an empty quote and met=false.
+- Provide constructive feedback comments.
+- Mark isCorrect=true only if the student earned full or near-full marks.`;
+}
+
 const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {
 
     await removeAllPreviousAIComments(worksheetQuestionProgressId);
@@ -83,38 +140,12 @@ const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQues
         return updatedProgress;
     }
 
-    const comments = studentQuestionProgress.comments;
-
     try {
+        const prompt = buildGradingPrompt(question, responseText);
+
         const apiResponse = await inference(
-            `Grade the following worksheet response:
-            
-            Question: ${question.question}
-            Response: ${responseText}
-
-            Comments: ${comments.map((comment) => comment.content).join('\n')}
-            Mark Scheme: ${JSON.stringify(question.markScheme)}
-            
-            Justify your reasoning by including comment(s) and mark the question please.         
-            Return ONLY JSON in the following format (fill in the values as per the question):
-           {
-            "isCorrect": <boolean>,
-            "points": <number>,
-            "markschemeState": [
-                { "id": <string>, "correct": <boolean> }
-            ],
-            "comments": [<string>, ...]
-            }
-            `,
-            z.object({
-                isCorrect: z.boolean(),
-                points: z.number(),
-                markschemeState: z.array(z.object({
-                    id: z.string(),
-                    correct: z.boolean(),
-                  })), // @note: this has to be converted to [id: string]: correct boolean
-                comments: z.array(z.string()),
-            }),
+            prompt,
+            gradingResponseSchema,
             {
                 reason: 'worksheet_autograde',
                 metadata: {
@@ -128,6 +159,27 @@ const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQues
             throw error;
         });
 
+        const maxPoints = question.points || 0;
+        const clampedPoints = Math.max(0, Math.min(Math.round((apiResponse as { points: number }).points), maxPoints));
+
+        const validMarkSchemeIds = new Set(
+            (Array.isArray(question.markScheme) ? question.markScheme as MarkSchemeItem[] : []).map(item => item.id),
+        );
+
+        const validatedMarkschemeState = (apiResponse as {
+            markschemeState: { id: string; correct: boolean }[];
+        }).markschemeState
+            .filter(item => validMarkSchemeIds.has(item.id))
+            .reduce((acc, curr) => {
+                acc["item-" + curr.id] = curr.correct;
+                return acc;
+            }, {} as Record<string, boolean>);
+
+        const annotations = (apiResponse as {
+            annotations: { quote: string; markSchemeId: string; criterion: string; met: boolean }[];
+        }).annotations
+            .filter(a => a.quote.length === 0 || responseText.includes(a.quote));
+
         const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({
             where: { id: studentQuestionProgress.id, status: {
                 not: {
@@ -137,13 +189,11 @@ const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQues
             data: {
                 status: JobStatus.COMPLETED,
                 isCorrect: (apiResponse as { isCorrect: boolean }).isCorrect,
-                points: (apiResponse as { points: number }).points,
-                markschemeState: (apiResponse as {
-                    markschemeState: { id: string; correct: boolean }[];
-                }).markschemeState.reduce((acc, curr) => {
-                    acc["item-" + curr.id] = curr.correct;
-                    return acc;
-                }, {} as Record<string, boolean>),
+                points: clampedPoints,
+                markschemeState: {
+                    ...validatedMarkschemeState,
+                    _annotations: annotations,
+                },
                 comments: {
                     create: (apiResponse as {
                         comments: string[];
@@ -279,7 +329,14 @@ export const gradeWorksheetPipeline = async (worksheetResponseId: string) => {
             continue;
         }
 
-        await gradeWorksheetQuestion(worksheetResponseId, response.id);
+        try {
+            await gradeWorksheetQuestion(worksheetResponseId, response.id);
+        } catch (questionError) {
+            logger.error('Failed to grade individual question, continuing with remaining questions', {
+                questionId: response.questionId,
+                error: questionError,
+            });
+        }
 
     };
 };

package/src/pipelines/labChatPrompt.ts

@@ -47,7 +47,6 @@ const LAB_CHAT_REFERENCE_RULES = [
 
 const LAB_CHAT_DOC_RULES = [
   "WHEN CREATING FILES (generate_document tool):",
-  "- Call generate_document with title, content (markdown/plain), and format.",
   "- You can generate MANY file types — not just PDF. Always pass format explicitly.",
   "- Match format to what the teacher asked for:",
   "  * slides / presentation / deck → pptx",
@@ -56,10 +55,8 @@ const LAB_CHAT_DOC_RULES = [
   "  * printable worksheet / reading → pdf",
   "  * diagram / chart image → png",
   "  * notes / readme → md or txt",
-  "- Supported: pdf, docx, xlsx, pptx, csv, md, html, txt, json, xml, tex, png, jpeg, gif, zip, py, js, ts, css, sh.",
-  "- Use markdown structure in content: # headings, paragraphs, - bullets, 1. numbered lists.",
+  "- Supported: pdf, docx, xlsx, pptx, csv, md, html, txt, json, xml, png, jpeg, gif, zip, py, js, ts, …",
   "- Write complete classroom-ready content — no placeholders.",
-  "- One file per tool call; split long packs into logical separate documents if needed.",
   "- In your spoken reply, name the actual format (e.g. \"PowerPoint\", \"spreadsheet\") — never say you only make PDFs.",
 ];
 

package/src/routers/auth.ts

@@ -5,7 +5,6 @@ import {
   protectedProcedure,
   publicProcedure,
 } from "../trpc.js";
-import { CURRENT_TERMS_VERSION } from "../lib/legal.js";
 import {
   register,
   login,
@@ -28,16 +27,6 @@ const registerSchema = z
     email: z.string().email("Invalid email address"),
     password: z.string().min(6, "Password must be at least 6 characters"),
     confirmPassword: z.string(),
-    agreeToTerms: z.literal(true, {
-      errorMap: () => ({
-        message: "You must accept the Terms of Service and Privacy Policy",
-      }),
-    }),
-    termsVersion: z.literal(CURRENT_TERMS_VERSION, {
-      errorMap: () => ({
-        message: "Please accept the current Terms of Service and Privacy Policy",
-      }),
-    }),
   })
   .refine((data) => data.password === data.confirmPassword, {
     message: "Passwords don't match",
@@ -52,8 +41,6 @@ export const authRouter = createTRPCRouter({
         username: input.username,
         email: input.email,
         password: input.password,
-        agreeToTerms: input.agreeToTerms,
-        termsVersion: input.termsVersion,
       })
     ),
 

package/src/routers/user.ts

@@ -1,4 +1,3 @@
-import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 import { createTRPCRouter, protectedProcedure } from "../trpc.js";
 import {
@@ -6,10 +5,6 @@ import {
   updateProfile,
   getUploadUrl,
 } from "../services/user.js";
-import {
-  deleteUserAccount,
-  exportUserData,
-} from "../services/userPrivacy.js";
 
 const fileUploadSchema = z.object({
   filePath: z.string().min(1, "File path is required"),
@@ -84,25 +79,4 @@ export const userRouter = createTRPCRouter({
     .mutation(({ ctx, input }) =>
       getUploadUrl(ctx.user!.id, input.fileName, input.fileType)
     ),
-
-  exportData: protectedProcedure.query(({ ctx }) =>
-    exportUserData(ctx.user!.id),
-  ),
-
-  deleteAccount: protectedProcedure
-    .input(
-      z.object({
-        confirmUsername: z.string().min(1),
-      }),
-    )
-    .mutation(async ({ ctx, input }) => {
-      const profile = await getProfile(ctx.user!.id);
-      if (profile.username !== input.confirmUsername) {
-        throw new TRPCError({
-          code: "BAD_REQUEST",
-          message: "Username confirmation does not match",
-        });
-      }
-      return deleteUserAccount(ctx.user!.id);
-    }),
 });

package/src/services/aiChatStream.ts

@@ -87,13 +87,6 @@ export function applyResolvedFormatsToStreamParts(
   });
 }
 
-/** Tools that queue async work after the model stream; UI stays loading until the pipeline finishes. */
-const DEFERRED_COMPLETION_TOOLS = new Set(['generate_document']);
-
-function isDeferredCompletionTool(toolName: string): boolean {
-  return DEFERRED_COMPLETION_TOOLS.has(toolName);
-}
-
 /** Attach file IDs to `generate_document` tool parts for inline download chips. */
 export function enrichStreamPartsWithGeneratedFiles(
   parts: StreamPart[],
@@ -133,24 +126,11 @@ export function enrichStreamPartsWithGeneratedFiles(
       ...part,
       fileId: file.fileId,
       fileName: file.fileName,
-      status: 'completed',
       ...(file.format ? { format: file.format } : {}),
     };
   });
 }
 
-/** Mark deferred tools completed (file linked) or failed (generation did not produce a file). */
-export function finalizeDeferredToolParts(parts: StreamPart[]): StreamPart[] {
-  return parts.map((part) => {
-    if (part.type !== 'tool' || !isDeferredCompletionTool(part.toolName)) {
-      return part;
-    }
-    if (part.fileId) return { ...part, status: 'completed' };
-    if (part.status === 'executing') return { ...part, status: 'failed' };
-    return part;
-  });
-}
-
 function toolFieldFromInput(input: unknown, key: string): string | undefined {
   if (input && typeof input === 'object') {
     const val = (input as Record<string, unknown>)[key];
@@ -291,15 +271,8 @@ export async function streamChatResponse(
         }
         case 'tool-result':
         case 'tool-error': {
-          const failed = part.type === 'tool-error';
-          const deferred = isDeferredCompletionTool(part.toolName);
-          // Deferred tools (e.g. generate_document) only queue work during the
-          // stream — keep the spinner until the pipeline attaches a file.
-          const status: 'executing' | 'completed' | 'failed' = failed
-            ? 'failed'
-            : deferred
-              ? 'executing'
-              : 'completed';
+          const status: 'completed' | 'failed' =
+            part.type === 'tool-error' ? 'failed' : 'completed';
           const title = toolTitleFromInput(part.input);
           const format = toolFieldFromInput(part.input, 'format');
           const idx = toolPartIndexById.get(part.toolCallId);
@@ -314,7 +287,7 @@ export async function streamChatResponse(
             toolName: part.toolName,
             input: part.input,
             output: part.type === 'tool-result' ? part.output : undefined,
-            status: failed ? 'failed' : 'completed',
+            status,
           });
           await broadcast('message-tool-call', {
             messageId: aiMessageId,

package/src/services/aiProposalTools.ts

@@ -241,12 +241,6 @@ export function labProposalTools(proposals: LabProposals): ToolSet {
       inputSchema: jsonSchema({
         type: 'object',
         properties: {
-          title: { type: 'string', description: 'Document title' },
-          content: {
-            type: 'string',
-            description:
-              'Full body — markdown or plain text with headings, lists, tables, slide notes, etc.',
-          },
           format: {
             type: 'string',
             description:
@@ -257,6 +251,11 @@ export function labProposalTools(proposals: LabProposals): ToolSet {
               'py', 'js', 'ts', 'css', 'sh',
             ],
           },
+          title: { type: 'string', description: 'Document title' },
+          content: {
+            type: 'string',
+            description: 'Full body — markdown or plain text with headings, lists, tables, slide notes, etc.',
+          },
         },
         required: ['title', 'content', 'format'],
       }),

package/src/services/aiTools.ts

@@ -251,7 +251,7 @@ export function aiTools(classId: string): ToolSet {
           const client = new OpenAI();
           const response = await client.responses.create({
             model: 'gpt-4o-mini',
-            tools: [{ type: 'web_search' }],
+            tools: [{ type: 'web_search_preview' }],
             input: query,
           });
 

package/src/services/auth.ts

@@ -10,7 +10,6 @@ import { sendMail } from "../utils/email.js";
 import { prismaWrapper } from "../utils/prismaWrapper.js";
 import { env } from "../lib/config/env.js";
 import { logger } from "../utils/logger.js";
-import { CURRENT_TERMS_VERSION } from "../lib/legal.js";
 import {
   findUserByUsername,
   findUserByUsernameOrEmail,
@@ -33,17 +32,8 @@ export async function register(input: {
   username: string;
   email: string;
   password: string;
-  agreeToTerms: true;
-  termsVersion: string;
 }) {
-  const { username, email, password, termsVersion } = input;
-
-  if (termsVersion !== CURRENT_TERMS_VERSION) {
-    throw new TRPCError({
-      code: "BAD_REQUEST",
-      message: "Please accept the current Terms of Service and Privacy Policy.",
-    });
-  }
+  const { username, email, password } = input;
 
   const existingUser = await prismaWrapper.findFirst(
     () => findUserByUsernameOrEmail(username, email),
@@ -80,9 +70,7 @@ export async function register(input: {
         username,
         email,
         password: await hash(password, 10),
-        verified: false,
-        termsAcceptedAt: new Date(),
-        termsVersion,
+        verified: true,
       }),
     "creating new user during registration"
   );

package/src/services/marketing.ts

@@ -4,7 +4,7 @@
 import { v4 } from "uuid";
 import {
   createSchoolDevelopmentProgram,
-  findSchoolDevelopmentProgramStatusById,
+  findSchoolDevelopmentProgramById,
   createEarlyAccessRequest,
 } from "../models/marketing.js";
 
@@ -42,9 +42,9 @@ export async function createSchoolDevelopmentProgramRecord(input: {
   return { id: program.id };
 }
 
-/** Public application status lookup (no contact PII). */
+/** Look up a school development program by ID. */
 export async function searchSchoolDevelopmentPrograms(id: string) {
-  return findSchoolDevelopmentProgramStatusById(id);
+  return findSchoolDevelopmentProgramById(id);
 }
 
 /** Create an early access request. */