@goscribe/server 1.1.6 → 1.2.0

package/.env.example

@@ -0,0 +1,43 @@
+# ──────────────────────────────────────────────
+# Scribe Server Environment Variables
+# Copy this file to .env and fill in your values
+# ──────────────────────────────────────────────
+
+# Auth
+AUTH_SECRET="your-auth-secret-here"
+AUTH_TRUST_HOST=true
+AUTH_URL=http://localhost:3001
+
+# Database (PostgreSQL via Supabase)
+DATABASE_URL="postgresql://user:password@host:6543/postgres?pgbouncer=true"
+DIRECT_URL="postgresql://user:password@host:5432/postgres"
+
+# AI Inference
+DONT_TEST_INFERENCE=false
+INFERENCE_API_URL=http://localhost:5000
+INFERENCE_API_KEY=your-inference-api-key
+INFERENCE_BASE_URL=https://api.cohere.ai/compatibility/v1
+
+# Supabase Storage
+SUPABASE_URL=https://your-project.supabase.co
+SUPABASE_SERVICE_ROLE_KEY=your-supabase-service-role-key
+
+# Google Cloud Storage (for podcast audio)
+GCP_PROJECT_ID=your-gcp-project
+GCP_BUCKET=your-bucket-name
+GCP_CLIENT_EMAIL=your-service-account@your-project.iam.gserviceaccount.com
+GCP_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----\nyour-private-key\n-----END PRIVATE KEY-----\n"
+
+# Pusher (real-time events)
+PUSHER_APP_ID=your-pusher-app-id
+PUSHER_KEY=your-pusher-key
+PUSHER_SECRET=your-pusher-secret
+PUSHER_CLUSTER=your-cluster
+
+# Email (Resend)
+RESEND_API_KEY=re_your_resend_api_key
+EMAIL_FROM=Scribe <noreply@yourdomain.com>
+
+# Optional
+COHERE_API_KEY=your-cohere-key
+MURF_TTS_KEY=your-murf-tts-key

package/dist/routers/_app.d.ts

@@ -299,7 +299,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
                 folders: number;
                 lastUpdated: Date | undefined;
                 spaceUsed: number;
-                spaceLeft: number;
+                spaceTotal: number;
             };
             meta: object;
         }>;

package/dist/routers/auth.js

@@ -4,7 +4,7 @@ import bcrypt from 'bcryptjs';
 import { serialize } from 'cookie';
 import crypto from 'node:crypto';
 import { TRPCError } from '@trpc/server';
