@goscribe/server 1.5.0 → 1.7.0

package/dist/src/types/index.d.ts

@@ -0,0 +1,126 @@
+import type { Prisma } from '@prisma/client';
+/**
+ * Common types for the application
+ */
+export type PrismaTransaction = Omit<Prisma.TransactionClient, '$connect' | '$disconnect' | '$on' | '$transaction' | '$use'>;
+/**
+ * User types
+ */
+export interface UserSession {
+    id: string;
+    name?: string | null;
+    email?: string | null;
+    image?: string | null;
+}
+export interface AuthContext {
+    session: {
+        user: UserSession;
+    } | null;
+    userId?: string;
+}
+/**
+ * Artifact types
+ */
+export type ArtifactTypeEnum = 'STUDY_GUIDE' | 'FLASHCARD_SET' | 'WORKSHEET' | 'MEETING_SUMMARY' | 'PODCAST_EPISODE';
+export type DifficultyEnum = 'EASY' | 'MEDIUM' | 'HARD';
+export type QuestionTypeEnum = 'MULTIPLE_CHOICE' | 'TEXT' | 'NUMERIC' | 'TRUE_FALSE' | 'MATCHING' | 'FILL_IN_THE_BLANK';
+/**
+ * Worksheet types
+ */
+export interface MarkSchemePoint {
+    point: number;
+    requirements: number;
+}
+export interface MarkScheme {
+    points: MarkSchemePoint[];
+    totalPoints: number;
+}
+export interface UserMarkSchemePoint extends MarkSchemePoint {
+    achievedPoints: number;
+    feedback: string;
+}
+export interface UserMarkScheme {
+    points: UserMarkSchemePoint[];
+    totalPoints: number;
+}
+export interface WorksheetQuestionMeta {
+    options?: string[];
+    completed?: boolean;
+    userAnswer?: string;
+    completedAt?: Date | null;
+    mark_scheme?: MarkScheme;
+    userMarkScheme?: UserMarkScheme;
+}
+export interface WorksheetQuestionProgressMeta {
+    userMarkScheme?: UserMarkScheme;
+}
+export interface CreateWorksheetQuestionInput {
+    prompt: string;
+    answer?: string;
+    type: QuestionTypeEnum;
+    difficulty?: DifficultyEnum;
+    order?: number;
+    meta?: WorksheetQuestionMeta;
+}
+export interface UpdateWorksheetQuestionInput extends Partial<CreateWorksheetQuestionInput> {
+    id: string;
+}
+/**
+ * Flashcard types
+ */
+export interface CreateFlashcardInput {
+    front: string;
+    back: string;
+    tags?: string[];
+    order?: number;
+}
+export interface UpdateFlashcardInput extends Partial<CreateFlashcardInput> {
+    id: string;
+}
+/**
+ * File upload types
+ */
+export interface FileUploadResult {
+    id: string;
+    name: string;
+    url: string;
+    mimeType: string;
+    size: number;
+}
+/**
+ * Pagination types
+ */
+export interface PaginationInput {
+    page?: number;
+    limit?: number;
+}
+export interface PaginatedResult<T> {
+    data: T[];
+    pagination: {
+        page: number;
+        limit: number;
+        total: number;
+        totalPages: number;
+    };
+}
+/**
+ * Search types
+ */
+export interface SearchInput extends PaginationInput {
+    query: string;
+}
+/**
+ * Response types
+ */
+export type SuccessResponse<T = void> = {
+    success: true;
+    data: T;
+    message?: string;
+};
+export type ErrorResponse = {
+    success: false;
+    error: {
+        code: string;
+        message: string;
+    };
+};

package/dist/src/types/index.js

@@ -0,0 +1 @@
+export {};

package/dist/trpc.d.ts

