feat: frontend LOG_LEVEL support via logger utility (#209)

- Inject LOG_LEVEL at build time via Vite define (__LOG_LEVEL__, default: warn)
- Create frontend logger utility (frontend/src/utils/logger.ts) mirroring backend API
- Replace all console.error calls with log.error in MedicationsPage, AppContext, Auth
- Supports levels: silent > error > warn > info > debug

Closes #205

.github/copilot-instructions.md

@@ -2,35 +2,75 @@
 
 ## Purpose
 
-This file is intentionally short.
-Use `AGENTS.md` as the canonical governance source and `.github/skills/*/SKILL.md` for detailed workflows.
+Use `AGENTS.md` as the canonical governance source. Read the referenced skill files before starting any task.
+
+## Project Orientation (Read First)
+
+- **Product**: MedAssist-ng is a medication planner with stock tracking, reminders (email/push), refill history, and schedule sharing.
+- **Tech stack**: React + TypeScript + Vite (`frontend/`), Fastify + TypeScript + Drizzle + SQLite (`backend/`).
+- **Request path**: Frontend uses `/api/*` only; backend route handlers live in `backend/src/routes/`.
+- **Primary backend modules**:
+	- Auth/SSO: `backend/src/routes/auth.ts`, `backend/src/routes/oidc.ts`, `backend/src/plugins/auth.ts`
+	- Medications/data: `backend/src/routes/medications.ts`, `backend/src/db/schema.ts`
+	- Reminders: `backend/src/services/reminder-scheduler.ts`, `backend/src/routes/planner.ts`, `backend/src/routes/settings.ts`
+- **Primary frontend modules**:
+	- Pages: `frontend/src/pages/`
+	- Shared app state: `frontend/src/context/AppContext.tsx`
+	- Domain hooks: `frontend/src/hooks/`
+	- Translations: `frontend/src/i18n/en.json`, `frontend/src/i18n/de.json`
+
+Use this orientation for quick navigation before applying the rules below.
 
 ## Always-On Rules
 
 - English only for project artifacts.
-- No remote git/release actions by normal agent (`git push`, PR create/merge, tag/release).
+- **NEVER run remote git commands** — no `git push`, no `gh pr create/merge`, no `gh release`, no `git tag`. Prepare locally, then hand off to `@release-manager`.
 - Testing work belongs to `@testing-manager`.
 - PR/release/CI orchestration belongs to `@release-manager`.
 - Keep changes local, focused, and consistent with existing UI/API patterns.
+- Remove obsolete code when re-implementing — never leave dead code behind.
+- **Document behavioral discoveries**: When you discover or clarify how a feature works (e.g., what triggers notifications, how thresholds interact, which code paths exist), **always** add or update the relevant section in `doku/APP_BEHAVIOR.md`. This is mandatory — do not rely on conversation context alone.
 
 ## MedAssist Essentials
 
 - Frontend calls backend through `/api/*`.
-- All UI text must use i18n keys (`t("...")`) with EN/DE entries.
 - DB changes must stay backward-compatible (schema default + alter migration + null-safe reads).
 
-## Skill Routing
+---
 
-- Architecture/boundaries: `medassist-architecture-guard`
-- DB compatibility: `medassist-db-compat-check`
-- i18n rules: `medassist-i18n-enforcer`
-- UI consistency: `medassist-ui-consistency`
-- Testing delegation: `medassist-testing-handoff`
-- Release delegation: `medassist-release-handoff`
+## Skills (MANDATORY — read before every task)
+
+Before starting any task, identify which skills apply and **read their full SKILL.md file** for detailed rules.
+
+| Skill | Trigger | File |
+|---|---|---|
+| **Architecture Guard** | API endpoints, frontend API calls, routing, code placement | `.github/skills/medassist-architecture-guard/SKILL.md` |
+| **DB Compatibility** | Persisted data, schema changes, migrations | `.github/skills/medassist-db-compat-check/SKILL.md` |
+| **i18n Enforcer** ⚠️ | Any user-facing text in frontend or backend | `.github/skills/medassist-i18n-enforcer/SKILL.md` |
+| **UI Consistency** | UI flows, modals, buttons, forms, settings | `.github/skills/medassist-ui-consistency/SKILL.md` |
+| **Frontend Polish** | Visual quality improvements | `.github/skills/medassist-frontend-polish/SKILL.md` |
+| **Security Sanity** | Backend routes, auth, file handling, external input | `.github/skills/medassist-security-sanity/SKILL.md` |
+| **Observability Guard** | Services, schedulers, startup, failure handling | `.github/skills/medassist-observability-guard/SKILL.md` |
+| **Config Change Guard** | `.env`, Docker, Vite proxy, runtime defaults | `.github/skills/medassist-config-change-guard/SKILL.md` |
+| **Doc Sync Guard** | Behavior changes, setup, env vars, workflows | `.github/skills/medassist-doc-sync-guard/SKILL.md` |
+| **Testing Handoff** | Writing/running tests, CI test failures | `.github/skills/medassist-testing-handoff/SKILL.md` |
+| **Release Handoff** | Branch push, PR, merge, tagging, release | `.github/skills/medassist-release-handoff/SKILL.md` |
+| **Skill Quality Review** | Creating/modifying skills | `.github/skills/medassist-skill-quality-review/SKILL.md` |
+
+### Non-negotiable parity rules (always apply)
+
+1. **Desktop + Mobile Parity**: Medication edit has two paths — `MedicationsPage.tsx` (desktop) and `MobileEditModal` (mobile). **Always update BOTH**.
+2. **Notification Dual Code Paths**: Notifications have two code paths — `backend/src/services/reminder-scheduler.ts` (scheduler) and `backend/src/routes/planner.ts` (manual). **Always update BOTH**.
+
+---
+
+## Delegation
+
+- **Testing handoff → `@testing-manager`**: test planning, writing, execution, CI test triage.
+- **Release handoff → `@release-manager`**: PR/release orchestration, merge flow, workflow monitoring.
 
 ## Key References
 
 - Canonical governance: `AGENTS.md`
-- Global engineering rules: see `AGENTS.md` (`Global Engineering Rules` section).
-- Project skills: `.github/skills/README.md`
+- Skill files: `.github/skills/*/SKILL.md`
 - Specialist agents: `.github/agents/testing-manager.agent.md`, `.github/agents/release-manager.agent.md`

.github/dependabot.yml

@@ -0,0 +1,53 @@
+version: 2
+
+updates:
+  # Backend dependencies
+  - package-ecosystem: "npm"
+    directory: "/backend"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+    groups:
+      minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+
+  # Frontend dependencies
+  - package-ecosystem: "npm"
+    directory: "/frontend"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+    groups:
+      minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+
+  # Root dev dependencies
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+
+  # GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "ci"

.github/workflows/codeql.yml

@@ -47,18 +47,18 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{ matrix.language }}"

.github/workflows/docker-build.yml

@@ -45,7 +45,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -70,7 +70,7 @@ jobs:
             type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ${{ matrix.context }}
           push: true
@@ -94,7 +94,7 @@ jobs:
     
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0  # Fetch all history for changelog generation
 

.github/workflows/e2e.yml

@@ -22,10 +22,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: 'npm'
@@ -54,7 +54,7 @@ jobs:
           SESSION_SECRET: e2e-test-session-secret-long-enough
 
       - name: Upload Playwright report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: playwright-report
@@ -62,7 +62,7 @@ jobs:
           retention-days: 7
 
       - name: Upload test results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: playwright-results

.github/workflows/test.yml

@@ -51,10 +51,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: 'npm'
@@ -73,7 +73,7 @@ jobs:
         run: npm run test:coverage
 
       - name: Upload coverage report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: backend-coverage
@@ -81,7 +81,7 @@ jobs:
           retention-days: 7
 
   # =============================================================================
-  # Frontend Build Validation (skipped if no frontend-related files changed)
+  # Frontend Tests & Build (skipped if no frontend-related files changed)
   # =============================================================================
   frontend-build:
     name: Frontend Build
@@ -96,10 +96,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: 'npm'
@@ -111,5 +111,16 @@ jobs:
       - name: Lint
         run: npm run lint
 
+      - name: Run tests with coverage
+        run: npm run test:coverage
+
       - name: TypeScript type check & build
         run: npm run build
+
+      - name: Upload coverage report
+        uses: actions/upload-artifact@v6
+        if: always()
+        with:
+          name: frontend-coverage
+          path: frontend/coverage/
+          retention-days: 7

.github/workflows/update-test-badges.yml

@@ -24,12 +24,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.BADGE_TOKEN || secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: 'npm'

.gitignore

@@ -80,4 +80,5 @@ Thumbs.db
 .roo/
 .roomodes
 AGENTS.md
-docs/TECH_STACK.md
+docs/TECH_STACK.md
+doku

README.md

@@ -18,8 +18,8 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/Backend_Tests-518%2F518-brightgreen?logo=vitest" alt="Backend Tests 454/454" />
-  <img src="https://img.shields.io/badge/Frontend_Tests-879%2F879-brightgreen?logo=vitest" alt="Frontend Tests 611/611" />
+  <img src="https://img.shields.io/badge/Backend_Tests-526%2F526-brightgreen?logo=vitest" alt="Backend Tests 454/454" />
+  <img src="https://img.shields.io/badge/Frontend_Tests-719%2F719-brightgreen?logo=vitest" alt="Frontend Tests 611/611" />
 </p>
 
 ### 🤖 AI-Generated Code

backend/drizzle/0008_add_prescription_tracking.sql

@@ -0,0 +1,8 @@
+ALTER TABLE `medications` ADD `prescription_enabled` integer NOT NULL DEFAULT 0;
+ALTER TABLE `medications` ADD `prescription_authorized_refills` integer;
+ALTER TABLE `medications` ADD `prescription_remaining_refills` integer;
+ALTER TABLE `medications` ADD `prescription_low_refill_threshold` integer NOT NULL DEFAULT 1;
+ALTER TABLE `medications` ADD `prescription_expiry_date` text;
+
+ALTER TABLE `user_settings` ADD `email_prescription_reminders` integer NOT NULL DEFAULT 1;
+ALTER TABLE `user_settings` ADD `shoutrrr_prescription_reminders` integer NOT NULL DEFAULT 1;

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medassist-ng-backend",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "private": true,
   "type": "module",
   "scripts": {
@@ -17,31 +17,31 @@
     "check": "npx biome check . && tsc --noEmit"
   },
   "dependencies": {
-    "@fastify/cookie": "^10.0.1",
-    "@fastify/cors": "^10.0.1",
+    "@fastify/cookie": "^11.0.2",
+    "@fastify/cors": "^11.2.0",
     "@fastify/helmet": "^13.0.2",
     "@fastify/jwt": "^10.0.0",
-    "@fastify/multipart": "^9.3.0",
+    "@fastify/multipart": "^9.4.0",
     "@fastify/rate-limit": "^10.3.0",
     "@fastify/sensible": "^6.0.4",
-    "@fastify/static": "^8.3.0",
-    "@libsql/client": "^0.10.0",
-    "argon2": "^0.40.0",
-    "dotenv": "^16.4.5",
+    "@fastify/static": "^9.0.0",
+    "@libsql/client": "^0.17.0",
+    "argon2": "^0.44.0",
+    "dotenv": "^17.3.1",
     "drizzle-orm": "^0.45.1",
-    "fastify": "^5.7.3",
-    "nodemailer": "^7.0.11",
-    "openid-client": "^6.8.1",
+    "fastify": "^5.7.4",
+    "nodemailer": "^8.0.1",
+    "openid-client": "^6.8.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.12",
-    "@types/node": "^22.7.4",
+    "@biomejs/biome": "^2.3.15",
+    "@types/node": "^25.2.3",
     "@types/nodemailer": "^6.4.21",
     "@types/supertest": "^6.0.2",
-    "@vitest/coverage-v8": "^4.0.16",
-    "drizzle-kit": "^0.31.8",
-    "supertest": "^7.0.0",
+    "@vitest/coverage-v8": "^4.0.18",
+    "drizzle-kit": "^0.31.9",
+    "supertest": "^7.2.2",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4",
     "vitest": "^4.0.16"

backend/src/db/db-utils.ts

@@ -135,6 +135,19 @@ export async function runAlterMigrations(client: Client): Promise<{ success: boo
 		`ALTER TABLE user_settings ADD COLUMN last_stock_reminder_med_names text`,
 		// Added for share stock visibility toggle
 		`ALTER TABLE user_settings ADD COLUMN share_stock_status integer NOT NULL DEFAULT 1`,
+		// Added for prescription refill tracking and reminders
+		`ALTER TABLE medications ADD COLUMN prescription_enabled integer NOT NULL DEFAULT 0`,
+		`ALTER TABLE medications ADD COLUMN prescription_authorized_refills integer`,
+		`ALTER TABLE medications ADD COLUMN prescription_remaining_refills integer`,
+		`ALTER TABLE medications ADD COLUMN prescription_low_refill_threshold integer NOT NULL DEFAULT 1`,
+		`ALTER TABLE medications ADD COLUMN prescription_expiry_date text`,
+		`ALTER TABLE user_settings ADD COLUMN email_prescription_reminders integer NOT NULL DEFAULT 1`,
+		`ALTER TABLE user_settings ADD COLUMN shoutrrr_prescription_reminders integer NOT NULL DEFAULT 1`,
+		`ALTER TABLE user_settings ADD COLUMN last_prescription_reminder_sent text`,
+		`ALTER TABLE user_settings ADD COLUMN last_prescription_reminder_channel text`,
+		`ALTER TABLE user_settings ADD COLUMN last_prescription_reminder_med_names text`,
+		// Added for refill history prescription tracking
+		`ALTER TABLE refill_history ADD COLUMN used_prescription integer NOT NULL DEFAULT 0`,
 	];
 
 	for (const sql of alterMigrations) {
@@ -172,6 +185,23 @@ export async function runAlterMigrations(client: Client): Promise<{ success: boo
 		}
 	}
 
+	// Create indexes that might be missing (silently fail if already exists)
+	const createIndexMigrations = [
+		// Added in v1.6.x - case-insensitive unique usernames
+		`CREATE UNIQUE INDEX IF NOT EXISTS users_username_lower_unique ON users(lower(username))`,
+	];
+
+	for (const sql of createIndexMigrations) {
+		try {
+			await client.execute(sql);
+		} catch (e: any) {
+			// Silently ignore "already exists" errors
+			if (!e.message?.includes("already exists")) {
+				errors.push(e.message);
+			}
+		}
+	}
+
 	return { success: errors.length === 0, errors };
 }
 

backend/src/db/schema.ts

@@ -47,6 +47,11 @@ export const medications = sqliteTable("medications", {
 	expiryDate: text("expiry_date"),
 	notes: text("notes"),
 	intakeRemindersEnabled: integer("intake_reminders_enabled", { mode: "boolean" }).notNull().default(false),
+	prescriptionEnabled: integer("prescription_enabled", { mode: "boolean" }).notNull().default(false),
+	prescriptionAuthorizedRefills: integer("prescription_authorized_refills"),
+	prescriptionRemainingRefills: integer("prescription_remaining_refills"),
+	prescriptionLowRefillThreshold: integer("prescription_low_refill_threshold").notNull().default(1),
+	prescriptionExpiryDate: text("prescription_expiry_date"),
 	dismissedUntil: text("dismissed_until"), // ISO date string (e.g. "2026-01-23") - all past doses until this date are dismissed
 	updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().default(sql`CURRENT_TIMESTAMP`),
 });