-import { supabaseClient } from 'src/lib/storage.js';
+import { supabaseClient } from '../lib/storage.js';
 // Helper to create custom auth token
 function createCustomAuthToken(userId) {
     const secret = process.env.AUTH_SECRET;
@@ -42,7 +42,7 @@ export const auth = router({
         const objectKey = `profile_picture_${ctx.session.user.id}`;
         const { data: signedUrlData, error: signedUrlError } = await supabaseClient.storage
             .from('media')
-            .createSignedUploadUrl(objectKey); // 5 minutes
+            .createSignedUploadUrl(objectKey, { upsert: true }); // 5 minutes
         if (signedUrlError) {
             throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message: `Failed to generate upload URL: ${signedUrlError.message}` });
         }
@@ -141,7 +141,13 @@ export const auth = router({
         };
     }),
     logout: publicProcedure.mutation(async ({ ctx }) => {
-        // Clear the auth cookie
+        const token = ctx.cookies["auth_token"];
+        if (!token) {
+            throw new Error("No token found");
+        }
+        await ctx.db.session.delete({
+            where: { id: token },
+        });
         ctx.res.setHeader("Set-Cookie", serialize("auth_token", "", {
             httpOnly: true,
             secure: process.env.NODE_ENV === "production",

package/dist/routers/workspace.d.ts

@@ -191,7 +191,7 @@ export declare const workspace: import("@trpc/server").TRPCBuiltRouter<{
             folders: number;
             lastUpdated: Date | undefined;
             spaceUsed: number;
-            spaceLeft: number;
+            spaceTotal: number;
         };
         meta: object;
     }>;

package/dist/routers/workspace.js

@@ -174,7 +174,7 @@ export const workspace = router({
             folders: folders.length,
             lastUpdated: lastUpdated?.updatedAt,
             spaceUsed: spaceLeft._sum?.size ?? 0,
-            spaceLeft: 1000000000 - (spaceLeft._sum?.size ?? 0) || 0,
+            spaceTotal: 1000000000,
         };
     }),
     update: authedProcedure

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goscribe/server",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,6 +40,7 @@
     "prisma": "^6.14.0",
     "pusher": "^5.2.0",
     "pusher-js": "^8.4.0",
+    "resend": "^6.9.2",
     "socket.io": "^4.8.1",
     "superjson": "^2.2.2",
     "uuid": "^13.0.0",

package/prisma/schema.prisma

@@ -62,6 +62,10 @@ model User {
   // Invitations
   sentInvitations WorkspaceInvitation[] @relation("UserInvitations")
 
+  // Study guide annotations
+  highlights        StudyGuideHighlight[] @relation("UserHighlights")
+  studyGuideComments StudyGuideComment[]  @relation("UserStudyGuideComments")
+
   notifications Notification[]
   chats         Chat[]
   createdAt     DateTime       @default(now())
@@ -270,12 +274,54 @@ model ArtifactVersion {
   createdById String?
   createdBy   User?   @relation("UserArtifactVersions", fields: [createdById], references: [id], onDelete: SetNull)
 
+  // Highlights on this version
+  highlights StudyGuideHighlight[]
+
   createdAt DateTime @default(now())
 
   @@unique([artifactId, version]) // each artifact has 1,2,3...
   @@index([artifactId])
 }
 
+//
+// Study Guide Highlights and Comments
+//
+model StudyGuideHighlight {
+  id                String          @id @default(cuid())
+  artifactVersionId String
+  artifactVersion   ArtifactVersion @relation(fields: [artifactVersionId], references: [id], onDelete: Cascade)
+
+  userId String
+  user   User   @relation("UserHighlights", fields: [userId], references: [id], onDelete: Cascade)
+
+  startOffset  Int // character offset in the content
+  endOffset    Int
+  selectedText String // the highlighted text (preserved even if content changes)
+  color        String @default("#FBBF24") // highlight color
+
+  comments StudyGuideComment[]
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([artifactVersionId, userId])
+}
+
+model StudyGuideComment {
+  id          String              @id @default(cuid())
+  highlightId String
+  highlight   StudyGuideHighlight @relation(fields: [highlightId], references: [id], onDelete: Cascade)
+
+  userId  String
+  user    User   @relation("UserStudyGuideComments", fields: [userId], references: [id], onDelete: Cascade)
+  content String
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([highlightId])
+}
+
 //
 // Flashcards (child items of a FLASHCARD_SET Artifact)
 //

package/src/lib/ai-session.ts

@@ -1,5 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import { logger } from './logger.js';
+import { withRetry } from './retry.js';
 import { MarkScheme, UserMarkScheme } from '../types/index.js';
 
 // External AI service configuration
@@ -8,8 +9,8 @@ import { MarkScheme, UserMarkScheme } from '../types/index.js';
 const AI_SERVICE_URL = process.env.INFERENCE_API_URL + '/upload';
 const AI_RESPONSE_URL = process.env.INFERENCE_API_URL + '/last_response';
 
-console.log('AI_SERVICE_URL', AI_SERVICE_URL);
-console.log('AI_RESPONSE_URL', AI_RESPONSE_URL);
+logger.info(`AI_SERVICE_URL: ${AI_SERVICE_URL}`);
+logger.info(`AI_RESPONSE_URL: ${AI_RESPONSE_URL}`);
 
 // Mock mode flag - when true, returns fake responses instead of calling AI service
 const MOCK_MODE = process.env.DONT_TEST_INFERENCE === 'true';
@@ -49,7 +50,7 @@ export class AISessionService {
     await new Promise(resolve => setTimeout(resolve, IMITATE_WAIT_TIME_MS));
     // Mock mode - return fake session
     if (MOCK_MODE) {
-      console.log(`🎭 MOCK MODE: Initializing AI session for workspace ${workspaceId}`);
+      logger.info(`MOCK MODE: Initializing AI session for workspace ${workspaceId}`);
       const session: AISession = {
         id: sessionId,
         workspaceId,
@@ -73,23 +74,23 @@ export class AISessionService {
 
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       try {
-        console.log(`🤖 AI Session init attempt ${attempt}/${maxRetries} for workspace ${workspaceId}`);
+        logger.info(`AI Session init attempt ${attempt}/${maxRetries} for workspace ${workspaceId}`);
         
         const response = await fetch(AI_SERVICE_URL, {
           method: 'POST',
           body: formData,
         });
 
-        console.log(`📡 AI Service response status: ${response.status} ${response.statusText}`);
+        logger.info(`AI Service response status: ${response.status} ${response.statusText}`);
 
         if (!response.ok) {
           const errorText = await response.text();
-          console.error(`❌ AI Service error response:`, errorText);
+          logger.error(`AI Service error response: ${errorText}`);
           throw new Error(`AI service error: ${response.status} ${response.statusText} - ${errorText}`);
         }
 
         const result = await response.json();
-        console.log(`📋 AI Service result:`, result);
+        logger.debug(`AI Service result: ${JSON.stringify(result)}`);
         
         // If we get a response with a message, consider it successful
         if (!result.message) {
@@ -106,22 +107,22 @@ export class AISessionService {
         };
 
         this.sessions.set(sessionId, session);
-        console.log(`✅ AI Session initialized successfully on attempt ${attempt}`);
+        logger.info(`AI Session initialized successfully on attempt ${attempt}`);
         return session;
         
       } catch (error) {
         lastError = error instanceof Error ? error : new Error('Unknown error');
-        console.error(`❌ AI Session init attempt ${attempt} failed:`, lastError.message);
+        logger.error(`AI Session init attempt ${attempt} failed: ${lastError.message}`);
         
         if (attempt < maxRetries) {
           const delay = Math.pow(2, attempt) * 1000; // Exponential backoff: 2s, 4s, 8s
-          console.log(`⏳ Retrying in ${delay}ms...`);
+          logger.info(`Retrying in ${delay}ms...`);
           await new Promise(resolve => setTimeout(resolve, delay));
         }
       }
     }
 
-    console.error(`💥 All ${maxRetries} attempts failed. Last error:`, lastError?.message);
+    logger.error(`All ${maxRetries} attempts failed. Last error: ${lastError?.message}`);
     throw new TRPCError({
       code: 'INTERNAL_SERVER_ERROR',
       message: `Failed to initialize AI session after ${maxRetries} attempts: ${lastError?.message || 'Unknown error'}`,
@@ -163,7 +164,7 @@ export class AISessionService {
       formData.append('maxPages', maxPages.toString());
     }
 
-    console.log('formData', formData);
+    logger.debug('Processing file with formData');
 
     // Retry logic for file processing
     const maxRetries = 3;
@@ -180,7 +181,7 @@ export class AISessionService {
         const response = await fetch(AI_SERVICE_URL, {
           method: 'POST',
           body: formData,
-          // signal: controller.signal,
+          signal: controller.signal,
         });
 
         clearTimeout(timeoutId);
@@ -230,7 +231,7 @@ export class AISessionService {
     await new Promise(resolve => setTimeout(resolve, IMITATE_WAIT_TIME_MS));
     // Mock mode - return fake study guide
     if (MOCK_MODE) {
-      console.log(`🎭 MOCK MODE: Generating study guide for session ${sessionId}`);
+      logger.info(`MOCK MODE: Generating study guide for session ${sessionId}`);
       return `# Mock Study Guide
 
 ## Overview
@@ -252,11 +253,12 @@ This mock study guide demonstrates the structure and format that would be genera
 *Note: This is a mock response generated when DONT_TEST_INFERENCE=true*`;
     }
 
-    const formData = new FormData();
-    formData.append('command', 'generate_study_guide');
-    formData.append('session', sessionId);
-    formData.append('user', user);
-    try {
+    return withRetry(async () => {
+      const formData = new FormData();
+      formData.append('command', 'generate_study_guide');
+      formData.append('session', sessionId);
+      formData.append('user', user);
+
       const response = await fetch(AI_SERVICE_URL, {
         method: 'POST',
         body: formData,
@@ -267,13 +269,11 @@ This mock study guide demonstrates the structure and format that would be genera
       }
 
       const result = await response.json();
+      if (!result.markdown) {
+        throw new Error('AI service returned empty study guide');
+      }
       return result.markdown;
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: `Failed to generate study guide: ${error instanceof Error ? error.message : 'Unknown error'}`,
-      });
-    }
+    }, { maxRetries: 3, timeoutMs: 300000, label: 'generateStudyGuide' });
   }
 
   // Generate flashcard questions
@@ -291,14 +291,14 @@ This mock study guide demonstrates the structure and format that would be genera
         })));
     }
 
-    const formData = new FormData();
-    formData.append('command', 'generate_flashcard_questions');
-    formData.append('session', sessionId);
-    formData.append('user', user);
-    formData.append('num_questions', numQuestions.toString());
-    formData.append('difficulty', difficulty);
+    return withRetry(async () => {
+      const formData = new FormData();
+      formData.append('command', 'generate_flashcard_questions');
+      formData.append('session', sessionId);
+      formData.append('user', user);
+      formData.append('num_questions', numQuestions.toString());
+      formData.append('difficulty', difficulty);
 
-    try {
       const response = await fetch(AI_SERVICE_URL, {
         method: 'POST',
         body: formData,
@@ -309,16 +309,8 @@ This mock study guide demonstrates the structure and format that would be genera
       }
 
       const result = await response.json();
-
-      console.log(JSON.parse(result.flashcards))
-
       return JSON.parse(result.flashcards).flashcards;
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: `Failed to generate flashcard questions: ${error instanceof Error ? error.message : 'Unknown error'}`,
-      });
-    }
+    }, { maxRetries: 3, timeoutMs: 300000, label: 'generateFlashcardQuestions' });
   }
 
   // Generate worksheet questions
@@ -351,15 +343,14 @@ This mock study guide demonstrates the structure and format that would be genera
       });
     }
 