@@ -20,7 +20,9 @@ export declare const publicProcedure: import("@trpc/server").TRPCProcedureBuilde
 /** Exported procedures with middleware */
 export declare const authedProcedure: import("@trpc/server").TRPCProcedureBuilder<Context, object, {
     userId: any;
-    session: any;
+    session: {
+        user: import("./context.js").SessionUser;
+    };
     req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
     res: import("express").Response<any, Record<string, any>>;
     db: import("@prisma/client").PrismaClient<import("@prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs>;
@@ -28,7 +30,9 @@ export declare const authedProcedure: import("@trpc/server").TRPCProcedureBuilde
 }, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>;
 export declare const verifiedProcedure: import("@trpc/server").TRPCProcedureBuilder<Context, object, {
     userId: any;
-    session: any;
+    session: {
+        user: import("./context.js").SessionUser;
+    };
     req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
     res: import("express").Response<any, Record<string, any>>;
     db: import("@prisma/client").PrismaClient<import("@prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs>;
@@ -36,7 +40,9 @@ export declare const verifiedProcedure: import("@trpc/server").TRPCProcedureBuil
 }, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>;
 export declare const adminProcedure: import("@trpc/server").TRPCProcedureBuilder<Context, object, {
     userId: any;
-    session: any;
+    session: {
+        user: import("./context.js").SessionUser;
+    };
     req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
     res: import("express").Response<any, Record<string, any>>;
     db: import("@prisma/client").PrismaClient<import("@prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs>;
@@ -44,7 +50,9 @@ export declare const adminProcedure: import("@trpc/server").TRPCProcedureBuilder
 }, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>;
 export declare const limitedProcedure: import("@trpc/server").TRPCProcedureBuilder<Context, object, {
     userId: any;
-    session: any;
+    session: {
+        user: import("./context.js").SessionUser;
+    };
     req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
     res: import("express").Response<any, Record<string, any>>;
     db: import("@prisma/client").PrismaClient<import("@prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs>;

package/dist/trpc.js

@@ -79,11 +79,8 @@ const errorHandler = middleware(async ({ next }) => {
 /**
  * Middleware that enforces email verification
  */
-const isVerified = middleware(async ({ ctx, next }) => {
-    const user = await ctx.db.user.findUnique({
-        where: { id: ctx.session.user.id },
-        select: { emailVerified: true },
-    });
+const isVerified = middleware(({ ctx, next }) => {
+    const user = ctx.session?.user;
     if (!user?.emailVerified) {
         throw new TRPCError({
             code: "FORBIDDEN",
@@ -139,12 +136,9 @@ const checkUsageLimit = middleware(async ({ ctx, next, path }) => {
 /**
  * Middleware that enforces system admin role
  */
-const isAdmin = middleware(async ({ ctx, next }) => {
-    const user = await ctx.db.user.findUnique({
-        where: { id: ctx.session.user.id },
-        include: { role: true },
-    });
-    if (user?.role?.name !== 'System Admin') {
+const isAdmin = middleware(({ ctx, next }) => {
+    const user = ctx.session?.user;
+    if (!user?.isSystemAdmin) {
         throw new TRPCError({
             code: "FORBIDDEN",
             message: "You do not have permission to access this resource",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goscribe/server",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,23 +13,20 @@
   },
   "scripts": {
     "dev": "tsx watch src/server.ts",
-    "build": "npx prisma generate && tsc -p .",
+    "build": "prisma generate && tsc -p .",
     "start": "node --experimental-specifier-resolution=node dist/server.js",
     "test": "tsx --test \"src/**/*.test.ts\"",
     "test:activity": "tsx --test src/services/activity/activity-log.service.test.ts src/services/activity/activity-human-description.service.test.ts",
-    "generate": "npx prisma generate",
+    "generate": "prisma generate",
     "prepublishOnly": "npm run generate && npm run build"
   },
-  "prisma": {
-    "seed": "node --experimental-specifier-resolution=node prisma/seed.mjs"
-  },
   "author": "",
   "license": "MIT",
   "dependencies": {
     "@auth/express": "^0.11.0",
     "@auth/prisma-adapter": "^2.10.0",
-    "@goscribe/server": "^1.1.2",
-    "@prisma/client": "^6.14.0",
+    "@prisma/adapter-pg": "^7.0.0",
+    "@prisma/client": "^7.0.0",
     "@supabase/supabase-js": "^2.76.1",
     "@trpc/server": "^11.5.0",
     "@types/uuid": "^10.0.0",
@@ -44,7 +41,7 @@
     "morgan": "^1.10.1",
     "openai": "^6.3.0",
     "pdf-parse": "^1.1.4",
-    "prisma": "^6.14.0",
+    "pg": "^8.16.0",
     "pusher": "^5.2.0",
     "pusher-js": "^8.4.0",
     "resend": "^6.9.2",
@@ -55,12 +52,14 @@
     "zod": "^4.1.1"
   },
   "devDependencies": {
+    "prisma": "^7.0.0",
     "@types/compression": "^1.8.1",
     "@types/cookie": "^1.0.0",
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.3",
     "@types/morgan": "^1.9.10",
     "@types/node": "^24.3.0",
+    "@types/pg": "^8.15.0",
     "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0",
     "tsc-alias": "^1.8.16",

package/prisma/schema.prisma

@@ -1,11 +1,10 @@
 generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
+  output   = "../generated/prisma"
 }
 
 datasource db {
-  provider  = "postgresql"
-  url       = env("DATABASE_URL")
-  directUrl = env("DIRECT_URL")
+  provider = "postgresql"
 }
 
 //

package/prisma/seed.mjs

@@ -1,4 +1,6 @@
-import { PrismaClient } from '@prisma/client';
+import 'dotenv/config';
+import { PrismaClient } from '../generated/prisma/client.js';
+import { PrismaPg } from '@prisma/adapter-pg';
 
 /** Keep in sync with server/src/lib/curated-kb-seed.ts */
 const CURATED_KB_SEEDS = [
@@ -25,7 +27,8 @@ const CURATED_KB_SEEDS = [
   { slug: 'ib-psychology-hl', name: 'IB Psychology HL', description: 'Biological, cognitive, sociocultural, and abnormal psychology at HL depth.', category: 'IB', subject: 'psychology' },
 ];
 
-const prisma = new PrismaClient();
+const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL });
+const prisma = new PrismaClient({ adapter });
 
 async function main() {
   for (const seed of CURATED_KB_SEEDS) {

package/prisma.config.ts

@@ -0,0 +1,16 @@
+import "dotenv/config";
+import { defineConfig, env } from "prisma/config";
+
+// Migrations use direct connection when available (Supabase pooler vs direct).
+const migrationUrl = process.env.DIRECT_URL ?? env("DATABASE_URL");
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+    seed: "node --experimental-specifier-resolution=node prisma/seed.mjs",
+  },
+  datasource: {
+    url: migrationUrl,
+  },
+});

package/src/context.ts

@@ -4,14 +4,44 @@ import { prisma } from "./lib/prisma.js";
 import { verifyCustomAuthCookie } from "./lib/auth.js";
 import cookie from "cookie";
 
+export type SessionUser = {
+  id: string;
+  emailVerified: boolean;
+  isSystemAdmin: boolean;
+};
+
 export async function createContext({ req, res }: CreateExpressContextOptions) {
   const cookies = cookie.parse(req.headers.cookie ?? "");
 
-  // Only use custom auth cookie
   const custom = verifyCustomAuthCookie(cookies["auth_token"]);
-  
+
   if (custom) {
-    return { db: prisma, session: { user: { id: custom.userId } } as any, req, res, cookies };
+    const user = await prisma.user.findUnique({
+      where: { id: custom.userId },
+      select: {
+        id: true,
+        emailVerified: true,
+        role: { select: { name: true } },
+      },
+    });
+
+    if (!user) {
+      return { db: prisma, session: null, req, res, cookies };
+    }
+
+    const sessionUser: SessionUser = {
+      id: user.id,
+      emailVerified: !!user.emailVerified,
+      isSystemAdmin: user.role?.name === "System Admin",
+    };
+
+    return {
+      db: prisma,
+      session: { user: sessionUser } as { user: SessionUser },
+      req,
+      res,
+      cookies,
+    };
   }
 
   return { db: prisma, session: null, req, res, cookies };

package/src/lib/ai/index.ts

@@ -2,6 +2,7 @@ import { aiConfig } from './config.js';
 import {
   complete,
   completeText,
+  streamComplete,
 } from './llm-client.js';
 import {
   DEFAULT_EMBEDDING_DIM,
@@ -21,6 +22,7 @@ export const ai = {
   llm: {
     complete,
     completeText,
+    streamComplete,
   },
   embed: {
     texts: embedTexts,
@@ -49,6 +51,7 @@ export {
   aiConfig,
   complete,
   completeText,
+  streamComplete,
   DEFAULT_EMBEDDING_DIM,
   DEFAULT_EMBEDDING_MODEL,
   embedQuery,

package/src/lib/ai/llm-client.ts

@@ -27,5 +27,28 @@ export async function completeText(
   return response.choices?.[0]?.message?.content ?? '';
 }
 
+export async function streamComplete(
+  messages: ChatMessage[],
+  onDelta: (delta: string) => void | Promise<void>,
+  options: CompleteOptions = {},
+): Promise<string> {
+  const stream = await client.chat.completions.create({
+    model: options.model ?? aiConfig.llm.model,
+    messages,
+    stream: true,
+    ...(options.temperature !== undefined ? { temperature: options.temperature } : {}),
+  });
+
+  let content = '';
+  for await (const chunk of stream) {
+    const delta = chunk.choices?.[0]?.delta?.content ?? '';
+    if (!delta) continue;
+    content += delta;
+    await onDelta(delta);
+  }
+
+  return content;
+}
+
 /** @deprecated Use `complete()` from the ai module instead. */
 export default complete;

package/src/lib/prisma.ts

@@ -1,16 +1,25 @@
-// Resolve the client from this package's generated output so types always match
-// `prisma/schema.prisma` (the `@prisma/client` entry can resolve to a different
-// generated client in multi-folder workspaces and lose model delegates in the IDE).
-import { PrismaClient } from "../../node_modules/.prisma/client/index.js";
+import { PrismaPg } from "@prisma/adapter-pg";
+import { PrismaClient } from "../../generated/prisma/client.js";
 
-export { ArtifactType } from "../../node_modules/.prisma/client/index.js";
+export {
+  ArtifactType,
+  ActivityLogCategory,
+  ActivityLogStatus,
+  InvoiceType,
+} from "../../generated/prisma/client.js";
 
 const globalForPrisma = globalThis as unknown as { prisma?: PrismaClient };
 
+function createPrismaClient(): PrismaClient {
+  const connectionString = process.env.DATABASE_URL;
+  if (!connectionString) {
+    throw new Error("DATABASE_URL is not set");
+  }
+  const adapter = new PrismaPg({ connectionString });
+  return new PrismaClient({ adapter });
+}
+
 export const prisma =
-  globalForPrisma.prisma ??
-  new PrismaClient({
-    // log: ["query"], // enable if you want
-  });
+  globalForPrisma.prisma ?? createPrismaClient();
 
 if (process.env.NODE_ENV !== "production") globalForPrisma.prisma = prisma;

package/src/routers/auth.ts

@@ -30,7 +30,7 @@ const passwordFieldSchema = z
   .regex(/[^a-zA-Z0-9]/, 'Password must contain at least one special character');
 
 export const auth = router({
-  updateProfile: publicProcedure
+  updateProfile: authedProcedure
     .input(z.object({ name: z.string().min(1) }))
     .mutation(({ ctx, input }) =>
       new AuthService(ctx.db).updateProfile(ctx.session.user.id, input),

package/src/routers/workspace.ts

@@ -71,6 +71,10 @@ export const workspace = router({
     new WorkspaceService(ctx.db).getStats(ctx.session.user.id),
   ),
 
+  getAccountSummary: authedProcedure.query(({ ctx }) =>
+    new WorkspaceService(ctx.db).getAccountSummary(ctx.session.user.id),
+  ),
+
   getStudyAnalytics: authedProcedure.query(({ ctx }) =>
     new WorkspaceAnalyticsService(ctx.db).getStudyAnalytics(ctx.session.user.id),
   ),

package/src/scripts/purge-deleted-users.ts

@@ -1,4 +1,4 @@
-import { PrismaClient } from '@prisma/client';
+import { prisma as db } from '../lib/prisma.js';
 import { supabaseClient } from '../lib/storage.js';
 import { logger } from '../lib/logger.js';
 import { env } from '../lib/env.js';
@@ -9,8 +9,6 @@ import {
 } from '@prisma/client';
 import { recordExplicitActivity } from '../services/activity/activity-log.service.js';
 
-const db = new PrismaClient();
-
 async function purgeDeletedUsers() {
     try {
         const startedAt = Date.now();

package/src/services/billing/payment.service.ts

@@ -5,7 +5,7 @@ import { Stripe } from 'stripe';
 import { BaseService } from '../base.service.js';
 import { stripe } from '../../lib/stripe.js';
 import { env } from '../../lib/env.js';
-import { getUserUsage, getUserPlanLimits } from './usage.service.js';
+import { getAccountSummary, getUserUsage, getUserPlanLimits } from './usage.service.js';
 import {
   notifyPaymentSucceeded,
   notifySubscriptionActivated,
@@ -423,11 +423,8 @@ export class PaymentService extends BaseService {
   }
 
   async getUsageOverview(userId: string) {
-    const [usage, limits] = await Promise.all([
-      getUserUsage(userId),
-      getUserPlanLimits(userId),
-    ]);
-    return { usage, limits, hasActivePlan: !!limits };
+    const { usage, limits, hasActivePlan } = await getAccountSummary(userId);
+    return { usage, limits, hasActivePlan };
   }
 
   getResourcePrices() {