chore: release v1.19.0 (#388)

* docs: require explicit issue comment when closing issues via PR

* chore: release v1.19.0

.github/agents/release-manager.agent.md

@@ -163,6 +163,7 @@ When code changes (features or bug fixes) are complete:
    ```
    - Use `--label enhancement` for `feat/` branches, `--label bug` for `fix/` branches, `--label documentation` for `docs/` branches.
    - Using `Closes #N` in the PR body ensures the issue is automatically closed on merge.
+   - Always add an explicit issue comment with the PR link and short fix summary (do not rely on auto-close event only).
    - The `--project` flag links the PR to the Project board.
 4. **Present the PR URL to the user and wait for confirmation.**
 
@@ -451,6 +452,7 @@ All work is tracked in the [GitHub Project board](https://github.com/users/Danie
    Issues with `enhancement`, `bug`, or `triage` labels are **automatically added** to the board.
 
 2. **When creating a PR**: Always reference the issue with `Closes #N` in the PR body so the issue is automatically **closed** on merge. Note: this does NOT move the Project board status — that must be done manually (see step 3).
+   Also add a direct issue comment with the PR link and a one-line summary for clear issue-thread traceability.
 
 3. **After merge — verify automation**: The `project-auto-done.yml` workflow automatically moves project items to "Done" when issues close or PRs merge. After merge, verify it ran:
    ```bash

.gitignore

@@ -82,5 +82,8 @@ Thumbs.db
 .claude/
 AGENTS.md
 docs/TECH_STACK.md
-doku
+doku/
-plan
+doku/memory_notes.md
+doku/report.md
+plan/
+.copilot-tracking

README.md

@@ -120,10 +120,10 @@ Share your medication schedule with others via a public link.
 </details>
 
 ### Smart Inventory
-- Track exact stock: packs, blisters, bottles, and loose pills
+- Track exact stock with package profiles (blister, bottle, tube, liquid container)
 - Display remaining days of supply
 - Automatic calculation based on intake schedule
-- Manual stock correction supports partial blisters and loose pills
+- Manual stock correction supports profile-specific stock semantics (sealed units + loose stock for blister, amount-based stock for bottle/tube/liquid)
 
 ### Medication Refill
 - One-click refill with pack or loose pill options
@@ -141,7 +141,7 @@ Share your medication schedule with others via a public link.
 - Intake reminders via push notifications
 
 ### Trip Planner
-- Calculate how many pills you need for a trip or date range
+- Calculate medication demand for a trip or date range with package-aware units
 - Plan ahead for vacations, business trips, or hospital stays
 - Send demand reports via email or push notification
 

backend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "medassist-ng-backend",
-  "version": "1.17.1",
+  "version": "1.18.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "medassist-ng-backend",
-      "version": "1.17.1",
+      "version": "1.18.2",
       "dependencies": {
         "@fastify/cookie": "^11.0.2",
         "@fastify/cors": "^11.2.0",
@@ -20,7 +20,7 @@
         "argon2": "^0.44.0",
         "dotenv": "^17.3.1",
         "drizzle-orm": "^0.45.1",
-        "fastify": "^5.7.4",
+        "fastify": "^5.8.1",
         "nodemailer": "^8.0.1",
         "openid-client": "^6.8.2",
         "sharp": "^0.34.5",
@@ -28,7 +28,7 @@
       },
       "devDependencies": {
         "@biomejs/biome": "^2.4.4",
-        "@types/node": "^25.3.2",
+        "@types/node": "^25.3.3",
         "@types/nodemailer": "^7.0.11",
         "@types/supertest": "^7.2.0",
         "@vitest/coverage-v8": "^4.0.18",
@@ -2625,9 +2625,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.3.2",
+      "version": "25.3.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
-      "integrity": "sha512-RpV6r/ij22zRRdyBPcxDeKAzH43phWVKEjL2iksqo1Vz3CuBUrgmPpPhALKiRfU7OMCmeeO9vECBMsV0hMTG8Q==",
+      "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~7.18.0"
@@ -4156,9 +4156,9 @@
       }
     },
     "node_modules/fastify": {
-      "version": "5.7.4",
+      "version": "5.8.1",
-      "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.7.4.tgz",
+      "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.8.1.tgz",
-      "integrity": "sha512-e6l5NsRdaEP8rdD8VR0ErJASeyaRbzXYpmkrpr2SuvuMq6Si3lvsaVy5C+7gLanEkvjpMDzBXWE5HPeb/hgTxA==",
+      "integrity": "sha512-y0kicFvvn7CYWoPOVLOcvn4YyKQz03DIY7UxmyOy21/J8eXm09R+tmb+tVDBW5h+pja30cHI5dqUcSlvY86V2A==",
       "funding": [
         {
           "type": "github",
@@ -4180,7 +4180,7 @@
         "fast-json-stringify": "^6.0.0",
         "find-my-way": "^9.0.0",
         "light-my-request": "^6.0.0",
-        "pino": "^10.1.0",
+        "pino": "^9.14.0 || ^10.1.0",
         "process-warning": "^5.0.0",
         "rfdc": "^1.3.1",
         "secure-json-parse": "^4.0.0",

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medassist-ng-backend",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -29,7 +29,7 @@
     "argon2": "^0.44.0",
     "dotenv": "^17.3.1",
     "drizzle-orm": "^0.45.1",
-    "fastify": "^5.7.4",
+    "fastify": "^5.8.1",
     "nodemailer": "^8.0.1",
     "openid-client": "^6.8.2",
     "sharp": "^0.34.5",
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.4",
-    "@types/node": "^25.3.2",
+    "@types/node": "^25.3.3",
     "@types/nodemailer": "^7.0.11",
     "@types/supertest": "^7.2.0",
     "@vitest/coverage-v8": "^4.0.18",

backend/src/routes/export.ts

@@ -10,6 +10,7 @@ import { doseTracking, medications, refillHistory, shareTokens, userSettings } f
 import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
+import { normalizePackageType, PACKAGE_TYPES } from "../utils/package-profiles.js";
 import { parseIntakesJson, parseTakenByJson } from "../utils/scheduler-utils.js";
 
 const IMAGES_DIR = resolve(getDataDir(), "images");
@@ -39,7 +40,7 @@ const inventorySchema = z.object({
 	totalPills: z.number().int().nullable().optional(), // For bottle type: total capacity
 	looseTablets: z.number().int().min(0).default(0),
 	stockAdjustment: z.number().int().default(0), // Manual stock correction
-	packageType: z.enum(["blister", "bottle", "tube", "liquid_container"]).default("blister"),
+	packageType: z.enum(PACKAGE_TYPES).default("blister"),
 	packageAmountValue: z.number().int().min(0).default(0),
 	packageAmountUnit: z.enum(["ml", "g"]).default("ml"),
 });
@@ -319,7 +320,7 @@ export async function exportRoutes(app: FastifyInstance) {
 					totalPills: med.totalPills ?? null,
 					looseTablets: med.looseTablets ?? 0,
 					stockAdjustment: med.stockAdjustment ?? 0,
-					packageType: med.packageType ?? "blister",
+					packageType: normalizePackageType(med.packageType),
 					packageAmountValue: med.packageAmountValue ?? 0,
 					packageAmountUnit: (med.packageAmountUnit ?? "ml") as "ml" | "g",
 				},
@@ -595,7 +596,7 @@ export async function exportRoutes(app: FastifyInstance) {
 						medicationForm: med.medicationForm ?? "tablet",
 						pillForm: med.pillForm || null,
 						lifecycleCategory: med.lifecycleCategory ?? "refill_when_empty",
-						packageType: med.inventory.packageType ?? "blister",
+						packageType: normalizePackageType(med.inventory.packageType),
 						packageAmountValue: med.inventory.packageAmountValue ?? 0,
 						packageAmountUnit: med.inventory.packageAmountUnit ?? "ml",
 						packCount: med.inventory.packCount,

backend/src/routes/medications.ts

@@ -14,6 +14,13 @@ import {
 	streamToBuffer,
 	writeOptimizedImageSet,
 } from "../utils/image-upload.js";
+import {
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+	normalizePackageType,
+	PACKAGE_TYPES,
+} from "../utils/package-profiles.js";
 import {
 	type Intake,
 	normalizeIntakeUsageForStock,
@@ -75,7 +82,7 @@ const blisterSchema = z.object({
 	start: z.string().datetime({ local: true }),
 });
 
-const packageTypeSchema = z.enum(["blister", "bottle", "tube", "liquid_container"]).default("blister");
+const packageTypeSchema = z.enum(PACKAGE_TYPES).default("blister");
 const medicationFormSchema = z.enum(["capsule", "tablet", "liquid", "topical"]).default("tablet");
 const pillFormSchema = z.enum(["capsule", "tablet"]);
 const lifecycleCategorySchema = z.enum(["refill_when_empty", "treatment_period"]).default("refill_when_empty");
@@ -163,7 +170,7 @@ const medicationSchema = z
 	.refine(
 		(data) => {
 			if (data.medicationForm === "topical") {
-				return data.packageType === "tube";
+				return isTubePackageType(data.packageType);
 			}
 			return true;
 		},
@@ -175,7 +182,7 @@ const medicationSchema = z
 	.refine(
 		(data) => {
 			if (data.medicationForm === "liquid") {
-				return data.packageType === "liquid_container";
+				return isLiquidContainerPackageType(data.packageType);
 			}
 			return true;
 		},
@@ -187,7 +194,7 @@ const medicationSchema = z
 	.refine(
 		(data) => {
 			if (data.medicationForm === "capsule" || data.medicationForm === "tablet") {
-				return data.packageType !== "tube" && data.packageType !== "liquid_container";
+				return !isTubePackageType(data.packageType) && !isLiquidContainerPackageType(data.packageType);
 			}
 			return true;
 		},
@@ -294,7 +301,7 @@ export async function medicationRoutes(app: FastifyInstance) {
 				medicationForm: row.medicationForm ?? "tablet",
 				pillForm: row.pillForm ?? null,
 				lifecycleCategory: row.lifecycleCategory ?? "refill_when_empty",
-				packageType: row.packageType ?? "blister",
+				packageType: normalizePackageType(row.packageType),
 				packCount: row.packCount ?? 1,
 				blistersPerPack: row.blistersPerPack ?? 1,
 				pillsPerBlister: row.pillsPerBlister ?? 1,
@@ -412,7 +419,7 @@ export async function medicationRoutes(app: FastifyInstance) {
 				medicationForm: medicationForm ?? "tablet",
 				pillForm: normalizedPillForm,
 				lifecycleCategory: lifecycleCategory ?? "refill_when_empty",
-				packageType: packageType ?? "blister",
+				packageType: normalizePackageType(packageType),
 				packCount,
 				blistersPerPack,
 				pillsPerBlister,
@@ -448,7 +455,7 @@ export async function medicationRoutes(app: FastifyInstance) {
 			medicationForm: inserted.medicationForm ?? "tablet",
 			pillForm: inserted.pillForm ?? null,
 			lifecycleCategory: inserted.lifecycleCategory ?? "refill_when_empty",
-			packageType: inserted.packageType ?? "blister",
+			packageType: normalizePackageType(inserted.packageType),
 			packCount: inserted.packCount,
 			blistersPerPack: inserted.blistersPerPack,
 			pillsPerBlister: inserted.pillsPerBlister,
@@ -583,7 +590,7 @@ export async function medicationRoutes(app: FastifyInstance) {
 				medicationForm: medicationForm ?? "tablet",
 				pillForm: normalizedPillForm,
 				lifecycleCategory: lifecycleCategory ?? "refill_when_empty",
-				packageType: packageType ?? "blister",
+				packageType: normalizePackageType(packageType),
 				packCount,
 				blistersPerPack,
 				pillsPerBlister,
@@ -743,7 +750,7 @@ export async function medicationRoutes(app: FastifyInstance) {
 			medicationForm: result[0].medicationForm ?? "tablet",
 			pillForm: result[0].pillForm ?? null,
 			lifecycleCategory: result[0].lifecycleCategory ?? "refill_when_empty",
-			packageType: result[0].packageType ?? "blister",
+			packageType: normalizePackageType(result[0].packageType),
 			packCount: result[0].packCount,
 			blistersPerPack: result[0].blistersPerPack,
 			pillsPerBlister: result[0].pillsPerBlister,
@@ -901,8 +908,8 @@ export async function medicationRoutes(app: FastifyInstance) {
 			updatedAt: new Date(),
 		};
 
-		const packageType = existing.packageType ?? "blister";
+		const packageType = normalizePackageType(existing.packageType);
-		const allowsAmountBaseUpdate = packageType === "tube" || packageType === "liquid_container";
+		const allowsAmountBaseUpdate = isTubePackageType(packageType) || isLiquidContainerPackageType(packageType);
 		if (allowsAmountBaseUpdate) {
 			if (totalPills !== undefined) updateFields.totalPills = totalPills;
 			if (looseTablets !== undefined) updateFields.looseTablets = looseTablets;
@@ -1097,14 +1104,13 @@ export async function medicationRoutes(app: FastifyInstance) {
 			const blistersPerPack = row.blistersPerPack ?? 1;
 			const looseTablets = row.looseTablets ?? 0;
 			const stockAdjustment = row.stockAdjustment ?? 0;
-			const packageType = row.packageType ?? "blister";
+			const packageType = normalizePackageType(row.packageType);
 
 			// For bottle type, looseTablets IS the current stock (no blister math)
-			const isTopical = medForm === "topical" || packageType === "tube";
+			const isTopical = medForm === "topical" || isTubePackageType(packageType);
-			const originalTotalPills =
+			const originalTotalPills = isAmountBasedPackageType(packageType)
-				packageType === "bottle" || packageType === "liquid_container"
+				? looseTablets + stockAdjustment
-					? looseTablets + stockAdjustment
+				: packCount * blistersPerPack * pillsPerBlister + looseTablets + stockAdjustment;
-					: packCount * blistersPerPack * pillsPerBlister + looseTablets + stockAdjustment;
 
 			// Calculate consumption with the same automatic/manual behavior as frontend coverage.
 			const stockCorrectionCutoff = row.lastStockCorrectionAt ? new Date(row.lastStockCorrectionAt).getTime() : 0;
@@ -1232,7 +1238,7 @@ export async function medicationRoutes(app: FastifyInstance) {
 			let fullBlisters: number;
 			let loosePills: number;
 
-			if (packageType === "bottle" || packageType === "tube" || packageType === "liquid_container") {
+			if (isAmountBasedPackageType(packageType)) {
 				// Bottle type: no blisters, everything is loose pills
 				fullBlisters = 0;
 				loosePills = availableAfterPeriod;

backend/src/routes/planner.ts

@@ -15,6 +15,12 @@ import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import { updateReminderSentTime, updateUserReminderSentTime } from "../services/reminder-scheduler.js";
 import type { AuthUser } from "../types/fastify.js";
+import {
+	getPlannerUnitKind,
+	isAmountBasedPackageType,
+	isTubePackageType,
+	normalizePackageType,
+} from "../utils/package-profiles.js";
 import { loadUserSettings, sendShoutrrrNotification } from "./settings.js";
 
 // Escape HTML to prevent XSS in email templates
@@ -80,12 +86,13 @@ type PlannerRow = {
 };
 
 function isContainerPackage(packageType?: string): boolean {
-	return packageType === "bottle" || packageType === "tube" || packageType === "liquid_container";
+	return isAmountBasedPackageType(packageType);
 }
 
 function getPlannerUnit(packageType: string | undefined, tr: ReturnType<typeof getTranslations>): string {
-	if (packageType === "tube") return tr.common.units;
+	const unitKind = getPlannerUnitKind(packageType);
-	if (packageType === "liquid_container") return tr.common.ml;
+	if (unitKind === "units") return tr.common.units;
+	if (unitKind === "ml") return tr.common.ml;
 	return tr.common.pills;
 }
 
@@ -481,13 +488,13 @@ ${getFooterPlain(language)}`;
 			.where(and(eq(medications.userId, userId), eq(medications.isObsolete, false)));
 		const activeMedicationByName = new Map(
 			activeMeds
-				.map((med) => [med.name || med.genericName || "", med.packageType ?? "blister"] as const)
+				.map((med) => [med.name || med.genericName || "", normalizePackageType(med.packageType)] as const)
 				.filter(([name]) => name.length > 0)
 		);
 		const filteredLowStock = lowStock.filter((item) => {
 			const packageType = activeMedicationByName.get(item.name);
 			if (!packageType) return false;
-			if (packageType === "tube") return false;
+			if (isTubePackageType(packageType)) return false;
 			return true;
 		});
 		if (filteredLowStock.length === 0) {

backend/src/routes/settings.ts

@@ -326,6 +326,8 @@ export async function settingsRoutes(app: FastifyInstance) {
 		const userId = await getUserId(request, reply);
 
 		const settings = await getOrCreateUserSettings(userId);
+		const reminderHour = envInt("REMINDER_HOUR", 6);
+		const reminderMinutesBefore = envInt("REMINDER_MINUTES_BEFORE", 15);
 
 		return reply.send({
 			// User notification settings (from DB)
@@ -376,6 +378,8 @@ export async function settingsRoutes(app: FastifyInstance) {
 			lastPrescriptionReminderChannel: settings.lastPrescriptionReminderChannel ?? null,
 			lastPrescriptionReminderMedNames: settings.lastPrescriptionReminderMedNames ?? null,
 			// Server settings (from .env, read-only)
+			reminderHour,
+			reminderMinutesBefore,
 			expiryWarningDays: parseInt(process.env.EXPIRY_WARNING_DAYS ?? "30", 10),
 		});
 	});

backend/src/routes/share.ts

@@ -7,6 +7,7 @@ import { medications, shareTokens, userSettings, users } from "../db/schema.js";
 import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
+import { isAmountBasedPackageType, normalizePackageType } from "../utils/package-profiles.js";
 import {
 	getAllTakenByForMedication,
 	parseIntakesJson,
@@ -119,12 +120,9 @@ export async function shareRoutes(app: FastifyInstance) {
 			// Parse takenBy JSON array
 			const takenByArray = parseTakenByJson(med.takenByJson);
 
-			const totalPills =
+			const totalPills = isAmountBasedPackageType(med.packageType)
-				(med.packageType ?? "blister") === "bottle" ||
+				? med.looseTablets + (med.stockAdjustment ?? 0)
-				(med.packageType ?? "blister") === "tube" ||
+				: med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets + (med.stockAdjustment ?? 0);
-				(med.packageType ?? "blister") === "liquid_container"
-					? med.looseTablets + (med.stockAdjustment ?? 0)
-					: med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets + (med.stockAdjustment ?? 0);
 			return {
 				id: med.id,
 				name: med.name,
@@ -133,7 +131,7 @@ export async function shareRoutes(app: FastifyInstance) {
 				doseUnit: med.doseUnit ?? "mg",
 				imageUrl: med.imageUrl,
 				totalPills,
-				packageType: med.packageType ?? "blister",
+				packageType: normalizePackageType(med.packageType),
 				packCount: med.packCount,
 				blistersPerPack: med.blistersPerPack,
 				looseTablets: med.looseTablets,

backend/src/services/intake-reminder-scheduler.ts

@@ -50,6 +50,36 @@ function saveIntakeReminderState(state: IntakeReminderState): void {
 	writeFileSync(intakeReminderStateFile, JSON.stringify(state, null, 2));
 }
 
+type MailDeliveryInfo = {
+	accepted?: unknown;
+	rejected?: unknown;
+	response?: unknown;
+};
+
+function normalizeRecipients(value: unknown): string[] {
+	if (!Array.isArray(value)) return [];
+	return value
+		.map((entry) => (typeof entry === "string" ? entry : String(entry ?? "")))
+		.map((entry) => entry.trim())
+		.filter(Boolean);
+}
+
+function getDeliveryError(info: MailDeliveryInfo): string | null {
+	const accepted = normalizeRecipients(info.accepted);
+	const rejected = normalizeRecipients(info.rejected);
+
+	if (accepted.length > 0) return null;
+	if (rejected.length > 0) {
+		return `SMTP rejected all recipients: ${rejected.join(", ")}`;
+	}
+
+	if (typeof info.response === "string" && info.response.trim()) {
+		return `SMTP did not confirm accepted recipients. Response: ${info.response}`;
+	}
+
+	return "SMTP did not confirm accepted recipients.";
+}
+
 function buildDoseIdForIntake(intake: UpcomingIntake & { medicationId: number; blisterIndex: number }): string {
 	const intakeDate = intake.intakeTime;
 	const dateOnlyMs = new Date(intakeDate.getFullYear(), intakeDate.getMonth(), intakeDate.getDate()).getTime();
@@ -166,7 +196,7 @@ async function sendIntakeReminderEmail(
 	repeatIntervalMinutes?: number,
 	currentCount?: number,
 	maxCount?: number
-): Promise<{ success: boolean; error?: string }> {
+): Promise<{ success: boolean; error?: string; messageId?: string; smtpResponse?: string }> {
 	const smtpHost = process.env.SMTP_HOST;
 	const smtpUser = process.env.SMTP_USER;
 	const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS; // Token takes precedence
@@ -310,7 +340,7 @@ ${getFooterPlain(language)}`;
 			},
 		});
 
-		await transporter.sendMail({
+		const mailResult = await transporter.sendMail({
 			from: smtpFrom,
 			to: email,
 			subject: `💊 ${subject}`,
@@ -318,7 +348,16 @@ ${getFooterPlain(language)}`;
 			html,
 		});
 
-		return { success: true };
+		const deliveryError = getDeliveryError(mailResult);
+		if (deliveryError) {
+			return { success: false, error: deliveryError };
+		}
+
+		return {
+			success: true,
+			messageId: mailResult.messageId,
+			smtpResponse: typeof mailResult.response === "string" ? mailResult.response : undefined,
+		};
 	} catch (error) {
 		const errorMessage = error instanceof Error ? error.message : "Unknown error";
 		return { success: false, error: errorMessage };
@@ -380,17 +419,26 @@ async function checkAndSendIntakeRemindersForUser(
 		`[IntakeReminder] User ${settings.userId}: Notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`
 	);
 
-	// Get all medications with intake reminders enabled for this user
+	// Build medication entries that have at least one reminder-enabled intake.
-	const medsWithReminders = rows.filter((row) => row.intakeRemindersEnabled);
+	// Intake-level reminders are the single source of truth.
+	const reminderEntries = rows
+		.map((med) => {
+			const intakes = parseIntakesJson(
+				med.intakesJson,
+				{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
+				false
+			);
+			const intakesWithReminders = intakes.filter((intake) => intake.intakeRemindersEnabled === true);
+			return { med, intakes, intakesWithReminders };
+		})
+		.filter((entry) => entry.intakesWithReminders.length > 0);
 
-	if (medsWithReminders.length === 0) {
+	if (reminderEntries.length === 0) {
 		logger.debug(`[IntakeReminder] User ${settings.userId}: No medications have reminders enabled`);
 		return; // No medications have reminders enabled for this user
 	}
 
-	logger.debug(
+	logger.debug(`[IntakeReminder] User ${settings.userId}: Found ${reminderEntries.length} medications with reminders`);
-		`[IntakeReminder] User ${settings.userId}: Found ${medsWithReminders.length} medications with reminders`
-	);
 
 	const state = loadIntakeReminderState();
 	const allUpcoming: (UpcomingIntake & { medicationId: number; blisterIndex: number })[] = [];
@@ -407,13 +455,7 @@ async function checkAndSendIntakeRemindersForUser(
 	);
 
 	// Find intakes: upcoming ones in reminder window + past ones for repeat reminders
-	for (const med of medsWithReminders) {
+	for (const { med, intakes, intakesWithReminders } of reminderEntries) {
-		// Parse intakes using new format (with per-intake takenBy), falling back to legacy
-		const intakes = parseIntakesJson(
-			med.intakesJson,
-			{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
-			med.intakeRemindersEnabled ?? false
-		);
 		// Medication-level takenBy (for fallback/display purposes)
 		const medicationTakenBy = parseTakenByJson(med.takenByJson);
 		const medDisplayName = med.name || med.genericName || "";
@@ -422,15 +464,6 @@ async function checkAndSendIntakeRemindersForUser(
 			`[IntakeReminder] User ${settings.userId}: Processing medication "${medDisplayName}" with ${intakes.length} intakes`
 		);
 
-		// Filter intakes that have reminders enabled (per-intake setting or medication-level)
-		const intakesWithReminders = intakes.filter((intake, idx) => {
-			const hasReminder = intake.intakeRemindersEnabled || med.intakeRemindersEnabled;
-			if (!hasReminder) {
-				logger.debug(`[IntakeReminder] User ${settings.userId}: Intake ${idx} has reminders disabled, skipping`);
-			}
-			return hasReminder;
-		});
-
 		// Process each intake separately to track blisterIndex
 		intakesWithReminders.forEach((intake, _blisterIndex) => {
 			const actualIndex = intakes.indexOf(intake); // Get the actual index in original array
@@ -670,7 +703,9 @@ async function checkAndSendIntakeRemindersForUser(
 		);
 		emailSuccess = result.success;
 		if (result.success) {
-			logger.info(`[IntakeReminder] User ${settings.userId}: Email sent successfully`);
+			logger.info(
+				`[IntakeReminder] User ${settings.userId}: Email sent successfully (to: ${settings.notificationEmail}, messageId: ${result.messageId}, smtp: ${result.smtpResponse})`
+			);
 		} else {
 			logger.error(`[IntakeReminder] User ${settings.userId}: Failed to send email: ${result.error}`);
 		}

backend/src/services/reminder-scheduler.ts

@@ -8,6 +8,12 @@ import { doseTracking, medications, userSettings } from "../db/schema.js";
 import { getFooterHtml, getFooterPlain, getTranslations, type Language, t } from "../i18n/translations.js";
 import { getAllUserSettings, sendShoutrrrNotification, type UserSettings } from "../routes/settings.js";
 import type { ServiceLogger } from "../utils/logger.js";
+import {
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+	normalizePackageType,
+} from "../utils/package-profiles.js";
 // Import shared utilities
 import {
 	type Blister,
@@ -268,9 +274,10 @@ async function getMedicationsNeedingReminder(
 	const msPerDay = 86_400_000;
 
 	for (const row of rows) {
+		const packageType = normalizePackageType(row.packageType);
 		// Tube stock reminders are intentionally disabled:
 		// topical usage in grams cannot be mapped reliably to schedule events.
-		if ((row.packageType ?? "blister") === "tube") continue;
+		if (isTubePackageType(packageType)) continue;
 
 		const intakes = parseIntakesJson(
 			row.intakesJson,
@@ -283,10 +290,9 @@ async function getMedicationsNeedingReminder(
 			start: i.start,
 		}));
 
-		const originalTotalPills =
+		const originalTotalPills = isAmountBasedPackageType(packageType)
-			(row.packageType ?? "blister") === "bottle"
+			? row.looseTablets + (row.stockAdjustment ?? 0)
-				? row.looseTablets + (row.stockAdjustment ?? 0)
+			: row.packCount * row.blistersPerPack * row.pillsPerBlister + row.looseTablets + (row.stockAdjustment ?? 0);
-				: row.packCount * row.blistersPerPack * row.pillsPerBlister + row.looseTablets + (row.stockAdjustment ?? 0);
 
 		const stockCorrectionCutoff = row.lastStockCorrectionAt ? new Date(row.lastStockCorrectionAt).getTime() : 0;
 		const takenDoseIds = takenDoseIdsByMed.get(row.id) ?? new Set<string>();
@@ -393,7 +399,7 @@ async function getMedicationsNeedingReminder(
 
 		if (daysLeft === null) continue;
 
-		const isLiquid = (row.packageType ?? "blister") === "liquid_container";
+		const isLiquid = isLiquidContainerPackageType(packageType);
 		const { lowDays, criticalDays } = isLiquid
 			? getLiquidReminderThresholds(reminderDaysBefore)
 			: { lowDays: lowStockDays, criticalDays: reminderDaysBefore };

backend/src/utils/package-profiles.ts

@@ -0,0 +1,32 @@
+export const PACKAGE_TYPES = ["blister", "bottle", "tube", "liquid_container"] as const;
+
+export type PackageType = (typeof PACKAGE_TYPES)[number];
+
+const PACKAGE_TYPE_SET = new Set<string>(PACKAGE_TYPES);
+
+export function normalizePackageType(packageType?: string | null): PackageType {
+	if (packageType && PACKAGE_TYPE_SET.has(packageType)) {
+		return packageType as PackageType;
+	}
+	return "blister";
+}
+
+export function isTubePackageType(packageType?: string | null): boolean {
+	return normalizePackageType(packageType) === "tube";
+}
+
+export function isLiquidContainerPackageType(packageType?: string | null): boolean {
+	return normalizePackageType(packageType) === "liquid_container";
+}
+
+export function isAmountBasedPackageType(packageType?: string | null): boolean {
+	const normalized = normalizePackageType(packageType);
+	return normalized === "bottle" || normalized === "tube" || normalized === "liquid_container";
+}
+
+export function getPlannerUnitKind(packageType?: string | null): "pills" | "ml" | "units" {
+	const normalized = normalizePackageType(packageType);
+	if (normalized === "tube") return "units";
+	if (normalized === "liquid_container") return "ml";
+	return "pills";
+}

backend/src/utils/scheduler-utils.ts

@@ -4,6 +4,7 @@
  */
 
 import { getDateLocale, type Language } from "../i18n/translations.js";
+import { isLiquidContainerPackageType, isTubePackageType } from "./package-profiles.js";
 
 // Legacy type - individual blister schedule (DEPRECATED: use Intake instead)
 export type Blister = { usage: number; every: number; start: string };
@@ -36,9 +37,9 @@ export function normalizeIntakeUsageForStock(
 ): number {
 	const usage = Number(intake.usage);
 	if (!Number.isFinite(usage) || usage <= 0) return 0;
-	if (packageType === "tube") return 0;
+	if (isTubePackageType(packageType)) return 0;
 
-	const isLiquidStock = packageType === "liquid_container" || medicationForm === "liquid";
+	const isLiquidStock = isLiquidContainerPackageType(packageType) || medicationForm === "liquid";
 	if (!isLiquidStock) return usage;
 
 	if (intake.intakeUnit === "tsp") return usage * 5;

frontend/e2e/dashboard-data.spec.ts

@@ -65,7 +65,7 @@ test.describe("Dashboard with medications", () => {
 	test("should show medication overview table with medications", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 		await expect(overviewTable.locator(".table-head")).toBeVisible();
 
@@ -77,7 +77,7 @@ test.describe("Dashboard with medications", () => {
 	test("should show status chips in overview table", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// Each medication row should have a status chip
@@ -88,7 +88,7 @@ test.describe("Dashboard with medications", () => {
 	test("should show stock information in overview", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// The Ibuprofen row should show stock info (60 pills minus today's usage = 59)
@@ -202,7 +202,7 @@ test.describe("Dashboard with medications", () => {
 	test("should open medication detail modal from overview table", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		const medRow = overviewTable.locator(".table-row").filter({ hasText: MED_1 }).first();

frontend/e2e/fixtures/index.ts

@@ -177,7 +177,9 @@ export { expect };
 // ---------------------------------------------------------------------------
 const API_BASE = process.env.PLAYWRIGHT_BASE_URL || "http://localhost:5173";
 
-function getAuthCookie(): string | null {
+let cachedAuthCookie: string | null = null;
+
+function readAuthCookieFromFile(): string | null {
 	try {
 		const state = JSON.parse(fs.readFileSync(authFile, "utf-8"));
 		return state.cookies?.find((c: { name: string }) => c.name === "access_token")?.value ?? null;
@@ -186,6 +188,49 @@ function getAuthCookie(): string | null {
 	}
 }
 
+function extractCookieValue(setCookieHeaders: string[], name: string): string | null {
+	for (const header of setCookieHeaders) {
+		const [pair] = header.split(";");
+		if (!pair) continue;
+		const [cookieName, ...valueParts] = pair.split("=");
+		if (cookieName?.trim() !== name) continue;
+		const value = valueParts.join("=").trim();
+		if (value) return value;
+	}
+	return null;
+}
+
+async function refreshAuthCookieViaLogin(): Promise<string | null> {
+	const res = await fetch(`${API_BASE}/api/auth/login`, {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify({
+			username: TEST_USER.username,
+			password: TEST_USER.password,
+			rememberMe: false,
+		}),
+	});
+
+	if (!res.ok) return null;
+
+	const getSetCookie = (res.headers as Headers & { getSetCookie?: () => string[] }).getSetCookie;
+	const setCookieHeaders = typeof getSetCookie === "function" ? getSetCookie.call(res.headers) : [];
+	const fallback = res.headers.get("set-cookie");
+	if (fallback) setCookieHeaders.push(fallback);
+
+	const accessToken = extractCookieValue(setCookieHeaders, "access_token");
+	if (accessToken) {
+		cachedAuthCookie = accessToken;
+	}
+	return accessToken;
+}
+
+function getAuthCookie(): string | null {
+	if (cachedAuthCookie) return cachedAuthCookie;
+	cachedAuthCookie = readAuthCookieFromFile();
+	return cachedAuthCookie;
+}
+
 /** Typed medication response (subset of fields we care about) */
 export interface TestMedication {
 	id: number;
@@ -214,12 +259,14 @@ export async function createMedicationViaAPI(data: {
 	takenBy?: string[];
 	notes?: string;
 	expiryDate?: string;
-	packageType?: "blister" | "bottle";
+	packageType?: "blister" | "bottle" | "tube" | "liquid_container";
+	medicationForm?: "capsule" | "tablet" | "liquid" | "topical";
 	packCount?: number;
 	blistersPerPack?: number;
 	pillsPerBlister?: number;
 	looseTablets?: number;
 	totalPills?: number;
+	packageAmountValue?: number;
 	intakeRemindersEnabled?: boolean;
 	intakes?: {
 		usage: number;
@@ -229,16 +276,30 @@ export async function createMedicationViaAPI(data: {
 		takenBy?: string | null;
 	}[];
 }): Promise<TestMedication> {
-	const token = getAuthCookie();
+	let token = getAuthCookie();
-	const isBottle = data.packageType === "bottle";
+	const packageType = data.packageType ?? "blister";
+	const isAmountBased = packageType === "bottle" || packageType === "tube" || packageType === "liquid_container";
+	let defaultMedicationForm: "capsule" | "tablet" | "liquid" | "topical" = "tablet";
+	if (packageType === "tube") {
+		defaultMedicationForm = "topical";
+	} else if (packageType === "liquid_container") {
+		defaultMedicationForm = "liquid";
+	}
+	const medicationForm = data.medicationForm ?? defaultMedicationForm;
+	const packageAmountValue =
+		data.packageAmountValue ??
+		(packageType === "tube" || packageType === "liquid_container" ? Math.max(1, data.totalPills ?? 30) : 0);
 	const body = {
-		packageType: isBottle ? "bottle" : "blister",
+		packageType,
-		packCount: isBottle ? 1 : (data.packCount ?? 1),
+		medicationForm,
-		blistersPerPack: isBottle ? 1 : (data.blistersPerPack ?? 1),
+		packCount: packageType === "tube" ? 1 : (data.packCount ?? 1),
-		pillsPerBlister: isBottle ? 1 : (data.pillsPerBlister ?? 10),
+		blistersPerPack: isAmountBased ? 1 : (data.blistersPerPack ?? 1),
-		// For bottles: looseTablets IS the current stock. Default to totalPills if not specified.
+		pillsPerBlister: isAmountBased ? 1 : (data.pillsPerBlister ?? 10),
-		looseTablets: isBottle ? (data.looseTablets ?? data.totalPills ?? 0) : (data.looseTablets ?? 0),
+		// Amount-based packages use looseTablets as current stock.
-		totalPills: isBottle ? (data.totalPills ?? null) : null,
+		looseTablets: isAmountBased ? (data.looseTablets ?? data.totalPills ?? 0) : (data.looseTablets ?? 0),
+		totalPills: isAmountBased ? (data.totalPills ?? null) : null,
+		packageAmountValue,
+		packageAmountUnit: packageType === "tube" ? "g" : "ml",
 		intakes: [
 			{
 				usage: 1,
@@ -261,6 +322,10 @@ export async function createMedicationViaAPI(data: {
 			},
 			body: JSON.stringify(body),
 		});
+		if (res.status === 401) {
+			token = await refreshAuthCookieViaLogin();
+			if (token) continue;
+		}
 		if (res.status === 429) {
 			// Rate limited — exponential backoff: 3s, 6s, 9s, 12s, 15s
 			await new Promise((r) => setTimeout(r, 3000 * (attempt + 1)));
@@ -280,12 +345,16 @@ export async function createMedicationViaAPI(data: {
  * Includes retry for rate-limited responses.
  */
 export async function deleteMedicationViaAPI(id: number): Promise<void> {
-	const token = getAuthCookie();
+	let token = getAuthCookie();
 	for (let attempt = 0; attempt < 3; attempt++) {
 		const res = await fetch(`${API_BASE}/api/medications/${id}`, {
 			method: "DELETE",
 			headers: token ? { Cookie: `access_token=${token}` } : {},
 		});
+		if (res.status === 401) {
+			token = await refreshAuthCookieViaLogin();
+			if (token) continue;
+		}
 		if (res.status === 429) {
 			await new Promise((r) => setTimeout(r, 3000 * (attempt + 1)));
 			continue;
@@ -299,11 +368,15 @@ export async function deleteMedicationViaAPI(id: number): Promise<void> {
  * Includes retry logic for rate-limited responses.
  */
 export async function deleteAllMedicationsViaAPI(): Promise<void> {
-	const token = getAuthCookie();
+	let token = getAuthCookie();
 	for (let attempt = 0; attempt < 3; attempt++) {
 		const res = await fetch(`${API_BASE}/api/medications`, {
 			headers: token ? { Cookie: `access_token=${token}` } : {},
 		});
+		if (res.status === 401) {
+			token = await refreshAuthCookieViaLogin();
+			if (token) continue;
+		}
 		if (res.status === 429) {
 			await new Promise((r) => setTimeout(r, 3000 * (attempt + 1)));
 			continue;
@@ -316,6 +389,10 @@ export async function deleteAllMedicationsViaAPI(): Promise<void> {
 					method: "DELETE",
 					headers: token ? { Cookie: `access_token=${token}` } : {},
 				});
+				if (delRes.status === 401) {
+					token = await refreshAuthCookieViaLogin();
+					if (token) continue;
+				}
 				if (delRes.status === 429) {
 					await new Promise((r) => setTimeout(r, 3000));
 					continue;
@@ -332,7 +409,7 @@ export async function deleteAllMedicationsViaAPI(): Promise<void> {
  * Requires a medication with takenBy to exist first.
  */
 export async function createShareTokenViaAPI(takenBy: string, scheduleDays = 30): Promise<TestShareToken> {
-	const token = getAuthCookie();
+	let token = getAuthCookie();
 	for (let attempt = 0; attempt < 5; attempt++) {
 		const res = await fetch(`${API_BASE}/api/share`, {
 			method: "POST",
@@ -342,6 +419,10 @@ export async function createShareTokenViaAPI(takenBy: string, scheduleDays = 30)
 			},
 			body: JSON.stringify({ takenBy, scheduleDays }),
 		});
+		if (res.status === 401) {
+			token = await refreshAuthCookieViaLogin();
+			if (token) continue;
+		}
 		if (res.status === 429) {
 			await new Promise((r) => setTimeout(r, 3000 * (attempt + 1)));
 			continue;

frontend/e2e/medication-crud.spec.ts

@@ -26,7 +26,7 @@ async function fillAndSaveMedication(
 	opts: {
 		name: string;
 		genericName?: string;
-		packageType?: "blister" | "bottle";
+		packageType?: "blister" | "bottle" | "tube" | "liquid_container";
 		packs?: string;
 		blistersPerPack?: string;
 		pillsPerBlister?: string;
@@ -56,6 +56,18 @@ async function fillAndSaveMedication(
 		if (opts.totalCapacity)
 			await form.getByLabel(/(Total Capacity|form\.totalCapacity|Total \(pills\))/i).fill(opts.totalCapacity);
 		if (opts.currentPills) await form.getByLabel(/(Current Pills|form\.currentPills)/i).fill(opts.currentPills);
+	} else if (opts.packageType === "tube") {
+		await packageTypeSelect.selectOption("tube");
+		await page.getByRole("tab", { name: /Package/i }).click();
+		if (opts.totalCapacity) {
+			await form.getByLabel(/(Amount per tube|form\.packageAmountPerTube)/i).fill(opts.totalCapacity);
+		}
+	} else if (opts.packageType === "liquid_container") {
+		await packageTypeSelect.selectOption("liquid_container");
+		await page.getByRole("tab", { name: /Package/i }).click();
+		if (opts.totalCapacity) {
+			await form.getByLabel(/(Package amount|form\.packageAmount)/i).fill(opts.totalCapacity);
+		}
 	} else {
 		await packageTypeSelect.selectOption("blister");
 		await page.getByRole("tab", { name: /Package/i }).click();
@@ -83,7 +95,11 @@ async function fillAndSaveMedication(
 			await form.getByRole("button", { name: /(Intake|form\.blisters\.addIntake)/i }).click();
 		}
 		const row = form.locator(".blister-row").nth(i);
-		await row.getByLabel(/(Usage \(pills\)|form\.blisters\.usage)/i).fill(intakes[i].usage);
+		await row
+			.getByLabel(
+				/(Usage \((pills|tablets|capsules|ml|applications)\)|form\.blisters\.(usage|usageTablets|usageCapsules|usageMl|usageApplication))/i
+			)
+			.fill(intakes[i].usage);
 		await row.getByLabel(/(Every \(days\)|form\.blisters\.everyDays)/i).fill(intakes[i].every);
 	}
 
@@ -194,6 +210,26 @@ test.describe("Medication CRUD", () => {
 			});
 		});
 
+		test("should create a tube medication via the form", async ({ page }) => {
+			await navigateTo(page, "/medications");
+
+			await fillAndSaveMedication(page, {
+				name: "Test Tube Cream",
+				packageType: "tube",
+				totalCapacity: "50",
+			});
+		});
+
+		test("should create a liquid-container medication via the form", async ({ page }) => {
+			await navigateTo(page, "/medications");
+
+			await fillAndSaveMedication(page, {
+				name: "Test Liquid Syrup",
+				packageType: "liquid_container",
+				totalCapacity: "120",
+			});
+		});
+
 		test("should create medication with notes and expiry date", async ({ page }) => {
 			await navigateTo(page, "/medications");
 

frontend/e2e/medication-edit.spec.ts

@@ -329,7 +329,7 @@ test.describe("Medication Editing", () => {
 		}
 	});
 
-	test("should change package type between blister and bottle", async ({ page }) => {
+	test("should change package type across all supported profiles", async ({ page }) => {
 		createdMeds.push(
 			await createMedicationViaAPI({
 				name: "PackType Change Med",
@@ -357,15 +357,24 @@ test.describe("Medication Editing", () => {
 		await packageSelect.selectOption("bottle");
 		await page.getByRole("tab", { name: /Package/i }).click();
 		await expect(form.getByLabel(/(Total Capacity|form\.totalCapacity|Total \(pills\))/i)).toBeVisible();
+		await page.getByRole("tab", { name: /General/i }).click();
 
-		// Fill bottle-specific fields
+		// Switch to tube
-		await form.getByLabel(/(Total Capacity|form\.totalCapacity|Total \(pills\))/i).fill("120");
+		await packageSelect.selectOption("tube");
+		await page.getByRole("tab", { name: /Package/i }).click();
+		await expect(form.getByLabel(/(Amount per tube|form\.packageAmountPerTube)/i)).toBeVisible();
+		await page.getByRole("tab", { name: /General/i }).click();
+
+		// Switch to liquid container and persist this final state
+		await packageSelect.selectOption("liquid_container");
+		await page.getByRole("tab", { name: /Package/i }).click();
+		await expect(form.getByLabel(/(Package amount|form\.packageAmount)/i)).toBeVisible();
 
 		await saveEditAndVerify(page, "PackType Change Med");
 
-		// Verify it's still a bottle after reload
+		// Verify final package type persisted
 		await clickEditMed(page, "PackType Change Med");
-		await expect(page.locator("select.package-type-select")).toHaveValue("bottle");
+		await expect(page.locator("select.package-type-select")).toHaveValue("liquid_container");
 	});
 
 	test("should edit multiple fields at once (name, notes, generic, taken-by)", async ({ page }) => {

frontend/e2e/medications.spec.ts

@@ -87,25 +87,17 @@ test.describe("Medications Page", () => {
 		expect(hasPacks || hasTotal).toBeTruthy();
 	});
 
-	test("should toggle package type between blister and bottle", async ({ page }) => {
+	test("should expose all supported package type options", async ({ page }) => {
 		await openMedicationForm(page);
 		const form = visibleMedForm(page);
-		await page.getByRole("tab", { name: /Package/i }).click();
+		const packageSelect = form.locator("select.package-type-select");
+		await expect(packageSelect).toBeVisible();
 
-		// Find the package type radio buttons or selector
+		const optionValues = await packageSelect
-		const blisterOption = form.getByText(/(Blister Pack|form\.packageType\.blister)/i);
+			.locator("option")
-		const bottleOption = form.getByText(/(Pill Bottle|form\.packageType\.bottle)/i);
+			.evaluateAll((options) => options.map((option) => (option as HTMLOptionElement).value));
 
-		if (await blisterOption.isVisible().catch(() => false)) {
+		expect(optionValues).toEqual(expect.arrayContaining(["blister", "bottle", "tube", "liquid_container"]));
-			// Switch to bottle
-			await bottleOption.click();
-			// Bottle-specific fields should appear
-			await expect(form.getByLabel(/(Total Capacity|form\.totalCapacity)/i)).toBeVisible();
-
-			// Switch back to blister
-			await blisterOption.click();
-			await expect(form.getByLabel(/(Blisters per pack|form\.blistersPerPack)/i)).toBeVisible();
-		}
 	});
 
 	test("should have intake schedule with add button", async ({ page }) => {

frontend/e2e/schedule-data.spec.ts

@@ -224,15 +224,4 @@ test.describe("Schedule with medications", () => {
 			expect(await takeButtons.count()).toBeGreaterThanOrEqual(1);
 		}
 	});
-
-	test("should show medication names in timeline rows", async ({ page }) => {
-		await navigateTo(page, "/dashboard");
-		await page.waitForLoadState("networkidle");
-
-		const todayBlock = page.locator(".day-block.today");
-		await expect(todayBlock).toBeVisible({ timeout: 15000 });
-
-		const medNames = todayBlock.locator(".med-name");
-		expect(await medNames.count()).toBeGreaterThanOrEqual(1);
-	});
 });

frontend/e2e/share-schedule.spec.ts

@@ -72,7 +72,7 @@ test.describe("Share Schedule", () => {
 	test("should show taken-by badges on dashboard overview table", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// Alice's medication should show "Alice" badge
@@ -253,7 +253,7 @@ test.describe("Share Schedule", () => {
 	test("should show notes icon on dashboard for medication with notes", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// Alice's med has notes — should show the 📝 icon
@@ -265,7 +265,7 @@ test.describe("Share Schedule", () => {
 	test("should show notes in medication detail modal", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// Click on Alice's med to open detail modal

frontend/e2e/stock-status.spec.ts

@@ -125,7 +125,7 @@ test.describe("Stock Status Levels", () => {
 	test("should show all medications in overview table", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// All 5 medications should appear
@@ -139,7 +139,7 @@ test.describe("Stock Status Levels", () => {
 	test("should show High status chip for well-stocked medication", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// High stock med row should have a .status-chip.high
@@ -151,7 +151,7 @@ test.describe("Stock Status Levels", () => {
 	test("should show Normal status chip for moderate stock medication", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		const normalRow = overviewTable.locator(".table-row").filter({ hasText: MED_NORMAL });
@@ -162,7 +162,7 @@ test.describe("Stock Status Levels", () => {
 	test("should show Warning status chip for low stock medication", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		const lowRow = overviewTable.locator(".table-row").filter({ hasText: MED_LOW });
@@ -173,7 +173,7 @@ test.describe("Stock Status Levels", () => {
 	test("should show Danger status chip for critical stock medication", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		const criticalRow = overviewTable.locator(".table-row").filter({ hasText: MED_CRITICAL });
@@ -184,7 +184,7 @@ test.describe("Stock Status Levels", () => {
 	test("should show Danger status chip for depleted medication", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		const depletedRow = overviewTable.locator(".table-row").filter({ hasText: MED_DEPLETED });
@@ -195,7 +195,7 @@ test.describe("Stock Status Levels", () => {
 	test("should show days-left and runs-out date in overview", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// High stock should show many days (around 299)
@@ -227,7 +227,7 @@ test.describe("Stock Status Levels", () => {
 	test("should color-code stock values depending on status", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// High stock row should have success-text class on stock cells
@@ -255,7 +255,7 @@ test.describe("Stock Status Levels", () => {
 	test("should open medication detail modal showing stock info", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// Click on the critical stock medication row
@@ -278,7 +278,7 @@ test.describe("Stock Status Levels", () => {
 	test("should show generic name in overview for medications that have one", async ({ page }) => {
 		await navigateTo(page, "/dashboard");
 
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		// Click on the normal stock med (has generic name "Ibuprofen 400mg")

frontend/e2e/tooltip-data.spec.ts

@@ -54,7 +54,7 @@ test.describe("MedDetail footer tooltip visibility", () => {
 	 */
 	async function openMedDetailModal(page: import("@playwright/test").Page) {
 		await navigateTo(page, "/dashboard");
-		const overviewTable = page.locator(".table.table-7");
+		const overviewTable = page.locator(".dashboard-overview-section .table").first();
 		await expect(overviewTable).toBeVisible({ timeout: 10000 });
 
 		const medRow = overviewTable.locator(".table-row").filter({ hasText: MED_NAME }).first();

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "medassist-ng-frontend",
-  "version": "1.17.0",
+  "version": "1.18.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "medassist-ng-frontend",
-      "version": "1.17.0",
+      "version": "1.18.2",
       "dependencies": {
         "i18next": "^25.8.13",
         "i18next-browser-languagedetector": "^8.2.1",
@@ -23,7 +23,7 @@
         "@testing-library/jest-dom": "^6.9.1",
         "@testing-library/react": "^16.3.2",
         "@testing-library/user-event": "^14.6.1",
-        "@types/node": "^25.3.2",
+        "@types/node": "^25.3.3",
         "@types/react": "^19.2.14",
         "@types/react-dom": "^19.2.3",
         "@types/react-router-dom": "^5.3.3",
@@ -1779,9 +1779,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.3.2",
+      "version": "25.3.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
-      "integrity": "sha512-RpV6r/ij22zRRdyBPcxDeKAzH43phWVKEjL2iksqo1Vz3CuBUrgmPpPhALKiRfU7OMCmeeO9vECBMsV0hMTG8Q==",
+      "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "medassist-ng-frontend",
   "private": true,
-  "version": "1.18.0",
+  "version": "1.19.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -42,7 +42,7 @@
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",
-    "@types/node": "^25.3.2",
+    "@types/node": "^25.3.3",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@types/react-router-dom": "^5.3.3",

frontend/playwright.base.config.ts

@@ -7,7 +7,9 @@ export function buildPlaywrightConfig(runAllBrowsers: boolean) {
 			: {};
 	const baseURL = env.PLAYWRIGHT_BASE_URL || "http://localhost:5173";
 	const parsedWorkers = Number.parseInt(env.PLAYWRIGHT_WORKERS ?? "", 10);
-	const workers = Number.isFinite(parsedWorkers) && parsedWorkers > 0 ? parsedWorkers : env.CI ? 1 : 4;
+	// Default to single-worker execution to keep API-seeded E2E suites deterministic.
+	// Still allow explicit local overrides via PLAYWRIGHT_WORKERS.
+	const workers = Number.isFinite(parsedWorkers) && parsedWorkers > 0 ? parsedWorkers : 1;
 
 	const projects: NonNullable<PlaywrightTestConfig["projects"]> = [
 		{

frontend/src/components/Auth.tsx

@@ -157,7 +157,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {
 						return;
 					}
 				}
-				log.warn("[Auth] Session refresh failed, clearing local user state", { correlationId });
+				log.debug("[Auth] Session refresh unavailable, clearing local user state", { correlationId });
 				setUser(null);
 			} else {
 				log.warn("[Auth] Unexpected /auth/me response", { status: res.status, correlationId });
@@ -181,7 +181,11 @@ export function AuthProvider({ children }: { children: ReactNode }) {
 			);
 			const res = await fetch("/api/auth/refresh", init);
 			if (!res.ok) {
-				log.warn("[Auth] Token refresh rejected", { status: res.status, correlationId });
+				if (res.status === 401) {
+					log.debug("[Auth] Token refresh rejected (unauthenticated)", { status: res.status, correlationId });
+				} else {
+					log.warn("[Auth] Token refresh rejected", { status: res.status, correlationId });
+				}
 			}
 			return res.ok;
 		} catch (error) {

frontend/src/components/MedDetailModal.tsx

@@ -15,7 +15,14 @@ import { useTranslation } from "react-i18next";
 import { Lightbox, MedicationAvatar } from "../components";
 import { useEscapeKey } from "../hooks";
 import type { Coverage, Medication, RefillEntry, StockThresholds } from "../types";
-import { getMedDisplayName, getMedTotal, getPackageSize } from "../types";
+import {
+	getMedDisplayName,
+	getMedTotal,
+	getPackageSize,
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+} from "../types";
 import { formatNumber, generateICS, getExpiryClass, getSystemLocale } from "../utils";
 import { getStockStatus } from "../utils/schedule";
 import { splitCurrentBlisterStock } from "../utils/stock";
@@ -170,7 +177,7 @@ export function MedDetailModal({
 	}, [showEditStockModal]);
 
 	const remainingPrescriptionRefills = Math.max(0, Number(selectedMed?.prescriptionRemainingRefills) || 0);
-	const prescriptionPackCapEnabled = selectedMed?.packageType === "blister" && usePrescriptionRefill;
+	const prescriptionPackCapEnabled = !isAmountBasedPackageType(selectedMed?.packageType) && usePrescriptionRefill;
 	const cappedRefillPacks = prescriptionPackCapEnabled
 		? Math.min(refillPacks, remainingPrescriptionRefills)
 		: refillPacks;
@@ -179,7 +186,7 @@ export function MedDetailModal({
 	useEffect(() => {
 		if (!selectedMed) return;
 		if (!showRefillModal) return;
-		if (selectedMed.packageType !== "blister" || !usePrescriptionRefill) return;
+		if (isAmountBasedPackageType(selectedMed.packageType) || !usePrescriptionRefill) return;
 		if (refillPacks <= remainingPrescriptionRefills) return;
 		onRefillPacksChange(remainingPrescriptionRefills);
 	}, [
@@ -192,9 +199,10 @@ export function MedDetailModal({
 	]);
 
 	if (!selectedMed) return null;
-	const isAmountPackage = selectedMed.packageType === "tube" || selectedMed.packageType === "liquid_container";
+	const isAmountPackage =
+		isTubePackageType(selectedMed.packageType) || isLiquidContainerPackageType(selectedMed.packageType);
 	const amountUnitLabel =
-		selectedMed.packageType === "liquid_container" || selectedMed.medicationForm === "liquid"
+		isLiquidContainerPackageType(selectedMed.packageType) || selectedMed.medicationForm === "liquid"
 			? t("form.packageAmountUnitMl")
 			: t("form.packageAmountUnitG");
 	const stockUnitLabel = isAmountPackage ? amountUnitLabel : null;
@@ -202,12 +210,9 @@ export function MedDetailModal({
 	const medCoverage = coverage.all.find((c) => c.name === getMedDisplayName(selectedMed));
 	const packageSize = getPackageSize(selectedMed);
 	// Structural max = sealed package capacity only (excludes pre-existing looseTablets).
-	const structuralMax =
+	const structuralMax = isAmountBasedPackageType(selectedMed.packageType)
-		selectedMed.packageType === "bottle" ||
+		? (selectedMed.totalPills ?? packageSize)
-		selectedMed.packageType === "tube" ||
+		: selectedMed.packCount * selectedMed.blistersPerPack * selectedMed.pillsPerBlister;
-		selectedMed.packageType === "liquid_container"
-			? (selectedMed.totalPills ?? packageSize)
-			: selectedMed.packCount * selectedMed.blistersPerPack * selectedMed.pillsPerBlister;
 	const currentStock = medCoverage ? Math.round(medCoverage.medsLeft) : getMedTotal(selectedMed);
 	const status = medCoverage ? getStockStatus(medCoverage.daysLeft, medCoverage.medsLeft, settings) : null;
 	const fallbackTextClass = status?.className === "warning" ? "warning-text" : "success-text";
@@ -216,12 +221,9 @@ export function MedDetailModal({
 	const currentFullBlisters = Math.max(0, stock.fullBlisters);
 	const currentPartialPills = Math.max(0, stock.openBlisterPills);
 	const currentLoosePills = Math.max(0, stock.loosePills);
-	const stockDisplayTotal =
+	const stockDisplayTotal = isAmountBasedPackageType(selectedMed.packageType)
-		selectedMed.packageType === "bottle" ||
+		? (selectedMed.totalPills ?? packageSize)
-		selectedMed.packageType === "tube" ||
+		: Math.max(0, structuralMax);
-		selectedMed.packageType === "liquid_container"
-			? (selectedMed.totalPills ?? packageSize)
-			: Math.max(0, structuralMax);
 	const packageCount = Math.max(1, Number(selectedMed.packCount) || 1);
 	const amountPerPackage = (() => {
 		const configured = Number(selectedMed.packageAmountValue ?? 0);
@@ -244,7 +246,7 @@ export function MedDetailModal({
 	const decrementLabel = t("editStock.decreaseValue");
 	const incrementLabel = t("editStock.increaseValue");
 	const getScheduleUsageLabel = (usage: number, intakeUnit?: "ml" | "tsp" | "tbsp" | null) => {
-		if (selectedMed.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(selectedMed.packageType)) {
 			if (intakeUnit === "tsp") {
 				return `${usage} ${t("form.blisters.teaspoons", { count: Math.abs(usage) })}`;
 			}
@@ -253,7 +255,7 @@ export function MedDetailModal({
 			}
 			return `${usage} ${t("form.packageAmountUnitMl")}`;
 		}
-		if (selectedMed.packageType === "tube") {
+		if (isTubePackageType(selectedMed.packageType)) {
 			return `${usage} ${t("form.blisters.applications", { count: Math.abs(usage) })}`;
 		}
 		return `${usage} ${usage !== 1 ? t("common.pills") : t("common.pill")}`;
@@ -266,12 +268,10 @@ export function MedDetailModal({
 					every: blister.every,
 					start: blister.start,
 					takenBy: null,
-					intakeRemindersEnabled: selectedMed.intakeRemindersEnabled ?? false,
+					intakeRemindersEnabled: false,
 					intakeUnit: null,
 				}));
-	const hasAnyIntakeReminder = scheduleIntakes.some(
+	const hasAnyIntakeReminder = scheduleIntakes.some((intake) => intake.intakeRemindersEnabled === true);
-		(intake) => (intake.intakeRemindersEnabled ?? selectedMed.intakeRemindersEnabled ?? false) === true
-	);
 	const normalizeBlisterStock = (nextFull: number, nextPartial: number, nextLoose: number) => {
 		let normalizedFull = Math.max(0, nextFull);
 		let normalizedPartial = Math.max(0, nextPartial);
@@ -400,7 +400,7 @@ export function MedDetailModal({
 
 	const renderEditStockModal = () => {
 		if (!showEditStockModal) return null;
-		const isLiquidPackage = selectedMed.packageType === "liquid_container";
+		const isLiquidPackage = isLiquidContainerPackageType(selectedMed.packageType);
 		const liquidBottleCount = Math.max(1, editStockFullBlisters);
 		const liquidAmountPerBottle = Math.max(1, Number.isFinite(amountPerPackage) ? amountPerPackage : 1);
 		const liquidCapacity = Math.max(1, Math.round(liquidBottleCount * liquidAmountPerBottle));
@@ -439,7 +439,7 @@ export function MedDetailModal({
 					<h2>{t("editStock.title")}</h2>
 					<p className="edit-stock-med-name">{getMedDisplayName(selectedMed)}</p>
 					<p className="edit-stock-hint">{t("editStock.hint")}</p>
-					{selectedMed.packageType === "blister" && (
+					{!isAmountBasedPackageType(selectedMed.packageType) && (
 						<p className="edit-stock-cap-info edit-stock-live-breakdown">
 							{t("editStock.currentComposition", {
 								fullBlisters: currentFullBlisters,
@@ -449,10 +449,10 @@ export function MedDetailModal({
 							})}
 						</p>
 					)}
-					{selectedMed.packageType === "bottle" && (
+					{isAmountBasedPackageType(selectedMed.packageType) && !isTubePackageType(selectedMed.packageType) && (
 						<p className="edit-stock-cap-info">{t("editStock.packageSize", { count: structuralMax })}</p>
 					)}
-					{(selectedMed.packageType === "tube" || selectedMed.packageType === "liquid_container") && (
+					{(isTubePackageType(selectedMed.packageType) || isLiquidContainerPackageType(selectedMed.packageType)) && (
 						<p className="edit-stock-cap-info">
 							{t("form.totalAmount")}: {formatNumber(isLiquidPackage ? liquidCapacity : structuralMax)}{" "}
 							{amountUnitLabel}
@@ -465,10 +465,7 @@ export function MedDetailModal({
 					{(() => {
 						const dbTotal = getMedTotal(selectedMed);
 						const currentTotal = medCoverage ? Math.round(medCoverage.medsLeft) : dbTotal;
-						const isBottle =
+						const isBottle = isAmountBasedPackageType(selectedMed.packageType);
-							selectedMed.packageType === "bottle" ||
-							selectedMed.packageType === "tube" ||
-							selectedMed.packageType === "liquid_container";
 						const enteredTotal = isLiquidPackage
 							? Math.min(liquidCapacity, editStockPartialBlisterPills)
 							: isBottle
@@ -813,7 +810,7 @@ export function MedDetailModal({
 					<div className="med-detail-section">
 						<h3>{t("modal.stockInfo")}</h3>
 						<div className="med-detail-grid">
-							{selectedMed.packageType === "blister" && (
+							{!isAmountBasedPackageType(selectedMed.packageType) && (
 								<>
 									<div className="med-detail-item">
 										<span className="med-detail-label">{t("table.fullBlisters")}</span>
@@ -832,7 +829,7 @@ export function MedDetailModal({
 									</div>
 								</>
 							)}
-							<div className={`med-detail-item ${selectedMed.packageType === "bottle" ? "full-width" : "full-width"}`}>
+							<div className="med-detail-item full-width">
 								<span className="med-detail-label">
 									{isAmountPackage ? t("form.currentAmount") : t("modal.currentStock")}
 								</span>
@@ -858,27 +855,27 @@ export function MedDetailModal({
 					<div className="med-detail-section">
 						<h3>
 							{t("modal.packageDetails")} (
-							{selectedMed.packageType === "bottle"
+							{isTubePackageType(selectedMed.packageType)
-								? t("form.packageTypeBottle")
+								? t("form.packageTypeTube")
-								: selectedMed.packageType === "tube"
+								: isLiquidContainerPackageType(selectedMed.packageType)
-									? t("form.packageTypeTube")
+									? t("form.packageTypeLiquidContainer")
-									: selectedMed.packageType === "liquid_container"
+									: isAmountBasedPackageType(selectedMed.packageType)
-										? t("form.packageTypeLiquidContainer")
+										? t("form.packageTypeBottle")
 										: t("form.packageTypeBlister")}
 							)
-							{selectedMed.packageType === "tube" && (
+							{isTubePackageType(selectedMed.packageType) && (
 								<span className="info-tooltip small" data-tooltip={t("modal.packageTypeTubeHint")}>
 									ℹ️
 								</span>
 							)}
-							{selectedMed.packageType === "liquid_container" && (
+							{isLiquidContainerPackageType(selectedMed.packageType) && (
 								<span className="info-tooltip small" data-tooltip={t("modal.packageTypeLiquidHint")}>
 									ℹ️
 								</span>
 							)}
 						</h3>
 						<div className="med-detail-grid">
-							{selectedMed.packageType === "blister" ? (
+							{!isAmountBasedPackageType(selectedMed.packageType) ? (
 								<>
 									<div className="med-detail-item">
 										<span className="med-detail-label">{t("modal.packs")}</span>
@@ -893,7 +890,7 @@ export function MedDetailModal({
 										<span className="med-detail-value">{selectedMed.pillsPerBlister}</span>
 									</div>
 								</>
-							) : selectedMed.packageType === "liquid_container" ? (
+							) : isLiquidContainerPackageType(selectedMed.packageType) ? (
 								<>
 									<div className="med-detail-item">
 										<span className="med-detail-label">{t("form.bottles")}</span>
@@ -912,7 +909,7 @@ export function MedDetailModal({
 										</span>
 									</div>
 								</>
-							) : selectedMed.packageType === "tube" ? (
+							) : isTubePackageType(selectedMed.packageType) ? (
 								<>
 									<div className="med-detail-item">
 										<span className="med-detail-label">{t("form.tubes")}</span>
@@ -967,7 +964,7 @@ export function MedDetailModal({
 						<div className="med-detail-section">
 							<h3>
 								{t("modal.intakeSchedule")}{" "}
-								{(selectedMed.intakeRemindersEnabled || hasAnyIntakeReminder) && (
+								{hasAnyIntakeReminder && (
 									<span className="reminder-icon info-tooltip" data-tooltip={t("tooltips.intakeReminders")}>
 										<Bell size={14} aria-hidden="true" />
 									</span>
@@ -978,7 +975,7 @@ export function MedDetailModal({
 									const hasPerIntakeTakenBy = !!intake.takenBy;
 									const personCount = Math.max(1, selectedMed.takenBy?.length ?? 0);
 									const totalUsage = hasPerIntakeTakenBy ? intake.usage : intake.usage * personCount;
-									const showIntakeBell = intake.intakeRemindersEnabled ?? selectedMed.intakeRemindersEnabled ?? false;
+									const showIntakeBell = intake.intakeRemindersEnabled === true;
 
 									return (
 										<div
@@ -1115,13 +1112,10 @@ export function MedDetailModal({
 											</span>
 											<span className="refill-amount">
 												{(() => {
-													const total =
+													const total = isAmountBasedPackageType(selectedMed.packageType)
-														selectedMed.packageType === "bottle" ||
+														? entry.loosePillsAdded
-														selectedMed.packageType === "tube" ||
+														: entry.packsAdded * selectedMed.blistersPerPack * selectedMed.pillsPerBlister +
-														selectedMed.packageType === "liquid_container"
+															entry.loosePillsAdded;
-															? entry.loosePillsAdded
-															: entry.packsAdded * selectedMed.blistersPerPack * selectedMed.pillsPerBlister +
-																entry.loosePillsAdded;
 													return `+${total}${isAmountPackage ? ` ${stockUnitLabel}` : ` ${total === 1 ? t("common.pill") : t("common.pills")}`}`;
 												})()}
 												{entry.usedPrescription && (
@@ -1221,7 +1215,7 @@ export function MedDetailModal({
 						<p className="refill-med-name">{getMedDisplayName(selectedMed)}</p>
 
 						<div className="refill-form">
-							{selectedMed.packageType === "blister" ? (
+							{!isAmountBasedPackageType(selectedMed.packageType) ? (
 								<>
 									<label>
 										{t("refill.packs")}
@@ -1265,7 +1259,7 @@ export function MedDetailModal({
 												onUsePrescriptionRefillChange(checked);
 												if (
 													checked &&
-													selectedMed.packageType === "blister" &&
+													!isAmountBasedPackageType(selectedMed.packageType) &&
 													refillPacks > remainingPrescriptionRefills
 												) {
 													onRefillPacksChange(remainingPrescriptionRefills);
@@ -1291,9 +1285,7 @@ export function MedDetailModal({
 									className="success"
 									onClick={() => onSubmitRefill(selectedMed.id, usePrescriptionRefill)}
 									disabled={
-										(selectedMed.packageType === "bottle" ||
+										(isAmountBasedPackageType(selectedMed.packageType)
-										selectedMed.packageType === "tube" ||
-										selectedMed.packageType === "liquid_container"
 											? refillLoose < 1
 											: cappedRefillPacks < 1 && refillLoose < 1) ||
 										exceedsPrescriptionPackLimit ||
@@ -1303,10 +1295,9 @@ export function MedDetailModal({
 									{refillSaving ? t("common.saving") : t("refill.button")}
 								</button>
 								{(() => {
-									const totalRefill =
+									const totalRefill = !isAmountBasedPackageType(selectedMed.packageType)
-										selectedMed.packageType === "blister"
+										? cappedRefillPacks * selectedMed.blistersPerPack * selectedMed.pillsPerBlister + refillLoose
-											? cappedRefillPacks * selectedMed.blistersPerPack * selectedMed.pillsPerBlister + refillLoose
+										: refillLoose;
-											: refillLoose;
 									return totalRefill > 0 ? (
 										<span className="refill-preview">
 											+{totalRefill}

frontend/src/components/MobileEditModal.tsx

@@ -10,7 +10,14 @@ import { useTranslation } from "react-i18next";
 import { useEscapeKey } from "../hooks/useEscapeKey";
 import { useScrollLock } from "../hooks/useScrollLock";
 import type { DoseUnit, FieldErrors, FormBlister, FormIntake, FormState, Medication } from "../types";
-import { DOSE_UNITS } from "../types";
+import {
+	allowsPillFormSelection,
+	DOSE_UNITS,
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+	PACKAGE_PROFILES,
+} from "../types";
 import { deriveTotal } from "../utils";
 import { DateInput } from "./DateInput";
 import { FormNumberStepper } from "./FormNumberStepper";
@@ -68,7 +75,7 @@ export interface MobileEditModalProps {
 
 /** Calculate total pills from form state */
 function deriveTotalFromForm(form: FormState) {
-	if (form.packageType === "bottle" || form.packageType === "tube" || form.packageType === "liquid_container") {
+	if (isAmountBasedPackageType(form.packageType)) {
 		// For bottle type, looseTablets is the current stock
 		return Number(form.looseTablets) || 0;
 	}
@@ -126,19 +133,19 @@ export function MobileEditModal({
 	const activeTabIndexRef = useRef(0);
 
 	const allowFractionalIntake = useMemo(() => {
-		if (form.packageType === "liquid_container") return true;
+		if (isLiquidContainerPackageType(form.packageType)) return true;
-		if (form.packageType === "tube") return form.medicationForm === "liquid";
+		if (isTubePackageType(form.packageType)) return form.medicationForm === "liquid";
 		return form.pillForm === "tablet";
 	}, [form.packageType, form.medicationForm, form.pillForm]);
 
 	const getUsageLabel = useCallback(
 		(intake: (typeof form.intakes)[number]) => {
-			if (form.packageType === "liquid_container") {
+			if (isLiquidContainerPackageType(form.packageType)) {
 				if (intake.intakeUnit === "tsp") return t("form.blisters.usageTsp");
 				if (intake.intakeUnit === "tbsp") return t("form.blisters.usageTbsp");
 				return t("form.blisters.usageMl");
 			}
-			if (form.packageType === "tube") {
+			if (isTubePackageType(form.packageType)) {
 				return form.medicationForm === "liquid" ? t("form.blisters.usageMl") : t("form.blisters.usageApplication");
 			}
 			if (form.pillForm === "capsule") return t("form.blisters.usageCapsules");
@@ -147,7 +154,7 @@ export function MobileEditModal({
 		[form.packageType, form.medicationForm, form.pillForm, t]
 	);
 
-	const usesAmountLabels = form.packageType === "tube" || form.packageType === "liquid_container";
+	const usesAmountLabels = isTubePackageType(form.packageType) || isLiquidContainerPackageType(form.packageType);
 	const totalCapacityLabel = usesAmountLabels ? t("form.totalAmount") : t("form.totalCapacity");
 	const currentStockLabel = usesAmountLabels ? t("form.currentAmount") : t("form.currentPills");
 	const totalLabel = usesAmountLabels ? t("form.totalAmountLabel") : t("form.total");
@@ -432,10 +439,11 @@ export function MobileEditModal({
 												value={form.packageType}
 												onChange={(e) => onHandleValueChange("packageType", e.target.value as FormState["packageType"])}
 											>
-												<option value="blister">{t("form.packageTypeBlister")}</option>
+												{PACKAGE_PROFILES.map((profile) => (
-												<option value="bottle">{t("form.packageTypeBottle")}</option>
+													<option key={profile.value} value={profile.value}>
-												<option value="tube">{t("form.packageTypeTube")}</option>
+														{t(profile.labelKey)}
-												<option value="liquid_container">{t("form.packageTypeLiquidContainer")}</option>
+													</option>
+												))}
 											</select>
 										</label>
 										<label className="full">
@@ -446,7 +454,7 @@ export function MobileEditModal({
 												placeholder={t("common.optional")}
 											/>
 										</label>
-										{form.packageType !== "tube" && form.packageType !== "liquid_container" && (
+										{allowsPillFormSelection(form.packageType) && (
 											<label className="full">
 												{t("form.pillForm")}
 												<select
@@ -458,7 +466,7 @@ export function MobileEditModal({
 												</select>
 											</label>
 										)}
-										{form.packageType === "tube" && (
+										{isTubePackageType(form.packageType) && (
 											<label className="full">
 												{t("form.medicationForm")}
 												<select value={"topical"} onChange={() => onHandleValueChange("medicationForm", "topical")}>
@@ -466,7 +474,7 @@ export function MobileEditModal({
 												</select>
 											</label>
 										)}
-										{form.packageType === "liquid_container" && (
+										{isLiquidContainerPackageType(form.packageType) && (
 											<label className="full">
 												{t("form.medicationForm")}
 												<select value={"liquid"} onChange={() => onHandleValueChange("medicationForm", "liquid")}>
@@ -560,7 +568,7 @@ export function MobileEditModal({
 									<div className="full form-category">
 										<h4 className="form-category-title">{t("form.sections.stock")}</h4>
 										{(() => {
-											if (form.packageType === "blister") {
+											if (!isAmountBasedPackageType(form.packageType)) {
 												return (
 													<>
 														<label>
@@ -601,7 +609,7 @@ export function MobileEditModal({
 												);
 											}
 
-											if (form.packageType === "tube") {
+											if (isTubePackageType(form.packageType)) {
 												return (
 													<>
 														<label>
@@ -640,7 +648,7 @@ export function MobileEditModal({
 												);
 											}
 
-											if (form.packageType === "liquid_container") {
+											if (isLiquidContainerPackageType(form.packageType)) {
 												return (
 													<>
 														<label>
@@ -710,19 +718,17 @@ export function MobileEditModal({
 												</>
 											);
 										})()}
-										{form.packageType === "bottle" && (
+										{isAmountBasedPackageType(form.packageType) && !isTubePackageType(form.packageType) && (
 											<div className="full stock-total-row">
 												<div className="stock-total-field">
 													<p className="sub">
 														<strong>{totalLabel}:</strong> {deriveTotalFromForm(form)}
-														{form.packageType !== "tube" && form.packageType !== "liquid_container"
+														{` ${deriveTotalFromForm(form) === 1 ? t("common.pill") : t("common.pills")}`}
-															? ` ${deriveTotalFromForm(form) === 1 ? t("common.pill") : t("common.pills")}`
-															: ""}
 													</p>
 												</div>
 											</div>
 										)}
-										{form.packageType !== "tube" && form.packageType !== "liquid_container" && (
+										{allowsPillFormSelection(form.packageType) && (
 											<label className="full">
 												{t("form.pillWeight")} ({form.doseUnit})
 												<div className="dose-input-group">
@@ -839,7 +845,7 @@ export function MobileEditModal({
 														onChange={(e) => onSetIntakeValue(idx, "startTime", e.target.value)}
 													/>
 												</label>
-												{form.packageType === "liquid_container" && (
+												{isLiquidContainerPackageType(form.packageType) && (
 													<label className="compact full-row">
 														<span>{t("form.blisters.intakeUnit")}</span>
 														<select

frontend/src/components/ReportModal.tsx

@@ -3,7 +3,13 @@ import { useTranslation } from "react-i18next";
 import { useEscapeKey } from "../hooks/useEscapeKey";
 import { useScrollLock } from "../hooks/useScrollLock";
 import type { Medication } from "../types";
-import { getMedDisplayName, getPackageSize } from "../types";
+import {
+	getMedDisplayName,
+	getPackageSize,
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+} from "../types";
 import { MedicationAvatar } from "./MedicationAvatar";
 
 type ReportFormat = "txt" | "md" | "pdf";
@@ -299,35 +305,35 @@ function fmtDateTime(iso: string | null | undefined): string {
 }
 
 function getTubeUnitKey(med: Medication): "form.ml" | "blisters.applications" {
-	if (med.packageType === "liquid_container") return "form.ml";
+	if (isLiquidContainerPackageType(med.packageType)) return "form.ml";
 	return med.medicationForm === "liquid" ? "form.ml" : "blisters.applications";
 }
 
 function getUsageText(med: Medication, usage: number, t: TFn): string {
-	if (med.packageType === "tube" || med.packageType === "liquid_container") {
+	if (isTubePackageType(med.packageType) || isLiquidContainerPackageType(med.packageType)) {
 		return `${usage} ${t(getTubeUnitKey(med))}`;
 	}
 	return `${usage} ${usage === 1 ? t("common.pill") : t("common.pills")}`;
 }
 
 function getTotalCapacityLabel(med: Medication, t: TFn): string {
-	if (med.packageType === "tube" || med.packageType === "liquid_container") {
+	if (isTubePackageType(med.packageType) || isLiquidContainerPackageType(med.packageType)) {
 		return t("form.totalAmountLabel", { unit: t(getTubeUnitKey(med)) });
 	}
 	return t("report.docTotalCapacity");
 }
 
 function getCurrentStockText(med: Medication, t: TFn): string {
-	if (med.packageType === "tube" || med.packageType === "liquid_container") {
+	if (isTubePackageType(med.packageType) || isLiquidContainerPackageType(med.packageType)) {
 		return `${getPackageSize(med)} ${t(getTubeUnitKey(med))}`;
 	}
 	return `${getPackageSize(med)} ${t("common.pills")}`;
 }
 
 function getReportPackageTypeLabel(med: Medication, t: TFn): string {
-	if (med.packageType === "bottle") return t("report.docBottle");
+	if (isTubePackageType(med.packageType)) return t("report.docTube");
-	if (med.packageType === "tube") return t("report.docTube");
+	if (isLiquidContainerPackageType(med.packageType)) return t("form.packageTypeLiquidContainer");
-	if (med.packageType === "liquid_container") return t("form.packageTypeLiquidContainer");
+	if (isAmountBasedPackageType(med.packageType)) return t("report.docBottle");
 	return t("report.docBlister");
 }
 
@@ -374,7 +380,7 @@ function generateTextReport(
 		// Package / Stock
 		lines.push(h3(t("report.docPackage")));
 		lines.push(item(t("report.docPackageType"), getReportPackageTypeLabel(med, t)));
-		if (med.packageType === "blister") {
+		if (!isAmountBasedPackageType(med.packageType)) {
 			lines.push(item(t("report.docPacks"), String(med.packCount)));
 			lines.push(item(t("report.docBlistersPerPack"), String(med.blistersPerPack)));
 			lines.push(item(t("report.docPillsPerBlister"), String(med.pillsPerBlister)));
@@ -383,7 +389,7 @@ function generateTextReport(
 			lines.push(item(getTotalCapacityLabel(med, t), String(med.totalPills ?? med.looseTablets)));
 		}
 		lines.push(item(t("report.docCurrentStock"), getCurrentStockText(med, t)));
-		if (med.packageType !== "tube" && med.packageType !== "liquid_container" && med.pillWeightMg)
+		if (!isTubePackageType(med.packageType) && !isLiquidContainerPackageType(med.packageType) && med.pillWeightMg)
 			lines.push(item(t("report.docDosePerPill"), `${med.pillWeightMg} ${med.doseUnit ?? "mg"}`));
 		if (med.expiryDate) lines.push(item(t("report.docExpiryDate"), fmtDate(med.expiryDate)));
 		if (med.notes) lines.push(item(t("report.docNotes"), med.notes));
@@ -439,7 +445,7 @@ function generateTextReport(
 			if (data.refills.length > 0) {
 				lines.push(h3(t("report.docRefillHistory")));
 				for (const r of data.refills) {
-					let entry = `${fmtDate(r.refillDate)}: +${r.packsAdded} ${t("report.docPacks")}, +${r.loosePillsAdded} ${med.packageType === "tube" || med.packageType === "liquid_container" ? t(getTubeUnitKey(med)) : t("common.pills")}`;
+					let entry = `${fmtDate(r.refillDate)}: +${r.packsAdded} ${t("report.docPacks")}, +${r.loosePillsAdded} ${isTubePackageType(med.packageType) || isLiquidContainerPackageType(med.packageType) ? t(getTubeUnitKey(med)) : t("common.pills")}`;
 					if (r.usedPrescription) entry += ` ${t("report.docRefillPrescription")}`;
 					lines.push(fmt === "md" ? `- ${entry}` : `  • ${entry}`);
 				}
@@ -572,7 +578,7 @@ function buildPrintHtml(
 		s += `<h3>${escHtml(t("report.docPackage"))}</h3>`;
 		s += `<table><tbody>`;
 		s += `<tr><td class="label">${escHtml(t("report.docPackageType"))}</td><td>${escHtml(getReportPackageTypeLabel(med, t))}</td></tr>`;
-		if (med.packageType === "blister") {
+		if (!isAmountBasedPackageType(med.packageType)) {
 			s += `<tr><td class="label">${escHtml(t("report.docPacks"))}</td><td>${med.packCount}</td></tr>`;
 			s += `<tr><td class="label">${escHtml(t("report.docBlistersPerPack"))}</td><td>${med.blistersPerPack}</td></tr>`;
 			s += `<tr><td class="label">${escHtml(t("report.docPillsPerBlister"))}</td><td>${med.pillsPerBlister}</td></tr>`;
@@ -582,7 +588,7 @@ function buildPrintHtml(
 			s += `<tr><td class="label">${escHtml(getTotalCapacityLabel(med, t))}</td><td>${med.totalPills ?? med.looseTablets}</td></tr>`;
 		}
 		s += `<tr><td class="label">${escHtml(t("report.docCurrentStock"))}</td><td>${escHtml(getCurrentStockText(med, t))}</td></tr>`;
-		if (med.packageType !== "tube" && med.packageType !== "liquid_container" && med.pillWeightMg)
+		if (!isTubePackageType(med.packageType) && !isLiquidContainerPackageType(med.packageType) && med.pillWeightMg)
 			s += `<tr><td class="label">${escHtml(t("report.docDosePerPill"))}</td><td>${med.pillWeightMg} ${escHtml(med.doseUnit ?? "mg")}</td></tr>`;
 		if (med.expiryDate)
 			s += `<tr><td class="label">${escHtml(t("report.docExpiryDate"))}</td><td>${fmtDate(med.expiryDate)}</td></tr>`;
@@ -646,7 +652,7 @@ function buildPrintHtml(
 				s += `<h3>${escHtml(t("report.docRefillHistory"))}</h3>`;
 				s += `<ul>`;
 				for (const r of data.refills) {
-					let entry = `${fmtDate(r.refillDate)}: +${r.packsAdded} ${escHtml(t("report.docPacks"))}, +${r.loosePillsAdded} ${escHtml(med.packageType === "tube" || med.packageType === "liquid_container" ? t(getTubeUnitKey(med)) : t("common.pills"))}`;
+					let entry = `${fmtDate(r.refillDate)}: +${r.packsAdded} ${escHtml(t("report.docPacks"))}, +${r.loosePillsAdded} ${escHtml(isTubePackageType(med.packageType) || isLiquidContainerPackageType(med.packageType) ? t(getTubeUnitKey(med)) : t("common.pills"))}`;
 					if (r.usedPrescription) entry += ` <em>${escHtml(t("report.docRefillPrescription"))}</em>`;
 					s += `<li>${entry}</li>`;
 				}

frontend/src/components/SharedSchedule.tsx

@@ -9,7 +9,7 @@ import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
 import { useEscapeKey } from "../hooks";
 import type { ExpiredLinkData, SharedScheduleData } from "../types";
-import { getMedDisplayName, getMedTotal } from "../types";
+import { getMedDisplayName, getMedTotal, isLiquidContainerPackageType, isTubePackageType } from "../types";
 import { getSystemLocale } from "../utils/formatters";
 import { isDoseDismissed } from "../utils/schedule";
 import { loadCollapsedDaysFromStorage } from "../utils/storage";
@@ -24,10 +24,10 @@ function getStockStatus(
 	thresholds: { lowStockDays: number; normalStockDays: number; highStockDays: number; criticalStockDays: number },
 	packageType?: string
 ) {
-	if (packageType === "tube") return { className: "success", label: "status.noSchedule" };
+	if (isTubePackageType(packageType)) return { className: "success", label: "status.noSchedule" };
 	if (medsLeft <= 0 || daysLeft === 0) return { className: "danger", label: "status.outOfStock" };
 	if (daysLeft === null) return { className: "success", label: "status.noSchedule" };
-	if (packageType === "liquid_container") {
+	if (isLiquidContainerPackageType(packageType)) {
 		const lowDays = Math.max(1, Math.floor(thresholds.criticalStockDays));
 		const criticalDays = Math.max(1, Math.ceil(lowDays / 2));
 		if (daysLeft <= criticalDays) return { className: "danger", label: "status.criticalStock" };
@@ -54,7 +54,7 @@ export function SharedSchedule() {
 	const [showFutureDays, setShowFutureDays] = useState(false);
 
 	const isLiquidContainerMed = (med: SharedScheduleData["medications"][number] | undefined) =>
-		med?.packageType === "liquid_container";
+		isLiquidContainerPackageType(med?.packageType);
 
 	const convertLiquidUsageToMl = (usage: number, unit: "ml" | "tsp" | "tbsp" | null | undefined): number => {
 		if (unit === "tsp") return usage * 5;
@@ -67,7 +67,7 @@ export function SharedSchedule() {
 		med: SharedScheduleData["medications"][number] | undefined,
 		unit: "ml" | "tsp" | "tbsp" | null | undefined
 	): number => {
-		if (med?.packageType === "tube") return 0;
+		if (isTubePackageType(med?.packageType)) return 0;
 		if (!isLiquidContainerMed(med)) return usage;
 		return convertLiquidUsageToMl(usage, unit);
 	};
@@ -140,7 +140,7 @@ export function SharedSchedule() {
 	const shouldHideNoScheduleStatusForTube = (
 		med: SharedScheduleData["medications"][number] | undefined,
 		status: { className: string; label: string } | null
-	) => med?.packageType === "tube" && status?.label === "status.noSchedule";
+	) => isTubePackageType(med?.packageType) && status?.label === "status.noSchedule";
 
 	const getVisibleStockStatus = (
 		med: SharedScheduleData["medications"][number] | undefined,
@@ -423,7 +423,12 @@ export function SharedSchedule() {
 			// Use intakes (with per-intake takenBy) if available, fallback to blisters (legacy)
 			const intakes =
 				med.intakes ||
-				med.blisters.map((b) => ({ ...b, takenBy: null as string | null, intakeRemindersEnabled: false }));
+				med.blisters.map((b) => ({
+					...b,
+					intakeUnit: null,
+					takenBy: null as string | null,
+					intakeRemindersEnabled: false,
+				}));
 
 			intakes.forEach((intake, intakeIdx) => {
 				// Filter: only include intakes for this person (null = everyone, or matches share's takenBy)
@@ -535,7 +540,14 @@ export function SharedSchedule() {
 		const depletion: Record<string, number | null> = {};
 
 		for (const med of data.medications) {
-			const intakes = med.intakes || med.blisters.map((b) => ({ ...b, takenBy: null as string | null }));
+			const intakes =
+				med.intakes ||
+				med.blisters.map((b) => ({
+					...b,
+					intakeUnit: null,
+					takenBy: null as string | null,
+					intakeRemindersEnabled: false,
+				}));
 
 			// Count unique people from all intakes (for per-intake takenBy)
 			const uniquePeople = new Set<string>();

frontend/src/hooks/useMedicationForm.ts

@@ -1,7 +1,13 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import type { FieldErrors, FormBlister, FormIntake, FormState, Medication } from "../types";
-import { FIELD_LIMITS } from "../types";
+import {
+	FIELD_LIMITS,
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+	normalizePackageType,
+} from "../types";
 import { toDateValue, toTimeValue } from "../utils/formatters";
 
 export const defaultBlister = (): FormBlister => {
@@ -213,7 +219,7 @@ export function useMedicationForm(): UseMedicationFormReturn {
 						every: String(i.every),
 						startDate: toDateValue(i.start),
 						startTime: toTimeValue(i.start),
-						intakeUnit: i.intakeUnit ?? "ml",
+						intakeUnit: (i.intakeUnit ?? "ml") as FormIntake["intakeUnit"],
 						takenBy: i.takenBy ?? "", // Convert null to empty string for form
 						intakeRemindersEnabled: i.intakeRemindersEnabled,
 					}))
@@ -222,7 +228,7 @@ export function useMedicationForm(): UseMedicationFormReturn {
 						every: String(s.every),
 						startDate: toDateValue(s.start),
 						startTime: toTimeValue(s.start),
-						intakeUnit: "ml",
+						intakeUnit: "ml" as const,
 						takenBy: "", // Legacy blisters have no per-intake takenBy
 						intakeRemindersEnabled: med.intakeRemindersEnabled ?? false,
 					}));
@@ -230,18 +236,19 @@ export function useMedicationForm(): UseMedicationFormReturn {
 		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 isTubeOrLiquidPackage = med.packageType === "tube" || med.packageType === "liquid_container";
+		const packageType = normalizePackageType(med.packageType);
+		const isTubeOrLiquidPackage = isTubePackageType(packageType) || isLiquidContainerPackageType(packageType);
 		let normalizedPackCount = String(med.packCount);
 		let normalizedPackageAmountValue = String(med.packageAmountValue ?? 0);
 
 		if (isTubeOrLiquidPackage) {
-			const safePackCount = med.packageType === "tube" ? 1 : Math.max(1, med.packCount || 1);
+			const safePackCount = isTubePackageType(packageType) ? 1 : Math.max(1, med.packCount || 1);
 			normalizedPackCount = String(safePackCount);
 
 			const rawPackageAmount = Number(med.packageAmountValue ?? 0);
 			const legacyKnownAmount = Math.max(0, Number(med.totalPills ?? 0), Number(med.looseTablets ?? 0));
 
-			if (med.packageType === "tube") {
+			if (isTubePackageType(packageType)) {
 				normalizedPackageAmountValue = String(
 					legacyKnownAmount > 0 ? legacyKnownAmount : Math.max(1, rawPackageAmount)
 				);
@@ -256,16 +263,12 @@ export function useMedicationForm(): UseMedicationFormReturn {
 			? Math.max(0, (Number(normalizedPackCount) || 0) * (Number(normalizedPackageAmountValue) || 0))
 			: null;
 
-		const bottleTotalPills =
+		const bottleTotalPills = isAmountBasedPackageType(packageType) && med.looseTablets ? String(med.looseTablets) : "";
-			(med.packageType === "bottle" || med.packageType === "tube" || med.packageType === "liquid_container") &&
-			med.looseTablets
-				? String(med.looseTablets)
-				: "";
 		let resolvedForm = med.medicationForm;
 		if (!resolvedForm) {
-			if (med.packageType === "tube") {
+			if (isTubePackageType(packageType)) {
 				resolvedForm = "topical";
-			} else if (med.packageType === "liquid_container") {
+			} else if (isLiquidContainerPackageType(packageType)) {
 				resolvedForm = "liquid";
 			} else {
 				resolvedForm = med.pillForm ?? "tablet";
@@ -273,9 +276,9 @@ export function useMedicationForm(): UseMedicationFormReturn {
 		}
 		const resolvedPillForm = med.pillForm ?? (resolvedForm === "capsule" ? "capsule" : "tablet");
 		let normalizedPackageAmountUnit = med.packageAmountUnit ?? "ml";
-		if (med.packageType === "tube") {
+		if (isTubePackageType(packageType)) {
 			normalizedPackageAmountUnit = "g";
-		} else if (med.packageType === "liquid_container") {
+		} else if (isLiquidContainerPackageType(packageType)) {
 			normalizedPackageAmountUnit = "ml";
 		}
 		let resolvedTotalPills = bottleTotalPills;
@@ -291,7 +294,7 @@ export function useMedicationForm(): UseMedicationFormReturn {
 			medicationForm: resolvedForm,
 			pillForm: resolvedPillForm,
 			lifecycleCategory: med.lifecycleCategory ?? "refill_when_empty",
-			packageType: med.packageType ?? "blister",
+			packageType,
 			packCount: normalizedPackCount,
 			blistersPerPack: String(med.blistersPerPack),
 			pillsPerBlister: String(med.pillsPerBlister),
@@ -347,14 +350,14 @@ export function useMedicationForm(): UseMedicationFormReturn {
 				const next = { ...prev, [key]: value } as FormState;
 
 				if (key === "packageType") {
-					if (value === "tube") {
+					if (isTubePackageType(value)) {
 						next.packCount = "1";
 						next.packageAmountValue = String(Math.max(1, Number(next.packageAmountValue) || 0));
 						next.medicationForm = "topical";
 						next.lifecycleCategory = "treatment_period";
 						next.doseUnit = "units";
 						next.packageAmountUnit = "g";
-					} else if (value === "liquid_container") {
+					} else if (isLiquidContainerPackageType(value)) {
 						next.packCount = String(Math.max(1, Number(next.packCount) || 1));
 						next.packageAmountValue = String(Math.max(1, Number(next.packageAmountValue) || 0));
 						next.medicationForm = "liquid";
@@ -369,12 +372,12 @@ export function useMedicationForm(): UseMedicationFormReturn {
 				}
 
 				if (key === "medicationForm") {
-					if (next.packageType === "tube") {
+					if (isTubePackageType(next.packageType)) {
 						next.medicationForm = "topical";
 						next.lifecycleCategory = "treatment_period";
 						next.doseUnit = "units";
 						next.packageAmountUnit = "g";
-					} else if (next.packageType === "liquid_container") {
+					} else if (isLiquidContainerPackageType(next.packageType)) {
 						next.medicationForm = "liquid";
 						next.lifecycleCategory = "refill_when_empty";
 						next.doseUnit = "ml";
@@ -383,10 +386,10 @@ export function useMedicationForm(): UseMedicationFormReturn {
 					}
 				}
 
-				if (next.packageType === "tube") {
+				if (isTubePackageType(next.packageType)) {
 					next.packCount = "1";
 					next.packageAmountUnit = "g";
-				} else if (next.packageType === "liquid_container") {
+				} else if (isLiquidContainerPackageType(next.packageType)) {
 					next.packageAmountUnit = "ml";
 				}
 

frontend/src/hooks/useRefill.ts

@@ -1,6 +1,12 @@
 import { useCallback, useEffect, useState } from "react";
 import type { Coverage, FormState, Medication, RefillEntry } from "../types";
-import { getMedTotal, getPackageSize } from "../types";
+import {
+	getMedTotal,
+	getPackageSize,
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+} from "../types";
 
 export interface UseRefillReturn {
 	// Refill state
@@ -137,10 +143,9 @@ export function useRefill(): UseRefillReturn {
 			if (!selectedMed) return;
 			setEditStockSaving(true);
 			try {
-				const isTubePackage = selectedMed.packageType === "tube";
+				const isTubePackage = isTubePackageType(selectedMed.packageType);
-				const isBottlePackage = selectedMed.packageType === "bottle";
+				const isLiquidPackage = isLiquidContainerPackageType(selectedMed.packageType);
-				const isLiquidPackage = selectedMed.packageType === "liquid_container";
+				const isAmountPackage = isAmountBasedPackageType(selectedMed.packageType);
-				const isAmountPackage = isBottlePackage || isTubePackage || isLiquidPackage;
 				const liquidAmountPerBottle = Math.max(
 					1,
 					Number.isFinite(Number(selectedMed.packageAmountValue)) && Number(selectedMed.packageAmountValue) > 0
@@ -268,10 +273,7 @@ export function useRefill(): UseRefillReturn {
 	const openEditStockModal = useCallback((selectedMed: Medication, coverage: { all: Coverage[] }) => {
 		if (!selectedMed) return;
 		setEditStockMedication(selectedMed);
-		const isAmountPackage =
+		const isAmountPackage = isAmountBasedPackageType(selectedMed.packageType);
-			selectedMed.packageType === "bottle" ||
-			selectedMed.packageType === "tube" ||
-			selectedMed.packageType === "liquid_container";
 		// Get current stock from coverage (after consumption)
 		const medCoverage = coverage.all.find((c) => c.name === selectedMed.name);
 		const dbTotal = getMedTotal(selectedMed);
@@ -282,7 +284,7 @@ export function useRefill(): UseRefillReturn {
 		const knownLoose = Math.min(currentStock, Math.max(0, selectedMed.looseTablets));
 		const sealedPills = Math.max(0, currentStock - knownLoose);
 		let fullBlisters: number;
-		if (selectedMed.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(selectedMed.packageType)) {
 			fullBlisters = Math.max(1, selectedMed.packCount);
 		} else if (isAmountPackage) {
 			fullBlisters = 0;

frontend/src/hooks/useSettings.ts

@@ -49,6 +49,8 @@ export interface Settings {
 	upcomingTodayOnly: boolean;
 	shareScheduleTodayOnly: boolean;
 	swapDashboardMainSections: boolean;
+	reminderHour: number;
+	reminderMinutesBefore: number;
 	expiryWarningDays: number;
 }
 
@@ -96,6 +98,8 @@ const defaultSettings: Settings = {
 	upcomingTodayOnly: false,
 	shareScheduleTodayOnly: false,
 	swapDashboardMainSections: false,
+	reminderHour: 6,
+	reminderMinutesBefore: 15,
 	expiryWarningDays: 30,
 };
 

frontend/src/i18n/de.json

@@ -323,9 +323,9 @@
     "schedule": {
       "title": "Erinnerungsplan",
       "stockCheck": "Bestands- & Rezeptprüfung",
-      "dailyAt6": "Täglich um 6:00 Uhr",
+      "dailyAtHour": "Täglich um {{hour}}:00 Uhr",
       "intakeCheck": "Einnahmeprüfung",
-      "15minBefore": "15 Min. vor geplanter Zeit",
+      "minutesBefore": "{{minutes}} Min. vor geplanter Zeit",
       "nextCheck": "Nächste Bestandsprüfung",
       "lastSent": "Letzte Benachrichtigung",
       "lastStockSent": "Letzte Bestands-Erinnerung",

frontend/src/i18n/en.json

@@ -323,9 +323,9 @@
     "schedule": {
       "title": "Reminder Schedule",
       "stockCheck": "Stock & prescription check",
-      "dailyAt6": "Daily at 6:00 AM",
+      "dailyAtHour": "Daily at {{hour}}:00",
       "intakeCheck": "Intake check",
-      "15minBefore": "15 min before scheduled time",
+      "minutesBefore": "{{minutes}} min before scheduled time",
       "nextCheck": "Next stock check",
       "lastSent": "Last notification sent",
       "lastStockSent": "Last stock reminder",

frontend/src/pages/DashboardPage.tsx

@@ -6,7 +6,14 @@ import { ConfirmModal, MedicationAvatar } from "../components";
 import { useAuth } from "../components/Auth";
 import { useAppContext } from "../context";
 import { useModalHistory } from "../hooks";
-import { type Coverage, getMedDisplayName } from "../types";
+import {
+	allowsPillFormSelection,
+	type Coverage,
+	getMedDisplayName,
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+} from "../types";
 import { formatNumber, getExpiryClass, getSystemLocale } from "../utils/formatters";
 import { expandDoseIds, getStockStatus, isDoseDismissed } from "../utils/schedule";
 import {
@@ -132,15 +139,15 @@ export function DashboardPage() {
 	const prescriptionEmptyCount = prescriptionLowMeds.filter((med) => med.remainingRefills <= 0).length;
 
 	const getTubeUnitLabel = (med: (typeof meds)[number] | undefined, value: number) =>
-		med?.packageType === "liquid_container" || med?.medicationForm === "liquid"
+		isLiquidContainerPackageType(med?.packageType) || med?.medicationForm === "liquid"
 			? t("form.packageAmountUnitMl")
 			: t("form.blisters.applications", { count: Math.abs(value) });
 
 	const formatStockLabel = (med: (typeof meds)[number] | undefined, medsLeft: number) => {
-		if (med?.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(med?.packageType)) {
 			return `${formatNumber(medsLeft)} ${t("form.packageAmountUnitMl")}`;
 		}
-		if (med?.packageType === "tube") {
+		if (isTubePackageType(med?.packageType)) {
 			return `${formatNumber(medsLeft)} ${getTubeUnitLabel(med, medsLeft)}`;
 		}
 		return t("table.pillsCount", { count: Math.round(medsLeft) });
@@ -177,10 +184,10 @@ export function DashboardPage() {
 		usage: number,
 		intakeUnit?: "ml" | "tsp" | "tbsp" | null
 	) => {
-		if (med?.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(med?.packageType)) {
 			return formatLiquidUsageLabel(usage, intakeUnit);
 		}
-		if (med?.packageType === "tube") {
+		if (isTubePackageType(med?.packageType)) {
 			return `${usage} ${getTubeUnitLabel(med, usage)}`;
 		}
 		return `${usage} ${usage !== 1 ? t("common.pills") : t("common.pill")}`;
@@ -192,7 +199,7 @@ export function DashboardPage() {
 		intakeUnit?: "ml" | "tsp" | "tbsp" | null,
 		doses?: Array<{ usage: number; intakeUnit?: "ml" | "tsp" | "tbsp" | null }>
 	) => {
-		if (med?.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(med?.packageType)) {
 			if (doses && doses.length > 0) {
 				const normalizedDoses = doses.filter((dose) => Number.isFinite(Number(dose.usage)) && Number(dose.usage) > 0);
 				if (normalizedDoses.length > 0) {
@@ -214,7 +221,7 @@ export function DashboardPage() {
 
 			return formatLiquidUsageLabel(total, intakeUnit);
 		}
-		if (med?.packageType === "tube") {
+		if (isTubePackageType(med?.packageType)) {
 			return `${total} ${getTubeUnitLabel(med, total)}`;
 		}
 		return t("common.pillsTotal", { count: total });
@@ -245,7 +252,7 @@ export function DashboardPage() {
 			const personMultiplier = hasPerIntakeTakenBy ? 1 : Math.max(1, med.takenBy?.length ?? 0);
 			const normalizedUsage = (usage * personMultiplier) / every;
 
-			if (med.packageType === "liquid_container") {
+			if (isLiquidContainerPackageType(med.packageType)) {
 				dailyTotal += convertLiquidUsageToMl(normalizedUsage, intake.intakeUnit ?? "ml");
 			} else {
 				dailyTotal += normalizedUsage;
@@ -254,11 +261,11 @@ export function DashboardPage() {
 
 		if (dailyTotal <= 0) return "-";
 
-		if (med.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(med.packageType)) {
 			return t("table.perDayWithUnit", { value: formatNumber(dailyTotal), unit: t("form.packageAmountUnitMl") });
 		}
 
-		if (med.packageType === "tube") {
+		if (isTubePackageType(med.packageType)) {
 			const tubeUnit =
 				med.medicationForm === "liquid"
 					? t("form.packageAmountUnitMl")
@@ -273,7 +280,7 @@ export function DashboardPage() {
 	const shouldHideNoScheduleStatusForTube = (
 		med: (typeof meds)[number] | undefined,
 		status: { className: string; label: string } | null
-	) => med?.packageType === "tube" && status?.label === "status.noSchedule";
+	) => isTubePackageType(med?.packageType) && status?.label === "status.noSchedule";
 
 	const getVisibleStockStatus = (
 		med: (typeof meds)[number] | undefined,
@@ -746,9 +753,7 @@ export function DashboardPage() {
 											</span>
 										</span>
 										<span data-label={t("table.stock")} className={textClass}>
-											{med?.packageType === "bottle" ||
+											{isAmountBasedPackageType(med?.packageType)
-											med?.packageType === "tube" ||
-											med?.packageType === "liquid_container"
 												? formatStockLabel(med, row.medsLeft)
 												: formatFullBlisters(stock.fullBlisters, t)}
 										</span>
@@ -757,11 +762,9 @@ export function DashboardPage() {
 										</span>
 										<span
 											data-label={t("table.stockDetails")}
-											className={`${textClass}${med?.packageType === "bottle" || med?.packageType === "tube" || med?.packageType === "liquid_container" ? " hide-on-card" : ""}`}
+											className={`${textClass}${isAmountBasedPackageType(med?.packageType) ? " hide-on-card" : ""}`}
 										>
-											{med?.packageType === "bottle" ||
+											{isAmountBasedPackageType(med?.packageType)
-											med?.packageType === "tube" ||
-											med?.packageType === "liquid_container"
 												? "—"
 												: formatOpenBlisterAndLoose(
 														stock.openBlisterPills,
@@ -958,11 +961,9 @@ export function DashboardPage() {
 																				<span className="dose-usage-main">
 																					{formatDoseUsageLabel(med, dose.usage, dose.intakeUnit)}
 																				</span>
-																				{med?.packageType !== "tube" &&
+																				{allowsPillFormSelection(med?.packageType) && med?.pillWeightMg && (
-																					med?.packageType !== "liquid_container" &&
+																					<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																					med?.pillWeightMg && (
+																				)}
-																						<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																					)}
 																			</span>
 																			{dose.intakeRemindersEnabled && (
 																				<span
@@ -1005,7 +1006,8 @@ export function DashboardPage() {
 																											🤖
 																										</span>
 																									)}
-																									↩
+																									<span className="dose-btn-label">{t("common.undo")}</span>
+																									<span aria-hidden="true">↩</span>
 																								</button>
 																							) : (
 																								<button
@@ -1240,11 +1242,9 @@ export function DashboardPage() {
 																				<span className="dose-usage-main">
 																					{formatDoseUsageLabel(med, dose.usage, dose.intakeUnit)}
 																				</span>
-																				{med?.packageType !== "tube" &&
+																				{allowsPillFormSelection(med?.packageType) && med?.pillWeightMg && (
-																					med?.packageType !== "liquid_container" &&
+																					<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																					med?.pillWeightMg && (
+																				)}
-																						<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																					)}
 																			</span>
 																			{dose.intakeRemindersEnabled && (
 																				<span
@@ -1287,7 +1287,8 @@ export function DashboardPage() {
 																											🤖
 																										</span>
 																									)}
-																									↩
+																									<span className="dose-btn-label">{t("common.undo")}</span>
+																									<span aria-hidden="true">↩</span>
 																								</button>
 																							) : (
 																								<button
@@ -1485,11 +1486,9 @@ export function DashboardPage() {
 																				<span className="dose-usage-main">
 																					{formatDoseUsageLabel(med, dose.usage, dose.intakeUnit)}
 																				</span>
-																				{med?.packageType !== "tube" &&
+																				{allowsPillFormSelection(med?.packageType) && med?.pillWeightMg && (
-																					med?.packageType !== "liquid_container" &&
+																					<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																					med?.pillWeightMg && (
+																				)}
-																						<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																					)}
 																			</span>
 																			{dose.intakeRemindersEnabled && (
 																				<span
@@ -1532,7 +1531,8 @@ export function DashboardPage() {
 																											🤖
 																										</span>
 																									)}
-																									↩
+																									<span className="dose-btn-label">{t("common.undo")}</span>
+																									<span aria-hidden="true">↩</span>
 																								</button>
 																							) : (
 																								<button

frontend/src/pages/MedicationsPage.tsx

@@ -17,8 +17,20 @@ import {
 import { useAuth } from "../components/Auth";
 import { useAppContext, useUnsavedChanges } from "../context";
 import { useMedicationForm, useModalHistory, useUnsavedChangesWarning } from "../hooks";
-import type { DoseUnit, FormState, Medication } from "../types";
+import type { DoseUnit, FormState, Medication, PackageType } from "../types";
-import { DOSE_UNITS, FIELD_LIMITS, getMedDisplayName, getPackageSize } from "../types";
+import {
+	allowsPillFormSelection,
+	DOSE_UNITS,
+	FIELD_LIMITS,
+	getMedDisplayName,
+	getPackageProfile,
+	getPackageSize,
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+	normalizePackageType,
+	PACKAGE_PROFILES,
+} from "../types";
 import { combineDateAndTime, formatDate, formatDateTime, formatNumber } from "../utils/formatters";
 import { MAX_IMAGE_UPLOAD_BYTES, resolveImageUploadError } from "../utils/image-upload";
 import { log } from "../utils/logger";
@@ -239,7 +251,7 @@ export function MedicationsPage() {
 
 	// Calculate total tablets
 	const totalTablets = useMemo(() => {
-		if (form.packageType === "bottle" || form.packageType === "tube" || form.packageType === "liquid_container") {
+		if (isAmountBasedPackageType(form.packageType)) {
 			// For bottle type, looseTablets is the current stock
 			return Number(form.looseTablets) || 0;
 		}
@@ -274,41 +286,43 @@ export function MedicationsPage() {
 	}, [form.medicationStartDate, form.medicationEndDate, form.intakes, t]);
 
 	const allowFractionalIntake = useMemo(() => {
-		if (form.packageType === "liquid_container") return true;
+		if (isLiquidContainerPackageType(form.packageType)) return true;
-		if (form.packageType === "tube") return form.medicationForm === "liquid";
+		if (isTubePackageType(form.packageType)) return form.medicationForm === "liquid";
 		return form.pillForm === "tablet";
 	}, [form.packageType, form.medicationForm, form.pillForm]);
 
-	const usageLabel = useMemo(() => {
+	const getUsageLabel = useCallback(
-		if (form.packageType === "liquid_container") {
+		(intakeUnit: "ml" | "tsp" | "tbsp") => {
-			return t("form.blisters.usageMl");
+			if (isLiquidContainerPackageType(form.packageType)) {
-		}
+				if (intakeUnit === "tsp") return t("form.blisters.usageTsp");
-		if (form.packageType === "tube") {
+				if (intakeUnit === "tbsp") return t("form.blisters.usageTbsp");
-			return form.medicationForm === "liquid" ? t("form.blisters.usageMl") : t("form.blisters.usageApplication");
+				return t("form.blisters.usageMl");
-		}
+			}
-		if (form.pillForm === "capsule") return t("form.blisters.usageCapsules");
+			if (isTubePackageType(form.packageType)) {
-		return t("form.blisters.usageTablets");
+				return form.medicationForm === "liquid" ? t("form.blisters.usageMl") : t("form.blisters.usageApplication");
-	}, [form.packageType, form.medicationForm, form.pillForm, t]);
+			}
+			if (form.pillForm === "capsule") return t("form.blisters.usageCapsules");
+			return t("form.blisters.usageTablets");
+		},
+		[form.packageType, form.medicationForm, form.pillForm, t]
+	);
 
-	const usesAmountLabels = form.packageType === "tube" || form.packageType === "liquid_container";
+	const usesAmountLabels = isTubePackageType(form.packageType) || isLiquidContainerPackageType(form.packageType);
 	const totalCapacityLabel = usesAmountLabels ? t("form.totalAmount") : t("form.totalCapacity");
 	const currentStockLabel = usesAmountLabels ? t("form.currentAmount") : t("form.currentPills");
 	const totalLabel = usesAmountLabels ? t("form.totalAmountLabel") : t("form.total");
 
 	const getMedicationPackageTypeLabel = useCallback(
 		(med: Medication) => {
-			if (med.packageType === "bottle") return t("form.packageTypeBottle");
+			return t(getPackageProfile(med.packageType).labelKey);
-			if (med.packageType === "tube") return t("form.packageTypeTube");
-			if (med.packageType === "liquid_container") return t("form.packageTypeLiquidContainer");
-			return t("form.packageTypeBlister");
 		},
 		[t]
 	);
 
 	const getMedicationStockSuffix = useCallback(
 		(med: Medication) => {
-			if (med.packageType === "tube") return "";
+			if (isTubePackageType(med.packageType)) return "";
-			if (med.packageType === "liquid_container") return " ml";
+			if (isLiquidContainerPackageType(med.packageType)) return " ml";
 			return ` ${getPackageSize(med) === 1 ? t("common.pill") : t("common.pills")}`;
 		},
 		[t]
@@ -316,10 +330,10 @@ export function MedicationsPage() {
 
 	const getMedicationUsageUnitLabel = useCallback(
 		(med: Medication, usage: number) => {
-			if (med.packageType === "tube") {
+			if (isTubePackageType(med.packageType)) {
 				return med.medicationForm === "liquid" ? "ml" : t("form.blisters.usageApplication");
 			}
-			if (med.packageType === "liquid_container") return "ml";
+			if (isLiquidContainerPackageType(med.packageType)) return "ml";
 			if (usage === 1) return t("common.pill");
 			return t("common.pills");
 		},
@@ -522,7 +536,7 @@ export function MedicationsPage() {
 			usage: Number(intake.usage) || 1,
 			every: Number(intake.every) || 1,
 			start: combineDateAndTime(intake.startDate, intake.startTime),
-			intakeUnit: form.packageType === "liquid_container" ? intake.intakeUnit : null,
+			intakeUnit: isLiquidContainerPackageType(form.packageType) ? intake.intakeUnit : null,
 			takenBy: intake.takenBy.trim() || null, // Empty string becomes null
 			intakeRemindersEnabled: intake.intakeRemindersEnabled,
 		}));
@@ -539,22 +553,23 @@ export function MedicationsPage() {
 		const lowRefillThreshold = Math.min(Number(form.prescriptionLowRefillThreshold || 1), authorizedRefills);
 
 		let derivedMedicationForm: string;
-		if (form.packageType === "tube") {
+		if (isTubePackageType(form.packageType)) {
 			derivedMedicationForm =
 				form.medicationForm === "liquid" || form.medicationForm === "topical" ? form.medicationForm : "topical";
-		} else if (form.packageType === "liquid_container") {
+		} else if (isLiquidContainerPackageType(form.packageType)) {
 			derivedMedicationForm = "liquid";
 		} else {
 			derivedMedicationForm = form.pillForm;
 		}
 
-		const tubeTotalAmount =
+		const tubeTotalAmount = isTubePackageType(form.packageType)
-			form.packageType === "tube" ? (Number(form.packCount) || 0) * (Number(form.packageAmountValue ?? 0) || 0) : null;
+			? (Number(form.packCount) || 0) * (Number(form.packageAmountValue ?? 0) || 0)
+			: null;
 
 		let packageAmountUnit = form.packageAmountUnit ?? "ml";
-		if (form.packageType === "tube") {
+		if (isTubePackageType(form.packageType)) {
 			packageAmountUnit = "g";
-		} else if (form.packageType === "liquid_container") {
+		} else if (isLiquidContainerPackageType(form.packageType)) {
 			packageAmountUnit = "ml";
 		}
 
@@ -563,16 +578,19 @@ export function MedicationsPage() {
 			genericName: form.genericName.trim() || null,
 			takenBy: form.takenBy.length > 0 ? form.takenBy : [],
 			medicationForm: derivedMedicationForm,
-			pillForm: form.packageType === "tube" || form.packageType === "liquid_container" ? null : form.pillForm,
+			pillForm:
+				isTubePackageType(form.packageType) || isLiquidContainerPackageType(form.packageType) ? null : form.pillForm,
 			lifecycleCategory: form.lifecycleCategory,
-			packageType: form.packageType,
+			packageType: normalizePackageType(form.packageType),
-			packCount: form.packageType === "tube" ? Math.max(1, Number(form.packCount) || 1) : Number(form.packCount) || 0,
+			packCount: isTubePackageType(form.packageType)
-			blistersPerPack: form.packageType === "tube" ? 1 : Number(form.blistersPerPack) || 1,
+				? Math.max(1, Number(form.packCount) || 1)
-			pillsPerBlister: form.packageType === "tube" ? 1 : Number(form.pillsPerBlister) || 1,
+				: Number(form.packCount) || 0,
+			blistersPerPack: isTubePackageType(form.packageType) ? 1 : Number(form.blistersPerPack) || 1,
+			pillsPerBlister: isTubePackageType(form.packageType) ? 1 : Number(form.pillsPerBlister) || 1,
 			packageAmountValue: Number(form.packageAmountValue ?? 0) || 0,
 			packageAmountUnit,
-			totalPills: form.packageType === "tube" ? tubeTotalAmount : Number(form.totalPills) || null,
+			totalPills: isTubePackageType(form.packageType) ? tubeTotalAmount : Number(form.totalPills) || null,
-			looseTablets: form.packageType === "tube" ? tubeTotalAmount || 0 : Number(form.looseTablets) || 0,
+			looseTablets: isTubePackageType(form.packageType) ? tubeTotalAmount || 0 : Number(form.looseTablets) || 0,
 			pillWeightMg: Number(form.pillWeightMg) || null,
 			doseUnit: form.doseUnit,
 			medicationStartDate: form.medicationStartDate || null,
@@ -976,7 +994,7 @@ export function MedicationsPage() {
 												<span>
 													{t("medications.details.type")}: <strong>{getMedicationPackageTypeLabel(med)}</strong>
 												</span>
-												{med.packageType === "blister" ? (
+												{!isAmountBasedPackageType(med.packageType) ? (
 													<>
 														<span>
 															{t("medications.details.packs")}: <strong>{med.packCount}</strong>
@@ -1009,7 +1027,7 @@ export function MedicationsPage() {
 													? Math.round(coverageByMed[getMedDisplayName(med)].medsLeft)
 													: getPackageSize(med)}{" "}
 												/ {getPackageSize(med)}
-												{med.packageType === "tube" ? "" : getMedicationStockSuffix(med)}
+												{getMedicationStockSuffix(med)}
 												{(coverageByMed[getMedDisplayName(med)]
 													? Math.round(coverageByMed[getMedDisplayName(med)].medsLeft)
 													: getPackageSize(med)) > getPackageSize(med) && (
@@ -1245,17 +1263,24 @@ export function MedicationsPage() {
 										<select
 											className="package-type-select"
 											value={form.packageType}
-											onChange={(e) =>
+											onChange={(e) => handleValueChange("packageType", e.target.value as PackageType)}
-												handleValueChange("packageType", e.target.value as import("../types").PackageType)
-											}
 										>
-											<option value="blister">{t("form.packageTypeBlister")}</option>
+											{PACKAGE_PROFILES.map((profile) => (
-											<option value="bottle">{t("form.packageTypeBottle")}</option>
+												<option key={profile.value} value={profile.value}>
-											<option value="tube">{t("form.packageTypeTube")}</option>
+													{t(profile.labelKey)}
-											<option value="liquid_container">{t("form.packageTypeLiquidContainer")}</option>
+												</option>
+											))}
 										</select>
 									</label>
-									{form.packageType !== "tube" && form.packageType !== "liquid_container" && (
+									<label>
+										{t("form.medicationEndDate")}
+										<DateInput
+											value={form.medicationEndDate}
+											onChange={(e) => handleValueChange("medicationEndDate", e.target.value)}
+											placeholder={t("common.optional")}
+										/>
+									</label>
+									{allowsPillFormSelection(form.packageType) && (
 										<label>
 											{t("form.pillForm")}
 											<select
@@ -1267,7 +1292,7 @@ export function MedicationsPage() {
 											</select>
 										</label>
 									)}
-									{form.packageType === "tube" && (
+									{isTubePackageType(form.packageType) && (
 										<label>
 											{t("form.medicationForm")}
 											<select value={"topical"} onChange={() => handleValueChange("medicationForm", "topical")}>
@@ -1275,7 +1300,7 @@ export function MedicationsPage() {
 											</select>
 										</label>
 									)}
-									{form.packageType === "liquid_container" && (
+									{isLiquidContainerPackageType(form.packageType) && (
 										<label>
 											{t("form.medicationForm")}
 											<select value={"liquid"} onChange={() => handleValueChange("medicationForm", "liquid")}>
@@ -1283,14 +1308,6 @@ export function MedicationsPage() {
 											</select>
 										</label>
 									)}
-									<label>
-										{t("form.medicationEndDate")}
-										<DateInput
-											value={form.medicationEndDate}
-											onChange={(e) => handleValueChange("medicationEndDate", e.target.value)}
-											placeholder={t("common.optional")}
-										/>
-									</label>
 									{form.medicationEndDate && (
 										<label className="full">
 											{t("form.autoMarkObsoleteAfterEndDate")}
@@ -1418,7 +1435,7 @@ export function MedicationsPage() {
 								<div className="full form-category">
 									<h4 className="form-category-title">{t("form.sections.stock")}</h4>
 									{(() => {
-										if (form.packageType === "blister") {
+										if (!isAmountBasedPackageType(form.packageType)) {
 											return (
 												<>
 													<label>
@@ -1459,7 +1476,7 @@ export function MedicationsPage() {
 											);
 										}
 
-										if (form.packageType === "tube") {
+										if (isTubePackageType(form.packageType)) {
 											return (
 												<>
 													<label>
@@ -1531,7 +1548,7 @@ export function MedicationsPage() {
 											</>
 										);
 									})()}
-									{form.packageType !== "tube" && form.packageType !== "liquid_container" && (
+									{allowsPillFormSelection(form.packageType) && (
 										<label className="full">
 											{t("form.pillWeight")} ({form.doseUnit})
 											<div className="dose-input-group">
@@ -1557,7 +1574,7 @@ export function MedicationsPage() {
 											</div>
 										</label>
 									)}
-									{(form.packageType === "bottle" || form.packageType === "liquid_container") && (
+									{isAmountBasedPackageType(form.packageType) && !isTubePackageType(form.packageType) && (
 										<div className="full stock-total-row">
 											<label className="stock-total-field">
 												{totalLabel}
@@ -1565,7 +1582,7 @@ export function MedicationsPage() {
 											</label>
 										</div>
 									)}
-									{form.packageType === "liquid_container" && (
+									{isLiquidContainerPackageType(form.packageType) && (
 										<label className="full">
 											{t("form.packageAmount")}
 											<div className="dose-input-group">
@@ -1703,7 +1720,7 @@ export function MedicationsPage() {
 										<div key={idx} className="blister-row">
 											<div className="blister-inputs">
 												<label>
-													{usageLabel}
+													{getUsageLabel(intake.intakeUnit ?? "ml")}
 													<FormNumberStepper
 														value={intake.usage}
 														onChange={(nextValue) => setIntakeValue(idx, "usage", nextValue)}
@@ -1739,7 +1756,7 @@ export function MedicationsPage() {
 														onChange={(e) => setIntakeValue(idx, "startTime", e.target.value)}
 													/>
 												</label>
-												{form.packageType === "liquid_container" && (
+												{isLiquidContainerPackageType(form.packageType) && (
 													<label>
 														{t("form.blisters.intakeUnit")}
 														<select

frontend/src/pages/PlannerPage.tsx

@@ -5,7 +5,7 @@ import { DateTimeInput, MedicationAvatar } from "../components";
 import { useAuth } from "../components/Auth";
 import { useAppContext } from "../context";
 import type { PlannerRow } from "../types";
-import { getMedDisplayName } from "../types";
+import { getMedDisplayName, isAmountBasedPackageType, isLiquidContainerPackageType, isTubePackageType } from "../types";
 import { toInputValue } from "../utils/formatters";
 
 // Date helpers
@@ -124,10 +124,10 @@ export function PlannerPage() {
 
 	const getUsageUnitLabel = (medicationId: number, count: number): string => {
 		const med = meds.find((m) => m.id === medicationId);
-		if (med?.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(med?.packageType)) {
 			return t("form.ml");
 		}
-		if (med?.packageType === "tube") {
+		if (isTubePackageType(med?.packageType)) {
 			return med.medicationForm === "liquid" ? t("form.ml") : t("blisters.applications");
 		}
 		return count === 1 ? t("common.pill") : t("common.pills");
@@ -136,10 +136,10 @@ export function PlannerPage() {
 	const getAvailableLabel = (medicationId: number, loosePills: number): string => {
 		const med = meds.find((m) => m.id === medicationId);
 		const roundedLoose = Math.round(loosePills * 10) / 10;
-		if (med?.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(med?.packageType)) {
 			return `${roundedLoose} ${t("form.ml")}`;
 		}
-		if (med?.packageType === "tube") {
+		if (isTubePackageType(med?.packageType)) {
 			const unit = med.medicationForm === "liquid" ? t("form.ml") : t("blisters.applications");
 			return `${roundedLoose} ${unit}`;
 		}
@@ -254,17 +254,11 @@ export function PlannerPage() {
 											</span>
 										</span>
 										<span data-label={t("planner.table.blisters")}>
-											{row.packageType === "bottle" ||
+											{isAmountBasedPackageType(row.packageType) ? "–" : `${row.blistersNeeded} × ${row.blisterSize}`}
-											row.packageType === "tube" ||
-											row.packageType === "liquid_container"
-												? "–"
-												: `${row.blistersNeeded} × ${row.blisterSize}`}
 										</span>
 										<span data-label={t("planner.table.prescriptionRefills")}>{remainingRefills ?? "–"}</span>
 										<span data-label={t("planner.table.available")}>
-											{row.packageType === "bottle" ||
+											{isAmountBasedPackageType(row.packageType) ? (
-											row.packageType === "tube" ||
-											row.packageType === "liquid_container" ? (
 												getAvailableLabel(row.medicationId, row.loosePills)
 											) : (
 												<>

frontend/src/pages/SchedulePage.tsx

@@ -5,7 +5,7 @@ import { MedicationAvatar } from "../components";
 import { useAuth } from "../components/Auth";
 import { useAppContext } from "../context";
 import type { Coverage } from "../types";
-import { getMedDisplayName } from "../types";
+import { getMedDisplayName, isLiquidContainerPackageType, isTubePackageType } from "../types";
 import { formatNumber } from "../utils/formatters";
 import { expandDoseIds, isDoseDismissed } from "../utils/schedule";
 
@@ -21,12 +21,12 @@ function getStockStatus(
 	settings: { lowStockDays: number; normalStockDays: number; highStockDays: number; reminderDaysBefore: number },
 	packageType?: string
 ) {
-	if (packageType === "tube") return { className: "success", label: "status.noSchedule" };
+	if (isTubePackageType(packageType)) return { className: "success", label: "status.noSchedule" };
 	// Out of stock or completely depleted = danger (red)
 	if (medsLeft <= 0 || daysLeft === 0) return { className: "danger", label: "status.outOfStock" };
 	// No schedule, but has stock = normal
 	if (daysLeft === null) return { className: "success", label: "status.noSchedule" };
-	if (packageType === "liquid_container") {
+	if (isLiquidContainerPackageType(packageType)) {
 		const lowDays = Math.max(1, Math.floor(settings.reminderDaysBefore));
 		const criticalDays = Math.max(1, Math.ceil(lowDays / 2));
 		if (daysLeft <= criticalDays) return { className: "danger", label: "status.criticalStock" };
@@ -95,10 +95,10 @@ export function SchedulePage() {
 	const shouldHideNoScheduleStatusForTube = (
 		med: (typeof meds)[number] | undefined,
 		status: { className: string; label: string } | null
-	) => med?.packageType === "tube" && status?.label === "status.noSchedule";
+	) => isTubePackageType(med?.packageType) && status?.label === "status.noSchedule";
 
 	const getTubeUnitLabel = (med: (typeof meds)[number] | undefined, value: number) =>
-		med?.packageType === "liquid_container" || med?.medicationForm === "liquid"
+		isLiquidContainerPackageType(med?.packageType) || med?.medicationForm === "liquid"
 			? t("form.packageAmountUnitMl")
 			: t("form.blisters.applications", { count: Math.abs(value) });
 
@@ -133,10 +133,10 @@ export function SchedulePage() {
 		usage: number,
 		intakeUnit?: "ml" | "tsp" | "tbsp" | null
 	) => {
-		if (med?.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(med?.packageType)) {
 			return formatLiquidUsageLabel(usage, intakeUnit);
 		}
-		if (med?.packageType === "tube") {
+		if (isTubePackageType(med?.packageType)) {
 			return `${usage} ${getTubeUnitLabel(med, usage)}`;
 		}
 		return `${usage} ${usage !== 1 ? t("common.pills") : t("common.pill")}`;
@@ -147,7 +147,7 @@ export function SchedulePage() {
 		total: number,
 		doses?: Array<{ usage: number; intakeUnit?: "ml" | "tsp" | "tbsp" | null }>
 	) => {
-		if (med?.packageType === "liquid_container") {
+		if (isLiquidContainerPackageType(med?.packageType)) {
 			if (doses && doses.length > 0) {
 				const normalizedDoses = doses.filter((dose) => Number.isFinite(Number(dose.usage)) && Number(dose.usage) > 0);
 				if (normalizedDoses.length > 0) {
@@ -167,7 +167,7 @@ export function SchedulePage() {
 			}
 			return `${formatNumber(total)} ${t("form.packageAmountUnitMl")}`;
 		}
-		if (med?.packageType === "tube") {
+		if (isTubePackageType(med?.packageType)) {
 			return `${total} ${getTubeUnitLabel(med, total)}`;
 		}
 		return t("common.pillsTotal", { count: total });

frontend/src/pages/SettingsPage.tsx

@@ -479,11 +479,15 @@ export function SettingsPage() {
 							</div>
 							<div className="schedule-row">
 								<span className="schedule-label">{t("settings.schedule.stockCheck")}</span>
-								<span className="schedule-value">{t("settings.schedule.dailyAt6")}</span>
+								<span className="schedule-value">
+									{t("settings.schedule.dailyAtHour", { hour: settings.reminderHour })}
+								</span>
 							</div>
 							<div className="schedule-row">
 								<span className="schedule-label">{t("settings.schedule.intakeCheck")}</span>
-								<span className="schedule-value">{t("settings.schedule.15minBefore")}</span>
+								<span className="schedule-value">
+									{t("settings.schedule.minutesBefore", { minutes: settings.reminderMinutesBefore })}
+								</span>
 							</div>
 							{settings.nextScheduledCheck && (
 								<div className="schedule-row">

frontend/src/pages/dashboard-helpers.ts

@@ -1,5 +1,5 @@
 import type { Coverage, Medication, PackageType } from "../types";
-import { getMedTotal as getMedTotalFromTypes } from "../types";
+import { getMedTotal as getMedTotalFromTypes, isLiquidContainerPackageType, isTubePackageType } from "../types";
 import { splitCurrentBlisterStock } from "../utils/stock";
 
 export function userStorageKey(userId: number | undefined, key: string): string {
@@ -78,7 +78,7 @@ export function getReminderStatusData(
 
 	for (const c of allCoverage) {
 		const med = medByName.get(c.name);
-		if (med?.packageType === "tube") continue;
+		if (isTubePackageType(med?.packageType)) continue;
 
 		if (c.medsLeft <= 0) {
 			lowStockMap.set(c.name, { name: c.name, daysLeft: 0, isCritical: true });
@@ -88,7 +88,7 @@ export function getReminderStatusData(
 		if (c.daysLeft === null) continue;
 
 		const roundedDaysLeft = Math.round(c.daysLeft);
-		const isLiquid = med?.packageType === "liquid_container";
+		const isLiquid = isLiquidContainerPackageType(med?.packageType);
 		const liquidLowDays = Math.max(1, Math.floor(reminderDaysBefore));
 		const liquidCriticalDays = Math.max(1, Math.ceil(liquidLowDays / 2));
 		const isCritical = isLiquid ? c.daysLeft <= liquidCriticalDays : c.daysLeft <= reminderDaysBefore;

frontend/src/styles.css

@@ -121,7 +121,7 @@ body.modal-open {
 .route-transition-mask.active {
 	transition: none;
 	opacity: 1;
-	pointer-events: auto;
+	pointer-events: none;
 }
 
 .hero {

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

@@ -15,6 +15,8 @@ const defaultForm: FormState = {
 	packCount: "1",
 	blistersPerPack: "1",
 	pillsPerBlister: "1",
+	packageAmountValue: "0",
+	packageAmountUnit: "ml",
 	looseTablets: "0",
 	totalPills: "",
 	pillWeightMg: "",

frontend/src/test/utils/schedule.test.ts

@@ -1286,9 +1286,9 @@ describe("getNextReminderForMed", () => {
 		vi.useRealTimers();
 	});
 
-	const mockT = (key: string, options?: Record<string, number>) => {
+	const mockT = (key: string, options?: Record<string, unknown>) => {
-		if (options?.count) return `${key} (${options.count})`;
+		if (typeof options?.count === "number") return `${key} (${options.count})`;
-		if (options?.days) return `${key} (${options.days})`;
+		if (typeof options?.days === "number") return `${key} (${options.days})`;
 		return key;
 	};
 

frontend/src/types/index.ts

@@ -2,16 +2,35 @@
 // Core Types for MedAssist
 // =============================================================================
 
-export type PackageType = "blister" | "bottle" | "tube" | "liquid_container";
+export type { PackageProfile, PackageType } from "./package-profiles";
+export {
+	allowsPillFormSelection,
+	getPackageProfile,
+	isAmountBasedPackageType,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+	normalizePackageType,
+	PACKAGE_PROFILES,
+	PACKAGE_TYPES,
+} from "./package-profiles";
+
+import type { PackageType } from "./package-profiles";
+import { isAmountBasedPackageType } from "./package-profiles";
 
 // Common medication dose units
-export type DoseUnit = "mg" | "g" | "mcg" | "ml";
+export type DoseUnit = "mg" | "g" | "mcg" | "ml" | "units";
+
+export type MedicationForm = "tablet" | "capsule" | "topical" | "liquid";
+export type PillForm = "tablet" | "capsule";
+export type LifecycleCategory = "refill_when_empty" | "treatment_period";
+export type PackageAmountUnit = "ml" | "g";
 
 export const DOSE_UNITS: { value: DoseUnit; label: string }[] = [
 	{ value: "mg", label: "mg" },
 	{ value: "g", label: "g" },
 	{ value: "mcg", label: "mcg (µg)" },
 	{ value: "ml", label: "ml" },
+	{ value: "units", label: "units" },
 ];
 
 export type Blister = {
@@ -50,7 +69,14 @@ export type Medication = {
 	lastStockCorrectionAt?: string | null;
 	pillWeightMg?: number | null;
 	doseUnit?: DoseUnit | null; // Unit for the dose (mg, g, mcg, ml, IU, etc.)
+	medicationForm?: MedicationForm | null;
+	pillForm?: PillForm | null;
+	lifecycleCategory?: LifecycleCategory | null;
+	packageAmountValue?: number | null;
+	packageAmountUnit?: PackageAmountUnit | null;
 	medicationStartDate?: string | null;
+	medicationEndDate?: string | null;
+	autoMarkObsoleteAfterEndDate?: boolean;
 	blisters: Blister[]; // Legacy array format
 	intakes?: Intake[]; // New intake format with per-intake takenBy
 	imageUrl?: string | null;
@@ -114,15 +140,22 @@ export type FormState = {
 	name: string;
 	genericName: string;
 	takenBy: string[]; // Medication-level takenBy (legacy/compatibility)
+	medicationForm: MedicationForm;
+	pillForm: PillForm;
+	lifecycleCategory: LifecycleCategory;
 	packageType: PackageType;
 	packCount: string;
 	blistersPerPack: string;
 	pillsPerBlister: string;
+	packageAmountValue: string;
+	packageAmountUnit: PackageAmountUnit;
 	totalPills: string; // For bottle type: total capacity
 	looseTablets: string; // For blister: extra loose pills; for bottle: current stock
 	pillWeightMg: string;
 	doseUnit: DoseUnit; // Unit for the dose (mg, g, mcg, ml, IU, etc.)
 	medicationStartDate: string;
+	medicationEndDate: string;
+	autoMarkObsoleteAfterEndDate: boolean;
 	expiryDate: string;
 	notes: string;
 	prescriptionEnabled: boolean;
@@ -260,7 +293,7 @@ type MedLike = Pick<Medication, "packCount" | "blistersPerPack" | "pillsPerBlist
 export function getMedTotal(med: MedLike): number {
 	// Amount-based package types store their current base stock directly
 	// in totalPills (fallback looseTablets for legacy rows).
-	if (med.packageType === "bottle" || med.packageType === "tube" || med.packageType === "liquid_container") {
+	if (isAmountBasedPackageType(med.packageType)) {
 		const baseStock = med.totalPills ?? med.looseTablets;
 		return baseStock + (med.stockAdjustment ?? 0);
 	}
@@ -271,7 +304,7 @@ export function getMedTotal(med: MedLike): number {
 /** Get the base package size (without stockAdjustment) */
 export function getPackageSize(med: MedLike): number {
 	// Amount-based package types use totalPills as base capacity
-	if (med.packageType === "bottle" || med.packageType === "tube" || med.packageType === "liquid_container") {
+	if (isAmountBasedPackageType(med.packageType)) {
 		return med.totalPills ?? med.looseTablets;
 	}
 	// For blister type, calculate from packs + loose

frontend/src/types/package-profiles.ts

@@ -0,0 +1,72 @@
+export const PACKAGE_TYPES = ["blister", "bottle", "tube", "liquid_container"] as const;
+
+export type PackageType = (typeof PACKAGE_TYPES)[number];
+
+export type PackageProfile = {
+	value: PackageType;
+	labelKey: string;
+	amountBased: boolean;
+	plannerUnitKind: "pills" | "ml" | "units";
+	allowsPillFormSelection: boolean;
+};
+
+export const PACKAGE_PROFILES: PackageProfile[] = [
+	{
+		value: "blister",
+		labelKey: "form.packageTypeBlister",
+		amountBased: false,
+		plannerUnitKind: "pills",
+		allowsPillFormSelection: true,
+	},
+	{
+		value: "bottle",
+		labelKey: "form.packageTypeBottle",
+		amountBased: true,
+		plannerUnitKind: "pills",
+		allowsPillFormSelection: true,
+	},
+	{
+		value: "tube",
+		labelKey: "form.packageTypeTube",
+		amountBased: true,
+		plannerUnitKind: "units",
+		allowsPillFormSelection: false,
+	},
+	{
+		value: "liquid_container",
+		labelKey: "form.packageTypeLiquidContainer",
+		amountBased: true,
+		plannerUnitKind: "ml",
+		allowsPillFormSelection: false,
+	},
+];
+
+const PACKAGE_TYPE_SET = new Set<string>(PACKAGE_TYPES);
+const PROFILE_BY_TYPE = new Map(PACKAGE_PROFILES.map((profile) => [profile.value, profile] as const));
+
+export function normalizePackageType(packageType?: string | null): PackageType {
+	if (packageType && PACKAGE_TYPE_SET.has(packageType)) {
+		return packageType as PackageType;
+	}
+	return "blister";
+}
+
+export function getPackageProfile(packageType?: string | null): PackageProfile {
+	return PROFILE_BY_TYPE.get(normalizePackageType(packageType)) ?? PACKAGE_PROFILES[0];
+}
+
+export function isTubePackageType(packageType?: string | null): boolean {
+	return normalizePackageType(packageType) === "tube";
+}
+
+export function isLiquidContainerPackageType(packageType?: string | null): boolean {
+	return normalizePackageType(packageType) === "liquid_container";
+}
+
+export function isAmountBasedPackageType(packageType?: string | null): boolean {
+	return getPackageProfile(packageType).amountBased;
+}
+
+export function allowsPillFormSelection(packageType?: string | null): boolean {
+	return getPackageProfile(packageType).allowsPillFormSelection;
+}

frontend/src/utils/schedule.ts

@@ -12,14 +12,14 @@ import type {
 	StockStatus,
 	StockThresholds,
 } from "../types";
-import { getMedDisplayName, getMedTotal } from "../types";
+import { getMedDisplayName, getMedTotal, isLiquidContainerPackageType, isTubePackageType } from "../types";
 
 function normalizeIntakeUsageForStock(intake: Intake, med: Medication): number {
 	const usage = Number(intake.usage);
 	if (!Number.isFinite(usage) || usage <= 0) return 0;
-	if (med.packageType === "tube") return 0;
+	if (isTubePackageType(med.packageType)) return 0;
 
-	const isLiquidStock = med.packageType === "liquid_container" || med.medicationForm === "liquid";
+	const isLiquidStock = isLiquidContainerPackageType(med.packageType) || med.medicationForm === "liquid";
 	if (!isLiquidStock) return usage;
 
 	if (intake.intakeUnit === "tsp") return usage * 5;
@@ -344,7 +344,7 @@ export function getStockStatus(
 	}
 
 	// Tube has no stock reminder semantics.
-	if (packageType === "tube") {
+	if (isTubePackageType(packageType)) {
 		return { level: "normal", className: "success", label: "status.noSchedule" };
 	}
 
@@ -353,7 +353,7 @@ export function getStockStatus(
 		return { level: "normal", className: "success", label: "status.noSchedule" };
 	}
 
-	if (packageType === "liquid_container") {
+	if (isLiquidContainerPackageType(packageType)) {
 		const liquidThresholds = getLiquidDerivedThresholds(thresholds.criticalStockDays);
 		if (daysLeft <= liquidThresholds.criticalDays) {
 			return { level: "critical", className: "danger", label: "status.criticalStock" };

frontend/src/utils/stock.ts

@@ -1,4 +1,5 @@
 import type { Medication } from "../types";
+import { isAmountBasedPackageType } from "../types";
 
 export type BlisterStockSplit = {
 	fullBlisters: number;
@@ -34,10 +35,9 @@ export function splitCurrentBlisterStock(
  * Convenience helper when medication object already contains stock fields.
  */
 export function getBlisterStockFromMedication(med: Medication): BlisterStockSplit {
-	const total =
+	const total = isAmountBasedPackageType(med.packageType)
-		med.packageType === "bottle" || med.packageType === "tube" || med.packageType === "liquid_container"
+		? med.looseTablets + (med.stockAdjustment ?? 0)
-			? med.looseTablets + (med.stockAdjustment ?? 0)
+		: med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets + (med.stockAdjustment ?? 0);
-			: med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets + (med.stockAdjustment ?? 0);
 
 	return splitCurrentBlisterStock(total, med.pillsPerBlister, med.looseTablets);
 }

package-lock.json

@@ -8,7 +8,7 @@
       "devDependencies": {
         "@biomejs/biome": "^2.4.4",
         "husky": "^9.1.0",
-        "lint-staged": "^16.2.7"
+        "lint-staged": "^16.3.1"
       }
     },
     "backend": {
@@ -439,19 +439,18 @@
       }
     },
     "node_modules/lint-staged": {
-      "version": "16.2.7",
+      "version": "16.3.1",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-16.2.7.tgz",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-16.3.1.tgz",
-      "integrity": "sha512-lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==",
+      "integrity": "sha512-bqvvquXzFBAlSbluugR4KXAe4XnO/QZcKVszpkBtqLWa2KEiVy8n6Xp38OeUbv/gOJOX4Vo9u5pFt/ADvbm42Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "commander": "^14.0.2",
+        "commander": "^14.0.3",
         "listr2": "^9.0.5",
         "micromatch": "^4.0.8",
-        "nano-spawn": "^2.0.0",
-        "pidtree": "^0.6.0",
         "string-argv": "^0.3.2",
-        "yaml": "^2.8.1"
+        "tinyexec": "^1.0.2",
+        "yaml": "^2.8.2"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
@@ -541,19 +540,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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": ">=20.17"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/nano-spawn?sponsor=1"
-      }
-    },
     "node_modules/onetime": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
@@ -570,19 +556,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pidtree": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
-      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "pidtree": "bin/pidtree.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/restore-cursor": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
@@ -680,6 +653,16 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
+    "node_modules/tinyexec": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz",
+      "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",

package.json

@@ -9,7 +9,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.4.4",
     "husky": "^9.1.0",
-    "lint-staged": "^16.2.7"
+    "lint-staged": "^16.3.1"
   },
   "lint-staged": {
     "backend/src/**/*.ts": [