-    const formData = new FormData();
-    formData.append('command', 'generate_worksheet_questions');
-    formData.append('session', sessionId);
-    formData.append('user', user);
-    formData.append('num_questions', numQuestions.toString());
-    formData.append('difficulty', difficulty);
-
+    return withRetry(async () => {
+      const formData = new FormData();
+      formData.append('command', 'generate_worksheet_questions');
+      formData.append('session', sessionId);
+      formData.append('user', user);
+      formData.append('num_questions', numQuestions.toString());
+      formData.append('difficulty', difficulty);
 
-    try {
       const response = await fetch(AI_SERVICE_URL, {
         method: 'POST',
         body: formData,
@@ -370,16 +361,8 @@ This mock study guide demonstrates the structure and format that would be genera
       }
 
       const result = await response.json();
-
-      console.log(JSON.parse(result.worksheet));
-
       return result.worksheet;
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: `Failed to generate worksheet questions: ${error instanceof Error ? error.message : 'Unknown error'}`,
-      });
-    }
+    }, { maxRetries: 3, timeoutMs: 300000, label: 'generateWorksheetQuestions' });
   }
 
   async checkWorksheetQuestions(sessionId: string, user: string, question: string, answer: string, mark_scheme: MarkScheme): Promise<UserMarkScheme> {
@@ -402,7 +385,7 @@ This mock study guide demonstrates the structure and format that would be genera
     }
 
     const result = await response.json();
