@studious-lms/server 1.13.0 → 1.14.0

package/prisma/migrations/20260610130000_add_worksheet_tags/migration.sql

@@ -0,0 +1,13 @@
+-- CreateTable (implicit many-to-many join for ClassTag <-> Worksheet)
+CREATE TABLE "_WorksheetToTag" (
+    "A" TEXT NOT NULL,
+    "B" TEXT NOT NULL,
+    CONSTRAINT "_WorksheetToTag_A_fkey" FOREIGN KEY ("A") REFERENCES "DiscussionTag"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "_WorksheetToTag_B_fkey" FOREIGN KEY ("B") REFERENCES "Worksheet"("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_WorksheetToTag_AB_unique" ON "_WorksheetToTag"("A", "B");
+
+-- CreateIndex
+CREATE INDEX "_WorksheetToTag_B_index" ON "_WorksheetToTag"("B");

package/prisma/schema.prisma

@@ -5,7 +5,8 @@
 // Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
 
 generator client {
-  provider = "prisma-client-js"
+  provider        = "prisma-client-js"
+  previewFeatures = ["postgresqlExtensions"]
   // output   = "../generated/prisma"
 }
 
@@ -15,9 +16,10 @@ generator client {
 // }
 
 datasource db {
-  provider  = "postgresql"
-  url       = env("DATABASE_URL")
-  directUrl = env("DIRECT_URL")
+  provider   = "postgresql"
+  url        = env("DATABASE_URL")
+  directUrl  = env("DIRECT_URL")
+  extensions = [vector]
 }
 
 enum AssignmentType {
@@ -321,7 +323,8 @@ model Class {
   tags              Tag[]             @relation("ClassTags")
   permissions       Permission[]      @relation("ClassPermissions")
   discussions       Discussion[]
-  discussionTags    DiscussionTag[]
+  classTags         ClassTag[]
+  embeddings        Embedding[]
 
   discussionsEnabled              Boolean @default(true)
   studentsCanCreateDiscussions    Boolean @default(true)
@@ -542,7 +545,7 @@ model Discussion {
   isLocked       Boolean           @default(false)
   allowReplies   Boolean           @default(true)
   attachments    File[]            @relation("DiscussionFiles")
-  tags           DiscussionTag[]   @relation("DiscussionToTag")
+  tags           ClassTag[]        @relation("DiscussionToTag")
   replies        DiscussionReply[]
   reactions      Reaction[]
   reads          DiscussionRead[]
@@ -575,15 +578,17 @@ model DiscussionReply {
   @@index([parentId])
 }
 
-model DiscussionTag {
+model ClassTag {
   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")
+  worksheets  Worksheet[]  @relation("WorksheetToTag")
 
   @@unique([classId, name])
+  @@map("DiscussionTag")
 }
 
 model DiscussionRead {
@@ -861,6 +866,7 @@ model Worksheet {
   runJob                    RunJob?                    @relation("WorksheetRunJob", fields: [runJobId], references: [id], onDelete: SetNull)
 
   status                    JobStatus?                 @default(NOT_STARTED)
+  tags                      ClassTag[]                 @relation("WorksheetToTag")
 
   @@unique([classId, sourceUrl])
 }
@@ -962,6 +968,31 @@ enum RunJobType {
   AI_LAB_CHAT
   AI_NEWTON_CHAT
   STUDENT_PROGRESS_CHAT
+  EMBED_CONTENT
+}
+
+enum EmbeddingSourceType {
+  FILE
+  ASSIGNMENT
+  WORKSHEET
+  ANNOUNCEMENT
+  SECTION
+}
+
+model Embedding {
+  id         String              @id @default(uuid())
+  classId    String
+  sourceType EmbeddingSourceType
+  sourceId   String
+  content    String
+  vector     Unsupported("vector(1536)")
+  metadata   Json?               @default("{}")
+  createdAt  DateTime            @default(now())
+
+  class Class @relation(fields: [classId], references: [id], onDelete: Cascade)
+
+  @@index([classId])
+  @@index([sourceType, sourceId])
 }
 
 enum RunJobStatus {

package/src/index.ts

@@ -27,6 +27,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import "./instrument.js";
 import { openAIClient } from './utils/inference.js';
+import { aiStreamRouter } from './routes/aiStream.js';
 
 const app = express();
 
@@ -313,6 +314,9 @@ io.engine.on('connection_error', (err: Error) => {
 // Setup socket handlers
 setupSocketHandlers(io);
 
+// AI streaming routes
+app.use('/api/ai', aiStreamRouter);
+
 // File serving endpoint for secure file access
 app.get('/api/files/:fileId', async (req, res) => {
   try {

package/src/lib/config/cors.ts

@@ -5,18 +5,24 @@ type CorsEnv = {
   CORS_ALLOWED_ORIGIN_PATTERNS?: string;
 };
 
-const productionOrigins = [
+// First-party Studious domains. These are always allowed, regardless of
+// NODE_ENV, so local/dev servers can still serve the real frontends.
+const studiousOrigins = [
   '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',
+  'https://superuser.studious.sh',
+  'https://*.studious.sh',
+  'https://www.studious.ac',
+  'https://studious.ac',
+  'https://dev.studious.ac',
+  'https://superuser.studious.ac',
+  'https://*.studious.ac',
 ];
 
-const nonProductionOrigins = [
+// Local development frontends.
+// @todo: gate these behind a non-production check before real prod.
+const localhostOrigins = [
   'http://localhost:3000',
   'http://localhost:3001',
   'http://127.0.0.1:3000',
@@ -40,6 +46,17 @@ const parseList = (value?: string) =>
 
 const isDefined = <T>(value: T | undefined | null): value is T => Boolean(value);
 
+const hasWildcard = (value: string) => value.includes('*');
+
+// Turn a wildcard origin like `https://*.studious.ac` into an anchored regex.
+// `*` matches one or more subdomain labels (e.g. `app` or `a.b`).
+const wildcardOriginToRegExp = (value: string) => {
+  const escaped = value
+    .replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+    .replace(/\\\*/g, '[a-z0-9-]+(?:\\.[a-z0-9-]+)*');
+  return new RegExp(`^${escaped}$`, 'i');
+};
+
 const toCorsOrigin = (value: string) => {
   try {
     return new URL(value).origin;
@@ -79,14 +96,20 @@ export const isValidCorsOriginPatternList = (patterns?: string) => {
 };
 
 export const createCorsOriginMatcher = (env: CorsEnv) => {
-  const allowedOrigins = Array.from(new Set([
-    ...(env.NODE_ENV === 'production' ? productionOrigins : nonProductionOrigins),
+  const configuredOrigins = Array.from(new Set([
+    ...studiousOrigins,
+    ...localhostOrigins,
     env.NEXT_PUBLIC_APP_URL ? toCorsOrigin(env.NEXT_PUBLIC_APP_URL) : undefined,
     ...parseCorsOrigins(env.CORS_ALLOWED_ORIGINS),
   ].filter(isDefined)));
 
+  // Wildcard entries (e.g. `https://*.studious.ac`) can't be matched by exact
+  // string comparison, so they're compiled into regex patterns instead.
+  const allowedOrigins = configuredOrigins.filter((origin) => !hasWildcard(origin));
+
   const allowedOriginPatterns = [
     vercelAppOriginPattern,
+    ...configuredOrigins.filter(hasWildcard).map(wildcardOriginToRegExp),
     ...parseCorsOriginPatterns(env.CORS_ALLOWED_ORIGIN_PATTERNS),
   ];
 

package/src/lib/config/env.ts

@@ -35,6 +35,12 @@ const baseSchema = z.object({
   NODE_ENV: z.enum(['development', 'production', 'test']).default('development'),
   PORT: z.string().transform(Number).default('3001'),
   DATABASE_URL: z.string().url('DATABASE_URL must be a valid URL'),
+  /**
+   * Optional BullMQ key prefix. Defaults to `bull:<NODE_ENV>` (see
+   * `getBullPrefix`). Set explicitly to isolate queues when multiple
+   * databases share one Redis instance (e.g. several devs on one Upstash).
+   */
+  BULL_PREFIX: z.string().optional(),
 });
 
 // Production/development schema with all required vars

package/src/lib/googleCloudStorage.ts

@@ -98,4 +98,25 @@ export async function copyFile(sourcePath: string, destPath: string): Promise<vo
       message: 'Failed to copy file in storage',
     });
   }
+}
+
+/**
+ * Returns the public URL for a GCS object.
+ * The object must be publicly readable (via ACL or bucket-level IAM).
+ */
+export function getPublicUrl(filePath: string): string {
+  return `https://storage.googleapis.com/${env.GOOGLE_CLOUD_BUCKET_NAME}/${filePath}`;
+}
+
+/**
+ * Best-effort attempt to make a GCS object publicly readable.
+ * Silently ignores errors (e.g. uniform bucket-level access enabled).
+ */
+export async function makeFilePublic(filePath: string): Promise<void> {
+  try {
+    await bucket.file(filePath).makePublic();
+  } catch {
+    // Bucket may use uniform access or already have a public IAM policy – either way, the
+    // public URL will work if the bucket allows it; nothing to do here.
+  }
 } 

package/src/lib/prisma.ts

@@ -30,6 +30,19 @@ const getDatabaseUrl = () => {
   }
 };
 
+/**
+ * Resolve a profile-picture value stored in the DB to a browser-loadable URL.
+ * - `null` / empty  → `null`
+ * - already an HTTP URL (e.g. dicebear)  → returned as-is
+ * - raw GCS object path  → converted to a public GCS URL
+ */
+function resolveProfilePictureUrl(raw: string | null): string | null {
+  if (!raw) return null;
+  if (raw.startsWith('http')) return raw;
+  const bucket = env.GOOGLE_CLOUD_BUCKET_NAME;
+  return `https://storage.googleapis.com/${bucket}/${raw}`;
+}
+
 const prismaClientSingleton = () => {
   return new PrismaClient({
     datasources: {
@@ -37,6 +50,23 @@ const prismaClientSingleton = () => {
         url: getDatabaseUrl(),
       },
     },
+  }).$extends({
+    result: {
+      userProfile: {
+        profilePicture: {
+          needs: { profilePicture: true },
+          compute(profile) {
+            return resolveProfilePictureUrl(profile.profilePicture);
+          },
+        },
+        profilePictureThumbnail: {
+          needs: { profilePictureThumbnail: true },
+          compute(profile) {
+            return resolveProfilePictureUrl(profile.profilePictureThumbnail);
+          },
+        },
+      },
+    },
   });
 };
 
@@ -53,4 +83,13 @@ if (env.NODE_ENV !== 'production') {
 
 process.on('beforeExit', async () => {
   await prisma.$disconnect();
-});
+});
+
+/** The concrete (extended) Prisma client type used throughout the app. */
+export type AppPrismaClient = typeof prisma;
+
+/** Transaction client type compatible with the extended Prisma client. */
+export type AppTransactionClient = Omit<
+  AppPrismaClient,
+  '$connect' | '$disconnect' | '$on' | '$transaction' | '$use' | '$extends'
+>;

package/src/models/class.ts

@@ -5,7 +5,8 @@
  */
 
 import { Assignment, Class, Folder, GradingBoundary, MarkScheme, Section, SessionType, Worksheet } from "@prisma/client";
-import type { PrismaClient, WorksheetQuestion } from "@prisma/client";
+import type { WorksheetQuestion } from "@prisma/client";
+import type { AppPrismaClient, AppTransactionClient } from "../lib/prisma.js";
 
 import { prisma } from "../lib/prisma.js";
 import { v4 as uuidv4 } from 'uuid';
@@ -477,7 +478,7 @@ async function recursivelyCopyFilesToGcs(folderId: string): Promise<Map<string,
 }
 
 async function recursivelyCreateFiles(
-  tx: PrismaClient | Omit<PrismaClient, "$connect" | "$disconnect" | "$on" | "$transaction" | "$use" | "$extends">,
+  tx: AppPrismaClient | AppTransactionClient,
   folderId: string,
   targetFolderId: string | undefined,
   pathMap: Map<string, string>

package/src/models/worksheet.ts

@@ -1,8 +1,8 @@
 /**
  * Worksheet model – worksheets, questions, submissions, student progress, grading.
  */
-import type { Prisma } from "@prisma/client";
 import { prisma } from "../lib/prisma.js";
+import type { AppTransactionClient } from "../lib/prisma.js";
 import type { WorksheetQuestionType, JobStatus } from "@prisma/client";
 import {
   classMemberOrSchoolAdminWhere,
@@ -45,6 +45,7 @@ export function findWorksheetByIdForClassMember(id: string, userId: string) {
     include: {
       questions: { orderBy: { order: "asc" as const } },
       class: true,
+      tags: true,
     },
   });
 }
@@ -59,6 +60,7 @@ export function findWorksheetByIdForTeacher(id: string, userId: string) {
     include: {
       questions: { orderBy: { order: "asc" as const } },
       class: true,
+      tags: true,
     },
   });
 }
@@ -69,6 +71,7 @@ export function findWorksheetsByClassId(classId: string) {
     where: { classId },
     include: {
       questions: { select: { id: true } },
+      tags: true,
     },
     orderBy: { createdAt: "desc" },
   });
@@ -121,7 +124,7 @@ export function deleteWorksheet(id: string) {
  * Does not copy student responses or assignment links.
  */
 export async function duplicateWorksheetWithClient(
-  tx: Prisma.TransactionClient,
+  tx: AppTransactionClient,
   sourceWorksheetId: string,
   targetClassId: string,
   name: string

package/src/pipelines/aiLabChat.ts

@@ -7,7 +7,6 @@ import { prisma } from "../lib/prisma.js";
 import { pusher, teacherChannel } from "../lib/pusher.js";
 import type { Assignment, Class, File, Section, User } from "@prisma/client";
 import {
-  inference,
   completePendingAIMessage,
   failPendingAIMessage,
 } from "../utils/inference.js";
@@ -16,8 +15,11 @@ import { createPdf } from "../lib/jsonConversion.js";
 import { v4 } from "uuid";
 import { bucket } from "../lib/googleCloudStorage.js";
 import { DocumentBlock } from "../lib/jsonStyles.js";
-import { type LabChatResponse, labChatResponseSchema } from "./aiLabChatContract.js";
-import { buildLabChatResponseMessages } from "./labChatPrompt.js";
+import { broadcastTextChunks, broadcastStreamComplete } from "../utils/streamBroadcast.js";
+import { buildLabChatAgentMessages } from "./labChatPrompt.js";
+import { streamChatResponse } from "../services/aiChatStream.js";
+import { aiTools } from "../services/aiTools.js";
+import { labProposalTools, createLabProposals } from "../services/aiProposalTools.js";
 
 /** Cap model wait time; leave headroom after inference for PDF/GCS/DB within Vercel maxDuration (500s). */
 const LAB_CHAT_RESPONSE_TIMEOUT_MS = 400_000;
@@ -303,33 +305,6 @@ export const getBaseSystemPrompt = (
 
 
 
-/**
- * Generate labchat responses
- * Allow for the generation of the following:
- * - Assignment(s) either individual or bulk as an lesson / course plan.
- * - Worksheet(s) either individual or bulk as an lesson / course plan.
- * - Files (PDFs)
- * @param labChatId 
- */
-// export const sendAiLabChatResponsePipeline = async (labChatId: string) => {
-//     const message = await prisma?.message.create({
-//         data: {
-//             content: "GENERATING_CONTENT",
-//             senderId: getAIUserId(),
-//             conversationId: labChatId,
-//             status: JobStatus.PENDING,
-//         },
-//     });
-
-//     try {
-
-//         inference(`
-//         `)
-//     }
-    
-// };
-
-
 /**
  * Fill the AI introduction placeholder for a brand-new lab chat.
  *
@@ -348,6 +323,7 @@ export const generateAndSendLabIntroduction = async (
       "Hello teaching team! I'm your AI assistant for course material development. I'll help you create educational content - when you have a clear request, I'll produce it directly. I only ask questions when I need to clarify the topic or scope. What would you like to work on?";
 
     try {
+      await broadcastTextChunks(conversationId, aiMessageId, introMessage);
       await completePendingAIMessage(aiMessageId, introMessage);
       logger.info('AI Introduction sent', { labChatId, conversationId, aiMessageId });
     } catch (error) {
@@ -474,50 +450,51 @@ export const generateAndSendLabIntroduction = async (
         assignments: classData.assignments,
       });
 
-      const messages = buildLabChatResponseMessages({
+      const { system, messages } = buildLabChatAgentMessages({
         context: fullLabChat.context,
         classContext,
         recentMessages: recentMessages.reverse(),
         isAIUser,
       });
-  
-  
-    //   const completion = await inferenceClient.chat.completions.create({
-    //     model: 'command-a-03-2025',
-    //     messages,
-    //     temperature: 0.7,
-    //     response_format: zodTextFormat(labChatResponseSchema, "lab_chat_response_format"),
-    //   });
-
-    const response = await withTimeout(
-      inference<LabChatResponse>(messages, labChatResponseSchema, {
-        reason: 'lab_chat_response',
-        metadata: {
-          labChatId,
+
+      // Genuine agentic generation: the model streams prose token-by-token and
+      // calls real tools inline — read-only RAG lookups plus "propose_*" tools
+      // that record create-actions into `proposals`. `streamChatResponse`
+      // broadcasts the real text chunks and tool-call events as they happen.
+      const proposals = createLabProposals();
+      const tools = {
+        ...aiTools(fullLabChat.classId),
+        ...labProposalTools(proposals),
+      };
+
+      const { text: streamedText, parts: streamParts } = await withTimeout(
+        streamChatResponse({
           conversationId,
-          classId: fullLabChat.classId,
           aiMessageId: emitOptions.aiMessageId,
-        },
-      }),
-      LAB_CHAT_RESPONSE_TIMEOUT_MS,
-      "Lab chat response generation",
-    );
-        
-      if (!response) {
-        throw new Error('No response generated from inference API');
-      }
-      // Parse the JSON response and generate PDF if docs are provided
+          system,
+          messages,
+          tools,
+          temperature: 0.7,
+          maxOutputTokens: 4096,
+          maxSteps: 8,
+        }),
+        LAB_CHAT_RESPONSE_TIMEOUT_MS,
+        "Lab chat response generation",
+      );
+
+      // Real text + tool-call events were already broadcast inline (in order)
+      // during the stream by `streamChatResponse`. Just close the stream.
+      await broadcastStreamComplete(conversationId, emitOptions.aiMessageId);
+
+      // Generate PDFs for any proposed documents and persist the message.
       try {
-        const jsonData = response;
-  
-  
         const attachmentIds: string[] = [];
-        // Generate PDFs if docs are provided
-        if (jsonData.docs && Array.isArray(jsonData.docs)) {
+        // Generate PDFs if docs were proposed
+        if (proposals.docs.length > 0) {
           
   
-          for (let i = 0; i < jsonData.docs.length; i++) {
-            const doc = jsonData.docs[i];
+          for (let i = 0; i < proposals.docs.length; i++) {
+            const doc = proposals.docs[i];
             if (!doc.title || !doc.blocks || !Array.isArray(doc.blocks)) {
               logger.error(`Document ${i + 1} is missing title or blocks`);
               continue;
@@ -577,30 +554,28 @@ export const generateAndSendLabIntroduction = async (
           }
         }
   
-        await completePendingAIMessage(emitOptions.aiMessageId, jsonData.text, {
+        await completePendingAIMessage(emitOptions.aiMessageId, streamedText, {
           attachments: {
             connect: attachmentIds.map(id => ({ id })),
           },
           meta: {
-            assignmentsToCreate: jsonData.assignmentsToCreate?.map(assignment => ({
-              ...assignment,
-              id: v4(),
-            })) || null,
-            worksheetsToCreate: jsonData.worksheetsToCreate?.map(worksheet => ({
-              ...worksheet,
-              id: v4(),
-            })) || null,
-            sectionsToCreate: jsonData.sectionsToCreate?.map(section => ({
-              ...section,
-              id: v4(),
-            })) || null,
+            assignmentsToCreate: proposals.assignments.length > 0
+              ? proposals.assignments.map(assignment => ({ ...assignment, id: v4() }))
+              : null,
+            worksheetsToCreate: proposals.worksheets.length > 0
+              ? proposals.worksheets.map(worksheet => ({ ...worksheet, id: v4() }))
+              : null,
+            sectionsToCreate: proposals.sections.length > 0
+              ? proposals.sections.map(section => ({ ...section, id: v4() }))
+              : null,
+            streamParts: streamParts.length > 0 ? streamParts : null,
           },
         });
-      } catch (parseError) {
-        logger.error('Failed to parse AI response or generate PDF:', { error: parseError, labChatId });
+      } catch (persistError) {
+        logger.error('Failed to persist AI response or generate PDF:', { error: persistError, labChatId });
         // Fallback: complete the placeholder with the raw text so the
         // teacher still sees something useful instead of FAILED.
-        await completePendingAIMessage(emitOptions.aiMessageId, response.text);
+        await completePendingAIMessage(emitOptions.aiMessageId, streamedText);
       }
 
       try {