diff --git a/packages/shared/src/classifications.ts b/packages/shared/src/classifications.ts
index 15b7864..d265aaa 100644
--- a/packages/shared/src/classifications.ts
+++ b/packages/shared/src/classifications.ts
@@ -1,4 +1,4 @@
-import type { DiseaseCatalogItem, DiseaseSlug, RiskLevel } from './diseases';
+import type { DiseaseCatalogItem, DiseaseSlug } from './diseases';
 
 export type ManualClassificationRequest = {
   diseaseSlug: DiseaseSlug;
@@ -6,36 +6,126 @@ export type ManualClassificationRequest = {
   location: string;
 };
 
-export type ManualClassificationRecord = {
+export type ManualClassificationRecord = ManualClassificationRequest & {
   id: string;
-  diseaseSlug: DiseaseSlug;
-  observation: string;
-  location: string;
   createdAt: string;
   disease: DiseaseCatalogItem;
 };
 
 export type PredictionProbability = {
   diseaseSlug: DiseaseSlug;
-  label: DiseaseCatalogItem['label'];
+  label: string;
   confidence: number;
 };
 
 export type UploaderMetadata = {
   public_id: string;
+  telegram_file_id?: string;
+  telegram_file_unique_id?: string;
   file_name: string;
   mime_type: string;
   size_bytes: number;
   file_type: string;
-  uploader_id?: number;
-  created_at: string;
-  telegram_file_id?: string;
-  telegram_file_unique_id?: string;
-  storage_chat_id?: number;
-  storage_message_id?: number;
   download_url: string;
 };
 
+export type DiagnosisStatus =
+  | 'ai_verified'
+  | 'needs_review'
+  | 'expert_verified'
+  | 'expert_corrected'
+  | 'failed';
+
+export type UserRole = 'user' | 'expert';
+
+export type AuthUser = {
+  id: string;
+  email: string;
+  name: string;
+  role: UserRole;
+};
+
+export type AuthFeatures = {
+  googleOAuthEnabled: boolean;
+};
+
+export type AuthMeResponse = {
+  user: AuthUser | null;
+  features: AuthFeatures;
+};
+
+export type AuthRequest = {
+  email: string;
+  password: string;
+};
+
+export type RegisterRequest = AuthRequest & {
+  name: string;
+};
+
+export type AuthResponse = {
+  user: AuthUser;
+  features: AuthFeatures;
+};
+
+export type DiagnosisPrediction = {
+  id: string;
+  diseaseSlug: DiseaseSlug | null;
+  modelLabel: string;
+  confidence: number;
+  rank: number;
+};
+
+export type ExpertReviewRecord = {
+  id: string;
+  diagnosisId: string;
+  expertId: string;
+  verdict: 'verified' | 'corrected';
+  correctedDiseaseSlug: DiseaseSlug | null;
+  notes: string;
+  createdAt: string;
+  expert: AuthUser;
+};
+
+export type DiagnosisRecord = {
+  id: string;
+  userId: string;
+  predictedDiseaseSlug: DiseaseSlug | null;
+  confidence: number | null;
+  status: DiagnosisStatus;
+  failureReason: string | null;
+  imageUrl: string;
+  uploaderPublicId: string;
+  imageFileName: string;
+  imageMimeType: string;
+  imageSizeBytes: number;
+  createdAt: string;
+  updatedAt: string;
+  disease: DiseaseCatalogItem | null;
+  predictions: DiagnosisPrediction[];
+  latestReview: ExpertReviewRecord | null;
+};
+
+export type ReviewDiagnosisRequest = {
+  verdict: 'verified' | 'corrected';
+  correctedDiseaseSlug?: DiseaseSlug;
+  notes: string;
+};
+
+export type DashboardSummary = {
+  diseaseCount: number;
+  classificationCount: number;
+  imageClassificationCount: number;
+  needsReviewCount: number;
+  riskDistribution: {
+    low: number;
+    medium: number;
+    high: number;
+  };
+  latestClassification: ManualClassificationRecord | null;
+  latestDiagnosis: DiagnosisRecord | null;
+};
+
 export type ImageClassificationRecord = {
   id: string;
   predictedDiseaseSlug: DiseaseSlug;
@@ -48,10 +138,3 @@ export type ImageClassificationRecord = {
   createdAt: string;
   disease: DiseaseCatalogItem;
 };
-
-export type DashboardSummary = {
-  diseaseCount: number;
-  classificationCount: number;
-  latestClassification: ManualClassificationRecord | null;
-  riskDistribution: Record<RiskLevel, number>;
-};
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index ca609a5..6f33fe0 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -23,4 +23,16 @@ export type {
   PredictionProbability,
   UploaderMetadata,
   ImageClassificationRecord,
+  DiagnosisStatus,
+  UserRole,
+  AuthUser,
+  AuthFeatures,
+  AuthMeResponse,
+  AuthRequest,
+  RegisterRequest,
+  AuthResponse,
+  DiagnosisPrediction,
+  ExpertReviewRecord,
+  DiagnosisRecord,
+  ReviewDiagnosisRequest,
 } from './classifications';