-    console.log(result.marking);
+    logger.debug(`Worksheet marking result received`);
     return JSON.parse(result.marking);
   }
 
@@ -576,6 +559,77 @@ This mock study guide demonstrates the structure and format that would be genera
       });
     }
   }
+
+  async segmentStudyGuide (sessionId: string, user: string, studyGuide: string): Promise<{
+    hint: string;
+    content: string
+  }[]> {
+    // def generate_study_guide_segmentation(request):
+    // user = request.form.get("user")
+    // session = request.form.get("session")
+    // study_guide = request.form.get("study_guide")
+
+    // if not user or not session:
+    //     return {"error": "Session not initialized."}, 400
+    // if not study_guide:
+    //     print("Study guide not provided.")
+    //     return {"error": "Study guide not provided."}, 400
+    
+    // messages = generate_segmentation(study_guide)
+    // return {"segmentation": messages}, 200  
+
+    const formData = new FormData();
+    formData.append('command', 'generate_study_guide_segmentation');
+    formData.append('session', sessionId);
+    formData.append('user', user);
+    formData.append('study_guide', studyGuide);
+    try {
+      const response = await fetch(AI_SERVICE_URL, {
+        method: 'POST',
+        body: formData,
+      });
+      if (!response.ok) {
+        throw new Error(`AI service error: ${response.status} ${response.statusText}`);
+      }
+      const result = await response.json();
+      return result.segmentation;
+    } catch (error) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: `Failed to segment study guide: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      });
+    }
+  }
+  async validateSegmentSummary(sessionId: string, user: string, segmentContent: string, studentResponse: string, studyGuide: string): Promise<{
+    valid: boolean;
+    feedback: string;
+  }> {
+    const formData = new FormData();
+    formData.append('command', 'validate_segment_summary');
+    formData.append('session', sessionId);
+    formData.append('user', user);
+
+    formData.append('segment_content', segmentContent);
+    formData.append('student_response', studentResponse);
+    formData.append('study_guide', studyGuide);
+    try {
+      const response = await fetch(AI_SERVICE_URL, {
+        method: 'POST',
+        body: formData,
+      });
+      if (!response.ok) {
+        throw new Error(`AI service error: ${response.status} ${response.statusText}`);
+      }
+      const result = await response.json();
+      return result.feedback;
+    } catch (error) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: `Failed to validate segment summary: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      });
+    }
+  }
+
   // Get session by ID
   getSession(sessionId: string): AISession | undefined {
     return this.sessions.get(sessionId);
@@ -598,21 +652,21 @@ This mock study guide demonstrates the structure and format that would be genera
     await new Promise(resolve => setTimeout(resolve, IMITATE_WAIT_TIME_MS));
     // Mock mode - always return healthy
     if (MOCK_MODE) {
-      console.log('🎭 MOCK MODE: AI service health check - returning healthy');
+      logger.info('MOCK MODE: AI service health check - returning healthy');
       return true;
     }
 
     try {
-      console.log('🏥 Checking AI service health...');
+      logger.info('Checking AI service health...');
       const response = await fetch(AI_SERVICE_URL, {
         method: 'POST',
         body: new FormData(), // Empty form data
       });
       
-      console.log(`🏥 AI Service health check status: ${response.status}`);
+      logger.info(`AI Service health check status: ${response.status}`);
       return response.ok;
     } catch (error) {
-      console.error('🏥 AI Service health check failed:', error);
+      logger.error('AI Service health check failed:', error);
       return false;
     }
   }