@@ -65,11 +70,15 @@ export const userSettings = sqliteTable("user_settings", {
 	notificationEmail: text("notification_email"),
 	emailStockReminders: integer("email_stock_reminders", { mode: "boolean" }).notNull().default(true),
 	emailIntakeReminders: integer("email_intake_reminders", { mode: "boolean" }).notNull().default(true),
+	emailPrescriptionReminders: integer("email_prescription_reminders", { mode: "boolean" }).notNull().default(true),
 	// Push notifications (shoutrrr/ntfy)
 	shoutrrrEnabled: integer("shoutrrr_enabled", { mode: "boolean" }).notNull().default(false),
 	shoutrrrUrl: text("shoutrrr_url"),
 	shoutrrrStockReminders: integer("shoutrrr_stock_reminders", { mode: "boolean" }).notNull().default(true),
 	shoutrrrIntakeReminders: integer("shoutrrr_intake_reminders", { mode: "boolean" }).notNull().default(true),
+	shoutrrrPrescriptionReminders: integer("shoutrrr_prescription_reminders", { mode: "boolean" })
+		.notNull()
+		.default(true),
 	// Reminder settings
 	reminderDaysBefore: integer("reminder_days_before").notNull().default(7),
 	repeatDailyReminders: integer("repeat_daily_reminders", { mode: "boolean" }).notNull().default(false),
@@ -98,6 +107,10 @@ export const userSettings = sqliteTable("user_settings", {
 	lastStockReminderSent: text("last_stock_reminder_sent"),
 	lastStockReminderChannel: text("last_stock_reminder_channel"),
 	lastStockReminderMedNames: text("last_stock_reminder_med_names"),
+	// Last prescription reminder tracking (separate from stock/intake)
+	lastPrescriptionReminderSent: text("last_prescription_reminder_sent"),
+	lastPrescriptionReminderChannel: text("last_prescription_reminder_channel"),
+	lastPrescriptionReminderMedNames: text("last_prescription_reminder_med_names"),
 	// Timestamps
 	updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().default(sql`CURRENT_TIMESTAMP`),
 });
@@ -159,5 +172,6 @@ export const refillHistory = sqliteTable("refill_history", {
 		.references(() => users.id, { onDelete: "cascade" }),
 	packsAdded: integer("packs_added").notNull().default(0),
 	loosePillsAdded: integer("loose_pills_added").notNull().default(0),
+	usedPrescription: integer("used_prescription", { mode: "boolean" }).notNull().default(false),
 	refillDate: integer("refill_date", { mode: "timestamp" }).notNull().default(sql`(strftime('%s','now'))`),
 });

backend/src/i18n/translations.ts

@@ -123,6 +123,39 @@ type TranslationKeys = {
 		criticalSection: string;
 		lowStockSection: string;
 	};
+	// Prescription reminder (shared across email + push)
+	prescriptionReminder: {
+		subjectSingle: string;
+		subjectMultiple: string;
+		pushTitleLow: string;
+		pushTitleEmpty: string;
+		pushEmpty: string;
+		pushEmptySingle: string;
+		pushLow: string;
+		pushLowSingle: string;
+		pushRenewNow: string;
+		pushEmptySection: string;
+		pushLowSection: string;
+		pushRefillsLeft: string;
+		title: string;
+		titleEmpty: string;
+		descriptionLow: string;
+		descriptionEmpty: string;
+		alertLowSingle: string;
+		alertLowMultiple: string;
+		alertEmptySingle: string;
+		alertEmptyMultiple: string;
+		line: string;
+		lineEmpty: string;
+		expiresSuffix: string;
+		repeatDailyNote: string;
+		tableHeaders: {
+			medication: string;
+			refillsLeft: string;
+			reminderThreshold: string;
+			prescriptionExpires: string;
+		};
+	};
 	// Demand calculator email
 	demandCalculator: {
 		subject: string;
@@ -134,11 +167,13 @@ type TranslationKeys = {
 			medication: string;
 			usage: string;
 			needed: string;
+			prescriptionRefills: string;
 			available: string;
 			status: string;
 		};
 		statusEnough: string;
 		statusEmpty: string;
+		prescriptionNotApplicable: string;
 	};
 	// Common
 	common: {
@@ -156,8 +191,8 @@ type TranslationKeys = {
 const translations: Record<Language, TranslationKeys> = {
 	en: {
 		stockReminder: {
-			subject: "MedAssist-ng Auto-Reminder: {count} Medication{s} Running Critically Low",
-			title: "⚠️ MedAssist-ng - Automatic Reorder Reminder",
+			subject: "MedAssist-ng: ⚠️ {count} Medication{s} Running Critically Low",
+			title: "⚠️ MedAssist-ng: Automatic Reorder Reminder",
 			description: "The following medications are running critically low and need to be reordered:",
 			descriptionEmpty: "The following medications are empty and need to be reordered immediately:",
 			descriptionMixed: "The following medications need to be reordered:",
@@ -211,9 +246,41 @@ const translations: Record<Language, TranslationKeys> = {
 			criticalSection: "Running critically low",
 			lowStockSection: "Running low",
 		},
+		prescriptionReminder: {
+			subjectSingle: "MedAssist-ng: 🚨 Prescription Refill Reminder",
+			subjectMultiple: "MedAssist-ng: 🚨 {count} Prescriptions Need Renewal Soon",
+			pushTitleLow: "💊 MedAssist-ng: {count} prescriptions are running low",
+			pushTitleEmpty: "💊 MedAssist-ng: {count} prescriptions need renewal now",
+			pushEmpty: "prescriptions out of refills",
+			pushEmptySingle: "prescription out of refills",
+			pushLow: "prescriptions low on refills",
+			pushLowSingle: "prescription low on refills",
+			pushRenewNow: "Renew Now!",
+			pushEmptySection: "Prescriptions with no refills left",
+			pushLowSection: "Prescriptions running low on refills",
+			pushRefillsLeft: "{count} refill(s) remaining on this prescription",
+			title: "⚠️ MedAssist-ng - Prescription Reminder",
+			titleEmpty: "🚨 MedAssist-ng - Prescription Reminder",
+			descriptionLow: "Some prescriptions are low on remaining refills.",
+			descriptionEmpty: "Some prescriptions have no refills left. Contact your doctor for renewal.",
+			alertLowSingle: "⚠️ 1 prescription is low on refills",
+			alertLowMultiple: "⚠️ {count} prescriptions are low on refills",
+			alertEmptySingle: "🚨 1 prescription needs renewal now",
+			alertEmptyMultiple: "🚨 {count} prescriptions need renewal now",
+			line: "{name}: {refills} refill(s) remaining on this prescription{expirySuffix}",
+			lineEmpty: "{name}: no refills remaining on this prescription{expirySuffix}",
+			expiresSuffix: ", expires {date}",
+			repeatDailyNote: "You are receiving this daily reminder because 'Repeat Daily' is enabled in settings.",
+			tableHeaders: {
+				medication: "Medication",
+				refillsLeft: "Prescription refills left",
+				reminderThreshold: "Reminder threshold",
+				prescriptionExpires: "Prescription expires",
+			},
+		},
 		demandCalculator: {
-			subject: "MedAssist-ng - Supply Overview ({from} - {until})",
-			title: "MedAssist-ng - Demand Calculator",
+			subject: "MedAssist-ng: Supply Overview ({from} - {until})",
+			title: "MedAssist-ng: Demand Calculator",
 			description: "Supply overview from {from} to {until}",
 			summaryOutOfStock: "⚠️ {count} medication{s} will be out of stock during this period.",
 			summaryAllOk: "✓ All medications have sufficient supply for this period.",
@@ -221,11 +288,13 @@ const translations: Record<Language, TranslationKeys> = {
 				medication: "Medication",
 				usage: "Usage",
 				needed: "Blisters needed",
+				prescriptionRefills: "Prescription refills",
 				available: "Available",
 				status: "Status",
 			},
 			statusEnough: "✓ Enough",
 			statusEmpty: "✗ Empty",
+			prescriptionNotApplicable: "–",
 		},
 		common: {
 			pill: "pill",
@@ -240,8 +309,8 @@ const translations: Record<Language, TranslationKeys> = {
 	},
 	de: {
 		stockReminder: {
-			subject: "MedAssist-ng Auto-Erinnerung: {count} Medikament{e} kritisch niedrig",
-			title: "⚠️ MedAssist-ng - Automatische Nachbestell-Erinnerung",
+			subject: "MedAssist-ng: ⚠️ {count} Medikament{e} kritisch niedrig",
+			title: "⚠️ MedAssist-ng: Automatische Nachbestell-Erinnerung",
 			description: "Die folgenden Medikamente sind kritisch niedrig und sollten nachbestellt werden:",
 			descriptionEmpty: "Die folgenden Medikamente sind leer und müssen sofort nachbestellt werden:",
 			descriptionMixed: "Die folgenden Medikamente müssen nachbestellt werden:",
@@ -296,9 +365,43 @@ const translations: Record<Language, TranslationKeys> = {
 			criticalSection: "Kritisch niedrig",
 			lowStockSection: "Niedrig",
 		},
+		prescriptionReminder: {
+			subjectSingle: "MedAssist-ng: 🚨 Rezept-Nachfüll-Erinnerung",
+			subjectMultiple: "MedAssist-ng: 🚨 {count} Rezepte müssen bald erneuert werden",
+			pushTitleLow: "💊 MedAssist-ng: {count} Rezept(e) haben nur noch wenige Nachfüllungen",
+			pushTitleEmpty: "💊 MedAssist-ng: {count} Rezept(e) müssen jetzt erneuert werden",
+			pushEmpty: "Rezepte ohne verbleibende Nachfüllung",
+			pushEmptySingle: "Rezept ohne verbleibende Nachfüllung",
+			pushLow: "Rezepte mit wenigen verbleibenden Nachfüllungen",
+			pushLowSingle: "Rezept mit wenigen verbleibenden Nachfüllungen",
+			pushRenewNow: "Jetzt erneuern!",
+			pushEmptySection: "Rezepte ohne Nachfüllungen",
+			pushLowSection: "Rezepte mit bald aufgebrauchten Nachfüllungen",
+			pushRefillsLeft: "{count} Nachfüllung(en) für dieses Rezept übrig",
+			title: "⚠️ MedAssist-ng - Rezept-Erinnerung",
+			titleEmpty: "🚨 MedAssist-ng - Rezept-Erinnerung",
+			descriptionLow: "Einige Rezepte haben nur noch wenige Nachfüllungen.",
+			descriptionEmpty:
+				"Einige Rezepte haben keine Nachfüllungen mehr. Bitte kontaktieren Sie Ihren Arzt für eine Erneuerung.",
+			alertLowSingle: "⚠️ 1 Rezept ist bei den Nachfüllungen niedrig",
+			alertLowMultiple: "⚠️ {count} Rezepte sind bei den Nachfüllungen niedrig",
+			alertEmptySingle: "🚨 1 Rezept muss jetzt erneuert werden",
+			alertEmptyMultiple: "🚨 {count} Rezepte müssen jetzt erneuert werden",
+			line: "{name}: {refills} Nachfüllung(en) für dieses Rezept übrig{expirySuffix}",
+			lineEmpty: "{name}: keine Nachfüllung mehr für dieses Rezept{expirySuffix}",
+			expiresSuffix: ", läuft ab {date}",
+			repeatDailyNote:
+				"Sie erhalten diese tägliche Erinnerung, weil 'Täglich wiederholen' in den Einstellungen aktiviert ist.",
+			tableHeaders: {
+				medication: "Medikament",
+				refillsLeft: "Rezept-Nachfüllungen übrig",
+				reminderThreshold: "Erinnerungsschwelle",
+				prescriptionExpires: "Rezeptablauf",
+			},
+		},
 		demandCalculator: {
-			subject: "MedAssist-ng - Bestandsübersicht ({from} - {until})",
-			title: "MedAssist-ng - Bedarfsrechner",
+			subject: "MedAssist-ng: Bestandsübersicht ({from} - {until})",
+			title: "MedAssist-ng: Bedarfsrechner",
 			description: "Bestandsübersicht von {from} bis {until}",
 			summaryOutOfStock: "⚠️ {count} Medikament{e} wird im Zeitraum nicht ausreichen.",
 			summaryAllOk: "✓ Alle Medikamente reichen für diesen Zeitraum.",
@@ -306,11 +409,13 @@ const translations: Record<Language, TranslationKeys> = {
 				medication: "Medikament",
 				usage: "Verbrauch",
 				needed: "Blister benötigt",
+				prescriptionRefills: "Rezept-Nachfüllungen",
 				available: "Verfügbar",
 				status: "Status",
 			},
 			statusEnough: "✓ Ausreichend",
 			statusEmpty: "✗ Leer",
+			prescriptionNotApplicable: "–",
 		},
 		common: {
 			pill: "Tablette",

backend/src/routes/auth.ts

@@ -1,6 +1,6 @@
 import { randomBytes } from "node:crypto";
 import argon2 from "argon2";
-import { eq } from "drizzle-orm";
+import { eq, sql } from "drizzle-orm";
 import type { FastifyInstance } from "fastify";
 import { z } from "zod";
 import { db } from "../db/client.js";
@@ -129,7 +129,7 @@ export async function authRoutes(app: FastifyInstance) {
 			const { username, password } = parsed.data;
 
 			// Check if username already exists
-			const [existingUser] = await db.select().from(users).where(eq(users.username, username));
+			const [existingUser] = await db.select().from(users).where(sql`lower(${users.username}) = lower(${username})`);
 			if (existingUser) {
 				return reply.status(409).send({ error: "Username already taken", code: "USERNAME_EXISTS" });
 			}
@@ -190,7 +190,7 @@ export async function authRoutes(app: FastifyInstance) {
 			const { username, password, rememberMe } = parsed.data;
 
 			// Find user by username
-			const [user] = await db.select().from(users).where(eq(users.username, username));
+			const [user] = await db.select().from(users).where(sql`lower(${users.username}) = lower(${username})`);
 
 			// Generic error to prevent user enumeration
 			const invalidCredentialsError = () =>

backend/src/routes/export.ts

@@ -52,6 +52,11 @@ const medicationExportSchema = z.object({
 	expiryDate: z.string().nullable().optional(),
 	notes: z.string().nullable().optional(),
 	intakeRemindersEnabled: z.boolean().default(false),
+	prescriptionEnabled: z.boolean().default(false),
+	prescriptionAuthorizedRefills: z.number().int().min(0).nullable().optional(),
+	prescriptionRemainingRefills: z.number().int().min(0).nullable().optional(),
+	prescriptionLowRefillThreshold: z.number().int().min(0).default(1),
+	prescriptionExpiryDate: z.string().nullable().optional(),
 	image: z.string().nullable().optional(), // base64 data URL or null
 	lastStockCorrectionAt: z.string().nullable().optional(), // ISO datetime of last stock correction
 });
@@ -80,11 +85,13 @@ const settingsExportSchema = z
 		notificationEmail: z.string().nullable().optional(),
 		emailStockReminders: z.boolean().default(true),
 		emailIntakeReminders: z.boolean().default(true),
+		emailPrescriptionReminders: z.boolean().default(true),
 		// Push notifications
 		shoutrrrEnabled: z.boolean().optional(),
 		shoutrrrUrl: z.string().nullable().optional(),
 		shoutrrrStockReminders: z.boolean().default(true),
 		shoutrrrIntakeReminders: z.boolean().default(true),
+		shoutrrrPrescriptionReminders: z.boolean().default(true),
 		// Reminder settings
 		reminderDaysBefore: z.number().int().default(7),
 		repeatDailyReminders: z.boolean().default(false),
@@ -285,6 +292,11 @@ export async function exportRoutes(app: FastifyInstance) {
 				expiryDate: med.expiryDate,
 				notes: med.notes,
 				intakeRemindersEnabled: med.intakeRemindersEnabled ?? false,
+				prescriptionEnabled: med.prescriptionEnabled ?? false,
+				prescriptionAuthorizedRefills: med.prescriptionAuthorizedRefills ?? null,
+				prescriptionRemainingRefills: med.prescriptionRemainingRefills ?? null,
+				prescriptionLowRefillThreshold: med.prescriptionLowRefillThreshold ?? 1,
+				prescriptionExpiryDate: med.prescriptionExpiryDate ?? null,
 				image: includeImages ? imageToBase64(med.imageUrl) : null,
 				lastStockCorrectionAt: lastStockCorrectionAtIso,
 			};
@@ -346,11 +358,13 @@ export async function exportRoutes(app: FastifyInstance) {
 					notificationEmail: settings.notificationEmail,
 					emailStockReminders: settings.emailStockReminders,
 					emailIntakeReminders: settings.emailIntakeReminders,
+					emailPrescriptionReminders: settings.emailPrescriptionReminders ?? true,
 					// Only include sensitive data if requested
 					shoutrrrEnabled: includeSensitive ? settings.shoutrrrEnabled : undefined,
 					shoutrrrUrl: includeSensitive ? settings.shoutrrrUrl : undefined,
 					shoutrrrStockReminders: settings.shoutrrrStockReminders,
 					shoutrrrIntakeReminders: settings.shoutrrrIntakeReminders,
+					shoutrrrPrescriptionReminders: settings.shoutrrrPrescriptionReminders ?? true,
 					reminderDaysBefore: settings.reminderDaysBefore,
 					repeatDailyReminders: settings.repeatDailyReminders,
 					skipRemindersForTakenDoses: settings.skipRemindersForTakenDoses,
@@ -508,6 +522,11 @@ export async function exportRoutes(app: FastifyInstance) {
 						expiryDate: med.expiryDate || null,
 						notes: med.notes || null,
 						intakeRemindersEnabled,
+						prescriptionEnabled: med.prescriptionEnabled ?? false,
+						prescriptionAuthorizedRefills: med.prescriptionEnabled ? (med.prescriptionAuthorizedRefills ?? null) : null,
+						prescriptionRemainingRefills: med.prescriptionEnabled ? (med.prescriptionRemainingRefills ?? null) : null,
+						prescriptionLowRefillThreshold: med.prescriptionLowRefillThreshold ?? 1,
+						prescriptionExpiryDate: med.prescriptionExpiryDate || null,
 						imageUrl: null, // Will be set after image is saved
 					})
 					.returning();
@@ -551,10 +570,12 @@ export async function exportRoutes(app: FastifyInstance) {
 					notificationEmail: importData.settings.notificationEmail || null,
 					emailStockReminders: importData.settings.emailStockReminders ?? true,
 					emailIntakeReminders: importData.settings.emailIntakeReminders ?? true,
+					emailPrescriptionReminders: importData.settings.emailPrescriptionReminders ?? true,
 					shoutrrrEnabled: importData.settings.shoutrrrEnabled ?? false,
 					shoutrrrUrl: importData.settings.shoutrrrUrl || null,
 					shoutrrrStockReminders: importData.settings.shoutrrrStockReminders ?? true,
 					shoutrrrIntakeReminders: importData.settings.shoutrrrIntakeReminders ?? true,
+					shoutrrrPrescriptionReminders: importData.settings.shoutrrrPrescriptionReminders ?? true,
 					reminderDaysBefore: importData.settings.reminderDaysBefore ?? 7,
 					repeatDailyReminders: importData.settings.repeatDailyReminders ?? false,
 					skipRemindersForTakenDoses: importData.settings.skipRemindersForTakenDoses ?? false,

backend/src/routes/medications.ts

@@ -48,12 +48,39 @@ const medicationSchema = z
 		doseUnit: doseUnitSchema,
 		expiryDate: z.string().nullable().optional(),
 		notes: z.string().max(2000).nullable().optional(),
+		prescriptionEnabled: z.boolean().default(false),
+		prescriptionAuthorizedRefills: z.number().int().min(0).nullable().optional(),
+		prescriptionRemainingRefills: z.number().int().min(0).nullable().optional(),
+		prescriptionLowRefillThreshold: z.number().int().min(0).default(1),
+		prescriptionExpiryDate: z.string().nullable().optional(),
 		intakeRemindersEnabled: z.boolean().default(false), // Medication-level (deprecated, kept for backward compat)
 		// Accept either new intakes format or legacy blisters format
 		intakes: z.array(intakeSchema).min(1).max(12).optional(),
 		blisters: z.array(blisterSchema).min(1).max(12).optional(), // Legacy format
 	})
-	.refine((data) => data.intakes || data.blisters, { message: "Either 'intakes' or 'blisters' must be provided" });
+	.refine((data) => data.intakes || data.blisters, { message: "Either 'intakes' or 'blisters' must be provided" })
+	.refine(
+		(data) => {
+			if (!data.prescriptionEnabled) return true;
+			if (data.prescriptionAuthorizedRefills == null || data.prescriptionRemainingRefills == null) return false;
+			return data.prescriptionRemainingRefills <= data.prescriptionAuthorizedRefills;
+		},
+		{
+			message: "When prescription is enabled, remaining refills must be <= authorized refills",
+			path: ["prescriptionRemainingRefills"],
+		}
+	)
+	.refine(
+		(data) => {
+			if (!data.prescriptionEnabled) return true;
+			if (data.prescriptionAuthorizedRefills == null) return false;
+			return data.prescriptionLowRefillThreshold <= data.prescriptionAuthorizedRefills;
+		},
+		{
+			message: "When prescription is enabled, low refill threshold must be <= authorized refills",
+			path: ["prescriptionLowRefillThreshold"],
+		}
+	);
 
 export async function medicationRoutes(app: FastifyInstance) {
 	// All medication routes require auth
@@ -109,6 +136,11 @@ export async function medicationRoutes(app: FastifyInstance) {
 				expiryDate: row.expiryDate,
 				notes: row.notes,
 				intakeRemindersEnabled: row.intakeRemindersEnabled ?? false,
+				prescriptionEnabled: row.prescriptionEnabled ?? false,
+				prescriptionAuthorizedRefills: row.prescriptionAuthorizedRefills ?? null,
+				prescriptionRemainingRefills: row.prescriptionRemainingRefills ?? null,
+				prescriptionLowRefillThreshold: row.prescriptionLowRefillThreshold ?? 1,
+				prescriptionExpiryDate: row.prescriptionExpiryDate ?? null,
 				dismissedUntil: row.dismissedUntil ?? null,
 				updatedAt: row.updatedAt,
 			};
@@ -134,6 +166,11 @@ export async function medicationRoutes(app: FastifyInstance) {
 			doseUnit,
 			expiryDate,
 			notes,
+			prescriptionEnabled,
+			prescriptionAuthorizedRefills,
+			prescriptionRemainingRefills,
+			prescriptionLowRefillThreshold,
+			prescriptionExpiryDate,
 			intakeRemindersEnabled,
 			intakes: inputIntakes,
 			blisters: inputBlisters,
@@ -187,6 +224,11 @@ export async function medicationRoutes(app: FastifyInstance) {
 				doseUnit: doseUnit ?? "mg",
 				expiryDate: expiryDate || null,
 				notes: notes || null,
+				prescriptionEnabled: prescriptionEnabled ?? false,
+				prescriptionAuthorizedRefills: prescriptionEnabled ? (prescriptionAuthorizedRefills ?? null) : null,
+				prescriptionRemainingRefills: prescriptionEnabled ? (prescriptionRemainingRefills ?? null) : null,
+				prescriptionLowRefillThreshold: prescriptionLowRefillThreshold ?? 1,
+				prescriptionExpiryDate: prescriptionExpiryDate || null,
 				intakeRemindersEnabled: intakeRemindersEnabled ?? false,
 				intakesJson,
 				usageJson,
@@ -216,6 +258,11 @@ export async function medicationRoutes(app: FastifyInstance) {
 			expiryDate: inserted.expiryDate,
 			notes: inserted.notes,
 			intakeRemindersEnabled: inserted.intakeRemindersEnabled,
+			prescriptionEnabled: inserted.prescriptionEnabled ?? false,
+			prescriptionAuthorizedRefills: inserted.prescriptionAuthorizedRefills ?? null,
+			prescriptionRemainingRefills: inserted.prescriptionRemainingRefills ?? null,
+			prescriptionLowRefillThreshold: inserted.prescriptionLowRefillThreshold ?? 1,
+			prescriptionExpiryDate: inserted.prescriptionExpiryDate ?? null,
 			updatedAt: inserted.updatedAt,
 		};
 	});
@@ -249,6 +296,11 @@ export async function medicationRoutes(app: FastifyInstance) {
 			doseUnit,
 			expiryDate,
 			notes,
+			prescriptionEnabled,
+			prescriptionAuthorizedRefills,
+			prescriptionRemainingRefills,
+			prescriptionLowRefillThreshold,
+			prescriptionExpiryDate,
 			intakeRemindersEnabled,
 			intakes: inputIntakes,
 			blisters: inputBlisters,
@@ -312,6 +364,11 @@ export async function medicationRoutes(app: FastifyInstance) {
 				doseUnit: doseUnit ?? "mg",
 				expiryDate: expiryDate || null,
 				notes: notes || null,
+				prescriptionEnabled: prescriptionEnabled ?? false,
+				prescriptionAuthorizedRefills: prescriptionEnabled ? (prescriptionAuthorizedRefills ?? null) : null,
+				prescriptionRemainingRefills: prescriptionEnabled ? (prescriptionRemainingRefills ?? null) : null,
+				prescriptionLowRefillThreshold: prescriptionLowRefillThreshold ?? 1,
+				prescriptionExpiryDate: prescriptionExpiryDate || null,
 				intakeRemindersEnabled: intakeRemindersEnabled ?? false,
 				intakesJson,
 				usageJson,
@@ -465,6 +522,11 @@ export async function medicationRoutes(app: FastifyInstance) {
 			expiryDate: result[0].expiryDate,
 			notes: result[0].notes,
 			intakeRemindersEnabled: result[0].intakeRemindersEnabled,
+			prescriptionEnabled: result[0].prescriptionEnabled ?? false,
+			prescriptionAuthorizedRefills: result[0].prescriptionAuthorizedRefills ?? null,
+			prescriptionRemainingRefills: result[0].prescriptionRemainingRefills ?? null,
+			prescriptionLowRefillThreshold: result[0].prescriptionLowRefillThreshold ?? 1,
+			prescriptionExpiryDate: result[0].prescriptionExpiryDate ?? null,
 			updatedAt: result[0].updatedAt,
 		};
 	});

backend/src/routes/oidc.ts

@@ -1,5 +1,5 @@
 import { createHash, randomBytes } from "node:crypto";
-import { eq } from "drizzle-orm";
+import { eq, sql } from "drizzle-orm";
 import type { FastifyInstance, FastifyReply } from "fastify";
 import * as client from "openid-client";
 import { db } from "../db/client.js";
@@ -234,7 +234,7 @@ async function findOrCreateOIDCUser(
 	}
 
 	// Check if username already exists (potential collision)
-	const [existingByUsername] = await db.select().from(users).where(eq(users.username, username));
+	const [existingByUsername] = await db.select().from(users).where(sql`lower(${users.username}) = lower(${username})`);
 
 	if (existingByUsername) {
 		// Username collision! Check if it's a local user without OIDC linked

backend/src/routes/planner.ts

@@ -1,5 +1,8 @@
+import { eq } from "drizzle-orm";
 import type { FastifyInstance, FastifyRequest } from "fastify";
 import nodemailer from "nodemailer";
+import { db } from "../db/client.js";
+import { medications } from "../db/schema.js";
 import {
 	getDateLocale,
 	getFooterHtml,
@@ -61,6 +64,19 @@ type ReminderEmailBody = {
 	language?: Language; // Optional: passed from frontend for unauthenticated requests
 };
 
+type PrescriptionReminderItem = {
+	name: string;
+	remainingRefills: number;
+	threshold: number;
+	expiryDate?: string | null;
+};
+
+type PrescriptionReminderBody = {
+	email: string;
+	prescriptionLow: PrescriptionReminderItem[];
+	language?: Language;
+};
+
 export async function plannerRoutes(app: FastifyInstance) {
 	// Add auth hook for all planner routes
 	app.addHook("preHandler", requireAuth);
@@ -119,6 +135,21 @@ export async function plannerRoutes(app: FastifyInstance) {
 		const outOfStockCount = rows.filter((r) => !r.enough).length;
 		const summaryText = outOfStockCount > 0 ? t(dc.summaryOutOfStock, { count: outOfStockCount }) : dc.summaryAllOk;
 
+		// Load prescription data for medications referenced in planner rows
+		const medIds = rows.map((r) => r.medicationId).filter(Boolean);
+		const allMeds =
+			medIds.length > 0
+				? await db
+						.select({
+							id: medications.id,
+							prescriptionEnabled: medications.prescriptionEnabled,
+							prescriptionRemainingRefills: medications.prescriptionRemainingRefills,
+						})
+						.from(medications)
+						.where(eq(medications.userId, userId))
+				: [];
+		const prescriptionMap = new Map(allMeds.map((m) => [m.id, m]));
+
 		// Build plain text (shared between email and push)
 		const plainText = `${dc.title}
 ${t(dc.description, { from: fromDate, until: untilDate })}
@@ -130,12 +161,16 @@ ${rows
 		const isBottle = r.packageType === "bottle";
 		const usage = `${r.plannerUsage} ${tr.common.pills}`;
 		const needed = isBottle ? "–" : `${r.blistersNeeded} × ${r.blisterSize}`;
+		const medPrescription = prescriptionMap.get(r.medicationId);
+		const rxRefills = medPrescription?.prescriptionEnabled
+			? String(medPrescription.prescriptionRemainingRefills ?? 0)
+			: dc.prescriptionNotApplicable;
 		const loosePills = Math.round((Number(r.loosePills) || 0) * 10) / 10;
 		const available = isBottle
 			? `${loosePills} ${tr.common.pills}`
 			: `${r.fullBlisters} ${tr.common.blisters}${loosePills > 0 ? ` + ${loosePills} ${tr.common.pills}` : ""}`;
 		const status = r.enough ? dc.statusEnough : dc.statusEmpty;
-		return `${r.medicationName}: ${usage}, ${needed}, ${available} - ${status}`;
+		return `${r.medicationName}: ${usage}, ${needed}, ${dc.tableHeaders.prescriptionRefills}: ${rxRefills}, ${available} - ${status}`;
 	})
 	.join("\n")}
 
@@ -169,6 +204,12 @@ ${getFooterPlain(language)}`;
 						// "Blisters needed" column: dash for bottles
 						const neededCell = isBottle ? "–" : `${safeBlistersNeeded} × ${safeBlisterSize}`;
 
+						// "Prescription refills" column
+						const medPrescription = prescriptionMap.get(row.medicationId);
+						const rxCell = medPrescription?.prescriptionEnabled
+							? String(medPrescription.prescriptionRemainingRefills ?? 0)
+							: dc.prescriptionNotApplicable;
+
 						// "Available" column: match frontend format
 						let availableCell: string;
 						if (isBottle) {
@@ -180,11 +221,14 @@ ${getFooterPlain(language)}`;
 							}
 						}
 
+						const rowBg = row.enough ? "" : " background: #fef2f2;";
+
 						return `
-        <tr>
+        <tr style="${rowBg}">
           <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${safeName}</td>
           <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;"><strong>${safePlannerUsage}</strong> ${tr.common.pills}</td>
           <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${neededCell}</td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${rxCell}</td>
           <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${availableCell}</td>
           <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">
             <span style="display: inline-block; padding: 4px 10px; border-radius: 12px; font-size: 12px; font-weight: 600; ${
@@ -221,6 +265,7 @@ ${getFooterPlain(language)}`;
                   <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.medication}</th>
                   <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.usage}</th>
                   <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.needed}</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.prescriptionRefills}</th>
                   <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.available}</th>
                   <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.status}</th>
                 </tr>
@@ -344,7 +389,7 @@ ${getFooterPlain(language)}`;
 		if (lowStockMeds.length > 0) {
 			titleParts.push(`⚠️ ${lowStockMeds.length} ${tr.push.lowStock}`);
 		}
-		const notificationTitle = `MedAssist: ${titleParts.join(", ")} - ${tr.push.reorderNow}`;
+		const notificationTitle = `MedAssist-ng: ${titleParts.join(", ")} - ${tr.push.reorderNow}`;
 
 		// Build description text
 		let descriptionText: string;
@@ -485,8 +530,7 @@ ${getFooterPlain(language)}`;
                 </table>
               </div>
 
-              <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
-              <p style="color: #9ca3af; font-size: 11px; margin: 0;">${getFooterHtml(language)}</p>
+							<p style="color: #9ca3af; font-size: 11px; margin: 16px 0 0 0;">${getFooterHtml(language)}</p>
             </div>
           </div>
         `;
@@ -507,7 +551,7 @@ ${getFooterPlain(language)}`;
 					await transporter.sendMail({
 						from: smtpFrom,
 						to: email,
-						subject: `MedAssist-ng - ${subjectText}`,
+						subject: `MedAssist-ng: ${subjectText}`,
 						text: plainText,
 						html,
 					});
@@ -544,7 +588,7 @@ ${getFooterPlain(language)}`;
 
 			// Also update user settings in database so frontend can display the info
 			const firstMed = lowStock[0];
-			const medNames = lowStock.length > 1 ? `${firstMed.name} (+${lowStock.length - 1})` : firstMed?.name;
+			const medNames = lowStock.map((m: { name: string }) => m.name).join(", ");
 			await updateUserReminderSentTime(userId, "stock", channel, medNames);
 		}
 
@@ -564,4 +608,212 @@ ${getFooterPlain(language)}`;
 			return reply.status(400).send({ error: "No notification channels configured" });
 		}
 	});
+
+	// Manual prescription reminder (supports email and push)
+	app.post<{ Body: PrescriptionReminderBody }>("/reminder/send-prescription", async (request, reply) => {
+		const { email, prescriptionLow } = request.body;
+
+		if (!prescriptionLow || prescriptionLow.length === 0) {
+			return reply.status(400).send({ error: "Missing prescription reminder data" });
+		}
+
+		const userId = await getUserId(request);
+		const userSettings = await loadUserSettings(userId);
+		const language = (userSettings.language as Language) || "en";
+		const tr = getTranslations(language);
+
+		const emptyRx = prescriptionLow.filter((item) => item.remainingRefills <= 0);
+		const lowRx = prescriptionLow.filter((item) => item.remainingRefills > 0);
+
+		const lines = prescriptionLow.map((item) => {
+			const expirySuffix = item.expiryDate ? t(tr.prescriptionReminder.expiresSuffix, { date: item.expiryDate }) : "";
+			if (item.remainingRefills <= 0) {
+				return `- ${t(tr.prescriptionReminder.lineEmpty, {
+					name: item.name,
+					expirySuffix,
+				})}`;
+			}
+			return `- ${t(tr.prescriptionReminder.line, {
+				name: item.name,
+				refills: item.remainingRefills,
+				expirySuffix,
+			})}`;
+		});
+
+		const medNames = prescriptionLow.map((m: { name: string }) => m.name).join(", ");
+
+		const results: { email?: boolean; push?: boolean; errors: string[] } = { errors: [] };
+
+		if (userSettings.emailEnabled && userSettings.emailPrescriptionReminders && email) {
+			const smtpHost = process.env.SMTP_HOST;
+			const smtpUser = process.env.SMTP_USER;
+			const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS;
+			const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
+			const smtpSecure = process.env.SMTP_SECURE === "true";
+			const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
+
+			if (smtpHost && smtpUser) {
+				try {
+					const transporter = nodemailer.createTransport({
+						host: smtpHost,
+						port: smtpPort,
+						secure: smtpSecure,
+						auth: {
+							user: smtpUser,
+							pass: smtpPass ?? "",
+						},
+					});
+
+					const subject =
+						prescriptionLow.length === 1
+							? tr.prescriptionReminder.subjectSingle
+							: t(tr.prescriptionReminder.subjectMultiple, { count: prescriptionLow.length });
+
+					const bodyText =
+						emptyRx.length > 0 ? tr.prescriptionReminder.descriptionEmpty : tr.prescriptionReminder.descriptionLow;
+					const alertText =
+						emptyRx.length > 0
+							? emptyRx.length === 1
+								? tr.prescriptionReminder.alertEmptySingle
+								: t(tr.prescriptionReminder.alertEmptyMultiple, { count: emptyRx.length })
+							: lowRx.length === 1
+								? tr.prescriptionReminder.alertLowSingle
+								: t(tr.prescriptionReminder.alertLowMultiple, { count: lowRx.length });
+
+					const tableRows = prescriptionLow
+						.map((item) => {
+							const isEmpty = item.remainingRefills <= 0;
+							const safeName = escapeHtml(item.name);
+							const safeRefills = Number(item.remainingRefills) || 0;
+							const safeThreshold = Number(item.threshold) || 0;
+							const safeExpiry = item.expiryDate ? escapeHtml(String(item.expiryDate)) : "-";
+							const rowBg = isEmpty ? "#fef2f2" : "white";
+							return `
+					<tr style="background: ${rowBg};">
+						<td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${isEmpty ? "🚨" : "⚠️"} ${safeName}</td>
+						<td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap; ${isEmpty ? "color: #dc2626; font-weight: 600;" : ""}"><strong>${safeRefills}</strong></td>
+						<td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${safeThreshold}</td>
+						<td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${safeExpiry}</td>
+					</tr>`;
+						})
+						.join("");
+
+					const emailTitle = emptyRx.length > 0 ? tr.prescriptionReminder.titleEmpty : tr.prescriptionReminder.title;
+					const text = `${emailTitle}\n\n${bodyText}\n\n${lines.join("\n")}\n\n---\n${getFooterPlain(language)}`;
+					const html = `
+					<div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
+						<div style="background: white; border-radius: 12px; padding: 16px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
+							<h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${emailTitle}</h2>
+							<p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">${bodyText}</p>
+
+							<div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; ${emptyRx.length > 0 ? "background: #fef2f2; border: 1px solid #dc2626;" : "background: #fffbeb; border: 1px solid #f59e0b;"}">
+								<p style="margin: 0; ${emptyRx.length > 0 ? "color: #dc2626; font-weight: 600;" : "color: #b45309; font-weight: 500;"} font-size: 13px;">
+									${alertText}
+								</p>
+							</div>
+
+							<div style="overflow-x: auto; -webkit-overflow-scrolling: touch;">
+								<table style="width: 100%; border-collapse: collapse; background: white; min-width: 460px;">
+									<thead>
+										<tr style="background: #f3f4f6;">
+											<th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.prescriptionReminder.tableHeaders.medication}</th>
+											<th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.prescriptionReminder.tableHeaders.refillsLeft}</th>
+											<th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.prescriptionReminder.tableHeaders.reminderThreshold}</th>
+											<th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.prescriptionReminder.tableHeaders.prescriptionExpires}</th>
+										</tr>
+									</thead>
+									<tbody>
+										${tableRows}
+									</tbody>
+								</table>
+							</div>
+
+							<hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
+							<p style="color: #9ca3af; font-size: 11px; margin: 0;">${getFooterHtml(language)}</p>
+						</div>
+					</div>
+				`;
+
+					await transporter.sendMail({
+						from: smtpFrom,
+						to: email,
+						subject,
+						text,
+						html,
+					});
+
+					results.email = true;
+				} catch (error) {
+					const errorMessage = error instanceof Error ? error.message : "Unknown error";
+					results.errors.push(`Email: ${errorMessage}`);
+				}
+			}
+		}
+
+		if (userSettings.shoutrrrEnabled && userSettings.shoutrrrPrescriptionReminders && userSettings.shoutrrrUrl) {
+			const titleParts: string[] = [];
+			if (emptyRx.length > 0)
+				titleParts.push(
+					`🚨 ${emptyRx.length} ${emptyRx.length === 1 ? tr.prescriptionReminder.pushEmptySingle : tr.prescriptionReminder.pushEmpty}`
+				);
+			if (lowRx.length > 0)
+				titleParts.push(
+					`🚨 ${lowRx.length} ${lowRx.length === 1 ? tr.prescriptionReminder.pushLowSingle : tr.prescriptionReminder.pushLow}`
+				);
+			const title = `MedAssist-ng: ${titleParts.join(", ")} - ${tr.prescriptionReminder.pushRenewNow}`;
+
+			const messageParts: string[] = [];
+			if (emptyRx.length > 0) {
+				messageParts.push(`🚨 ${tr.prescriptionReminder.pushEmptySection}:`);
+				for (const m of emptyRx) {
+					messageParts.push(`  • ${m.name}`);
+				}
+			}
+			if (lowRx.length > 0) {
+				if (emptyRx.length > 0) messageParts.push("");
+				messageParts.push(`🚨 ${tr.prescriptionReminder.pushLowSection}:`);
+				for (const m of lowRx) {
+					messageParts.push(
+						`  • ${m.name}: ${t(tr.prescriptionReminder.pushRefillsLeft, { count: m.remainingRefills })}`
+					);
+				}
+			}
+			const message = messageParts.join("\n") + `\n\n---\n${getFooterPlain(language)}`;
+
+			try {
+				const pushResult = await sendShoutrrrNotification(userSettings.shoutrrrUrl, title, message);
+				if (pushResult.success) {
+					results.push = true;
+				} else {
+					results.errors.push(`Push: ${pushResult.error}`);
+				}
+			} catch (error) {
+				const errorMessage = error instanceof Error ? error.message : "Unknown error";
+				results.errors.push(`Push: ${errorMessage}`);
+			}
+		}
+
+		if (results.email || results.push) {
+			const channel = results.email && results.push ? "both" : results.email ? "email" : "push";
+			updateReminderSentTime("prescription", channel);
+			await updateUserReminderSentTime(userId, "prescription", channel, medNames);
+		}
+
+		const sentChannels: string[] = [];
+		if (results.email) sentChannels.push("email");
+		if (results.push) sentChannels.push("push");
+
+		if (sentChannels.length > 0) {
+			return reply.send({
+				success: true,
+				message: `Prescription reminder sent via ${sentChannels.join(" and ")}`,
+			});
+		}
+
+		if (results.errors.length > 0) {
+			return reply.status(500).send({ error: results.errors.join("; ") });
+		}
+
+		return reply.status(400).send({ error: "No notification channels configured" });
+	});
 }

backend/src/routes/refills.ts

@@ -11,6 +11,7 @@ const refillSchema = z
 	.object({
 		packsAdded: z.number().int().min(0).default(0),
 		loosePillsAdded: z.number().int().min(0).default(0),
+		usePrescription: z.boolean().default(false),
 	})
 	.refine((data) => data.packsAdded > 0 || data.loosePillsAdded > 0, {
 		message: "Must add at least one pack or some loose pills",
@@ -50,17 +51,32 @@ export async function refillRoutes(app: FastifyInstance) {
 			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
 		if (!med) return reply.notFound("Medication not found");
 
-		const { packsAdded, loosePillsAdded } = parsed.data;
+		const { packsAdded, loosePillsAdded, usePrescription } = parsed.data;
+
+		if (usePrescription) {
+			if (!(med.prescriptionEnabled ?? false)) {
+				return reply.status(400).send({ error: "Prescription refill is not enabled for this medication" });
+			}
+			const remaining = med.prescriptionRemainingRefills ?? 0;
+			if (remaining <= 0) {
+				return reply.status(409).send({ error: "No remaining prescription refills" });
+			}
+		}
 
 		// Update medication stock
 		const newPackCount = med.packCount + packsAdded;
 		const newLooseTablets = med.looseTablets + loosePillsAdded;
 
+		const newRemainingRefills = usePrescription
+			? Math.max(0, (med.prescriptionRemainingRefills ?? 0) - 1)
+			: (med.prescriptionRemainingRefills ?? null);
+
 		await db
 			.update(medications)
 			.set({
 				packCount: newPackCount,
 				looseTablets: newLooseTablets,
+				prescriptionRemainingRefills: newRemainingRefills,
 				stockAdjustment: 0, // Reset offset since we're adding to base stock
 				lastStockCorrectionAt: new Date(), // Reset consumed counter to now
 				updatedAt: new Date(),
@@ -75,6 +91,7 @@ export async function refillRoutes(app: FastifyInstance) {
 				userId,
 				packsAdded,
 				loosePillsAdded,
+				usedPrescription: usePrescription,
 			})
 			.returning();
 
@@ -100,6 +117,13 @@ export async function refillRoutes(app: FastifyInstance) {
 				looseTablets: newLooseTablets,
 				totalPills: newTotalPills,
 			},
+			prescription: {
+				used: usePrescription,
+				remainingRefills: newRemainingRefills,
+				authorizedRefills: med.prescriptionAuthorizedRefills ?? null,
+				lowRefillThreshold: med.prescriptionLowRefillThreshold ?? 1,
+				enabled: med.prescriptionEnabled ?? false,
+			},
 		};
 	});
 
@@ -132,6 +156,7 @@ export async function refillRoutes(app: FastifyInstance) {
 			packsAdded: r.packsAdded,
 			loosePillsAdded: r.loosePillsAdded,
 			totalPillsAdded: isBottle ? r.loosePillsAdded : r.packsAdded * pillsPerPack + r.loosePillsAdded,
+			usedPrescription: r.usedPrescription ?? false,
 			refillDate: r.refillDate,
 		}));
 	});

backend/src/routes/settings.ts

@@ -15,10 +15,12 @@ export type UserSettings = {
 	notificationEmail: string | null;
 	emailStockReminders: boolean;
 	emailIntakeReminders: boolean;
+	emailPrescriptionReminders: boolean;
 	shoutrrrEnabled: boolean;
 	shoutrrrUrl: string | null;
 	shoutrrrStockReminders: boolean;
 	shoutrrrIntakeReminders: boolean;
+	shoutrrrPrescriptionReminders: boolean;
 	reminderDaysBefore: number;
 	repeatDailyReminders: boolean;
 	skipRemindersForTakenDoses: boolean;
@@ -39,6 +41,9 @@ export type UserSettings = {
 	lastStockReminderSent: string | null;
 	lastStockReminderChannel: string | null;
 	lastStockReminderMedNames: string | null;
+	lastPrescriptionReminderSent: string | null;
+	lastPrescriptionReminderChannel: string | null;
+	lastPrescriptionReminderMedNames: string | null;
 };
 
 type SettingsBody = {
@@ -53,8 +58,10 @@ type SettingsBody = {
 	shoutrrrUrl: string;
 	emailStockReminders: boolean;
 	emailIntakeReminders: boolean;
+	emailPrescriptionReminders: boolean;
 	shoutrrrStockReminders: boolean;
 	shoutrrrIntakeReminders: boolean;
+	shoutrrrPrescriptionReminders: boolean;
 	skipRemindersForTakenDoses: boolean;
 	repeatRemindersEnabled: boolean;
 	reminderRepeatIntervalMinutes: number;
@@ -94,10 +101,12 @@ function getDefaultSettings() {
 		notificationEmail: process.env.DEFAULT_NOTIFICATION_EMAIL || null,
 		emailStockReminders: envBool("DEFAULT_EMAIL_STOCK_REMINDERS", true),
 		emailIntakeReminders: envBool("DEFAULT_EMAIL_INTAKE_REMINDERS", true),
+		emailPrescriptionReminders: envBool("DEFAULT_EMAIL_PRESCRIPTION_REMINDERS", true),
 		shoutrrrEnabled: envBool("DEFAULT_SHOUTRRR_ENABLED", false),
 		shoutrrrUrl: process.env.DEFAULT_SHOUTRRR_URL || null,
 		shoutrrrStockReminders: envBool("DEFAULT_SHOUTRRR_STOCK_REMINDERS", true),
 		shoutrrrIntakeReminders: envBool("DEFAULT_SHOUTRRR_INTAKE_REMINDERS", true),
+		shoutrrrPrescriptionReminders: envBool("DEFAULT_SHOUTRRR_PRESCRIPTION_REMINDERS", true),
 		reminderDaysBefore: envInt("REMINDER_DAYS_BEFORE", 7),
 		repeatDailyReminders: envBool("DEFAULT_REPEAT_DAILY_REMINDERS", false),
 		skipRemindersForTakenDoses: envBool("DEFAULT_SKIP_REMINDERS_FOR_TAKEN_DOSES", false),
@@ -118,6 +127,9 @@ function getDefaultSettings() {
 		lastStockReminderSent: null,
 		lastStockReminderChannel: null,
 		lastStockReminderMedNames: null,
+		lastPrescriptionReminderSent: null,
+		lastPrescriptionReminderChannel: null,
+		lastPrescriptionReminderMedNames: null,
 	};
 }
 
@@ -148,10 +160,12 @@ export async function loadUserSettings(userId: number): Promise<UserSettings> {
 		notificationEmail: settings.notificationEmail,
 		emailStockReminders: settings.emailStockReminders,
 		emailIntakeReminders: settings.emailIntakeReminders,
+		emailPrescriptionReminders: settings.emailPrescriptionReminders ?? true,
 		shoutrrrEnabled: settings.shoutrrrEnabled,
 		shoutrrrUrl: settings.shoutrrrUrl,
 		shoutrrrStockReminders: settings.shoutrrrStockReminders,
 		shoutrrrIntakeReminders: settings.shoutrrrIntakeReminders,
+		shoutrrrPrescriptionReminders: settings.shoutrrrPrescriptionReminders ?? true,
 		reminderDaysBefore: settings.reminderDaysBefore,
 		repeatDailyReminders: settings.repeatDailyReminders,
 		skipRemindersForTakenDoses: settings.skipRemindersForTakenDoses ?? false,
@@ -172,6 +186,9 @@ export async function loadUserSettings(userId: number): Promise<UserSettings> {
 		lastStockReminderSent: settings.lastStockReminderSent ?? null,
 		lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
 		lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
+		lastPrescriptionReminderSent: settings.lastPrescriptionReminderSent ?? null,
+		lastPrescriptionReminderChannel: settings.lastPrescriptionReminderChannel ?? null,
+		lastPrescriptionReminderMedNames: settings.lastPrescriptionReminderMedNames ?? null,
 	};
 }
 
@@ -184,10 +201,12 @@ export async function getAllUserSettings(): Promise<UserSettings[]> {
 		notificationEmail: settings.notificationEmail,
 		emailStockReminders: settings.emailStockReminders,
 		emailIntakeReminders: settings.emailIntakeReminders,
+		emailPrescriptionReminders: settings.emailPrescriptionReminders ?? true,
 		shoutrrrEnabled: settings.shoutrrrEnabled,
 		shoutrrrUrl: settings.shoutrrrUrl,
 		shoutrrrStockReminders: settings.shoutrrrStockReminders,
 		shoutrrrIntakeReminders: settings.shoutrrrIntakeReminders,
+		shoutrrrPrescriptionReminders: settings.shoutrrrPrescriptionReminders ?? true,
 		reminderDaysBefore: settings.reminderDaysBefore,
 		repeatDailyReminders: settings.repeatDailyReminders,
 		skipRemindersForTakenDoses: settings.skipRemindersForTakenDoses ?? false,
@@ -208,6 +227,9 @@ export async function getAllUserSettings(): Promise<UserSettings[]> {
 		lastStockReminderSent: settings.lastStockReminderSent ?? null,
 		lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
 		lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
+		lastPrescriptionReminderSent: settings.lastPrescriptionReminderSent ?? null,
+		lastPrescriptionReminderChannel: settings.lastPrescriptionReminderChannel ?? null,
+		lastPrescriptionReminderMedNames: settings.lastPrescriptionReminderMedNames ?? null,
 	}));
 }
 
@@ -250,8 +272,10 @@ export async function settingsRoutes(app: FastifyInstance) {
 			shoutrrrUrl: settings.shoutrrrUrl ?? "",
 			emailStockReminders: settings.emailStockReminders,
 			emailIntakeReminders: settings.emailIntakeReminders,
+			emailPrescriptionReminders: settings.emailPrescriptionReminders ?? true,
 			shoutrrrStockReminders: settings.shoutrrrStockReminders,
 			shoutrrrIntakeReminders: settings.shoutrrrIntakeReminders,
+			shoutrrrPrescriptionReminders: settings.shoutrrrPrescriptionReminders ?? true,
 			skipRemindersForTakenDoses: settings.skipRemindersForTakenDoses,
 			repeatRemindersEnabled: settings.repeatRemindersEnabled ?? false,
 			reminderRepeatIntervalMinutes: settings.reminderRepeatIntervalMinutes ?? 30,
@@ -276,6 +300,10 @@ export async function settingsRoutes(app: FastifyInstance) {
 			lastStockReminderSent: settings.lastStockReminderSent ?? null,
 			lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
 			lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
+			// Prescription reminder tracking (separate from stock/intake)
+			lastPrescriptionReminderSent: settings.lastPrescriptionReminderSent ?? null,
+			lastPrescriptionReminderChannel: settings.lastPrescriptionReminderChannel ?? null,
+			lastPrescriptionReminderMedNames: settings.lastPrescriptionReminderMedNames ?? null,
 			// Server settings (from .env, read-only)
 			expiryWarningDays: parseInt(process.env.EXPIRY_WARNING_DAYS ?? "30", 10),
 		});
@@ -303,10 +331,12 @@ export async function settingsRoutes(app: FastifyInstance) {
 			notificationEmail: body.notificationEmail || null,
 			emailStockReminders: body.emailStockReminders ?? true,
 			emailIntakeReminders: body.emailIntakeReminders ?? true,
+			emailPrescriptionReminders: body.emailPrescriptionReminders ?? true,
 			shoutrrrEnabled: body.shoutrrrEnabled ?? false,
 			shoutrrrUrl: body.shoutrrrUrl || null,
 			shoutrrrStockReminders: body.shoutrrrStockReminders ?? true,
 			shoutrrrIntakeReminders: body.shoutrrrIntakeReminders ?? true,
+			shoutrrrPrescriptionReminders: body.shoutrrrPrescriptionReminders ?? true,
 			reminderDaysBefore: body.reminderDaysBefore,
 			repeatDailyReminders,
 			skipRemindersForTakenDoses: body.skipRemindersForTakenDoses ?? false,
@@ -334,6 +364,30 @@ export async function settingsRoutes(app: FastifyInstance) {
 		return reply.send({ success: true });
 	});
 
+	// Update only the language setting (lightweight, called on dropdown change)
+	app.put<{ Body: { language: string } }>("/settings/language", async (request, reply) => {
+		const userId = await getUserId(request, reply);
+		const { language } = request.body;
+
+		if (!language || !["en", "de"].includes(language)) {
+			return reply.status(400).send({ error: "Invalid language" });
+		}
+
+		const existingSettings = await db.select().from(userSettings).where(eq(userSettings.userId, userId));
+
+		if (existingSettings.length > 0) {
+			await db.update(userSettings).set({ language, updatedAt: new Date() }).where(eq(userSettings.userId, userId));
+		} else {
+			await db.insert(userSettings).values({
+				userId,
+				...getDefaultSettings(),
+				language,
+			});
+		}
+
+		return reply.send({ success: true });
+	});
+
 	// Test email - use SMTP settings from process.env
 	app.post<{ Body: TestEmailBody }>("/settings/test-email", async (request, reply) => {
 		const { email } = request.body;
@@ -533,7 +587,10 @@ export async function sendShoutrrrNotification(
 		// This works for ntfy, Apprise, and most simple push services
 		if (!isJsonWebhook) {
 			targetUrl = sanitizedUrl;
-			headers = { Title: cleanTitle, Tags: "pill" };
+			// Use RFC 2047 Base64 encoding for Title header to safely pass non-ASCII
+			// characters (umlauts, accents, etc.) through HTTP headers
+			const encodedTitle = `=?UTF-8?B?${Buffer.from(cleanTitle, "utf-8").toString("base64")}?=`;
+			headers = { Title: encodedTitle, Tags: "pill" };
 			body = message;
 
 			// Add auth if present (extracted during sanitization)

backend/src/services/reminder-scheduler.ts

@@ -24,6 +24,17 @@ import {
 	type ReminderState,
 } from "../utils/scheduler-utils.js";
 
+function escapeHtml(text: string): string {
+	const htmlEscapes: Record<string, string> = {
+		"&": "&amp;",
+		"<": "&lt;",
+		">": "&gt;",
+		'"': "&quot;",
+		"'": "&#39;",
+	};
+	return text.replace(/[&<>"']/g, (char) => htmlEscapes[char] || char);
+}
+
 const REMINDER_HOUR = parseInt(process.env.REMINDER_HOUR ?? "6", 10); // Default 6:00 AM local time
 
 const reminderStateFile = resolve(getDataDir(), "reminder-state.json");
@@ -48,7 +59,7 @@ export function getReminderState(): ReminderState {
 }
 
 export function updateReminderSentTime(
-	type: "stock" | "intake" = "stock",
+	type: "stock" | "intake" | "prescription" = "stock",
 	channel: "email" | "push" | "both" = "email"
 ): void {
 	const state = loadReminderState();
@@ -66,7 +77,7 @@ export function updateReminderSentTime(
 // Stock and intake reminders are tracked separately so neither overwrites the other
 export async function updateUserReminderSentTime(
 	userId: number,
-	type: "stock" | "intake" = "stock",
+	type: "stock" | "intake" | "prescription" = "stock",
 	channel: "email" | "push" | "both" = "email",
 	medName?: string,
 	takenBy?: string
@@ -83,6 +94,16 @@ export async function updateUserReminderSentTime(
 				lastStockReminderMedNames: medName ?? null,
 			})
 			.where(eq(userSettings.userId, userId));
+	} else if (type === "prescription") {
+		// Write to dedicated prescription reminder columns only
+		await db
+			.update(userSettings)
+			.set({
+				lastPrescriptionReminderSent: now,
+				lastPrescriptionReminderChannel: channel,
+				lastPrescriptionReminderMedNames: medName ?? null,
+			})
+			.where(eq(userSettings.userId, userId));
 	} else {
 		// Write to intake reminder columns
 		await db
@@ -107,11 +128,20 @@ type LowStockItem = {
 	medsLeft: number;
 	daysLeft: number | null;
 	depletionDate: string | null;
+	isCritical: boolean;
+};
+
+type PrescriptionReminderItem = {
+	name: string;
+	remainingRefills: number;
+	lowThreshold: number;
+	expiryDate: string | null;
 };
 
 async function getMedicationsNeedingReminder(
 	userId: number,
 	reminderDaysBefore: number,
+	lowStockDays: number,
 	language: Language
 ): Promise<LowStockItem[]> {
 	const rows = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
@@ -126,13 +156,18 @@ async function getMedicationsNeedingReminder(
 				: row.packCount * row.blistersPerPack * row.pillsPerBlister + row.looseTablets + (row.stockAdjustment ?? 0);
 		const { daysLeft, depletionDate } = calculateDepletionInfo({ count: totalPills, blisters }, language);
 
-		// Check if medication runs out within reminderDaysBefore days
-		if (daysLeft !== null && daysLeft <= reminderDaysBefore) {
+		if (daysLeft === null) continue;
+
+		const isCritical = daysLeft <= reminderDaysBefore;
+		const isLow = daysLeft < lowStockDays;
+
+		if (isCritical || isLow) {
 			lowStock.push({
 				name: row.name,
 				medsLeft: totalPills,
 				daysLeft,
 				depletionDate,
+				isCritical,
 			});
 		}
 	}
@@ -140,6 +175,23 @@ async function getMedicationsNeedingReminder(
 	return lowStock;
 }
 
+async function getMedicationsNeedingPrescriptionReminder(userId: number): Promise<PrescriptionReminderItem[]> {
+	const rows = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
+
+	return rows
+		.filter(
+			(row) =>
+				(row.prescriptionEnabled ?? false) &&
+				(row.prescriptionRemainingRefills ?? 0) <= (row.prescriptionLowRefillThreshold ?? 1)
+		)
+		.map((row) => ({
+			name: row.name,
+			remainingRefills: row.prescriptionRemainingRefills ?? 0,
+			lowThreshold: row.prescriptionLowRefillThreshold ?? 1,
+			expiryDate: row.prescriptionExpiryDate ?? null,
+		}));
+}
+
 async function sendReminderEmail(
 	email: string,
 	lowStock: LowStockItem[],
@@ -158,35 +210,82 @@ async function sendReminderEmail(
 	}
 
 	const tr = getTranslations(language);
-	const tableRows = lowStock
-		.map(
-			(row) => `
-      <tr>
-        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${row.name}</td>
-        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;"><strong>${row.medsLeft}</strong></td>
-        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.daysLeft ?? 0}</td>
-        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.depletionDate ?? "-"}</td>
-      </tr>
-    `
-		)
-		.join("");
 
-	const alertText =
-		lowStock.length === 1
-			? tr.stockReminder.alertSingle
-			: t(tr.stockReminder.alertMultiple, { count: lowStock.length });
+	// Separate into 3 categories: empty, critical, and low stock
+	const emptyMeds = lowStock.filter((item) => item.medsLeft <= 0);
+	const criticalMeds = lowStock.filter((item) => item.medsLeft > 0 && item.isCritical);
+	const lowStockMeds = lowStock.filter((item) => item.medsLeft > 0 && !item.isCritical);
+
+	// Build per-category alert boxes
+	const alertParts: string[] = [];
+	if (emptyMeds.length > 0) {
+		const emptyAlert =
+			emptyMeds.length === 1
+				? tr.stockReminder.alertEmptySingle
+				: t(tr.stockReminder.alertEmptyMultiple, { count: emptyMeds.length });
+		alertParts.push(`
+            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fef2f2; border: 1px solid #dc2626;">
+              <p style="margin: 0; color: #dc2626; font-weight: 600; font-size: 13px;">${emptyAlert}</p>
+            </div>`);
+	}
+	if (criticalMeds.length > 0) {
+		const criticalAlert =
+			criticalMeds.length === 1
+				? tr.stockReminder.alertLowSingle
+				: t(tr.stockReminder.alertLowMultiple, { count: criticalMeds.length });
+		alertParts.push(`
+            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fff7ed; border: 1px solid #ea580c;">
+              <p style="margin: 0; color: #c2410c; font-weight: 600; font-size: 13px;">${criticalAlert}</p>
+            </div>`);
+	}
+	if (lowStockMeds.length > 0) {
+		const lowAlert =
+			lowStockMeds.length === 1
+				? tr.stockReminder.alertLowStockSingle
+				: t(tr.stockReminder.alertLowStockMultiple, { count: lowStockMeds.length });
+		alertParts.push(`
+            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fffbeb; border: 1px solid #f59e0b;">
+              <p style="margin: 0; color: #b45309; font-weight: 500; font-size: 13px;">${lowAlert}</p>
+            </div>`);
+	}
+	const alertHtml = alertParts.join("");
+
+	// Build description text
+	let descriptionText: string;
+	if (emptyMeds.length > 0 && (criticalMeds.length > 0 || lowStockMeds.length > 0)) {
+		descriptionText = tr.stockReminder.descriptionMixed;
+	} else if (emptyMeds.length > 0) {
+		descriptionText = tr.stockReminder.descriptionEmpty;
+	} else if (criticalMeds.length > 0) {
+		descriptionText = tr.stockReminder.description;
+	} else {
+		descriptionText = tr.stockReminder.descriptionLow;
+	}
+
+	// Build table rows with status indicator
+	const tableRows = lowStock
+		.map((row) => {
+			const isEmpty = row.medsLeft <= 0;
+			const isCritical = row.isCritical;
+			const statusIcon = isEmpty ? "🚨" : isCritical ? "🚨" : "⚠️";
+			const rowBg = isEmpty ? "#fef2f2" : isCritical ? "#fff7ed" : "white";
+			return `
+      <tr style="background: ${rowBg};">
+        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${statusIcon} ${row.name}</td>
+        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap; ${isEmpty ? "color: #dc2626; font-weight: 600;" : ""}"><strong>${row.medsLeft}</strong></td>
+        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.daysLeft ?? 0}</td>
+        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${isEmpty ? `<strong>${tr.stockReminder.now ?? "-"}</strong>` : (row.depletionDate ?? "-")}</td>
+      </tr>`;
+		})
+		.join("");
 
 	const html = `
     <div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
       <div style="background: white; border-radius: 12px; padding: 16px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
-        <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${tr.stockReminder.title}</h2>
-        <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">${tr.stockReminder.description}</p>
+        <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${emptyMeds.length > 0 ? "🚨" : "⚠️"} MedAssist-ng - ${tr.push.reorderNow}</h2>
+        <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">${descriptionText}</p>
         
-        <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; background: #fef2f2; border: 1px solid #fecaca;">
-          <p style="margin: 0; color: #991b1b; font-weight: 500; font-size: 13px;">
-            ${alertText}
-          </p>
-        </div>
+        ${alertHtml}
 
         <div style="overflow-x: auto; -webkit-overflow-scrolling: touch;">
           <table style="width: 100%; border-collapse: collapse; background: white; min-width: 400px;">
@@ -239,7 +338,7 @@ ${getFooterPlain(language)}${isRepeatDaily ? `\n\n${tr.stockReminder.repeatDaily
 		await transporter.sendMail({
 			from: smtpFrom,
 			to: email,
-			subject: `⚠️ ${subject}`,
+			subject,
 			text: plainText,
 			html,
 		});
@@ -272,118 +371,301 @@ async function checkAndSendReminderForUser(
 	const language = settings.language;
 	const tr = getTranslations(language);
 
-	// Check if any stock reminder notifications are enabled (granular check)
-	const emailEnabled = settings.emailEnabled && settings.notificationEmail && settings.emailStockReminders;
-	const shoutrrrEnabled = settings.shoutrrrEnabled && settings.shoutrrrUrl && settings.shoutrrrStockReminders;
+	const stockEmailEnabled = settings.emailEnabled && settings.notificationEmail && settings.emailStockReminders;
+	const stockPushEnabled = settings.shoutrrrEnabled && settings.shoutrrrUrl && settings.shoutrrrStockReminders;
+	const prescriptionEmailEnabled =
+		settings.emailEnabled && settings.notificationEmail && settings.emailPrescriptionReminders;
+	const prescriptionPushEnabled =
+		settings.shoutrrrEnabled && settings.shoutrrrUrl && settings.shoutrrrPrescriptionReminders;
 
-	if (!emailEnabled && !shoutrrrEnabled) {
-		return; // No stock reminder notifications enabled for this user
+	if (!stockEmailEnabled && !stockPushEnabled && !prescriptionEmailEnabled && !prescriptionPushEnabled) {
+		return;
 	}
 
 	const state = loadReminderState();
 	const today = getTodayInTimezone(); // YYYY-MM-DD in configured timezone
 	const userStateKey = `user_${settings.userId}`;
+	const userStockNotifiedKey = `${userStateKey}_${today}_stock`;
+	const userPrescriptionNotifiedKey = `${userStateKey}_${today}_prescription`;
 
-	// Get all medications that need a reminder for this user
-	const allLowStock = await getMedicationsNeedingReminder(settings.userId, settings.reminderDaysBefore, language);
+	const allLowStock = await getMedicationsNeedingReminder(
+		settings.userId,
+		settings.reminderDaysBefore,
+		settings.lowStockDays,
+		language
+	);
+	const allPrescriptionLow = await getMedicationsNeedingPrescriptionReminder(settings.userId);
 
-	if (allLowStock.length === 0) {
-		return; // No low stock for this user
-	}
-
-	// Simple per-user tracking - check if we already sent today
-	const userNotifiedKey = `${userStateKey}_${today}`;
-	if (state.notifiedMedications.includes(userNotifiedKey) && !settings.repeatDailyReminders) {
-		return; // Already notified this user today
-	}
-
-	logger.info(`[Reminder] User ${settings.userId}: Sending reminder for ${allLowStock.length} medications...`);
-
-	let emailSuccess = false;
-	let shoutrrrSuccess = false;
-
-	// Send email if enabled
-	if (emailEnabled) {
-		const result = await sendReminderEmail(
-			settings.notificationEmail!,
-			allLowStock,
-			language,
-			settings.repeatDailyReminders
-		);
-		emailSuccess = result.success;
-		if (result.success) {
-			logger.info(`[Reminder] User ${settings.userId}: Email sent successfully to ${settings.notificationEmail}`);
-		} else {
-			logger.error(`[Reminder] User ${settings.userId}: Failed to send email: ${result.error}`);
-		}
-	}
-
-	// Send Shoutrrr notification if enabled
-	if (shoutrrrEnabled) {
-		// Separate empty from critical stock medications (all auto-reminder meds are critical by definition)
-		const emptyMeds = allLowStock.filter((m) => m.medsLeft <= 0);
-		const criticalMeds = allLowStock.filter((m) => m.medsLeft > 0);
-
-		// Build clear title
-		const titleParts: string[] = [];
-		if (emptyMeds.length > 0) {
-			titleParts.push(`🚨 ${emptyMeds.length} ${tr.push.empty || "Empty"}`);
-		}
-		if (criticalMeds.length > 0) {
-			titleParts.push(`🚨 ${criticalMeds.length} ${tr.push.critical || "Critical"}`);
-		}
-		const title = `MedAssist: ${titleParts.join(", ")} - ${tr.push.reorderNow || "Reorder Now!"}`;
-
-		// Build clear message with sections
-		const messageParts: string[] = [];
-		if (emptyMeds.length > 0) {
-			messageParts.push(`🚨 ${tr.push.emptySection || "Empty (reorder immediately)"}:`);
-			emptyMeds.forEach((m) => messageParts.push(`  • ${m.name}`));
-		}
-		if (criticalMeds.length > 0) {
-			if (emptyMeds.length > 0) messageParts.push("");
-			messageParts.push(`🚨 ${tr.push.criticalSection || "Running critically low"}:`);
-			criticalMeds.forEach((m) =>
-				messageParts.push(
-					`  • ${m.name}: ${t(tr.push.pillsLeft, { count: m.medsLeft })}, ${t(tr.push.daysLeft, { count: m.daysLeft ?? 0 })}`
-				)
+	if (allLowStock.length > 0 && (stockEmailEnabled || stockPushEnabled)) {
+		if (!state.notifiedMedications.includes(userStockNotifiedKey) || settings.repeatDailyReminders) {
+			logger.info(
+				`[Reminder] User ${settings.userId}: Sending stock reminder for ${allLowStock.length} medications...`
 			);
-		}
 
-		if (settings.repeatDailyReminders) {
-			messageParts.push("");
-			messageParts.push(tr.push.repeatDailyNote);
-		}
+			let emailSuccess = false;
+			let shoutrrrSuccess = false;
 
-		const message = messageParts.join("\n") + `\n\n---\n${getFooterPlain(language)}`;
+			if (stockEmailEnabled) {
+				const result = await sendReminderEmail(
+					settings.notificationEmail!,
+					allLowStock,
+					language,
+					settings.repeatDailyReminders
+				);
+				emailSuccess = result.success;
+				if (!result.success) {
+					logger.error(`[Reminder] User ${settings.userId}: Failed to send stock email: ${result.error}`);
+				}
+			}
 
-		const result = await sendShoutrrrNotification(settings.shoutrrrUrl!, title, message);
-		shoutrrrSuccess = result.success;
-		if (result.success) {
-			logger.info(`[Reminder] User ${settings.userId}: Push notification sent successfully`);
-		} else {
-			logger.error(`[Reminder] User ${settings.userId}: Failed to send push notification: ${result.error}`);
+			if (stockPushEnabled) {
+				const emptyMeds = allLowStock.filter((m) => m.medsLeft <= 0);
+				const criticalMeds = allLowStock.filter((m) => m.medsLeft > 0 && m.isCritical);
+				const lowStockMeds = allLowStock.filter((m) => m.medsLeft > 0 && !m.isCritical);
+
+				const titleParts: string[] = [];
+				if (emptyMeds.length > 0) titleParts.push(`🚨 ${emptyMeds.length} ${tr.push.empty}`);
+				if (criticalMeds.length > 0) titleParts.push(`🚨 ${criticalMeds.length} ${tr.push.critical}`);
+				if (lowStockMeds.length > 0) titleParts.push(`⚠️ ${lowStockMeds.length} ${tr.push.lowStock}`);
+				const title = `MedAssist-ng: ${titleParts.join(", ")} - ${tr.push.reorderNow}`;
+
+				const messageParts: string[] = [];
+				if (emptyMeds.length > 0) {
+					messageParts.push(`🚨 ${tr.push.emptySection}:`);
+					emptyMeds.forEach((m) => messageParts.push(`  • ${m.name}`));
+				}
+				if (criticalMeds.length > 0) {
+					if (messageParts.length > 0) messageParts.push("");
+					messageParts.push(`🚨 ${tr.push.criticalSection}:`);
+					criticalMeds.forEach((m) =>
+						messageParts.push(
+							`  • ${m.name}: ${t(tr.push.pillsLeft, { count: m.medsLeft })}, ${t(tr.push.daysLeft, { count: m.daysLeft ?? 0 })}`
+						)
+					);
+				}
+				if (lowStockMeds.length > 0) {
+					if (messageParts.length > 0) messageParts.push("");
+					messageParts.push(`⚠️ ${tr.push.lowStockSection}:`);
+					lowStockMeds.forEach((m) =>
+						messageParts.push(
+							`  • ${m.name}: ${t(tr.push.pillsLeft, { count: m.medsLeft })}, ${t(tr.push.daysLeft, { count: m.daysLeft ?? 0 })}`
+						)
+					);
+				}
+				const message = messageParts.join("\n") + `\n\n---\n${getFooterPlain(language)}`;
+				const result = await sendShoutrrrNotification(settings.shoutrrrUrl!, title, message);
+				shoutrrrSuccess = result.success;
+				if (!result.success) {
+					logger.error(`[Reminder] User ${settings.userId}: Failed to send stock push: ${result.error}`);
+				}
+			}
+
+			if (emailSuccess || shoutrrrSuccess) {
+				const currentState = loadReminderState();
+				const channel = emailSuccess && shoutrrrSuccess ? "both" : emailSuccess ? "email" : "push";
+				saveReminderState({
+					lastAutoEmailSent: new Date().toISOString(),
+					lastAutoEmailDate: today,
+					notifiedMedications: [...new Set([...currentState.notifiedMedications, userStockNotifiedKey])],
+					nextScheduledCheck: currentState.nextScheduledCheck,
+					lastNotificationType: "stock",
+					lastNotificationChannel: channel,
+				});
+
+				const firstMed = allLowStock[0];
+				const medNames = allLowStock.map((m) => m.name).join(", ");
+				await updateUserReminderSentTime(settings.userId, "stock", channel, medNames);
+			}
 		}
 	}
 
-	// Update state if any notification was sent successfully
-	if (emailSuccess || shoutrrrSuccess) {
-		const currentState = loadReminderState();
-		const channel = emailSuccess && shoutrrrSuccess ? "both" : emailSuccess ? "email" : "push";
-		saveReminderState({
-			lastAutoEmailSent: new Date().toISOString(),
-			lastAutoEmailDate: today,
-			notifiedMedications: [...new Set([...currentState.notifiedMedications, userNotifiedKey])],
-			nextScheduledCheck: currentState.nextScheduledCheck,
-			lastNotificationType: "stock",
-			lastNotificationChannel: channel,
-		});
+	if (allPrescriptionLow.length > 0 && (prescriptionEmailEnabled || prescriptionPushEnabled)) {
+		if (!state.notifiedMedications.includes(userPrescriptionNotifiedKey) || settings.repeatDailyReminders) {
+			logger.info(
+				`[Reminder] User ${settings.userId}: Sending prescription reminder for ${allPrescriptionLow.length} medications...`
+			);
 
-		// Also update user settings in database so frontend can display the info
-		// For stock reminders, show the first medication name
-		const firstMed = allLowStock[0];
-		const medNames = allLowStock.length > 1 ? `${firstMed.name} (+${allLowStock.length - 1})` : firstMed?.name;
-		await updateUserReminderSentTime(settings.userId, "stock", channel, medNames);
+			const emptyRx = allPrescriptionLow.filter((m) => m.remainingRefills <= 0);
+			const lowRx = allPrescriptionLow.filter((m) => m.remainingRefills > 0);
+			const lines = allPrescriptionLow.map((m) => {
+				const expirySuffix = m.expiryDate ? t(tr.prescriptionReminder.expiresSuffix, { date: m.expiryDate }) : "";
+				if (m.remainingRefills <= 0) {
+					return `- ${t(tr.prescriptionReminder.lineEmpty, {
+						name: m.name,
+						expirySuffix,
+					})}`;
+				}
+				return `- ${t(tr.prescriptionReminder.line, {
+					name: m.name,
+					refills: m.remainingRefills,
+					expirySuffix,
+				})}`;
+			});
+
+			let emailSuccess = false;
+			let shoutrrrSuccess = false;
+
+			if (prescriptionEmailEnabled) {
+				const smtpHost = process.env.SMTP_HOST;
+				const smtpUser = process.env.SMTP_USER;
+				const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS;
+				const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
+				const smtpSecure = process.env.SMTP_SECURE === "true";
+				const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
+
+				if (smtpHost && smtpUser) {
+					try {
+						const transporter = nodemailer.createTransport({
+							host: smtpHost,
+							port: smtpPort,
+							secure: smtpSecure,
+							auth: { user: smtpUser, pass: smtpPass ?? "" },
+						});
+
+						const subject =
+							allPrescriptionLow.length === 1
+								? tr.prescriptionReminder.subjectSingle
+								: t(tr.prescriptionReminder.subjectMultiple, { count: allPrescriptionLow.length });
+
+						const bodyText =
+							emptyRx.length > 0 ? tr.prescriptionReminder.descriptionEmpty : tr.prescriptionReminder.descriptionLow;
+						const alertText =
+							emptyRx.length > 0
+								? emptyRx.length === 1
+									? tr.prescriptionReminder.alertEmptySingle
+									: t(tr.prescriptionReminder.alertEmptyMultiple, { count: emptyRx.length })
+								: lowRx.length === 1
+									? tr.prescriptionReminder.alertLowSingle
+									: t(tr.prescriptionReminder.alertLowMultiple, { count: lowRx.length });
+
+						const tableRows = allPrescriptionLow
+							.map((item) => {
+								const isEmpty = item.remainingRefills <= 0;
+								const safeName = escapeHtml(item.name);
+								const safeRefills = Number(item.remainingRefills) || 0;
+								const safeThreshold = Number(item.lowThreshold) || 0;
+								const safeExpiry = item.expiryDate ? escapeHtml(String(item.expiryDate)) : "-";
+								const rowBg = isEmpty ? "#fef2f2" : "white";
+								return `
+      <tr style="background: ${rowBg};">
+        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${isEmpty ? "🚨" : "⚠️"} ${safeName}</td>
+        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap; ${isEmpty ? "color: #dc2626; font-weight: 600;" : ""}"><strong>${safeRefills}</strong></td>
+        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${safeThreshold}</td>
+        <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${safeExpiry}</td>
+      </tr>`;
+							})
+							.join("");
+
+						const html = `
+    <div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
+      <div style="background: white; border-radius: 12px; padding: 16px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
+        <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${emptyRx.length > 0 ? tr.prescriptionReminder.titleEmpty : tr.prescriptionReminder.title}</h2>
+        <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">${bodyText}</p>
+
+        <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; ${
+					emptyRx.length > 0
+						? "background: #fef2f2; border: 1px solid #dc2626;"
+						: "background: #fffbeb; border: 1px solid #f59e0b;"
+				}">
+          <p style="margin: 0; ${emptyRx.length > 0 ? "color: #dc2626; font-weight: 600;" : "color: #b45309; font-weight: 500;"} font-size: 13px;">
+            ${alertText}
+          </p>
+        </div>
+
+        <div style="overflow-x: auto; -webkit-overflow-scrolling: touch;">
+          <table style="width: 100%; border-collapse: collapse; background: white; min-width: 460px;">
+            <thead>
+              <tr style="background: #f3f4f6;">
+                <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.prescriptionReminder.tableHeaders.medication}</th>
+                <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.prescriptionReminder.tableHeaders.refillsLeft}</th>
+                <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.prescriptionReminder.tableHeaders.reminderThreshold}</th>
+                <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.prescriptionReminder.tableHeaders.prescriptionExpires}</th>
+              </tr>
+            </thead>
+            <tbody>
+              ${tableRows}
+            </tbody>
+          </table>
+        </div>
+
+        <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
+        <p style="color: #9ca3af; font-size: 11px; margin: 0;">
+          ${getFooterHtml(language)}
+        </p>
+        ${settings.repeatDailyReminders ? `<p style="color: #9ca3af; font-size: 11px; margin: 8px 0 0 0; font-style: italic;">${tr.prescriptionReminder.repeatDailyNote}</p>` : ""}
+      </div>
+    </div>
+  `;
+						const text = `${emptyRx.length > 0 ? tr.prescriptionReminder.titleEmpty : tr.prescriptionReminder.title}\n\n${bodyText}\n\n${lines.join("\n")}\n\n---\n${getFooterPlain(language)}${settings.repeatDailyReminders ? `\n\n${tr.prescriptionReminder.repeatDailyNote}` : ""}`;
+
+						await transporter.sendMail({
+							from: smtpFrom,
+							to: settings.notificationEmail!,
+							subject,
+							text,
+							html,
+						});
+						emailSuccess = true;
+					} catch (error) {
+						const errorMessage = error instanceof Error ? error.message : "Unknown error";
+						logger.error(`[Reminder] User ${settings.userId}: Failed to send prescription email: ${errorMessage}`);
+					}
+				}
+			}
+
+			if (prescriptionPushEnabled) {
+				const titleParts: string[] = [];
+				if (emptyRx.length > 0)
+					titleParts.push(
+						`🚨 ${emptyRx.length} ${emptyRx.length === 1 ? tr.prescriptionReminder.pushEmptySingle : tr.prescriptionReminder.pushEmpty}`
+					);
+				if (lowRx.length > 0)
+					titleParts.push(
+						`🚨 ${lowRx.length} ${lowRx.length === 1 ? tr.prescriptionReminder.pushLowSingle : tr.prescriptionReminder.pushLow}`
+					);
+				const title = `MedAssist-ng: ${titleParts.join(", ")} - ${tr.prescriptionReminder.pushRenewNow}`;
+
+				const messageParts: string[] = [];
+				if (emptyRx.length > 0) {
+					messageParts.push(`🚨 ${tr.prescriptionReminder.pushEmptySection}:`);
+					for (const m of emptyRx) {
+						messageParts.push(`  • ${m.name}`);
+					}
+				}
+				if (lowRx.length > 0) {
+					if (emptyRx.length > 0) messageParts.push("");
+					messageParts.push(`🚨 ${tr.prescriptionReminder.pushLowSection}:`);
+					for (const m of lowRx) {
+						messageParts.push(
+							`  • ${m.name}: ${t(tr.prescriptionReminder.pushRefillsLeft, { count: m.remainingRefills })}`
+						);
+					}
+				}
+				const message = messageParts.join("\n") + `\n\n---\n${getFooterPlain(language)}`;
+				const result = await sendShoutrrrNotification(settings.shoutrrrUrl!, title, message);
+				shoutrrrSuccess = result.success;
+				if (!result.success) {
+					logger.error(`[Reminder] User ${settings.userId}: Failed to send prescription push: ${result.error}`);
+				}
+			}
+
+			if (emailSuccess || shoutrrrSuccess) {
+				const currentState = loadReminderState();
+				const channel = emailSuccess && shoutrrrSuccess ? "both" : emailSuccess ? "email" : "push";
+				saveReminderState({
+					lastAutoEmailSent: new Date().toISOString(),
+					lastAutoEmailDate: today,
+					notifiedMedications: [...new Set([...currentState.notifiedMedications, userPrescriptionNotifiedKey])],
+					nextScheduledCheck: currentState.nextScheduledCheck,
+					lastNotificationType: "prescription",
+					lastNotificationChannel: channel,
+				});
+
+				const firstMed = allPrescriptionLow[0];
+				const medNames = allPrescriptionLow.map((m) => m.name).join(", ");
+				await updateUserReminderSentTime(settings.userId, "prescription", channel, medNames);
+			}
+		}
 	}
 }
 

backend/src/test/auth.test.ts

@@ -194,6 +194,29 @@ describe("Auth Routes (AUTH_ENABLED=true)", () => {
 			expect(response.json().code).toBe("USERNAME_EXISTS");
 		});
 
+		it("should reject duplicate username regardless of case", async () => {
+			await app.inject({
+				method: "POST",
+				url: "/auth/register",
+				payload: {
+					username: "CaseUser",
+					password: "TestPassword123",
+				},
+			});
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/auth/register",
+				payload: {
+					username: "caseuser",
+					password: "AnotherPassword123",
+				},
+			});
+
+			expect(response.statusCode).toBe(409);
+			expect(response.json().code).toBe("USERNAME_EXISTS");
+		});
+
 		it("should reject short password", async () => {
 			const response = await app.inject({
 				method: "POST",
@@ -275,6 +298,21 @@ describe("Auth Routes (AUTH_ENABLED=true)", () => {
 			expect(cookies.find((c: any) => c.name === "refresh_token")).toBeDefined();
 		});
 
+		it("should login case-insensitively with different username casing", async () => {
+			const response = await app.inject({
+				method: "POST",
+				url: "/auth/login",
+				payload: {
+					username: "LOGINUSER",
+					password: "TestPassword123",
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json().ok).toBe(true);
+			expect(response.json().user.username).toBe("loginuser");
+		});
+
 		it("should reject invalid password", async () => {
 			const response = await app.inject({
 				method: "POST",

backend/src/test/e2e-routes.test.ts

@@ -99,6 +99,11 @@ async function createSchema(client: Client) {
 		    expiry_date text,
 		    notes text,
 		    intake_reminders_enabled integer NOT NULL DEFAULT 0,
+		    prescription_enabled integer NOT NULL DEFAULT 0,
+		    prescription_authorized_refills integer,
+		    prescription_remaining_refills integer,
+		    prescription_low_refill_threshold integer NOT NULL DEFAULT 1,
+		    prescription_expiry_date text,
 		    dismissed_until text,
 		    updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
 		    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
@@ -110,10 +115,12 @@ async function createSchema(client: Client) {
       notification_email text,
       email_stock_reminders integer NOT NULL DEFAULT 1,
       email_intake_reminders integer NOT NULL DEFAULT 1,
+	email_prescription_reminders integer NOT NULL DEFAULT 1,
       shoutrrr_enabled integer NOT NULL DEFAULT 0,
       shoutrrr_url text,
       shoutrrr_stock_reminders integer NOT NULL DEFAULT 1,
       shoutrrr_intake_reminders integer NOT NULL DEFAULT 1,
+	shoutrrr_prescription_reminders integer NOT NULL DEFAULT 1,
       reminder_days_before integer NOT NULL DEFAULT 7,
       repeat_daily_reminders integer NOT NULL DEFAULT 0,
       skip_reminders_for_taken_doses integer NOT NULL DEFAULT 0,
@@ -135,6 +142,9 @@ async function createSchema(client: Client) {
       last_stock_reminder_sent text,
       last_stock_reminder_channel text,
       last_stock_reminder_med_names text,
+			last_prescription_reminder_sent text,
+			last_prescription_reminder_channel text,
+			last_prescription_reminder_med_names text,
       updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
@@ -163,6 +173,7 @@ async function createSchema(client: Client) {
       user_id integer NOT NULL,
       packs_added integer NOT NULL DEFAULT 0,
       loose_pills_added integer NOT NULL DEFAULT 0,
+		used_prescription integer NOT NULL DEFAULT 0,
       refill_date integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (medication_id) REFERENCES medications(id) ON DELETE CASCADE,
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
@@ -1621,6 +1632,83 @@ describe("E2E Tests with Real Routes", () => {
 			expect(data.newStock.looseTablets).toBe(15); // 5 + 10
 		});
 
+		it("should decrement remaining refills and mark history when using prescription refill", async () => {
+			const createResponse = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Prescription Refill Med",
+					packCount: 1,
+					blistersPerPack: 2,
+					pillsPerBlister: 10,
+					looseTablets: 0,
+					prescriptionEnabled: true,
+					prescriptionAuthorizedRefills: 3,
+					prescriptionRemainingRefills: 2,
+					prescriptionLowRefillThreshold: 1,
+					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+				},
+			});
+			expect(createResponse.statusCode).toBe(200);
+			const medId = createResponse.json().id;
+
+			const refillResponse = await app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 1, loosePillsAdded: 0, usePrescription: true },
+			});
+
+			expect(refillResponse.statusCode).toBe(200);
+			const refillData = refillResponse.json();
+			expect(refillData.prescription.used).toBe(true);
+			expect(refillData.prescription.remainingRefills).toBe(1);
+
+			const medsResponse = await app.inject({
+				method: "GET",
+				url: "/medications",
+			});
+			expect(medsResponse.statusCode).toBe(200);
+			const med = medsResponse.json().find((m: any) => m.id === medId);
+			expect(med.prescriptionRemainingRefills).toBe(1);
+
+			const historyResponse = await app.inject({
+				method: "GET",
+				url: `/medications/${medId}/refills`,
+			});
+			expect(historyResponse.statusCode).toBe(200);
+			expect(historyResponse.json()[0].usedPrescription).toBe(true);
+		});
+
+		it("should reject prescription refill when no remaining prescription refills are available", async () => {
+			const createResponse = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Prescription Empty Med",
+					packCount: 1,
+					blistersPerPack: 2,
+					pillsPerBlister: 10,
+					looseTablets: 0,
+					prescriptionEnabled: true,
+					prescriptionAuthorizedRefills: 2,
+					prescriptionRemainingRefills: 0,
+					prescriptionLowRefillThreshold: 1,
+					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+				},
+			});
+			expect(createResponse.statusCode).toBe(200);
+			const medId = createResponse.json().id;
+
+			const refillResponse = await app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 1, loosePillsAdded: 0, usePrescription: true },
+			});
+
+			expect(refillResponse.statusCode).toBe(409);
+			expect(refillResponse.json().error).toContain("No remaining prescription refills");
+		});
+
 		it("should return 400 when no packs or pills added", async () => {
 			const createResponse = await app.inject({
 				method: "POST",

backend/src/test/integration.test.ts

@@ -94,6 +94,11 @@ async function createSchema(client: Client) {
 		    expiry_date text,
 		    notes text,
 		    intake_reminders_enabled integer NOT NULL DEFAULT 0,
+		    prescription_enabled integer NOT NULL DEFAULT 0,
+		    prescription_authorized_refills integer,
+		    prescription_remaining_refills integer,
+		    prescription_low_refill_threshold integer NOT NULL DEFAULT 1,
+		    prescription_expiry_date text,
 		    dismissed_until text,
 		    updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
 		    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
@@ -105,10 +110,12 @@ async function createSchema(client: Client) {
       notification_email text,
       email_stock_reminders integer NOT NULL DEFAULT 1,
       email_intake_reminders integer NOT NULL DEFAULT 1,
+	email_prescription_reminders integer NOT NULL DEFAULT 1,
       shoutrrr_enabled integer NOT NULL DEFAULT 0,
       shoutrrr_url text,
       shoutrrr_stock_reminders integer NOT NULL DEFAULT 1,
       shoutrrr_intake_reminders integer NOT NULL DEFAULT 1,
+	shoutrrr_prescription_reminders integer NOT NULL DEFAULT 1,
       reminder_days_before integer NOT NULL DEFAULT 7,
       repeat_daily_reminders integer NOT NULL DEFAULT 0,
       skip_reminders_for_taken_doses integer NOT NULL DEFAULT 0,
@@ -130,6 +137,9 @@ async function createSchema(client: Client) {
       last_stock_reminder_sent text,
       last_stock_reminder_channel text,
       last_stock_reminder_med_names text,
+			last_prescription_reminder_sent text,
+			last_prescription_reminder_channel text,
+			last_prescription_reminder_med_names text,
       updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,

backend/src/test/planner.test.ts

@@ -86,6 +86,39 @@ async function createSchema(client: Client) {
       is_active integer NOT NULL DEFAULT 1,
       created_at integer NOT NULL DEFAULT (strftime('%s','now')),
       updated_at integer NOT NULL DEFAULT (strftime('%s','now'))
+    )`,
+		`CREATE TABLE IF NOT EXISTS medications (
+      id integer PRIMARY KEY AUTOINCREMENT,
+      user_id integer NOT NULL,
+      name text NOT NULL,
+      generic_name text,
+      taken_by_json text NOT NULL DEFAULT '[]',
+      package_type text NOT NULL DEFAULT 'blister',
+      pack_count integer NOT NULL DEFAULT 1,
+      blisters_per_pack integer NOT NULL DEFAULT 1,
+      pills_per_blister integer NOT NULL DEFAULT 1,
+      total_pills integer,
+      loose_tablets integer NOT NULL DEFAULT 0,
+      stock_adjustment integer NOT NULL DEFAULT 0,
+      last_stock_correction_at integer,
+      pill_weight_mg integer,
+      dose_unit text DEFAULT 'mg',
+      usage_json text NOT NULL DEFAULT '[]',
+      every_json text NOT NULL DEFAULT '[]',
+      start_json text NOT NULL DEFAULT '[]',
+      intakes_json text NOT NULL DEFAULT '[]',
+      image_url text,
+      expiry_date text,
+      notes text,
+      intake_reminders_enabled integer NOT NULL DEFAULT 0,
+      prescription_enabled integer NOT NULL DEFAULT 0,
+      prescription_authorized_refills integer,
+      prescription_remaining_refills integer,
+      prescription_low_refill_threshold integer NOT NULL DEFAULT 1,
+      prescription_expiry_date text,
+      dismissed_until text,
+      updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
+      FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
 		`CREATE TABLE IF NOT EXISTS user_settings (
       id integer PRIMARY KEY AUTOINCREMENT,
@@ -94,10 +127,12 @@ async function createSchema(client: Client) {
       notification_email text,
       email_stock_reminders integer NOT NULL DEFAULT 1,
       email_intake_reminders integer NOT NULL DEFAULT 1,
+		email_prescription_reminders integer NOT NULL DEFAULT 1,
       shoutrrr_enabled integer NOT NULL DEFAULT 0,
       shoutrrr_url text,
       shoutrrr_stock_reminders integer NOT NULL DEFAULT 1,
       shoutrrr_intake_reminders integer NOT NULL DEFAULT 1,
+		shoutrrr_prescription_reminders integer NOT NULL DEFAULT 1,
       reminder_days_before integer NOT NULL DEFAULT 7,
       repeat_daily_reminders integer NOT NULL DEFAULT 0,
       skip_reminders_for_taken_doses integer NOT NULL DEFAULT 0,
@@ -119,6 +154,9 @@ async function createSchema(client: Client) {
       last_stock_reminder_sent text,
       last_stock_reminder_channel text,
       last_stock_reminder_med_names text,
+			last_prescription_reminder_sent text,
+			last_prescription_reminder_channel text,
+			last_prescription_reminder_med_names text,
       updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
@@ -980,4 +1018,106 @@ describe("Planner Routes", () => {
 			expect(message).toContain("Running critically low");
 		});
 	});
+
+	describe("POST /reminder/send-prescription", () => {
+		it("should reject request with missing prescription data", async () => {
+			const response = await app.inject({
+				method: "POST",
+				url: "/reminder/send-prescription",
+				payload: {
+					email: "test@example.com",
+					prescriptionLow: [],
+				},
+			});
+
+			expect(response.statusCode).toBe(400);
+			expect(response.json()).toEqual({ error: "Missing prescription reminder data" });
+		});
+
+		it("should return error when no notification channels configured", async () => {
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 0, 0, 'en')`,
+				args: [999999999],
+			});
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/reminder/send-prescription",
+				payload: {
+					email: "test@example.com",
+					prescriptionLow: [{ name: "Aspirin", remainingRefills: 0, threshold: 1, expiryDate: "2026-01-01" }],
+				},
+			});
+
+			expect(response.statusCode).toBe(400);
+			expect(response.json()).toEqual({ error: "No notification channels configured" });
+		});
+
+		it("should send prescription email reminder when email is enabled", async () => {
+			process.env.SMTP_HOST = "smtp.test.com";
+			process.env.SMTP_USER = "user@test.com";
+			process.env.SMTP_PASS = "password";
+
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
+				args: [999999999],
+			});
+
+			mockSendMail.mockResolvedValueOnce({ messageId: "123" });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/reminder/send-prescription",
+				payload: {
+					email: "test@example.com",
+					prescriptionLow: [
+						{ name: "Aspirin", remainingRefills: 0, threshold: 1, expiryDate: "2026-01-01" },
+						{ name: "Ibuprofen", remainingRefills: 1, threshold: 2, expiryDate: null },
+					],
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ success: true, message: "Prescription reminder sent via email" });
+			expect(mockSendMail).toHaveBeenCalledTimes(1);
+			expect(mockUpdateReminderSentTime).toHaveBeenCalledWith("prescription", "email");
+			expect(mockUpdateUserReminderSentTime).toHaveBeenCalledWith(
+				999999999,
+				"prescription",
+				"email",
+				"Aspirin, Ibuprofen"
+			);
+
+			delete process.env.SMTP_HOST;
+			delete process.env.SMTP_USER;
+			delete process.env.SMTP_PASS;
+		});
+
+		it("should send prescription push reminder when shoutrrr is enabled", async () => {
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
+				args: [999999999],
+			});
+
+			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/reminder/send-prescription",
+				payload: {
+					email: "test@example.com",
+					prescriptionLow: [{ name: "Aspirin", remainingRefills: 1, threshold: 2, expiryDate: "2026-01-01" }],
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ success: true, message: "Prescription reminder sent via push" });
+			expect(mockSendShoutrrr).toHaveBeenCalledTimes(1);
+			const [_url, title, message] = mockSendShoutrrr.mock.calls[0];
+			expect(title).toContain("Renew Now");
+			expect(message).toContain("Aspirin");
+			expect(mockUpdateReminderSentTime).toHaveBeenCalledWith("prescription", "push");
+			expect(mockUpdateUserReminderSentTime).toHaveBeenCalledWith(999999999, "prescription", "push", "Aspirin");
+		});
+	});
 });

backend/src/test/translations.test.ts

@@ -98,7 +98,7 @@ describe("Translations Module", () => {
 
 			// Stock reminder subject
 			const subject = t(translations.stockReminder.subject, { count: 3, s: "s" });
-			expect(subject).toBe("MedAssist-ng Auto-Reminder: 3 Medications Running Critically Low");
+			expect(subject).toBe("MedAssist-ng: ⚠️ 3 Medications Running Critically Low");
 
 			// Intake reminder description
 			const description = t(translations.intakeReminder.description, { minutes: 30 });
@@ -113,7 +113,7 @@ describe("Translations Module", () => {
 			const translations = getTranslations("de");
 
 			const subject = t(translations.stockReminder.subject, { count: 2, e: "e" });
-			expect(subject).toBe("MedAssist-ng Auto-Erinnerung: 2 Medikamente kritisch niedrig");
+			expect(subject).toBe("MedAssist-ng: ⚠️ 2 Medikamente kritisch niedrig");
 
 			const takenBy = t(translations.intakeReminder.takenBy, { name: "Daniel" });
 			expect(takenBy).toBe("für Daniel");

backend/src/utils/scheduler-utils.ts

@@ -485,7 +485,7 @@ export type ReminderState = {
 	lastAutoEmailDate: string | null;
 	notifiedMedications: string[];
 	nextScheduledCheck: string | null;
-	lastNotificationType: "stock" | "intake" | null;
+	lastNotificationType: "stock" | "intake" | "prescription" | null;
 	lastNotificationChannel: "email" | "push" | "both" | null;
 };
 

backend/vitest.config.ts

@@ -14,5 +14,25 @@ export default defineConfig({
     },
     // Timeout for longer integration tests
     testTimeout: 10000,
+    coverage: {
+      provider: "v8",
+      reporter: ["text", "json", "html"],
+      include: ["src/**/*.ts"],
+      exclude: [
+        "src/test/**",
+        "src/**/*.d.ts",
+        "src/**/index.ts",
+        "src/services/**",
+        "src/utils/logger.ts",
+      ],
+      thresholds: {
+        global: {
+          lines: 60,
+          functions: 65,
+          branches: 50,
+          statements: 60,
+        },
+      },
+    },
   },
 });

biome.json

@@ -21,7 +21,8 @@
 			"style": {
 				"noNonNullAssertion": "off",
 				"useConst": "error",
-				"noParameterAssign": "off"
+				"noParameterAssign": "off",
+				"noNestedTernary": "warn"
 			},
 			"correctness": {
 				"noUnusedVariables": "warn",

frontend/e2e/medications.spec.ts

@@ -1,4 +1,4 @@
-import { expect } from "@playwright/test";
+import { expect, type Page } from "@playwright/test";
 import { authFile, navigateTo, test } from "./fixtures";
 
 /**
@@ -10,6 +10,14 @@ import { authFile, navigateTo, test } from "./fixtures";
 test.describe("Medications Page", () => {
 	test.use({ storageState: authFile });
 
+	async function openMedicationForm(page: Page) {
+		await navigateTo(page, "/medications");
+		const newMedicationButton = page.getByRole("button", { name: /New medication/i });
+		if (await newMedicationButton.isVisible().catch(() => false)) {
+			await newMedicationButton.click();
+		}
+	}
+
 	test("should display medications page", async ({ page }) => {
 		await navigateTo(page, "/medications");
 
@@ -31,9 +39,8 @@ test.describe("Medications Page", () => {
 	});
 
 	test("should display the medication form with required fields", async ({ page }) => {
-		await navigateTo(page, "/medications");
+		await openMedicationForm(page);
 
-		// The form should always be visible on the medications page
 		const commercialName = page.getByLabel(/Commercial Name/i);
 		await expect(commercialName).toBeVisible();
 
@@ -45,7 +52,7 @@ test.describe("Medications Page", () => {
 	});
 
 	test("should fill in medication details", async ({ page }) => {
-		await navigateTo(page, "/medications");
+		await openMedicationForm(page);
 
 		const nameField = page.getByLabel(/Commercial Name/i);
 		await nameField.fill("Test Aspirin");
@@ -57,7 +64,7 @@ test.describe("Medications Page", () => {
 	});
 
 	test("should have stock inventory fields", async ({ page }) => {
-		await navigateTo(page, "/medications");
+		await openMedicationForm(page);
 
 		// Stock fields should be visible
 		await expect(page.getByLabel(/^Packs$/i)).toBeVisible();
@@ -74,7 +81,7 @@ test.describe("Medications Page", () => {
 	});
 
 	test("should toggle package type between blister and bottle", async ({ page }) => {
-		await navigateTo(page, "/medications");
+		await openMedicationForm(page);
 
 		// Find the package type radio buttons or selector
 		const blisterOption = page.getByText(/Blister Pack/i);
@@ -93,7 +100,7 @@ test.describe("Medications Page", () => {
 	});
 
 	test("should have intake schedule with add button", async ({ page }) => {
-		await navigateTo(page, "/medications");
+		await openMedicationForm(page);
 
 		// Intake schedule section
 		const scheduleSection = page.getByText(/Intake schedule/i);
@@ -108,7 +115,7 @@ test.describe("Medications Page", () => {
 	});
 
 	test("should have save and cancel buttons", async ({ page }) => {
-		await navigateTo(page, "/medications");
+		await openMedicationForm(page);
 
 		// Fill in a name to make the form dirty
 		await page.getByLabel(/Commercial Name/i).fill("Test");
@@ -119,7 +126,7 @@ test.describe("Medications Page", () => {
 	});
 
 	test("should prevent navigation with unsaved changes", async ({ page }) => {
-		await navigateTo(page, "/medications");
+		await openMedicationForm(page);
 
 		// Fill in the form to create unsaved changes
 		await page.getByLabel(/Commercial Name/i).fill("Unsaved Medication");

frontend/e2e/settings.spec.ts

@@ -13,7 +13,7 @@ test.describe("Settings Page", () => {
 	test("should display settings form", async ({ page }) => {
 		await navigateTo(page, "/settings");
 
-		await expect(page.locator("form.settings-form")).toBeVisible();
+		await expect(page.locator("div.settings-form")).toBeVisible();
 	});
 
 	test("should show language section with select", async ({ page }) => {
@@ -60,7 +60,7 @@ test.describe("Settings Page", () => {
 		await expect(thresholdGroup).toBeVisible();
 
 		// Should have three threshold number inputs
-		const thresholdInputs = thresholdGroup.locator('input[type="number"]');
+		const thresholdInputs = thresholdGroup.locator('input[type="text"]');
 		await expect(thresholdInputs).toHaveCount(3);
 	});
 
@@ -97,11 +97,11 @@ test.describe("Settings Page", () => {
 		await expect(otherCard).toHaveClass(/selected/);
 	});
 
-	test("should have save button in form footer", async ({ page }) => {
+	test("should have export action button", async ({ page }) => {
 		await navigateTo(page, "/settings");
 
-		const saveButton = page.locator('div.form-footer > button[type="submit"]');
-		await expect(saveButton).toBeVisible();
+		const exportButton = page.getByRole("button", { name: /Export Data|Daten exportieren/i });
+		await expect(exportButton).toBeVisible();
 	});
 
 	test("should show export/import section", async ({ page }) => {
@@ -156,7 +156,7 @@ test.describe("Settings Page", () => {
 		await navigateTo(page, "/settings");
 
 		const thresholdGroup = page.locator("div.threshold-chips-group");
-		const inputs = thresholdGroup.locator('input[type="number"]');
+		const inputs = thresholdGroup.locator('input[type="text"]');
 
 		// Set an invalid value (critical > low)
 		const criticalInput = inputs.first();
@@ -182,6 +182,6 @@ test.describe("Settings Page", () => {
 		await settingsOption.click();
 
 		await expect(page).toHaveURL(/\/settings/);
-		await expect(page.locator("form.settings-form")).toBeVisible();
+		await expect(page.locator("div.settings-form")).toBeVisible();
 	});
 });

frontend/package-lock.json

@@ -1,35 +1,35 @@
 {
   "name": "medassist-ng-frontend",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "medassist-ng-frontend",
-      "version": "1.10.2",
+      "version": "1.10.3",
       "dependencies": {
-        "i18next": "^24.2.2",
-        "i18next-browser-languagedetector": "^8.0.4",
+        "i18next": "^25.8.7",
+        "i18next-browser-languagedetector": "^8.2.1",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-i18next": "^15.4.1",
-        "react-router-dom": "^7.12.0",
-        "zod": "^3.23.8"
+        "react-router-dom": "^7.13.0",
+        "zod": "^4.3.6"
       },
       "devDependencies": {
-        "@biomejs/biome": "^2.3.12",
-        "@playwright/test": "^1.58.1",
+        "@biomejs/biome": "^2.3.15",
+        "@playwright/test": "^1.58.2",
         "@testing-library/jest-dom": "^6.9.1",
         "@testing-library/react": "^16.3.2",
         "@testing-library/user-event": "^14.6.1",
         "@types/react": "^18.3.4",
         "@types/react-dom": "^18.3.0",
         "@types/react-router-dom": "^5.3.3",
-        "@vitejs/plugin-react": "^4.3.2",
-        "@vitest/coverage-v8": "^4.0.17",
-        "jsdom": "^27.4.0",
+        "@vitejs/plugin-react": "^5.1.4",
+        "@vitest/coverage-v8": "^4.0.18",
+        "jsdom": "^28.0.0",
         "typescript": "^5.5.4",
-        "vite": "^7.3.0",
+        "vite": "^7.3.1",
         "vitest": "^4.0.17"
       }
     },
@@ -103,13 +103,13 @@
       "license": "MIT"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -118,9 +118,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
-      "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
+      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -128,21 +128,21 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
-      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
+      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-module-transforms": "^7.28.3",
-        "@babel/helpers": "^7.28.4",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.28.5",
-        "@babel/types": "^7.28.5",
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helpers": "^7.28.6",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -159,14 +159,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
-      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -176,13 +176,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.2",
+        "@babel/compat-data": "^7.28.6",
         "@babel/helper-validator-option": "^7.27.1",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
@@ -203,29 +203,29 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
-      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
+      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.28.3"
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -275,27 +275,27 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
-      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
+      "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.4"
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
+      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.5"
+        "@babel/types": "^7.29.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -346,33 +346,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+        "@babel/code-frame": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
-      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
+      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.29.0",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -380,9 +380,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -404,9 +404,9 @@
       }
     },
     "node_modules/@biomejs/biome": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.3.12.tgz",
-      "integrity": "sha512-AR7h4aSlAvXj7TAajW/V12BOw2EiS0AqZWV5dGozf4nlLoUF/ifvD0+YgKSskT0ylA6dY1A8AwgP8kZ6yaCQnA==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.3.15.tgz",
+      "integrity": "sha512-u+jlPBAU2B45LDkjjNNYpc1PvqrM/co4loNommS9/sl9oSxsAQKsNZejYuUztvToB5oXi1tN/e62iNd6ESiY3g==",
       "dev": true,
       "license": "MIT OR Apache-2.0",
       "bin": {
@@ -420,20 +420,20 @@
         "url": "https://opencollective.com/biome"
       },
       "optionalDependencies": {
-        "@biomejs/cli-darwin-arm64": "2.3.12",
-        "@biomejs/cli-darwin-x64": "2.3.12",
-        "@biomejs/cli-linux-arm64": "2.3.12",
-        "@biomejs/cli-linux-arm64-musl": "2.3.12",
-        "@biomejs/cli-linux-x64": "2.3.12",
-        "@biomejs/cli-linux-x64-musl": "2.3.12",
-        "@biomejs/cli-win32-arm64": "2.3.12",
-        "@biomejs/cli-win32-x64": "2.3.12"
+        "@biomejs/cli-darwin-arm64": "2.3.15",
+        "@biomejs/cli-darwin-x64": "2.3.15",
+        "@biomejs/cli-linux-arm64": "2.3.15",
+        "@biomejs/cli-linux-arm64-musl": "2.3.15",
+        "@biomejs/cli-linux-x64": "2.3.15",
+        "@biomejs/cli-linux-x64-musl": "2.3.15",
+        "@biomejs/cli-win32-arm64": "2.3.15",
+        "@biomejs/cli-win32-x64": "2.3.15"
       }
     },
     "node_modules/@biomejs/cli-darwin-arm64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.12.tgz",
-      "integrity": "sha512-cO6fn+KiMBemva6EARDLQBxeyvLzgidaFRJi8G7OeRqz54kWK0E+uSjgFaiHlc3DZYoa0+1UFE8mDxozpc9ieg==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.15.tgz",
+      "integrity": "sha512-SDCdrJ4COim1r8SNHg19oqT50JfkI/xGZHSyC6mGzMfKrpNe/217Eq6y98XhNTc0vGWDjznSDNXdUc6Kg24jbw==",
       "cpu": [
         "arm64"
       ],
@@ -448,9 +448,9 @@
       }
     },
     "node_modules/@biomejs/cli-darwin-x64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.3.12.tgz",
-      "integrity": "sha512-/fiF/qmudKwSdvmSrSe/gOTkW77mHHkH8Iy7YC2rmpLuk27kbaUOPa7kPiH5l+3lJzTUfU/t6x1OuIq/7SGtxg==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.3.15.tgz",
+      "integrity": "sha512-RkyeSosBtn3C3Un8zQnl9upX0Qbq4E3QmBa0qjpOh1MebRbHhNlRC16jk8HdTe/9ym5zlfnpbb8cKXzW+vlTxw==",
       "cpu": [
         "x64"
       ],
@@ -465,9 +465,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-arm64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.3.12.tgz",
-      "integrity": "sha512-nbOsuQROa3DLla5vvsTZg+T5WVPGi9/vYxETm9BOuLHBJN3oWQIg3MIkE2OfL18df1ZtNkqXkH6Yg9mdTPem7A==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.3.15.tgz",
+      "integrity": "sha512-FN83KxrdVWANOn5tDmW6UBC0grojchbGmcEz6JkRs2YY6DY63sTZhwkQ56x6YtKhDVV1Unz7FJexy8o7KwuIhg==",
       "cpu": [
         "arm64"
       ],
@@ -482,9 +482,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-arm64-musl": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.3.12.tgz",
-      "integrity": "sha512-aqkeSf7IH+wkzFpKeDVPSXy9uDjxtLpYA6yzkYsY+tVjwFFirSuajHDI3ul8en90XNs1NA0n8kgBrjwRi5JeyA==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.3.15.tgz",
+      "integrity": "sha512-SSSIj2yMkFdSkXqASzIBdjySBXOe65RJlhKEDlri7MN19RC4cpez+C0kEwPrhXOTgJbwQR9QH1F4+VnHkC35pg==",
       "cpu": [
         "arm64"
       ],
@@ -499,9 +499,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-x64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.3.12.tgz",
-      "integrity": "sha512-CQtqrJ+qEEI8tgRSTjjzk6wJAwfH3wQlkIGsM5dlecfRZaoT+XCms/mf7G4kWNexrke6mnkRzNy6w8ebV177ow==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.3.15.tgz",
+      "integrity": "sha512-T8n9p8aiIKOrAD7SwC7opiBM1LYGrE5G3OQRXWgbeo/merBk8m+uxJ1nOXMPzfYyFLfPlKF92QS06KN1UW+Zbg==",
       "cpu": [
         "x64"
       ],
@@ -516,9 +516,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-x64-musl": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.3.12.tgz",
-      "integrity": "sha512-kVGWtupRRsOjvw47YFkk5mLiAdpCPMWBo1jOwAzh+juDpUb2sWarIp+iq+CPL1Wt0LLZnYtP7hH5kD6fskcxmg==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.3.15.tgz",
+      "integrity": "sha512-dbjPzTh+ijmmNwojFYbQNMFp332019ZDioBYAMMJj5Ux9d8MkM+u+J68SBJGVwVeSHMYj+T9504CoxEzQxrdNw==",
       "cpu": [
         "x64"
       ],
@@ -533,9 +533,9 @@
       }
     },
     "node_modules/@biomejs/cli-win32-arm64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.3.12.tgz",
-      "integrity": "sha512-Re4I7UnOoyE4kHMqpgtG6UvSBGBbbtvsOvBROgCCoH7EgANN6plSQhvo2W7OCITvTp7gD6oZOyZy72lUdXjqZg==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.3.15.tgz",
+      "integrity": "sha512-puMuenu/2brQdgqtQ7geNwQlNVxiABKEZJhMRX6AGWcmrMO8EObMXniFQywy2b81qmC+q+SDvlOpspNwz0WiOA==",
       "cpu": [
         "arm64"
       ],
@@ -550,9 +550,9 @@
       }
     },
     "node_modules/@biomejs/cli-win32-x64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.3.12.tgz",
-      "integrity": "sha512-qqGVWqNNek0KikwPZlOIoxtXgsNGsX+rgdEzgw82Re8nF02W+E2WokaQhpF5TdBh/D/RQ3TLppH+otp6ztN0lw==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.3.15.tgz",
+      "integrity": "sha512-kDZr/hgg+igo5Emi0LcjlgfkoGZtgIpJKhnvKTRmMBv6FF/3SDyEV4khBwqNebZIyMZTzvpca9sQNSXJ39pI2A==",
       "cpu": [
         "x64"
       ],
@@ -1144,9 +1144,9 @@
       }
     },
     "node_modules/@exodus/bytes": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.9.0.tgz",
-      "integrity": "sha512-lagqsvnk09NKogQaN/XrtlWeUF8SRhT12odMvbTIIaVObqzwAogL6jhR4DAp0gPuKoM1AOVrKUshJpRdpMFrww==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.14.1.tgz",
+      "integrity": "sha512-OhkBFWI6GcRMUroChZiopRiSp2iAMvEBK47NhJooDqz1RERO4QuZIZnjP63TXX8GAiLABkYmX+fuQsdJ1dd2QQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1212,13 +1212,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.58.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.1.tgz",
-      "integrity": "sha512-6LdVIUERWxQMmUSSQi0I53GgCBYgM2RpGngCPY7hSeju+VrKjq3lvs7HpJoPbDiY5QM5EYRtRX5fvrinnMAz3w==",
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
+      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.58.1"
+        "playwright": "1.58.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -1228,9 +1228,9 @@
       }
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.27",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
-      "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==",
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.3.tgz",
+      "integrity": "sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==",
       "dev": true,
       "license": "MIT"
     },
@@ -1776,35 +1776,35 @@
       }
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
-      "integrity": "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.4.tgz",
+      "integrity": "sha512-VIcFLdRi/VYRU8OL/puL7QXMYafHmqOnwTZY50U1JPlCNj30PxCMx65c494b1K9be9hX83KVt0+gTEwTWLqToA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.28.0",
+        "@babel/core": "^7.29.0",
         "@babel/plugin-transform-react-jsx-self": "^7.27.1",
         "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-        "@rolldown/pluginutils": "1.0.0-beta.27",
+        "@rolldown/pluginutils": "1.0.0-rc.3",
         "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.17.0"
+        "react-refresh": "^0.18.0"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
         "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.0.17.tgz",
-      "integrity": "sha512-/6zU2FLGg0jsd+ePZcwHRy3+WpNTBBhDY56P4JTRqUN/Dp6CvOEa9HrikcQ4KfV2b2kAHUFB4dl1SuocWXSFEw==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.0.18.tgz",
+      "integrity": "sha512-7i+N2i0+ME+2JFZhfuz7Tg/FqKtilHjGyGvoHYQ6iLV0zahbsJ9sljC9OcFcPDbhYKCet+sG8SsVqlyGvPflZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^1.0.2",
-        "@vitest/utils": "4.0.17",
+        "@vitest/utils": "4.0.18",
         "ast-v8-to-istanbul": "^0.3.10",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
@@ -1818,8 +1818,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "4.0.17",
-        "vitest": "4.0.17"
+        "@vitest/browser": "4.0.18",
+        "vitest": "4.0.18"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -1828,16 +1828,16 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.17.tgz",
-      "integrity": "sha512-mEoqP3RqhKlbmUmntNDDCJeTDavDR+fVYkSOw8qRwJFaW/0/5zA9zFeTrHqNtcmwh6j26yMmwx2PqUDPzt5ZAQ==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.18.tgz",
+      "integrity": "sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.0.17",
-        "@vitest/utils": "4.0.17",
+        "@vitest/spy": "4.0.18",
+        "@vitest/utils": "4.0.18",
         "chai": "^6.2.1",
         "tinyrainbow": "^3.0.3"
       },
@@ -1846,13 +1846,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.17.tgz",
-      "integrity": "sha512-+ZtQhLA3lDh1tI2wxe3yMsGzbp7uuJSWBM1iTIKCbppWTSBN09PUC+L+fyNlQApQoR+Ps8twt2pbSSXg2fQVEQ==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.18.tgz",
+      "integrity": "sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "4.0.17",
+        "@vitest/spy": "4.0.18",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.21"
       },
@@ -1873,9 +1873,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.17.tgz",
-      "integrity": "sha512-Ah3VAYmjcEdHg6+MwFE17qyLqBHZ+ni2ScKCiW2XrlSBV4H3Z7vYfPfz7CWQ33gyu76oc0Ai36+kgLU3rfF4nw==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.18.tgz",
+      "integrity": "sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1886,13 +1886,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.17.tgz",
-      "integrity": "sha512-JmuQyf8aMWoo/LmNFppdpkfRVHJcsgzkbCA+/Bk7VfNH7RE6Ut2qxegeyx2j3ojtJtKIbIGy3h+KxGfYfk28YQ==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.18.tgz",
+      "integrity": "sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "4.0.17",
+        "@vitest/utils": "4.0.18",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -1900,13 +1900,13 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.17.tgz",
-      "integrity": "sha512-npPelD7oyL+YQM2gbIYvlavlMVWUfNNGZPcu0aEUQXt7FXTuqhmgiYupPnAanhKvyP6Srs2pIbWo30K0RbDtRQ==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.18.tgz",
+      "integrity": "sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.0.17",
+        "@vitest/pretty-format": "4.0.18",
         "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
@@ -1915,9 +1915,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.17.tgz",
-      "integrity": "sha512-I1bQo8QaP6tZlTomQNWKJE6ym4SHf3oLS7ceNjozxxgzavRAgZDc06T7kD8gb9bXKEgcLNt00Z+kZO6KaJ62Ew==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.18.tgz",
+      "integrity": "sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -1925,13 +1925,13 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.17.tgz",
-      "integrity": "sha512-RG6iy+IzQpa9SB8HAFHJ9Y+pTzI+h8553MrciN9eC6TFBErqrQaTas4vG+MVj8S4uKk8uTT2p0vgZPnTdxd96w==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.18.tgz",
+      "integrity": "sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.0.17",
+        "@vitest/pretty-format": "4.0.18",
         "tinyrainbow": "^3.0.3"
       },
       "funding": {
@@ -2013,9 +2013,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.9.11",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz",
-      "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==",
+      "version": "2.9.19",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
+      "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -2067,9 +2067,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001761",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001761.tgz",
-      "integrity": "sha512-JF9ptu1vP2coz98+5051jZ4PwQgd2ni8A+gYSN7EA7dPKIMf0pDlSUxhdmVOaV3/fYK5uWBkgSXJaRLr4+3A6g==",
+      "version": "1.0.30001769",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001769.tgz",
+      "integrity": "sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg==",
       "dev": true,
       "funding": [
         {
@@ -2172,27 +2172,17 @@
       "license": "MIT"
     },
     "node_modules/data-urls": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.1.tgz",
-      "integrity": "sha512-euIQENZg6x8mj3fO6o9+fOW8MimUI4PpD/fZBhJfeioZVy9TUpM4UY7KjQNVZFlqwJ0UdzRDzkycB997HEq1BQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-7.0.0.tgz",
+      "integrity": "sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "whatwg-mimetype": "^5.0.0",
-        "whatwg-url": "^15.1.0"
+        "whatwg-url": "^16.0.0"
       },
       "engines": {
-        "node": ">=20"
-      }
-    },
-    "node_modules/data-urls/node_modules/whatwg-mimetype": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz",
-      "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=20"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
     "node_modules/debug": {
@@ -2239,9 +2229,9 @@
       "peer": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.267",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz",
-      "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==",
+      "version": "1.5.286",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
+      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
       "dev": true,
       "license": "ISC"
     },
@@ -2448,9 +2438,9 @@
       }
     },
     "node_modules/i18next": {
-      "version": "24.2.3",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.3.tgz",
-      "integrity": "sha512-lfbf80OzkocvX7nmZtu7nSTNbrTYR52sLWxPtlXX1zAhVw8WEnFk4puUkCR4B1dNQwbSpEHHHemcZu//7EcB7A==",
+      "version": "25.8.7",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.7.tgz",
+      "integrity": "sha512-ttxxc5+67S/0hhoeVdEgc1lRklZhdfcUSEPp1//uUG2NB88X3667gRsDar+ZWQFdysnOsnb32bcoMsa4mtzhkQ==",
       "funding": [
         {
           "type": "individual",
@@ -2467,7 +2457,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.26.10"
+        "@babel/runtime": "^7.28.4"
       },
       "peerDependencies": {
         "typescript": "^5"
@@ -2479,9 +2469,9 @@
       }
     },
     "node_modules/i18next-browser-languagedetector": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.0.tgz",
-      "integrity": "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.1.tgz",
+      "integrity": "sha512-bZg8+4bdmaOiApD7N7BPT9W8MLZG+nPTOFlLiJiT8uzKXFjhxw4v2ierCXOwB5sFDMtuA5G4kgYZ0AznZxQ/cw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2"
@@ -2550,17 +2540,17 @@
       "license": "MIT"
     },
     "node_modules/jsdom": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.4.0.tgz",
-      "integrity": "sha512-mjzqwWRD9Y1J1KUi7W97Gja1bwOOM5Ug0EZ6UDK3xS7j7mndrkwozHtSblfomlzyB4NepioNt+B2sOSzczVgtQ==",
+      "version": "28.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-28.0.0.tgz",
+      "integrity": "sha512-KDYJgZ6T2TKdU8yBfYueq5EPG/EylMsBvCaenWMJb2OXmjgczzwveRCoJ+Hgj1lXPDyasvrgneSn4GBuR1hYyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@acemir/cssom": "^0.9.28",
+        "@acemir/cssom": "^0.9.31",
         "@asamuzakjp/dom-selector": "^6.7.6",
-        "@exodus/bytes": "^1.6.0",
-        "cssstyle": "^5.3.4",
-        "data-urls": "^6.0.0",
+        "@exodus/bytes": "^1.11.0",
+        "cssstyle": "^5.3.7",
+        "data-urls": "^7.0.0",
         "decimal.js": "^10.6.0",
         "html-encoding-sniffer": "^6.0.0",
         "http-proxy-agent": "^7.0.2",
@@ -2570,11 +2560,11 @@
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
         "tough-cookie": "^6.0.0",
+        "undici": "^7.20.0",
         "w3c-xmlserializer": "^5.0.0",
-        "webidl-conversions": "^8.0.0",
-        "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^15.1.0",
-        "ws": "^8.18.3",
+        "webidl-conversions": "^8.0.1",
+        "whatwg-mimetype": "^5.0.0",
+        "whatwg-url": "^16.0.0",
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
@@ -2801,13 +2791,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.58.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.1.tgz",
-      "integrity": "sha512-+2uTZHxSCcxjvGc5C891LrS1/NlxglGxzrC4seZiVjcYVQfUa87wBL6rTDqzGjuoWNjnBzRqKmF6zRYGMvQUaQ==",
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
+      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.58.1"
+        "playwright-core": "1.58.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -2820,9 +2810,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.58.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.1.tgz",
-      "integrity": "sha512-bcWzOaTxcW+VOOGBCQgnaKToLJ65d6AqfLVKEWvexyS3AS6rbXl+xdpYRMGSRBClPvyj44njOWoxjNdL/H9UNg==",
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
+      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -2962,9 +2952,9 @@
       "peer": true
     },
     "node_modules/react-refresh": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
-      "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
+      "integrity": "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2972,9 +2962,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.12.0.tgz",
-      "integrity": "sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.0.tgz",
+      "integrity": "sha512-PZgus8ETambRT17BUm/LL8lX3Of+oiLaPuVTRH3l1eLvSPpKO3AvhAEb5N7ihAFZQrYDqkvvWfFh9p0z9VsjLw==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",
@@ -2994,12 +2984,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.12.0.tgz",
-      "integrity": "sha512-pfO9fiBcpEfX4Tx+iTYKDtPbrSLLCbwJ5EqP+SPYQu1VYCXdy79GSj0wttR0U4cikVdlImZuEZ/9ZNCgoaxwBA==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.13.0.tgz",
+      "integrity": "sha512-5CO/l5Yahi2SKC6rGZ+HDEjpjkGaG/ncEP7eWFTvFxbHP8yeeI0PxTDjimtpXYlR3b3i9/WIL4VJttPrESIf2g==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.12.0"
+        "react-router": "7.13.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -3281,6 +3271,16 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/undici": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.21.0.tgz",
+      "integrity": "sha512-Hn2tCQpoDt1wv23a68Ctc8Cr/BHpUSfaPYrkajTXOS9IKpxVRx/X5m1K2YkbK2ipgZgxXSgsUinl3x+2YdSSfg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.18.1"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
@@ -3313,9 +3313,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz",
-      "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
+      "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3388,19 +3388,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.17.tgz",
-      "integrity": "sha512-FQMeF0DJdWY0iOnbv466n/0BudNdKj1l5jYgl5JVTwjSsZSlqyXFt/9+1sEyhR6CLowbZpV7O1sCHrzBhucKKg==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.18.tgz",
+      "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "4.0.17",
-        "@vitest/mocker": "4.0.17",
-        "@vitest/pretty-format": "4.0.17",
-        "@vitest/runner": "4.0.17",
-        "@vitest/snapshot": "4.0.17",
-        "@vitest/spy": "4.0.17",
-        "@vitest/utils": "4.0.17",
+        "@vitest/expect": "4.0.18",
+        "@vitest/mocker": "4.0.18",
+        "@vitest/pretty-format": "4.0.18",
+        "@vitest/runner": "4.0.18",
+        "@vitest/snapshot": "4.0.18",
+        "@vitest/spy": "4.0.18",
+        "@vitest/utils": "4.0.18",
         "es-module-lexer": "^1.7.0",
         "expect-type": "^1.2.2",
         "magic-string": "^0.30.21",
@@ -3428,10 +3428,10 @@
         "@edge-runtime/vm": "*",
         "@opentelemetry/api": "^1.9.0",
         "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-        "@vitest/browser-playwright": "4.0.17",
-        "@vitest/browser-preview": "4.0.17",
-        "@vitest/browser-webdriverio": "4.0.17",
-        "@vitest/ui": "4.0.17",
+        "@vitest/browser-playwright": "4.0.18",
+        "@vitest/browser-preview": "4.0.18",
+        "@vitest/browser-webdriverio": "4.0.18",
+        "@vitest/ui": "4.0.18",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -3498,27 +3498,28 @@
       }
     },
     "node_modules/whatwg-mimetype": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
-      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz",
+      "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/whatwg-url": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz",
-      "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.0.tgz",
+      "integrity": "sha512-9CcxtEKsf53UFwkSUZjG+9vydAsFO4lFHBpJUtjBcoJOCJpKnSJNwCw813zrYJHpCJ7sgfbtOe0V5Ku7Pa1XMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@exodus/bytes": "^1.11.0",
         "tr46": "^6.0.0",
-        "webidl-conversions": "^8.0.0"
+        "webidl-conversions": "^8.0.1"
       },
       "engines": {
-        "node": ">=20"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
     "node_modules/why-is-node-running": {
@@ -3538,28 +3539,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/ws": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
-      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/xml-name-validator": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
@@ -3585,9 +3564,9 @@
       "license": "ISC"
     },
     "node_modules/zod": {
-      "version": "3.25.76",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
+      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "medassist-ng-frontend",
   "private": true,
-  "version": "1.10.2",
+  "version": "1.10.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -21,28 +21,28 @@
     "test:e2e:report": "playwright show-report"
   },
   "dependencies": {
-    "i18next": "^24.2.2",
-    "i18next-browser-languagedetector": "^8.0.4",
+    "i18next": "^25.8.7",
+    "i18next-browser-languagedetector": "^8.2.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-i18next": "^15.4.1",
-    "react-router-dom": "^7.12.0",
-    "zod": "^3.23.8"
+    "react-router-dom": "^7.13.0",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.12",
-    "@playwright/test": "^1.58.1",
+    "@biomejs/biome": "^2.3.15",
+    "@playwright/test": "^1.58.2",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",
     "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
     "@types/react-router-dom": "^5.3.3",
-    "@vitejs/plugin-react": "^4.3.2",
-    "@vitest/coverage-v8": "^4.0.17",
-    "jsdom": "^27.4.0",
+    "@vitejs/plugin-react": "^5.1.4",
+    "@vitest/coverage-v8": "^4.0.18",
+    "jsdom": "^28.0.0",
     "typescript": "^5.5.4",
-    "vite": "^7.3.0",
+    "vite": "^7.3.1",
     "vitest": "^4.0.17"
   }
 }

frontend/src/App.tsx

@@ -127,6 +127,8 @@ function AppContent() {
 		setRefillPacks,
 		refillLoose,
 		setRefillLoose,
+		usePrescriptionRefill,
+		setUsePrescriptionRefill,
 		refillSaving,
 		refillHistory,
 		refillHistoryExpanded,
@@ -355,8 +357,8 @@ function AppContent() {
 	};
 
 	// For MedDetailModal: refill without form update (not editing)
-	const handleSubmitRefill = async (medId: number) => {
-		await ctx.submitRefill(medId, null, () => {}, loadMeds);
+	const handleSubmitRefill = async (medId: number, usePrescription: boolean = false) => {
+		await ctx.submitRefill(medId, null, () => {}, loadMeds, usePrescription);
 	};
 
 	// Wrapper for openEditStockModal (provides selectedMed and coverage)
@@ -430,6 +432,8 @@ function AppContent() {
 				onRefillPacksChange={setRefillPacks}
 				refillLoose={refillLoose}
 				onRefillLooseChange={setRefillLoose}
+				usePrescriptionRefill={usePrescriptionRefill}
+				onUsePrescriptionRefillChange={setUsePrescriptionRefill}
 				refillSaving={refillSaving}
 				refillHistory={refillHistory}
 				refillHistoryExpanded={refillHistoryExpanded}

frontend/src/components/Auth.tsx

@@ -1,5 +1,6 @@
 import { createContext, type ReactNode, useCallback, useContext, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { log } from "../utils/logger";
 import { ConfirmModal } from "./ConfirmModal";
 import { PasswordInput } from "./PasswordInput";
 
@@ -109,7 +110,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {
 			}
 			setLoading(false);
 		} catch (err) {
-			console.error(`Failed to fetch auth state (attempt ${retryCount + 1}/${maxRetries + 1}):`, err);
+			log.error(`Failed to fetch auth state (attempt ${retryCount + 1}/${maxRetries + 1}):`, err);
 
 			// Retry on connection errors or 5xx errors (server might be restarting)
 			if (retryCount < maxRetries) {

frontend/src/components/ConfirmModal.tsx

@@ -13,6 +13,7 @@ export interface ConfirmModalProps {
 	onCancel: () => void;
 	isLoading?: boolean;
 	confirmVariant?: "primary" | "danger" | "success";
+	overlayClassName?: string;
 }
 
 export function ConfirmModal({
@@ -24,9 +25,10 @@ export function ConfirmModal({
 	onCancel,
 	isLoading = false,
 	confirmVariant = "primary",
+	overlayClassName,
 }: ConfirmModalProps) {
 	return (
-		<div className="modal-overlay" onClick={onCancel}>
+		<div className={`modal-overlay${overlayClassName ? ` ${overlayClassName}` : ""}`} onClick={onCancel}>
 			<div className="modal-content" onClick={(e) => e.stopPropagation()} style={{ maxWidth: "450px" }}>
 				<button className="modal-close" onClick={onCancel}>
 					×

frontend/src/components/MedDetailModal.tsx

@@ -6,6 +6,7 @@
  * 1. Context mode: Uses useAppContext() for all state (when no props provided)
  * 2. Props mode: Accepts all required data as props (for gradual adoption)
  */
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Lightbox, MedicationAvatar } from "../components";
 import type { Coverage, Medication, RefillEntry, StockThresholds } from "../types";
@@ -83,11 +84,13 @@ export interface MedDetailModalProps {
 	onRefillPacksChange: (value: number) => void;
 	refillLoose: number;
 	onRefillLooseChange: (value: number) => void;
+	usePrescriptionRefill: boolean;
+	onUsePrescriptionRefillChange: (value: boolean) => void;
 	refillSaving: boolean;
 	refillHistory: RefillEntry[];
 	refillHistoryExpanded: boolean;
 	onRefillHistoryExpandedChange: (value: boolean) => void;
-	onSubmitRefill: (medId: number) => Promise<void>;
+	onSubmitRefill: (medId: number, usePrescription?: boolean) => Promise<void>;
 	// Edit stock state
 	editStockFullBlisters: number;
 	onEditStockFullBlistersChange: (value: number) => void;
@@ -115,6 +118,8 @@ export function MedDetailModal({
 	onRefillPacksChange,
 	refillLoose,
 	onRefillLooseChange,
+	usePrescriptionRefill,
+	onUsePrescriptionRefillChange,
 	refillSaving,
 	refillHistory,
 	refillHistoryExpanded,
@@ -128,6 +133,20 @@ export function MedDetailModal({
 	onSubmitStockCorrection,
 }: MedDetailModalProps) {
 	const { t, i18n } = useTranslation();
+	const [editStockFullInput, setEditStockFullInput] = useState("0");
+	const [editStockPartialInput, setEditStockPartialInput] = useState("0");
+
+	const parseStockInput = (value: string): number => {
+		const parsed = Number.parseInt(value, 10);
+		return Number.isNaN(parsed) ? 0 : parsed;
+	};
+
+	useEffect(() => {
+		if (showEditStockModal) {
+			setEditStockFullInput(String(editStockFullBlisters));
+			setEditStockPartialInput(String(editStockPartialBlisterPills));
+		}
+	}, [showEditStockModal, editStockFullBlisters, editStockPartialBlisterPills]);
 
 	if (!selectedMed) return null;
 
@@ -138,6 +157,7 @@ export function MedDetailModal({
 	const textClass =
 		status?.className === "danger" ? "danger-text" : status?.className === "warning" ? "warning-text" : "success-text";
 	const stock = getBlisterStock(currentStock, selectedMed.pillsPerBlister, selectedMed.looseTablets, packageSize);
+	const fullForBounds = Math.max(0, parseStockInput(editStockFullInput));
 
 	return (
 		<div className="modal-overlay" onClick={onClose}>
@@ -263,6 +283,42 @@ export function MedDetailModal({
 						</div>
 					</div>
 
+					{/* Prescription Details Section */}
+					{selectedMed.prescriptionEnabled && (
+						<div className="med-detail-section">
+							<h3>{t("form.sections.prescription")}</h3>
+							<div className="med-detail-grid">
+								<div className="med-detail-item">
+									<span className="med-detail-label">{t("prescription.authorizedRefills")}</span>
+									<span className="med-detail-value">{selectedMed.prescriptionAuthorizedRefills ?? "—"}</span>
+								</div>
+								<div className="med-detail-item">
+									<span className="med-detail-label">{t("prescription.remainingRefills")}</span>
+									<span className="med-detail-value">{selectedMed.prescriptionRemainingRefills ?? "—"}</span>
+								</div>
+								<div className="med-detail-item">
+									<span className="med-detail-label">{t("prescription.lowThreshold")}</span>
+									<span className="med-detail-value">{selectedMed.prescriptionLowRefillThreshold ?? "—"}</span>
+								</div>
+								<div className="med-detail-item">
+									<span className="med-detail-label">{t("prescription.expiryDate")}</span>
+									<span className="med-detail-value">
+										{selectedMed.prescriptionExpiryDate
+											? new Date(selectedMed.prescriptionExpiryDate).toLocaleDateString(
+													getSystemLocale(i18n.language),
+													{
+														day: "2-digit",
+														month: "short",
+														year: "numeric",
+													}
+												)
+											: "—"}
+									</span>
+								</div>
+							</div>
+						</div>
+					)}
+
 					{/* Intake Schedule Section */}
 					{selectedMed.blisters.length > 0 && (
 						<div className="med-detail-section">
@@ -373,6 +429,12 @@ export function MedDetailModal({
 																entry.loosePillsAdded;
 													return `+${total} ${total === 1 ? t("common.pill") : t("common.pills")}`;
 												})()}
+												{entry.usedPrescription && (
+													<span className="refill-prescription-badge" title={t("refill.viaPrescription")}>
+														{" "}
+														📋
+													</span>
+												)}
 											</span>
 										</div>
 									))}
@@ -459,6 +521,23 @@ export function MedDetailModal({
 									/>
 								</label>
 							)}
+
+							{selectedMed.prescriptionEnabled && (
+								<div className="refill-prescription-row full">
+									<label className="refill-prescription-toggle">
+										<input
+											type="checkbox"
+											checked={usePrescriptionRefill}
+											onChange={(e) => onUsePrescriptionRefillChange(e.target.checked)}
+											disabled={(Number(selectedMed.prescriptionRemainingRefills) || 0) <= 0}
+										/>
+										<span className="refill-prescription-label-text">{t("prescription.useForRefill")}</span>
+									</label>
+									<span className="refill-remaining-badge">
+										{t("prescription.remainingRefills")}: {Number(selectedMed.prescriptionRemainingRefills) || 0}
+									</span>
+								</div>
+							)}
 						</div>
 
 						<div className="modal-footer">
@@ -468,7 +547,7 @@ export function MedDetailModal({
 							<div className="refill-footer-right">
 								<button
 									className="success"
-									onClick={() => onSubmitRefill(selectedMed.id)}
+									onClick={() => onSubmitRefill(selectedMed.id, usePrescriptionRefill)}
 									disabled={(refillPacks < 1 && refillLoose < 1) || refillSaving}
 								>
 									{refillSaving ? t("common.saving") : t("refill.button")}
@@ -525,8 +604,17 @@ export function MedDetailModal({
 												<input
 													type="number"
 													min="0"
-													value={editStockPartialBlisterPills}
-													onChange={(e) => onEditStockPartialBlisterPillsChange(parseInt(e.target.value, 10) || 0)}
+													value={editStockPartialInput}
+													onChange={(e) => {
+														const raw = e.target.value;
+														setEditStockPartialInput(raw);
+														onEditStockPartialBlisterPillsChange(raw === "" ? 0 : Math.max(0, parseStockInput(raw)));
+													}}
+													onBlur={() => {
+														const normalized = Math.max(0, parseStockInput(editStockPartialInput));
+														onEditStockPartialBlisterPillsChange(normalized);
+														setEditStockPartialInput(String(normalized));
+													}}
 												/>
 											</label>
 										) : (
@@ -537,23 +625,45 @@ export function MedDetailModal({
 													<input
 														type="number"
 														min="0"
-														value={editStockFullBlisters}
-														onChange={(e) => onEditStockFullBlistersChange(parseInt(e.target.value, 10) || 0)}
+														value={editStockFullInput}
+														onChange={(e) => {
+															const raw = e.target.value;
+															setEditStockFullInput(raw);
+															onEditStockFullBlistersChange(raw === "" ? 0 : Math.max(0, parseStockInput(raw)));
+														}}
+														onBlur={() => {
+															const normalized = Math.max(0, parseStockInput(editStockFullInput));
+															onEditStockFullBlistersChange(normalized);
+															setEditStockFullInput(String(normalized));
+														}}
 													/>
 												</label>
 												<label>
 													{t("editStock.partialBlisterPills")}
 													<input
 														type="number"
-														min={editStockFullBlisters > 0 ? -(selectedMed.pillsPerBlister - 1) : 0}
+														min={fullForBounds > 0 ? -(selectedMed.pillsPerBlister - 1) : 0}
 														max={selectedMed.pillsPerBlister}
-														value={editStockPartialBlisterPills}
+														value={editStockPartialInput}
 														onChange={(e) => {
-															const val = parseInt(e.target.value, 10) || 0;
-															const min = editStockFullBlisters > 0 ? -(selectedMed.pillsPerBlister - 1) : 0;
+															const raw = e.target.value;
+															setEditStockPartialInput(raw);
+															if (raw === "") {
+																onEditStockPartialBlisterPillsChange(0);
+																return;
+															}
+															const val = parseStockInput(raw);
+															const min = fullForBounds > 0 ? -(selectedMed.pillsPerBlister - 1) : 0;
 															const max = selectedMed.pillsPerBlister;
 															onEditStockPartialBlisterPillsChange(Math.max(min, Math.min(val, max)));
 														}}
+														onBlur={() => {
+															const min = fullForBounds > 0 ? -(selectedMed.pillsPerBlister - 1) : 0;
+															const max = selectedMed.pillsPerBlister;
+															const normalized = Math.max(min, Math.min(parseStockInput(editStockPartialInput), max));
+															onEditStockPartialBlisterPillsChange(normalized);
+															setEditStockPartialInput(String(normalized));
+														}}
 													/>
 												</label>
 											</>

frontend/src/components/MobileEditModal.tsx

@@ -41,12 +41,14 @@ export interface MobileEditModalProps {
 	onAddIntake: (takenBy?: string) => void;
 	onRemoveIntake: (idx: number) => void;
 	// Value change handler for numeric fields
-	onHandleValueChange: <K extends keyof FormState>(field: K, value: string) => void;
+	onHandleValueChange: <K extends keyof FormState>(field: K, value: FormState[K]) => void;
 	// Refill state (for edit mode)
 	refillPacks: number;
 	onRefillPacksChange: (value: number) => void;
 	refillLoose: number;
 	onRefillLooseChange: (value: number) => void;
+	usePrescriptionRefill: boolean;
+	onUsePrescriptionRefillChange: (value: boolean) => void;
 	refillSaving: boolean;
 	onSubmitRefill: (medId: number) => Promise<void>;
 	// Image handling
@@ -99,6 +101,8 @@ export function MobileEditModal({
 	onRefillPacksChange,
 	refillLoose,
 	onRefillLooseChange,
+	usePrescriptionRefill,
+	onUsePrescriptionRefillChange,
 	refillSaving,
 	onSubmitRefill,
 	meds,
@@ -121,6 +125,9 @@ export function MobileEditModal({
 					×
 				</button>
 				<div className="edit-modal-header">
+					<button type="button" className="ghost small" onClick={onClose}>
+						← {t("common.back")}
+					</button>
 					<h2>{editingId ? t("form.editEntry") : t("form.newEntry")}</h2>
 				</div>
 				<form
@@ -137,184 +144,276 @@ export function MobileEditModal({
 						onSaveMedication(e);
 					}}
 				>
-					<label className={`full ${fieldErrors.name ? "has-error" : ""}`}>
-						{t("form.commercialName")}
-						<input
-							value={form.name}
-							onChange={(e) => onFormChange({ ...form, name: e.target.value })}
-							placeholder={t("form.placeholders.commercial")}
-							maxLength={FIELD_LIMITS.name.max}
-							required
-						/>
-						{fieldErrors.name && <span className="field-error">{fieldErrors.name}</span>}
-					</label>
-					<label className={`full ${fieldErrors.genericName ? "has-error" : ""}`}>
-						{t("form.genericName")}
-						<input
-							value={form.genericName}
-							onChange={(e) => onFormChange({ ...form, genericName: e.target.value })}
-							placeholder={t("form.placeholders.generic")}
-							maxLength={FIELD_LIMITS.genericName.max}
-						/>
-						{fieldErrors.genericName && <span className="field-error">{fieldErrors.genericName}</span>}
-					</label>
-					<label className={`full ${fieldErrors.takenBy ? "has-error" : ""}`}>
-						{t("form.takenBy")}
-						<div className="tag-input-container">
-							{form.takenBy.map((person) => (
-								<span key={person} className="tag">
-									{person}
-									<button type="button" className="tag-remove" onClick={() => onRemoveTakenByPerson(person)}>
-										×
-									</button>
-								</span>
-							))}
+					<div className="full form-category">
+						<h4 className="form-category-title">{t("form.sections.general")}</h4>
+						<label className={`full ${fieldErrors.name ? "has-error" : ""}`}>
+							{t("form.commercialName")}
 							<input
-								value={takenByInput}
-								onChange={(e) => onTakenByInputChange(e.target.value)}
-								onKeyDown={onTakenByKeyDown}
-								onBlur={() => {
-									if (takenByInput.trim()) onAddTakenByPerson(takenByInput);
-								}}
-								placeholder={
-									form.takenBy.length === 0 ? t("form.placeholders.takenBy") : t("form.placeholders.addPerson")
-								}
-								maxLength={FIELD_LIMITS.takenBy.max}
-								list="takenby-suggestions-modal"
+								value={form.name}
+								onChange={(e) => onFormChange({ ...form, name: e.target.value })}
+								placeholder={t("form.placeholders.commercial")}
+								maxLength={FIELD_LIMITS.name.max}
+								required
 							/>
-							<datalist id="takenby-suggestions-modal">
-								{existingPeople
-									.filter((p) => !form.takenBy.includes(p))
-									.map((person) => (
-										<option key={person} value={person} />
-									))}
-							</datalist>
-						</div>
-						{fieldErrors.takenBy && <span className="field-error">{fieldErrors.takenBy}</span>}
-					</label>
-					<label className="full">
-						{t("form.packageType")}
-						<select
-							className="package-type-select"
-							value={form.packageType}
-							onChange={(e) => onHandleValueChange("packageType", e.target.value)}
-						>
-							<option value="blister">{t("form.packageTypeBlister")}</option>
-							<option value="bottle">{t("form.packageTypeBottle")}</option>
-						</select>
-					</label>
-					{form.packageType === "blister" ? (
-						<>
-							<label>
-								{t("form.packs")}
-								<input
-									type="number"
-									min="0"
-									value={form.packCount}
-									onChange={(e) => onHandleValueChange("packCount", e.target.value)}
-								/>
-							</label>
-							<label>
-								{t("form.blistersPerPack")}
-								<input
-									type="number"
-									min="0"
-									value={form.blistersPerPack}
-									onChange={(e) => onHandleValueChange("blistersPerPack", e.target.value)}
-								/>
-							</label>
-							<label>
-								{t("form.pillsPerBlister")}
-								<input
-									type="number"
-									min="1"
-									value={form.pillsPerBlister}
-									onChange={(e) => onHandleValueChange("pillsPerBlister", e.target.value)}
-								/>
-							</label>
-							<label>
-								{t("form.loosePills")}
-								<input
-									type="number"
-									min="0"
-									value={form.looseTablets}
-									onChange={(e) => onHandleValueChange("looseTablets", e.target.value)}
-								/>
-							</label>
-						</>
-					) : (
-						<>
-							<label>
-								{t("form.totalCapacity")}
-								<input
-									type="number"
-									min="1"
-									value={form.totalPills}
-									onChange={(e) => onHandleValueChange("totalPills", e.target.value)}
-								/>
-							</label>
-							<label>
-								{t("form.currentPills")}
-								<input
-									type="number"
-									min="0"
-									value={form.looseTablets}
-									onChange={(e) => onHandleValueChange("looseTablets", e.target.value)}
-								/>
-							</label>
-						</>
-					)}
-					<div className="full">
-						<p className="sub">
-							<strong>{t("form.total")}:</strong> {deriveTotalFromForm(form)}{" "}
-							{deriveTotalFromForm(form) === 1 ? t("common.pill") : t("common.pills")}
-						</p>
-					</div>
-					<label className="full">
-						{t("form.pillWeight")} ({form.doseUnit})
-						<div className="dose-input-group">
+							{fieldErrors.name && <span className="field-error">{fieldErrors.name}</span>}
+						</label>
+						<label className={`full ${fieldErrors.genericName ? "has-error" : ""}`}>
+							{t("form.genericName")}
 							<input
-								type="number"
-								min="0"
-								step="0.1"
-								value={form.pillWeightMg}
-								onChange={(e) => onFormChange({ ...form, pillWeightMg: e.target.value })}
-								placeholder={t("form.placeholders.weight")}
+								value={form.genericName}
+								onChange={(e) => onFormChange({ ...form, genericName: e.target.value })}
+								placeholder={t("form.placeholders.generic")}
+								maxLength={FIELD_LIMITS.genericName.max}
 							/>
-							<select
-								value={form.doseUnit}
-								onChange={(e) => onFormChange({ ...form, doseUnit: e.target.value as DoseUnit })}
-								className="dose-unit-select"
-							>
-								{DOSE_UNITS.map((unit) => (
-									<option key={unit.value} value={unit.value}>
-										{unit.label}
-									</option>
+							{fieldErrors.genericName && <span className="field-error">{fieldErrors.genericName}</span>}
+						</label>
+						<label className={`full ${fieldErrors.takenBy ? "has-error" : ""}`}>
+							{t("form.takenBy")}
+							<div className="tag-input-container">
+								{form.takenBy.map((person) => (
+									<span key={person} className="tag">
+										{person}
+										<button type="button" className="tag-remove" onClick={() => onRemoveTakenByPerson(person)}>
+											×
+										</button>
+									</span>
 								))}
+								<input
+									value={takenByInput}
+									onChange={(e) => onTakenByInputChange(e.target.value)}
+									onKeyDown={onTakenByKeyDown}
+									onBlur={() => {
+										if (takenByInput.trim()) onAddTakenByPerson(takenByInput);
+									}}
+									placeholder={
+										form.takenBy.length === 0 ? t("form.placeholders.takenBy") : t("form.placeholders.addPerson")
+									}
+									maxLength={FIELD_LIMITS.takenBy.max}
+									list="takenby-suggestions-modal"
+								/>
+								<datalist id="takenby-suggestions-modal">
+									{existingPeople
+										.filter((p) => !form.takenBy.includes(p))
+										.map((person) => (
+											<option key={person} value={person} />
+										))}
+								</datalist>
+							</div>
+							{fieldErrors.takenBy && <span className="field-error">{fieldErrors.takenBy}</span>}
+						</label>
+						<label className="full">
+							{t("form.packageType")}
+							<select
+								className="package-type-select"
+								value={form.packageType}
+								onChange={(e) => onHandleValueChange("packageType", e.target.value)}
+							>
+								<option value="blister">{t("form.packageTypeBlister")}</option>
+								<option value="bottle">{t("form.packageTypeBottle")}</option>
 							</select>
-						</div>
-					</label>
-					<label className="full">
-						{t("form.expiryDate")}
-						<input
-							type="date"
-							value={form.expiryDate}
-							onChange={(e) => onFormChange({ ...form, expiryDate: e.target.value })}
-						/>
-					</label>
+						</label>
+					</div>
 
-					{/* Refill section - only shown when editing (mobile) */}
-					{editingId && (
-						<div className="full refill-section">
-							<h4 className="refill-title">{t("refill.title")}</h4>
-							<div className="refill-form-inline">
+					<div className="full form-category">
+						<h4 className="form-category-title">{t("form.sections.stock")}</h4>
+						{form.packageType === "blister" ? (
+							<>
+								<label>
+									{t("form.packs")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.packCount}
+										onChange={(e) => onHandleValueChange("packCount", e.target.value)}
+									/>
+								</label>
+								<label>
+									{t("form.blistersPerPack")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.blistersPerPack}
+										onChange={(e) => onHandleValueChange("blistersPerPack", e.target.value)}
+									/>
+								</label>
+								<label>
+									{t("form.pillsPerBlister")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.pillsPerBlister}
+										onChange={(e) => onHandleValueChange("pillsPerBlister", e.target.value)}
+									/>
+								</label>
+								<label>
+									{t("form.loosePills")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.looseTablets}
+										onChange={(e) => onHandleValueChange("looseTablets", e.target.value)}
+									/>
+								</label>
+							</>
+						) : (
+							<>
+								<label>
+									{t("form.totalCapacity")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.totalPills}
+										onChange={(e) => onHandleValueChange("totalPills", e.target.value)}
+									/>
+								</label>
+								<label>
+									{t("form.currentPills")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.looseTablets}
+										onChange={(e) => onHandleValueChange("looseTablets", e.target.value)}
+									/>
+								</label>
+							</>
+						)}
+						<div className="full">
+							<p className="sub">
+								<strong>{t("form.total")}:</strong> {deriveTotalFromForm(form)}{" "}
+								{deriveTotalFromForm(form) === 1 ? t("common.pill") : t("common.pills")}
+							</p>
+						</div>
+						<label className="full">
+							{t("form.pillWeight")} ({form.doseUnit})
+							<div className="dose-input-group">
+								<input
+									type="text"
+									inputMode="decimal"
+									pattern="[0-9]*\.?[0-9]*"
+									value={form.pillWeightMg}
+									onChange={(e) => onFormChange({ ...form, pillWeightMg: e.target.value })}
+									placeholder={t("form.placeholders.weight")}
+								/>
+								<select
+									value={form.doseUnit}
+									onChange={(e) => onFormChange({ ...form, doseUnit: e.target.value as DoseUnit })}
+									className="dose-unit-select"
+								>
+									{DOSE_UNITS.map((unit) => (
+										<option key={unit.value} value={unit.value}>
+											{unit.label}
+										</option>
+									))}
+								</select>
+							</div>
+						</label>
+						<label className="full">
+							{t("form.expiryDate")}
+							<input
+								type="date"
+								value={form.expiryDate}
+								onChange={(e) => onFormChange({ ...form, expiryDate: e.target.value })}
+							/>
+						</label>
+						<label className={`full ${fieldErrors.notes ? "has-error" : ""}`}>
+							{t("form.notes")}
+							<textarea
+								value={form.notes}
+								onChange={(e) => onFormChange({ ...form, notes: e.target.value })}
+								placeholder={t("form.placeholders.notes")}
+								rows={2}
+								maxLength={FIELD_LIMITS.notes.max}
+								className="auto-resize"
+								onInput={(e) => {
+									const target = e.target as HTMLTextAreaElement;
+									target.style.height = "auto";
+									target.style.height = `${target.scrollHeight}px`;
+								}}
+							/>
+							{form.notes.length > 0 && (
+								<span className={`char-count ${form.notes.length > FIELD_LIMITS.notes.max * 0.9 ? "warning" : ""}`}>
+									{t("common.validation.tooLong", { current: form.notes.length, max: FIELD_LIMITS.notes.max })}
+								</span>
+							)}
+							{fieldErrors.notes && <span className="field-error">{fieldErrors.notes}</span>}
+						</label>
+					</div>
+
+					<div className="full form-category">
+						<h4 className="form-category-title">{t("form.sections.prescription")}</h4>
+						<label className="full">
+							{t("prescription.enabled")}
+							<label className="toggle-switch small">
+								<input
+									type="checkbox"
+									checked={form.prescriptionEnabled}
+									onChange={(e) => onHandleValueChange("prescriptionEnabled", e.target.checked)}
+								/>
+								<span className="toggle-slider"></span>
+							</label>
+						</label>
+						{form.prescriptionEnabled && (
+							<>
+								<label className="prescription-field">
+									{t("prescription.authorizedRefills")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.prescriptionAuthorizedRefills}
+										onChange={(e) => onHandleValueChange("prescriptionAuthorizedRefills", e.target.value)}
+									/>
+								</label>
+								<label className="prescription-field">
+									{t("prescription.remainingRefills")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.prescriptionRemainingRefills}
+										onChange={(e) => onHandleValueChange("prescriptionRemainingRefills", e.target.value)}
+									/>
+								</label>
+								<label className="prescription-field">
+									{t("prescription.lowThreshold")}
+									<input
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
+										value={form.prescriptionLowRefillThreshold}
+										onChange={(e) => onHandleValueChange("prescriptionLowRefillThreshold", e.target.value)}
+									/>
+								</label>
+								<label className="prescription-field">
+									{t("prescription.expiryDate")}
+									<input
+										type="date"
+										value={form.prescriptionExpiryDate}
+										onChange={(e) => onHandleValueChange("prescriptionExpiryDate", e.target.value)}
+									/>
+								</label>
+							</>
+						)}
+					</div>
+
+					<div className="full form-category refill-section">
+						<h4 className="form-category-title">{t("refill.title")}</h4>
+						{editingId ? (
+							<>
 								{form.packageType === "blister" ? (
 									<>
 										<label>
 											{t("refill.packs")}
 											<input
-												type="number"
-												min="0"
+												type="text"
+												inputMode="numeric"
+												pattern="[0-9]*"
 												value={refillPacks}
 												onChange={(e) => onRefillPacksChange(parseInt(e.target.value, 10) || 0)}
 											/>
@@ -322,102 +421,109 @@ export function MobileEditModal({
 										<label>
 											{t("refill.loosePills")}
 											<input
-												type="number"
-												min="0"
+												type="text"
+												inputMode="numeric"
+												pattern="[0-9]*"
 												value={refillLoose}
 												onChange={(e) => onRefillLooseChange(parseInt(e.target.value, 10) || 0)}
 											/>
 										</label>
 									</>
 								) : (
-									<label>
+									<label className="full">
 										{t("refill.pillsToAdd")}
 										<input
-											type="number"
-											min="0"
+											type="text"
+											inputMode="numeric"
+											pattern="[0-9]*"
 											value={refillLoose}
 											onChange={(e) => onRefillLooseChange(parseInt(e.target.value, 10) || 0)}
 										/>
 									</label>
 								)}
-								<button
-									type="button"
-									className="success"
-									onClick={() => onSubmitRefill(editingId)}
-									disabled={(refillPacks < 1 && refillLoose < 1) || refillSaving}
-								>
-									{refillSaving ? t("common.saving") : t("refill.button")}
-								</button>
-								{(() => {
-									const totalRefill =
-										form.packageType === "blister"
-											? refillPacks * Number(form.blistersPerPack || 0) * Number(form.pillsPerBlister || 1) +
-												refillLoose
-											: refillLoose;
-									return totalRefill > 0 ? (
-										<span className="refill-preview">
-											+{totalRefill} {totalRefill === 1 ? t("common.pill") : t("common.pills")}
+								<div className="refill-submit-row full">
+									<button
+										type="button"
+										className="success"
+										onClick={() => onSubmitRefill(editingId)}
+										disabled={(refillPacks < 1 && refillLoose < 1) || refillSaving}
+									>
+										{refillSaving ? t("common.saving") : t("refill.button")}
+									</button>
+									{(() => {
+										const totalRefill =
+											form.packageType === "blister"
+												? refillPacks * Number(form.blistersPerPack || 0) * Number(form.pillsPerBlister || 1) +
+													refillLoose
+												: refillLoose;
+										return totalRefill > 0 ? (
+											<span className="refill-preview">
+												+{totalRefill} {totalRefill === 1 ? t("common.pill") : t("common.pills")}
+											</span>
+										) : null;
+									})()}
+								</div>
+								{form.prescriptionEnabled && (
+									<div className="refill-prescription-row full">
+										<label className="refill-prescription-toggle">
+											<input
+												type="checkbox"
+												checked={usePrescriptionRefill}
+												onChange={(e) => onUsePrescriptionRefillChange(e.target.checked)}
+												disabled={(Number(form.prescriptionRemainingRefills) || 0) <= 0}
+											/>
+											<span className="refill-prescription-label-text">{t("prescription.useForRefill")}</span>
+										</label>
+										<span className="refill-remaining-badge">
+											{t("prescription.remainingRefills")}: {Number(form.prescriptionRemainingRefills) || 0}
 										</span>
-									) : null;
-								})()}
-							</div>
+									</div>
+								)}
+							</>
+						) : (
+							<p className="refill-unavailable">{t("refill.saveFirst", "Save medication first to enable refill")}</p>
+						)}
+					</div>
+
+					{editingId && (
+						<div className="full form-category image-section">
+							<h4 className="form-category-title">{t("form.medicationImage")}</h4>
+							{currentMed?.imageUrl ? (
+								<div className="image-preview">
+									<img src={`/api/images/${currentMed.imageUrl}`} alt={currentMed.name} />
+									<button type="button" className="danger" onClick={() => onDeleteMedImage(editingId)}>
+										{t("form.removeImage")}
+									</button>
+								</div>
+							) : (
+								<input
+									type="file"
+									accept="image/*"
+									onChange={(e) => e.target.files?.[0] && onUploadMedImage(editingId, e.target.files[0])}
+								/>
+							)}
 						</div>
 					)}
 
-					<label className={`full ${fieldErrors.notes ? "has-error" : ""}`}>
-						{t("form.notes")}
-						<textarea
-							value={form.notes}
-							onChange={(e) => onFormChange({ ...form, notes: e.target.value })}
-							placeholder={t("form.placeholders.notes")}
-							rows={2}
-							maxLength={FIELD_LIMITS.notes.max}
-							className="auto-resize"
-							onInput={(e) => {
-								const target = e.target as HTMLTextAreaElement;
-								target.style.height = "auto";
-								target.style.height = `${target.scrollHeight}px`;
-							}}
-						/>
-						{form.notes.length > 0 && (
-							<span className={`char-count ${form.notes.length > FIELD_LIMITS.notes.max * 0.9 ? "warning" : ""}`}>
-								{t("common.validation.tooLong", { current: form.notes.length, max: FIELD_LIMITS.notes.max })}
-							</span>
-						)}
-						{fieldErrors.notes && <span className="field-error">{fieldErrors.notes}</span>}
-					</label>
-
-					{editingId && currentMed?.imageUrl ? (
-						<div className="full image-field">
-							<span className="field-label">{t("form.medicationImage")}</span>
-							<div className="image-preview">
-								<img src={`/api/images/${currentMed.imageUrl}`} alt={currentMed.name} />
-								<button type="button" className="danger" onClick={() => onDeleteMedImage(editingId)}>
-									{t("form.removeImage")}
-								</button>
-							</div>
+					<div className="full form-category intake-section">
+						<div className="form-category-header">
+							<h4 className="form-category-title">{t("form.blisters.title")}</h4>
+							<button
+								type="button"
+								className="ghost add-blister"
+								onClick={() => onAddIntake(form.takenBy.length === 1 ? form.takenBy[0] : undefined)}
+							>
+								+ {t("form.blisters.addIntake")}
+							</button>
 						</div>
-					) : editingId ? (
-						<label className="full">
-							{t("form.medicationImage")}
-							<input
-								type="file"
-								accept="image/*"
-								onChange={(e) => e.target.files?.[0] && onUploadMedImage(editingId, e.target.files[0])}
-							/>
-						</label>
-					) : null}
-
-					<fieldset className="full blister-section">
-						<legend>{t("form.blisters.title")}</legend>
 						{form.intakes.map((intake, idx) => (
 							<div key={idx} className="blister-row">
 								<label className="compact">
 									<span>{t("form.blisters.usage")}</span>
 									<input
-										type="number"
-										min="0"
-										step="0.1"
+										type="text"
+										inputMode="decimal"
+										pattern="[0-9]*\.?[0-9]*"
 										value={intake.usage}
 										onChange={(e) => onSetIntakeValue(idx, "usage", e.target.value)}
 									/>
@@ -425,8 +531,9 @@ export function MobileEditModal({
 								<label className="compact">
 									<span>{t("form.blisters.everyDays")}</span>
 									<input
-										type="number"
-										min="1"
+										type="text"
+										inputMode="numeric"
+										pattern="[0-9]*"
 										value={intake.every}
 										onChange={(e) => onSetIntakeValue(idx, "every", e.target.value)}
 									/>
@@ -477,14 +584,7 @@ export function MobileEditModal({
 								)}
 							</div>
 						))}
-						<button
-							type="button"
-							className="ghost add-blister"
-							onClick={() => onAddIntake(form.takenBy.length === 1 ? form.takenBy[0] : undefined)}
-						>
-							+ {t("form.blisters.addIntake")}
-						</button>
-					</fieldset>
+					</div>
 
 					<div className="modal-footer">
 						<button type="button" className="ghost" onClick={onClose}>

frontend/src/context/AppContext.tsx

@@ -5,6 +5,7 @@ import { useAuth } from "../components/Auth";
 import { useCollapsedDays, useDoses, useMedications, useRefill, useSettings, useShare } from "../hooks";
 import type { Coverage, Medication, ScheduleEvent, StockThresholds } from "../types";
 import { getSystemLocale } from "../utils/formatters";
+import { log } from "../utils/logger";
 import { buildSchedulePreview, calculateCoverage, computeMissedPastDoseIds, isDoseDismissed } from "../utils/schedule";
 
 // =============================================================================
@@ -17,6 +18,7 @@ export type DoseInfo = {
 	when: number;
 	usage: number;
 	takenBy: string[];
+	intakeRemindersEnabled: boolean;
 };
 
 export type DayMedEntry = {
@@ -58,7 +60,7 @@ export interface AppContextValue {
 	testingShoutrrr: boolean;
 	testShoutrrrResult: { success: boolean; message: string } | null;
 	loadSettings: () => void;
-	saveSettings: (e: React.FormEvent) => Promise<void>;
+	saveSettings: (e?: React.FormEvent) => Promise<void>;
 	testEmail: () => Promise<void>;
 	testShoutrrr: () => Promise<void>;
 
@@ -105,6 +107,8 @@ export interface AppContextValue {
 	setRefillPacks: React.Dispatch<React.SetStateAction<number>>;
 	refillLoose: number;
 	setRefillLoose: React.Dispatch<React.SetStateAction<number>>;
+	usePrescriptionRefill: boolean;
+	setUsePrescriptionRefill: React.Dispatch<React.SetStateAction<boolean>>;
 	refillSaving: boolean;
 	refillHistory: ReturnType<typeof useRefill>["refillHistory"];
 	refillHistoryExpanded: boolean;
@@ -121,7 +125,8 @@ export interface AppContextValue {
 		medId: number,
 		editingId: number | null,
 		setForm: React.Dispatch<React.SetStateAction<any>>,
-		loadMeds: () => void
+		loadMeds: () => void,
+		usePrescription?: boolean
 	) => Promise<void>;
 	submitStockCorrection: (medId: number, selectedMed: Medication, loadMeds: () => void) => Promise<void>;
 	openRefillModal: () => void;
@@ -382,6 +387,7 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
 					when: event.when,
 					usage: event.usage,
 					takenBy: event.takenBy ? [event.takenBy] : [],
+					intakeRemindersEnabled: event.intakeRemindersEnabled,
 				});
 				medEntry.lastWhen = Math.max(medEntry.lastWhen, event.when);
 				day.meds.set(event.medName, medEntry);
@@ -509,7 +515,7 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
 				document.body.removeChild(a);
 				URL.revokeObjectURL(url);
 			} catch (err) {
-				console.error("Export error:", err);
+				log.error("Export error:", err);
 			}
 			setExporting(false);
 		},
@@ -563,7 +569,7 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
 			try {
 				data = text ? JSON.parse(text) : {};
 			} catch {
-				console.error("Import response parse error:", text);
+				log.error("Import response parse error:", text);
 				alert(`${t("exportImport.importError")}: Server returned invalid response`);
 				return;
 			}
@@ -585,7 +591,7 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
 			settingsHook.loadSettings();
 			doses.loadTakenDoses();
 		} catch (err) {
-			console.error("Import error:", err);
+			log.error("Import error:", err);
 			alert(t("exportImport.importError"));
 		}
 
@@ -602,6 +608,7 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
 			settings.notificationEmail !== savedSettings.notificationEmail ||
 			settings.emailStockReminders !== savedSettings.emailStockReminders ||
 			settings.emailIntakeReminders !== savedSettings.emailIntakeReminders ||
+			settings.emailPrescriptionReminders !== savedSettings.emailPrescriptionReminders ||
 			settings.reminderDaysBefore !== savedSettings.reminderDaysBefore ||
 			settings.repeatDailyReminders !== savedSettings.repeatDailyReminders ||
 			settings.lowStockDays !== savedSettings.lowStockDays ||
@@ -611,6 +618,7 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
 			settings.shoutrrrUrl !== savedSettings.shoutrrrUrl ||
 			settings.shoutrrrStockReminders !== savedSettings.shoutrrrStockReminders ||
 			settings.shoutrrrIntakeReminders !== savedSettings.shoutrrrIntakeReminders ||
+			settings.shoutrrrPrescriptionReminders !== savedSettings.shoutrrrPrescriptionReminders ||
 			settings.skipRemindersForTakenDoses !== savedSettings.skipRemindersForTakenDoses ||
 			settings.repeatRemindersEnabled !== savedSettings.repeatRemindersEnabled ||
 			settings.reminderRepeatIntervalMinutes !== savedSettings.reminderRepeatIntervalMinutes ||
@@ -735,6 +743,8 @@ export function AppProvider({ children }: { children: React.ReactNode }) {
 			setRefillPacks: refill.setRefillPacks,
 			refillLoose: refill.refillLoose,
 			setRefillLoose: refill.setRefillLoose,
+			usePrescriptionRefill: refill.usePrescriptionRefill,
+			setUsePrescriptionRefill: refill.setUsePrescriptionRefill,
 			refillSaving: refill.refillSaving,
 			refillHistory: refill.refillHistory,
 			refillHistoryExpanded: refill.refillHistoryExpanded,

frontend/src/hooks/useMedicationForm.ts

@@ -43,6 +43,11 @@ export const defaultForm = (): FormState => ({
 	doseUnit: "mg",
 	expiryDate: "",
 	notes: "",
+	prescriptionEnabled: false,
+	prescriptionAuthorizedRefills: "",
+	prescriptionRemainingRefills: "",
+	prescriptionLowRefillThreshold: "1",
+	prescriptionExpiryDate: "",
 	intakeRemindersEnabled: false,
 	blisters: [defaultBlister()],
 	intakes: [defaultIntake()],
@@ -78,7 +83,7 @@ export interface UseMedicationFormReturn {
 	removeIntake: (idx: number) => void;
 	startEdit: (med: Medication, openEditModal: () => void) => void;
 	resetForm: () => void;
-	handleValueChange: <K extends keyof FormState>(key: K, value: string) => void;
+	handleValueChange: <K extends keyof FormState>(key: K, value: FormState[K]) => void;
 	addTakenByPerson: (name: string) => void;
 	removeTakenByPerson: (name: string) => void;
 	handleTakenByKeyDown: (e: React.KeyboardEvent<HTMLInputElement>) => void;
@@ -96,6 +101,12 @@ export function useMedicationForm(): UseMedicationFormReturn {
 	const [pendingImagePreview, setPendingImagePreview] = useState<string | null>(null);
 	const [takenByInput, setTakenByInput] = useState("");
 
+	const parseNonNegativeInt = useCallback((value: string): number => {
+		const parsed = Number.parseInt(value, 10);
+		if (Number.isNaN(parsed) || parsed < 0) return 0;
+		return parsed;
+	}, []);
+
 	// Validate form fields
 	const validateField = useCallback(
 		(field: keyof FieldErrors, value: string | string[]): string | undefined => {
@@ -199,6 +210,10 @@ export function useMedicationForm(): UseMedicationFormReturn {
 						intakeRemindersEnabled: med.intakeRemindersEnabled ?? false,
 					}));
 
+		const authorizedRefills = Math.max(0, med.prescriptionAuthorizedRefills ?? 0);
+		const remainingRefills = Math.min(Math.max(0, med.prescriptionRemainingRefills ?? 0), authorizedRefills);
+		const lowRefillThreshold = Math.min(Math.max(0, med.prescriptionLowRefillThreshold ?? 1), authorizedRefills);
+
 		const editForm: FormState = {
 			name: med.name,
 			genericName: med.genericName ?? "",
@@ -217,6 +232,11 @@ export function useMedicationForm(): UseMedicationFormReturn {
 			doseUnit: med.doseUnit ?? "mg",
 			expiryDate: med.expiryDate ? med.expiryDate.slice(0, 10) : "",
 			notes: med.notes ?? "",
+			prescriptionEnabled: med.prescriptionEnabled ?? false,
+			prescriptionAuthorizedRefills: med.prescriptionAuthorizedRefills != null ? String(authorizedRefills) : "",
+			prescriptionRemainingRefills: med.prescriptionRemainingRefills != null ? String(remainingRefills) : "",
+			prescriptionLowRefillThreshold: String(lowRefillThreshold),
+			prescriptionExpiryDate: med.prescriptionExpiryDate ? med.prescriptionExpiryDate.slice(0, 10) : "",
 			intakeRemindersEnabled: med.intakeRemindersEnabled ?? false,
 			blisters: med.blisters.map((s) => ({
 				usage: String(s.usage),
@@ -246,9 +266,54 @@ export function useMedicationForm(): UseMedicationFormReturn {
 		setOriginalForm(newForm);
 	}, []);
 
-	const handleValueChange = useCallback(<K extends keyof FormState>(key: K, value: string) => {
-		setForm((prev) => ({ ...prev, [key]: value }));
-	}, []);
+	const handleValueChange = useCallback(
+		<K extends keyof FormState>(key: K, value: FormState[K]) => {
+			setForm((prev) => {
+				const next = { ...prev, [key]: value } as FormState;
+
+				if (key === "prescriptionAuthorizedRefills") {
+					const raw = String(value);
+					next.prescriptionAuthorizedRefills = raw === "" ? "" : String(parseNonNegativeInt(raw));
+				}
+
+				if (key === "prescriptionRemainingRefills") {
+					const raw = String(value);
+					next.prescriptionRemainingRefills = raw === "" ? "" : String(parseNonNegativeInt(raw));
+				}
+
+				if (key === "prescriptionLowRefillThreshold") {
+					const raw = String(value);
+					next.prescriptionLowRefillThreshold = raw === "" ? "" : String(parseNonNegativeInt(raw));
+				}
+
+				if (!next.prescriptionEnabled) {
+					return next;
+				}
+
+				const authorizedRefills = parseNonNegativeInt(next.prescriptionAuthorizedRefills);
+
+				if (key === "prescriptionAuthorizedRefills") {
+					next.prescriptionRemainingRefills = String(
+						Math.min(parseNonNegativeInt(next.prescriptionRemainingRefills), authorizedRefills)
+					);
+					next.prescriptionLowRefillThreshold = String(
+						Math.min(parseNonNegativeInt(next.prescriptionLowRefillThreshold), authorizedRefills)
+					);
+				}
+
+				if (key === "prescriptionRemainingRefills") {
+					next.prescriptionRemainingRefills = String(Math.min(parseNonNegativeInt(String(value)), authorizedRefills));
+				}
+
+				if (key === "prescriptionLowRefillThreshold") {
+					next.prescriptionLowRefillThreshold = String(Math.min(parseNonNegativeInt(String(value)), authorizedRefills));
+				}
+
+				return next;
+			});
+		},
+		[parseNonNegativeInt]
+	);
 
 	// Tag input helpers for "Taken By" field
 	const addTakenByPerson = useCallback(

frontend/src/hooks/useRefill.ts

@@ -10,6 +10,8 @@ export interface UseRefillReturn {
 	setRefillPacks: React.Dispatch<React.SetStateAction<number>>;
 	refillLoose: number;
 	setRefillLoose: React.Dispatch<React.SetStateAction<number>>;
+	usePrescriptionRefill: boolean;
+	setUsePrescriptionRefill: React.Dispatch<React.SetStateAction<boolean>>;
 	refillSaving: boolean;
 	refillHistory: RefillEntry[];
 	refillHistoryExpanded: boolean;
@@ -30,7 +32,8 @@ export interface UseRefillReturn {
 		medId: number,
 		editingId: number | null,
 		setForm: React.Dispatch<React.SetStateAction<FormState>>,
-		loadMeds: () => void
+		loadMeds: () => void,
+		usePrescription?: boolean
 	) => Promise<void>;
 	submitStockCorrection: (medId: number, selectedMed: Medication, loadMeds: () => void) => Promise<void>;
 	openRefillModal: () => void;
@@ -44,6 +47,7 @@ export function useRefill(): UseRefillReturn {
 	const [showRefillModal, setShowRefillModal] = useState(false);
 	const [refillPacks, setRefillPacks] = useState(1);
 	const [refillLoose, setRefillLoose] = useState(0);
+	const [usePrescriptionRefill, setUsePrescriptionRefill] = useState(false);
 	const [refillSaving, setRefillSaving] = useState(false);
 	const [refillHistory, setRefillHistory] = useState<RefillEntry[]>([]);
 	const [refillHistoryExpanded, setRefillHistoryExpanded] = useState(false);
@@ -75,7 +79,8 @@ export function useRefill(): UseRefillReturn {
 			medId: number,
 			editingId: number | null,
 			setForm: React.Dispatch<React.SetStateAction<FormState>>,
-			loadMeds: () => void
+			loadMeds: () => void,
+			usePrescription: boolean = false
 		) => {
 			if (refillPacks < 1 && refillLoose < 1) return;
 			setRefillSaving(true);
@@ -84,7 +89,7 @@ export function useRefill(): UseRefillReturn {
 					method: "POST",
 					headers: { "Content-Type": "application/json" },
 					credentials: "include",
-					body: JSON.stringify({ packsAdded: refillPacks, loosePillsAdded: refillLoose }),
+					body: JSON.stringify({ packsAdded: refillPacks, loosePillsAdded: refillLoose, usePrescription }),
 				});
 				if (res.ok) {
 					const data = await res.json();
@@ -94,11 +99,16 @@ export function useRefill(): UseRefillReturn {
 							...f,
 							packCount: String(data.newStock.packCount),
 							looseTablets: String(data.newStock.looseTablets),
+							prescriptionRemainingRefills:
+								data.prescription?.remainingRefills != null
+									? String(data.prescription.remainingRefills)
+									: f.prescriptionRemainingRefills,
 						}));
 					}
 					// Reset refill form
 					setRefillPacks(1);
 					setRefillLoose(0);
+					setUsePrescriptionRefill(false);
 					// Close refill modal via history back for proper back-button support
 					if (showRefillModal) {
 						window.history.back();
@@ -217,6 +227,8 @@ export function useRefill(): UseRefillReturn {
 		setRefillPacks,
 		refillLoose,
 		setRefillLoose,
+		usePrescriptionRefill,
+		setUsePrescriptionRefill,
 		refillSaving,
 		refillHistory,
 		refillHistoryExpanded,

frontend/src/hooks/useSettings.ts

@@ -2,7 +2,7 @@
 // useSettings Hook - Settings state and operations
 // =============================================================================
 
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 export interface Settings {
@@ -26,19 +26,24 @@ export interface Settings {
 	hasSmtpPassword: boolean;
 	lastAutoEmailSent: string | null;
 	nextScheduledCheck: string | null;
-	lastNotificationType: "stock" | "intake" | null;
+	lastNotificationType: "stock" | "intake" | "prescription" | null;
 	lastNotificationChannel: "email" | "push" | "both" | null;
 	lastReminderMedName: string | null;
 	lastReminderTakenBy: string | null;
 	lastStockReminderSent: string | null;
 	lastStockReminderChannel: "email" | "push" | "both" | null;
 	lastStockReminderMedNames: string | null;
+	lastPrescriptionReminderSent: string | null;
+	lastPrescriptionReminderChannel: "email" | "push" | "both" | null;
+	lastPrescriptionReminderMedNames: string | null;
 	shoutrrrEnabled: boolean;
 	shoutrrrUrl: string;
 	emailStockReminders: boolean;
 	emailIntakeReminders: boolean;
+	emailPrescriptionReminders: boolean;
 	shoutrrrStockReminders: boolean;
 	shoutrrrIntakeReminders: boolean;
+	shoutrrrPrescriptionReminders: boolean;
 	stockCalculationMode: "automatic" | "manual";
 	shareStockStatus: boolean;
 	expiryWarningDays: number;
@@ -72,12 +77,17 @@ const defaultSettings: Settings = {
 	lastStockReminderSent: null,
 	lastStockReminderChannel: null,
 	lastStockReminderMedNames: null,
+	lastPrescriptionReminderSent: null,
+	lastPrescriptionReminderChannel: null,
+	lastPrescriptionReminderMedNames: null,
 	shoutrrrEnabled: false,
 	shoutrrrUrl: "",
 	emailStockReminders: true,
 	emailIntakeReminders: true,
+	emailPrescriptionReminders: true,
 	shoutrrrStockReminders: true,
 	shoutrrrIntakeReminders: true,
+	shoutrrrPrescriptionReminders: true,
 	stockCalculationMode: "automatic",
 	shareStockStatus: true,
 	expiryWarningDays: 30,
@@ -97,7 +107,7 @@ export interface UseSettingsReturn {
 	testShoutrrrResult: { success: boolean; message: string } | null;
 	setTestShoutrrrResult: React.Dispatch<React.SetStateAction<{ success: boolean; message: string } | null>>;
 	loadSettings: () => void;
-	saveSettings: (e: React.FormEvent) => Promise<void>;
+	saveSettings: (e?: React.FormEvent) => Promise<void>;
 	testEmail: () => Promise<void>;
 	testShoutrrr: () => Promise<void>;
 	hasUnsavedChanges: boolean;
@@ -152,6 +162,11 @@ export function useSettings(): UseSettingsReturn {
 						lastStockReminderSent: data.lastStockReminderSent ?? prev.lastStockReminderSent,
 						lastStockReminderChannel: data.lastStockReminderChannel ?? prev.lastStockReminderChannel,
 						lastStockReminderMedNames: data.lastStockReminderMedNames ?? prev.lastStockReminderMedNames,
+						lastPrescriptionReminderSent: data.lastPrescriptionReminderSent ?? prev.lastPrescriptionReminderSent,
+						lastPrescriptionReminderChannel:
+							data.lastPrescriptionReminderChannel ?? prev.lastPrescriptionReminderChannel,
+						lastPrescriptionReminderMedNames:
+							data.lastPrescriptionReminderMedNames ?? prev.lastPrescriptionReminderMedNames,
 					}));
 					setSavedSettings((prev) => ({
 						...prev,
@@ -163,6 +178,11 @@ export function useSettings(): UseSettingsReturn {
 						lastStockReminderSent: data.lastStockReminderSent ?? prev.lastStockReminderSent,
 						lastStockReminderChannel: data.lastStockReminderChannel ?? prev.lastStockReminderChannel,
 						lastStockReminderMedNames: data.lastStockReminderMedNames ?? prev.lastStockReminderMedNames,
+						lastPrescriptionReminderSent: data.lastPrescriptionReminderSent ?? prev.lastPrescriptionReminderSent,
+						lastPrescriptionReminderChannel:
+							data.lastPrescriptionReminderChannel ?? prev.lastPrescriptionReminderChannel,
+						lastPrescriptionReminderMedNames:
+							data.lastPrescriptionReminderMedNames ?? prev.lastPrescriptionReminderMedNames,
 					}));
 				})
 				.catch(() => {});
@@ -172,54 +192,45 @@ export function useSettings(): UseSettingsReturn {
 		return () => clearInterval(interval);
 	}, []);
 
-	const saveSettings = useCallback(
-		async (e: React.FormEvent) => {
-			e.preventDefault();
-
+	// Internal save function (no event needed)
+	const performSave = useCallback(
+		async (settingsToSave: Settings) => {
 			// Auto-disable email if no recipient is set
-			const effectiveEmailEnabled = settings.emailEnabled && !!settings.notificationEmail?.trim();
+			const effectiveEmailEnabled = settingsToSave.emailEnabled && !!settingsToSave.notificationEmail?.trim();
 			// Auto-disable push if no URL is set
-			const effectiveShoutrrrEnabled = settings.shoutrrrEnabled && !!settings.shoutrrrUrl?.trim();
-
-			// Validate email if email notifications are enabled
-			if (effectiveEmailEnabled && settings.notificationEmail) {
-				const emailRegex = /^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}$/i;
-				if (!emailRegex.test(settings.notificationEmail)) {
-					setTestEmailResult({ success: false, message: "Invalid email address" });
-					return;
-				}
-			}
+			const effectiveShoutrrrEnabled = settingsToSave.shoutrrrEnabled && !!settingsToSave.shoutrrrUrl?.trim();
 
 			setSettingsSaving(true);
-			setTestEmailResult(null);
 
 			const payload = {
 				emailEnabled: effectiveEmailEnabled,
-				notificationEmail: settings.notificationEmail,
-				reminderDaysBefore: settings.reminderDaysBefore,
-				repeatDailyReminders: settings.repeatDailyReminders,
-				skipRemindersForTakenDoses: settings.skipRemindersForTakenDoses,
-				repeatRemindersEnabled: settings.repeatRemindersEnabled,
-				reminderRepeatIntervalMinutes: settings.reminderRepeatIntervalMinutes,
-				maxNaggingReminders: settings.maxNaggingReminders ?? 5,
-				lowStockDays: settings.lowStockDays,
-				normalStockDays: settings.normalStockDays,
-				highStockDays: settings.highStockDays,
+				notificationEmail: settingsToSave.notificationEmail,
+				reminderDaysBefore: settingsToSave.reminderDaysBefore,
+				repeatDailyReminders: settingsToSave.repeatDailyReminders,
+				skipRemindersForTakenDoses: settingsToSave.skipRemindersForTakenDoses,
+				repeatRemindersEnabled: settingsToSave.repeatRemindersEnabled,
+				reminderRepeatIntervalMinutes: settingsToSave.reminderRepeatIntervalMinutes,
+				maxNaggingReminders: settingsToSave.maxNaggingReminders ?? 5,
+				lowStockDays: settingsToSave.lowStockDays,
+				normalStockDays: settingsToSave.normalStockDays,
+				highStockDays: settingsToSave.highStockDays,
 				shoutrrrEnabled: effectiveShoutrrrEnabled,
-				shoutrrrUrl: settings.shoutrrrUrl,
-				emailStockReminders: settings.emailStockReminders,
-				emailIntakeReminders: settings.emailIntakeReminders,
-				shoutrrrStockReminders: settings.shoutrrrStockReminders,
-				shoutrrrIntakeReminders: settings.shoutrrrIntakeReminders,
-				stockCalculationMode: settings.stockCalculationMode,
-				shareStockStatus: settings.shareStockStatus,
+				shoutrrrUrl: settingsToSave.shoutrrrUrl,
+				emailStockReminders: settingsToSave.emailStockReminders,
+				emailIntakeReminders: settingsToSave.emailIntakeReminders,
+				emailPrescriptionReminders: settingsToSave.emailPrescriptionReminders,
+				shoutrrrStockReminders: settingsToSave.shoutrrrStockReminders,
+				shoutrrrIntakeReminders: settingsToSave.shoutrrrIntakeReminders,
+				shoutrrrPrescriptionReminders: settingsToSave.shoutrrrPrescriptionReminders,
+				stockCalculationMode: settingsToSave.stockCalculationMode,
+				shareStockStatus: settingsToSave.shareStockStatus,
 				language: i18n.language,
-				smtpHost: settings.smtpHost,
-				smtpPort: settings.smtpPort,
-				smtpUser: settings.smtpUser,
-				smtpPass: settings.smtpPass || undefined,
-				smtpFrom: settings.smtpFrom,
-				smtpSecure: settings.smtpSecure,
+				smtpHost: settingsToSave.smtpHost,
+				smtpPort: settingsToSave.smtpPort,
+				smtpUser: settingsToSave.smtpUser,
+				smtpPass: settingsToSave.smtpPass || undefined,
+				smtpFrom: settingsToSave.smtpFrom,
+				smtpSecure: settingsToSave.smtpSecure,
 			};
 
 			await fetch("/api/settings", {
@@ -230,7 +241,7 @@ export function useSettings(): UseSettingsReturn {
 			}).catch(() => null);
 
 			const updatedSettings = {
-				...settings,
+				...settingsToSave,
 				emailEnabled: effectiveEmailEnabled,
 				shoutrrrEnabled: effectiveShoutrrrEnabled,
 			};
@@ -239,7 +250,62 @@ export function useSettings(): UseSettingsReturn {
 			setSavedSettings(updatedSettings);
 			setSettingsSaved(true);
 		},
-		[settings, i18n.language]
+		[i18n.language]
+	);
+
+	// Debounced auto-save: fires whenever settings change
+	const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+	const initialLoadDone = useRef(false);
+
+	useEffect(() => {
+		// Skip auto-save during initial load
+		if (!initialLoadDone.current) {
+			return;
+		}
+
+		// Don't save if nothing changed
+		if (JSON.stringify(settings) === JSON.stringify(savedSettings)) {
+			return;
+		}
+
+		// Don't save if thresholds are invalid
+		if (settings.reminderDaysBefore >= settings.lowStockDays || settings.lowStockDays >= settings.highStockDays) {
+			return;
+		}
+
+		if (debounceRef.current) {
+			clearTimeout(debounceRef.current);
+		}
+
+		debounceRef.current = setTimeout(() => {
+			performSave(settings);
+		}, 600);
+
+		return () => {
+			if (debounceRef.current) {
+				clearTimeout(debounceRef.current);
+			}
+		};
+	}, [settings, savedSettings, performSave]);
+
+	// Mark initial load as done after first settings load completes
+	useEffect(() => {
+		if (!settingsLoading && !initialLoadDone.current) {
+			// Use a small delay to ensure savedSettings is set
+			const t = setTimeout(() => {
+				initialLoadDone.current = true;
+			}, 100);
+			return () => clearTimeout(t);
+		}
+	}, [settingsLoading]);
+
+	// Legacy saveSettings wrapper (kept for compatibility)
+	const saveSettings = useCallback(
+		async (e?: React.FormEvent) => {
+			if (e) e.preventDefault();
+			await performSave(settings);
+		},
+		[settings, performSave]
 	);
 
 	const testEmail = useCallback(async () => {

frontend/src/i18n/de.json

@@ -88,6 +88,15 @@
       "criticalMeds_other": "{{count}} Medikamente kritisch",
       "lowMeds": "{{count}} Medikament knapp",
       "lowMeds_other": "{{count}} Medikamente knapp",
+      "prescriptionNeeds": "Rezept knapp",
+      "prescriptionLowMeds": "{{count}} Rezept knapp",
+      "prescriptionLowMeds_other": "{{count}} Rezepte knapp",
+      "prescriptionCriticalMeds": "{{count}} Rezept aufgebraucht",
+      "prescriptionCriticalMeds_other": "{{count}} Rezepte aufgebraucht",
+      "needsPrescriptionRefill": "Rezept nachfüllen nötig",
+      "usedBy": "Verwendet von",
+      "refillsLeft": "{{count}} Nachfüllung übrig",
+      "refillsLeft_other": "{{count}} Nachfüllungen übrig",
       "daysLeft": "{{days}} Tag übrig",
       "daysLeft_other": "{{days}} Tage übrig",
       "needsRefill": "Nachfüllen nötig"
@@ -127,12 +136,21 @@
       "stock": "Bestand",
       "totalCapacity": "Kapazität",
       "type": "Typ"
+    },
+    "deleteModal": {
+      "title": "Medikament löschen",
+      "message": "Möchtest du \"{{name}}\" wirklich löschen?"
     }
   },
   "form": {
     "editEntry": "Medikament bearbeiten",
     "newEntry": "Neues Medikament",
     "badge": "Packungen + lose Tabletten",
+    "sections": {
+      "general": "Allgemein",
+      "stock": "Bestand & Dosis",
+      "prescription": "Rezept"
+    },
     "commercialName": "Handelsname",
     "genericName": "Wirkstoff",
     "takenBy": "Eingenommen von",
@@ -189,6 +207,7 @@
       "medication": "Medikament",
       "usage": "Verbrauch",
       "blistersNeeded": "Blister benötigt",
+      "prescriptionRefills": "Rezept-Nachfüllungen",
       "blisters": "Blister",
       "available": "Verfügbar"
     }
@@ -206,6 +225,7 @@
       "push": "Push",
       "stockReminders": "Bestands-Erinnerungen",
       "intakeReminders": "Einnahme-Erinnerungen",
+      "prescriptionReminders": "Rezept-Erinnerungen",
       "enableHint": "Aktivieren Sie mindestens einen Kanal, um Benachrichtigungen zu erhalten.",
       "skipTakenDoses": "Keine Erinnerungen für genommene Dosen",
       "skipTakenDosesTooltip": "Sende keine Einnahme-Erinnerungen für Dosen, die heute bereits als genommen markiert wurden",
@@ -228,7 +248,7 @@
     },
     "schedule": {
       "title": "Erinnerungsplan",
-      "stockCheck": "Bestandsprüfung",
+      "stockCheck": "Bestands- & Rezeptprüfung",
       "dailyAt6": "Täglich um 6:00 Uhr",
       "intakeCheck": "Einnahmeprüfung",
       "15minBefore": "15 Min. vor geplanter Zeit",
@@ -236,6 +256,7 @@
       "lastSent": "Letzte Benachrichtigung",
       "lastStockSent": "Letzte Bestands-Erinnerung",
       "lastIntakeSent": "Letzte Einnahme-Erinnerung",
+      "lastPrescriptionSent": "Letzte Rezept-Erinnerung",
       "envHint": "Diese Werte können über REMINDER_HOUR und REMINDER_MINUTES_BEFORE in .env konfiguriert werden"
     },
     "stock": {
@@ -258,7 +279,8 @@
     },
     "stockReminder": {
       "title": "Bestands-Erinnerung",
-      "description": "Benachrichtigung wenn Medikamentenbestand erreicht",
+      "description": "Bestands-Erinnerungen aktivieren",
+      "infoTooltip": "Benachrichtigungen umfassen alle Medikamente mit Niedrig- oder Kritisch-Status. Niedrig: Bestand wird knapp. Kritisch: Bestand ist kritisch niedrig — bald nachbestellen.",
       "repeatDaily": "Täglich wiederholen",
       "repeatTooltip": "Wenn aktiviert, wird täglich eine Erinnerung gesendet solange der Bestand kritisch ist. Andernfalls nur einmal pro Medikament bis zum Auffüllen."
     },
@@ -364,6 +386,7 @@
     "sending": "Wird gesendet...",
     "sent": "Gesendet!",
     "sendFailed": "Senden fehlgeschlagen",
+    "saveFailed": "Speichern fehlgeschlagen",
     "networkError": "Netzwerkfehler",
     "saving": "Wird gespeichert...",
     "unsavedChanges": {
@@ -379,6 +402,7 @@
     },
     "saved": "Gespeichert ✓",
     "save": "Speichern",
+    "back": "Zurück",
     "cancel": "Abbrechen",
     "close": "Schließen",
     "edit": "Bearbeiten",
@@ -468,6 +492,7 @@
     "downloadFilename": "medassist-export"
   },
   "refill": {
+    "saveFirst": "Speichere das Medikament zuerst, um Nachfüllen zu aktivieren",
     "title": "Nachfüllen",
     "packs": "Packungen hinzufügen",
     "pillsToAdd": "Tabletten hinzufügen",
@@ -482,7 +507,16 @@
     "packsAdded_other": "{{count}} Packungen",
     "pillsAdded": "{{count}} Tablette",
     "pillsAdded_other": "{{count}} Tabletten",
-    "button": "Nachfüllen"
+    "button": "Nachfüllen",
+    "viaPrescription": "Rezept"
+  },
+  "prescription": {
+    "enabled": "Rezept verfolgen",
+    "authorizedRefills": "Genehmigte Nachfüllungen",
+    "remainingRefills": "Verbleibende Nachfüllungen",
+    "lowThreshold": "Schwelle für Rezept-Erinnerung",
+    "expiryDate": "Rezeptablauf",
+    "useForRefill": "Rezept-Nachfüllung verwenden"
   },
   "editStock": {
     "title": "Bestand korrigieren",

frontend/src/i18n/en.json

@@ -88,6 +88,15 @@
       "criticalMeds_other": "{{count}} medications critical",
       "lowMeds": "{{count}} medication low",
       "lowMeds_other": "{{count}} medications low",
+      "prescriptionNeeds": "Prescription low",
+      "prescriptionLowMeds": "{{count}} prescription low",
+      "prescriptionLowMeds_other": "{{count}} prescriptions low",
+      "prescriptionCriticalMeds": "{{count}} prescription empty",
+      "prescriptionCriticalMeds_other": "{{count}} prescriptions empty",
+      "needsPrescriptionRefill": "Needs prescription refill",
+      "usedBy": "Used by",
+      "refillsLeft": "{{count}} refill left",
+      "refillsLeft_other": "{{count}} refills left",
       "daysLeft": "{{days}} day left",
       "daysLeft_other": "{{days}} days left",
       "needsRefill": "Needs refill"
@@ -127,12 +136,21 @@
       "stock": "Stock",
       "totalCapacity": "Capacity",
       "type": "Type"
+    },
+    "deleteModal": {
+      "title": "Delete medication",
+      "message": "Do you really want to delete \"{{name}}\"?"
     }
   },
   "form": {
     "editEntry": "Edit medication",
     "newEntry": "New medication",
     "badge": "Packs + loose pills",
+    "sections": {
+      "general": "General",
+      "stock": "Stock & Dose",
+      "prescription": "Prescription"
+    },
     "commercialName": "Commercial Name",
     "genericName": "Generic Name",
     "takenBy": "Taken by",
@@ -189,6 +207,7 @@
       "medication": "Medication",
       "usage": "Usage",
       "blistersNeeded": "Blisters needed",
+      "prescriptionRefills": "Prescription refills",
       "blisters": "Blisters",
       "available": "Available"
     }
@@ -206,6 +225,7 @@
       "push": "Push",
       "stockReminders": "Stock Reminders",
       "intakeReminders": "Intake Reminders",
+      "prescriptionReminders": "Prescription Reminders",
       "enableHint": "Enable at least one channel below to receive notifications.",
       "skipTakenDoses": "Skip reminders for taken doses",
       "skipTakenDosesTooltip": "Don't send intake reminders for doses that have already been marked as taken today",
@@ -228,7 +248,7 @@
     },
     "schedule": {
       "title": "Reminder Schedule",
-      "stockCheck": "Stock check",
+      "stockCheck": "Stock & prescription check",
       "dailyAt6": "Daily at 6:00 AM",
       "intakeCheck": "Intake check",
       "15minBefore": "15 min before scheduled time",
@@ -236,6 +256,7 @@
       "lastSent": "Last notification sent",
       "lastStockSent": "Last stock reminder",
       "lastIntakeSent": "Last intake reminder",
+      "lastPrescriptionSent": "Last prescription reminder",
       "envHint": "These values can be configured via REMINDER_HOUR and REMINDER_MINUTES_BEFORE in .env"
     },
     "stock": {
@@ -258,7 +279,8 @@
     },
     "stockReminder": {
       "title": "Stock Reminder",
-      "description": "Sends notification when medication stock reaches",
+      "description": "Enable stock reminders",
+      "infoTooltip": "Notifications include all medications with Low or Critical stock status. Low: stock is running low. Critical: stock is critically low — reorder soon.",
       "repeatDaily": "Repeat daily",
       "repeatTooltip": "When enabled, sends reminders every day while stock is critical. Otherwise, only notifies once per medication until restocked."
     },
@@ -364,6 +386,7 @@
     "sending": "Sending...",
     "sent": "Sent!",
     "sendFailed": "Failed to send",
+    "saveFailed": "Failed to save",
     "networkError": "Network error",
     "saving": "Saving...",
     "unsavedChanges": {
@@ -379,6 +402,7 @@
     },
     "saved": "Saved ✓",
     "save": "Save",
+    "back": "Back",
     "cancel": "Cancel",
     "close": "Close",
     "edit": "Edit",
@@ -468,6 +492,7 @@
     "downloadFilename": "medassist-export"
   },
   "refill": {
+    "saveFirst": "Save medication first to enable refill",
     "title": "Refill",
     "packs": "Packs to add",
     "pillsToAdd": "Pills to add",
@@ -482,7 +507,16 @@
     "packsAdded_other": "{{count}} packs",
     "pillsAdded": "{{count}} pill",
     "pillsAdded_other": "{{count}} pills",
-    "button": "Refill"
+    "button": "Refill",
+    "viaPrescription": "Prescription"
+  },
+  "prescription": {
+    "enabled": "Track prescription",
+    "authorizedRefills": "Authorized refills",
+    "remainingRefills": "Remaining refills",
+    "lowThreshold": "Low-refill reminder threshold",
+    "expiryDate": "Prescription expiry",
+    "useForRefill": "Use prescription refill"
   },
   "editStock": {
     "title": "Correct Stock",

frontend/src/pages/DashboardPage.tsx

@@ -79,7 +79,7 @@ function NotificationBellIcon() {
 export function getReminderStatusData(
 	reminderDaysBefore: number,
 	lowStockDays: number,
-	lowCoverage: Coverage[],
+	_allLowCoverage: Coverage[],
 	allCoverage: Coverage[],
 	lastAutoEmailSent: string | null,
 	lastNotificationType: string | null,
@@ -97,12 +97,30 @@ export function getReminderStatusData(
 	lastStockSent: { date: string; medNames: string | null } | null;
 	lastIntakeSent: { date: string; medName: string | null; takenBy: string | null } | null;
 } {
-	const criticalCount = lowCoverage.length;
-	const lowCount = allCoverage.filter((c) => {
-		if (c.medsLeft <= 0) return false;
-		if (c.daysLeft === null) return false;
-		return c.daysLeft < lowStockDays && c.daysLeft > reminderDaysBefore;
-	}).length;
+	const lowStockMap = new Map<string, { name: string; daysLeft: number; isCritical: boolean }>();
+
+	for (const c of allCoverage) {
+		if (c.medsLeft <= 0) {
+			lowStockMap.set(c.name, { name: c.name, daysLeft: 0, isCritical: true });
+			continue;
+		}
+
+		if (c.daysLeft === null) continue;
+
+		const roundedDaysLeft = Math.round(c.daysLeft);
+		const isCritical = c.daysLeft <= reminderDaysBefore;
+		const isLow = c.daysLeft < lowStockDays;
+		if (!isCritical && !isLow) continue;
+
+		const existing = lowStockMap.get(c.name);
+		if (!existing || roundedDaysLeft < existing.daysLeft || (isCritical && !existing.isCritical)) {
+			lowStockMap.set(c.name, { name: c.name, daysLeft: roundedDaysLeft, isCritical });
+		}
+	}
+
+	const lowStockMeds = Array.from(lowStockMap.values()).sort((a, b) => a.daysLeft - b.daysLeft);
+	const criticalCount = lowStockMeds.filter((m) => m.isCritical).length;
+	const lowCount = lowStockMeds.filter((m) => !m.isCritical).length;
 
 	// Determine status
 	let status: { text: string; className: string };
@@ -123,34 +141,6 @@ export function getReminderStatusData(
 		};
 	}
 
-	// Collect all low stock medications (critical + low), deduplicated by name
-	const lowStockMap = new Map<string, { name: string; daysLeft: number; isCritical: boolean }>();
-
-	// Add critical meds (from lowCoverage - these are ≤3 days)
-	for (const c of lowCoverage) {
-		if (c.daysLeft !== null) {
-			const existing = lowStockMap.get(c.name);
-			if (!existing || c.daysLeft < existing.daysLeft) {
-				lowStockMap.set(c.name, { name: c.name, daysLeft: Math.round(c.daysLeft), isCritical: true });
-			}
-		}
-	}
-
-	// Add low but not critical meds
-	for (const c of allCoverage) {
-		if (c.medsLeft <= 0) continue;
-		if (c.daysLeft === null) continue;
-		if (c.daysLeft < lowStockDays && c.daysLeft > reminderDaysBefore) {
-			const existing = lowStockMap.get(c.name);
-			if (!existing || c.daysLeft < existing.daysLeft) {
-				lowStockMap.set(c.name, { name: c.name, daysLeft: Math.round(c.daysLeft), isCritical: false });
-			}
-		}
-	}
-
-	// Convert to array and sort by days left (most urgent first)
-	const lowStockMeds = Array.from(lowStockMap.values()).sort((a, b) => a.daysLeft - b.daysLeft);
-
 	// Parse last stock reminder sent info (from dedicated stock tracking columns)
 	let lastStockSent: { date: string; medNames: string | null } | null = null;
 	if (lastStockReminderSent) {
@@ -252,45 +242,117 @@ export function DashboardPage() {
 	const intakeRemindersEnabled =
 		(settings.emailEnabled && settings.emailIntakeReminders) ||
 		(settings.shoutrrrEnabled && settings.shoutrrrIntakeReminders);
-	const anyRemindersEnabled = stockRemindersEnabled || intakeRemindersEnabled;
+	const prescriptionRemindersEnabled =
+		(settings.emailEnabled && settings.emailPrescriptionReminders) ||
+		(settings.shoutrrrEnabled && settings.shoutrrrPrescriptionReminders);
+
+	const prescriptionLowMeds = meds
+		.filter((med) => {
+			if (!med.prescriptionEnabled) return false;
+			const remaining = med.prescriptionRemainingRefills ?? 0;
+			const threshold = med.prescriptionLowRefillThreshold ?? 1;
+			return remaining <= threshold;
+		})
+		.map((med) => ({
+			id: med.id,
+			name: med.name,
+			remainingRefills: med.prescriptionRemainingRefills ?? 0,
+			threshold: med.prescriptionLowRefillThreshold ?? 1,
+		}))
+		.sort((a, b) => a.remainingRefills - b.remainingRefills);
+
+	const anyRemindersEnabled = stockRemindersEnabled || intakeRemindersEnabled || prescriptionRemindersEnabled;
+
+	const prescriptionEmptyCount = prescriptionLowMeds.filter((med) => med.remainingRefills <= 0).length;
+	const prescriptionStatus =
+		prescriptionRemindersEnabled && prescriptionLowMeds.length > 0
+			? {
+					text:
+						prescriptionEmptyCount > 0
+							? t("dashboard.reminders.prescriptionCriticalMeds", { count: prescriptionEmptyCount })
+							: t("dashboard.reminders.prescriptionLowMeds", { count: prescriptionLowMeds.length }),
+					className: prescriptionEmptyCount > 0 ? "danger" : "warning",
+				}
+			: null;
 
 	// Manual reminder send state
 	const [sendingReminder, setSendingReminder] = useState(false);
 	const [reminderResult, setReminderResult] = useState<{ success: boolean; message: string } | null>(null);
 
 	async function sendManualReminder() {
-		if (!stockRemindersEnabled || reminderData.lowStockMeds.length === 0) return;
+		const sendableStock = stockRemindersEnabled && reminderData.lowStockMeds.length > 0;
+		const sendablePrescription = prescriptionRemindersEnabled && prescriptionLowMeds.length > 0;
+		if (!sendableStock && !sendablePrescription) return;
+
 		setSendingReminder(true);
 		setReminderResult(null);
 
 		try {
-			const lowStock = reminderData.lowStockMeds.map((m) => {
-				const cov = coverage.all.find((c) => c.name === m.name);
-				return {
-					name: m.name,
-					medsLeft: cov?.medsLeft ?? 0,
-					daysLeft: m.daysLeft,
-					depletionDate: cov?.depletionDate ?? null,
-					isCritical: m.isCritical,
-				};
-			});
+			const messages: string[] = [];
+			const errors: string[] = [];
 
-			const res = await fetch("/api/reminder/send-email", {
-				method: "POST",
-				headers: { "Content-Type": "application/json" },
-				credentials: "include",
-				body: JSON.stringify({
-					email: settings.notificationEmail,
-					lowStock,
-				}),
-			});
-			const data = await res.json();
-			if (res.ok) {
-				setReminderResult({ success: true, message: data.message || t("common.sent") });
-				// Refresh settings so "Last stock reminder" row appears immediately
+			if (sendableStock) {
+				const lowStock = reminderData.lowStockMeds.map((m) => {
+					const cov = coverage.all.find((c) => c.name === m.name);
+					return {
+						name: m.name,
+						medsLeft: cov?.medsLeft ?? 0,
+						daysLeft: m.daysLeft,
+						depletionDate: cov?.depletionDate ?? null,
+						isCritical: m.isCritical,
+					};
+				});
+
+				const stockRes = await fetch("/api/reminder/send-email", {
+					method: "POST",
+					headers: { "Content-Type": "application/json" },
+					credentials: "include",
+					body: JSON.stringify({
+						email: settings.notificationEmail,
+						lowStock,
+					}),
+				});
+				const stockData = await stockRes.json();
+				if (stockRes.ok) {
+					messages.push(stockData.message || t("common.sent"));
+				} else {
+					errors.push(stockData.error || t("common.sendFailed"));
+				}
+			}
+
+			if (sendablePrescription) {
+				const prescriptionLow = prescriptionLowMeds.map((med) => {
+					const fullMed = meds.find((m) => m.id === med.id);
+					return {
+						name: med.name,
+						remainingRefills: med.remainingRefills,
+						threshold: med.threshold,
+						expiryDate: fullMed?.prescriptionExpiryDate ?? null,
+					};
+				});
+
+				const prescriptionRes = await fetch("/api/reminder/send-prescription", {
+					method: "POST",
+					headers: { "Content-Type": "application/json" },
+					credentials: "include",
+					body: JSON.stringify({
+						email: settings.notificationEmail,
+						prescriptionLow,
+					}),
+				});
+				const prescriptionData = await prescriptionRes.json();
+				if (prescriptionRes.ok) {
+					messages.push(prescriptionData.message || t("common.sent"));
+				} else {
+					errors.push(prescriptionData.error || t("common.sendFailed"));
+				}
+			}
+
+			if (messages.length > 0) {
+				setReminderResult({ success: true, message: messages.join(" • ") });
 				loadSettings();
 			} else {
-				setReminderResult({ success: false, message: data.error || t("common.sendFailed") });
+				setReminderResult({ success: false, message: errors.join(" • ") || t("common.sendFailed") });
 			}
 		} catch {
 			setReminderResult({ success: false, message: t("common.networkError") });
@@ -307,9 +369,15 @@ export function DashboardPage() {
 							<NotificationBellIcon />
 						</span>
 						<span className="reminder-status-title">{t("dashboard.reminders.active")}</span>
-						<span className={`status-chip small ${reminderData.status.className}`}>{reminderData.status.text}</span>
+						{stockRemindersEnabled && (
+							<span className={`status-chip small ${reminderData.status.className}`}>{reminderData.status.text}</span>
+						)}
+						{prescriptionStatus && (
+							<span className={`status-chip small ${prescriptionStatus.className}`}>{prescriptionStatus.text}</span>
+						)}
 					</div>
 					{(reminderData.lowStockMeds.length > 0 ||
+						(prescriptionRemindersEnabled && prescriptionLowMeds.length > 0) ||
 						(stockRemindersEnabled && reminderData.lastStockSent) ||
 						(intakeRemindersEnabled && reminderData.lastIntakeSent)) && (
 						<div className="reminder-status-details">
@@ -346,27 +414,54 @@ export function DashboardPage() {
 									</span>
 								</div>
 							)}
+							{prescriptionRemindersEnabled && prescriptionLowMeds.length > 0 && (
+								<div className="reminder-status-row">
+									<span className="reminder-status-label">{t("dashboard.reminders.needsPrescriptionRefill")}:</span>
+									<span className="reminder-status-value">
+										{prescriptionLowMeds.map((med, idx) => {
+											const medication = meds.find((m) => m.id === med.id);
+											const textClass = med.remainingRefills <= 0 ? "danger-text" : "warning-text";
+											return (
+												<span key={med.id}>
+													{idx > 0 && ", "}
+													<span className={`reminder-days-left ${textClass}`}>
+														{t("prescription.remainingRefills")}: {med.remainingRefills} ·{" "}
+														{t("dashboard.reminders.usedBy")}:{" "}
+														<span
+															className={`med-link clickable ${textClass}`}
+															onClick={() => medication && openMedDetail(medication)}
+														>
+															{med.name}
+														</span>
+													</span>
+												</span>
+											);
+										})}
+									</span>
+								</div>
+							)}
 							{stockRemindersEnabled && reminderData.lastStockSent && (
 								<div className="reminder-status-row">
 									<span className="reminder-status-label">{t("dashboard.reminders.lastStockSent")}:</span>
 									<span className="reminder-status-value">
 										{reminderData.lastStockSent.medNames &&
 											(() => {
-												// Extract first med name (medNames may be "Name (+N)")
-												const rawName = reminderData.lastStockSent!.medNames!;
-												const firstName = rawName.replace(/\s*\(\+\d+\)$/, "");
-												const suffix = rawName.includes("(+") ? rawName.slice(firstName.length) : "";
-												const medication = meds.find((m) => m.name === firstName);
-												return medication ? (
-													<>
-														<span className="med-link clickable" onClick={() => openMedDetail(medication)}>
-															{firstName}
+												const names = reminderData.lastStockSent!.medNames!.split(", ");
+												return names.map((name, idx) => {
+													const medication = meds.find((m) => m.name === name);
+													return (
+														<span key={name}>
+															{idx > 0 && ", "}
+															{medication ? (
+																<span className="med-link clickable" onClick={() => openMedDetail(medication)}>
+																	{name}
+																</span>
+															) : (
+																<span className="reminder-med-name">{name}</span>
+															)}
 														</span>
-														{suffix && <span className="reminder-med-name">{suffix}</span>}
-													</>
-												) : (
-													<span className="reminder-med-name">{rawName}</span>
-												);
+													);
+												});
 											})()}
 										<span className="reminder-date"> {reminderData.lastStockSent.date}</span>
 									</span>
@@ -396,7 +491,8 @@ export function DashboardPage() {
 							)}
 						</div>
 					)}
-					{stockRemindersEnabled && reminderData.lowStockMeds.length > 0 && (
+					{((stockRemindersEnabled && reminderData.lowStockMeds.length > 0) ||
+						(prescriptionRemindersEnabled && prescriptionLowMeds.length > 0)) && (
 						<div className="reminder-send-row">
 							<button type="button" className="ghost" onClick={sendManualReminder} disabled={sendingReminder}>
 								{sendingReminder ? t("common.sending") : t("dashboard.reorder.sendReminder")}
@@ -527,20 +623,26 @@ export function DashboardPage() {
 													</span>
 												))}
 										</span>
-										{(med?.intakeRemindersEnabled || med?.notes) && (
-											<span className="med-icons">
-												{med?.intakeRemindersEnabled && (
-													<span className="reminder-icon info-tooltip" data-tooltip={t("tooltips.intakeReminders")}>
-														🔔
+										{(() => {
+											const hasIntakeReminders =
+												med?.intakes?.some((i) => i.intakeRemindersEnabled) ?? med?.intakeRemindersEnabled;
+											return (
+												(hasIntakeReminders || med?.notes) && (
+													<span className="med-icons">
+														{hasIntakeReminders && (
+															<span className="reminder-icon info-tooltip" data-tooltip={t("tooltips.intakeReminders")}>
+																🔔
+															</span>
+														)}
+														{med?.notes && (
+															<span className="notes-icon info-tooltip" data-tooltip={t("tooltips.hasNotes")}>
+																📝
+															</span>
+														)}
 													</span>
-												)}
-												{med?.notes && (
-													<span className="notes-icon info-tooltip" data-tooltip={t("tooltips.hasNotes")}>
-														📝
-													</span>
-												)}
-											</span>
-										)}
+												)
+											);
+										})()}
 									</span>
 									<span data-label={t("table.stock")} className={textClass}>
 										{med?.packageType === "bottle"
@@ -698,14 +800,6 @@ export function DashboardPage() {
 																	<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
 																</div>
 																<span className="med-name-text">{item.medName}</span>
-																{med?.intakeRemindersEnabled && (
-																	<span
-																		className="reminder-icon info-tooltip"
-																		data-tooltip={t("tooltips.intakeReminders")}
-																	>
-																		🔔
-																	</span>
-																)}
 															</div>
 															<div className="tag-row">
 																<span className="tag subtle">{t("common.pillsTotal", { count: item.total })}</span>
@@ -726,6 +820,14 @@ export function DashboardPage() {
 																			{med?.pillWeightMg &&
 																				` (${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"})`}
 																		</span>
+																		{dose.intakeRemindersEnabled && (
+																			<span
+																				className="reminder-icon info-tooltip"
+																				data-tooltip={t("tooltips.intakeReminders")}
+																			>
+																				🔔
+																			</span>
+																		)}
 																		<div className="dose-checks">
 																			{people.map((person) => {
 																				const doseId = getDoseId(dose.id, person);
@@ -905,14 +1007,6 @@ export function DashboardPage() {
 																	<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
 																</div>
 																<span className="med-name-text">{item.medName}</span>
-																{med?.intakeRemindersEnabled && (
-																	<span
-																		className="reminder-icon info-tooltip"
-																		data-tooltip={t("tooltips.intakeReminders")}
-																	>
-																		🔔
-																	</span>
-																)}
 															</div>
 															<div className="tag-row">
 																<span className="tag subtle">{t("common.pillsTotal", { count: item.total })}</span>
@@ -937,6 +1031,14 @@ export function DashboardPage() {
 																			{med?.pillWeightMg &&
 																				` (${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"})`}
 																		</span>
+																		{dose.intakeRemindersEnabled && (
+																			<span
+																				className="reminder-icon info-tooltip"
+																				data-tooltip={t("tooltips.intakeReminders")}
+																			>
+																				🔔
+																			</span>
+																		)}
 																		<div className="dose-checks">
 																			{people.map((person) => {
 																				const doseId = getDoseId(dose.id, person);
@@ -1092,14 +1194,6 @@ export function DashboardPage() {
 																	<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
 																</div>
 																<span className="med-name-text">{item.medName}</span>
-																{med?.intakeRemindersEnabled && (
-																	<span
-																		className="reminder-icon info-tooltip"
-																		data-tooltip={t("tooltips.intakeReminders")}
-																	>
-																		🔔
-																	</span>
-																)}
 															</div>
 															<div className="tag-row">
 																<span className="tag subtle">{t("common.pillsTotal", { count: item.total })}</span>
@@ -1120,6 +1214,14 @@ export function DashboardPage() {
 																			{med?.pillWeightMg &&
 																				` (${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"})`}
 																		</span>
+																		{dose.intakeRemindersEnabled && (
+																			<span
+																				className="reminder-icon info-tooltip"
+																				data-tooltip={t("tooltips.intakeReminders")}
+																			>
+																				🔔
+																			</span>
+																		)}
 																		<div className="dose-checks">
 																			{people.map((person) => {
 																				const doseId = getDoseId(dose.id, person);

frontend/src/pages/PlannerPage.tsx

@@ -196,16 +196,19 @@ export function PlannerPage() {
 				</form>
 				{plannerRows.length > 0 && (
 					<>
-						<div className="table">
+						<div className="table table-6">
 							<div className="table-head">
 								<span>{t("planner.table.medication")}</span>
 								<span>{t("planner.table.usage")}</span>
 								<span>{t("planner.table.blistersNeeded")}</span>
+								<span>{t("planner.table.prescriptionRefills")}</span>
 								<span>{t("planner.table.available")}</span>
 								<span>{t("table.status")}</span>
 							</div>
 							{plannerRows.map((row) => {
-								const med = meds.find((m) => m.name === row.medicationName);
+								const med =
+									meds.find((m) => m.id === row.medicationId) || meds.find((m) => m.name === row.medicationName);
+								const remainingRefills = med?.prescriptionEnabled ? (med.prescriptionRemainingRefills ?? 0) : null;
 								return (
 									<div key={row.medicationId} className="table-row clickable" onClick={() => med && openMedDetail(med)}>
 										<span data-label={t("planner.table.medication")} className="cell-with-avatar">
@@ -219,6 +222,7 @@ export function PlannerPage() {
 										<span data-label={t("planner.table.blisters")}>
 											{row.packageType === "bottle" ? "–" : `${row.blistersNeeded} × ${row.blisterSize}`}
 										</span>
+										<span data-label={t("planner.table.prescriptionRefills")}>{remainingRefills ?? "–"}</span>
 										<span data-label={t("planner.table.available")}>
 											{row.packageType === "bottle" ? (
 												`${Math.round(row.loosePills * 10) / 10} ${Math.round(row.loosePills * 10) / 10 === 1 ? t("common.pill") : t("common.pills")}`

frontend/src/pages/SchedulePage.tsx

@@ -176,14 +176,6 @@ export function SchedulePage() {
 														<div className="med-name">
 															<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
 															<span className="med-name-text">{item.medName}</span>
-															{med?.intakeRemindersEnabled && (
-																<span
-																	className="reminder-icon info-tooltip"
-																	data-tooltip={t("tooltips.intakeReminders")}
-																>
-																	🔔
-																</span>
-															)}
 														</div>
 														<div className="tag-row">
 															<span className="tag subtle">{t("common.pillsTotal", { count: item.total })}</span>
@@ -199,7 +191,15 @@ export function SchedulePage() {
 																	<span className="dose-usage">
 																		{dose.usage} {dose.usage !== 1 ? t("common.pills") : t("common.pill")}
 																		{med?.pillWeightMg && ` (${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"})`}
-																	</span>
+																	</span>{" "}
+																	{dose.intakeRemindersEnabled && (
+																		<span
+																			className="reminder-icon info-tooltip"
+																			data-tooltip={t("tooltips.intakeReminders")}
+																		>
+																			🔔
+																		</span>
+																	)}{" "}
 																	<div className="dose-checks">
 																		{people.map((person) => {
 																			const doseId = getDoseId(dose.id, person);
@@ -313,11 +313,6 @@ export function SchedulePage() {
 												<div className="med-name">
 													<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
 													<span className="med-name-text">{item.medName}</span>
-													{med?.intakeRemindersEnabled && (
-														<span className="reminder-icon info-tooltip" data-tooltip={t("tooltips.intakeReminders")}>
-															🔔
-														</span>
-													)}
 												</div>
 												<div className="tag-row">
 													<span className="tag subtle">{t("common.pillsTotal", { count: item.total })}</span>
@@ -337,6 +332,14 @@ export function SchedulePage() {
 																{dose.usage} {dose.usage !== 1 ? t("common.pills") : t("common.pill")}
 																{med?.pillWeightMg && ` (${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"})`}
 															</span>
+															{dose.intakeRemindersEnabled && (
+																<span
+																	className="reminder-icon info-tooltip"
+																	data-tooltip={t("tooltips.intakeReminders")}
+																>
+																	🔔
+																</span>
+															)}
 															<div className="dose-checks">
 																{people.map((person) => {
 																	const doseId = getDoseId(dose.id, person);

frontend/src/pages/SettingsPage.tsx

@@ -9,10 +9,6 @@ export function SettingsPage() {
 		settings,
 		setSettings,
 		settingsLoading,
-		settingsSaving,
-		settingsSaved,
-		saveSettings,
-		settingsChanged,
 		// Email testing
 		testEmail,
 		testingEmail,
@@ -41,7 +37,7 @@ export function SettingsPage() {
 			{settingsLoading ? (
 				<p>{t("settings.loading")}</p>
 			) : (
-				<form className="settings-form" onSubmit={saveSettings}>
+				<div className="settings-form">
 					{/* Language */}
 					<article className="card">
 						<div className="card-head">
@@ -52,7 +48,16 @@ export function SettingsPage() {
 								<span className="setting-label">{t("settings.language.select")}</span>
 								<select
 									value={i18n.language}
-									onChange={(e) => i18n.changeLanguage(e.target.value)}
+									onChange={(e) => {
+										const lang = e.target.value;
+										i18n.changeLanguage(lang);
+										fetch("/api/settings/language", {
+											method: "PUT",
+											headers: { "Content-Type": "application/json" },
+											credentials: "include",
+											body: JSON.stringify({ language: lang }),
+										});
+									}}
 									className="language-select"
 								>
 									<option value="en">🇬🇧 English</option>
@@ -132,6 +137,37 @@ export function SettingsPage() {
 										</label>
 									</div>
 								</div>
+								<div className="matrix-row">
+									<div className="matrix-label">{t("settings.notifications.prescriptionReminders")}</div>
+									<div className="matrix-cell">
+										<label className={`toggle-switch small${!settings.emailEnabled ? " disabled" : ""}`}>
+											<input
+												type="checkbox"
+												checked={
+													settings.smtpHost && settings.emailEnabled ? settings.emailPrescriptionReminders : false
+												}
+												onChange={(e) => setSettings({ ...settings, emailPrescriptionReminders: e.target.checked })}
+												disabled={!settings.emailEnabled}
+											/>
+											<span className="toggle-slider"></span>
+										</label>
+									</div>
+									<div className="matrix-cell">
+										<label className={`toggle-switch small${!settings.shoutrrrEnabled ? " disabled" : ""}`}>
+											<input
+												type="checkbox"
+												checked={
+													settings.shoutrrrUrl && settings.shoutrrrEnabled
+														? settings.shoutrrrPrescriptionReminders
+														: false
+												}
+												onChange={(e) => setSettings({ ...settings, shoutrrrPrescriptionReminders: e.target.checked })}
+												disabled={!settings.shoutrrrEnabled}
+											/>
+											<span className="toggle-slider"></span>
+										</label>
+									</div>
+								</div>
 							</div>
 							{!settings.emailEnabled && !settings.shoutrrrEnabled && (
 								<p className="hint-text">{t("settings.notifications.enableHint")}</p>
@@ -196,10 +232,9 @@ export function SettingsPage() {
 											</span>
 										</label>
 										<input
-											type="number"
-											min="5"
-											max="480"
-											step="5"
+											type="text"
+											inputMode="numeric"
+											pattern="[0-9]*"
 											value={settings.reminderRepeatIntervalMinutes}
 											onChange={(e) =>
 												setSettings({ ...settings, reminderRepeatIntervalMinutes: parseInt(e.target.value, 10) || 30 })
@@ -218,10 +253,9 @@ export function SettingsPage() {
 											</span>
 										</label>
 										<input
-											type="number"
-											min="1"
-											max="20"
-											step="1"
+											type="text"
+											inputMode="numeric"
+											pattern="[0-9]*"
 											value={settings.maxNaggingReminders ?? 5}
 											onChange={(e) => {
 												const val = parseInt(e.target.value, 10);
@@ -243,7 +277,9 @@ export function SettingsPage() {
 							<div className="setting-row compact">
 								<label className="setting-label">
 									{t("settings.stockReminder.description")}{" "}
-									<span className="status-chip small danger">{t("status.criticalStock")}</span>
+									<span className="info-tooltip small" data-tooltip={t("settings.stockReminder.infoTooltip")}>
+										ⓘ
+									</span>{" "}
 								</label>
 								<label
 									className={`toggle-switch small${!settings.emailEnabled && !settings.shoutrrrEnabled ? " disabled" : ""}`}
@@ -276,6 +312,7 @@ export function SettingsPage() {
 									<span className="toggle-slider"></span>
 								</label>
 							</div>
+
 							<div className="setting-row compact" style={{ marginTop: "4px" }}>
 								<label className="setting-label">
 									{t("settings.stockReminder.repeatDaily")}
@@ -320,6 +357,7 @@ export function SettingsPage() {
 													emailEnabled: false,
 													emailStockReminders: false,
 													emailIntakeReminders: false,
+													emailPrescriptionReminders: false,
 													skipRemindersForTakenDoses: false,
 													repeatRemindersEnabled: false,
 												});
@@ -389,6 +427,7 @@ export function SettingsPage() {
 													shoutrrrEnabled: false,
 													shoutrrrStockReminders: false,
 													shoutrrrIntakeReminders: false,
+													shoutrrrPrescriptionReminders: false,
 													skipRemindersForTakenDoses: false,
 													repeatRemindersEnabled: false,
 												});
@@ -497,6 +536,20 @@ export function SettingsPage() {
 									</span>
 								</div>
 							)}
+							{settings.lastPrescriptionReminderSent && (
+								<div className="schedule-row">
+									<span className="schedule-label">{t("settings.schedule.lastPrescriptionSent")}</span>
+									<span className="schedule-value">
+										{new Date(settings.lastPrescriptionReminderSent).toLocaleString(getSystemLocale(i18n.language), {
+											day: "2-digit",
+											month: "2-digit",
+											year: "numeric",
+											hour: "2-digit",
+											minute: "2-digit",
+										})}
+									</span>
+								</div>
+							)}
 						</div>
 					</article>
 
@@ -565,9 +618,9 @@ export function SettingsPage() {
 									</span>
 									<div className="input-with-tooltip">
 										<input
-											type="number"
-											min="1"
-											max="364"
+											type="text"
+											inputMode="numeric"
+											pattern="[0-9]*"
 											value={settings.reminderDaysBefore}
 											onChange={(e) => setSettings({ ...settings, reminderDaysBefore: Number(e.target.value) || 7 })}
 										/>
@@ -592,9 +645,9 @@ export function SettingsPage() {
 									</span>
 									<div className="input-with-tooltip">
 										<input
-											type="number"
-											min="2"
-											max="365"
+											type="text"
+											inputMode="numeric"
+											pattern="[0-9]*"
 											value={settings.lowStockDays}
 											onChange={(e) => setSettings({ ...settings, lowStockDays: Number(e.target.value) || 30 })}
 										/>
@@ -612,9 +665,9 @@ export function SettingsPage() {
 									</span>
 									<div className="input-with-tooltip">
 										<input
-											type="number"
-											min="3"
-											max="730"
+											type="text"
+											inputMode="numeric"
+											pattern="[0-9]*"
 											value={settings.highStockDays}
 											onChange={(e) => setSettings({ ...settings, highStockDays: Number(e.target.value) || 180 })}
 										/>
@@ -747,25 +800,7 @@ export function SettingsPage() {
 							</div>
 						</div>
 					</article>
-
-					<div className="form-footer">
-						<button
-							type="submit"
-							disabled={
-								settingsSaving ||
-								(!settingsChanged && settingsSaved) ||
-								settings.reminderDaysBefore >= settings.lowStockDays ||
-								settings.lowStockDays >= settings.highStockDays
-							}
-						>
-							{settingsSaving
-								? t("common.saving")
-								: settingsSaved && !settingsChanged
-									? t("common.saved")
-									: t("settings.saveSettings")}
-						</button>
-					</div>
-				</form>
+				</div>
 			)}
 
 			{/* Import Confirmation Modal */}

frontend/src/styles.css

@@ -319,7 +319,7 @@ body.modal-open {
 .reminder-status-details {
 	display: flex;
 	flex-direction: column;
-	gap: 0.25rem;
+	gap: 0.5rem;
 	padding-left: 1.75rem;
 }
 
@@ -375,8 +375,9 @@ body.modal-open {
 
 .reminder-send-row {
 	display: flex;
-	align-items: center;
-	gap: 0.75rem;
+	flex-direction: column;
+	align-items: flex-start;
+	gap: 0.35rem;
 	padding-left: 1.75rem;
 	padding-top: 0.25rem;
 }
@@ -435,6 +436,9 @@ body.modal-open {
 	.reminder-low-stock-list {
 		padding-left: 0;
 	}
+	.reminder-send-row {
+		padding-left: 0;
+	}
 }
 
 .tabs {
@@ -602,6 +606,26 @@ body.modal-open {
 	flex-direction: column;
 	gap: 0.75rem;
 }
+
+/* Grid view for medications page */
+.med-grid-wrapper {
+	max-width: 1200px;
+	margin: 0 auto;
+	width: 100%;
+}
+
+.med-grid {
+	display: grid;
+	grid-template-columns: repeat(2, 1fr);
+	gap: 1rem;
+}
+
+@media (max-width: 768px) {
+	.med-grid {
+		grid-template-columns: 1fr;
+	}
+}
+
 .med-row {
 	display: flex;
 	flex-direction: column;
@@ -823,20 +847,10 @@ body.modal-open {
 	}
 }
 
-.blisters h3 {
-	margin: 0;
-}
 .gap {
 	gap: 0.6rem;
 }
 
-/* Blisters header actions */
-.blisters-actions {
-	display: flex;
-	align-items: center;
-	gap: 0.75rem;
-}
-
 /* Inline checkbox for compact layout */
 .inline-checkbox {
 	display: flex !important;
@@ -1069,6 +1083,82 @@ textarea.auto-resize {
 .form-grid .full {
 	grid-column: 1 / -1;
 }
+
+.form-category {
+	grid-column: 1 / -1;
+	display: grid;
+	grid-template-columns: repeat(2, minmax(0, 1fr));
+	gap: 1rem 1.25rem;
+	padding: 0.95rem;
+	border: 1px solid var(--border-primary);
+	border-radius: 12px;
+	background: var(--bg-tertiary);
+}
+
+.form-category-title {
+	grid-column: 1 / -1;
+	margin: 0;
+	color: var(--accent-light);
+	font-size: 0.78rem;
+	font-weight: 600;
+	text-transform: uppercase;
+	letter-spacing: 0.08em;
+}
+
+.form-category .full {
+	grid-column: 1 / -1;
+}
+
+.form-category > label:not(.full) {
+	align-self: end;
+}
+
+.form-category-header {
+	grid-column: 1 / -1;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 0.75rem;
+}
+
+.form-category-header .form-category-title {
+	margin: 0;
+}
+
+/* Intake section */
+.intake-section .blister-row {
+	grid-column: 1 / -1;
+}
+
+/* Image section */
+.image-section {
+	grid-template-columns: 1fr;
+}
+
+.image-section .image-preview {
+	grid-column: 1 / -1;
+}
+
+.image-section input[type="file"] {
+	grid-column: 1 / -1;
+	font-size: 0.9rem;
+}
+
+.image-section input[type="file"]::file-selector-button {
+	background: var(--accent);
+	color: white;
+	border: none;
+	padding: 0.5rem 1rem;
+	border-radius: 6px;
+	cursor: pointer;
+	margin-right: 0.75rem;
+	font-weight: 500;
+}
+
+.image-section input[type="file"]::file-selector-button:hover {
+	background: var(--accent-light);
+}
+
 .form-grid .optional-label {
 	text-transform: none;
 	font-weight: 400;
@@ -1926,6 +2016,7 @@ textarea.auto-resize {
 .status-chip.small {
 	font-size: 0.7rem;
 	padding: 0.2rem 0.5rem;
+	word-spacing: 0.1rem;
 }
 
 @media (max-width: 760px) {
@@ -3354,13 +3445,6 @@ textarea.auto-resize {
 	margin-bottom: 0.75rem;
 }
 
-/* Image upload section */
-.image-upload-section {
-	margin-top: 1rem;
-	padding-top: 1rem;
-	border-top: 1px solid var(--border-primary);
-}
-
 .image-preview {
 	display: flex;
 	align-items: center;
@@ -3376,26 +3460,6 @@ textarea.auto-resize {
 	border: 1px solid var(--border-primary);
 }
 
-.image-upload-section input[type="file"] {
-	margin-top: 0.5rem;
-	font-size: 0.9rem;
-}
-
-.image-upload-section input[type="file"]::file-selector-button {
-	background: var(--accent);
-	color: white;
-	border: none;
-	padding: 0.5rem 1rem;
-	border-radius: 6px;
-	cursor: pointer;
-	margin-right: 0.75rem;
-	font-weight: 500;
-}
-
-.image-upload-section input[type="file"]::file-selector-button:hover {
-	background: var(--accent-light);
-}
-
 /* Modal styles */
 .modal-overlay {
 	position: fixed;
@@ -5168,30 +5232,68 @@ a.about-version-link:hover {
 	}
 }
 
-/* Inline refill form in edit modal */
-.refill-form-inline {
+/* Refill: submit row (button + pill preview) */
+.refill-submit-row {
 	display: flex;
-	align-items: flex-end;
+	align-items: center;
 	gap: 1rem;
-	flex-wrap: wrap;
 }
 
-.refill-form-inline label {
-	flex: 1;
-	min-width: 100px;
+.refill-submit-row button {
+	height: 42px;
+	padding: 0 2rem;
+	min-width: 120px;
+	flex-shrink: 0;
 }
 
-.refill-form-inline label input {
+/* Refill: prescription toggle row */
+.refill-prescription-row {
+	display: flex;
+	align-items: center;
+	gap: 1rem;
+	padding-top: 0.25rem;
+	border-top: 1px solid var(--border-primary);
+}
+
+.refill-prescription-row .refill-prescription-toggle {
+	display: grid;
+	grid-template-columns: 18px minmax(0, 1fr);
+	align-items: start;
+	gap: 0.6rem;
+	margin: 0;
+	text-transform: none;
+	letter-spacing: normal;
+	line-height: 1.2;
+	font-size: 0.95rem;
+	color: var(--text-primary);
+	cursor: pointer;
+	white-space: normal;
 	width: 100%;
 }
 
-.refill-form-inline button {
+.refill-prescription-row .refill-prescription-toggle input {
+	width: 18px;
+	height: 18px;
+	min-width: 18px;
+	margin: 0;
 	flex-shrink: 0;
-	margin-bottom: 0;
-	align-self: flex-end;
-	height: 42px;
-	padding: 0 1rem;
-	min-width: 110px;
+}
+
+.refill-prescription-label-text {
+	min-width: 0;
+	overflow-wrap: anywhere;
+}
+
+.refill-prescription-row .refill-prescription-toggle input:disabled {
+	opacity: 0.6;
+	cursor: not-allowed;
+}
+
+.refill-remaining-badge {
+	font-size: 0.85rem;
+	font-weight: 600;
+	color: var(--success);
+	margin-left: auto;
 }
 
 .refill-preview {
@@ -5212,11 +5314,7 @@ a.about-version-link:hover {
 }
 
 .refill-section {
-	border-left: 3px solid var(--success);
-	background: var(--bg-secondary);
-	margin-top: 1.5rem;
-	padding: 1rem 1rem 1rem 1.25rem;
-	border-radius: 0 8px 8px 0;
+	margin-top: 0;
 }
 
 .refill-section .refill-title {
@@ -5226,23 +5324,33 @@ a.about-version-link:hover {
 	margin: 0 0 0.75rem 0;
 }
 
-.refill-section .refill-form-inline button {
+.refill-section .refill-submit-row button {
 	background: var(--success);
 	color: white;
 	border: none;
 }
 
-.refill-section .refill-form-inline button:hover:not(:disabled) {
+.refill-section .refill-submit-row button:hover:not(:disabled) {
 	background: var(--success-hover, #3aa865);
 	filter: brightness(1.1);
 }
 
-.refill-section .refill-form-inline button:disabled {
+.refill-section .refill-submit-row button:disabled {
 	background: var(--bg-tertiary);
 	color: var(--text-tertiary);
 	cursor: not-allowed;
 }
 
+.refill-unavailable {
+	grid-column: 1 / -1;
+	margin: 0;
+	padding: 0.6rem 0.75rem;
+	border-radius: 8px;
+	border: 1px dashed var(--border-secondary);
+	color: var(--text-secondary);
+	font-size: 0.88rem;
+}
+
 /* =============================================================================
    Edit Stock Modal (Correction)
    ============================================================================= */
@@ -5389,6 +5497,10 @@ a.about-version-link:hover {
 	background: rgba(0, 0, 0, 0.6);
 }
 
+.modal-overlay.nested-confirm {
+	z-index: 1200;
+}
+
 /* =============================================================================
    Shared Schedule Page (Public)
    ============================================================================= */
@@ -5573,6 +5685,31 @@ a.about-version-link:hover {
 	width: 100%;
 }
 
+.mobile-edit-form .form-category {
+	grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+	gap: 0.75rem 1rem;
+	padding: 0.8rem;
+}
+
+.mobile-edit-form .refill-prescription-row {
+	display: grid;
+	grid-template-columns: minmax(0, 1fr);
+	gap: 0.6rem;
+	align-items: start;
+	width: 100%;
+}
+
+.mobile-edit-form .refill-prescription-row .refill-prescription-toggle {
+	grid-template-columns: 18px minmax(0, 1fr);
+	line-height: 1.3;
+	max-width: 100%;
+}
+
+.mobile-edit-form .refill-remaining-badge {
+	margin-left: 0;
+	justify-self: start;
+}
+
 .mobile-edit-form.form-grid input,
 .mobile-edit-form.form-grid textarea,
 .mobile-edit-form.form-grid select {
@@ -5580,30 +5717,6 @@ a.about-version-link:hover {
 	width: 100%;
 }
 
-/* Mobile Blister/Intake Schedule Section */
-.mobile-edit-form .blister-section {
-	padding: 1rem;
-	margin-top: 0.5rem;
-}
-
-.mobile-edit-form .blister-section legend {
-	font-size: 0.95rem;
-	padding: 0 0.5rem;
-	display: flex;
-	align-items: center;
-	gap: 0.5rem;
-	flex-wrap: nowrap;
-	width: 100%;
-}
-
-.mobile-edit-form .blister-section legend .toggle-switch {
-	margin-left: auto;
-}
-
-.mobile-edit-form .blister-section legend .legend-hint {
-	margin-left: 0;
-}
-
 .mobile-edit-form .blister-row {
 	display: grid;
 	grid-template-columns: 1fr 1fr;

frontend/src/test/components/MedDetailModal.test.tsx

@@ -144,6 +144,36 @@ describe("MedDetailModal", () => {
 		expect(screen.getByText("Test notes")).toBeInTheDocument();
 	});
 
+	it("shows prescription details section when prescription is enabled", () => {
+		const med: Medication = {
+			...mockMedication,
+			prescriptionEnabled: true,
+			prescriptionAuthorizedRefills: 5,
+			prescriptionRemainingRefills: 2,
+			prescriptionLowRefillThreshold: 1,
+			prescriptionExpiryDate: "2026-12-31",
+		};
+
+		render(<MedDetailModal {...defaultProps} selectedMed={med} />);
+
+		expect(screen.getByText(/form\.sections\.prescription/i)).toBeInTheDocument();
+		expect(screen.getByText(/prescription\.authorizedRefills/i)).toBeInTheDocument();
+		expect(screen.getByText(/prescription\.remainingRefills/i)).toBeInTheDocument();
+		expect(screen.getByText(/prescription\.lowThreshold/i)).toBeInTheDocument();
+		expect(screen.getByText(/prescription\.expiryDate/i)).toBeInTheDocument();
+	});
+
+	it("does not show prescription details section when prescription is disabled", () => {
+		const med: Medication = {
+			...mockMedication,
+			prescriptionEnabled: false,
+		};
+
+		render(<MedDetailModal {...defaultProps} selectedMed={med} />);
+
+		expect(screen.queryByText(/form\.sections\.prescription/i)).not.toBeInTheDocument();
+	});
+
 	it("displays schedule information", () => {
 		render(<MedDetailModal {...defaultProps} />);
 
@@ -247,7 +277,7 @@ describe("MedDetailModal with refill modal", () => {
 
 		const submitBtn = document.querySelector(".refill-modal .modal-footer .success") as HTMLButtonElement;
 		fireEvent.click(submitBtn);
-		expect(onSubmitRefill).toHaveBeenCalledWith(mockMedication.id);
+		expect(onSubmitRefill).toHaveBeenCalledWith(mockMedication.id, undefined);
 	});
 
 	it("disables refill submit button when no pills are entered", () => {

frontend/src/test/components/MobileEditModal.test.tsx

@@ -460,7 +460,7 @@ describe("MobileEditModal field callbacks", () => {
 		const onHandleValueChange = vi.fn();
 		render(<MobileEditModal {...defaultProps} onHandleValueChange={onHandleValueChange} />);
 
-		const packCountInput = document.querySelector('input[type="number"][min="0"]') as HTMLInputElement;
+		const packCountInput = document.querySelector('input[type="text"][inputmode="numeric"]') as HTMLInputElement;
 		fireEvent.change(packCountInput, { target: { value: "4" } });
 
 		expect(onHandleValueChange).toHaveBeenCalledWith("packCount", "4");

frontend/src/test/hooks/useRefill.test.ts

@@ -138,13 +138,19 @@ describe("useRefill", () => {
 			await result.current.submitRefill(1, 1, mockSetForm, mockLoadMeds);
 		});
 
-		expect(fetch).toHaveBeenCalledWith(
+		expect(fetch).toHaveBeenNthCalledWith(
+			1,
 			"/api/medications/1/refill",
 			expect.objectContaining({
 				method: "POST",
-				body: JSON.stringify({ packsAdded: 1, loosePillsAdded: 0 }),
+				body: JSON.stringify({ packsAdded: 1, loosePillsAdded: 0, usePrescription: false }),
 			})
 		);
+		expect(fetch).toHaveBeenNthCalledWith(
+			2,
+			"/api/medications/1/refills",
+			expect.objectContaining({ credentials: "include" })
+		);
 		expect(mockSetForm).toHaveBeenCalled();
 		expect(mockLoadMeds).toHaveBeenCalled();
 	});

frontend/src/test/hooks/useSettings.test.ts

@@ -84,7 +84,7 @@ describe("useSettings", () => {
 		expect(result.current.settingsSaved).toBe(true);
 	});
 
-	it("validates email before saving", async () => {
+	it("keeps email channel enabled when recipient is non-empty", async () => {
 		(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
 			ok: true,
 			json: () => Promise.resolve({}),
@@ -111,8 +111,7 @@ describe("useSettings", () => {
 			await result.current.saveSettings(mockEvent);
 		});
 
-		expect(result.current.testEmailResult?.success).toBe(false);
-		expect(result.current.testEmailResult?.message).toContain("Invalid email");
+		expect(result.current.settings.emailEnabled).toBe(true);
 	});
 
 	it("tests email notification", async () => {

frontend/src/test/pages/SchedulePage.test.tsx

@@ -45,7 +45,16 @@ const mockFutureDays = [
 			{
 				medName: "Aspirin",
 				total: 1,
-				doses: [{ id: `1-0-${FIXED_TIMESTAMP}`, timeStr: "09:00", when: FIXED_TIMESTAMP, usage: 1, takenBy: ["John"] }],
+				doses: [
+					{
+						id: `1-0-${FIXED_TIMESTAMP}`,
+						timeStr: "09:00",
+						when: FIXED_TIMESTAMP,
+						usage: 1,
+						takenBy: ["John"],
+						intakeRemindersEnabled: true,
+					},
+				],
 				lastWhen: FIXED_TIMESTAMP,
 			},
 		],

frontend/src/types/index.ts

@@ -52,6 +52,11 @@ export type Medication = {
 	imageUrl?: string | null;
 	expiryDate?: string | null;
 	notes?: string | null;
+	prescriptionEnabled?: boolean;
+	prescriptionAuthorizedRefills?: number | null;
+	prescriptionRemainingRefills?: number | null;
+	prescriptionLowRefillThreshold?: number;
+	prescriptionExpiryDate?: string | null;
 	intakeRemindersEnabled?: boolean; // Medication-level setting (deprecated, use per-intake)
 	dismissedUntil?: string | null; // ISO date string (YYYY-MM-DD) - all past doses until this date are dismissed
 	updatedAt: string | number | null;
@@ -74,6 +79,7 @@ export type RefillEntry = {
 	id: number;
 	packsAdded: number;
 	loosePillsAdded: number;
+	usedPrescription?: boolean;
 	refillDate: string;
 };
 
@@ -110,6 +116,11 @@ export type FormState = {
 	doseUnit: DoseUnit; // Unit for the dose (mg, g, mcg, ml, IU, etc.)
 	expiryDate: string;
 	notes: string;
+	prescriptionEnabled: boolean;
+	prescriptionAuthorizedRefills: string;
+	prescriptionRemainingRefills: string;
+	prescriptionLowRefillThreshold: string;
+	prescriptionExpiryDate: string;
 	intakeRemindersEnabled: boolean; // Deprecated, kept for backward compat
 	blisters: FormBlister[]; // Legacy form format
 	intakes: FormIntake[]; // New form format with per-intake takenBy
@@ -154,6 +165,7 @@ export type ScheduleEvent = {
 	when: number;
 	isPast: boolean;
 	takenBy: string | null; // Per-intake takenBy (single person or null)
+	intakeRemindersEnabled: boolean; // Per-intake reminder flag
 };
 
 export type BlisterStock = {

frontend/src/utils/logger.ts

@@ -0,0 +1,39 @@
+/**
+ * Frontend logger that respects LOG_LEVEL (injected at build time via Vite define).
+ * Mirrors the backend logger API so usage is consistent across the stack.
+ *
+ * Levels (high → low): silent > error > warn > info > debug
+ * Default: "warn" — only warn and error messages are shown.
+ */
+
+declare const __LOG_LEVEL__: string;
+
+const LOG_LEVELS: Record<string, number> = {
+	silent: 50,
+	error: 40,
+	warn: 30,
+	info: 20,
+	debug: 10,
+};
+
+const configuredLevel = typeof __LOG_LEVEL__ !== "undefined" ? __LOG_LEVEL__.toLowerCase() : "warn";
+const threshold = LOG_LEVELS[configuredLevel] ?? LOG_LEVELS.warn;
+
+function shouldLog(level: string): boolean {
+	return (LOG_LEVELS[level] ?? 0) >= threshold;
+}
+
+export const log = {
+	debug(...args: unknown[]): void {
+		if (shouldLog("debug")) console.debug(...args);
+	},
+	info(...args: unknown[]): void {
+		if (shouldLog("info")) console.info(...args);
+	},
+	warn(...args: unknown[]): void {
+		if (shouldLog("warn")) console.warn(...args);
+	},
+	error(...args: unknown[]): void {
+		if (shouldLog("error")) console.error(...args);
+	},
+};

frontend/src/utils/schedule.ts

@@ -70,6 +70,7 @@ export function buildSchedulePreview(
 					isPast,
 					timeStr: d.toLocaleTimeString(locale, { hour: "2-digit", minute: "2-digit" }),
 					dateStr: d.toLocaleDateString(locale, { weekday: "short", day: "2-digit", month: "short" }),
+					intakeRemindersEnabled: intake.intakeRemindersEnabled,
 				});
 			}
 		});

frontend/vite.config.ts

@@ -1,17 +1,20 @@
-import { readFileSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
 
 // Read version from package.json at build time
 const packageJson = JSON.parse(readFileSync("./package.json", "utf-8"));
 
-// Default to localhost for local dev and CI; docker dev overrides via BACKEND_URL
-const backendTarget = process.env.BACKEND_URL || "http://localhost:3000";
+// Default to localhost for local dev and CI.
+// In Docker, prefer backend-dev to avoid localhost proxy failures.
+const defaultBackendTarget = existsSync("/.dockerenv") ? "http://backend-dev:3000" : "http://localhost:3000";
+const backendTarget = process.env.BACKEND_URL || defaultBackendTarget;
 
 export default defineConfig({
   plugins: [react()],
   define: {
     __APP_VERSION__: JSON.stringify(packageJson.version || "unknown"),
+    __LOG_LEVEL__: JSON.stringify(process.env.LOG_LEVEL || "warn"),
   },
   server: {
     port: 5173,

package-lock.json

@@ -6,9 +6,9 @@
     "": {
       "name": "medassist-ng",
       "devDependencies": {
-        "@biomejs/biome": "^2.3.12",
+        "@biomejs/biome": "^2.3.15",
         "husky": "^9.1.0",
-        "lint-staged": "^15.2.0"
+        "lint-staged": "^16.2.7"
       }
     },
     "backend": {
@@ -76,9 +76,9 @@
       }
     },
     "node_modules/@biomejs/biome": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.3.12.tgz",
-      "integrity": "sha512-AR7h4aSlAvXj7TAajW/V12BOw2EiS0AqZWV5dGozf4nlLoUF/ifvD0+YgKSskT0ylA6dY1A8AwgP8kZ6yaCQnA==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.3.15.tgz",
+      "integrity": "sha512-u+jlPBAU2B45LDkjjNNYpc1PvqrM/co4loNommS9/sl9oSxsAQKsNZejYuUztvToB5oXi1tN/e62iNd6ESiY3g==",
       "dev": true,
       "license": "MIT OR Apache-2.0",
       "bin": {
@@ -92,20 +92,20 @@
         "url": "https://opencollective.com/biome"
       },
       "optionalDependencies": {
-        "@biomejs/cli-darwin-arm64": "2.3.12",
-        "@biomejs/cli-darwin-x64": "2.3.12",
-        "@biomejs/cli-linux-arm64": "2.3.12",
-        "@biomejs/cli-linux-arm64-musl": "2.3.12",
-        "@biomejs/cli-linux-x64": "2.3.12",
-        "@biomejs/cli-linux-x64-musl": "2.3.12",
-        "@biomejs/cli-win32-arm64": "2.3.12",
-        "@biomejs/cli-win32-x64": "2.3.12"
+        "@biomejs/cli-darwin-arm64": "2.3.15",
+        "@biomejs/cli-darwin-x64": "2.3.15",
+        "@biomejs/cli-linux-arm64": "2.3.15",
+        "@biomejs/cli-linux-arm64-musl": "2.3.15",
+        "@biomejs/cli-linux-x64": "2.3.15",
+        "@biomejs/cli-linux-x64-musl": "2.3.15",
+        "@biomejs/cli-win32-arm64": "2.3.15",
+        "@biomejs/cli-win32-x64": "2.3.15"
       }
     },
     "node_modules/@biomejs/cli-darwin-arm64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.12.tgz",
-      "integrity": "sha512-cO6fn+KiMBemva6EARDLQBxeyvLzgidaFRJi8G7OeRqz54kWK0E+uSjgFaiHlc3DZYoa0+1UFE8mDxozpc9ieg==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.15.tgz",
+      "integrity": "sha512-SDCdrJ4COim1r8SNHg19oqT50JfkI/xGZHSyC6mGzMfKrpNe/217Eq6y98XhNTc0vGWDjznSDNXdUc6Kg24jbw==",
       "cpu": [
         "arm64"
       ],
@@ -120,9 +120,9 @@
       }
     },
     "node_modules/@biomejs/cli-darwin-x64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.3.12.tgz",
-      "integrity": "sha512-/fiF/qmudKwSdvmSrSe/gOTkW77mHHkH8Iy7YC2rmpLuk27kbaUOPa7kPiH5l+3lJzTUfU/t6x1OuIq/7SGtxg==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.3.15.tgz",
+      "integrity": "sha512-RkyeSosBtn3C3Un8zQnl9upX0Qbq4E3QmBa0qjpOh1MebRbHhNlRC16jk8HdTe/9ym5zlfnpbb8cKXzW+vlTxw==",
       "cpu": [
         "x64"
       ],
@@ -137,9 +137,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-arm64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.3.12.tgz",
-      "integrity": "sha512-nbOsuQROa3DLla5vvsTZg+T5WVPGi9/vYxETm9BOuLHBJN3oWQIg3MIkE2OfL18df1ZtNkqXkH6Yg9mdTPem7A==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.3.15.tgz",
+      "integrity": "sha512-FN83KxrdVWANOn5tDmW6UBC0grojchbGmcEz6JkRs2YY6DY63sTZhwkQ56x6YtKhDVV1Unz7FJexy8o7KwuIhg==",
       "cpu": [
         "arm64"
       ],
@@ -154,9 +154,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-arm64-musl": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.3.12.tgz",
-      "integrity": "sha512-aqkeSf7IH+wkzFpKeDVPSXy9uDjxtLpYA6yzkYsY+tVjwFFirSuajHDI3ul8en90XNs1NA0n8kgBrjwRi5JeyA==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.3.15.tgz",
+      "integrity": "sha512-SSSIj2yMkFdSkXqASzIBdjySBXOe65RJlhKEDlri7MN19RC4cpez+C0kEwPrhXOTgJbwQR9QH1F4+VnHkC35pg==",
       "cpu": [
         "arm64"
       ],
@@ -171,9 +171,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-x64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.3.12.tgz",
-      "integrity": "sha512-CQtqrJ+qEEI8tgRSTjjzk6wJAwfH3wQlkIGsM5dlecfRZaoT+XCms/mf7G4kWNexrke6mnkRzNy6w8ebV177ow==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.3.15.tgz",
+      "integrity": "sha512-T8n9p8aiIKOrAD7SwC7opiBM1LYGrE5G3OQRXWgbeo/merBk8m+uxJ1nOXMPzfYyFLfPlKF92QS06KN1UW+Zbg==",
       "cpu": [
         "x64"
       ],
@@ -188,9 +188,9 @@
       }
     },
     "node_modules/@biomejs/cli-linux-x64-musl": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.3.12.tgz",
-      "integrity": "sha512-kVGWtupRRsOjvw47YFkk5mLiAdpCPMWBo1jOwAzh+juDpUb2sWarIp+iq+CPL1Wt0LLZnYtP7hH5kD6fskcxmg==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.3.15.tgz",
+      "integrity": "sha512-dbjPzTh+ijmmNwojFYbQNMFp332019ZDioBYAMMJj5Ux9d8MkM+u+J68SBJGVwVeSHMYj+T9504CoxEzQxrdNw==",
       "cpu": [
         "x64"
       ],
@@ -205,9 +205,9 @@
       }
     },
     "node_modules/@biomejs/cli-win32-arm64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.3.12.tgz",
-      "integrity": "sha512-Re4I7UnOoyE4kHMqpgtG6UvSBGBbbtvsOvBROgCCoH7EgANN6plSQhvo2W7OCITvTp7gD6oZOyZy72lUdXjqZg==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.3.15.tgz",
+      "integrity": "sha512-puMuenu/2brQdgqtQ7geNwQlNVxiABKEZJhMRX6AGWcmrMO8EObMXniFQywy2b81qmC+q+SDvlOpspNwz0WiOA==",
       "cpu": [
         "arm64"
       ],
@@ -222,9 +222,9 @@
       }
     },
     "node_modules/@biomejs/cli-win32-x64": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.3.12.tgz",
-      "integrity": "sha512-qqGVWqNNek0KikwPZlOIoxtXgsNGsX+rgdEzgw82Re8nF02W+E2WokaQhpF5TdBh/D/RQ3TLppH+otp6ztN0lw==",
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.3.15.tgz",
+      "integrity": "sha512-kDZr/hgg+igo5Emi0LcjlgfkoGZtgIpJKhnvKTRmMBv6FF/3SDyEV4khBwqNebZIyMZTzvpca9sQNSXJ39pI2A==",
       "cpu": [
         "x64"
       ],
@@ -239,9 +239,9 @@
       }
     },
     "node_modules/ansi-escapes": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.2.0.tgz",
-      "integrity": "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz",
+      "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -256,6 +256,8 @@
     },
     "node_modules/ansi-regex": {
       "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -267,6 +269,8 @@
     },
     "node_modules/ansi-styles": {
       "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -289,19 +293,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/chalk": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
-      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/cli-cursor": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
@@ -319,42 +310,17 @@
       }
     },
     "node_modules/cli-truncate": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
-      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.1.1.tgz",
+      "integrity": "sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^7.0.0"
+        "slice-ansi": "^7.1.0",
+        "string-width": "^8.0.0"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-truncate/node_modules/emoji-regex": {
-      "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
-      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cli-truncate/node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -368,43 +334,21 @@
       "license": "MIT"
     },
     "node_modules/commander": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
-      "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.3.tgz",
+      "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
+    "node_modules/emoji-regex": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.4.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
+      "license": "MIT"
     },
     "node_modules/environment": {
       "version": "1.1.0",
@@ -426,30 +370,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/execa": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^8.0.1",
-        "human-signals": "^5.0.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^4.1.0",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -476,29 +396,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-stream": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=16.17.0"
-      }
-    },
     "node_modules/husky": {
       "version": "9.1.7",
       "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
@@ -515,6 +412,22 @@
         "url": "https://github.com/sponsors/typicode"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
+      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -525,73 +438,39 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/lilconfig": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antonk52"
-      }
-    },
     "node_modules/lint-staged": {
-      "version": "15.5.2",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.5.2.tgz",
-      "integrity": "sha512-YUSOLq9VeRNAo/CTaVmhGDKG+LBtA8KF1X4K5+ykMSwWST1vDxJRB2kv2COgLb1fvpCo+A/y9A0G0znNVmdx4w==",
+      "version": "16.2.7",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-16.2.7.tgz",
+      "integrity": "sha512-lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^5.4.1",
-        "commander": "^13.1.0",
-        "debug": "^4.4.0",
-        "execa": "^8.0.1",
-        "lilconfig": "^3.1.3",
-        "listr2": "^8.2.5",
+        "commander": "^14.0.2",
+        "listr2": "^9.0.5",
         "micromatch": "^4.0.8",
+        "nano-spawn": "^2.0.0",
         "pidtree": "^0.6.0",
         "string-argv": "^0.3.2",
-        "yaml": "^2.7.0"
+        "yaml": "^2.8.1"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
       },
       "engines": {
-        "node": ">=18.12.0"
+        "node": ">=20.17"
       },
       "funding": {
         "url": "https://opencollective.com/lint-staged"
       }
     },
     "node_modules/listr2": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.3.3.tgz",
-      "integrity": "sha512-LWzX2KsqcB1wqQ4AHgYb4RsDXauQiqhjLk+6hjbaeHG4zpjjVAB6wC/gz6X0l+Du1cN3pUB5ZlrvTbhGSNnUQQ==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.5.tgz",
+      "integrity": "sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cli-truncate": "^4.0.0",
+        "cli-truncate": "^5.0.0",
         "colorette": "^2.0.20",
         "eventemitter3": "^5.0.1",
         "log-update": "^6.1.0",
@@ -599,50 +478,7 @@
         "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/listr2/node_modules/emoji-regex": {
-      "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
-      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/listr2/node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/listr2/node_modules/wrap-ansi": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
-      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "string-width": "^7.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/log-update": {
@@ -665,89 +501,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/emoji-regex": {
-      "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
-      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/log-update/node_modules/is-fullwidth-code-point": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
-      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-east-asian-width": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
-      "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "is-fullwidth-code-point": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/log-update/node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
-      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "string-width": "^7.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -775,19 +528,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/mimic-function": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
@@ -801,64 +541,35 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/npm-run-path": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/npm-run-path/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+    "node_modules/nano-spawn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/nano-spawn/-/nano-spawn-2.0.0.tgz",
+      "integrity": "sha512-tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=20.17"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sindresorhus/nano-spawn?sponsor=1"
       }
     },
     "node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mimic-fn": "^4.0.0"
+        "mimic-function": "^5.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pidtree": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
@@ -889,48 +600,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/restore-cursor/node_modules/onetime": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
-      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mimic-function": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/rfdc": {
       "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/signal-exit": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -941,35 +621,22 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
+      "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/string-argv": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
@@ -980,8 +647,27 @@
         "node": ">=0.6.19"
       }
     },
+    "node_modules/string-width": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.1.1.tgz",
+      "integrity": "sha512-KpqHIdDL9KwYk22wEOg/VIqYbrnLeSApsKT/bSj6Ez7pn3CftUiLAv2Lccpq1ALcpLV9UX1Ppn92npZWu2w/aw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.3.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/strip-ansi": {
       "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -994,19 +680,6 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -1020,18 +693,40 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/which": {
-      "version": "2.0.2",
+    "node_modules/wrap-ansi": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
+      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/yaml": {

package.json

@@ -7,9 +7,9 @@
     "lint:fix": "cd backend && npm run lint:fix && cd ../frontend && npm run lint:fix"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.12",
+    "@biomejs/biome": "^2.3.15",
     "husky": "^9.1.0",
-    "lint-staged": "^15.2.0"
+    "lint-staged": "^16.2.7"
   },
   "lint-staged": {
     "backend/src/**/*.ts": [