package/src/lib/constants.ts

@@ -0,0 +1,14 @@
+/**
+ * Shared constants for artifact types.
+ * Mirrors the Prisma ArtifactType enum to avoid direct type imports
+ * in contexts where Prisma client types may not be available.
+ */
+export const ArtifactType = {
+  STUDY_GUIDE: 'STUDY_GUIDE',
+  FLASHCARD_SET: 'FLASHCARD_SET',
+  WORKSHEET: 'WORKSHEET',
+  MEETING_SUMMARY: 'MEETING_SUMMARY',
+  PODCAST_EPISODE: 'PODCAST_EPISODE',
+} as const;
+
+export type ArtifactTypeValue = (typeof ArtifactType)[keyof typeof ArtifactType];

package/src/lib/email.ts

@@ -0,0 +1,46 @@
+import { Resend } from 'resend';
+import { logger } from './logger.js';
+
+// const resend = new Resend(process.env.RESEND_API_KEY);
+
+const FROM_EMAIL = process.env.EMAIL_FROM || 'Scribe <noreply@goscribe.app>';
+const APP_URL = process.env.AUTH_URL || 'http://localhost:3000';
+
+export async function sendVerificationEmail(
+  email: string,
+  token: string,
+  name?: string | null
+): Promise<boolean> {
+  const verifyUrl = APP_URL + '/verify-email?token=' + token;
+  const greeting = name ? ', ' + name : '';
+
+  const html = '<div style="font-family:system-ui,sans-serif;max-width:480px;margin:0 auto;padding:40px 20px;">'
+    + '<h2 style="font-size:20px;font-weight:600;margin-bottom:8px;">Welcome to Scribe' + greeting + '!</h2>'
+    + '<p style="color:#6b7280;font-size:14px;line-height:1.6;margin-bottom:24px;">'
+    + 'Please verify your email address to get the most out of your account.</p>'
+    + '<a href="' + verifyUrl + '" style="display:inline-block;background-color:#7c3aed;color:#fff;text-decoration:none;padding:10px 24px;border-radius:6px;font-size:14px;font-weight:500;">Verify Email</a>'
+    + '<p style="color:#9ca3af;font-size:12px;margin-top:32px;line-height:1.5;">'
+    + 'If you did not create an account on Scribe, you can safely ignore this email.'
+    + ' This link expires in 24 hours.</p>'
+    + '</div>';
+
+  try {
+    // const { error } = await resend.emails.send({
+    //   from: FROM_EMAIL,
+    //   to: email,
+    //   subject: 'Verify your email - Scribe',
+    //   html,
+    // });
+
+    // if (error) {
+    //   logger.error('Failed to send verification email to ' + email + ': ' + error.message);
+    //   return false;
+    // }
+
+    logger.info('Verification email sent to ' + email);
+    return true;
+  } catch (err) {
+    logger.error('Email send error:', err);
+    return false;
+  }
+}

package/src/lib/inference.ts

@@ -13,7 +13,7 @@ async function inference(prompt: string) {
         });
         return response;
     } catch (error) {
-        console.error('Inference error:', error);
+        // Inference error logged at call site
         throw error;
     }
 }

package/src/lib/logger.ts

@@ -163,7 +163,8 @@ class Logger {
     return `\x1b[90m${time}\x1b[0m`; // Gray color
   }
 
-  private formatContext(context: string): string {
+  private formatContext(context: string | unknown): string {
+    if (typeof context !== 'string') return '';
     const icon = CONTEXT_ICONS[context.toUpperCase()] || '📦';
     return `\x1b[94m${icon}${context}\x1b[0m `; // Blue color
   }
@@ -248,20 +249,36 @@ class Logger {
     }
   }
 
-  error(message: string, context?: string, metadata?: Record<string, any>, error?: Error): void {
-    this.log(LogLevel.ERROR, message, context, metadata, error);
+  error(message: string, contextOrError?: string | Error | unknown, metadata?: Record<string, any>, error?: Error): void {
+    if (contextOrError instanceof Error) {
+      this.log(LogLevel.ERROR, message, undefined, metadata, contextOrError);
+    } else {
+      this.log(LogLevel.ERROR, message, contextOrError as string | undefined, metadata, error);
+    }
   }
 
-  warn(message: string, context?: string, metadata?: Record<string, any>): void {
-    this.log(LogLevel.WARN, message, context, metadata);
+  warn(message: string, contextOrMeta?: string | Record<string, any>, metadata?: Record<string, any>): void {
+    if (typeof contextOrMeta === 'object' && contextOrMeta !== null) {
+      this.log(LogLevel.WARN, message, undefined, contextOrMeta as Record<string, any>);
+    } else {
+      this.log(LogLevel.WARN, message, contextOrMeta as string | undefined, metadata);
+    }
   }
 
-  info(message: string, context?: string, metadata?: Record<string, any>): void {
-    this.log(LogLevel.INFO, message, context, metadata);
+  info(message: string, contextOrMeta?: string | Record<string, any>, metadata?: Record<string, any>): void {
+    if (typeof contextOrMeta === 'object' && contextOrMeta !== null) {
+      this.log(LogLevel.INFO, message, undefined, contextOrMeta as Record<string, any>);
+    } else {
+      this.log(LogLevel.INFO, message, contextOrMeta as string | undefined, metadata);
+    }
   }
 
-  debug(message: string, context?: string, metadata?: Record<string, any>): void {
-    this.log(LogLevel.DEBUG, message, context, metadata);
+  debug(message: string, contextOrMeta?: string | Record<string, any>, metadata?: Record<string, any>): void {
+    if (typeof contextOrMeta === 'object' && contextOrMeta !== null) {
+      this.log(LogLevel.DEBUG, message, undefined, contextOrMeta as Record<string, any>);
+    } else {
+      this.log(LogLevel.DEBUG, message, contextOrMeta as string | undefined, metadata);
+    }
   }
 
   trace(message: string, context?: string, metadata?: Record<string, any>): void {