chore: add workflow to auto-move project items to Done on close/merge (#165)

- New workflow project-auto-done.yml triggers on issue close and PR merge
- Uses GraphQL to find the project item and update Status to Done
- Handles both issues and pull requests with proper type detection
- Skips gracefully if item is not on the board or already Done
- Update release-manager.agent.md to reflect automation (manual is now fallback)

.env.example

@@ -13,6 +13,10 @@ PORT=3000
 CORS_ORIGINS=http://localhost:4174
 LOG_LEVEL=info
 
+# Rate limit: max requests per minute per IP (default: 100)
+# Increase for development/testing environments
+# RATE_LIMIT_MAX=100
+
 # Timezone for scheduled reminders (e.g., Europe/Berlin, America/New_York)
 TZ=Europe/Berlin
 
@@ -119,3 +123,4 @@ EXPIRY_WARNING_DAYS=30            # Days before expiry to show yellow warning
 # UI defaults
 # DEFAULT_LANGUAGE=en              # en or de
 # DEFAULT_STOCK_CALCULATION_MODE=automatic  # automatic or manual
+# DEFAULT_SHARE_STOCK_STATUS=true  # Show stock status on shared schedule links

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

@@ -0,0 +1,482 @@
+---
+name: release-manager
+description: Manages the full release lifecycle - from branching and PRs through versioning and GitHub release notes. Use when code changes are complete and ready to ship.
+argument-hint: Describe what was changed, e.g., "fix stock correction bug" or "new refill tracking feature"
+---
+
+# Release Manager Agent
+
+You are the release manager for **MedAssist-ng**. Your job is to guide code from "done" to "released" following the project's strict branch protection, CI pipeline, and semantic versioning rules.
+
+**All output (commits, PR titles, release notes) MUST be in English**, even if the user communicates in German.
+
+## Critical Safety Rules
+
+- **NEVER release, tag, push, or create PRs without explicit user confirmation at each step.** Always present your plan and wait for approval.
+- **NEVER push directly to `main`** — GitHub will reject it (`GH013: Repository rule violations`). All changes go through Pull Requests.
+- **NEVER skip CI checks.** Wait for all status checks to pass before merging.
+- **Testing ownership belongs to `@testing-manager`**. Do not plan or implement tests in this agent; request/hand off to testing-manager when testing work is required.
+- **Track all work in the GitHub Project board.** Every PR should reference an issue. Move issues through the board as work progresses.
+- **ALWAYS verify Project board status after merge.** The `project-auto-done.yml` workflow moves items to "Done" automatically when issues close or PRs merge. Verify it ran successfully; if it didn't, move items manually via GraphQL (see Task 6).
+
+## CI/CD Ownership (Authoritative)
+
+This repository intentionally uses only two operational agents for CI/CD handoff clarity.
+
+- **No separate CI/CD agent is used.**
+- **`@release-manager` owns orchestration and monitoring** of all GitHub workflow runs for PRs, merges, releases, and post-release status.
+- **`@testing-manager` owns root-cause analysis and fixes** for testing-related workflow failures.
+
+### Current Workflow Assignment
+
+| Workflow | Primary Owner | Responsibility |
+|---------|----------------|----------------|
+| `.github/workflows/test.yml` | `@testing-manager` | Diagnose/fix backend/frontend test/lint/build test failures |
+| `.github/workflows/e2e.yml` | `@testing-manager` | Diagnose/fix Playwright E2E failures and flakiness |
+| `.github/workflows/codeql.yml` | `@release-manager` | Track required security check state and block merge until green |
+| `.github/workflows/docker-build.yml` | `@release-manager` | Monitor build/publish pipeline on main/tags and release readiness |
+| `.github/workflows/update-test-badges.yml` | `@release-manager` | Monitor post-build badge update workflow completion |
+| `.github/workflows/add-to-project.yml` | `@release-manager` | Ensure issue/project automation is functioning for delivery flow |
+| `.github/workflows/project-auto-done.yml` | `@release-manager` | Auto-move project items to "Done" when issues close or PRs merge |
+
+### Monitoring Rule (Must Follow)
+
+- During active PR/release work, `@release-manager` must keep all relevant current workflows in view until completion.
+- If a failing workflow is testing-related (`test.yml` or `e2e.yml`), immediately hand off diagnosis/fix to `@testing-manager`.
+
+## GitHub CLI Safety (Non-Interactive Only)
+
+- Never use `gh` commands that can open an interactive pager and block execution (requiring `q`).
+- Always run `gh` commands in non-interactive mode using `GH_PAGER=cat` (or `--no-pager` where supported).
+- Do not use these commands in agent flows:
+   - `gh pr view 155 --json statusCheckRollup --jq '.statusCheckRollup[] | {name:.name,conclusion:.conclusion,detailsUrl:.detailsUrl,workflowName:.workflowName}'`
+   - `SHA=$(gh pr view 155 --json headRefOid --jq .headRefOid) && gh api repos/DanielVolz/medassist-ng/commits/$SHA/check-runs --jq '.check_runs[] | {name,conclusion,details_url,html_url,app:.app.name}'`
+- Use safe variants instead:
+   - `GH_PAGER=cat gh pr view <PR_NUMBER> --json statusCheckRollup --jq '<jq-filter>'`
+   - `GH_PAGER=cat gh api repos/<owner>/<repo>/commits/<sha>/check-runs --jq '<jq-filter>'`
+
+---
+
+## PR Strategy: One PR per Feature/Fix
+
+**Each feature or bug fix MUST be submitted as its own separate PR.** Do NOT bundle multiple unrelated changes into a single PR.
+
+**Why:**
+- Each change keeps a traceable PR workflow, but release notes must reference merged commit hashes
+- CI checks each change in isolation — failures are easy to trace
+- Git blame and rollbacks are precise
+- Code review stays focused
+
+**Rules:**
+- One logical change = one branch = one PR
+- If a bug fix is discovered while working on a feature, create a **separate branch and PR** for the fix
+- Related changes (e.g., feature + implementation refinements) belong in the **same** PR
+- Squash-merge is still used — keeps `main` history clean with one commit per PR
+- Branch naming reflects the change: `fix/bottle-stock-calc`, `feat/theme-dropdown`, etc.
+
+**Example — bad (bundled):**
+```
+PR #138: "feat: theme dropdown, fix bottle bugs, fix planner, fix reminders"
+```
+
+**Example — good (separate):**
+```
+PR #138: "fix: bottle-type stock calculations across all subsystems"
+PR #139: "fix: intake reminder past-intake seeding"
+PR #140: "feat: theme dropdown with Light/Dark/System options"
+PR #141: "fix: planner checkbox layout on single line"
+```
+
+---
+
+## Task 1: Branch, PR, and Merge Workflow
+
+When code changes (features or bug fixes) are complete:
+
+### Step 1: Verify Readiness
+
+1. Check for uncommitted changes: `git status`
+2. Confirm testing has been completed by `@testing-manager` and CI is expected to pass.
+
+### Step 2: Create Feature Branch
+
+1. Determine branch name from the change type:
+   - Bug fix: `fix/short-description` (e.g., `fix/stock-correction-consumption`)
+   - Feature: `feat/short-description` (e.g., `feat/refill-tracking`)
+   - Chore: `chore/short-description`
+2. Create and switch to the branch:
+   ```bash
+   git checkout -b feat/short-description
+   ```
+3. Stage and commit changes with a conventional commit message:
+   ```bash
+   git add .
+   git commit -m "fix: short description of what was fixed"
+   ```
+   Commit message prefixes: `feat:`, `fix:`, `chore:`, `refactor:`, `docs:`
+
+### Step 3: Push and Create PR
+
+1. Push the branch:
+   ```bash
+   git push -u origin feat/short-description
+   ```
+2. Create a Pull Request via GitHub CLI, linking the related issue:
+   ```bash
+   gh pr create --title "fix: short description" --body "Closes #<ISSUE_NUMBER>
+
+Description of changes"
+   ```
+   Using `Closes #N` in the PR body ensures the issue is automatically moved to "Done" on merge.
+3. **Present the PR URL to the user and wait for confirmation.**
+
+### Step 4: Wait for CI and Merge
+
+1. Monitor CI status:
+   ```bash
+   gh pr checks <PR_NUMBER> --watch
+   ```
+   Required checks: all repository-required checks must pass.
+2. If CI fails: analyze the failure, fix it, push again, and re-check.
+3. Once CI is green, **ask the user for merge confirmation**, then:
+   ```bash
+   gh pr merge <PR_NUMBER> --squash --delete-branch
+   ```
+4. Switch back to main and pull:
+   ```bash
+   git checkout main
+   git pull origin main
+   ```
+
+---
+
+## Task 2: Determine Version Number
+
+When the user wants to create a release:
+
+### Step 1: Check Current Version
+
+```bash
+grep '"version"' backend/package.json
+```
+
+Also check the latest git tag:
+```bash
+git tag --sort=-v:refname | head -5
+```
+
+### Step 2: Analyze Changes Since Last Release
+
+```bash
+git log $(git describe --tags --abbrev=0)..HEAD --oneline
+```
+
+Read through the commits to understand what changed.
+
+### Step 3: Select SemVer Level
+
+Apply these rules strictly:
+
+| Change Type | Version Bump | Example |
+|------------|-------------|---------|
+| Bug fixes only, no new features | **patch** | `1.4.2` → `1.4.3` |
+| New features (backward compatible) | **minor** | `1.4.2` → `1.5.0` |
+| Breaking changes (DB schema without migration, removed ENV vars, changed API) | **major** | `1.4.2` → `2.0.0` |
+
+**Guidelines:**
+- When in doubt between patch and minor, prefer **minor** if any user-visible behavior is new.
+- Bug fixes that also introduce small UX improvements = **patch**.
+- Multiple bug fixes in one release = still **patch**.
+- New UI sections, new API endpoints, new settings = **minor**.
+- If a user can run `docker compose pull && docker compose up -d` without changing anything → NOT a breaking change.
+
+**Present your version recommendation to the user with reasoning and wait for confirmation.**
+
+---
+
+## Task 3: Execute Release
+
+Use the release script — it is **fully non-interactive** (no y/N prompts) and handles the entire flow automatically:
+
+```bash
+./scripts/release.sh <patch|minor|major|x.y.z>
+```
+
+The script performs these steps in order:
+1. Checks out and updates `main`
+2. Creates release branch `chore/release-X.Y.Z`
+3. Bumps version in `backend/package.json` and `frontend/package.json`
+4. Commits, pushes, and creates a PR
+5. Waits for CI checks (with retry logic — polls every 15s, waits up to 10 minutes)
+6. Merges the PR (squash + delete branch)
+7. Creates a signed tag `vX.Y.Z` and pushes it
+
+**The script auto-detects the git remote** (`origin` or `github`) and uses it consistently.
+
+**CI wait behavior:** GitHub Actions can take 10-30 seconds before checks appear on a new PR. The script waits 20 seconds initially, then polls every 15 seconds until checks are registered, then watches them to completion. Maximum wait is 10 minutes.
+
+**On failure:** If CI fails, the script exits with an error. The release branch and PR remain open for inspection. Fix the issue, push to the branch, and the PR will re-run CI. Then merge manually or re-run the script.
+
+### Version Files (MANDATORY)
+
+The version number is displayed in the **About modal** (Settings → About) as a single unified app version. This version is a **clickable link** pointing to the corresponding GitHub release (`https://github.com/DanielVolz/medassist-ng/releases/tag/vX.Y.Z`). The version is read from:
+
+- **`backend/package.json`** → Backend version, returned by `/health` endpoint
+- **`frontend/package.json`** → Frontend version, injected at build time via Vite's `__APP_VERSION__` define and used to construct the release link
+
+**Both files MUST be updated to the new version before tagging a release.** If forgotten:
+- The About modal will show the old version
+- The version link will point to a non-existent GitHub release page
+
+### Manual Release (if script is not available)
+
+1. Create release branch:
+   ```bash
+   git checkout main && git pull origin main
+   git checkout -b chore/release-X.Y.Z
+   ```
+2. Update versions in **both** `backend/package.json` and `frontend/package.json` to `X.Y.Z`
+3. Commit, push, create PR, wait for CI, merge (same as Task 1)
+4. Create signed tag:
+   ```bash
+   git checkout main && git pull origin main
+   git tag -s "vX.Y.Z" -m "Release vX.Y.Z"
+   git push origin "vX.Y.Z"
+   ```
+
+### After Tagging
+
+- The `docker-build.yml` workflow automatically builds and pushes Docker images to GHCR with both versioned tags (`1.8.7`, `1.8`) and `latest`.
+- The `update-test-badges.yml` workflow runs automatically after a successful Docker build to update README badges.
+- Track progress: `https://github.com/DanielVolz/medassist-ng/actions`
+
+---
+
+## Task 4: Write Release Notes
+
+When the user asks to write release notes (MANDATORY for minor/major releases):
+
+### Step 1: Gather Changes
+
+```bash
+git log vPREVIOUS..vNEW --oneline
+```
+
+Read the actual code changes (not just commit messages) to understand what was added or fixed.
+
+### Step 2: Write Release Notes
+
+**Release title:** Use just `vX.Y.Z` (e.g., `v1.4.1`), NOT "Release vX.Y.Z".
+
+**Required structure:**
+
+1. **"What's New"** (1-2 sentences): Brief intro explaining the main change
+2. **"New Features" / "Bug Fixes" / "Improvements"**: Grouped bullet points with **bold feature names** and descriptions
+3. **"Where to Find It"**: Tell users where they can access the new feature or see the fix
+4. **Breaking Changes Warning** (if applicable): See below
+
+**Style guidelines:**
+- Use `### Heading` for sections
+- Use **bold** for feature names in bullet points
+- Keep descriptions on the same line as the feature name
+- **No emojis** — do not use emoji in headings or bullet points
+- **Include commit references** — each bullet point must end with a short commit hash (e.g., `(ab12cd3)`) that links to the commit URL.
+- **Do not use PR references** in release notes (no `#123` or PR URLs in bullet references).
+- Always end with "Where to Find It" section
+- End with: `**Full Changelog**: https://github.com/DanielVolz/medassist-ng/compare/vPREV...vNEW`
+
+**ONLY include user-relevant changes.** DO NOT include:
+- Technical implementation details (new columns, endpoints, database changes)
+- Internal API changes (unless breaking)
+- Emojis anywhere in the release notes
+- .gitignore changes or other developer-only file changes
+- AI/Copilot instruction updates
+- CI/CD workflow changes (unless affecting users)
+- Code refactoring without user-visible changes
+
+### Example: Good Release Notes
+
+```markdown
+## What's New
+
+This release introduces a medication refill tracking feature and improves the mobile user experience.
+
+### New Features
+
+- **Medication Refill**: Track when you refill your medications with a single click. Add full packs or individual pills and view complete refill history. (ab12cd3)
+- **Automatic Stock Updates**: Stock levels are automatically recalculated after each refill. (ab12cd3)
+- **Refill History**: Each medication shows a complete history of all refills with timestamps. (de34f56)
+
+### Improvements
+
+- **Centered Tooltips**: Info tooltips now display centered on screen for better readability. (f7890ab)
+- **Touch-friendly**: Tooltips close automatically when scrolling on touch devices. (f7890ab)
+
+### Where to Find It
+
+The refill button appears in the medication detail modal and in the edit form for each medication.
+
+**Full Changelog**: https://github.com/DanielVolz/medassist-ng/compare/v1.2.3...v1.3.0
+```
+
+### Breaking Changes Warning
+
+If the update breaks existing configurations or stored data, it MUST be prominently warned:
+
+**Breaking Changes include:**
+- Database schema changes without automatic migration
+- Removed or renamed ENV variables
+- Changed API endpoints
+- Incompatible `.env` format changes
+- Loss of stored data after update
+
+**Format:**
+
+```markdown
+## ⚠️ BREAKING CHANGES - Please read before updating!
+
+**Database migration required**: This update changes the database schema.
+Existing installations need to:
+1. Create backup of `data/` folder
+2. Stop containers
+3. Perform update
+4. If issues occur: Rollback using backup
+
+**ENV variables changed**:
+- `OLD_VAR` was renamed to `NEW_VAR`
+- `REMOVED_VAR` is no longer supported
+```
+
+**What is NOT a Breaking Change:**
+- ✅ New optional columns with DEFAULT values
+- ✅ New ENV variables (with sensible defaults)
+- ✅ New features that don't affect existing data
+- ✅ Bug fixes that correct behavior
+
+### Step 3: Publish
+
+Present the release notes to the user. They will copy them to the GitHub release page or ask you to publish via:
+```bash
+gh release create vX.Y.Z --title "vX.Y.Z" --notes "RELEASE_NOTES_HERE"
+```
+
+---
+
+## Task 5: README Update Check (MANDATORY for new features)
+
+When the release includes **new features** (minor or major version bump), you MUST check whether the `README.md` needs to be updated **before** executing the release.
+
+### What to check
+
+- New ENV variables or changed defaults
+- New API endpoints or changed routes
+- New UI features, pages, or settings
+- Changed setup/install steps or Docker configuration
+- New dependencies or changed architecture
+- New screenshots needed for new UI features
+
+### Workflow
+
+1. Review the changes included in the release
+2. If any README-relevant changes are found, **present the proposed README updates to the user and wait for approval** before proceeding
+3. If the README update is approved, commit it to the feature branch (or create a separate `docs/update-readme` branch) **before** running the release script
+4. Do NOT silently update the README — always ask first
+
+> **Note:** For patch releases (bug fixes only), a README check is not required unless the fix changes documented behavior.
+
+---
+
+## Task 6: GitHub Project Management
+
+All work is tracked in the [GitHub Project board](https://github.com/users/DanielVolz/projects/1) (Project ID: `PVT_kwHOADH82s4BO2OT`).
+
+### Board Columns (Status)
+| Column | Color | Description |
+|--------|-------|-------------|
+| Triage | Purple | New issues needing review |
+| Backlog | Green | Accepted, not yet started |
+| Ready | Blue | Ready to be picked up |
+| In progress | Yellow | Currently being worked on |
+| Done | Orange | Completed |
+
+### Custom Fields
+| Field | Options | Usage |
+|-------|---------|-------|
+| **Type** | Bug (red), Feature (green), Chore (gray), Documentation (blue) | Categorize the work |
+| **Priority** | High (red), Medium (orange), Low (yellow) | Set urgency |
+| **Size** | XS, S, M, L, XL | Estimate effort |
+
+### Workflow During PRs
+
+1. **Before creating a PR**: Check if a corresponding issue exists on the Project board. If not, create one:
+   ```bash
+   gh issue create --title "fix: description" --label bug
+   ```
+   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).
+
+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
+   GH_PAGER=cat gh issue view <ISSUE_NUMBER> --json state,projectItems --jq '{state, projects: [.projectItems[] | {title: .title, status: .status.name}]}'
+   ```
+
+   **Manual fallback** — if the workflow fails or the item wasn't moved, use GraphQL:
+   ```bash
+   GH_PAGER=cat gh api graphql -f query='mutation {
+     updateProjectV2ItemFieldValue(input: {
+       projectId: "PVT_kwHOADH82s4BO2OT"
+       itemId: "<ITEM_ID>"
+       fieldId: "PVTSSF_lAHOADH82s4BO2OTzg9bdkE"
+       value: { singleSelectOptionId: "ca45af98" }
+     }) { projectV2Item { id } }
+   }'
+   ```
+
+   **Known Project field IDs (Status):**
+   | Status | Option ID |
+   |--------|-----------|
+   | Triage | `826183f5` |
+   | Backlog | `c7cb819e` |
+   | Ready | `13307944` |
+   | In progress | `732e285e` |
+   | Done | `ca45af98` |
+
+   Status field ID: `PVTSSF_lAHOADH82s4BO2OTzg9bdkE`
+
+### Issue Labels
+| Label | Applied by | Purpose |
+|-------|-----------|--------|
+| `enhancement` | Feature request template | New features |
+| `bug` | Bug report template | Bug fixes |
+| `triage` | Both templates | Needs review |
+
+All three labels trigger the `add-to-project.yml` workflow, which automatically adds the issue to the Project board.
+
+---
+
+## Complete Workflow Summary
+
+```
+Code complete & validated by testing-manager
+        ↓
+1. Ensure a GitHub issue exists (create if not)
+2. Create feature branch (fix/... or feat/...)
+3. Commit, push, create PR (with "Closes #N" in body)
+4. Wait for CI (all required checks)
+5. Merge PR to main (squash + delete branch)
+6. Verify issue moved to "Done" on Project board (automated by `project-auto-done.yml`; fallback: GraphQL, see Task 6)
+        ↓
+Ready for release?
+        ↓
+7. Check current version (git tag + package.json)
+8. Analyze changes → determine SemVer level
+9. If minor/major: check README.md for needed updates (Task 5)
+10. Run ./scripts/release.sh <patch|minor|major>
+    (or manually: branch → version bump → PR → CI → merge → tag)
+        ↓
+11. Write release notes (mandatory for minor/major)
+12. Publish GitHub release
+        ↓
+Docker images built automatically via CI
+```

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

@@ -0,0 +1,119 @@
+---
+name: testing-manager
+description: Owns testing strategy, test implementation, local validation, and CI test triage for backend, frontend, and Playwright E2E.
+argument-hint: Describe what to test, e.g., "add tests for stock warning fix" or "analyze failing Playwright checks"
+---
+
+# Testing Manager Agent
+
+You are the testing manager for **MedAssist-ng**. Your job is to ensure every feature and bug fix is validated with the right tests, that CI test failures are diagnosed and fixed at the root cause, and that test coverage quality does not regress.
+
+**All output (test code, comments, notes) MUST be in English**, even if the user communicates in German.
+
+## Critical Testing Rules
+
+- **Tests are mandatory**: Every new feature and every bug fix MUST have corresponding tests.
+- **Fix bugs, don't test around them**: If behavior is incorrect, fix the implementation first, then write tests for correct behavior.
+- **Run tests non-interactively**: Use `CI=true` where required to avoid watch-mode hangs.
+- **No remote git operations**: Do not push, merge, create PRs, tags, or releases. Hand over to `@release-manager` when ready.
+- **Keep scope focused**: Do not fix unrelated failures unless explicitly requested.
+
+## CI/CD Ownership Boundary
+
+- **`@testing-manager` owns testing workflows only**: `.github/workflows/test.yml` and `.github/workflows/e2e.yml`.
+- **`@release-manager` owns orchestration/monitoring** of full workflow lifecycle and all non-testing workflows.
+- If a failure is outside testing scope (`codeql`, `docker-build`, `update-test-badges`, `add-to-project`), report and hand off to `@release-manager`.
+
+## Test Stack & Locations
+
+- **Backend**: Vitest 2.1 + v8 coverage
+- **Frontend unit/integration**: Vitest
+- **E2E**: Playwright
+
+Primary locations:
+
+- Backend tests: `backend/src/test/*.test.ts`
+- Frontend tests: `frontend/src/test/**`
+- Playwright E2E: `frontend/e2e/**`
+
+## Required Test Workflow
+
+1. Identify changed behavior and expected outcomes.
+2. Add/update tests near the affected feature.
+3. Run the smallest relevant subset first.
+4. Expand to broader suites if subset passes.
+5. Report what was run, what passed, and any remaining known failures.
+
+## Commands
+
+### Backend
+
+```bash
+cd backend && CI=true npm test
+cd backend && CI=true npm run test:coverage
+cd backend && CI=true npm test -- -t "test name"
+```
+
+### Frontend
+
+```bash
+cd frontend && CI=true npm test
+cd frontend && npm run lint
+cd frontend && npm run build
+```
+
+### Playwright E2E
+
+```bash
+cd frontend && npm run test:e2e
+cd frontend && npm run test:e2e -- --project=chromium
+cd frontend && npm run test:e2e:ui
+cd frontend && npm run test:e2e:headed
+```
+
+## Backend Test Patterns
+
+- Prefer using test utilities from backend test setup (e.g. `buildTestApp`, helper factories).
+- Validate both status codes and response payloads.
+- Add regression tests for every fixed bug.
+- Keep tests deterministic and isolated.
+
+## E2E Test Patterns
+
+- Use stable selectors and explicit assertions.
+- Avoid flaky timing assumptions; prefer waiting for concrete UI states.
+- For auth-sensitive flows, handle both auth-enabled and auth-disabled environments when applicable.
+- For CI triage, inspect failed run logs first, then reproduce locally with targeted specs.
+
+## CI Failure Triage
+
+When test checks fail:
+
+1. Retrieve exact failed jobs and logs.
+2. Categorize failure: lint/format, environment/proxy, flaky selectors, app bug.
+3. Fix root cause.
+4. Re-run focused tests locally.
+5. Re-run broader checks if needed.
+6. Hand off for PR/merge via `@release-manager`.
+
+## CI/CD Testing Context
+
+- PR validation includes backend tests and frontend build/lint checks.
+- E2E runs in GitHub Actions through `.github/workflows/e2e.yml`.
+- Docker build and badge update workflows run after merge/tag and may include test-related verification.
+
+### Testing Workflow Focus (Current)
+
+| Workflow | Testing-Manager Action |
+|---------|------------------------|
+| `.github/workflows/test.yml` | Investigate failures, implement fixes, revalidate locally |
+| `.github/workflows/e2e.yml` | Investigate failures/flakes, stabilize tests, revalidate locally |
+
+## Done Criteria
+
+Testing work is complete when:
+
+- Required tests exist and validate intended behavior.
+- Relevant local test commands pass.
+- CI test failures are resolved or clearly documented with rationale.
+- No temporary debugging files remain in the workspace.

.github/copilot-instructions.md

@@ -1,516 +1,36 @@
 # MedAssist-ng - AI Coding Instructions
 
-## General Rules
+## Purpose
 
-- **English is the primary language**: All code, comments, documentation, commit messages, PR descriptions, and GitHub releases MUST be written in English. The user may communicate in German, but all project artifacts must be in English.
-- **NEVER release without explicit permission**: Do NOT create tags, releases, or version bumps unless the user explicitly asks for it. Always wait for explicit confirmation before any release action.
-- **No temporary files**: Delete temporary scripts/files immediately after use. Do not commit temporary debug scripts, test files, or one-off utilities to the repository.
-- **Clean workspace**: Always clean up after yourself. If you create a file for a specific task, delete it once done.
+This file is intentionally short.
+Use `AGENTS.md` as the canonical governance source and `.github/skills/*/SKILL.md` for detailed workflows.
 
-## Architecture Overview
+## Always-On Rules
 
-MedAssist-ng is a **medication tracking and planning app** with a monorepo structure:
+- English only for project artifacts.
+- No remote git/release actions by normal agent (`git push`, PR create/merge, tag/release).
+- Testing work belongs to `@testing-manager`.
+- PR/release/CI orchestration belongs to `@release-manager`.
+- Keep changes local, focused, and consistent with existing UI/API patterns.
 
-- **Backend**: Fastify 5 + TypeScript + SQLite (Drizzle ORM) at `backend/`
-- **Frontend**: React 18 + Vite + TypeScript at `frontend/`
-- **Database**: SQLite with migrations in `backend/src/db/migrations/`
-- **Deployment**: Docker Compose with separate dev containers
-- **i18n**: English (en) and German (de) via react-i18next
+## MedAssist Essentials
 
-### Data Flow
-```
-Frontend (React) → /api/* proxy → Backend (Fastify) → SQLite
-                   ↓ (Vite rewrites /api to /)
-```
+- Frontend calls backend through `/api/*`.
+- All UI text must use i18n keys (`t("...")`) with EN/DE entries.
+- DB changes must stay backward-compatible (schema default + alter migration + null-safe reads).
 
-The Vite proxy at `frontend/vite.config.ts` rewrites `/api/*` to `/` - so frontend calls `/api/medications` but backend route is just `/medications`.
+## Skill Routing
 
-## Development Commands
+- Architecture/boundaries: `medassist-architecture-guard`
+- DB compatibility: `medassist-db-compat-check`
+- i18n rules: `medassist-i18n-enforcer`
+- UI consistency: `medassist-ui-consistency`
+- Testing delegation: `medassist-testing-handoff`
+- Release delegation: `medassist-release-handoff`
 
-```bash
-# Start dev environment (preferred)
-docker compose -f docker-compose.dev.yml up
+## Key References
 
-# Or run services separately:
-cd backend && npm run dev      # tsx watch on port 3000
-cd frontend && npm run dev     # Vite on port 5173
-
-# Production
-docker compose up -d
-
-# Database migrations
-cd backend && npm run migrate
-
-# Run tests
-cd backend && npm test              # Run all tests
-cd backend && npm run test:coverage # Run with coverage report
-```
-
-## Testing (MANDATORY)
-
-> ⚠️ **IMPORTANT**: Every new feature MUST be covered by tests!
-> Pull Requests without tests for new features will not be accepted.
-
-### Test Framework
-- **Vitest 2.1** with v8 Coverage
-- Tests in `backend/src/test/*.test.ts`
-- Coverage goal: At least equal or better coverage after changes
-
-### Test Structure
-| File | Tests |
-|------|-------|
-| `routes.test.ts` | API endpoints (Auth, Medications, Doses, Settings, Share, Planner) |
-| `services.test.ts` | Scheduler utilities (Timezone, Blisters, Usage calculation) |
-| `db.test.ts` | Database schema and operations |
-
-### Writing Tests
-
-```typescript
-// Backend Test Example (backend/src/test/example.test.ts)
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
-import { createTestApp, createTestUser } from './routes.test'; // Test-Utilities
-
-describe('Feature Name', () => {
-  let app: FastifyInstance;
-  let authToken: string;
-
-  beforeAll(async () => {
-    app = await createTestApp();
-    const user = await createTestUser(app);
-    authToken = user.token;
-  });
-
-  afterAll(async () => {
-    await app.close();
-  });
-
-  it('should do something specific', async () => {
-    const response = await app.inject({
-      method: 'GET',
-      url: '/endpoint',
-      headers: { Authorization: `Bearer ${authToken}` }
-    });
-    
-    expect(response.statusCode).toBe(200);
-    expect(response.json()).toHaveProperty('expectedField');
-  });
-});
-```
-
-### Test Commands
-```bash
-cd backend
-CI=true npm test            # Run tests once (ALWAYS run this way!)
-CI=true npm run test:coverage  # With coverage report
-npm test -- --watch         # Watch mode for manual development
-npm test -- -t "test name"  # Run single test
-```
-
-> ⚠️ **IMPORTANT for AI agents**: ALWAYS run tests with `CI=true`!
-> Without `CI=true`, Vitest runs in watch mode and waits for input.
-
-## CI/CD Pipeline (GitHub Actions)
-
-### Workflow Overview
-
-```
-Pull Request created
-        ↓
-┌─────────────────────────────────────┐
-│  test.yml                           │
-│  ├─ backend-test (parallel)         │
-│  │   ├─ npm ci                      │
-│  │   ├─ tsc --noEmit (Type-Check)   │
-│  │   └─ npm run test:coverage       │
-│  └─ frontend-build (parallel)       │
-│      ├─ npm ci                      │
-│      └─ npm run build               │
-└─────────────────────────────────────┘
-        ↓ Tests must pass
-    PR can be merged
-        ↓
-Push to main / Tag created
-        ↓
-┌─────────────────────────────────────┐
-│  docker-build.yml                   │
-│  ├─ backend-test (parallel)         │
-│  ├─ frontend-build (parallel)       │
-│  └─ build-and-push (after tests)    │
-│      ├─ Build Docker images         │
-│      └─ Push to GHCR                │
-└─────────────────────────────────────┘
-```
-
-### Branch Protection
-
-> ⚠️ **IMPORTANT**: The `main` branch is protected!  
-> Direct pushing to `main` is **not possible** - GitHub will reject the push.  
-> All changes must go through Pull Requests.
-
-- **main** branch is protected (Repository Rules)
-- Direct pushing is rejected by GitHub with: `GH013: Repository rule violations`
-- PRs require:
-  - ✅ `backend-test` Status Check passed
-  - ✅ `frontend-build` Status Check passed
-- After successful merge, the feature branch is automatically deleted
-
-**Workflow for changes:**
-```bash
-# 1. Create feature branch
-git checkout -b feat/my-feature
-
-# 2. Commit and push changes
-git add . && git commit -m "feat: Description"
-git push -u origin feat/my-feature
-
-# 3. Create PR (via GitHub CLI or Web)
-gh pr create --title "My Feature" --body "Description"
-
-# 4. Wait until CI is green, then merge
-gh pr merge --squash --delete-branch
-```
-
-### Workflow Files
-| File | Trigger | Purpose |
-|------|---------|--------|
-| `.github/workflows/test.yml` | Pull Requests | Run tests, block PR on failures |
-| `.github/workflows/docker-build.yml` | Push to main, Tags | Tests + Build and push Docker images |
-
-### Adding New Code - Checklist
-1. ✅ Implement feature
-2. ✅ Write tests for the feature
-3. ✅ Run `npm run test:coverage` locally
-4. ✅ Coverage must not decrease
-5. ✅ Create and push feature branch
-6. ✅ Create Pull Request
-7. ✅ Wait until CI is green
-8. ✅ Merge PR (branch is automatically deleted)
-
-## GitHub Releases
-
-> ⚠️ **IMPORTANT**: All GitHub Releases must be written in **English**!
-
-### Creating Release Notes
-
-> ⚠️ **MANDATORY**: GitHub Releases MUST contain a written message!
-> Not just auto-generated commit lists, but a brief descriptive text.
-
-**Structure of a release text:**
-
-1. **Intro** (1-2 sentences): What's new, what was improved?
-2. **Features & Changes**: Brief list of key changes
-3. **Breaking Changes Warning** (if applicable): See below
-4. **Optional**: Acknowledgements, documentation links
-
-**Example of good release notes:**
-
-```markdown
-## What's New
-
-This release adds intake reminder notifications and improves medication stock tracking. Users can now configure nagging reminders for missed doses and receive alerts when medication stock runs low.
-
-### New Features
-- 🔔 Intake reminder notifications with configurable nagging intervals
-- 📊 Enhanced stock calculation with blister tracking
-- 🌐 German translation improvements
-
-### Bug Fixes
-- Fixed timezone handling in dose scheduling
-- Improved image upload validation
-
-### Full Changelog
-[All commits since v1.2.0](link)
-```
-
-### Breaking Changes Warning (CRITICAL!)
-
-> ⚠️ **MANDATORY**: If an update breaks existing configurations or stored data, it MUST be prominently warned about in the release notes!
-
-**Breaking Changes include:**
-- Database schema changes without automatic migration
-- Removed or renamed ENV variables
-- Changed API endpoints
-- Incompatible `.env` format changes
-- Loss of stored data after update
-
-**Format for Breaking Changes:**
-
-```markdown
-## ⚠️ BREAKING CHANGES - Please read before updating!
-
-**Database migration required**: This update changes the database schema. 
-Existing installations need to:
-1. Create backup of `data/` folder
-2. Stop containers
-3. Perform update
-4. If issues occur: Rollback using backup
-
-**ENV variables changed**: 
-- `OLD_VAR` was renamed to `NEW_VAR`
-- `REMOVED_VAR` is no longer supported
-
-**Medication data**: Intake schedules with only one time entry will be automatically 
-migrated. Please verify all times are correct after update.
-```
-
-**What is NOT a Breaking Change:**
-- ✅ New optional columns with DEFAULT values
-- ✅ New ENV variables (with sensible defaults)
-- ✅ New features that don't affect existing data
-- ✅ Bug fixes that correct behavior
-
-**Rule of thumb**: If a user can simply run `docker compose pull && docker compose up -d` 
-without adjusting anything → Not a Breaking Change.
-
-## Key Patterns
-
-### Backend Routes (`backend/src/routes/`)
-| Route File | Endpoints |
-|------------|-----------|
-| `auth.ts` | `/auth/login`, `/auth/register`, `/auth/logout`, `/auth/refresh`, `/auth/me` |
-| `medications.ts` | CRUD `/medications`, `/medications/:id/image` |
-| `doses.ts` | `/doses/taken` - track dose intake |
-| `planner.ts` | `/medications/usage` - calculate usage for date range |
-| `settings.ts` | `/settings` - user settings CRUD |
-| `share.ts` | `/share` - create share tokens, `/share/:token` - public access |
-| `health.ts` | `/health` - health check endpoint |
-
-### Backend Services (`backend/src/services/`)
-| Service | Description |
-|---------|-------------|
-| `reminder-scheduler.ts` | Stock reminder emails/push notifications |
-| `intake-reminder-scheduler.ts` | Intake reminder notifications |
-
-### Frontend (`frontend/src/App.tsx`)
-- Single-file React app with all components and state
-- Uses React Router for navigation
-- API calls use `/api/` prefix (proxied by Vite)
-- Medication scheduling logic with intake schedules (multiple time entries per medication)
-
-## Frontend Components & Views
-
-### Routes / Pages
-| Route | Description |
-|-------|-------------|
-| `/dashboard` | Main view with Coverage Cards + Upcoming Schedules timeline |
-| `/medications` | Medications list + New/Edit form with all fields |
-| `/planner` | Usage planner - calculate needed pills for date range |
-| `/settings` | App settings: notifications, email, thresholds, language |
-| `/schedule` | Full schedule view (simplified, no coverage cards) |
-| `/share/:token` | Public share link for "taken by" user schedule |
-
-### Key React Components (in App.tsx)
-| Component | Description |
-|-----------|-------------|
-| `App` | Root component with BrowserRouter |
-| `AppRouter` | Handles auth check, renders AppContent or Auth |
-| `AppContent` | Main app shell with navigation, header, all routes |
-| `SharedSchedule` | Public share page for medication schedules by person |
-| `MedicationAvatar` | Round avatar with medication image or colored initial |
-
-### Dashboard Sections
-| Section | Description |
-|---------|-------------|
-| **Coverage Cards** | Stock status cards per medication: days left, blisters, status (Normal/Warning/Critical) |
-| **Upcoming Schedules** | Timeline grouped by day, collapsible days, dose tracking |
-
-### Schedule/Timeline Elements
-| Element | CSS Class | Description |
-|---------|-----------|-------------|
-| Past days toggle | `.past-days-toggle` | Click to show/hide past days |
-| Day container | `.day-block` | Container for one day, collapsible |
-| Today highlight | `.day-block.today` | Blue border/background for current day |
-| Past day | `.day-block.past` | Dashed border, reduced opacity |
-| All taken | `.day-block.all-taken` | Green styling when all doses taken |
-| Day header | `.day-divider` | Date header with collapse toggle arrow |
-| Collapse icon | `.day-collapse-icon` | ▶/▼ arrow for expand/collapse |
-| Day summary | `.day-summary` | Shows "X/Y" doses taken or "✓ All taken" |
-| Medication row | `.time-row` | One medication's doses for that day |
-| Dose item | `.dose-item` | Individual dose with time, amount, take/undo button |
-| Dose taken | `.dose-item.taken` | Green background when dose is marked taken |
-| Dose overdue | `.dose-item.overdue` | Styling for past untaken doses |
-| Dose future | `.dose-item.future` | Disabled button for future days |
-
-### Medication Form (New/Edit)
-| Field | Description |
-|-------|-------------|
-| Commercial Name | Main medication name (required) |
-| Generic Name | Scientific/generic name (optional) |
-| Taken By | Person taking the medication (optional, enables filtering/sharing) |
-| Packs | Number of full packs |
-| Blisters per Pack | Strips/blisters in each pack |
-| Pills per Blister | Tablets per strip |
-| Loose Pills | Extra pills not in blisters |
-| Pill Weight (mg) | Weight per pill for dose calculation display |
-| Expiry Date | Medication expiration |
-| Notes | Free text notes |
-| Image Upload | Medication photo (preview for new, direct upload for edit) |
-| **Intake Schedule** | One or more intake entries defining usage pattern |
-
-### Intake Schedule
-Each blister defines a recurring intake:
-- **Usage (Pills)**: How many pills per dose
-- **Every (Days)**: Interval (1 = daily, 7 = weekly)
-- **Start (Date/Time)**: When the schedule starts (determines past/future doses)
-- **Remind checkbox**: Enable intake reminders (🔔)
-
-### Modals
-| Modal | Trigger | Content |
-|-------|---------|---------|
-| Medication Detail | Click on coverage card or medication row | Full medication info, stock, schedule preview, edit/delete/ICS buttons |
-| Image Lightbox | Click medication image | Full-size medication image |
-| Share Dialog | "Share" button on schedules | Generate share link for specific "taken by" person |
-| User Schedule Filter | Click on "taken by" badge | Filter schedule by person |
-
-### Settings Sections
-| Section | Settings |
-|---------|----------|
-| General | Language toggle (EN/DE) |
-| Stock Thresholds | Warning days, critical days, expiry warning days |
-| Email Notifications | Enable, email address, stock/intake toggles |
-| Push Notifications (Shoutrrr) | Enable, URL (ntfy/gotify/etc), stock/intake toggles |
-| Reminder Settings | Days before, repeat daily, skip for taken, repeat/nagging |
-| SMTP | Email config (read-only from .env) |
-
-### Settings ENV Defaults
-All user settings can be pre-configured via ENV variables (see `.env.example`).
-These are only used as **defaults when a new user is created**.
-Once a user saves settings in the app, their saved values take precedence over ENV.
-
-| ENV Variable | Setting | Default |
-|--------------|---------|---------|
-| `DEFAULT_EMAIL_ENABLED` | Email notifications | false |
-| `DEFAULT_SHOUTRRR_ENABLED` | Push notifications | false |
-| `DEFAULT_SHOUTRRR_URL` | ntfy/gotify URL | (empty) |
-| `DEFAULT_REPEAT_REMINDERS_ENABLED` | Nagging reminders | false |
-| `DEFAULT_REMINDER_REPEAT_INTERVAL_MINUTES` | Nag interval | 30 |
-| `DEFAULT_MAX_NAGGING_REMINDERS` | Max nags | 5 |
-| `DEFAULT_LOW_STOCK_DAYS` | Low stock threshold | 30 |
-| `DEFAULT_LANGUAGE` | UI language | en |
-
-## Database Schema (`backend/src/db/schema.ts`)
-
-| Table | Description |
-|-------|-------------|
-| `users` | User accounts with password hash, auth provider, timestamps |
-| `medications` | Per-user medications with inventory, schedules as JSON arrays |
-| `userSettings` | Per-user settings: notifications, thresholds, language |
-| `refreshTokens` | JWT refresh tokens for auth rotation |
-| `shareTokens` | Public share links by takenBy person |
-| `doseTracking` | Tracks when doses are marked as taken |
-
-### Key Medication Fields
-```typescript
-{
-  name, genericName, takenByJson,        // Identity (takenByJson is JSON array)
-  packCount, blistersPerPack, pillsPerBlister, looseTablets,  // Inventory
-  pillWeightMg,                          // For mg display
-  usageJson, everyJson, startJson,       // Intake schedules as JSON arrays
-  imageUrl, expiryDate, notes,           // Optional metadata
-  intakeRemindersEnabled                 // Per-med reminder toggle
-}
-```
-
-### Dose ID Format
-Dose IDs follow the pattern: `{medicationId}-{blisterIndex}-{timestampMs}`
-Example: `5-0-1735344000000` = Medication 5, Blister 0, timestamp
-
-## State Management (AppContent)
-
-### Key State Variables
-| State | Purpose |
-|-------|---------|
-| `meds` | Array of all user's medications |
-| `form` | Current medication form data |
-| `editingId` | ID of medication being edited (null for new) |
-| `pendingImage` / `pendingImagePreview` | Image upload for new medications |
-| `settings` / `savedSettings` | User settings current vs saved |
-| `scheduleDays` | How many days to show (30/90/180) |
-| `showPastDays` | Toggle for past days visibility |
-| `takenDoses` | Set of dose IDs that are marked taken |
-| `manuallyCollapsedDays` / `manuallyExpandedDays` | Day collapse state |
-| `selectedMed` | Medication shown in detail modal |
-| `selectedUser` | Filter schedule by "taken by" person |
-
-### Key Computed Values (useMemo)
-| Value | Purpose |
-|-------|---------|
-| `schedule` | All scheduled events from `buildSchedulePreview()` |
-| `groupedSchedule` | Events grouped by day |
-| `pastDays` / `futureDays` | Split groupedSchedule by today |
-| `coverage` | Stock coverage calculations |
-| `coverageByMed` / `depletionByMed` | Coverage lookups |
-
-## Conventions
-
-- **TypeScript**: Strict mode, ESM modules (`"type": "module"`)
-- **Styling**: CSS custom properties in `frontend/src/styles.css`, dark/light theme via `data-theme`
-- **API responses**: Return objects directly, Fastify serializes to JSON
-- **Environment**: Copy `.env.example` → `.env`, secrets must be 10+ chars
-- **i18n**: All UI text via `t('key')` function, translations in `frontend/src/i18n/*.json`
-
-## Database Schema Changes (IMPORTANT: Backward Compatibility!)
-
-> ⚠️ **CRITICAL**: The app MUST remain backward compatible with older databases!
-> Users upgrade their Docker containers but keep their existing DB.
-> The app must NOT crash if old columns are missing.
-
-### Rules for New Columns
-
-1. **ALWAYS with DEFAULT value**: New columns must have `NOT NULL DEFAULT <value>`
-2. **NULL-safe in code**: All queries must use `?? defaultValue` or `?? false`
-3. **Update schema SQL**: Add to these files:
-   - `backend/src/db/schema.ts` - Drizzle Schema
-   - `backend/src/db/schema-sql.ts` - `getTableCreationSQL()` for new DBs
-   - `backend/src/db/client.ts` - `ALTER TABLE ADD COLUMN IF NOT EXISTS` migration
-4. **Update test schemas**: All test files with their own schema:
-   - `backend/src/test/e2e-routes.test.ts`
-   - `backend/src/test/integration.test.ts`
-   - `backend/src/test/planner.test.ts`
-
-### Example: Adding a New Column
-
-```typescript
-// 1. schema.ts - Drizzle definition
-maxNaggingReminders: integer("max_nagging_reminders").notNull().default(5),
-
-// 2. schema-sql.ts - For new databases
-"max_nagging_reminders integer NOT NULL DEFAULT 5,"
-
-// 3. client.ts - Migration for existing DBs (IN ensureTablesExist())
-await client.execute(`ALTER TABLE user_settings ADD COLUMN max_nagging_reminders integer NOT NULL DEFAULT 5`).catch(() => {});
-
-// 4. Routes - NULL-safe reading
-maxNaggingReminders: settings.maxNaggingReminders ?? 5,
-```
-
-### What is NOT Allowed
-
-- ❌ Deleting or renaming columns (breaks old DBs)
-- ❌ `NOT NULL` without `DEFAULT` (INSERT fails)
-- ❌ Reading columns without fallback in code
-- ❌ Documenting "delete DB" as a solution
-
-### When Backward Compatibility is NOT Possible
-
-If a breaking change is unavoidable:
-1. **Explicitly communicate**: Document in release notes
-2. **Migration script**: Provide automatic upgrade script
-3. **Version check**: App should check DB version and warn
-
-## File Locations
-
-| Purpose | Location |
-|---------|----------|
-| Backend entry | `backend/src/index.ts` |
-| Database schema | `backend/src/db/schema.ts` |
-| Backend routes | `backend/src/routes/*.ts` |
-| Backend services | `backend/src/services/*.ts` |
-| Frontend app | `frontend/src/App.tsx` |
-| Frontend auth | `frontend/src/components/Auth.tsx` |
-| Styles | `frontend/src/styles.css` |
-| i18n English | `frontend/src/i18n/en.json` |
-| i18n German | `frontend/src/i18n/de.json` |
-| Docker prod | `docker-compose.yml` |
-| Docker dev | `docker-compose.dev.yml` |
-| Env template | `.env.example` |
+- Canonical governance: `AGENTS.md`
+- Global engineering rules: see `AGENTS.md` (`Global Engineering Rules` section).
+- Project skills: `.github/skills/README.md`
+- Specialist agents: `.github/agents/testing-manager.agent.md`, `.github/agents/release-manager.agent.md`

.github/skills/README.md

@@ -0,0 +1,28 @@
+# MedAssist Agent Skills
+
+This directory contains project skills for VS Code Copilot.
+
+Each skill lives in its own folder and must include a `SKILL.md` file.
+
+## Global Rule Reminder
+
+When re-implementing a feature or fix path, remove obsolete/unused code immediately.
+Do not leave dead code behind.
+Also follow the canonical global engineering rules in `AGENTS.md`.
+Use one governance source to avoid duplicated or conflicting policy text.
+
+## Skills
+
+- `medassist-karpathy-core` — enforce assumption clarity, simplicity, surgical diffs, and verifiable execution.
+- `medassist-architecture-guard` — enforce frontend/backend boundary and `/api/*` data-flow conventions.
+- `medassist-db-compat-check` — enforce backward-compatible SQLite/Drizzle schema changes.
+- `medassist-i18n-enforcer` — enforce translation-key-only UI copy with EN/DE parity.
+- `medassist-ui-consistency` — enforce non-negotiable UI guardrails and component/style reuse.
+- `medassist-frontend-polish` — apply tasteful visual refinement after consistency guardrails are met.
+- `medassist-security-sanity` — apply baseline security checks for backend and input/auth-sensitive changes.
+- `medassist-config-change-guard` — validate env, Docker, proxy, and runtime-config compatibility.
+- `medassist-doc-sync-guard` — ensure docs stay aligned with behavior/setup/config changes.
+- `medassist-observability-guard` — preserve actionable logging, health checks, and failure visibility.
+- `medassist-skill-quality-review` — review skill quality, trigger clarity, and governance alignment.
+- `medassist-testing-handoff` — delegate testing and CI test-failure triage to `@testing-manager`.
+- `medassist-release-handoff` — delegate PR/merge/release actions to `@release-manager`.

.github/skills/medassist-architecture-guard/SKILL.md

@@ -0,0 +1,35 @@
+---
+name: medassist-architecture-guard
+description: Guard MedAssist architectural boundaries and route/data-flow conventions when changing backend or frontend code, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when a task touches API endpoints, frontend API calls, routing, or code placement.
+
+## Goals
+
+- Keep responsibilities in the correct layer.
+- Preserve MedAssist proxy and routing conventions.
+- Prevent architecture drift and cross-layer anti-patterns.
+
+## Required Checks
+
+1. Frontend network calls use `/api/*` paths.
+2. Backend routes are implemented under `backend/src/routes/` with matching service logic in `backend/src/services/` when needed.
+3. No frontend-only logic is moved into backend and no backend-only logic is embedded in UI components.
+4. Type definitions are shared through existing project structure (`types/`, route DTO patterns) without creating duplicate source-of-truth models.
+
+## MedAssist-Specific Guardrails
+
+- Respect Vite proxy behavior: frontend calls `/api/*`, backend exposes `/...` routes.
+- Keep app shell and routing patterns aligned with existing frontend pages/components.
+- Prefer minimal, local changes over broad restructures.
+
+## Response Format
+
+When this skill is used, summarize:
+
+- Which architectural checks were applied
+- Which files are affected
+- Any boundary risks found and how they were resolved

.github/skills/medassist-config-change-guard/SKILL.md

@@ -0,0 +1,43 @@
+---
+name: medassist-config-change-guard
+description: Validate MedAssist configuration changes across env vars, Docker compose, proxy settings, and runtime defaults, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when changes touch `.env`, Docker files, Vite proxy settings, runtime defaults, or app startup behavior.
+
+## Objective
+
+Prevent configuration drift and broken local/CI environments.
+
+## Required Checks
+
+1. New/changed config has safe defaults.
+2. Env changes are backward-compatible where feasible.
+3. Docker/dev runtime changes remain consistent across services.
+4. Frontend/backend URL/proxy conventions remain valid (`/api/*`).
+5. Documentation reflects configuration changes.
+
+## Files to Prioritize
+
+- `.env.example`
+- `docker-compose.yml`
+- `docker-compose.dev.yml`
+- `frontend/vite.config.ts`
+- Relevant package scripts and startup files
+
+## Anti-Patterns
+
+- Hidden required env vars with no defaults.
+- Inconsistent host/port/proxy settings across environments.
+- Config changes without doc updates.
+
+## Response Format
+
+Report:
+
+- Config files reviewed
+- Compatibility impact (none/low/high)
+- Required follow-up updates
+- Final readiness recommendation

.github/skills/medassist-db-compat-check/SKILL.md

@@ -0,0 +1,40 @@
+---
+name: medassist-db-compat-check
+description: Enforce backward-compatible database changes for MedAssist SQLite and Drizzle migrations, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill for any feature or fix that adds or reads persisted data.
+
+## Mandatory Sequence
+
+For every new persisted field/column:
+
+1. Add the column in `backend/src/db/schema.ts` with `NOT NULL DEFAULT <value>`.
+2. Generate migration with Drizzle Kit.
+3. Add matching `ALTER TABLE` logic in `backend/src/db/client.ts` inside `runAlterMigrations()`.
+4. Read values null-safe in routes/services (`?? defaultValue`).
+
+## Hard Rules
+
+- Never remove or rename existing columns.
+- Never add non-null columns without defaults.
+- Never read newly added fields without fallback.
+- Never manually edit generated Drizzle SQL migrations.
+
+## Verification Checklist
+
+- Schema update exists.
+- Generated migration exists.
+- Alter migration for existing DBs exists.
+- Runtime reads are fallback-safe.
+
+## Response Format
+
+Report these items explicitly:
+
+- New/changed columns
+- Added alter-migration statements
+- Null-safe read locations
+- Remaining migration risk (if any)

.github/skills/medassist-doc-sync-guard/SKILL.md

@@ -0,0 +1,39 @@
+---
+name: medassist-doc-sync-guard
+description: Ensure MedAssist documentation stays aligned with behavior changes in APIs, configuration, setup, and operations, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when code changes alter behavior, setup steps, environment variables, user workflows, or operational commands.
+
+## Objective
+
+Keep docs consistent with actual product behavior and avoid stale setup/run guidance.
+
+## Required Checks
+
+1. If API behavior changed, verify relevant docs are updated.
+2. If ENV/config changed, update documented variables/defaults.
+3. If workflow/commands changed, update setup/run instructions.
+4. If user-facing behavior changed, update user-facing description.
+
+## Candidate Documentation Files
+
+- `README.md`
+- `docs/PROJECT_SETUP.md`
+- `docs/TECH_STACK.md`
+
+## Anti-Patterns
+
+- Shipping behavior changes without docs updates.
+- Updating docs with speculative/unverified commands.
+- Duplicating conflicting instructions across files.
+
+## Response Format
+
+Return:
+
+- Doc files that should change
+- Proposed update summary per file
+- Any intentionally skipped docs and reason

.github/skills/medassist-frontend-polish/SKILL.md

@@ -0,0 +1,67 @@
+---
+name: medassist-frontend-polish
+description: Improve frontend visual quality within the existing MedAssist design system, without introducing new themes, font stacks, or disruptive UI patterns, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when the user wants UI improvements, better styling, or a more polished frontend, but the feature must stay consistent with MedAssist product UX.
+
+## Scope
+
+This is the **visual enhancement skill**.
+It refines quality *within* existing product conventions.
+
+Apply `medassist-ui-consistency` rules first, then use this skill for tasteful polish.
+
+## Do Not Use This Skill For
+
+- Replacing base UI patterns/components with new ones.
+- New design-system direction, visual identity, or broad layout language changes.
+- Marketing/brand-experiment pages that intentionally break product conventions.
+
+## Objective
+
+Deliver production-grade visual refinement that feels intentionally designed while remaining fully consistent with existing MedAssist components, spacing, typography, and interaction patterns.
+
+## Strict Constraints
+
+- Reuse existing components and patterns first (`ConfirmModal`, `MedicationAvatar`, existing form/button/layout patterns).
+- Do not introduce new global theme systems, font families, or visual identity changes.
+- Do not invent new UX flows, pages, or interaction models unless explicitly requested.
+- Keep frontend text i18n-safe: use `t("...")` and EN/DE keys.
+- Respect accessibility and readability over decorative effects.
+
+## Allowed Enhancements
+
+- Better spacing rhythm and visual hierarchy.
+- Cleaner grouping, alignment, and density adjustments.
+- Improved states (hover, focus, disabled, loading) using existing style language.
+- Subtle transitions/micro-interactions that do not distract and do not change behavior.
+- Consistent empty/error/success presentation using existing UI conventions.
+
+## Not Allowed
+
+- Random aesthetic overhauls.
+- New color systems or hardcoded ad-hoc colors that break current theme tokens.
+- Heavy animation, parallax, or attention-stealing motion.
+- Typography experiments that diverge from current product style.
+- "Creative" layout changes that reduce usability or consistency.
+
+## Implementation Workflow
+
+1. Confirm `medassist-ui-consistency` guardrails are satisfied.
+2. Identify existing components and CSS patterns to reuse.
+3. Define the smallest visual changes that improve clarity and quality.
+4. Apply refinements in-place without changing core behavior.
+5. Validate consistency across neighboring views/components.
+6. Ensure i18n and accessibility are preserved.
+
+## Response Format
+
+When using this skill, report:
+
+- Reused components and style primitives
+- Specific polish improvements applied
+- Any trade-offs/constraints respected
+- Confirmation that no new design system or disruptive UX pattern was introduced

.github/skills/medassist-i18n-enforcer/SKILL.md

@@ -0,0 +1,31 @@
+---
+name: medassist-i18n-enforcer
+description: Enforce MedAssist i18n rules so UI copy is always translation-key based for English and German, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when changing frontend UI text, form labels, alerts, dialogs, or page content.
+
+## Rules
+
+- Do not hardcode new user-facing strings in React components.
+- Use translation keys via `t("...")`.
+- Add or update matching keys in:
+  - `frontend/src/i18n/en.json`
+  - `frontend/src/i18n/de.json`
+- Keep semantic key naming consistent with existing namespaces.
+
+## Validation
+
+1. Every new UI string has a key.
+2. English and German entries are both present.
+3. No fallback-to-English hardcoded text remains in JSX.
+
+## Response Format
+
+List:
+
+- New keys added
+- Files where keys were used
+- Any intentionally unchanged text and reason

.github/skills/medassist-observability-guard/SKILL.md

@@ -0,0 +1,41 @@
+---
+name: medassist-observability-guard
+description: Ensure MedAssist changes preserve actionable logging, health checks, and clear operational error visibility, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when changes affect backend services, schedulers, integrations, startup flow, or failure handling.
+
+## Objective
+
+Maintain operational visibility so failures are detectable, diagnosable, and actionable.
+
+## Required Checks
+
+1. Critical paths keep clear error reporting.
+2. Health-check behavior remains intact and meaningful.
+3. Logs contain actionable context without leaking secrets.
+4. Errors are surfaced with enough detail for debugging.
+5. Silent failure paths are avoided.
+
+## MedAssist Focus Areas
+
+- `backend/src/index.ts`
+- `backend/src/routes/health.ts`
+- `backend/src/services/*`
+- Scheduler and notification flows
+
+## Anti-Patterns
+
+- Swallowed exceptions.
+- Generic logs with no context.
+- Missing visibility for background failures.
+
+## Response Format
+
+Return:
+
+- Observability touchpoints reviewed
+- Gaps found and suggested fixes
+- Operational risk level

.github/skills/medassist-release-handoff/SKILL.md

@@ -0,0 +1,30 @@
+---
+name: medassist-release-handoff
+description: Enforce MedAssist release ownership by preventing remote git/release actions by normal agents and delegating to release-manager, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when a request includes branch push, PR creation, merge, tagging, release notes publishing, or release orchestration.
+
+## Ownership Rules
+
+- Remote git/release actions are owned by `@release-manager`.
+- Normal agent/Copilot must not perform:
+  - `git push`
+  - PR creation/merge
+  - tag/release creation
+
+## Required Behavior
+
+1. Perform local code edits only.
+2. Summarize local changes clearly.
+3. Provide handoff instruction to `@release-manager` for shipping steps.
+
+## Response Format
+
+When this skill applies, return:
+
+- "Release handoff required"
+- Delegate target: `@release-manager`
+- Shipping checklist (branch, PR, CI, merge, release)

.github/skills/medassist-security-sanity/SKILL.md

@@ -0,0 +1,43 @@
+---
+name: medassist-security-sanity
+description: Apply baseline security checks to MedAssist code changes, especially for backend routes, auth flows, and input handling, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when a change touches backend routes, auth/session logic, file handling, imports/exports, or external input.
+
+## Objective
+
+Prevent common security regressions with fast, practical checks during implementation.
+
+## Required Checks
+
+1. Validate and sanitize external input at API boundaries.
+2. Enforce auth/authz server-side for protected actions.
+3. Ensure secrets/tokens are never hardcoded or logged.
+4. Avoid information leakage in error responses.
+5. Keep permission-sensitive operations explicit and auditable.
+
+## MedAssist Focus Areas
+
+- Route handlers in `backend/src/routes/`.
+- Auth-related code in `backend/src/plugins/` and auth routes.
+- Data import/export and sharing endpoints.
+- File/image upload and serving paths.
+
+## Anti-Patterns
+
+- Trusting frontend-only checks.
+- Accepting unchecked query/body/path input.
+- Returning raw internal errors to clients.
+- Weak defaults for sensitive operations.
+
+## Response Format
+
+Report:
+
+- Security-sensitive files reviewed
+- Findings by severity (critical/major/minor)
+- Concrete remediation actions
+- Residual risk (if any)

.github/skills/medassist-skill-quality-review/SKILL.md

@@ -0,0 +1,42 @@
+---
+name: medassist-skill-quality-review
+description: Review MedAssist skills for trigger quality, scope boundaries, and conflicts with AGENTS governance, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when creating or modifying any skill under `.github/skills/`.
+
+## Objective
+
+Keep skills discoverable, non-overlapping, and aligned with canonical governance in `AGENTS.md`.
+
+## Required Checks
+
+1. Frontmatter has clear `name` and specific `description` trigger language.
+2. Scope boundaries are explicit (`when to use` / `do not use`).
+3. No conflicts with `AGENTS.md` ownership rules.
+4. No policy duplication that can drift from canonical governance.
+5. References to related skills are explicit where workflows chain.
+
+## Quality Signals
+
+- Trigger phrases are concrete and task-shaped.
+- Instructions are concise, actionable, and deterministic.
+- Response format is clear and useful for downstream handoff.
+
+## Anti-Patterns
+
+- Vague descriptions that match everything.
+- Duplicate skills with overlapping responsibilities.
+- Contradictory ownership guidance.
+- Long policy blocks copied from other files.
+
+## Response Format
+
+Return:
+
+- Scope/trigger issues found
+- Overlap/conflict findings
+- Suggested minimal edits
+- Final pass/fail recommendation

.github/skills/medassist-testing-handoff/SKILL.md

@@ -0,0 +1,31 @@
+---
+name: medassist-testing-handoff
+description: Enforce MedAssist testing ownership by delegating test planning, execution, and CI test failure triage to testing-manager, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill whenever a task includes writing tests, running tests, or diagnosing test-related CI failures.
+
+## Ownership Rules
+
+- Test planning, implementation, and execution are owned by `@testing-manager`.
+- CI test-failure triage (`test.yml`, `e2e.yml`) is owned by `@testing-manager`.
+- Normal coding agent should hand off testing tasks instead of executing testing workflows directly.
+
+## Handoff Template
+
+Use this structure for delegation:
+
+1. Scope: feature/fix and affected files
+2. Expected behavior
+3. Suggested test layers (unit/integration/e2e)
+4. CI failure context (if applicable)
+
+## Response Format
+
+When triggered, output:
+
+- "Testing handoff required"
+- Delegate target: `@testing-manager`
+- Minimal handoff brief (scope + expected behavior)

.github/skills/medassist-ui-consistency/SKILL.md

@@ -0,0 +1,42 @@
+---
+name: medassist-ui-consistency
+description: Enforce non-negotiable MedAssist UI guardrails by reusing existing components, styles, and interaction patterns, including equivalent requests phrased in German.
+---
+
+# Skill Instructions
+
+Use this skill when implementing or editing UI flows, modals, buttons, forms, schedule views, or settings screens.
+
+## Scope
+
+This is the **guardrail skill** for UI work.
+Use it to enforce consistency and prevent design drift.
+
+Use `medassist-frontend-polish` only after these guardrails are satisfied.
+
+## Do Not Use This Skill For
+
+- Creative visual redesign requests where no product consistency constraints apply.
+- Marketing-style one-off pages outside MedAssist product UI conventions.
+
+## Rules
+
+- Reuse existing components (for example `ConfirmModal`, `MedicationAvatar`) before creating new primitives.
+- Keep spacing, typography, and button styles aligned with existing patterns.
+- Avoid custom inline modal/button patterns that diverge from project design.
+- Prefer extending existing CSS classes/styles instead of introducing parallel styling systems.
+
+## Decision Heuristics
+
+1. If an equivalent component exists, reuse it.
+2. If small variant is needed, extend existing styles minimally.
+3. If a new component is unavoidable, match existing naming and structure conventions.
+
+## Response Format
+
+Provide:
+
+- Reused components/styles
+- Any new UI element and why reuse was not possible
+- Consistency risks reviewed
+- Confirmation that `medassist-frontend-polish` constraints remain compatible (if polish work is also requested)

.github/workflows/add-to-project.yml

@@ -0,0 +1,19 @@
+name: Add to Project
+
+on:
+  issues:
+    types: [opened, labeled]
+
+permissions: {}
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: ${{ vars.PROJECT_URL }}
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: enhancement, bug, triage
+          label-operator: OR

.github/workflows/codeql.yml

@@ -3,8 +3,30 @@ name: "CodeQL"
 on:
   push:
     branches: [main]
+    paths:
+      - '**.js'
+      - '**.ts'
+      - '**.tsx'
+      - '**.jsx'
+      - 'backend/package.json'
+      - 'backend/package-lock.json'
+      - 'frontend/package.json'
+      - 'frontend/package-lock.json'
+      - '.github/codeql/**'
+      - '.github/workflows/codeql.yml'
   pull_request:
     branches: [main]
+    paths:
+      - '**.js'
+      - '**.ts'
+      - '**.tsx'
+      - '**.jsx'
+      - 'backend/package.json'
+      - 'backend/package-lock.json'
+      - 'frontend/package.json'
+      - 'frontend/package-lock.json'
+      - '.github/codeql/**'
+      - '.github/workflows/codeql.yml'
   schedule:
     - cron: "0 6 * * 1" # Weekly on Monday at 6am UTC
   workflow_dispatch: # Allow manual trigger

.github/workflows/docker-build.yml

@@ -20,50 +20,16 @@ env:
 
 jobs:
   # =============================================================================
-  # Run Tests First
-  # =============================================================================
-  backend-test:
-    name: Backend Tests
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    defaults:
-      run:
-        working-directory: backend
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-          cache-dependency-path: backend/package-lock.json
-      - run: npm ci
-      - run: npx tsc --noEmit
-      - run: npm run test:run
-
-  frontend-build:
-    name: Frontend Build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    defaults:
-      run:
-        working-directory: frontend
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-      - run: npm ci
-      - run: npm run build
-
-  # =============================================================================
-  # Build and Push Docker Images (only after tests pass)
+  # Build and Push Docker Images
+  # Triggered on pushes to main (tagged as "main") and version tags (v*).
+  # Tests are NOT run here — branch protection on main requires all PR checks
+  # (backend-test + frontend-build from test.yml) to pass before merge.
+  # Tags are created from main, so code is already tested.
+  #
+  # main push  → "main" tag only (for testing before release)
+  # Tag builds → semver tags (e.g., 1.9.0, 1.9) plus "latest"
   # =============================================================================
   build-and-push:
-    needs: [backend-test, frontend-build]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -101,7 +67,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=raw,value=${{ github.event.inputs.tag || 'latest' }},enable=${{ github.event_name == 'workflow_dispatch' }}
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
 
       - name: Build and push
         uses: docker/build-push-action@v5
@@ -113,6 +79,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           platforms: linux/amd64,linux/arm64
+          provenance: false
+          sbom: false
 
   # =============================================================================
   # Create GitHub Release (only on tag push)
@@ -130,13 +98,28 @@ jobs:
         with:
           fetch-depth: 0  # Fetch all history for changelog generation
 
+      - name: Check if release exists
+        id: check_release
+        run: |
+          CURRENT_TAG=${GITHUB_REF#refs/tags/}
+          if gh release view "$CURRENT_TAG" &>/dev/null; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            echo "Release $CURRENT_TAG already exists, skipping creation"
+          else
+            echo "exists=false" >> $GITHUB_OUTPUT
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Get previous tag
+        if: steps.check_release.outputs.exists == 'false'
         id: prev_tag
         run: |
           PREV_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
           echo "tag=${PREV_TAG}" >> $GITHUB_OUTPUT
 
       - name: Generate changelog
+        if: steps.check_release.outputs.exists == 'false'
         id: changelog
         run: |
           CURRENT_TAG=${GITHUB_REF#refs/tags/}
@@ -165,6 +148,7 @@ jobs:
           echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${PREV_TAG}...${CURRENT_TAG}" >> changelog.md
 
       - name: Create GitHub Release
+        if: steps.check_release.outputs.exists == 'false'
         uses: softprops/action-gh-release@v2
         with:
           body_path: changelog.md

.github/workflows/e2e.yml

@@ -0,0 +1,70 @@
+name: E2E Tests
+
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - 'frontend/**'
+      - 'backend/**'
+      - '.github/workflows/e2e.yml'
+
+# Minimal permissions for security
+permissions:
+  contents: read
+
+jobs:
+  e2e:
+    name: Playwright E2E
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: |
+            backend/package-lock.json
+            frontend/package-lock.json
+
+      - name: Install backend dependencies
+        working-directory: backend
+        run: npm ci
+
+      - name: Install frontend dependencies
+        working-directory: frontend
+        run: npm ci
+
+      - name: Install Playwright browsers
+        working-directory: frontend
+        run: npx playwright install --with-deps chromium
+
+      - name: Run E2E tests (Chromium only)
+        working-directory: frontend
+        run: npx playwright test --project=chromium
+        env:
+          CI: true
+          JWT_SECRET: e2e-test-secret-that-is-long-enough
+          SESSION_SECRET: e2e-test-session-secret-long-enough
+
+      - name: Upload Playwright report
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-report
+          path: frontend/playwright-report/
+          retention-days: 7
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-results
+          path: frontend/test-results/
+          retention-days: 7

.github/workflows/project-auto-done.yml

@@ -0,0 +1,105 @@
+name: Move Done in Project
+
+on:
+  issues:
+    types: [closed]
+  pull_request:
+    types: [closed]
+
+permissions: {}
+
+jobs:
+  move-to-done:
+    name: Move to Done
+    runs-on: ubuntu-latest
+    if: >-
+      (github.event_name == 'issues' && github.event.issue.state_reason == 'completed') ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
+    steps:
+      - name: Move project item to Done
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          script: |
+            const projectId = 'PVT_kwHOADH82s4BO2OT';
+            const statusFieldId = 'PVTSSF_lAHOADH82s4BO2OTzg9bdkE';
+            const doneOptionId = 'ca45af98';
+
+            // Determine content ID (issue or PR node ID)
+            const nodeId = context.payload.issue?.node_id || context.payload.pull_request?.node_id;
+            const number = context.payload.issue?.number || context.payload.pull_request?.number;
+            const type = context.payload.issue ? 'issue' : 'pull_request';
+
+            console.log(`Processing ${type} #${number} (${nodeId})`);
+
+            // Find the project item by content node ID
+            const result = await github.graphql(`
+              query($nodeId: ID!) {
+                node(id: $nodeId) {
+                  ... on Issue {
+                    projectItems(first: 10) {
+                      nodes {
+                        id
+                        project { id }
+                        fieldValueByName(name: "Status") {
+                          ... on ProjectV2ItemFieldSingleSelectValue {
+                            name
+                            optionId
+                          }
+                        }
+                      }
+                    }
+                  }
+                  ... on PullRequest {
+                    projectItems(first: 10) {
+                      nodes {
+                        id
+                        project { id }
+                        fieldValueByName(name: "Status") {
+                          ... on ProjectV2ItemFieldSingleSelectValue {
+                            name
+                            optionId
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            `, { nodeId });
+
+            const items = result.node?.projectItems?.nodes || [];
+            const projectItem = items.find(item => item.project.id === projectId);
+
+            if (!projectItem) {
+              console.log(`${type} #${number} is not in the project board — skipping.`);
+              return;
+            }
+
+            const currentStatus = projectItem.fieldValueByName?.name || 'unknown';
+            if (currentStatus === 'Done') {
+              console.log(`${type} #${number} is already "Done" — skipping.`);
+              return;
+            }
+
+            console.log(`Moving ${type} #${number} from "${currentStatus}" to "Done"...`);
+
+            await github.graphql(`
+              mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) {
+                updateProjectV2ItemFieldValue(input: {
+                  projectId: $projectId
+                  itemId: $itemId
+                  fieldId: $fieldId
+                  value: { singleSelectOptionId: $optionId }
+                }) {
+                  projectV2Item { id }
+                }
+              }
+            `, {
+              projectId,
+              itemId: projectItem.id,
+              fieldId: statusFieldId,
+              optionId: doneOptionId
+            });
+
+            console.log(`Successfully moved ${type} #${number} to "Done".`);

.github/workflows/release.yml

@@ -1,56 +0,0 @@
-name: Create Release
-
-on:
-  push:
-    tags: ['v*']
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Get previous tag
-        id: prev_tag
-        run: |
-          # Get all tags sorted by version, find the one before current
-          CURRENT_TAG=${GITHUB_REF#refs/tags/}
-          PREV_TAG=$(git tag --sort=-v:refname | grep -A1 "^${CURRENT_TAG}$" | tail -1)
-          
-          # If no previous tag found (first release), use empty
-          if [ "$PREV_TAG" = "$CURRENT_TAG" ]; then
-            PREV_TAG=""
-          fi
-          
-          echo "previous_tag=$PREV_TAG" >> $GITHUB_OUTPUT
-          echo "Current tag: $CURRENT_TAG, Previous tag: $PREV_TAG"
-
-      - name: Generate changelog
-        id: changelog
-        run: |
-          PREV_TAG="${{ steps.prev_tag.outputs.previous_tag }}"
-          
-          if [ -z "$PREV_TAG" ]; then
-            # First release - get all commits
-            CHANGES=$(git log --pretty=format:"- %s" HEAD)
-          else
-            # Get commits since last tag
-            CHANGES=$(git log --pretty=format:"- %s" ${PREV_TAG}..HEAD)
-          fi
-          
-          # Write to file for multiline support
-          echo "$CHANGES" > changelog.txt
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        with:
-          body_path: changelog.txt
-          generate_release_notes: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -10,10 +10,38 @@ permissions:
 
 jobs:
   # =============================================================================
-  # Backend Tests
+  # Detect which paths changed to skip unnecessary jobs
+  # =============================================================================
+  changes:
+    name: Detect Changes
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+    outputs:
+      backend: ${{ steps.filter.outputs.backend }}
+      frontend: ${{ steps.filter.outputs.frontend }}
+    steps:
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            backend:
+              - 'backend/**'
+              - 'biome.json'
+              - '.github/workflows/test.yml'
+            frontend:
+              - 'frontend/**'
+              - 'biome.json'
+              - '.github/workflows/test.yml'
+
+  # =============================================================================
+  # Backend Tests (skipped if no backend-related files changed)
   # =============================================================================
   backend-test:
     name: Backend Tests
+    needs: changes
+    if: needs.changes.outputs.backend == 'true'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -35,6 +63,9 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Lint
+        run: npm run lint
+
       - name: TypeScript type check
         run: npx tsc --noEmit
 
@@ -50,10 +81,12 @@ jobs:
           retention-days: 7
 
   # =============================================================================
-  # Frontend Build Validation
+  # Frontend Build Validation (skipped if no frontend-related files changed)
   # =============================================================================
   frontend-build:
     name: Frontend Build
+    needs: changes
+    if: needs.changes.outputs.frontend == 'true'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -75,5 +108,8 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Lint
+        run: npm run lint
+
       - name: TypeScript type check & build
         run: npm run build

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

@@ -0,0 +1,111 @@
+name: Update Test Badges
+
+on:
+  workflow_dispatch:
+  workflow_run:
+    workflows: ["Build and Push Docker Images"]
+    types: [completed]
+    branches: [main]
+
+permissions:
+  contents: write
+
+# Prevent parallel badge workflows from racing each other
+concurrency:
+  group: update-test-badges
+  cancel-in-progress: true
+
+jobs:
+  update-badges:
+    name: Update Test Count Badges
+    runs-on: ubuntu-latest
+    # Only run after successful docker builds, not failed ones
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.BADGE_TOKEN || secrets.GITHUB_TOKEN }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+
+      - name: Install backend dependencies
+        working-directory: backend
+        run: npm ci
+
+      - name: Install frontend dependencies
+        working-directory: frontend
+        run: npm ci
+
+      - name: Run backend tests and capture count
+        id: backend-tests
+        working-directory: backend
+        timeout-minutes: 5
+        env:
+          CI: true
+        run: |
+          OUTPUT=$(npm run test:run 2>&1) || true
+          echo "$OUTPUT"
+          # Strip ANSI escape codes, then extract "Tests  X passed" from output
+          CLEAN=$(echo "$OUTPUT" | sed 's/\x1b\[[0-9;]*m//g')
+          PASSED=$(echo "$CLEAN" | grep -oP 'Tests\s+\K\d+(?=\s+passed)' | tail -1)
+          echo "count=$PASSED" >> $GITHUB_OUTPUT
+
+      - name: Run frontend tests and capture count
+        id: frontend-tests
+        working-directory: frontend
+        timeout-minutes: 5
+        env:
+          CI: true
+        run: |
+          OUTPUT=$(npm run test:run 2>&1) || true
+          echo "$OUTPUT"
+          # Strip ANSI escape codes, then extract "Tests  X passed" from output
+          CLEAN=$(echo "$OUTPUT" | sed 's/\x1b\[[0-9;]*m//g')
+          PASSED=$(echo "$CLEAN" | grep -oP 'Tests\s+\K\d+(?=\s+passed)' | tail -1)
+          echo "count=$PASSED" >> $GITHUB_OUTPUT
+
+      - name: Update README badges
+        run: |
+          BACKEND_COUNT="${{ steps.backend-tests.outputs.count }}"
+          FRONTEND_COUNT="${{ steps.frontend-tests.outputs.count }}"
+          
+          echo "Backend tests: $BACKEND_COUNT"
+          echo "Frontend tests: $FRONTEND_COUNT"
+          
+          # Only update if we got valid counts
+          if [[ -n "$BACKEND_COUNT" && -n "$FRONTEND_COUNT" ]]; then
+            # URL encode the slash for shields.io
+            BACKEND_BADGE="https://img.shields.io/badge/Backend_Tests-${BACKEND_COUNT}%2F${BACKEND_COUNT}-brightgreen?logo=vitest"
+            FRONTEND_BADGE="https://img.shields.io/badge/Frontend_Tests-${FRONTEND_COUNT}%2F${FRONTEND_COUNT}-brightgreen?logo=vitest"
+            
+            # Update README using sed
+            sed -i "s|https://img.shields.io/badge/Backend_Tests-[^\"]*|$BACKEND_BADGE|g" README.md
+            sed -i "s|https://img.shields.io/badge/Frontend_Tests-[^\"]*|$FRONTEND_BADGE|g" README.md
+            
+            echo "Updated badges in README.md"
+          else
+            echo "Could not extract test counts, skipping update"
+            exit 0
+          fi
+
+      - name: Commit and push badge updates
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add README.md
+          if git diff --cached --quiet; then
+            echo "No badge changes to commit"
+          else
+            git commit -m "chore: update test count badges [skip ci]"
+            # Rebase on latest main to avoid push rejection when concurrent
+            # badge workflows or other [skip ci] commits land between checkout and push
+            git pull --rebase origin main
+            git push
+          fi

.gitignore

@@ -1,33 +1,83 @@
-# Node
+# ===================
+# Dependencies
+# ===================
 node_modules/
+.pnpm-store/
+
+# ===================
+# Build outputs
+# ===================
+dist/
+build/
+.tmp/
+*.tsbuildinfo
+
+# ===================
+# Test & Coverage
+# ===================
+coverage/
+.nyc_output/
+
+# Playwright
+/frontend/playwright-report/
+/frontend/test-results/
+/frontend/e2e/.auth/
+/frontend/blob-report/
+
+# ===================
+# Environment
+# ===================
+.env
+.env.*
+!.env.example
+
+# ===================
+# Database & Data
+# ===================
+*.db
+*.sqlite
+*.sqlite3
+*.db-journal
+*.db-wal
+*.db-shm
+data/
+
+# ===================
+# Logs
+# ===================
+logs/
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 
-# Build outputs
-dist/
-build/
-coverage/
-.tmp/
-
-# Env
-.env
-.env.*
-!.env.example
-
-# SQLite
-*.db
-*.sqlite
-*.sqlite3
-*.db-journal
-backend/data/
-
-# Logs
-logs/
-*.log
-
-# Editor
-.vscode/
-.idea/
+# ===================
+# OS files
+# ===================
 .DS_Store
+Thumbs.db
+*.swp
+*.swo
+*~
+
+# ===================
+# IDE / Editor
+# ===================
+.idea/
+*.sublime-project
+*.sublime-workspace
+
+# Keep shared VS Code settings
+# .vscode/ is NOT ignored - settings.json is useful for the team
+
+# ===================
+# Misc
+# ===================
+*.local
+.cache/
+.turbo/
+.roo/
+.roomodes
+AGENTS.md
+docs/TECH_STACK.md

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "vitest.root": "backend",
+  "vitest.enable": true,
+  "vitest.commandLine": "npm test --"
+}

README.md

@@ -17,6 +17,11 @@
   <img src="https://img.shields.io/badge/Docker-Ready-2496ED?logo=docker" alt="Docker" />
 </p>
 
+<p align="center">
+  <img src="https://img.shields.io/badge/Backend_Tests-518%2F518-brightgreen?logo=vitest" alt="Backend Tests 454/454" />
+  <img src="https://img.shields.io/badge/Frontend_Tests-879%2F879-brightgreen?logo=vitest" alt="Frontend Tests 611/611" />
+</p>
+
 ### 🤖 AI-Generated Code
 
 > This app was 100% coded with Claude Opus 4.5. Use at your own risk.
@@ -28,6 +33,7 @@
 > **Think of this app as a helpful tool, but make all health decisions independently!**
 
 - [Features](#features)
+- [Screenshots](#screenshots)
 - [Getting Started](#getting-started)
 - [Configuration](#configuration)
 - [Development](#development)
@@ -38,11 +44,91 @@
   <img src="docs/gifs/MedAssist-demo.gif" alt="MedAssist-ng Dashboard" width="100%" />
 </p>
 
+<a id="screenshots"></a>
+<details>
+<summary><strong>Screenshots</strong></summary>
+<blockquote>
+
+<details>
+<summary>Dashboard</summary>
+
+Overview with stock status, reorder reminders, and upcoming schedules.
+
+<img src="docs/screenshots/dashboard-desktop.png" alt="Dashboard" width="100%" />
+
+</details>
+
+<details>
+<summary>Medication Detail</summary>
+
+View medication details, stock information, and intake schedule.
+
+<img src="docs/screenshots/medication-detail-modal.png" alt="Medication Detail Modal" width="100%" />
+
+</details>
+
+<details>
+<summary>Medications & Edit Form</summary>
+
+Manage your medications with the edit form and refill feature.
+
+<img src="docs/screenshots/medications-edit-desktop.png" alt="Medications Edit Form" width="100%" />
+
+</details>
+
+<details>
+<summary>Demand Calculator (Planner)</summary>
+
+Calculate how many pills you need for a specific date range.
+
+<img src="docs/screenshots/planner-desktop.png" alt="Planner - Demand Calculator" width="100%" />
+
+</details>
+
+<details>
+<summary>Shared Schedule</summary>
+
+Share your medication schedule with others via a public link.
+
+<img src="docs/screenshots/share-schedule-desktop.png" alt="Shared Schedule" width="100%" />
+
+</details>
+
+<details>
+<summary>Mobile Views</summary>
+
+<table>
+  <tr>
+    <td align="center" width="33%">
+      <strong>Dashboard</strong><br>
+      <img src="docs/screenshots/dashboard-mobile.png" alt="Mobile Dashboard" width="100%" />
+    </td>
+    <td align="center" width="33%">
+      <strong>Medications</strong><br>
+      <img src="docs/screenshots/medications-mobile.png" alt="Mobile Medications" width="100%" />
+    </td>
+    <td align="center" width="33%">
+      <strong>Schedule</strong><br>
+      <img src="docs/screenshots/schedule-mobile.png" alt="Mobile Schedule" width="100%" />
+    </td>
+  </tr>
+</table>
+
+</details>
+
+</blockquote>
+</details>
+
 ### Smart Inventory
-- Track exact stock: packs, blisters, and loose pills
+- Track exact stock: packs, blisters, bottles, and loose pills
 - Display remaining days of supply
 - Automatic calculation based on intake schedule
 
+### Medication Refill
+- One-click refill with pack or loose pill options
+- Complete refill history per medication
+- Automatic stock updates after each refill
+
 ### Flexible Schedules
 - Daily, weekly, or custom intervals per medication
 - Independent schedules for each medication
@@ -55,11 +141,17 @@
 ### Trip Planner
 - Calculate how many pills you need for a trip or date range
 - Plan ahead for vacations, business trips, or hospital stays
+- Send demand reports via email or push notification
 
 ### Multi-Person Support
 - Manage medications for multiple people
 - Share schedules via link. Recipients can mark doses as taken, you see it live
 
+### Data Export & Import
+- Export all your data (medications, dose history, settings) as JSON
+- Import previously exported data with automatic ID remapping
+- Choose whether to include sensitive data in exports
+
 ### Notifications
 - Email via SMTP
 - Push notifications via ntfy, Pushover, Gotify, Telegram, Discord & more ([Shoutrrr](https://containrrr.dev/shoutrrr/))
@@ -121,7 +213,7 @@ Generate secrets with: `openssl rand -hex 32`
 | `OIDC_ISSUER_URL` | — | OIDC provider URL |
 | `OIDC_CLIENT_ID` | — | Client ID from OIDC provider |
 | `OIDC_CLIENT_SECRET` | — | Client secret from OIDC provider |
-| `OIDC_REDIRECT_URI` | — | Callback URL |
+| `OIDC_REDIRECT_URI` | — | Full callback URL (e.g., `https://your-domain.com/api/auth/oidc/callback`) |
 | `OIDC_SCOPES` | `openid profile email` | Scopes to request |
 | `OIDC_USERNAME_CLAIM` | `preferred_username` | Claim for username |
 | `OIDC_AUTO_CREATE_USERS` | `true` | Auto-create users on first SSO login |
@@ -163,6 +255,14 @@ Configure push notifications in Settings → Push, or set defaults via environme
 | `DEFAULT_SHOUTRRR_STOCK_REMINDERS` | `true` | Send stock warnings via push |
 | `DEFAULT_SHOUTRRR_INTAKE_REMINDERS` | `true` | Send intake reminders via push |
 
+### Default User Settings
+
+These defaults are applied when a new user is created. Once a user saves settings in the app, their values take precedence.
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `DEFAULT_SHARE_STOCK_STATUS` | `true` | Show stock status (Normal/Low/Critical) on shared schedule links |
+
 #### URL Examples
 
 **ntfy** (free, self-hostable):

backend/.dockerignore

@@ -0,0 +1,35 @@
+# Dependencies
+node_modules/
+
+# Build outputs
+dist/
+coverage/
+
+# Development files
+*.log
+npm-debug.log*
+
+# Test files
+src/test/
+*.test.ts
+vitest.config.ts
+
+# Local data (mounted as volume in production)
+data/
+
+# IDE
+.vscode/
+.idea/
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Git
+.git/
+.gitignore
+
+# Docker
+Dockerfile
+.dockerignore
+docker-compose*.yml

backend/Dockerfile

@@ -46,6 +46,9 @@ COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/dist ./dist
 COPY --from=builder /app/package.json ./
 
+# Copy drizzle migrations folder (required for database setup)
+COPY drizzle ./drizzle
+
 # Create data directory and set ownership to node user (UID 1000)
 RUN mkdir -p /app/data && chown -R node:node /app
 

backend/drizzle.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from "drizzle-kit";
+
+export default defineConfig({
+  schema: "./src/db/schema.ts",
+  out: "./drizzle",
+  dialect: "sqlite",
+  dbCredentials: {
+    url: process.env.DATABASE_URL || "./data/medassist-ng.db",
+  },
+});

backend/drizzle/0000_init.sql

@@ -0,0 +1,112 @@
+CREATE TABLE `dose_tracking` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`user_id` integer NOT NULL,
+	`dose_id` text(255) NOT NULL,
+	`taken_at` integer DEFAULT (strftime('%s','now')) NOT NULL,
+	`marked_by` text(100),
+	`dismissed` integer DEFAULT false NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `medications` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`user_id` integer NOT NULL,
+	`name` text(100) NOT NULL,
+	`generic_name` text(100),
+	`taken_by_json` text DEFAULT '[]' NOT NULL,
+	`pack_count` integer DEFAULT 1 NOT NULL,
+	`blisters_per_pack` integer DEFAULT 1 NOT NULL,
+	`pills_per_blister` integer DEFAULT 1 NOT NULL,
+	`loose_tablets` integer DEFAULT 0 NOT NULL,
+	`pill_weight_mg` integer,
+	`usage_json` text DEFAULT '[]' NOT NULL,
+	`every_json` text DEFAULT '[]' NOT NULL,
+	`start_json` text DEFAULT '[]' NOT NULL,
+	`image_url` text,
+	`expiry_date` text,
+	`notes` text,
+	`intake_reminders_enabled` integer DEFAULT false NOT NULL,
+	`updated_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `refill_history` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`medication_id` integer NOT NULL,
+	`user_id` integer NOT NULL,
+	`packs_added` integer DEFAULT 0 NOT NULL,
+	`loose_pills_added` integer DEFAULT 0 NOT NULL,
+	`refill_date` integer DEFAULT (strftime('%s','now')) NOT NULL,
+	FOREIGN KEY (`medication_id`) REFERENCES `medications`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `refresh_tokens` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`user_id` integer NOT NULL,
+	`token_id` text(255) NOT NULL,
+	`expires_at` integer NOT NULL,
+	`rotated_at` integer,
+	`revoked` integer DEFAULT false NOT NULL,
+	`created_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `refresh_tokens_token_id_unique` ON `refresh_tokens` (`token_id`);--> statement-breakpoint
+CREATE TABLE `share_tokens` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`user_id` integer NOT NULL,
+	`token` text(64) NOT NULL,
+	`taken_by` text(100) NOT NULL,
+	`schedule_days` integer DEFAULT 30 NOT NULL,
+	`created_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`expires_at` integer,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `share_tokens_token_unique` ON `share_tokens` (`token`);--> statement-breakpoint
+CREATE TABLE `user_settings` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`user_id` integer NOT NULL,
+	`email_enabled` integer DEFAULT false NOT NULL,
+	`notification_email` text,
+	`email_stock_reminders` integer DEFAULT true NOT NULL,
+	`email_intake_reminders` integer DEFAULT true NOT NULL,
+	`shoutrrr_enabled` integer DEFAULT false NOT NULL,
+	`shoutrrr_url` text,
+	`shoutrrr_stock_reminders` integer DEFAULT true NOT NULL,
+	`shoutrrr_intake_reminders` integer DEFAULT true NOT NULL,
+	`reminder_days_before` integer DEFAULT 7 NOT NULL,
+	`repeat_daily_reminders` integer DEFAULT false NOT NULL,
+	`skip_reminders_for_taken_doses` integer DEFAULT false NOT NULL,
+	`repeat_reminders_enabled` integer DEFAULT false NOT NULL,
+	`reminder_repeat_interval_minutes` integer DEFAULT 30 NOT NULL,
+	`max_nagging_reminders` integer DEFAULT 5 NOT NULL,
+	`low_stock_days` integer DEFAULT 30 NOT NULL,
+	`normal_stock_days` integer DEFAULT 90 NOT NULL,
+	`high_stock_days` integer DEFAULT 180 NOT NULL,
+	`expiry_warning_days` integer DEFAULT 90 NOT NULL,
+	`language` text(10) DEFAULT 'en' NOT NULL,
+	`stock_calculation_mode` text(20) DEFAULT 'automatic' NOT NULL,
+	`last_auto_email_sent` text,
+	`last_notification_type` text,
+	`last_notification_channel` text,
+	`updated_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `user_settings_user_id_unique` ON `user_settings` (`user_id`);--> statement-breakpoint
+CREATE TABLE `users` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`username` text(100) NOT NULL,
+	`password_hash` text(255),
+	`avatar_url` text(255),
+	`auth_provider` text(50) DEFAULT 'local' NOT NULL,
+	`oidc_subject` text(255),
+	`is_active` integer DEFAULT true NOT NULL,
+	`last_login_at` integer,
+	`created_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `users_username_unique` ON `users` (`username`);

backend/drizzle/0001_add_stock_adjustment.sql

@@ -0,0 +1 @@
+ALTER TABLE `medications` ADD `stock_adjustment` integer DEFAULT 0 NOT NULL;

backend/drizzle/0002_add_last_stock_correction_at.sql

@@ -0,0 +1 @@
+ALTER TABLE `medications` ADD `last_stock_correction_at` integer;

backend/drizzle/0003_add_reminder_info_columns.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `medications` ADD `dismissed_until` text;--> statement-breakpoint
+ALTER TABLE `user_settings` ADD `last_reminder_med_name` text;--> statement-breakpoint
+ALTER TABLE `user_settings` ADD `last_reminder_taken_by` text;

backend/drizzle/0004_add_package_type.sql

@@ -0,0 +1,3 @@
+-- Add package type support (blister vs bottle)
+ALTER TABLE medications ADD COLUMN package_type TEXT DEFAULT 'blister' NOT NULL;
+ALTER TABLE medications ADD COLUMN total_pills INTEGER;

backend/drizzle/0005_add_intakes_json.sql

@@ -0,0 +1,3 @@
+-- Add dose_unit column and intakes JSON array for per-intake takenBy support
+ALTER TABLE `medications` ADD `dose_unit` text(20) DEFAULT 'mg';--> statement-breakpoint
+ALTER TABLE `medications` ADD `intakes_json` text DEFAULT '[]' NOT NULL;

backend/drizzle/0006_add_stock_reminder_tracking.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `user_settings` ADD `last_stock_reminder_sent` text;--> statement-breakpoint
+ALTER TABLE `user_settings` ADD `last_stock_reminder_channel` text;--> statement-breakpoint
+ALTER TABLE `user_settings` ADD `last_stock_reminder_med_names` text;

backend/drizzle/0007_add_share_stock_status.sql

@@ -0,0 +1 @@
+ALTER TABLE `user_settings` ADD `share_stock_status` integer DEFAULT true NOT NULL;

backend/drizzle/meta/0000_snapshot.json

@@ -0,0 +1,819 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "0e7f882c-b6e8-4d7b-a6a8-a076969c3e76",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "tables": {
+    "dose_tracking": {
+      "name": "dose_tracking",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dose_id": {
+          "name": "dose_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_at": {
+          "name": "taken_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        },
+        "marked_by": {
+          "name": "marked_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dismissed": {
+          "name": "dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dose_tracking_user_id_users_id_fk": {
+          "name": "dose_tracking_user_id_users_id_fk",
+          "tableFrom": "dose_tracking",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "medications": {
+      "name": "medications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "generic_name": {
+          "name": "generic_name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "taken_by_json": {
+          "name": "taken_by_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "pack_count": {
+          "name": "pack_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "blisters_per_pack": {
+          "name": "blisters_per_pack",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "pills_per_blister": {
+          "name": "pills_per_blister",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "loose_tablets": {
+          "name": "loose_tablets",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "pill_weight_mg": {
+          "name": "pill_weight_mg",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "usage_json": {
+          "name": "usage_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "every_json": {
+          "name": "every_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "start_json": {
+          "name": "start_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "intake_reminders_enabled": {
+          "name": "intake_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "medications_user_id_users_id_fk": {
+          "name": "medications_user_id_users_id_fk",
+          "tableFrom": "medications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refill_history": {
+      "name": "refill_history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "medication_id": {
+          "name": "medication_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "packs_added": {
+          "name": "packs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "loose_pills_added": {
+          "name": "loose_pills_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "refill_date": {
+          "name": "refill_date",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "refill_history_medication_id_medications_id_fk": {
+          "name": "refill_history_medication_id_medications_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "medications",
+          "columnsFrom": [
+            "medication_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "refill_history_user_id_users_id_fk": {
+          "name": "refill_history_user_id_users_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refresh_tokens": {
+      "name": "refresh_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token_id": {
+          "name": "token_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rotated_at": {
+          "name": "rotated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "refresh_tokens_token_id_unique": {
+          "name": "refresh_tokens_token_id_unique",
+          "columns": [
+            "token_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "refresh_tokens_user_id_users_id_fk": {
+          "name": "refresh_tokens_user_id_users_id_fk",
+          "tableFrom": "refresh_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "share_tokens": {
+      "name": "share_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_by": {
+          "name": "taken_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schedule_days": {
+          "name": "schedule_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "share_tokens_token_unique": {
+          "name": "share_tokens_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "share_tokens_user_id_users_id_fk": {
+          "name": "share_tokens_user_id_users_id_fk",
+          "tableFrom": "share_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_settings": {
+      "name": "user_settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_enabled": {
+          "name": "email_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notification_email": {
+          "name": "notification_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email_stock_reminders": {
+          "name": "email_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "email_intake_reminders": {
+          "name": "email_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_enabled": {
+          "name": "shoutrrr_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "shoutrrr_url": {
+          "name": "shoutrrr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shoutrrr_stock_reminders": {
+          "name": "shoutrrr_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_intake_reminders": {
+          "name": "shoutrrr_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reminder_days_before": {
+          "name": "reminder_days_before",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 7
+        },
+        "repeat_daily_reminders": {
+          "name": "repeat_daily_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "skip_reminders_for_taken_doses": {
+          "name": "skip_reminders_for_taken_doses",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "repeat_reminders_enabled": {
+          "name": "repeat_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "reminder_repeat_interval_minutes": {
+          "name": "reminder_repeat_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "max_nagging_reminders": {
+          "name": "max_nagging_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 5
+        },
+        "low_stock_days": {
+          "name": "low_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "normal_stock_days": {
+          "name": "normal_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "high_stock_days": {
+          "name": "high_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 180
+        },
+        "expiry_warning_days": {
+          "name": "expiry_warning_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "language": {
+          "name": "language",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'en'"
+        },
+        "stock_calculation_mode": {
+          "name": "stock_calculation_mode",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'automatic'"
+        },
+        "last_auto_email_sent": {
+          "name": "last_auto_email_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_type": {
+          "name": "last_notification_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_channel": {
+          "name": "last_notification_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "user_settings_user_id_unique": {
+          "name": "user_settings_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "user_settings_user_id_users_id_fk": {
+          "name": "user_settings_user_id_users_id_fk",
+          "tableFrom": "user_settings",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "auth_provider": {
+          "name": "auth_provider",
+          "type": "text(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "oidc_subject": {
+          "name": "oidc_subject",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_login_at": {
+          "name": "last_login_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

backend/drizzle/meta/0001_snapshot.json

@@ -0,0 +1,827 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "bcb60728-38c0-4965-adac-829c02240d89",
+  "prevId": "0e7f882c-b6e8-4d7b-a6a8-a076969c3e76",
+  "tables": {
+    "dose_tracking": {
+      "name": "dose_tracking",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dose_id": {
+          "name": "dose_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_at": {
+          "name": "taken_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        },
+        "marked_by": {
+          "name": "marked_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dismissed": {
+          "name": "dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dose_tracking_user_id_users_id_fk": {
+          "name": "dose_tracking_user_id_users_id_fk",
+          "tableFrom": "dose_tracking",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "medications": {
+      "name": "medications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "generic_name": {
+          "name": "generic_name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "taken_by_json": {
+          "name": "taken_by_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "pack_count": {
+          "name": "pack_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "blisters_per_pack": {
+          "name": "blisters_per_pack",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "pills_per_blister": {
+          "name": "pills_per_blister",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "loose_tablets": {
+          "name": "loose_tablets",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "stock_adjustment": {
+          "name": "stock_adjustment",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "pill_weight_mg": {
+          "name": "pill_weight_mg",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "usage_json": {
+          "name": "usage_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "every_json": {
+          "name": "every_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "start_json": {
+          "name": "start_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "intake_reminders_enabled": {
+          "name": "intake_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "medications_user_id_users_id_fk": {
+          "name": "medications_user_id_users_id_fk",
+          "tableFrom": "medications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refill_history": {
+      "name": "refill_history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "medication_id": {
+          "name": "medication_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "packs_added": {
+          "name": "packs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "loose_pills_added": {
+          "name": "loose_pills_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "refill_date": {
+          "name": "refill_date",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "refill_history_medication_id_medications_id_fk": {
+          "name": "refill_history_medication_id_medications_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "medications",
+          "columnsFrom": [
+            "medication_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "refill_history_user_id_users_id_fk": {
+          "name": "refill_history_user_id_users_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refresh_tokens": {
+      "name": "refresh_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token_id": {
+          "name": "token_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rotated_at": {
+          "name": "rotated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "refresh_tokens_token_id_unique": {
+          "name": "refresh_tokens_token_id_unique",
+          "columns": [
+            "token_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "refresh_tokens_user_id_users_id_fk": {
+          "name": "refresh_tokens_user_id_users_id_fk",
+          "tableFrom": "refresh_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "share_tokens": {
+      "name": "share_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_by": {
+          "name": "taken_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schedule_days": {
+          "name": "schedule_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "share_tokens_token_unique": {
+          "name": "share_tokens_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "share_tokens_user_id_users_id_fk": {
+          "name": "share_tokens_user_id_users_id_fk",
+          "tableFrom": "share_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_settings": {
+      "name": "user_settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_enabled": {
+          "name": "email_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notification_email": {
+          "name": "notification_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email_stock_reminders": {
+          "name": "email_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "email_intake_reminders": {
+          "name": "email_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_enabled": {
+          "name": "shoutrrr_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "shoutrrr_url": {
+          "name": "shoutrrr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shoutrrr_stock_reminders": {
+          "name": "shoutrrr_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_intake_reminders": {
+          "name": "shoutrrr_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reminder_days_before": {
+          "name": "reminder_days_before",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 7
+        },
+        "repeat_daily_reminders": {
+          "name": "repeat_daily_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "skip_reminders_for_taken_doses": {
+          "name": "skip_reminders_for_taken_doses",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "repeat_reminders_enabled": {
+          "name": "repeat_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "reminder_repeat_interval_minutes": {
+          "name": "reminder_repeat_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "max_nagging_reminders": {
+          "name": "max_nagging_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 5
+        },
+        "low_stock_days": {
+          "name": "low_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "normal_stock_days": {
+          "name": "normal_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "high_stock_days": {
+          "name": "high_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 180
+        },
+        "expiry_warning_days": {
+          "name": "expiry_warning_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "language": {
+          "name": "language",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'en'"
+        },
+        "stock_calculation_mode": {
+          "name": "stock_calculation_mode",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'automatic'"
+        },
+        "last_auto_email_sent": {
+          "name": "last_auto_email_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_type": {
+          "name": "last_notification_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_channel": {
+          "name": "last_notification_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "user_settings_user_id_unique": {
+          "name": "user_settings_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "user_settings_user_id_users_id_fk": {
+          "name": "user_settings_user_id_users_id_fk",
+          "tableFrom": "user_settings",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "auth_provider": {
+          "name": "auth_provider",
+          "type": "text(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "oidc_subject": {
+          "name": "oidc_subject",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_login_at": {
+          "name": "last_login_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

backend/drizzle/meta/0002_snapshot.json

@@ -0,0 +1,834 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "098ee506-e43d-4ccb-bee5-c387905695ab",
+  "prevId": "bcb60728-38c0-4965-adac-829c02240d89",
+  "tables": {
+    "dose_tracking": {
+      "name": "dose_tracking",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dose_id": {
+          "name": "dose_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_at": {
+          "name": "taken_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        },
+        "marked_by": {
+          "name": "marked_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dismissed": {
+          "name": "dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dose_tracking_user_id_users_id_fk": {
+          "name": "dose_tracking_user_id_users_id_fk",
+          "tableFrom": "dose_tracking",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "medications": {
+      "name": "medications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "generic_name": {
+          "name": "generic_name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "taken_by_json": {
+          "name": "taken_by_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "pack_count": {
+          "name": "pack_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "blisters_per_pack": {
+          "name": "blisters_per_pack",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "pills_per_blister": {
+          "name": "pills_per_blister",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "loose_tablets": {
+          "name": "loose_tablets",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "stock_adjustment": {
+          "name": "stock_adjustment",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_stock_correction_at": {
+          "name": "last_stock_correction_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pill_weight_mg": {
+          "name": "pill_weight_mg",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "usage_json": {
+          "name": "usage_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "every_json": {
+          "name": "every_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "start_json": {
+          "name": "start_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "intake_reminders_enabled": {
+          "name": "intake_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "medications_user_id_users_id_fk": {
+          "name": "medications_user_id_users_id_fk",
+          "tableFrom": "medications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refill_history": {
+      "name": "refill_history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "medication_id": {
+          "name": "medication_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "packs_added": {
+          "name": "packs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "loose_pills_added": {
+          "name": "loose_pills_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "refill_date": {
+          "name": "refill_date",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "refill_history_medication_id_medications_id_fk": {
+          "name": "refill_history_medication_id_medications_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "medications",
+          "columnsFrom": [
+            "medication_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "refill_history_user_id_users_id_fk": {
+          "name": "refill_history_user_id_users_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refresh_tokens": {
+      "name": "refresh_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token_id": {
+          "name": "token_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rotated_at": {
+          "name": "rotated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "refresh_tokens_token_id_unique": {
+          "name": "refresh_tokens_token_id_unique",
+          "columns": [
+            "token_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "refresh_tokens_user_id_users_id_fk": {
+          "name": "refresh_tokens_user_id_users_id_fk",
+          "tableFrom": "refresh_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "share_tokens": {
+      "name": "share_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_by": {
+          "name": "taken_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schedule_days": {
+          "name": "schedule_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "share_tokens_token_unique": {
+          "name": "share_tokens_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "share_tokens_user_id_users_id_fk": {
+          "name": "share_tokens_user_id_users_id_fk",
+          "tableFrom": "share_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_settings": {
+      "name": "user_settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_enabled": {
+          "name": "email_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notification_email": {
+          "name": "notification_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email_stock_reminders": {
+          "name": "email_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "email_intake_reminders": {
+          "name": "email_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_enabled": {
+          "name": "shoutrrr_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "shoutrrr_url": {
+          "name": "shoutrrr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shoutrrr_stock_reminders": {
+          "name": "shoutrrr_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_intake_reminders": {
+          "name": "shoutrrr_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reminder_days_before": {
+          "name": "reminder_days_before",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 7
+        },
+        "repeat_daily_reminders": {
+          "name": "repeat_daily_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "skip_reminders_for_taken_doses": {
+          "name": "skip_reminders_for_taken_doses",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "repeat_reminders_enabled": {
+          "name": "repeat_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "reminder_repeat_interval_minutes": {
+          "name": "reminder_repeat_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "max_nagging_reminders": {
+          "name": "max_nagging_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 5
+        },
+        "low_stock_days": {
+          "name": "low_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "normal_stock_days": {
+          "name": "normal_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "high_stock_days": {
+          "name": "high_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 180
+        },
+        "expiry_warning_days": {
+          "name": "expiry_warning_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "language": {
+          "name": "language",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'en'"
+        },
+        "stock_calculation_mode": {
+          "name": "stock_calculation_mode",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'automatic'"
+        },
+        "last_auto_email_sent": {
+          "name": "last_auto_email_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_type": {
+          "name": "last_notification_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_channel": {
+          "name": "last_notification_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "user_settings_user_id_unique": {
+          "name": "user_settings_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "user_settings_user_id_users_id_fk": {
+          "name": "user_settings_user_id_users_id_fk",
+          "tableFrom": "user_settings",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "auth_provider": {
+          "name": "auth_provider",
+          "type": "text(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "oidc_subject": {
+          "name": "oidc_subject",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_login_at": {
+          "name": "last_login_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

backend/drizzle/meta/0003_snapshot.json

@@ -0,0 +1,855 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "4f1d8273-1e60-4da1-9bfc-bd51c2784836",
+  "prevId": "098ee506-e43d-4ccb-bee5-c387905695ab",
+  "tables": {
+    "dose_tracking": {
+      "name": "dose_tracking",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dose_id": {
+          "name": "dose_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_at": {
+          "name": "taken_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        },
+        "marked_by": {
+          "name": "marked_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dismissed": {
+          "name": "dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dose_tracking_user_id_users_id_fk": {
+          "name": "dose_tracking_user_id_users_id_fk",
+          "tableFrom": "dose_tracking",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "medications": {
+      "name": "medications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "generic_name": {
+          "name": "generic_name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "taken_by_json": {
+          "name": "taken_by_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "pack_count": {
+          "name": "pack_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "blisters_per_pack": {
+          "name": "blisters_per_pack",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "pills_per_blister": {
+          "name": "pills_per_blister",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "loose_tablets": {
+          "name": "loose_tablets",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "stock_adjustment": {
+          "name": "stock_adjustment",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_stock_correction_at": {
+          "name": "last_stock_correction_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pill_weight_mg": {
+          "name": "pill_weight_mg",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "usage_json": {
+          "name": "usage_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "every_json": {
+          "name": "every_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "start_json": {
+          "name": "start_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "intake_reminders_enabled": {
+          "name": "intake_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "dismissed_until": {
+          "name": "dismissed_until",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "medications_user_id_users_id_fk": {
+          "name": "medications_user_id_users_id_fk",
+          "tableFrom": "medications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refill_history": {
+      "name": "refill_history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "medication_id": {
+          "name": "medication_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "packs_added": {
+          "name": "packs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "loose_pills_added": {
+          "name": "loose_pills_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "refill_date": {
+          "name": "refill_date",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "refill_history_medication_id_medications_id_fk": {
+          "name": "refill_history_medication_id_medications_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "medications",
+          "columnsFrom": [
+            "medication_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "refill_history_user_id_users_id_fk": {
+          "name": "refill_history_user_id_users_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refresh_tokens": {
+      "name": "refresh_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token_id": {
+          "name": "token_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rotated_at": {
+          "name": "rotated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "refresh_tokens_token_id_unique": {
+          "name": "refresh_tokens_token_id_unique",
+          "columns": [
+            "token_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "refresh_tokens_user_id_users_id_fk": {
+          "name": "refresh_tokens_user_id_users_id_fk",
+          "tableFrom": "refresh_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "share_tokens": {
+      "name": "share_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_by": {
+          "name": "taken_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schedule_days": {
+          "name": "schedule_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "share_tokens_token_unique": {
+          "name": "share_tokens_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "share_tokens_user_id_users_id_fk": {
+          "name": "share_tokens_user_id_users_id_fk",
+          "tableFrom": "share_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_settings": {
+      "name": "user_settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_enabled": {
+          "name": "email_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notification_email": {
+          "name": "notification_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email_stock_reminders": {
+          "name": "email_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "email_intake_reminders": {
+          "name": "email_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_enabled": {
+          "name": "shoutrrr_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "shoutrrr_url": {
+          "name": "shoutrrr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shoutrrr_stock_reminders": {
+          "name": "shoutrrr_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_intake_reminders": {
+          "name": "shoutrrr_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reminder_days_before": {
+          "name": "reminder_days_before",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 7
+        },
+        "repeat_daily_reminders": {
+          "name": "repeat_daily_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "skip_reminders_for_taken_doses": {
+          "name": "skip_reminders_for_taken_doses",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "repeat_reminders_enabled": {
+          "name": "repeat_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "reminder_repeat_interval_minutes": {
+          "name": "reminder_repeat_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "max_nagging_reminders": {
+          "name": "max_nagging_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 5
+        },
+        "low_stock_days": {
+          "name": "low_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "normal_stock_days": {
+          "name": "normal_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "high_stock_days": {
+          "name": "high_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 180
+        },
+        "expiry_warning_days": {
+          "name": "expiry_warning_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "language": {
+          "name": "language",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'en'"
+        },
+        "stock_calculation_mode": {
+          "name": "stock_calculation_mode",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'automatic'"
+        },
+        "last_auto_email_sent": {
+          "name": "last_auto_email_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_type": {
+          "name": "last_notification_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_channel": {
+          "name": "last_notification_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_reminder_med_name": {
+          "name": "last_reminder_med_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_reminder_taken_by": {
+          "name": "last_reminder_taken_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "user_settings_user_id_unique": {
+          "name": "user_settings_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "user_settings_user_id_users_id_fk": {
+          "name": "user_settings_user_id_users_id_fk",
+          "tableFrom": "user_settings",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "auth_provider": {
+          "name": "auth_provider",
+          "type": "text(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "oidc_subject": {
+          "name": "oidc_subject",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_login_at": {
+          "name": "last_login_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

backend/drizzle/meta/0005_snapshot.json

@@ -0,0 +1,886 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "fb61e5fd-152d-4e61-8836-e2fd1d28e3f0",
+  "prevId": "4f1d8273-1e60-4da1-9bfc-bd51c2784836",
+  "tables": {
+    "dose_tracking": {
+      "name": "dose_tracking",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dose_id": {
+          "name": "dose_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_at": {
+          "name": "taken_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        },
+        "marked_by": {
+          "name": "marked_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dismissed": {
+          "name": "dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dose_tracking_user_id_users_id_fk": {
+          "name": "dose_tracking_user_id_users_id_fk",
+          "tableFrom": "dose_tracking",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "medications": {
+      "name": "medications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "generic_name": {
+          "name": "generic_name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "taken_by_json": {
+          "name": "taken_by_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "package_type": {
+          "name": "package_type",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'blister'"
+        },
+        "pack_count": {
+          "name": "pack_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "blisters_per_pack": {
+          "name": "blisters_per_pack",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "pills_per_blister": {
+          "name": "pills_per_blister",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "total_pills": {
+          "name": "total_pills",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "loose_tablets": {
+          "name": "loose_tablets",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "stock_adjustment": {
+          "name": "stock_adjustment",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_stock_correction_at": {
+          "name": "last_stock_correction_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pill_weight_mg": {
+          "name": "pill_weight_mg",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dose_unit": {
+          "name": "dose_unit",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'mg'"
+        },
+        "usage_json": {
+          "name": "usage_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "every_json": {
+          "name": "every_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "start_json": {
+          "name": "start_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "intakes_json": {
+          "name": "intakes_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "intake_reminders_enabled": {
+          "name": "intake_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "dismissed_until": {
+          "name": "dismissed_until",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "medications_user_id_users_id_fk": {
+          "name": "medications_user_id_users_id_fk",
+          "tableFrom": "medications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refill_history": {
+      "name": "refill_history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "medication_id": {
+          "name": "medication_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "packs_added": {
+          "name": "packs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "loose_pills_added": {
+          "name": "loose_pills_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "refill_date": {
+          "name": "refill_date",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "refill_history_medication_id_medications_id_fk": {
+          "name": "refill_history_medication_id_medications_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "medications",
+          "columnsFrom": [
+            "medication_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "refill_history_user_id_users_id_fk": {
+          "name": "refill_history_user_id_users_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refresh_tokens": {
+      "name": "refresh_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token_id": {
+          "name": "token_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rotated_at": {
+          "name": "rotated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "refresh_tokens_token_id_unique": {
+          "name": "refresh_tokens_token_id_unique",
+          "columns": [
+            "token_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "refresh_tokens_user_id_users_id_fk": {
+          "name": "refresh_tokens_user_id_users_id_fk",
+          "tableFrom": "refresh_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "share_tokens": {
+      "name": "share_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_by": {
+          "name": "taken_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schedule_days": {
+          "name": "schedule_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "share_tokens_token_unique": {
+          "name": "share_tokens_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "share_tokens_user_id_users_id_fk": {
+          "name": "share_tokens_user_id_users_id_fk",
+          "tableFrom": "share_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_settings": {
+      "name": "user_settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_enabled": {
+          "name": "email_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notification_email": {
+          "name": "notification_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email_stock_reminders": {
+          "name": "email_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "email_intake_reminders": {
+          "name": "email_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_enabled": {
+          "name": "shoutrrr_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "shoutrrr_url": {
+          "name": "shoutrrr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shoutrrr_stock_reminders": {
+          "name": "shoutrrr_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_intake_reminders": {
+          "name": "shoutrrr_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reminder_days_before": {
+          "name": "reminder_days_before",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 7
+        },
+        "repeat_daily_reminders": {
+          "name": "repeat_daily_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "skip_reminders_for_taken_doses": {
+          "name": "skip_reminders_for_taken_doses",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "repeat_reminders_enabled": {
+          "name": "repeat_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "reminder_repeat_interval_minutes": {
+          "name": "reminder_repeat_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "max_nagging_reminders": {
+          "name": "max_nagging_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 5
+        },
+        "low_stock_days": {
+          "name": "low_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "normal_stock_days": {
+          "name": "normal_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "high_stock_days": {
+          "name": "high_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 180
+        },
+        "expiry_warning_days": {
+          "name": "expiry_warning_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "language": {
+          "name": "language",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'en'"
+        },
+        "stock_calculation_mode": {
+          "name": "stock_calculation_mode",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'automatic'"
+        },
+        "last_auto_email_sent": {
+          "name": "last_auto_email_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_type": {
+          "name": "last_notification_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_channel": {
+          "name": "last_notification_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_reminder_med_name": {
+          "name": "last_reminder_med_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_reminder_taken_by": {
+          "name": "last_reminder_taken_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "user_settings_user_id_unique": {
+          "name": "user_settings_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "user_settings_user_id_users_id_fk": {
+          "name": "user_settings_user_id_users_id_fk",
+          "tableFrom": "user_settings",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "auth_provider": {
+          "name": "auth_provider",
+          "type": "text(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "oidc_subject": {
+          "name": "oidc_subject",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_login_at": {
+          "name": "last_login_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

backend/drizzle/meta/0006_snapshot.json

@@ -0,0 +1,907 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "7cd75e33-b3d8-4930-a60b-2a0a9f644c6d",
+  "prevId": "fb61e5fd-152d-4e61-8836-e2fd1d28e3f0",
+  "tables": {
+    "dose_tracking": {
+      "name": "dose_tracking",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dose_id": {
+          "name": "dose_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_at": {
+          "name": "taken_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        },
+        "marked_by": {
+          "name": "marked_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dismissed": {
+          "name": "dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dose_tracking_user_id_users_id_fk": {
+          "name": "dose_tracking_user_id_users_id_fk",
+          "tableFrom": "dose_tracking",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "medications": {
+      "name": "medications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "generic_name": {
+          "name": "generic_name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "taken_by_json": {
+          "name": "taken_by_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "package_type": {
+          "name": "package_type",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'blister'"
+        },
+        "pack_count": {
+          "name": "pack_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "blisters_per_pack": {
+          "name": "blisters_per_pack",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "pills_per_blister": {
+          "name": "pills_per_blister",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "total_pills": {
+          "name": "total_pills",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "loose_tablets": {
+          "name": "loose_tablets",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "stock_adjustment": {
+          "name": "stock_adjustment",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_stock_correction_at": {
+          "name": "last_stock_correction_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pill_weight_mg": {
+          "name": "pill_weight_mg",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dose_unit": {
+          "name": "dose_unit",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'mg'"
+        },
+        "usage_json": {
+          "name": "usage_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "every_json": {
+          "name": "every_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "start_json": {
+          "name": "start_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "intakes_json": {
+          "name": "intakes_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "intake_reminders_enabled": {
+          "name": "intake_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "dismissed_until": {
+          "name": "dismissed_until",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "medications_user_id_users_id_fk": {
+          "name": "medications_user_id_users_id_fk",
+          "tableFrom": "medications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refill_history": {
+      "name": "refill_history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "medication_id": {
+          "name": "medication_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "packs_added": {
+          "name": "packs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "loose_pills_added": {
+          "name": "loose_pills_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "refill_date": {
+          "name": "refill_date",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "refill_history_medication_id_medications_id_fk": {
+          "name": "refill_history_medication_id_medications_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "medications",
+          "columnsFrom": [
+            "medication_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "refill_history_user_id_users_id_fk": {
+          "name": "refill_history_user_id_users_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refresh_tokens": {
+      "name": "refresh_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token_id": {
+          "name": "token_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rotated_at": {
+          "name": "rotated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "refresh_tokens_token_id_unique": {
+          "name": "refresh_tokens_token_id_unique",
+          "columns": [
+            "token_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "refresh_tokens_user_id_users_id_fk": {
+          "name": "refresh_tokens_user_id_users_id_fk",
+          "tableFrom": "refresh_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "share_tokens": {
+      "name": "share_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_by": {
+          "name": "taken_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schedule_days": {
+          "name": "schedule_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "share_tokens_token_unique": {
+          "name": "share_tokens_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "share_tokens_user_id_users_id_fk": {
+          "name": "share_tokens_user_id_users_id_fk",
+          "tableFrom": "share_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_settings": {
+      "name": "user_settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_enabled": {
+          "name": "email_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notification_email": {
+          "name": "notification_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email_stock_reminders": {
+          "name": "email_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "email_intake_reminders": {
+          "name": "email_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_enabled": {
+          "name": "shoutrrr_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "shoutrrr_url": {
+          "name": "shoutrrr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shoutrrr_stock_reminders": {
+          "name": "shoutrrr_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_intake_reminders": {
+          "name": "shoutrrr_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reminder_days_before": {
+          "name": "reminder_days_before",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 7
+        },
+        "repeat_daily_reminders": {
+          "name": "repeat_daily_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "skip_reminders_for_taken_doses": {
+          "name": "skip_reminders_for_taken_doses",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "repeat_reminders_enabled": {
+          "name": "repeat_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "reminder_repeat_interval_minutes": {
+          "name": "reminder_repeat_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "max_nagging_reminders": {
+          "name": "max_nagging_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 5
+        },
+        "low_stock_days": {
+          "name": "low_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "normal_stock_days": {
+          "name": "normal_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "high_stock_days": {
+          "name": "high_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 180
+        },
+        "expiry_warning_days": {
+          "name": "expiry_warning_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "language": {
+          "name": "language",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'en'"
+        },
+        "stock_calculation_mode": {
+          "name": "stock_calculation_mode",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'automatic'"
+        },
+        "last_auto_email_sent": {
+          "name": "last_auto_email_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_type": {
+          "name": "last_notification_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_channel": {
+          "name": "last_notification_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_reminder_med_name": {
+          "name": "last_reminder_med_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_reminder_taken_by": {
+          "name": "last_reminder_taken_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_stock_reminder_sent": {
+          "name": "last_stock_reminder_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_stock_reminder_channel": {
+          "name": "last_stock_reminder_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_stock_reminder_med_names": {
+          "name": "last_stock_reminder_med_names",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "user_settings_user_id_unique": {
+          "name": "user_settings_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "user_settings_user_id_users_id_fk": {
+          "name": "user_settings_user_id_users_id_fk",
+          "tableFrom": "user_settings",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "auth_provider": {
+          "name": "auth_provider",
+          "type": "text(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "oidc_subject": {
+          "name": "oidc_subject",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_login_at": {
+          "name": "last_login_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

backend/drizzle/meta/0007_snapshot.json

@@ -0,0 +1,915 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "b6f1ee4b-cc31-4060-a4d4-bcd4fdc5bd87",
+  "prevId": "7cd75e33-b3d8-4930-a60b-2a0a9f644c6d",
+  "tables": {
+    "dose_tracking": {
+      "name": "dose_tracking",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dose_id": {
+          "name": "dose_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_at": {
+          "name": "taken_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        },
+        "marked_by": {
+          "name": "marked_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dismissed": {
+          "name": "dismissed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "dose_tracking_user_id_users_id_fk": {
+          "name": "dose_tracking_user_id_users_id_fk",
+          "tableFrom": "dose_tracking",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "medications": {
+      "name": "medications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "generic_name": {
+          "name": "generic_name",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "taken_by_json": {
+          "name": "taken_by_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "package_type": {
+          "name": "package_type",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'blister'"
+        },
+        "pack_count": {
+          "name": "pack_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "blisters_per_pack": {
+          "name": "blisters_per_pack",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "pills_per_blister": {
+          "name": "pills_per_blister",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "total_pills": {
+          "name": "total_pills",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "loose_tablets": {
+          "name": "loose_tablets",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "stock_adjustment": {
+          "name": "stock_adjustment",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "last_stock_correction_at": {
+          "name": "last_stock_correction_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pill_weight_mg": {
+          "name": "pill_weight_mg",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "dose_unit": {
+          "name": "dose_unit",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'mg'"
+        },
+        "usage_json": {
+          "name": "usage_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "every_json": {
+          "name": "every_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "start_json": {
+          "name": "start_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "intakes_json": {
+          "name": "intakes_json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'[]'"
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "intake_reminders_enabled": {
+          "name": "intake_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "dismissed_until": {
+          "name": "dismissed_until",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "medications_user_id_users_id_fk": {
+          "name": "medications_user_id_users_id_fk",
+          "tableFrom": "medications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refill_history": {
+      "name": "refill_history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "medication_id": {
+          "name": "medication_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "packs_added": {
+          "name": "packs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "loose_pills_added": {
+          "name": "loose_pills_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "refill_date": {
+          "name": "refill_date",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(strftime('%s','now'))"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "refill_history_medication_id_medications_id_fk": {
+          "name": "refill_history_medication_id_medications_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "medications",
+          "columnsFrom": [
+            "medication_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "refill_history_user_id_users_id_fk": {
+          "name": "refill_history_user_id_users_id_fk",
+          "tableFrom": "refill_history",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "refresh_tokens": {
+      "name": "refresh_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token_id": {
+          "name": "token_id",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rotated_at": {
+          "name": "rotated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "refresh_tokens_token_id_unique": {
+          "name": "refresh_tokens_token_id_unique",
+          "columns": [
+            "token_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "refresh_tokens_user_id_users_id_fk": {
+          "name": "refresh_tokens_user_id_users_id_fk",
+          "tableFrom": "refresh_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "share_tokens": {
+      "name": "share_tokens",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "taken_by": {
+          "name": "taken_by",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schedule_days": {
+          "name": "schedule_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "share_tokens_token_unique": {
+          "name": "share_tokens_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "share_tokens_user_id_users_id_fk": {
+          "name": "share_tokens_user_id_users_id_fk",
+          "tableFrom": "share_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_settings": {
+      "name": "user_settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_enabled": {
+          "name": "email_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "notification_email": {
+          "name": "notification_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email_stock_reminders": {
+          "name": "email_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "email_intake_reminders": {
+          "name": "email_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_enabled": {
+          "name": "shoutrrr_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "shoutrrr_url": {
+          "name": "shoutrrr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shoutrrr_stock_reminders": {
+          "name": "shoutrrr_stock_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "shoutrrr_intake_reminders": {
+          "name": "shoutrrr_intake_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reminder_days_before": {
+          "name": "reminder_days_before",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 7
+        },
+        "repeat_daily_reminders": {
+          "name": "repeat_daily_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "skip_reminders_for_taken_doses": {
+          "name": "skip_reminders_for_taken_doses",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "repeat_reminders_enabled": {
+          "name": "repeat_reminders_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "reminder_repeat_interval_minutes": {
+          "name": "reminder_repeat_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "max_nagging_reminders": {
+          "name": "max_nagging_reminders",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 5
+        },
+        "low_stock_days": {
+          "name": "low_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "normal_stock_days": {
+          "name": "normal_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "high_stock_days": {
+          "name": "high_stock_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 180
+        },
+        "expiry_warning_days": {
+          "name": "expiry_warning_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 90
+        },
+        "language": {
+          "name": "language",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'en'"
+        },
+        "stock_calculation_mode": {
+          "name": "stock_calculation_mode",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'automatic'"
+        },
+        "share_stock_status": {
+          "name": "share_stock_status",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_auto_email_sent": {
+          "name": "last_auto_email_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_type": {
+          "name": "last_notification_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_notification_channel": {
+          "name": "last_notification_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_reminder_med_name": {
+          "name": "last_reminder_med_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_reminder_taken_by": {
+          "name": "last_reminder_taken_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_stock_reminder_sent": {
+          "name": "last_stock_reminder_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_stock_reminder_channel": {
+          "name": "last_stock_reminder_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_stock_reminder_med_names": {
+          "name": "last_stock_reminder_med_names",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "user_settings_user_id_unique": {
+          "name": "user_settings_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "user_settings_user_id_users_id_fk": {
+          "name": "user_settings_user_id_users_id_fk",
+          "tableFrom": "user_settings",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text(100)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "auth_provider": {
+          "name": "auth_provider",
+          "type": "text(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "oidc_subject": {
+          "name": "oidc_subject",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_login_at": {
+          "name": "last_login_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

backend/drizzle/meta/_journal.json

@@ -0,0 +1,62 @@
+{
+  "version": "7",
+  "dialect": "sqlite",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "6",
+      "when": 1768600500759,
+      "tag": "0000_init",
+      "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1768734577830,
+      "tag": "0001_add_stock_adjustment",
+      "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1768736677092,
+      "tag": "0002_add_last_stock_correction_at",
+      "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "6",
+      "when": 1769354512857,
+      "tag": "0003_add_reminder_info_columns",
+      "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "6",
+      "when": 1769886564000,
+      "tag": "0004_add_package_type",
+      "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "6",
+      "when": 1769893708813,
+      "tag": "0005_add_intakes_json",
+      "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "6",
+      "when": 1770626907896,
+      "tag": "0006_add_stock_reminder_tracking",
+      "breakpoints": true
+    },
+    {
+      "idx": 7,
+      "version": "6",
+      "when": 1770659669121,
+      "tag": "0007_add_share_stock_status",
+      "breakpoints": true
+    }
+  ]
+}

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medassist-ng-backend",
-  "version": "1.1.0",
+  "version": "1.10.2",
   "private": true,
   "type": "module",
   "scripts": {
@@ -10,7 +10,11 @@
     "migrate": "tsx src/db/migrate.ts",
     "test": "vitest",
     "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage"
+    "test:coverage": "vitest run --coverage",
+    "lint": "npx biome check .",
+    "lint:fix": "npx biome check --write .",
+    "format": "npx biome format --write .",
+    "check": "npx biome check . && tsc --noEmit"
   },
   "dependencies": {
     "@fastify/cookie": "^10.0.1",
@@ -24,17 +28,19 @@
     "@libsql/client": "^0.10.0",
     "argon2": "^0.40.0",
     "dotenv": "^16.4.5",
-    "drizzle-orm": "^0.32.2",
-    "fastify": "^5.0.0",
+    "drizzle-orm": "^0.45.1",
+    "fastify": "^5.7.3",
     "nodemailer": "^7.0.11",
     "openid-client": "^6.8.1",
     "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@biomejs/biome": "^2.3.12",
     "@types/node": "^22.7.4",
     "@types/nodemailer": "^6.4.21",
     "@types/supertest": "^6.0.2",
     "@vitest/coverage-v8": "^4.0.16",
+    "drizzle-kit": "^0.31.8",
     "supertest": "^7.0.0",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4",

backend/src/db/client.ts

@@ -1,109 +1,37 @@
-import { createClient, Client } from "@libsql/client";
-import { drizzle } from "drizzle-orm/libsql";
-import { existsSync, mkdirSync, accessSync, constants, statSync, writeFileSync } from "fs";
-import { resolve } from "path";
+import { existsSync, statSync } from "node:fs";
+import { resolve } from "node:path";
+import { type Client, createClient } from "@libsql/client";
 import dotenv from "dotenv";
-import { getTableCreationSQL } from "./schema-sql.js";
+import { drizzle } from "drizzle-orm/libsql";
+import { log } from "../utils/logger.js";
+// Import utilities from db-utils (side-effect-free)
+import {
+	ensureDataDirectory,
+	ensureDefaultUser,
+	getDataDir,
+	getDbPaths,
+	repairOrphanedDoseIds,
+	repairTrailingHyphenDoseIds,
+	runAlterMigrations,
+	runDrizzleMigrations,
+} from "./db-utils.js";
 
-dotenv.config({ path: process.env.DOTENV_PATH || ".env" });
+// Re-export all utilities so existing imports from client.ts keep working
+export {
+	buildDbUrl,
+	ensureDataDirectory,
+	ensureDefaultUser,
+	getDataDir,
+	getDbPaths,
+	repairOrphanedDoseIds,
+	repairTrailingHyphenDoseIds,
+	runAlterMigrations,
+	runDrizzleMigrations,
+} from "./db-utils.js";
 
-// =============================================================================
-// Exported utility functions for testing
-// =============================================================================
-
-/** Build the database URL from a path */
-export function buildDbUrl(dbPath: string): string {
-  return `file:${dbPath}`;
-}
-
-/** Get data directory and database path */
-export function getDbPaths(cwd: string = process.cwd()): { dataDir: string; dbPath: string; url: string } {
-  const dataDir = resolve(cwd, "data");
-  const dbPath = resolve(dataDir, "medassist-ng.db");
-  const url = buildDbUrl(dbPath);
-  return { dataDir, dbPath, url };
-}
-
-/** Ensure data directory exists and is writable */
-export function ensureDataDirectory(dataDir: string): { success: boolean; error?: string } {
-  try {
-    if (!existsSync(dataDir)) {
-      mkdirSync(dataDir, { recursive: true });
-    }
-    
-    // Check if directory is writable
-    accessSync(dataDir, constants.W_OK);
-    
-    // Try to create a test file to verify write access
-    const testFile = resolve(dataDir, ".write-test");
-    writeFileSync(testFile, "test");
-    
-    return { success: true };
-  } catch (err: any) {
-    return { success: false, error: err.message };
-  }
-}
-
-/** Get the SQL statements for creating all tables (re-exported from schema-sql) */
-export { getTableCreationSQL } from "./schema-sql.js";
-
-/** Run table creation migrations on a client */
-export async function runTableMigrations(client: Client): Promise<{ success: boolean; errors: string[] }> {
-  const tableCreations = getTableCreationSQL();
-  const errors: string[] = [];
-
-  for (const sql of tableCreations) {
-    try {
-      await client.execute(sql);
-    } catch (e: any) {
-      errors.push(e.message);
-    }
-  }
-
-  // Run ALTER TABLE migrations for backward compatibility with older databases
-  // These add new columns to existing tables (silently fail if column already exists)
-  const alterMigrations = [
-    // Added in v1.x - repeat reminders and nagging settings
-    `ALTER TABLE user_settings ADD COLUMN skip_reminders_for_taken_doses integer NOT NULL DEFAULT 0`,
-    `ALTER TABLE user_settings ADD COLUMN repeat_reminders_enabled integer NOT NULL DEFAULT 0`,
-    `ALTER TABLE user_settings ADD COLUMN reminder_repeat_interval_minutes integer NOT NULL DEFAULT 30`,
-    `ALTER TABLE user_settings ADD COLUMN max_nagging_reminders integer NOT NULL DEFAULT 5`,
-  ];
-
-  for (const sql of alterMigrations) {
-    try {
-      await client.execute(sql);
-    } catch (e: any) {
-      // Silently ignore "duplicate column" errors - column already exists
-      if (!e.message?.includes("duplicate column")) {
-        errors.push(e.message);
-      }
-    }
-  }
-
-  return { success: errors.length === 0, errors };
-}
-
-/** Ensure default user exists for auth-disabled mode */
-export async function ensureDefaultUser(client: Client, authEnabled: boolean): Promise<boolean> {
-  if (authEnabled) {
-    return false; // No default user needed
-  }
-
-  try {
-    const result = await client.execute("SELECT id FROM users WHERE id = 1");
-    if (result.rows.length === 0) {
-      await client.execute(
-        "INSERT INTO users (id, username, auth_provider) VALUES (1, 'default', 'local')"
-      );
-      return true; // Created
-    }
-    return false; // Already exists
-  } catch (e: any) {
-    console.error(`[DB] Error creating default user:`, e.message);
-    return false;
-  }
-}
+// Load .env: try cwd first, then parent dir (for local dev running from backend/)
+const envPath = process.env.DOTENV_PATH || (existsSync(".env") ? ".env" : "../.env");
+dotenv.config({ path: envPath });
 
 // =============================================================================
 // Database initialization (runs on import)
@@ -112,34 +40,34 @@ export async function ensureDefaultUser(client: Client, authEnabled: boolean): P
 // Use absolute path to ensure it works in Docker
 const { dataDir, dbPath, url } = getDbPaths();
 
-console.log(`[DB] Data directory: ${dataDir}`);
-console.log(`[DB] Database path: ${dbPath}`);
-console.log(`[DB] Database URL: ${url}`);
+log.debug(`[DB] Data directory: ${dataDir}`);
+log.debug(`[DB] Database path: ${dbPath}`);
+log.debug(`[DB] Database URL: ${url}`);
 
 // Ensure data directory exists and is writable
 const dirResult = ensureDataDirectory(dataDir);
 if (!dirResult.success) {
-  console.error(`[DB] ERROR: Cannot access data directory: ${dirResult.error}`);
-  console.error(`[DB] Please ensure the volume mount has correct permissions.`);
-  console.error(`[DB] Try running on host: sudo chown -R 1000:1000 ${dataDir}`);
+	log.error(`[DB] ERROR: Cannot access data directory: ${dirResult.error}`);
+	log.error(`[DB] Please ensure the volume mount has correct permissions.`);
+	log.error(`[DB] Try running on host: sudo chown -R 1000:1000 ${dataDir}`);
 	process.exit(1);
 } else {
-  console.log(`[DB] Data directory is writable`);
+	log.debug(`[DB] Data directory is writable`);
 
 	// Log directory stats
 	const stats = statSync(dataDir);
-  console.log(`[DB] Directory permissions: ${stats.mode.toString(8)}`);
-  console.log(`[DB] Directory UID: ${stats.uid}, GID: ${stats.gid}`);
-  console.log(`[DB] Write test successful`);
+	log.debug(`[DB] Directory permissions: ${stats.mode.toString(8)}`);
+	log.debug(`[DB] Directory UID: ${stats.uid}, GID: ${stats.gid}`);
+	log.debug(`[DB] Write test successful`);
 }
 
 let client: Client;
 try {
 	client = createClient({ url });
-  console.log(`[DB] Database client created successfully`);
+	log.debug(`[DB] Database client created successfully`);
 } catch (err: any) {
-  console.error(`[DB] ERROR: Failed to create database client: ${err.message}`);
-  console.error(`[DB] Database path: ${dbPath}`);
+	log.error(`[DB] ERROR: Failed to create database client: ${err.message}`);
+	log.error(`[DB] Database path: ${dbPath}`);
 	process.exit(1);
 }
 
@@ -147,17 +75,47 @@ export const db = drizzle(client);
 
 // Auto-run migrations (self-healing database)
 async function runMigrations() {
-  const result = await runTableMigrations(client);
-  if (result.errors.length > 0) {
-    result.errors.forEach(err => console.error(`[DB] Table creation error:`, err));
+	// Run drizzle-kit generated migrations
+	log.info(`[DB] Running migrations...`);
+	const migrateResult = await runDrizzleMigrations(db);
+	if (!migrateResult.success) {
+		log.error(`[DB] Migration error: ${migrateResult.error}`);
+	} else if (migrateResult.warning) {
+		log.warn(`[DB] Migration warning: ${migrateResult.warning}`);
+	} else {
+		log.debug(`[DB] Drizzle migrations completed`);
+	}
+
+	// Run ALTER TABLE migrations for backward compatibility
+	const alterResult = await runAlterMigrations(client);
+	if (alterResult.errors.length > 0) {
+		alterResult.errors.forEach((err) => log.error(`[DB] ALTER migration error: ${err}`));
+	}
+	log.debug(`[DB] Tables verified/created`);
+
+	// Repair dose IDs with trailing hyphens (from frontend takenBy bug)
+	const trailingResult = await repairTrailingHyphenDoseIds(client);
+	if (trailingResult.repaired > 0) {
+		log.info(`[DB] Repaired ${trailingResult.repaired} dose IDs with trailing hyphens`);
+	}
+	if (trailingResult.errors.length > 0) {
+		trailingResult.errors.forEach((err) => log.error(`[DB] Trailing-hyphen repair error: ${err}`));
+	}
+
+	// Repair orphaned dose tracking IDs from past schedule changes
+	const repairResult = await repairOrphanedDoseIds(client);
+	if (repairResult.repaired > 0) {
+		log.info(`[DB] Repaired ${repairResult.repaired} orphaned dose tracking IDs`);
+	}
+	if (repairResult.errors.length > 0) {
+		repairResult.errors.forEach((err) => log.error(`[DB] Dose repair error: ${err}`));
 	}
-  console.log(`[DB] Tables verified/created`);
 
 	// If auth is disabled, ensure a default user exists (ID=1)
 	const authEnabled = process.env.AUTH_ENABLED === "true";
 	const created = await ensureDefaultUser(client, authEnabled);
 	if (created) {
-    console.log(`[DB] Created default user for auth-disabled mode`);
+		log.info(`[DB] Created default user for auth-disabled mode`);
 	}
 }
 

backend/src/db/db-utils.ts

@@ -0,0 +1,358 @@
+/**
+ * Pure utility functions for database operations.
+ * Separated from client.ts to allow importing without triggering
+ * top-level database initialization side effects.
+ */
+
+import { accessSync, constants, existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import type { Client } from "@libsql/client";
+import type { drizzle } from "drizzle-orm/libsql";
+import { migrate } from "drizzle-orm/libsql/migrator";
+import { parseIntakesJson, parseLocalDateTime } from "../utils/scheduler-utils.js";
+
+// Get migrations folder path (relative to this file's location)
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const migrationsFolder = resolve(__dirname, "../../drizzle");
+
+// =============================================================================
+// Path & Directory utilities
+// =============================================================================
+
+/**
+ * Get the data directory path.
+ *
+ * Resolution order:
+ * 1. DATA_DIR env var (set by docker-compose for containers)
+ * 2. Monorepo detection: if ../docker-compose.yml exists, we're in backend/
+ *    subdirectory → use ../data (project root's data folder)
+ * 3. Fallback: resolve(cwd, "data") (running from project root or standalone)
+ */
+export function getDataDir(cwd: string = process.cwd()): string {
+	// Docker containers set DATA_DIR explicitly
+	if (process.env.DATA_DIR) return resolve(process.env.DATA_DIR);
+
+	// Local dev: detect if we're in backend/ subdirectory of the monorepo
+	if (existsSync(resolve(cwd, "..", "docker-compose.yml"))) {
+		return resolve(cwd, "..", "data");
+	}
+
+	// Default: data/ relative to cwd (running from project root)
+	return resolve(cwd, "data");
+}
+
+/** Build the database URL from a path */
+export function buildDbUrl(dbPath: string): string {
+	return `file:${dbPath}`;
+}
+
+/** Get data directory and database path */
+export function getDbPaths(cwd: string = process.cwd()): { dataDir: string; dbPath: string; url: string } {
+	const dataDir = getDataDir(cwd);
+	const dbPath = resolve(dataDir, "medassist-ng.db");
+	const url = buildDbUrl(dbPath);
+	return { dataDir, dbPath, url };
+}
+
+/** Ensure data directory exists and is writable */
+export function ensureDataDirectory(dataDir: string): { success: boolean; error?: string } {
+	try {
+		if (!existsSync(dataDir)) {
+			mkdirSync(dataDir, { recursive: true });
+		}
+
+		// Check if directory is writable
+		accessSync(dataDir, constants.W_OK);
+
+		// Try to create a test file to verify write access
+		const testFile = resolve(dataDir, ".write-test");
+		writeFileSync(testFile, "test");
+
+		return { success: true };
+	} catch (err: any) {
+		return { success: false, error: err.message };
+	}
+}
+
+// =============================================================================
+// Migration utilities
+// =============================================================================
+
+/** Run drizzle-kit migrations on the database */
+export async function runDrizzleMigrations(
+	database: ReturnType<typeof drizzle>
+): Promise<{ success: boolean; error?: string; warning?: string }> {
+	try {
+		await migrate(database, { migrationsFolder });
+		return { success: true };
+	} catch (err: any) {
+		// If the error is about existing schema objects, the DB is already up-to-date
+		// This happens when ALTER migrations in client.ts have already added the columns,
+		// or when tables were created before drizzle migrations were introduced
+		if (err.message?.includes("duplicate column") || err.message?.includes("already exists")) {
+			return { success: true, warning: `Schema already up-to-date: ${err.message}` };
+		}
+		return { success: false, error: err.message };
+	}
+}
+
+/** Run ALTER TABLE migrations for backward compatibility with older databases */
+export async function runAlterMigrations(client: Client): Promise<{ success: boolean; errors: string[] }> {
+	const errors: string[] = [];
+
+	// These add new columns to existing tables (silently fail if column already exists)
+	const alterMigrations = [
+		// Added in v1.x - repeat reminders and nagging settings
+		`ALTER TABLE user_settings ADD COLUMN skip_reminders_for_taken_doses integer NOT NULL DEFAULT 0`,
+		`ALTER TABLE user_settings ADD COLUMN repeat_reminders_enabled integer NOT NULL DEFAULT 0`,
+		`ALTER TABLE user_settings ADD COLUMN reminder_repeat_interval_minutes integer NOT NULL DEFAULT 30`,
+		`ALTER TABLE user_settings ADD COLUMN max_nagging_reminders integer NOT NULL DEFAULT 5`,
+		// Added in v1.2.3 - dismiss missed doses without deducting stock
+		`ALTER TABLE dose_tracking ADD COLUMN dismissed integer NOT NULL DEFAULT 0`,
+		// Added in v1.3.x - stock calculation mode (automatic/manual)
+		`ALTER TABLE user_settings ADD COLUMN stock_calculation_mode text NOT NULL DEFAULT 'automatic'`,
+		// Added for stock correction - hidden offset that doesn't affect looseTablets
+		`ALTER TABLE medications ADD COLUMN stock_adjustment integer NOT NULL DEFAULT 0`,
+		// Added for stock correction - timestamp to ignore consumed doses before correction
+		`ALTER TABLE medications ADD COLUMN last_stock_correction_at integer`,
+		// Added in v1.5.1 - dismiss past doses until date (robust against timestamp changes)
+		`ALTER TABLE medications ADD COLUMN dismissed_until text`,
+		// Added for more detailed reminder info display
+		`ALTER TABLE user_settings ADD COLUMN last_reminder_med_name text`,
+		`ALTER TABLE user_settings ADD COLUMN last_reminder_taken_by text`,
+		// Added for package type support (blister vs bottle)
+		`ALTER TABLE medications ADD COLUMN package_type text NOT NULL DEFAULT 'blister'`,
+		`ALTER TABLE medications ADD COLUMN total_pills integer`,
+		// Added for dose unit selection (mg, g, mcg, ml, IU, etc.)
+		`ALTER TABLE medications ADD COLUMN dose_unit text DEFAULT 'mg'`,
+		// Added for intake-level takenBy: unified intakes structure
+		`ALTER TABLE medications ADD COLUMN intakes_json text NOT NULL DEFAULT '[]'`,
+		// Added for separate stock reminder tracking
+		`ALTER TABLE user_settings ADD COLUMN last_stock_reminder_sent text`,
+		`ALTER TABLE user_settings ADD COLUMN last_stock_reminder_channel text`,
+		`ALTER TABLE user_settings ADD COLUMN last_stock_reminder_med_names text`,
+		// Added for share stock visibility toggle
+		`ALTER TABLE user_settings ADD COLUMN share_stock_status integer NOT NULL DEFAULT 1`,
+	];
+
+	for (const sql of alterMigrations) {
+		try {
+			await client.execute(sql);
+		} catch (e: any) {
+			// Silently ignore "duplicate column" errors - column already exists
+			if (!e.message?.includes("duplicate column")) {
+				errors.push(e.message);
+			}
+		}
+	}
+
+	// Create tables that might be missing (silently fail if already exists)
+	const createTableMigrations = [
+		// Added in v1.3.x - refill history tracking
+		`CREATE TABLE IF NOT EXISTS refill_history (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      medication_id INTEGER NOT NULL REFERENCES medications(id) ON DELETE CASCADE,
+      user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+      packs_added INTEGER NOT NULL DEFAULT 0,
+      loose_pills_added INTEGER NOT NULL DEFAULT 0,
+      refill_date INTEGER NOT NULL DEFAULT (strftime('%s','now'))
+    )`,
+	];
+
+	for (const sql of createTableMigrations) {
+		try {
+			await client.execute(sql);
+		} catch (e: any) {
+			// Silently ignore "table already exists" errors
+			if (!e.message?.includes("already exists")) {
+				errors.push(e.message);
+			}
+		}
+	}
+
+	return { success: errors.length === 0, errors };
+}
+
+// =============================================================================
+// User utilities
+// =============================================================================
+
+/** Ensure default user exists for auth-disabled mode */
+export async function ensureDefaultUser(client: Client, authEnabled: boolean): Promise<boolean> {
+	if (authEnabled) {
+		return false; // No default user needed
+	}
+
+	try {
+		const result = await client.execute("SELECT id FROM users WHERE id = 1");
+		if (result.rows.length === 0) {
+			await client.execute("INSERT INTO users (id, username, auth_provider) VALUES (1, 'default', 'local')");
+			return true; // Created
+		}
+		return false; // Already exists
+	} catch (e: any) {
+		console.error(`[DB] Error creating default user:`, e.message);
+		return false;
+	}
+}
+
+// =============================================================================
+// Startup repair: fix orphaned dose tracking IDs from past schedule changes
+// =============================================================================
+
+const MS_PER_DAY = 86_400_000;
+
+/**
+ * Repair dose IDs that have a trailing hyphen caused by a frontend bug where
+ * `[].toString()` produced an empty string, resulting in IDs like "5-0-1729123200000-"
+ * instead of "5-0-1729123200000". This strips trailing hyphens from all dose IDs.
+ *
+ * This function is idempotent - safe to run on every startup.
+ */
+export async function repairTrailingHyphenDoseIds(client: Client): Promise<{ repaired: number; errors: string[] }> {
+	const errors: string[] = [];
+	let repaired = 0;
+
+	try {
+		const result = await client.execute(
+			"UPDATE dose_tracking SET dose_id = RTRIM(dose_id, '-') WHERE dose_id LIKE '%-'"
+		);
+		repaired = result.rowsAffected;
+	} catch (e: any) {
+		errors.push(`Trailing-hyphen repair failed: ${e.message}`);
+	}
+
+	return { repaired, errors };
+}
+
+/**
+ * Repair orphaned dose tracking IDs that no longer match the current intake schedule.
+ * This fixes dose IDs that became invalid when a medication's schedule was changed
+ * BEFORE the on-edit migration (PR #103) was introduced.
+ *
+ * For each medication, generates all valid schedule dateOnlyMs values from each intake's
+ * start date up to today, then checks all dose_tracking entries. Any dose whose timestamp
+ * doesn't match a valid schedule date is remapped to the nearest valid date.
+ *
+ * This function is idempotent - safe to run on every startup.
+ */
+export async function repairOrphanedDoseIds(client: Client): Promise<{ repaired: number; errors: string[] }> {
+	const errors: string[] = [];
+	let repaired = 0;
+
+	try {
+		// Get all medications
+		const medsResult = await client.execute(
+			"SELECT id, intakes_json, usage_json, every_json, start_json, intake_reminders_enabled FROM medications"
+		);
+
+		if (medsResult.rows.length === 0) return { repaired, errors };
+
+		// Get all dose tracking entries
+		const dosesResult = await client.execute("SELECT id, dose_id FROM dose_tracking");
+		if (dosesResult.rows.length === 0) return { repaired, errors };
+
+		// Build a map of medId → dose entries for quick lookup
+		const dosesByMed = new Map<number, Array<{ id: number; doseId: string }>>();
+		for (const row of dosesResult.rows) {
+			const doseId = row.dose_id as string;
+			const parts = doseId.split("-");
+			if (parts.length < 3) continue;
+			const medId = parseInt(parts[0], 10);
+			if (Number.isNaN(medId)) continue;
+			if (!dosesByMed.has(medId)) dosesByMed.set(medId, []);
+			dosesByMed.get(medId)!.push({ id: row.id as number, doseId });
+		}
+
+		const now = new Date();
+		const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+
+		for (const med of medsResult.rows) {
+			const medId = med.id as number;
+			const medDoses = dosesByMed.get(medId);
+			if (!medDoses || medDoses.length === 0) continue;
+
+			// Parse intakes
+			const intakes = parseIntakesJson(
+				med.intakes_json as string | null,
+				{
+					usageJson: (med.usage_json as string) || "[]",
+					everyJson: (med.every_json as string) || "[]",
+					startJson: (med.start_json as string) || "[]",
+				},
+				(med.intake_reminders_enabled as number) === 1
+			);
+
+			if (intakes.length === 0) continue;
+
+			// For each intake index, build the set of valid dateOnlyMs values
+			const validDatesByIntake = new Map<number, Set<number>>();
+			for (let idx = 0; idx < intakes.length; idx++) {
+				const intake = intakes[idx];
+				const start = parseLocalDateTime(intake.start);
+				const every = intake.every;
+				if (every <= 0 || Number.isNaN(start.getTime())) continue;
+
+				const validDates = new Set<number>();
+				for (let d = new Date(start); d <= today; d.setDate(d.getDate() + every)) {
+					validDates.add(new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime());
+				}
+				validDatesByIntake.set(idx, validDates);
+			}
+
+			// Check each dose entry
+			for (const dose of medDoses) {
+				const parts = dose.doseId.split("-");
+				if (parts.length < 3) continue;
+
+				const intakeIdx = parseInt(parts[1], 10);
+				const dateOnlyMs = parseInt(parts[2], 10);
+				if (Number.isNaN(intakeIdx) || Number.isNaN(dateOnlyMs)) continue;
+
+				const validDates = validDatesByIntake.get(intakeIdx);
+				if (!validDates) continue; // Unknown intake index - skip
+
+				// Check if this dose's timestamp is valid
+				if (validDates.has(dateOnlyMs)) continue; // Already valid - nothing to do
+
+				// Orphaned dose - find the nearest valid schedule date
+				const intake = intakes[intakeIdx];
+				if (!intake) continue;
+
+				const halfInterval = (intake.every * MS_PER_DAY) / 2;
+				let bestMatch: number | null = null;
+				let bestDist = Infinity;
+
+				for (const validDate of validDates) {
+					const dist = Math.abs(validDate - dateOnlyMs);
+					if (dist < bestDist && dist <= halfInterval) {
+						bestDist = dist;
+						bestMatch = validDate;
+					}
+				}
+
+				if (bestMatch !== null) {
+					// Rebuild dose ID with new timestamp, preserving person suffix
+					const personSuffix = parts.length > 3 ? `-${parts.slice(3).join("-")}` : "";
+					const newDoseId = `${medId}-${intakeIdx}-${bestMatch}${personSuffix}`;
+
+					try {
+						await client.execute({
+							sql: "UPDATE dose_tracking SET dose_id = ? WHERE id = ?",
+							args: [newDoseId, dose.id],
+						});
+						repaired++;
+					} catch (e: any) {
+						errors.push(`Failed to repair dose ${dose.id}: ${e.message}`);
+					}
+				}
+			}
+		}
+	} catch (e: any) {
+		errors.push(`Repair failed: ${e.message}`);
+	}
+
+	return { repaired, errors };
+}

backend/src/db/migrate.ts

@@ -1,39 +1,50 @@
-import { createClient, Client } from "@libsql/client";
+import { existsSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { type Client, createClient } from "@libsql/client";
 import dotenv from "dotenv";
-import fs from "fs";
-import path from "path";
-import { getTableCreationSQL } from "./schema-sql.js";
+import { drizzle } from "drizzle-orm/libsql";
+import { migrate } from "drizzle-orm/libsql/migrator";
 
-dotenv.config({ path: process.env.DOTENV_PATH || ".env" });
+// Load .env: try cwd first, then parent dir (for local dev running from backend/)
+const envPath = process.env.DOTENV_PATH || (existsSync(".env") ? ".env" : "../.env");
+dotenv.config({ path: envPath });
+
+// Get migrations folder path (relative to this file's location)
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const migrationsFolder = resolve(__dirname, "../../drizzle");
 
 // =============================================================================
 // Exported utility functions for testing
 // =============================================================================
 
-/** Get the full migration SQL string (re-exported from schema-sql) */
-export { getTableCreationSQL };
-
-/** Split SQL string into individual statements */
+/** Split SQL string into individual statements (for backwards compatibility with tests) */
 export function splitSQLStatements(sql: string): string[] {
-  return sql.split(';').filter(s => s.trim().length > 0);
+	return sql.split(";").filter((s) => s.trim().length > 0);
 }
 
-/** Execute migration statements on a client */
-export async function executeMigration(client: Client): Promise<{ success: boolean; executed: number; errors: string[] }> {
-  const statements = getTableCreationSQL();
+/** Execute drizzle migrations on a database */
+export async function executeMigration(
+	client: Client
+): Promise<{ success: boolean; executed: number; errors: string[] }> {
 	const errors: string[] = [];
-  let executed = 0;
+	const db = drizzle(client);
 
-  for (const stmt of statements) {
 	try {
-      await client.execute(stmt);
-      executed++;
+		await migrate(db, { migrationsFolder });
+
+		// Count tables as a proxy for "executed" statements
+		const tables = await client.execute(
+			"SELECT COUNT(*) as count FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name NOT LIKE '__drizzle%'"
+		);
+		const executed = Number(tables.rows[0].count) || 0;
+
+		return { success: true, executed, errors };
 	} catch (err: any) {
 		errors.push(err.message);
+		return { success: false, executed: 0, errors };
 	}
-  }
-
-  return { success: errors.length === 0, executed, errors };
 }
 
 /** Get a preview of statement (first N characters) */
@@ -42,7 +53,7 @@ export function getStatementPreview(stmt: string, maxLength: number = 50): strin
 	if (trimmed.length <= maxLength) {
 		return trimmed;
 	}
-  return trimmed.substring(0, maxLength) + "...";
+	return `${trimmed.substring(0, maxLength)}...`;
 }
 
 // =============================================================================
@@ -52,19 +63,17 @@ export function getStatementPreview(stmt: string, maxLength: number = 50): strin
 const url = "file:./data/medassist-ng.db";
 
 async function main() {
-  console.log("Starting database setup...");
-  console.log("Database URL:", url);
+	console.log("[DB] Starting database setup...");
+	console.log("[DB] Database URL:", url);
+	console.log("[DB] Migrations folder:", migrationsFolder);
 
 	const client = createClient({ url });
+	const db = drizzle(client);
 
-  const statements = getTableCreationSQL();
+	console.log("[DB] Running drizzle migrations...");
+	await migrate(db, { migrationsFolder });
 
-  for (const stmt of statements) {
-    console.log("Executing:", getStatementPreview(stmt));
-    await client.execute(stmt);
-  }
-
-  console.log("Database setup complete!");
+	console.log("[DB] Database setup complete!");
 	process.exit(0);
 }
 

backend/src/db/schema-sql.ts

@@ -97,6 +97,17 @@ export function getTableCreationSQL(): string[] {
       dose_id text NOT NULL,
       taken_at integer NOT NULL DEFAULT (strftime('%s','now')),
       marked_by text,
+      dismissed integer NOT NULL DEFAULT 0,
+      FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+    )`,
+		`CREATE TABLE IF NOT EXISTS refill_history (
+      id integer PRIMARY KEY AUTOINCREMENT,
+      medication_id integer NOT NULL,
+      user_id integer NOT NULL,
+      packs_added integer NOT NULL DEFAULT 0,
+      loose_pills_added integer NOT NULL DEFAULT 0,
+      refill_date integer NOT NULL DEFAULT (strftime('%s','now')),
+      FOREIGN KEY (medication_id) REFERENCES medications(id) ON DELETE CASCADE,
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
 	];

backend/src/db/schema.ts

@@ -1,5 +1,5 @@
-import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
 import { sql } from "drizzle-orm";
+import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 
 // =============================================================================
 // Users - Simple auth, no roles (every user is equal)
@@ -22,22 +22,32 @@ export const users = sqliteTable("users", {
 // =============================================================================
 export const medications = sqliteTable("medications", {
 	id: integer("id").primaryKey({ autoIncrement: true }),
-  userId: integer("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
+	userId: integer("user_id")
+		.notNull()
+		.references(() => users.id, { onDelete: "cascade" }),
 	name: text("name", { length: 100 }).notNull(),
 	genericName: text("generic_name", { length: 100 }),
 	takenByJson: text("taken_by_json").notNull().default("[]"), // JSON array of person names
+	packageType: text("package_type", { length: 20 }).notNull().default("blister"), // 'blister' or 'bottle'
 	packCount: integer("pack_count").notNull().default(1),
 	blistersPerPack: integer("blisters_per_pack").notNull().default(1),
 	pillsPerBlister: integer("pills_per_blister").notNull().default(1),
-  looseTablets: integer("loose_tablets").notNull().default(0),
+	totalPills: integer("total_pills"), // For bottle type: total capacity of the container
+	looseTablets: integer("loose_tablets").notNull().default(0), // For blister: extra loose pills; for bottle: current stock
+	stockAdjustment: integer("stock_adjustment").notNull().default(0), // Hidden offset from stock corrections
+	lastStockCorrectionAt: integer("last_stock_correction_at", { mode: "timestamp" }), // When stock was last corrected - consumed doses before this don't count
 	pillWeightMg: integer("pill_weight_mg"),
-  usageJson: text("usage_json").notNull().default("[]"),
-  everyJson: text("every_json").notNull().default("[]"),
-  startJson: text("start_json").notNull().default("[]"),
+	doseUnit: text("dose_unit", { length: 20 }).default("mg"), // Unit for the dose (mg, g, mcg, ml, IU, etc.)
+	usageJson: text("usage_json").notNull().default("[]"), // DEPRECATED: Use intakesJson instead
+	everyJson: text("every_json").notNull().default("[]"), // DEPRECATED: Use intakesJson instead
+	startJson: text("start_json").notNull().default("[]"), // DEPRECATED: Use intakesJson instead
+	// New unified intakes structure: [{usage, every, start, takenBy, intakeRemindersEnabled}]
+	intakesJson: text("intakes_json").notNull().default("[]"),
 	imageUrl: text("image_url"),
 	expiryDate: text("expiry_date"),
 	notes: text("notes"),
 	intakeRemindersEnabled: integer("intake_reminders_enabled", { mode: "boolean" }).notNull().default(false),
+	dismissedUntil: text("dismissed_until"), // ISO date string (e.g. "2026-01-23") - all past doses until this date are dismissed
 	updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().default(sql`CURRENT_TIMESTAMP`),
 });
 
@@ -46,7 +56,10 @@ export const medications = sqliteTable("medications", {
 // =============================================================================
 export const userSettings = sqliteTable("user_settings", {
 	id: integer("id").primaryKey({ autoIncrement: true }),
-  userId: integer("user_id").notNull().unique().references(() => users.id, { onDelete: "cascade" }),
+	userId: integer("user_id")
+		.notNull()
+		.unique()
+		.references(() => users.id, { onDelete: "cascade" }),
 	// Email notifications
 	emailEnabled: integer("email_enabled", { mode: "boolean" }).notNull().default(false),
 	notificationEmail: text("notification_email"),
@@ -68,14 +81,23 @@ export const userSettings = sqliteTable("user_settings", {
 	lowStockDays: integer("low_stock_days").notNull().default(30),
 	normalStockDays: integer("normal_stock_days").notNull().default(90),
 	highStockDays: integer("high_stock_days").notNull().default(180),
+	expiryWarningDays: integer("expiry_warning_days").notNull().default(90),
 	// UI preferences
 	language: text("language", { length: 10 }).notNull().default("en"),
 	// Stock calculation mode: "automatic" (schedule-based) or "manual" (only marked doses)
 	stockCalculationMode: text("stock_calculation_mode", { length: 20 }).notNull().default("automatic"),
-  // Last notification tracking
+	// Whether shared schedule links show stock status (Critical/Low/Normal) to intake users
+	shareStockStatus: integer("share_stock_status", { mode: "boolean" }).notNull().default(true),
+	// Last notification tracking (intake reminders)
 	lastAutoEmailSent: text("last_auto_email_sent"),
 	lastNotificationType: text("last_notification_type"),
 	lastNotificationChannel: text("last_notification_channel"),
+	lastReminderMedName: text("last_reminder_med_name"),
+	lastReminderTakenBy: text("last_reminder_taken_by"),
+	// Last stock reminder tracking (separate from intake)
+	lastStockReminderSent: text("last_stock_reminder_sent"),
+	lastStockReminderChannel: text("last_stock_reminder_channel"),
+	lastStockReminderMedNames: text("last_stock_reminder_med_names"),
 	// Timestamps
 	updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().default(sql`CURRENT_TIMESTAMP`),
 });
@@ -85,7 +107,9 @@ export const userSettings = sqliteTable("user_settings", {
 // =============================================================================
 export const refreshTokens = sqliteTable("refresh_tokens", {
 	id: integer("id").primaryKey({ autoIncrement: true }),
-  userId: integer("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
+	userId: integer("user_id")
+		.notNull()
+		.references(() => users.id, { onDelete: "cascade" }),
 	tokenId: text("token_id", { length: 255 }).notNull().unique(),
 	expiresAt: integer("expires_at", { mode: "timestamp" }).notNull(),
 	rotatedAt: integer("rotated_at", { mode: "timestamp" }),
@@ -98,7 +122,9 @@ export const refreshTokens = sqliteTable("refresh_tokens", {
 // =============================================================================
 export const shareTokens = sqliteTable("share_tokens", {
 	id: integer("id").primaryKey({ autoIncrement: true }),
-  userId: integer("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
+	userId: integer("user_id")
+		.notNull()
+		.references(() => users.id, { onDelete: "cascade" }),
 	token: text("token", { length: 64 }).notNull().unique(),
 	takenBy: text("taken_by", { length: 100 }).notNull(),
 	scheduleDays: integer("schedule_days").notNull().default(30),
@@ -111,8 +137,27 @@ export const shareTokens = sqliteTable("share_tokens", {
 // =============================================================================
 export const doseTracking = sqliteTable("dose_tracking", {
 	id: integer("id").primaryKey({ autoIncrement: true }),
-  userId: integer("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
+	userId: integer("user_id")
+		.notNull()
+		.references(() => users.id, { onDelete: "cascade" }),
 	doseId: text("dose_id", { length: 255 }).notNull(), // e.g. "med-5-1-86400000-1735200000000"
 	takenAt: integer("taken_at", { mode: "timestamp" }).notNull().default(sql`(strftime('%s','now'))`),
 	markedBy: text("marked_by", { length: 100 }), // null = user, "Daniel" = via share link
+	dismissed: integer("dismissed", { mode: "boolean" }).notNull().default(false), // true = missed dose acknowledged without taking
+});
+
+// =============================================================================
+// Refill History - Tracks when medication stock was refilled
+// =============================================================================
+export const refillHistory = sqliteTable("refill_history", {
+	id: integer("id").primaryKey({ autoIncrement: true }),
+	medicationId: integer("medication_id")
+		.notNull()
+		.references(() => medications.id, { onDelete: "cascade" }),
+	userId: integer("user_id")
+		.notNull()
+		.references(() => users.id, { onDelete: "cascade" }),
+	packsAdded: integer("packs_added").notNull().default(0),
+	loosePillsAdded: integer("loose_pills_added").notNull().default(0),
+	refillDate: integer("refill_date", { mode: "timestamp" }).notNull().default(sql`(strftime('%s','now'))`),
 });

backend/src/i18n/translations.ts

@@ -1,21 +1,92 @@
 // Backend translations for notifications
 export type Language = "en" | "de";
 
+/**
+ * Map timezone to region code (ISO 3166-1 alpha-2).
+ * This allows combining app language with regional formatting.
+ */
+const TIMEZONE_TO_REGION: Record<string, string> = {
+	// Europe
+	"Europe/Berlin": "DE",
+	"Europe/Vienna": "AT",
+	"Europe/Zurich": "CH",
+	"Europe/London": "GB",
+	"Europe/Dublin": "IE",
+	"Europe/Paris": "FR",
+	"Europe/Madrid": "ES",
+	"Europe/Rome": "IT",
+	"Europe/Amsterdam": "NL",
+	"Europe/Brussels": "BE",
+	"Europe/Warsaw": "PL",
+	"Europe/Prague": "CZ",
+	"Europe/Stockholm": "SE",
+	"Europe/Oslo": "NO",
+	"Europe/Copenhagen": "DK",
+	"Europe/Helsinki": "FI",
+	"Europe/Athens": "GR",
+	"Europe/Lisbon": "PT",
+	"Europe/Moscow": "RU",
+	"Europe/Kiev": "UA",
+	"Europe/Kyiv": "UA",
+	"Europe/Budapest": "HU",
+	"Europe/Bucharest": "RO",
+	// Americas
+	"America/New_York": "US",
+	"America/Chicago": "US",
+	"America/Denver": "US",
+	"America/Los_Angeles": "US",
+	"America/Phoenix": "US",
+	"America/Toronto": "CA",
+	"America/Vancouver": "CA",
+	"America/Mexico_City": "MX",
+	"America/Sao_Paulo": "BR",
+	"America/Buenos_Aires": "AR",
+	// Asia/Pacific
+	"Asia/Tokyo": "JP",
+	"Asia/Shanghai": "CN",
+	"Asia/Hong_Kong": "HK",
+	"Asia/Singapore": "SG",
+	"Asia/Seoul": "KR",
+	"Asia/Dubai": "AE",
+	"Asia/Kolkata": "IN",
+	"Australia/Sydney": "AU",
+	"Australia/Melbourne": "AU",
+	"Pacific/Auckland": "NZ",
+};
+
+/**
+ * Get region code from TZ environment variable.
+ */
+function getRegionFromTimezone(): string | undefined {
+	const tz = process.env.TZ;
+	if (!tz) return undefined;
+	return TIMEZONE_TO_REGION[tz];
+}
+
 type TranslationKeys = {
-  // Stock reminder email
+	// Stock reminder (shared across email + push)
 	stockReminder: {
 		subject: string;
 		title: string;
 		description: string;
+		descriptionEmpty: string;
+		descriptionMixed: string;
 		alertSingle: string;
 		alertMultiple: string;
+		alertEmptySingle: string;
+		alertEmptyMultiple: string;
+		alertLowSingle: string;
+		alertLowMultiple: string;
+		alertLowStockSingle: string;
+		alertLowStockMultiple: string;
+		descriptionLow: string;
 		tableHeaders: {
 			medication: string;
 			pills: string;
 			days: string;
 			runsOut: string;
 		};
-    footer: string;
+		now: string;
 		repeatDailyNote: string;
 	};
 	// Intake reminder email
@@ -32,7 +103,6 @@ type TranslationKeys = {
 		};
 		pills: string;
 		takenBy: string;
-    footer: string;
 	};
 	// Push notifications
 	push: {
@@ -45,35 +115,68 @@ type TranslationKeys = {
 		repeatDailyNote: string;
 		empty: string;
 		low: string;
+		critical: string;
+		lowStock: string;
 		reorderNow: string;
 		emptySection: string;
 		lowSection: string;
+		criticalSection: string;
+		lowStockSection: string;
+	};
+	// Demand calculator email
+	demandCalculator: {
+		subject: string;
+		title: string;
+		description: string;
+		summaryOutOfStock: string;
+		summaryAllOk: string;
+		tableHeaders: {
+			medication: string;
+			usage: string;
+			needed: string;
+			available: string;
+			status: string;
+		};
+		statusEnough: string;
+		statusEmpty: string;
 	};
 	// Common
 	common: {
 		pill: string;
 		pills: string;
+		blister: string;
+		blisters: string;
 		day: string;
 		days: string;
 		soon: string;
+		footer: string;
 	};
 };
 
 const translations: Record<Language, TranslationKeys> = {
 	en: {
 		stockReminder: {
-      subject: "MedAssist-ng Auto-Reminder: {count} Medication{s} Running Low",
+			subject: "MedAssist-ng Auto-Reminder: {count} Medication{s} Running Critically Low",
 			title: "⚠️ MedAssist-ng - Automatic Reorder Reminder",
-      description: "The following medications are running low and need to be reordered:",
-      alertSingle: "⚠️ 1 medication running low!",
-      alertMultiple: "⚠️ {count} medications running low!",
+			description: "The following medications are running critically low and need to be reordered:",
+			descriptionEmpty: "The following medications are empty and need to be reordered immediately:",
+			descriptionMixed: "The following medications need to be reordered:",
+			alertSingle: "⚠️ 1 medication running critically low!",
+			alertMultiple: "⚠️ {count} medications running critically low!",
+			alertEmptySingle: "🚨 1 medication empty - reorder immediately!",
+			alertEmptyMultiple: "🚨 {count} medications empty - reorder immediately!",
+			alertLowSingle: "⚠️ 1 medication running critically low",
+			alertLowMultiple: "⚠️ {count} medications running critically low",
+			alertLowStockSingle: "⚠️ 1 medication running low",
+			alertLowStockMultiple: "⚠️ {count} medications running low",
+			descriptionLow: "The following medications are running low and should be reordered soon:",
 			tableHeaders: {
 				medication: "Medication",
 				pills: "Pills",
 				days: "Days",
 				runsOut: "Runs Out",
 			},
-      footer: "🤖 Automatic reminder from MedAssist-ng",
+			now: "NOW",
 			repeatDailyNote: "You are receiving this daily reminder because 'Repeat Daily' is enabled in settings.",
 		},
 		intakeReminder: {
@@ -89,45 +192,77 @@ const translations: Record<Language, TranslationKeys> = {
 			},
 			pills: "pills",
 			takenBy: "for {name}",
-      footer: "🤖 Automatic reminder from MedAssist-ng",
 		},
 		push: {
-      stockTitle: "MedAssist-ng: 1 Medication Running Low",
-      stockTitleMultiple: "MedAssist-ng: {count} Medications Running Low",
-      intakeTitle: "💊 Medication Reminder in {minutes} min",
+			stockTitle: "MedAssist-ng: 1 Medication Running Critically Low",
+			stockTitleMultiple: "MedAssist-ng: {count} Medications Running Critically Low",
+			intakeTitle: "💊 Reminder: Medication intake in {minutes} min",
 			pillsLeft: "{count} pills",
 			daysLeft: "{count} days left",
 			pillsAt: "{count} pills at {time}",
 			repeatDailyNote: "(Daily reminder enabled)",
 			empty: "Empty",
-      low: "Low",
+			low: "Critical",
+			critical: "Critical",
+			lowStock: "Low",
 			reorderNow: "Reorder Now!",
-      emptySection: "EMPTY (reorder immediately)",
-      lowSection: "RUNNING LOW (reorder soon)",
+			emptySection: "Empty (reorder immediately)",
+			lowSection: "Running critically low",
+			criticalSection: "Running critically low",
+			lowStockSection: "Running low",
+		},
+		demandCalculator: {
+			subject: "MedAssist-ng - Supply Overview ({from} - {until})",
+			title: "MedAssist-ng - Demand Calculator",
+			description: "Supply overview from {from} to {until}",
+			summaryOutOfStock: "⚠️ {count} medication{s} will be out of stock during this period.",
+			summaryAllOk: "✓ All medications have sufficient supply for this period.",
+			tableHeaders: {
+				medication: "Medication",
+				usage: "Usage",
+				needed: "Blisters needed",
+				available: "Available",
+				status: "Status",
+			},
+			statusEnough: "✓ Enough",
+			statusEmpty: "✗ Empty",
 		},
 		common: {
 			pill: "pill",
 			pills: "pills",
+			blister: "blister",
+			blisters: "blisters",
 			day: "day",
 			days: "days",
 			soon: "soon",
+			footer: "🤖 Sent from MedAssist-ng",
 		},
 	},
 	de: {
 		stockReminder: {
-      subject: "MedAssist-ng Auto-Erinnerung: {count} Medikament{e} wird knapp",
+			subject: "MedAssist-ng Auto-Erinnerung: {count} Medikament{e} kritisch niedrig",
 			title: "⚠️ MedAssist-ng - Automatische Nachbestell-Erinnerung",
-      description: "Die folgenden Medikamente gehen zur Neige und sollten nachbestellt werden:",
-      alertSingle: "⚠️ 1 Medikament wird knapp!",
-      alertMultiple: "⚠️ {count} Medikamente werden knapp!",
+			description: "Die folgenden Medikamente sind kritisch niedrig und sollten nachbestellt werden:",
+			descriptionEmpty: "Die folgenden Medikamente sind leer und müssen sofort nachbestellt werden:",
+			descriptionMixed: "Die folgenden Medikamente müssen nachbestellt werden:",
+			alertSingle: "⚠️ 1 Medikament kritisch niedrig!",
+			alertMultiple: "⚠️ {count} Medikamente kritisch niedrig!",
+			alertEmptySingle: "🚨 1 Medikament leer - sofort nachbestellen!",
+			alertEmptyMultiple: "🚨 {count} Medikamente leer - sofort nachbestellen!",
+			alertLowSingle: "⚠️ 1 Medikament kritisch niedrig",
+			alertLowMultiple: "⚠️ {count} Medikamente kritisch niedrig",
+			alertLowStockSingle: "⚠️ 1 Medikament niedrig",
+			alertLowStockMultiple: "⚠️ {count} Medikamente niedrig",
+			descriptionLow: "Die folgenden Medikamente werden knapp und sollten bald nachbestellt werden:",
 			tableHeaders: {
 				medication: "Medikament",
 				pills: "Tabletten",
 				days: "Tage",
 				runsOut: "Aufgebraucht",
 			},
-      footer: "🤖 Automatische Erinnerung von MedAssist-ng",
-      repeatDailyNote: "Sie erhalten diese tägliche Erinnerung, weil 'Täglich wiederholen' in den Einstellungen aktiviert ist.",
+			now: "JETZT",
+			repeatDailyNote:
+				"Sie erhalten diese tägliche Erinnerung, weil 'Täglich wiederholen' in den Einstellungen aktiviert ist.",
 		},
 		intakeReminder: {
 			subject: "MedAssist-ng: Einnahme-Erinnerung - {medications}",
@@ -142,28 +277,50 @@ const translations: Record<Language, TranslationKeys> = {
 			},
 			pills: "Tabletten",
 			takenBy: "für {name}",
-      footer: "🤖 Automatische Erinnerung von MedAssist-ng",
 		},
 		push: {
-      stockTitle: "MedAssist-ng: 1 Medikament wird knapp",
-      stockTitleMultiple: "MedAssist-ng: {count} Medikamente werden knapp",
-      intakeTitle: "💊 Einnahme-Erinnerung in {minutes} Min.",
+			stockTitle: "MedAssist-ng: 1 Medikament kritisch niedrig",
+			stockTitleMultiple: "MedAssist-ng: {count} Medikamente kritisch niedrig",
+			intakeTitle: "💊 Erinnerung: Medikamenteneinnahme in {minutes} Min.",
 			pillsLeft: "{count} Tabletten",
 			daysLeft: "{count} Tage übrig",
 			pillsAt: "{count} Tabletten um {time}",
 			repeatDailyNote: "(Tägliche Erinnerung aktiviert)",
 			empty: "Leer",
-      low: "Knapp",
+			low: "Kritisch",
+			critical: "Kritisch",
+			lowStock: "Niedrig",
 			reorderNow: "Jetzt nachbestellen!",
-      emptySection: "LEER (sofort nachbestellen)",
-      lowSection: "WIRD KNAPP (bald nachbestellen)",
+			emptySection: "Leer (sofort nachbestellen)",
+			lowSection: "Kritisch niedrig",
+			criticalSection: "Kritisch niedrig",
+			lowStockSection: "Niedrig",
+		},
+		demandCalculator: {
+			subject: "MedAssist-ng - Bestandsübersicht ({from} - {until})",
+			title: "MedAssist-ng - Bedarfsrechner",
+			description: "Bestandsübersicht von {from} bis {until}",
+			summaryOutOfStock: "⚠️ {count} Medikament{e} wird im Zeitraum nicht ausreichen.",
+			summaryAllOk: "✓ Alle Medikamente reichen für diesen Zeitraum.",
+			tableHeaders: {
+				medication: "Medikament",
+				usage: "Verbrauch",
+				needed: "Blister benötigt",
+				available: "Verfügbar",
+				status: "Status",
+			},
+			statusEnough: "✓ Ausreichend",
+			statusEmpty: "✗ Leer",
 		},
 		common: {
 			pill: "Tablette",
 			pills: "Tabletten",
+			blister: "Blister",
+			blisters: "Blister",
 			day: "Tag",
 			days: "Tage",
 			soon: "bald",
+			footer: "🤖 Gesendet von MedAssist-ng",
 		},
 	},
 };
@@ -181,13 +338,58 @@ export function t(template: string, params: Record<string, string | number> = {}
 	return result;
 }
 
-// Get date locale for toLocaleDateString
+/**
+ * Get locale for formatting based on language and timezone region.
+ * Combines language (en/de) with region from timezone (DE/US/etc.)
+ * Example: lang=en + TZ=Europe/Berlin → en-DE (English text, German format = 24h time)
+ */
 export function getDateLocale(language: Language): string {
+	const region = getRegionFromTimezone();
+
+	if (region) {
+		return `${language}-${region}`;
+	}
+
+	// Fallback: use language default
 	switch (language) {
 		case "de":
 			return "de-DE";
-    case "en":
 		default:
 			return "en-US";
 	}
 }
+
+/**
+ * Get the app URL from the first CORS_ORIGINS entry.
+ * Falls back to empty string if not set.
+ */
+export function getAppUrl(): string {
+	const origins = process.env.CORS_ORIGINS || "";
+	return origins.split(",")[0]?.trim() || "";
+}
+
+/**
+ * Get the unified footer as HTML with MedAssist-ng as a link to the instance.
+ * @param variant - 'planner' uses the Medication Planner footer text
+ */
+export function getFooterHtml(language: Language): string {
+	const tr = getTranslations(language);
+	const appUrl = getAppUrl();
+	const appName = appUrl
+		? `<a href="${appUrl}" style="color: #6b7280; text-decoration: underline;">MedAssist-ng</a>`
+		: "MedAssist-ng";
+	return tr.common.footer.replace("MedAssist-ng", appName);
+}
+
+/**
+ * Get the unified footer as plain text.
+ * @param variant - 'planner' uses the Medication Planner footer text
+ */
+export function getFooterPlain(language: Language): string {
+	const tr = getTranslations(language);
+	const appUrl = getAppUrl();
+	if (appUrl) {
+		return `${tr.common.footer} (${appUrl})`;
+	}
+	return tr.common.footer;
+}

backend/src/index.ts

@@ -1,45 +1,47 @@
-import Fastify, { FastifyInstance } from "fastify";
-import helmet from "@fastify/helmet";
-import cors from "@fastify/cors";
-import rateLimit from "@fastify/rate-limit";
-import sensible from "@fastify/sensible";
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
 import cookie from "@fastify/cookie";
+import cors from "@fastify/cors";
+import helmet from "@fastify/helmet";
 import jwt from "@fastify/jwt";
 import fastifyMultipart from "@fastify/multipart";
+import rateLimit from "@fastify/rate-limit";
+import sensible from "@fastify/sensible";
 import fastifyStatic from "@fastify/static";
-import { resolve } from "path";
-import { existsSync } from "fs";
-import { env } from "./plugins/env.js";
+import Fastify, { type FastifyInstance } from "fastify";
 import { migrationsReady } from "./db/client.js";
-import { healthRoutes } from "./routes/health.js";
+import { getDataDir } from "./db/db-utils.js";
+import { env } from "./plugins/env.js";
 import { authRoutes } from "./routes/auth.js";
-import { oidcRoutes } from "./routes/oidc.js";
-import { medicationRoutes } from "./routes/medications.js";
-import { settingsRoutes } from "./routes/settings.js";
-import { plannerRoutes } from "./routes/planner.js";
-import { shareRoutes } from "./routes/share.js";
 import { doseRoutes } from "./routes/doses.js";
 import { exportRoutes } from "./routes/export.js";
-import { startReminderScheduler } from "./services/reminder-scheduler.js";
+import { healthRoutes } from "./routes/health.js";
+import { medicationRoutes } from "./routes/medications.js";
+import { oidcRoutes } from "./routes/oidc.js";
+import { plannerRoutes } from "./routes/planner.js";
+import { refillRoutes } from "./routes/refills.js";
+import { settingsRoutes } from "./routes/settings.js";
+import { shareRoutes } from "./routes/share.js";
 import { startIntakeReminderScheduler } from "./services/intake-reminder-scheduler.js";
+import { startReminderScheduler } from "./services/reminder-scheduler.js";
 
 // Re-export utilities from server-config for external use
 export {
-  parseCorsOrigins,
+	buildAppConfig,
 	buildBaseCookieOptions,
 	buildRefreshCookieOptions,
-  buildAppConfig,
 	ensureImagesDirectory,
 	getJwtConfig,
+	parseCorsOrigins,
 } from "./utils/server-config.js";
 
 import {
-  parseCorsOrigins,
+	buildAppConfig,
 	buildBaseCookieOptions,
 	buildRefreshCookieOptions,
-  buildAppConfig,
 	ensureImagesDirectory,
 	getJwtConfig,
+	parseCorsOrigins,
 } from "./utils/server-config.js";
 
 /** Create and configure Fastify app (without starting) */
@@ -65,7 +67,7 @@ export async function createApp(options?: {
 		accessTtlMinutes: options?.accessTtlMinutes ?? 15,
 		refreshTtlDays: options?.refreshTtlDays ?? 7,
 		isProduction: options?.isProduction ?? false,
-    imagesDir: options?.imagesDir ?? resolve(process.cwd(), "data/images"),
+		imagesDir: options?.imagesDir ?? resolve(getDataDir(), "images"),
 	};
 
 	const app = Fastify({
@@ -87,7 +89,7 @@ export async function createApp(options?: {
 	await app.register(sensible);
 	await app.register(helmet);
 	await app.register(cors, { origin: opts.corsOrigins, credentials: true });
-  await app.register(rateLimit, { max: 100, timeWindow: "1 minute" });
+	await app.register(rateLimit, { max: 300, timeWindow: "1 minute" });
 	await app.register(cookie, { secret: opts.cookieSecret });
 
 	// JWT plugin
@@ -115,6 +117,7 @@ export async function createApp(options?: {
 	await app.register(shareRoutes);
 	await app.register(doseRoutes);
 	await app.register(exportRoutes);
+	await app.register(refillRoutes);
 
 	return app;
 }
@@ -123,9 +126,11 @@ export async function createApp(options?: {
 // Server initialization (runs on import)
 // =============================================================================
 
+import { log } from "./utils/logger.js";
+
 // Wait for database migrations before anything else
 await migrationsReady;
-console.log("[DB] Migrations complete, starting server...");
+log.info("[DB] Migrations complete, starting server...");
 
 // Ensure images directory exists
 const imagesDir = ensureImagesDirectory();
@@ -159,7 +164,7 @@ await app.register(sensible);
 await app.register(helmet);
 await app.register(cors, { origin: origins, credentials: true });
 await app.register(rateLimit, {
-  max: 100,
+	max: Number(process.env.RATE_LIMIT_MAX) || 100,
 	timeWindow: "1 minute",
 });
 await app.register(cookie, { secret: env.COOKIE_SECRET ?? "dev-cookie-secret" });
@@ -184,6 +189,7 @@ await app.register(plannerRoutes);
 await app.register(shareRoutes);
 await app.register(doseRoutes);
 await app.register(exportRoutes);
+await app.register(refillRoutes);
 
 const start = async () => {
 	try {
@@ -193,12 +199,14 @@ const start = async () => {
 		// Start the automatic reminder scheduler
 		startReminderScheduler({
 			info: (msg) => app.log.info(msg),
+			debug: (msg) => app.log.debug(msg),
 			error: (msg) => app.log.error(msg),
 		});
 
 		// Start the intake reminder scheduler (checks every minute)
 		startIntakeReminderScheduler({
 			info: (msg) => app.log.info(msg),
+			debug: (msg) => app.log.debug(msg),
 			error: (msg) => app.log.error(msg),
 		});
 	} catch (err) {

backend/src/plugins/auth.ts

@@ -1,8 +1,8 @@
-import { FastifyInstance, FastifyRequest, FastifyReply } from "fastify";
-import { env } from "./env.js";
+import { count, eq, sql } from "drizzle-orm";
+import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import { db } from "../db/client.js";
 import { users } from "../db/schema.js";
-import { sql, count, eq } from "drizzle-orm";
+import { env } from "./env.js";
 
 // =============================================================================
 // Anonymous User - Used when AUTH_ENABLED=false
@@ -37,7 +37,6 @@ export async function getAnonymousUserId(): Promise<number> {
   `);
 
 	anonymousUserVerified = true;
-  console.log(`Created anonymous user with fixed ID ${ANONYMOUS_USER_ID} for no-auth mode`);
 
 	return ANONYMOUS_USER_ID;
 }
@@ -87,7 +86,7 @@ export interface RequestUser {
 /**
  * Optional auth - verifies JWT if present, but doesn't require it
  */
-export async function optionalAuth(request: FastifyRequest, reply: FastifyReply) {
+export async function optionalAuth(request: FastifyRequest, _reply: FastifyReply) {
 	if (!env.AUTH_ENABLED) {
 		return;
 	}
@@ -100,7 +99,7 @@ export async function optionalAuth(request: FastifyRequest, reply: FastifyReply)
 	try {
 		const decoded = await request.jwtVerify<{ sub: number; username: string }>();
 		const [user] = await db.select().from(users).where(sql`${users.id} = ${decoded.sub}`);
-    if (user && user.isActive) {
+		if (user?.isActive) {
 			request.user = {
 				id: user.id,
 				username: user.username,

backend/src/plugins/env.ts

@@ -1,11 +1,17 @@
-import { z } from "zod";
+import { existsSync } from "node:fs";
 import dotenv from "dotenv";
+import { z } from "zod";
 
-dotenv.config({ path: process.env.DOTENV_PATH || ".env" });
+// Load .env: try cwd first, then parent dir (for local dev running from backend/)
+const envPath = process.env.DOTENV_PATH || (existsSync(".env") ? ".env" : "../.env");
+dotenv.config({ path: envPath });
 
 const EnvSchema = z.object({
 	NODE_ENV: z.enum(["development", "production", "test"]).default("production"),
-  PORT: z.string().transform((v) => parseInt(v, 10)).default("3000"),
+	PORT: z
+		.string()
+		.transform((v) => parseInt(v, 10))
+		.default("3000"),
 	CORS_ORIGINS: z.string().default("http://localhost:5173,http://localhost:4173"),
 	LOG_LEVEL: z.string().default("info"),
 
@@ -13,31 +19,48 @@ const EnvSchema = z.object({
 	// Auth Configuration
 	// ==========================================================================
 	// Master switch: Enable/disable authentication (default: disabled for easy setup)
-  AUTH_ENABLED: z.string().transform((v) => v === "true").default("false"),
+	AUTH_ENABLED: z
+		.string()
+		.transform((v) => v === "true")
+		.default("false"),
 	// Allow new user registrations (auto-enabled if no users exist)
-  REGISTRATION_ENABLED: z.string().transform((v) => v === "true").default("false"),
+	REGISTRATION_ENABLED: z
+		.string()
+		.transform((v) => v === "true")
+		.default("false"),
 	// Disable local auth when using SSO only
 
-  
 	// JWT Secrets - only required when AUTH_ENABLED=true
 	JWT_SECRET: z.string().min(10).optional(),
 	REFRESH_SECRET: z.string().min(10).optional(),
 	COOKIE_SECRET: z.string().min(10).optional(),
 
 	// Token TTL settings
-  ACCESS_TOKEN_TTL_MINUTES: z.string().transform((v) => parseInt(v, 10)).default("15"),
-  REFRESH_TOKEN_TTL_DAYS: z.string().transform((v) => parseInt(v, 10)).default("7"),
+	ACCESS_TOKEN_TTL_MINUTES: z
+		.string()
+		.transform((v) => parseInt(v, 10))
+		.default("15"),
+	REFRESH_TOKEN_TTL_DAYS: z
+		.string()
+		.transform((v) => parseInt(v, 10))
+		.default("7"),
 
 	// ==========================================================================
 	// OIDC SSO Configuration (Pocket ID, Authelia, etc.)
 	// ==========================================================================
-  OIDC_ENABLED: z.string().transform((v) => v === "true").default("false"),
+	OIDC_ENABLED: z
+		.string()
+		.transform((v) => v === "true")
+		.default("false"),
 	OIDC_ISSUER_URL: z.string().url().optional(), // e.g., https://auth.example.com
 	OIDC_CLIENT_ID: z.string().optional(),
 	OIDC_CLIENT_SECRET: z.string().optional(),
 	OIDC_REDIRECT_URI: z.string().url().optional(), // e.g., https://medassist.example.com/api/auth/oidc/callback
 	OIDC_SCOPES: z.string().default("openid profile email"),
-  OIDC_AUTO_CREATE_USERS: z.string().transform((v) => v === "true").default("true"),
+	OIDC_AUTO_CREATE_USERS: z
+		.string()
+		.transform((v) => v === "true")
+		.default("true"),
 	OIDC_USERNAME_CLAIM: z.string().default("preferred_username"), // or 'email', 'sub'
 	OIDC_PROVIDER_NAME: z.string().default("SSO"), // Display name for UI button
 });

backend/src/routes/auth.ts

@@ -1,11 +1,11 @@
-import { FastifyInstance } from "fastify";
-import { z } from "zod";
+import { randomBytes } from "node:crypto";
 import argon2 from "argon2";
-import { randomBytes } from "crypto";
-import { db } from "../db/client.js";
-import { users, refreshTokens } from "../db/schema.js";
 import { eq } from "drizzle-orm";
-import { env } from "../plugins/env.js";
+import type { FastifyInstance } from "fastify";
+import { z } from "zod";
+import { db } from "../db/client.js";
+import { getDataDir } from "../db/db-utils.js";
+import { refreshTokens, users } from "../db/schema.js";
 import { getAuthState, requireAuth } from "../plugins/auth.js";
 import type { AuthUser } from "../types/fastify.js";
 
@@ -51,11 +51,13 @@ const sensitiveRateLimitConfig = {
 // Validation Schemas
 // =============================================================================
 const registerSchema = z.object({
-  username: z.string()
+	username: z
+		.string()
 		.min(3, "Username must be at least 3 characters")
 		.max(50, "Username must be at most 50 characters")
 		.regex(/^[a-zA-Z0-9_-]+$/, "Username can only contain letters, numbers, underscores, and hyphens"),
-  password: z.string()
+	password: z
+		.string()
 		.min(8, "Password must be at least 8 characters")
 		.max(128, "Password must be at most 128 characters"),
 });
@@ -68,7 +70,8 @@ const loginSchema = z.object({
 
 const updateProfileSchema = z.object({
 	currentPassword: z.string().optional(),
-  newPassword: z.string()
+	newPassword: z
+		.string()
 		.min(8, "Password must be at least 8 characters")
 		.max(128, "Password must be at most 128 characters")
 		.optional(),
@@ -84,17 +87,21 @@ export async function authRoutes(app: FastifyInstance) {
 
 	// ---------------------------------------------------------------------------
 	// GET /auth/state - Public auth state (needed before login)
+	// Exempt from rate limit - lightweight state check called frequently
 	// ---------------------------------------------------------------------------
-  app.get("/auth/state", async () => {
+	app.get("/auth/state", { config: { rateLimit: false } }, async () => {
 		return getAuthState();
 	});
 
 	// ---------------------------------------------------------------------------
 	// POST /auth/register - User registration
 	// ---------------------------------------------------------------------------
-  app.post<{ Body: z.infer<typeof registerSchema> }>("/auth/register", {
+	app.post<{ Body: z.infer<typeof registerSchema> }>(
+		"/auth/register",
+		{
 			config: { rateLimit: sensitiveRateLimitConfig },
-  }, async (request, reply) => {
+		},
+		async (request, reply) => {
 			// Check auth state
 			const state = await getAuthState();
 
@@ -115,7 +122,7 @@ export async function authRoutes(app: FastifyInstance) {
 			if (!parsed.success) {
 				return reply.status(400).send({
 					error: parsed.error.errors[0]?.message ?? "Invalid input",
-        code: "VALIDATION_ERROR" 
+					code: "VALIDATION_ERROR",
 				});
 			}
 
@@ -131,11 +138,14 @@ export async function authRoutes(app: FastifyInstance) {
 			const passwordHash = await argon2.hash(password, ARGON2_OPTIONS);
 
 			// Create user
-    const [newUser] = await db.insert(users).values({
+			const [newUser] = await db
+				.insert(users)
+				.values({
 					username,
 					passwordHash,
 					authProvider: "local",
-    }).returning();
+				})
+				.returning();
 
 			app.log.info(`User registered: ${username}`);
 
@@ -147,14 +157,18 @@ export async function authRoutes(app: FastifyInstance) {
 				},
 				message: "Account created",
 			});
-  });
+		}
+	);
 
 	// ---------------------------------------------------------------------------
 	// POST /auth/login - User login
 	// ---------------------------------------------------------------------------
-  app.post<{ Body: z.infer<typeof loginSchema> }>("/auth/login", {
+	app.post<{ Body: z.infer<typeof loginSchema> }>(
+		"/auth/login",
+		{
 			config: { rateLimit: sensitiveRateLimitConfig },
-  }, async (request, reply) => {
+		},
+		async (request, reply) => {
 			const state = await getAuthState();
 
 			if (!state.authEnabled) {
@@ -169,7 +183,7 @@ export async function authRoutes(app: FastifyInstance) {
 			if (!parsed.success) {
 				return reply.status(400).send({
 					error: "Invalid credentials",
-        code: "VALIDATION_ERROR" 
+					code: "VALIDATION_ERROR",
 				});
 			}
 
@@ -204,9 +218,7 @@ export async function authRoutes(app: FastifyInstance) {
 			}
 
 			// Update last login
-    await db.update(users)
-      .set({ lastLoginAt: new Date(), updatedAt: new Date() })
-      .where(eq(users.id, user.id));
+			await db.update(users).set({ lastLoginAt: new Date(), updatedAt: new Date() }).where(eq(users.id, user.id));
 
 			// Generate tokens
 			const accessToken = app.jwt.sign(
@@ -249,14 +261,18 @@ export async function authRoutes(app: FastifyInstance) {
 						avatarUrl: user.avatarUrl,
 					},
 				});
-  });
+		}
+	);
 
 	// ---------------------------------------------------------------------------
 	// POST /auth/refresh - Refresh access token
 	// ---------------------------------------------------------------------------
-  app.post("/auth/refresh", {
+	app.post(
+		"/auth/refresh",
+		{
 			config: { rateLimit: authRateLimitConfig },
-  }, async (request, reply) => {
+		},
+		async (request, reply) => {
 			const refreshTokenCookie = request.cookies.refresh_token;
 			if (!refreshTokenCookie) {
 				return reply.status(401).send({ error: "No refresh token", code: "NO_REFRESH_TOKEN" });
@@ -264,14 +280,12 @@ export async function authRoutes(app: FastifyInstance) {
 
 			try {
 				// Verify refresh token
-      const decoded = app.jwt.verify<{ sub: number; jti: string }>(
-        refreshTokenCookie,
-        { key: app.config.refreshSecret }
-      );
+				const decoded = app.jwt.verify<{ sub: number; jti: string }>(refreshTokenCookie, {
+					key: app.config.refreshSecret,
+				});
 
 				// Check if token exists and is valid
-      const [token] = await db.select().from(refreshTokens)
-        .where(eq(refreshTokens.tokenId, decoded.jti));
+				const [token] = await db.select().from(refreshTokens).where(eq(refreshTokens.tokenId, decoded.jti));
 
 				if (!token || token.revoked || token.expiresAt < new Date()) {
 					return reply.status(401).send({ error: "Invalid refresh token", code: "INVALID_REFRESH_TOKEN" });
@@ -284,7 +298,8 @@ export async function authRoutes(app: FastifyInstance) {
 				}
 
 				// Rotate refresh token (revoke old, create new)
-      await db.update(refreshTokens)
+				await db
+					.update(refreshTokens)
 					.set({ revoked: true, rotatedAt: new Date() })
 					.where(eq(refreshTokens.id, token.id));
 
@@ -312,31 +327,29 @@ export async function authRoutes(app: FastifyInstance) {
 					.setCookie("access_token", newAccessToken, app.config.cookieOptions)
 					.setCookie("refresh_token", newRefreshToken, app.config.refreshCookieOptions)
 					.send({ ok: true });
-
 			} catch {
 				return reply.status(401).send({ error: "Invalid refresh token", code: "INVALID_REFRESH_TOKEN" });
 			}
-  });
+		}
+	);
 
 	// ---------------------------------------------------------------------------
 	// POST /auth/logout - Logout (revoke refresh token)
 	// ---------------------------------------------------------------------------
-  app.post("/auth/logout", {
+	app.post(
+		"/auth/logout",
+		{
 			config: { rateLimit: authRateLimitConfig },
-  }, async (request, reply) => {
+		},
+		async (request, reply) => {
 			const refreshTokenCookie = request.cookies.refresh_token;
 
 			if (refreshTokenCookie) {
 				try {
-        const decoded = app.jwt.verify<{ jti: string }>(
-          refreshTokenCookie,
-          { key: app.config.refreshSecret }
-        );
+					const decoded = app.jwt.verify<{ jti: string }>(refreshTokenCookie, { key: app.config.refreshSecret });
 
 					// Revoke the refresh token
-        await db.update(refreshTokens)
-          .set({ revoked: true })
-          .where(eq(refreshTokens.tokenId, decoded.jti));
+					await db.update(refreshTokens).set({ revoked: true }).where(eq(refreshTokens.tokenId, decoded.jti));
 				} catch {
 					// Invalid token, ignore
 				}
@@ -346,7 +359,8 @@ export async function authRoutes(app: FastifyInstance) {
 				.clearCookie("access_token", app.config.cookieOptions)
 				.clearCookie("refresh_token", app.config.refreshCookieOptions)
 				.send({ ok: true });
-  });
+		}
+	);
 
 	// ---------------------------------------------------------------------------
 	// GET /auth/me - Get current user profile
@@ -375,10 +389,13 @@ export async function authRoutes(app: FastifyInstance) {
 	// ---------------------------------------------------------------------------
 	// PUT /auth/me - Update current user profile
 	// ---------------------------------------------------------------------------
-  app.put<{ Body: z.infer<typeof updateProfileSchema> }>("/auth/me", { 
+	app.put<{ Body: z.infer<typeof updateProfileSchema> }>(
+		"/auth/me",
+		{
 			preHandler: requireAuth,
 			config: { rateLimit: authRateLimitConfig },
-  }, async (request, reply) => {
+		},
+		async (request, reply) => {
 			const authUser = request.user as unknown as AuthUser | null;
 			if (!authUser) {
 				return reply.status(401).send({ error: "Not authenticated" });
@@ -388,7 +405,7 @@ export async function authRoutes(app: FastifyInstance) {
 			if (!parsed.success) {
 				return reply.status(400).send({
 					error: parsed.error.errors[0]?.message ?? "Invalid input",
-        code: "VALIDATION_ERROR" 
+					code: "VALIDATION_ERROR",
 				});
 			}
 
@@ -424,15 +441,19 @@ export async function authRoutes(app: FastifyInstance) {
 			await db.update(users).set(updates).where(eq(users.id, user.id));
 
 			return { ok: true, message: "Profile updated" };
-  });
+		}
+	);
 
 	// ---------------------------------------------------------------------------
 	// POST /auth/avatar - Upload user avatar
 	// ---------------------------------------------------------------------------
-  app.post("/auth/avatar", { 
+	app.post(
+		"/auth/avatar",
+		{
 			preHandler: requireAuth,
 			config: { rateLimit: authRateLimitConfig },
-  }, async (request, reply) => {
+		},
+		async (request, reply) => {
 			const authUser = request.user as unknown as AuthUser | null;
 			if (!authUser) {
 				return reply.status(401).send({ error: "Not authenticated" });
@@ -454,9 +475,9 @@ export async function authRoutes(app: FastifyInstance) {
 			const filename = `avatar_${authUser.id}_${Date.now()}.${ext}`;
 
 			// Save file
-    const fs = await import("fs/promises");
-    const path = await import("path");
-    const imagesDir = path.join(process.cwd(), "data", "images");
+			const fs = await import("node:fs/promises");
+			const path = await import("node:path");
+			const imagesDir = path.join(getDataDir(), "images");
 			await fs.mkdir(imagesDir, { recursive: true });
 
 			const buffer = await data.toBuffer();
@@ -476,15 +497,19 @@ export async function authRoutes(app: FastifyInstance) {
 			await db.update(users).set({ avatarUrl: filename, updatedAt: new Date() }).where(eq(users.id, authUser.id));
 
 			return { ok: true, avatarUrl: filename };
-  });
+		}
+	);
 
 	// ---------------------------------------------------------------------------
 	// DELETE /auth/avatar - Delete user avatar
 	// ---------------------------------------------------------------------------
-  app.delete("/auth/avatar", { 
+	app.delete(
+		"/auth/avatar",
+		{
 			preHandler: requireAuth,
 			config: { rateLimit: authRateLimitConfig },
-  }, async (request, reply) => {
+		},
+		async (request, reply) => {
 			const authUser = request.user as unknown as AuthUser | null;
 			if (!authUser) {
 				return reply.status(401).send({ error: "Not authenticated" });
@@ -496,10 +521,10 @@ export async function authRoutes(app: FastifyInstance) {
 			}
 
 			// Delete file
-    const fs = await import("fs/promises");
-    const path = await import("path");
+			const fs = await import("node:fs/promises");
+			const path = await import("node:path");
 			try {
-      await fs.unlink(path.join(process.cwd(), "data", "images", user.avatarUrl));
+				await fs.unlink(path.join(getDataDir(), "images", user.avatarUrl));
 			} catch {
 				// Ignore if file doesn't exist
 			}
@@ -508,5 +533,46 @@ export async function authRoutes(app: FastifyInstance) {
 			await db.update(users).set({ avatarUrl: null, updatedAt: new Date() }).where(eq(users.id, authUser.id));
 
 			return { ok: true };
-  });
+		}
+	);
+
+	// ---------------------------------------------------------------------------
+	// DELETE /auth/me - Delete user account and all data
+	// ---------------------------------------------------------------------------
+	app.delete(
+		"/auth/me",
+		{
+			preHandler: requireAuth,
+			config: { rateLimit: sensitiveRateLimitConfig },
+		},
+		async (request, reply) => {
+			const authUser = request.user as unknown as AuthUser | null;
+			if (!authUser) {
+				return reply.status(401).send({ error: "Not authenticated" });
+			}
+
+			// Delete avatar file if exists
+			const [user] = await db.select().from(users).where(eq(users.id, authUser.id));
+			if (user?.avatarUrl) {
+				const fs = await import("node:fs/promises");
+				const path = await import("node:path");
+				try {
+					await fs.unlink(path.join(getDataDir(), "images", user.avatarUrl));
+				} catch {
+					// Ignore if file doesn't exist
+				}
+			}
+
+			// Delete user - cascade delete handles all related data
+			await db.delete(users).where(eq(users.id, authUser.id));
+
+			app.log.info(`User deleted account: ${authUser.username} (ID: ${authUser.id})`);
+
+			// Clear auth cookies
+			return reply
+				.clearCookie("access_token", app.config.cookieOptions)
+				.clearCookie("refresh_token", app.config.refreshCookieOptions)
+				.send({ ok: true, message: "Account deleted" });
+		}
+	);
 }

backend/src/routes/doses.ts

@@ -1,9 +1,9 @@
-import { FastifyInstance } from "fastify";
+import { and, eq } from "drizzle-orm";
+import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import { z } from "zod";
 import { db } from "../db/client.js";
 import { doseTracking, shareTokens } from "../db/schema.js";
-import { eq, and } from "drizzle-orm";
-import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
+import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
 
@@ -18,9 +18,13 @@ const shareDoseSchema = z.object({
 	doseId: z.string().min(1, "doseId is required"),
 });
 
+const dismissDosesSchema = z.object({
+	doseIds: z.array(z.string().min(1)).min(1, "At least one doseId is required"),
+});
+
 // Helper to get user ID from request
 // Returns anonymous user ID when auth is disabled
-async function getUserId(request: any, reply: any): Promise<number> {
+async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<number> {
 	// If auth is disabled, use the anonymous user
 	if (!env.AUTH_ENABLED) {
 		return getAnonymousUserId();
@@ -41,26 +45,21 @@ export async function doseRoutes(app: FastifyInstance) {
 	// ---------------------------------------------------------------------------
 	// GET /doses/taken - PROTECTED: Get all taken doses for the user
 	// ---------------------------------------------------------------------------
-  app.get(
-    "/doses/taken",
-    { preHandler: requireAuth },
-    async (request, reply) => {
+	app.get("/doses/taken", { preHandler: requireAuth }, async (request, reply) => {
 		const userId = await getUserId(request, reply);
 
 		// Get all taken doses for this user (no time limit)
-      const doses = await db.select()
-        .from(doseTracking)
-        .where(eq(doseTracking.userId, userId));
+		const doses = await db.select().from(doseTracking).where(eq(doseTracking.userId, userId));
 
 		return {
 			doses: doses.map((d) => ({
 				doseId: d.doseId,
 				takenAt: d.takenAt?.getTime() ?? Date.now(),
 				markedBy: d.markedBy,
+				dismissed: d.dismissed ?? false,
 			})),
 		};
-    }
-  );
+	});
 
 	// ---------------------------------------------------------------------------
 	// POST /doses/taken - PROTECTED: Mark a dose as taken
@@ -81,14 +80,10 @@ export async function doseRoutes(app: FastifyInstance) {
 			const { doseId } = parsed.data;
 
 			// Check if already marked
-      const [existing] = await db.select()
+			const [existing] = await db
+				.select()
 				.from(doseTracking)
-        .where(
-          and(
-            eq(doseTracking.userId, userId),
-            eq(doseTracking.doseId, doseId)
-          )
-        );
+				.where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
 
 			if (existing) {
 				return { success: true, message: "Already marked" };
@@ -116,23 +111,106 @@ export async function doseRoutes(app: FastifyInstance) {
 
 			const { doseId } = request.params;
 
-      await db.delete(doseTracking).where(
-        and(
-          eq(doseTracking.userId, userId),
-          eq(doseTracking.doseId, doseId)
-        )
-      );
+			// Check if this dose was dismissed
+			const [existing] = await db
+				.select()
+				.from(doseTracking)
+				.where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
+
+			if (existing?.dismissed) {
+				// Already dismissed - keep the record as-is
+				// The dose stays dismissed, we just acknowledge the undo request
+			} else {
+				// Not dismissed - delete the record entirely
+				await db.delete(doseTracking).where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
+			}
 
 			return { success: true };
 		}
 	);
 
+	// ---------------------------------------------------------------------------
+	// POST /doses/dismiss - PROTECTED: Dismiss missed doses without deducting stock
+	// ---------------------------------------------------------------------------
+	app.post<{ Body: z.infer<typeof dismissDosesSchema> }>(
+		"/doses/dismiss",
+		{ preHandler: requireAuth },
+		async (request, reply) => {
+			const userId = await getUserId(request, reply);
+
+			const parsed = dismissDosesSchema.safeParse(request.body);
+			if (!parsed.success) {
+				return reply.status(400).send({
+					error: parsed.error.errors[0]?.message ?? "Invalid input",
+				});
+			}
+
+			const { doseIds } = parsed.data;
+
+			// Insert dismissed records for each dose that doesn't exist yet
+			let dismissedCount = 0;
+			for (const doseId of doseIds) {
+				// Check if already exists (taken or dismissed)
+				const [existing] = await db
+					.select()
+					.from(doseTracking)
+					.where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
+
+				if (existing) {
+					// Already exists - update to dismissed if not already
+					if (!existing.dismissed) {
+						await db
+							.update(doseTracking)
+							.set({ dismissed: true })
+							.where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
+						dismissedCount++;
+					}
+				} else {
+					// Create new dismissed record
+					await db.insert(doseTracking).values({
+						userId,
+						doseId,
+						markedBy: null,
+						dismissed: true,
+					});
+					dismissedCount++;
+				}
+			}
+
+			return { success: true, dismissedCount };
+		}
+	);
+
+	// ---------------------------------------------------------------------------
+	// DELETE /doses/dismiss - PROTECTED: Clear all dismissed doses (un-dismiss)
+	// ---------------------------------------------------------------------------
+	app.delete("/doses/dismiss", { preHandler: requireAuth }, async (request, reply) => {
+		const userId = await getUserId(request, reply);
+
+		// Delete all dismissed-only records (not taken ones)
+		// For taken+dismissed, just remove the dismissed flag
+		const dismissed = await db
+			.select()
+			.from(doseTracking)
+			.where(and(eq(doseTracking.userId, userId), eq(doseTracking.dismissed, true)));
+
+		for (const d of dismissed) {
+			if (d.markedBy !== null || d.takenAt) {
+				// This was also marked as taken - just remove dismissed flag
+				await db.update(doseTracking).set({ dismissed: false }).where(eq(doseTracking.id, d.id));
+			} else {
+				// This was only dismissed - delete it
+				await db.delete(doseTracking).where(eq(doseTracking.id, d.id));
+			}
+		}
+
+		return { success: true, clearedCount: dismissed.length };
+	});
+
 	// ---------------------------------------------------------------------------
 	// GET /share/:token/doses - PUBLIC: Get taken doses for a share link
 	// ---------------------------------------------------------------------------
-  app.get<{ Params: { token: string } }>(
-    "/share/:token/doses",
-    async (request, reply) => {
+	app.get<{ Params: { token: string } }>("/share/:token/doses", async (request, reply) => {
 		const { token } = request.params;
 
 		// Find share token
@@ -142,19 +220,17 @@ export async function doseRoutes(app: FastifyInstance) {
 		}
 
 		// Get all taken doses for this user (no time limit)
-      const doses = await db.select()
-        .from(doseTracking)
-        .where(eq(doseTracking.userId, share.userId));
+		const doses = await db.select().from(doseTracking).where(eq(doseTracking.userId, share.userId));
 
 		return {
 			doses: doses.map((d) => ({
 				doseId: d.doseId,
 				takenAt: d.takenAt?.getTime() ?? Date.now(),
 				markedBy: d.markedBy,
+				dismissed: d.dismissed ?? false,
 			})),
 		};
-    }
-  );
+	});
 
 	// ---------------------------------------------------------------------------
 	// POST /share/:token/doses - PUBLIC: Mark a dose as taken via share link
@@ -180,14 +256,10 @@ export async function doseRoutes(app: FastifyInstance) {
 			}
 
 			// Check if already marked
-      const [existing] = await db.select()
+			const [existing] = await db
+				.select()
 				.from(doseTracking)
-        .where(
-          and(
-            eq(doseTracking.userId, share.userId),
-            eq(doseTracking.doseId, doseId)
-          )
-        );
+				.where(and(eq(doseTracking.userId, share.userId), eq(doseTracking.doseId, doseId)));
 
 			if (existing) {
 				return { success: true, message: "Already marked" };
@@ -207,9 +279,7 @@ export async function doseRoutes(app: FastifyInstance) {
 	// ---------------------------------------------------------------------------
 	// DELETE /share/:token/doses/:doseId - PUBLIC: Unmark a dose via share link
 	// ---------------------------------------------------------------------------
-  app.delete<{ Params: { token: string; doseId: string } }>(
-    "/share/:token/doses/:doseId",
-    async (request, reply) => {
+	app.delete<{ Params: { token: string; doseId: string } }>("/share/:token/doses/:doseId", async (request, reply) => {
 		const { token, doseId } = request.params;
 
 		// Find share token
@@ -218,14 +288,19 @@ export async function doseRoutes(app: FastifyInstance) {
 			return reply.notFound("Share link not found");
 		}
 
-      await db.delete(doseTracking).where(
-        and(
-          eq(doseTracking.userId, share.userId),
-          eq(doseTracking.doseId, doseId)
-        )
-      );
+		// Check if this dose was dismissed
+		const [existing] = await db
+			.select()
+			.from(doseTracking)
+			.where(and(eq(doseTracking.userId, share.userId), eq(doseTracking.doseId, doseId)));
+
+		if (existing?.dismissed) {
+			// Already dismissed - keep the record as-is
+		} else {
+			// Not dismissed - delete the record entirely
+			await db.delete(doseTracking).where(and(eq(doseTracking.userId, share.userId), eq(doseTracking.doseId, doseId)));
+		}
 
 		return { success: true };
-    }
-  );
+	});
 }

backend/src/routes/export.ts

@@ -1,16 +1,18 @@
-import { FastifyInstance } from "fastify";
-import { z } from "zod";
-import { randomBytes } from "crypto";
-import { db } from "../db/client.js";
-import { medications, userSettings, doseTracking, shareTokens } from "../db/schema.js";
+import { randomBytes } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { extname, resolve } from "node:path";
 import { eq } from "drizzle-orm";
-import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
+import type { FastifyInstance } from "fastify";
+import { z } from "zod";
+import { db } from "../db/client.js";
+import { getDataDir } from "../db/db-utils.js";
+import { doseTracking, medications, shareTokens, userSettings } 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 { resolve, extname } from "path";
-import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync } from "fs";
+import { parseIntakesJson, parseTakenByJson } from "../utils/scheduler-utils.js";
 
-const IMAGES_DIR = resolve(process.cwd(), "data/images");
+const IMAGES_DIR = resolve(getDataDir(), "images");
 
 // =============================================================================
 // Export Format Version (bump this when format changes)
@@ -26,6 +28,7 @@ const scheduleSchema = z.object({
 	every: z.number().int().min(1),
 	start: z.string(), // ISO datetime string
 	remind: z.boolean().optional().default(false),
+	takenBy: z.string().nullable().optional(), // Per-intake takenBy (new field)
 });
 
 const inventorySchema = z.object({
@@ -33,6 +36,8 @@ const inventorySchema = z.object({
 	blistersPerPack: z.number().int().min(1).default(1),
 	pillsPerBlister: z.number().int().min(1).default(1),
 	looseTablets: z.number().int().min(0).default(0),
+	stockAdjustment: z.number().int().default(0), // Manual stock correction
+	packageType: z.enum(["blister", "bottle"]).default("blister"),
 });
 
 const medicationExportSchema = z.object({
@@ -42,11 +47,13 @@ const medicationExportSchema = z.object({
 	takenBy: z.array(z.string()).default([]),
 	inventory: inventorySchema,
 	pillWeightMg: z.number().int().nullable().optional(),
+	doseUnit: z.enum(["mg", "g", "mcg", "ml", "IU", "units", "drops", "puffs"]).default("mg"),
 	schedules: z.array(scheduleSchema).default([]),
 	expiryDate: z.string().nullable().optional(),
 	notes: z.string().nullable().optional(),
 	intakeRemindersEnabled: z.boolean().default(false),
 	image: z.string().nullable().optional(), // base64 data URL or null
+	lastStockCorrectionAt: z.string().nullable().optional(), // ISO datetime of last stock correction
 });
 
 const doseHistorySchema = z.object({
@@ -55,6 +62,8 @@ const doseHistorySchema = z.object({
 	scheduledTime: z.string(), // ISO datetime
 	takenAt: z.string(), // ISO datetime
 	markedBy: z.string().nullable().optional(),
+	dismissed: z.boolean().default(false),
+	takenByPerson: z.string().nullable().optional(), // Person suffix from dose ID (e.g., "Daniel")
 });
 
 const shareLinkSchema = z.object({
@@ -64,7 +73,8 @@ const shareLinkSchema = z.object({
 	regenerateToken: z.boolean().default(true),
 });
 
-const settingsExportSchema = z.object({
+const settingsExportSchema = z
+	.object({
 		// Email notifications
 		emailEnabled: z.boolean().default(false),
 		notificationEmail: z.string().nullable().optional(),
@@ -89,7 +99,8 @@ const settingsExportSchema = z.object({
 		// UI preferences
 		language: z.string().default("en"),
 		stockCalculationMode: z.enum(["automatic", "manual"]).default("automatic"),
-}).optional();
+	})
+	.optional();
 
 const importDataSchema = z.object({
 	version: z.string(),
@@ -119,37 +130,24 @@ async function getUserId(request: any, reply: any): Promise<number> {
 	return authUser.id;
 }
 
-// Parse takenByJson safely
-function parseTakenByJson(takenByJson: string | null | undefined): string[] {
-  if (!takenByJson) return [];
-  try {
-    const parsed = JSON.parse(takenByJson);
-    return Array.isArray(parsed) ? parsed.filter((s: unknown) => typeof s === "string" && s.trim()) : [];
-  } catch {
-    return [];
-  }
-}
+// Parse intakes from DB format to export format (with per-intake takenBy)
+function parseIntakesForExport(
+	row: typeof medications.$inferSelect
+): Array<{ usage: number; every: number; start: string; remind: boolean; takenBy: string | null }> {
+	// Use the new parseIntakesJson which falls back to legacy format
+	const intakes = parseIntakesJson(
+		row.intakesJson,
+		{ usageJson: row.usageJson, everyJson: row.everyJson, startJson: row.startJson },
+		row.intakeRemindersEnabled ?? false
+	);
 
-// Parse blisters from DB format to export format
-function parseBlistersForExport(row: typeof medications.$inferSelect): Array<{ usage: number; every: number; start: string; remind: boolean }> {
-  try {
-    const usage = JSON.parse(row.usageJson || "[]") as number[];
-    const every = JSON.parse(row.everyJson || "[]") as number[];
-    const start = JSON.parse(row.startJson || "[]") as string[];
-    const len = Math.min(usage.length, every.length, start.length);
-    const schedules: Array<{ usage: number; every: number; start: string; remind: boolean }> = [];
-    for (let i = 0; i < len; i++) {
-      schedules.push({
-        usage: usage[i],
-        every: every[i],
-        start: start[i],
-        remind: row.intakeRemindersEnabled ?? false,
-      });
-    }
-    return schedules;
-  } catch {
-    return [];
-  }
+	return intakes.map((intake) => ({
+		usage: intake.usage,
+		every: intake.every,
+		start: intake.start,
+		remind: intake.intakeRemindersEnabled,
+		takenBy: intake.takenBy, // Per-intake takenBy
+	}));
 }
 
 // Read image file and convert to base64 data URL
@@ -204,8 +202,10 @@ function base64ToImage(base64: string, medicationId: number): string | null {
 }
 
 // Parse dose ID to extract medication ID and timestamp
-// Format: "{medicationId}-{blisterIndex}-{timestampMs}"
-function parseDoseId(doseId: string): { medicationId: number; blisterIndex: number; timestampMs: number } | null {
+// Format: "{medicationId}-{blisterIndex}-{timestampMs}" or "{medicationId}-{blisterIndex}-{timestampMs}-{person}"
+function parseDoseId(
+	doseId: string
+): { medicationId: number; blisterIndex: number; timestampMs: number; person: string | null } | null {
 	const parts = doseId.split("-");
 	if (parts.length < 3) return null;
 
@@ -213,14 +213,18 @@ function parseDoseId(doseId: string): { medicationId: number; blisterIndex: numb
 	const blisterIndex = parseInt(parts[1], 10);
 	const timestampMs = parseInt(parts[2], 10);
 
-  if (isNaN(medicationId) || isNaN(blisterIndex) || isNaN(timestampMs)) return null;
+	if (Number.isNaN(medicationId) || Number.isNaN(blisterIndex) || Number.isNaN(timestampMs)) return null;
 
-  return { medicationId, blisterIndex, timestampMs };
+	// Check if there's a person suffix (4th part onwards, could be multi-part name)
+	const person = parts.length > 3 ? parts.slice(3).join("-") : null;
+
+	return { medicationId, blisterIndex, timestampMs, person };
 }
 
-// Build dose ID from parts
-function buildDoseId(medicationId: number, blisterIndex: number, timestampMs: number): string {
-  return `${medicationId}-${blisterIndex}-${timestampMs}`;
+// Build dose ID from parts (with optional person suffix)
+function buildDoseId(medicationId: number, blisterIndex: number, timestampMs: number, person?: string | null): string {
+	const base = `${medicationId}-${blisterIndex}-${timestampMs}`;
+	return person ? `${base}-${person}` : base;
 }
 
 // =============================================================================
@@ -233,11 +237,10 @@ export async function exportRoutes(app: FastifyInstance) {
 	// ---------------------------------------------------------------------------
 	// GET /export - Export all user data
 	// ---------------------------------------------------------------------------
-  app.get<{ Querystring: { includeSensitive?: string } }>(
-    "/export",
-    async (request, reply) => {
+	app.get<{ Querystring: { includeSensitive?: string; includeImages?: string } }>("/export", async (request, reply) => {
 		const userId = await getUserId(request, reply);
 		const includeSensitive = request.query.includeSensitive === "true";
+		const includeImages = request.query.includeImages !== "false"; // Default to true
 
 		// 1. Load all medications
 		const meds = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
@@ -248,6 +251,21 @@ export async function exportRoutes(app: FastifyInstance) {
 			const exportId = `med-${index + 1}`;
 			medIdToExportId.set(med.id, exportId);
 
+			// Safely convert lastStockCorrectionAt to ISO string
+			let lastStockCorrectionAtIso: string | null = null;
+			if (med.lastStockCorrectionAt) {
+				try {
+					if (med.lastStockCorrectionAt instanceof Date && !Number.isNaN(med.lastStockCorrectionAt.getTime())) {
+						lastStockCorrectionAtIso = med.lastStockCorrectionAt.toISOString();
+					} else if (typeof med.lastStockCorrectionAt === "number" || typeof med.lastStockCorrectionAt === "string") {
+						const d = new Date(med.lastStockCorrectionAt);
+						lastStockCorrectionAtIso = !Number.isNaN(d.getTime()) ? d.toISOString() : null;
+					}
+				} catch {
+					lastStockCorrectionAtIso = null;
+				}
+			}
+
 			return {
 				_exportId: exportId,
 				name: med.name,
@@ -258,39 +276,72 @@ export async function exportRoutes(app: FastifyInstance) {
 					blistersPerPack: med.blistersPerPack ?? 1,
 					pillsPerBlister: med.pillsPerBlister ?? 1,
 					looseTablets: med.looseTablets ?? 0,
+					stockAdjustment: med.stockAdjustment ?? 0,
+					packageType: med.packageType ?? "blister",
 				},
 				pillWeightMg: med.pillWeightMg,
-          schedules: parseBlistersForExport(med),
+				doseUnit: med.doseUnit ?? "mg",
+				schedules: parseIntakesForExport(med),
 				expiryDate: med.expiryDate,
 				notes: med.notes,
 				intakeRemindersEnabled: med.intakeRemindersEnabled ?? false,
-          image: imageToBase64(med.imageUrl),
+				image: includeImages ? imageToBase64(med.imageUrl) : null,
+				lastStockCorrectionAt: lastStockCorrectionAtIso,
 			};
 		});
 
 		// 2. Load all dose tracking entries
 		const doses = await db.select().from(doseTracking).where(eq(doseTracking.userId, userId));
 
-      const exportDoseHistory = doses.map((dose) => {
+		const exportDoseHistory = doses
+			.map((dose) => {
 				const parsed = parseDoseId(dose.doseId);
 				if (!parsed) return null;
 
 				const exportId = medIdToExportId.get(parsed.medicationId);
 				if (!exportId) return null; // Orphaned dose, skip
 
+				// Safely convert takenAt to ISO string
+				let takenAtIso: string;
+				try {
+					if (dose.takenAt instanceof Date && !Number.isNaN(dose.takenAt.getTime())) {
+						takenAtIso = dose.takenAt.toISOString();
+					} else if (typeof dose.takenAt === "number" || typeof dose.takenAt === "string") {
+						const d = new Date(dose.takenAt);
+						takenAtIso = !Number.isNaN(d.getTime()) ? d.toISOString() : new Date().toISOString();
+					} else {
+						takenAtIso = new Date().toISOString();
+					}
+				} catch {
+					takenAtIso = new Date().toISOString();
+				}
+
+				// Safely convert scheduled time
+				let scheduledTimeIso: string;
+				try {
+					const d = new Date(parsed.timestampMs);
+					scheduledTimeIso = !Number.isNaN(d.getTime()) ? d.toISOString() : new Date().toISOString();
+				} catch {
+					scheduledTimeIso = new Date().toISOString();
+				}
+
 				return {
 					medicationRef: exportId,
 					scheduleIndex: parsed.blisterIndex,
-          scheduledTime: new Date(parsed.timestampMs).toISOString(),
-          takenAt: dose.takenAt?.toISOString() ?? new Date().toISOString(),
+					scheduledTime: scheduledTimeIso,
+					takenAt: takenAtIso,
 					markedBy: dose.markedBy,
+					dismissed: dose.dismissed ?? false,
+					takenByPerson: parsed.person,
 				};
-      }).filter((d): d is NonNullable<typeof d> => d !== null);
+			})
+			.filter((d): d is NonNullable<typeof d> => d !== null);
 
 		// 3. Load user settings
 		const [settings] = await db.select().from(userSettings).where(eq(userSettings.userId, userId));
 
-      const exportSettings = settings ? {
+		const exportSettings = settings
+			? {
 					emailEnabled: settings.emailEnabled,
 					notificationEmail: settings.notificationEmail,
 					emailStockReminders: settings.emailStockReminders,
@@ -311,17 +362,35 @@ export async function exportRoutes(app: FastifyInstance) {
 					highStockDays: settings.highStockDays,
 					language: settings.language,
 					stockCalculationMode: settings.stockCalculationMode,
-      } : undefined;
+				}
+			: undefined;
 
 		// 4. Load share links
 		const shares = await db.select().from(shareTokens).where(eq(shareTokens.userId, userId));
 
-      const exportShareLinks = shares.map((share) => ({
+		const exportShareLinks = shares.map((share) => {
+			// Safely convert expiresAt to ISO string
+			let expiresAtIso: string | null = null;
+			if (share.expiresAt) {
+				try {
+					if (share.expiresAt instanceof Date && !Number.isNaN(share.expiresAt.getTime())) {
+						expiresAtIso = share.expiresAt.toISOString();
+					} else if (typeof share.expiresAt === "number" || typeof share.expiresAt === "string") {
+						const d = new Date(share.expiresAt);
+						expiresAtIso = !Number.isNaN(d.getTime()) ? d.toISOString() : null;
+					}
+				} catch {
+					expiresAtIso = null;
+				}
+			}
+
+			return {
 				takenBy: share.takenBy,
 				scheduleDays: share.scheduleDays,
-        expiresAt: share.expiresAt?.toISOString() ?? null,
+				expiresAt: expiresAtIso,
 				regenerateToken: true, // Always regenerate tokens on import for security
-      }));
+			};
+		});
 
 		// Build export object
 		const exportData = {
@@ -340,14 +409,20 @@ export async function exportRoutes(app: FastifyInstance) {
 		reply.header("Content-Disposition", `attachment; filename="${filename}"`);
 
 		return exportData;
-    }
-  );
+	});
 
 	// ---------------------------------------------------------------------------
 	// POST /import - Import user data (replaces all existing data!)
 	// ---------------------------------------------------------------------------
 	app.post(
 		"/import",
+		{
+			config: {
+				// Increase body limit to 50MB to handle exports with base64 images
+				rawBody: true,
+			},
+			bodyLimit: 50 * 1024 * 1024, // 50 MB
+		},
 		async (request, reply) => {
 			const userId = await getUserId(request, reply);
 
@@ -371,7 +446,11 @@ export async function exportRoutes(app: FastifyInstance) {
 				if (med.imageUrl) {
 					const imagePath = resolve(IMAGES_DIR, med.imageUrl);
 					if (existsSync(imagePath)) {
-            try { unlinkSync(imagePath); } catch { /* ignore */ }
+						try {
+							unlinkSync(imagePath);
+						} catch {
+							/* ignore */
+						}
 					}
 				}
 			}
@@ -386,25 +465,43 @@ export async function exportRoutes(app: FastifyInstance) {
 			const exportIdToNewId = new Map<string, number>();
 
 			for (const med of importData.medications) {
-        // Convert schedules back to JSON arrays
+				// Convert schedules to both legacy and new formats
 				const usageJson = JSON.stringify(med.schedules.map((s) => s.usage));
 				const everyJson = JSON.stringify(med.schedules.map((s) => s.every));
 				const startJson = JSON.stringify(med.schedules.map((s) => s.start));
 				const takenByJson = JSON.stringify(med.takenBy);
 
+				// Build intakesJson array (new unified format with per-intake takenBy)
+				const intakesJson = JSON.stringify(
+					med.schedules.map((s) => ({
+						usage: s.usage,
+						every: s.every,
+						start: s.start,
+						takenBy: s.takenBy || null,
+						intakeRemindersEnabled: s.remind ?? false,
+					}))
+				);
+
 				// Check if any schedule has remind enabled
 				const intakeRemindersEnabled = med.schedules.some((s) => s.remind) || med.intakeRemindersEnabled;
 
-        const [inserted] = await db.insert(medications).values({
+				const [inserted] = await db
+					.insert(medications)
+					.values({
 						userId,
 						name: med.name,
 						genericName: med.genericName || null,
 						takenByJson,
+						packageType: med.inventory.packageType ?? "blister",
 						packCount: med.inventory.packCount,
 						blistersPerPack: med.inventory.blistersPerPack,
 						pillsPerBlister: med.inventory.pillsPerBlister,
 						looseTablets: med.inventory.looseTablets,
+						stockAdjustment: med.inventory.stockAdjustment ?? 0,
+						lastStockCorrectionAt: med.lastStockCorrectionAt ? new Date(med.lastStockCorrectionAt) : null,
 						pillWeightMg: med.pillWeightMg || null,
+						doseUnit: med.doseUnit ?? "mg",
+						intakesJson,
 						usageJson,
 						everyJson,
 						startJson,
@@ -412,7 +509,8 @@ export async function exportRoutes(app: FastifyInstance) {
 						notes: med.notes || null,
 						intakeRemindersEnabled,
 						imageUrl: null, // Will be set after image is saved
-        }).returning();
+					})
+					.returning();
 
 				// Save mapping
 				exportIdToNewId.set(med._exportId, inserted.id);
@@ -421,9 +519,7 @@ export async function exportRoutes(app: FastifyInstance) {
 				if (med.image) {
 					const imageUrl = base64ToImage(med.image, inserted.id);
 					if (imageUrl) {
-            await db.update(medications)
-              .set({ imageUrl })
-              .where(eq(medications.id, inserted.id));
+						await db.update(medications).set({ imageUrl }).where(eq(medications.id, inserted.id));
 					}
 				}
 			}
@@ -435,13 +531,15 @@ export async function exportRoutes(app: FastifyInstance) {
 
 				// Convert ISO timestamp back to milliseconds for dose ID
 				const timestampMs = new Date(dose.scheduledTime).getTime();
-        const doseId = buildDoseId(newMedId, dose.scheduleIndex, timestampMs);
+				// Rebuild dose ID with optional person suffix
+				const doseId = buildDoseId(newMedId, dose.scheduleIndex, timestampMs, dose.takenByPerson);
 
 				await db.insert(doseTracking).values({
 					userId,
 					doseId,
 					takenAt: new Date(dose.takenAt),
 					markedBy: dose.markedBy || null,
+					dismissed: dose.dismissed ?? false,
 				});
 			}
 

backend/src/routes/health.ts

@@ -1,8 +1,19 @@
-import { FastifyInstance } from "fastify";
+import { readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import type { FastifyInstance } from "fastify";
+
+// Read version from package.json at startup
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const packageJsonPath = resolve(__dirname, "../../package.json");
+const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+const backendVersion = packageJson.version || "unknown";
 
 export async function healthRoutes(app: FastifyInstance) {
-  app.get("/health", async () => ({
+	// Exempt from rate limit - lightweight health check
+	app.get("/health", { config: { rateLimit: false } }, async () => ({
 		status: "ok",
+		version: backendVersion,
 		smtpConfigured: Boolean(process.env.SMTP_HOST),
 		shoutrrrConfigured: Boolean(process.env.SHOUTRRR_URL),
 	}));

backend/src/routes/medications.ts

@@ -1,67 +1,59 @@
-import { FastifyInstance } from "fastify";
+import { createWriteStream, existsSync, unlinkSync } from "node:fs";
+import { extname, resolve } from "node:path";
+import { pipeline } from "node:stream/promises";
+import { and, eq, like } from "drizzle-orm";
+import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import { z } from "zod";
 import { db } from "../db/client.js";
-import { medications, doseTracking } from "../db/schema.js";
-import { eq, and, like, sql } from "drizzle-orm";
-import { createWriteStream, existsSync, unlinkSync } from "fs";
-import { resolve, extname } from "path";
-import { pipeline } from "stream/promises";
-import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
+import { getDataDir } from "../db/db-utils.js";
+import { doseTracking, medications } 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 { type Intake, parseIntakesJson, parseLocalDateTime, parseTakenByJson } from "../utils/scheduler-utils.js";
 
-const IMAGES_DIR = resolve(process.cwd(), "data/images");
+const IMAGES_DIR = resolve(getDataDir(), "images");
 
+// New intake schema with per-intake takenBy
+const intakeSchema = z.object({
+	usage: z.number().nonnegative(),
+	every: z.number().int().min(1),
+	start: z.string().datetime({ local: true }),
+	takenBy: z.string().trim().max(100).nullable().optional(), // Person for this specific intake
+	intakeRemindersEnabled: z.boolean().default(false), // Per-intake reminder setting
+});
+
+// Legacy blister schema (for backward compatibility during transition)
 const blisterSchema = z.object({
 	usage: z.number().nonnegative(),
 	every: z.number().int().min(1),
-  start: z.string().datetime(),
+	start: z.string().datetime({ local: true }),
 });
 
-const medicationSchema = z.object({
+const packageTypeSchema = z.enum(["blister", "bottle"]).default("blister");
+const doseUnitSchema = z.enum(["mg", "g", "mcg", "ml", "IU", "units", "drops", "puffs"]).default("mg");
+
+const medicationSchema = z
+	.object({
 		name: z.string().trim().min(1).max(100),
 		genericName: z.string().trim().max(100).nullable().optional(),
-  takenBy: z.array(z.string().trim().max(100)).default([]), // Array of person names
+		takenBy: z.array(z.string().trim().max(100)).default([]), // Medication-level takenBy (fallback)
+		packageType: packageTypeSchema,
 		packCount: z.number().int().min(0).default(1),
 		blistersPerPack: z.number().int().min(1).default(1),
 		pillsPerBlister: z.number().int().min(1).default(1),
+		totalPills: z.number().int().min(1).nullable().optional(), // For bottle type: total capacity
 		looseTablets: z.number().int().min(0).default(0),
-  pillWeightMg: z.number().int().min(1).nullable().optional(),
+		pillWeightMg: z.number().nonnegative().nullable().optional(),
+		doseUnit: doseUnitSchema,
 		expiryDate: z.string().nullable().optional(),
 		notes: z.string().max(2000).nullable().optional(),
-  intakeRemindersEnabled: z.boolean().default(false),
-  blisters: z.array(blisterSchema).min(1).max(12),
-});
-
-function zipBlisters(usage: number[], every: number[], start: string[]) {
-  const len = Math.min(usage.length, every.length, start.length);
-  const blisters: Array<{ usage: number; every: number; start: string }> = [];
-  for (let i = 0; i < len; i++) {
-    blisters.push({ usage: usage[i], every: every[i], start: start[i] });
-  }
-  return blisters;
-}
-
-function parseBlisters(row: typeof medications.$inferSelect) {
-  try {
-    const usage = JSON.parse(row.usageJson) as number[];
-    const every = JSON.parse(row.everyJson) as number[];
-    const start = JSON.parse(row.startJson) as string[];
-    return zipBlisters(usage, every, start);
-  } catch (err) {
-    return [];
-  }
-}
-
-function parseTakenByJson(takenByJson: string | null | undefined): string[] {
-  if (!takenByJson) return [];
-  try {
-    const parsed = JSON.parse(takenByJson);
-    return Array.isArray(parsed) ? parsed.filter((s: unknown) => typeof s === "string" && s.trim()) : [];
-  } catch {
-    return [];
-  }
-}
+		intakeRemindersEnabled: z.boolean().default(false), // Medication-level (deprecated, kept for backward compat)
+		// Accept either new intakes format or legacy blisters format
+		intakes: z.array(intakeSchema).min(1).max(12).optional(),
+		blisters: z.array(blisterSchema).min(1).max(12).optional(), // Legacy format
+	})
+	.refine((data) => data.intakes || data.blisters, { message: "Either 'intakes' or 'blisters' must be provided" });
 
 export async function medicationRoutes(app: FastifyInstance) {
 	// All medication routes require auth
@@ -69,7 +61,7 @@ export async function medicationRoutes(app: FastifyInstance) {
 
 	// Helper to get user ID from request
 	// Returns anonymous user ID when auth is disabled
-  async function getUserId(request: any, reply: any): Promise<number> {
+	async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<number> {
 		// If auth is disabled, use the anonymous user
 		if (!env.AUTH_ENABLED) {
 			return getAnonymousUserId();
@@ -87,23 +79,40 @@ export async function medicationRoutes(app: FastifyInstance) {
 	app.get("/medications", async (request, reply) => {
 		const userId = await getUserId(request, reply);
 		const rows = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
-    return rows.map((row) => ({
+		return rows.map((row) => {
+			// Parse intakes from new format, falling back to legacy
+			const intakes = parseIntakesJson(
+				row.intakesJson,
+				{ usageJson: row.usageJson, everyJson: row.everyJson, startJson: row.startJson },
+				row.intakeRemindersEnabled ?? false
+			);
+
+			return {
 				id: row.id,
 				name: row.name,
 				genericName: row.genericName,
 				takenBy: parseTakenByJson(row.takenByJson),
+				packageType: row.packageType ?? "blister",
 				packCount: row.packCount ?? 1,
 				blistersPerPack: row.blistersPerPack ?? 1,
 				pillsPerBlister: row.pillsPerBlister ?? 1,
+				totalPills: row.totalPills ?? null,
 				looseTablets: row.looseTablets ?? 0,
+				stockAdjustment: row.stockAdjustment ?? 0,
+				lastStockCorrectionAt: row.lastStockCorrectionAt?.toISOString() ?? null,
 				pillWeightMg: row.pillWeightMg,
-      blisters: parseBlisters(row),
+				doseUnit: row.doseUnit ?? "mg",
+				intakes, // New unified format with per-intake takenBy
+				// Legacy blisters format (for backward compat with frontend during transition)
+				blisters: intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start })),
 				imageUrl: row.imageUrl,
 				expiryDate: row.expiryDate,
 				notes: row.notes,
 				intakeRemindersEnabled: row.intakeRemindersEnabled ?? false,
+				dismissedUntil: row.dismissedUntil ?? null,
 				updatedAt: row.updatedAt,
-    }));
+			};
+		});
 	});
 
 	app.post("/medications", async (req, reply) => {
@@ -111,10 +120,54 @@ export async function medicationRoutes(app: FastifyInstance) {
 		if (!parsed.success) return reply.status(400).send(parsed.error.format());
 
 		const userId = await getUserId(req, reply);
-    const { name, genericName, takenBy, packCount, blistersPerPack, pillsPerBlister, looseTablets, pillWeightMg, expiryDate, notes, intakeRemindersEnabled, blisters } = parsed.data;
-    const usageJson = JSON.stringify(blisters.map((s) => s.usage));
-    const everyJson = JSON.stringify(blisters.map((s) => s.every));
-    const startJson = JSON.stringify(blisters.map((s) => s.start));
+		const {
+			name,
+			genericName,
+			takenBy,
+			packageType,
+			packCount,
+			blistersPerPack,
+			pillsPerBlister,
+			totalPills,
+			looseTablets,
+			pillWeightMg,
+			doseUnit,
+			expiryDate,
+			notes,
+			intakeRemindersEnabled,
+			intakes: inputIntakes,
+			blisters: inputBlisters,
+		} = parsed.data;
+
+		// Convert to unified intakes format
+		let intakes: Intake[];
+		if (inputIntakes) {
+			// New format with per-intake takenBy
+			intakes = inputIntakes.map((i) => ({
+				usage: i.usage,
+				every: i.every,
+				start: i.start,
+				takenBy: i.takenBy || null,
+				intakeRemindersEnabled: i.intakeRemindersEnabled ?? false,
+			}));
+		} else if (inputBlisters) {
+			// Legacy format - convert to new format
+			intakes = inputBlisters.map((b) => ({
+				usage: b.usage,
+				every: b.every,
+				start: b.start,
+				takenBy: null, // No per-intake takenBy from legacy
+				intakeRemindersEnabled: intakeRemindersEnabled ?? false,
+			}));
+		} else {
+			return reply.status(400).send({ error: "Either 'intakes' or 'blisters' must be provided" });
+		}
+
+		// Store both formats for backward compatibility
+		const intakesJson = JSON.stringify(intakes);
+		const usageJson = JSON.stringify(intakes.map((s) => s.usage));
+		const everyJson = JSON.stringify(intakes.map((s) => s.every));
+		const startJson = JSON.stringify(intakes.map((s) => s.start));
 		const takenByJson = JSON.stringify(takenBy || []);
 
 		const [inserted] = await db
@@ -124,14 +177,18 @@ export async function medicationRoutes(app: FastifyInstance) {
 				name,
 				genericName: genericName || null,
 				takenByJson,
+				packageType: packageType ?? "blister",
 				packCount,
 				blistersPerPack,
 				pillsPerBlister,
+				totalPills: totalPills || null,
 				looseTablets,
 				pillWeightMg: pillWeightMg || null,
+				doseUnit: doseUnit ?? "mg",
 				expiryDate: expiryDate || null,
 				notes: notes || null,
 				intakeRemindersEnabled: intakeRemindersEnabled ?? false,
+				intakesJson,
 				usageJson,
 				everyJson,
 				startJson,
@@ -143,12 +200,18 @@ export async function medicationRoutes(app: FastifyInstance) {
 			name: inserted.name,
 			genericName: inserted.genericName,
 			takenBy: parseTakenByJson(inserted.takenByJson),
+			packageType: inserted.packageType ?? "blister",
 			packCount: inserted.packCount,
 			blistersPerPack: inserted.blistersPerPack,
 			pillsPerBlister: inserted.pillsPerBlister,
+			totalPills: inserted.totalPills ?? null,
 			looseTablets: inserted.looseTablets,
+			stockAdjustment: inserted.stockAdjustment ?? 0,
+			lastStockCorrectionAt: inserted.lastStockCorrectionAt?.toISOString() ?? null,
 			pillWeightMg: inserted.pillWeightMg,
-      blisters,
+			doseUnit: inserted.doseUnit ?? "mg",
+			intakes,
+			blisters: intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start })),
 			imageUrl: inserted.imageUrl,
 			expiryDate: inserted.expiryDate,
 			notes: inserted.notes,
@@ -166,77 +229,238 @@ export async function medicationRoutes(app: FastifyInstance) {
 		const userId = await getUserId(req, reply);
 
 		// Verify ownership
-    const [existing] = await db.select().from(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+		const [existing] = await db
+			.select()
+			.from(medications)
+			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
 		if (!existing) return reply.notFound();
 
-    const { name, genericName, takenBy, packCount, blistersPerPack, pillsPerBlister, looseTablets, pillWeightMg, expiryDate, notes, intakeRemindersEnabled, blisters } = parsed.data;
-    const usageJson = JSON.stringify(blisters.map((s) => s.usage));
-    const everyJson = JSON.stringify(blisters.map((s) => s.every));
-    const startJson = JSON.stringify(blisters.map((s) => s.start));
+		const {
+			name,
+			genericName,
+			takenBy,
+			packageType,
+			packCount,
+			blistersPerPack,
+			pillsPerBlister,
+			totalPills,
+			looseTablets,
+			pillWeightMg,
+			doseUnit,
+			expiryDate,
+			notes,
+			intakeRemindersEnabled,
+			intakes: inputIntakes,
+			blisters: inputBlisters,
+		} = parsed.data;
+
+		// Convert to unified intakes format
+		let intakes: Intake[];
+		if (inputIntakes) {
+			// New format with per-intake takenBy
+			intakes = inputIntakes.map((i) => ({
+				usage: i.usage,
+				every: i.every,
+				start: i.start,
+				takenBy: i.takenBy || null,
+				intakeRemindersEnabled: i.intakeRemindersEnabled ?? false,
+			}));
+		} else if (inputBlisters) {
+			// Legacy format - convert to new format
+			intakes = inputBlisters.map((b) => ({
+				usage: b.usage,
+				every: b.every,
+				start: b.start,
+				takenBy: null, // No per-intake takenBy from legacy
+				intakeRemindersEnabled: intakeRemindersEnabled ?? false,
+			}));
+		} else {
+			return reply.status(400).send({ error: "Either 'intakes' or 'blisters' must be provided" });
+		}
+
+		// Store both formats for backward compatibility
+		const intakesJson = JSON.stringify(intakes);
+		const usageJson = JSON.stringify(intakes.map((s) => s.usage));
+		const everyJson = JSON.stringify(intakes.map((s) => s.every));
+		const startJson = JSON.stringify(intakes.map((s) => s.start));
 		const takenByJson = JSON.stringify(takenBy || []);
 
+		// If stock-defining fields changed, reset stockAdjustment so the new
+		// base stock reflects actual inventory.  This prevents the old
+		// correction offset from skewing the total after an edit.
+		const stockFieldsChanged =
+			existing.packCount !== packCount ||
+			existing.blistersPerPack !== blistersPerPack ||
+			existing.pillsPerBlister !== pillsPerBlister ||
+			(existing.looseTablets ?? 0) !== (looseTablets ?? 0);
+
+		const stockResetFields = stockFieldsChanged ? { stockAdjustment: 0, lastStockCorrectionAt: new Date() } : {};
+
 		const result = await db
 			.update(medications)
 			.set({
 				name,
 				genericName: genericName || null,
 				takenByJson,
+				packageType: packageType ?? "blister",
 				packCount,
 				blistersPerPack,
 				pillsPerBlister,
+				totalPills: totalPills || null,
 				looseTablets,
 				pillWeightMg: pillWeightMg || null,
+				doseUnit: doseUnit ?? "mg",
 				expiryDate: expiryDate || null,
 				notes: notes || null,
 				intakeRemindersEnabled: intakeRemindersEnabled ?? false,
+				intakesJson,
 				usageJson,
 				everyJson,
 				startJson,
 				updatedAt: new Date(),
+				...stockResetFields,
 			})
 			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)))
 			.returning();
 
 		if (!result.length) return reply.notFound();
 
-    // Clean up dose tracking entries that are before the earliest start date
-    // This ensures consistency when the user changes the start date
-    const earliestStart = Math.min(...blisters.map(b => new Date(b.start).getTime()));
-    if (!Number.isNaN(earliestStart)) {
-      // Get all dose tracking entries for this medication and filter out invalid ones
-      const allDoses = await db.select().from(doseTracking)
-        .where(and(
-          eq(doseTracking.userId, userId),
-          like(doseTracking.doseId, `${idNum}-%`)
-        ));
+		// ---------------------------------------------------------------
+		// Migrate dose tracking IDs when intake schedule changes
+		// ---------------------------------------------------------------
+		// Parse old intakes from the existing medication row
+		const oldIntakes = parseIntakesJson(
+			existing.intakesJson,
+			{ usageJson: existing.usageJson, everyJson: existing.everyJson, startJson: existing.startJson },
+			existing.intakeRemindersEnabled
+		);
 
-      // Find doses with timestamps before the earliest start date
-      const dosesToDelete = allDoses.filter(dose => {
+		// Get all dose tracking entries for this medication
+		const allDoses = await db
+			.select()
+			.from(doseTracking)
+			.where(and(eq(doseTracking.userId, userId), like(doseTracking.doseId, `${idNum}-%`)));
+
+		if (allDoses.length > 0) {
+			// Build migration map: for each intake index, map old dateOnlyMs → new dateOnlyMs
+			const now = new Date();
+			const migrationEnd = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+			const MS_PER_DAY = 86_400_000;
+
+			for (let idx = 0; idx < Math.max(oldIntakes.length, intakes.length); idx++) {
+				const oldIntake = oldIntakes[idx];
+				const newIntake = intakes[idx];
+
+				// Skip if this intake index doesn't exist in both old and new
+				if (!oldIntake || !newIntake) continue;
+
+				const oldStart = parseLocalDateTime(oldIntake.start);
+				const newStart = parseLocalDateTime(newIntake.start);
+				const oldEvery = oldIntake.every;
+				const newEvery = newIntake.every;
+
+				// Check if start date or interval changed (time-of-day changes don't matter for dateOnlyMs)
+				const oldStartDateOnly = new Date(oldStart.getFullYear(), oldStart.getMonth(), oldStart.getDate()).getTime();
+				const newStartDateOnly = new Date(newStart.getFullYear(), newStart.getMonth(), newStart.getDate()).getTime();
+
+				if (oldStartDateOnly === newStartDateOnly && oldEvery === newEvery) {
+					continue; // No schedule change that affects dose IDs
+				}
+
+				// Build set of new valid dateOnlyMs values for this intake
+				const newDates = new Set<number>();
+				for (let d = new Date(newStart); d <= migrationEnd; d.setDate(d.getDate() + newEvery)) {
+					newDates.add(new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime());
+				}
+
+				// Build set of old dateOnlyMs values with mapping to nearest new date
+				const oldToNewMap = new Map<number, number>();
+				for (let d = new Date(oldStart); d <= migrationEnd; d.setDate(d.getDate() + oldEvery)) {
+					const oldDateMs = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
+					// Find the closest new date within ±(newEvery/2) days
+					const halfInterval = (newEvery * MS_PER_DAY) / 2;
+					let bestMatch: number | null = null;
+					let bestDist = Infinity;
+					for (const newDateMs of newDates) {
+						const dist = Math.abs(newDateMs - oldDateMs);
+						if (dist < bestDist && dist <= halfInterval) {
+							bestDist = dist;
+							bestMatch = newDateMs;
+						}
+					}
+					if (bestMatch !== null && bestMatch !== oldDateMs) {
+						oldToNewMap.set(oldDateMs, bestMatch);
+						// Remove matched new date to prevent double-mapping
+						newDates.delete(bestMatch);
+					}
+				}
+
+				// Apply migrations to dose tracking entries
+				if (oldToNewMap.size > 0) {
+					const prefix = `${idNum}-${idx}-`;
+					const dosesToMigrate = allDoses.filter((d) => d.doseId.startsWith(prefix));
+
+					for (const dose of dosesToMigrate) {
+						const parts = dose.doseId.split("-");
+						if (parts.length >= 3) {
+							const oldTimestamp = parseInt(parts[2], 10);
+							const newTimestamp = oldToNewMap.get(oldTimestamp);
+							if (newTimestamp !== undefined) {
+								// Replace the timestamp in the dose ID, keeping any person suffix
+								const newDoseId = `${idNum}-${idx}-${newTimestamp}${parts.length > 3 ? `-${parts.slice(3).join("-")}` : ""}`;
+								await db.update(doseTracking).set({ doseId: newDoseId }).where(eq(doseTracking.id, dose.id));
+							}
+						}
+					}
+				}
+			}
+
+			// Also clean up dose tracking entries before the earliest new start date
+			const earliestStartDate = intakes.reduce((min, b) => {
+				const d = parseLocalDateTime(b.start);
+				// Use date-only (midnight) to match dose ID format
+				const dateOnly = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
+				return dateOnly < min ? dateOnly : min;
+			}, Infinity);
+			if (!Number.isNaN(earliestStartDate)) {
+				// Re-fetch after possible migrations
+				const updatedDoses = await db
+					.select()
+					.from(doseTracking)
+					.where(and(eq(doseTracking.userId, userId), like(doseTracking.doseId, `${idNum}-%`)));
+
+				const dosesToDelete = updatedDoses.filter((dose) => {
 					const parts = dose.doseId.split("-");
 					if (parts.length >= 3) {
 						const timestamp = parseInt(parts[2], 10);
-          return !Number.isNaN(timestamp) && timestamp < earliestStart;
+						return !Number.isNaN(timestamp) && timestamp < earliestStartDate;
 					}
 					return false;
 				});
 
-      // Delete invalid doses
 				for (const dose of dosesToDelete) {
 					await db.delete(doseTracking).where(eq(doseTracking.id, dose.id));
 				}
 			}
+		}
 
 		return {
 			id: result[0].id,
 			name: result[0].name,
 			genericName: result[0].genericName,
 			takenBy: parseTakenByJson(result[0].takenByJson),
+			packageType: result[0].packageType ?? "blister",
 			packCount: result[0].packCount,
 			blistersPerPack: result[0].blistersPerPack,
 			pillsPerBlister: result[0].pillsPerBlister,
+			totalPills: result[0].totalPills ?? null,
 			looseTablets: result[0].looseTablets,
+			stockAdjustment: result[0].stockAdjustment ?? 0,
+			lastStockCorrectionAt: result[0].lastStockCorrectionAt?.toISOString() ?? null,
 			pillWeightMg: result[0].pillWeightMg,
-      blisters,
+			doseUnit: result[0].doseUnit ?? "mg",
+			intakes,
+			blisters: intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start })),
 			imageUrl: result[0].imageUrl,
 			expiryDate: result[0].expiryDate,
 			notes: result[0].notes,
@@ -245,6 +469,47 @@ export async function medicationRoutes(app: FastifyInstance) {
 		};
 	});
 
+	// Stock correction endpoint - only updates stockAdjustment, preserves looseTablets
+	// Also sets lastStockCorrectionAt so consumed doses before this point don't count
+	app.patch<{ Params: { id: string }; Body: { stockAdjustment: number } }>(
+		"/medications/:id/stock-adjustment",
+		async (req, reply) => {
+			const idNum = Number(req.params.id);
+			if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
+
+			const userId = await getUserId(req, reply);
+
+			// Verify ownership
+			const [existing] = await db
+				.select()
+				.from(medications)
+				.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+			if (!existing) return reply.notFound();
+
+			const { stockAdjustment } = req.body as { stockAdjustment: number };
+			if (typeof stockAdjustment !== "number") return reply.badRequest("stockAdjustment must be a number");
+
+			const result = await db
+				.update(medications)
+				.set({
+					stockAdjustment,
+					lastStockCorrectionAt: new Date(), // Mark when correction was made
+					updatedAt: new Date(),
+				})
+				.where(and(eq(medications.id, idNum), eq(medications.userId, userId)))
+				.returning();
+
+			if (!result.length) return reply.notFound();
+
+			return {
+				id: result[0].id,
+				stockAdjustment: result[0].stockAdjustment ?? 0,
+				lastStockCorrectionAt: result[0].lastStockCorrectionAt?.toISOString() ?? null,
+				updatedAt: result[0].updatedAt,
+			};
+		}
+	);
+
 	app.delete<{ Params: { id: string } }>("/medications/:id", async (req, reply) => {
 		const idNum = Number(req.params.id);
 		if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
@@ -252,7 +517,10 @@ export async function medicationRoutes(app: FastifyInstance) {
 		const userId = await getUserId(req, reply);
 
 		// Delete associated image if exists (with ownership check)
-    const [existing] = await db.select().from(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+		const [existing] = await db
+			.select()
+			.from(medications)
+			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
 		if (!existing) return reply.notFound();
 
 		if (existing.imageUrl) {
@@ -260,7 +528,10 @@ export async function medicationRoutes(app: FastifyInstance) {
 			if (existsSync(imagePath)) unlinkSync(imagePath);
 		}
 
-    const deleted = await db.delete(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId))).returning();
+		const deleted = await db
+			.delete(medications)
+			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)))
+			.returning();
 		if (!deleted.length) return reply.notFound();
 		return reply.status(204).send();
 	});
@@ -271,7 +542,10 @@ export async function medicationRoutes(app: FastifyInstance) {
 		if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
 
 		const userId = await getUserId(req, reply);
-    const [existing] = await db.select().from(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+		const [existing] = await db
+			.select()
+			.from(medications)
+			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
 		if (!existing) return reply.notFound();
 
 		const data = await req.file();
@@ -294,7 +568,10 @@ export async function medicationRoutes(app: FastifyInstance) {
 			if (existsSync(oldPath)) unlinkSync(oldPath);
 		}
 
-    await db.update(medications).set({ imageUrl: filename, updatedAt: new Date() }).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+		await db
+			.update(medications)
+			.set({ imageUrl: filename, updatedAt: new Date() })
+			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
 
 		return { success: true, imageUrl: filename };
 	});
@@ -305,7 +582,10 @@ export async function medicationRoutes(app: FastifyInstance) {
 		if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
 
 		const userId = await getUserId(req, reply);
-    const [existing] = await db.select().from(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+		const [existing] = await db
+			.select()
+			.from(medications)
+			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
 		if (!existing) return reply.notFound();
 
 		if (existing.imageUrl) {
@@ -313,15 +593,22 @@ export async function medicationRoutes(app: FastifyInstance) {
 			if (existsSync(filepath)) unlinkSync(filepath);
 		}
 
-    await db.update(medications).set({ imageUrl: null, updatedAt: new Date() }).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+		await db
+			.update(medications)
+			.set({ imageUrl: null, updatedAt: new Date() })
+			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
 		return reply.status(204).send();
 	});
 
 	app.post("/medications/usage", async (req, reply) => {
-    const schema = z.object({ startDate: z.string().datetime(), endDate: z.string().datetime() });
+		const schema = z.object({
+			startDate: z.string().datetime(),
+			endDate: z.string().datetime(),
+			includeUntilStart: z.boolean().optional().default(false),
+		});
 		const parsed = schema.safeParse(req.body);
 		if (!parsed.success) return reply.status(400).send(parsed.error.format());
-    const { startDate, endDate } = parsed.data;
+		const { startDate, endDate, includeUntilStart } = parsed.data;
 		const start = new Date(startDate);
 		const end = new Date(endDate);
 		if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime()) || end <= start) {
@@ -330,69 +617,255 @@ export async function medicationRoutes(app: FastifyInstance) {
 
 		const userId = await getUserId(req, reply);
 		const rows = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
+
+		// Get all taken doses for this user to calculate actual consumption
+		const takenDoses = await db
+			.select()
+			.from(doseTracking)
+			.where(and(eq(doseTracking.userId, userId), eq(doseTracking.dismissed, false)));
+
+		// Create a map of medication ID to taken dose count
+		const takenDosesMap = new Map<number, { blisterIdx: number; usage: number }[]>();
+		takenDoses.forEach((dose) => {
+			const parts = dose.doseId.split("-");
+			if (parts.length >= 3) {
+				const medId = parseInt(parts[0], 10);
+				const blisterIdx = parseInt(parts[1], 10);
+				if (!Number.isNaN(medId) && !Number.isNaN(blisterIdx)) {
+					if (!takenDosesMap.has(medId)) {
+						takenDosesMap.set(medId, []);
+					}
+					takenDosesMap.get(medId)!.push({ blisterIdx, usage: 0 }); // usage filled later
+				}
+			}
+		});
+
+		// Use current time as the reference point for "available" stock
 		const now = new Date();
 
 		const payload = rows.map((row) => {
-      const blisters = parseBlisters(row);
-      const usageTotal = calculateUsageInRange(blisters, start, end);
+			// Parse intakes from new format, falling back to legacy
+			const intakes = parseIntakesJson(
+				row.intakesJson,
+				{ usageJson: row.usageJson, everyJson: row.everyJson, startJson: row.startJson },
+				row.intakeRemindersEnabled ?? false
+			);
+			const blisters = intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start }));
 			const pillsPerBlister = row.pillsPerBlister ?? 1;
 			const packCount = row.packCount ?? 1;
 			const blistersPerPack = row.blistersPerPack ?? 1;
 			const looseTablets = row.looseTablets ?? 0;
-      const originalTotalPills = packCount * blistersPerPack * pillsPerBlister + looseTablets;
+			const stockAdjustment = row.stockAdjustment ?? 0;
+			const packageType = row.packageType ?? "blister";
 
-      // Calculate consumption up to now (same logic as frontend)
+			// For bottle type, looseTablets IS the current stock (no blister math)
+			const originalTotalPills =
+				packageType === "bottle"
+					? looseTablets + stockAdjustment
+					: packCount * blistersPerPack * pillsPerBlister + looseTablets + stockAdjustment;
+
+			// Calculate consumption based on ACTUAL taken doses from dose_tracking
+			// This ensures Planner shows the same "current stock" as the Dashboard/Modal
+			// Use the same logic as frontend: generate expected doses and check which are marked
+			const stockCorrectionCutoff = row.lastStockCorrectionAt ? new Date(row.lastStockCorrectionAt).getTime() : 0;
+
+			// Build a Set of taken dose IDs for quick lookup
+			const takenDoseIds = new Set(
+				takenDoses
+					.filter((dose) => {
+						const parts = dose.doseId.split("-");
+						return parts.length >= 3 && parseInt(parts[0], 10) === row.id;
+					})
+					.map((dose) => dose.doseId)
+			);
+
+			// Count consumed pills by generating expected doses and checking if they're taken
 			let consumedUntilNow = 0;
-      blisters.forEach((blister) => {
-        const blisterStart = new Date(blister.start);
-        if (Number.isNaN(blisterStart.getTime()) || blisterStart > now) return;
 			const msPerDay = 86400000;
+
+			blisters.forEach((blister, blisterIdx) => {
+				const blisterStart = parseLocalDateTime(blister.start);
+				if (Number.isNaN(blisterStart.getTime())) return;
+
 				const period = Math.max(1, blister.every) * msPerDay;
-        const occurrences = Math.floor((now.getTime() - blisterStart.getTime()) / period) + 1;
-        consumedUntilNow += occurrences * blister.usage;
+
+				// After a stock correction, start counting from the NEXT scheduled
+				// dose, because the user's pill count already reflects all
+				// consumption up to the correction time.
+				let effectiveStart: number;
+				if (stockCorrectionCutoff > 0 && stockCorrectionCutoff >= blisterStart.getTime()) {
+					effectiveStart = stockCorrectionCutoff + period;
+				} else {
+					effectiveStart = blisterStart.getTime();
+				}
+				if (effectiveStart > now.getTime()) return;
+
+				const occurrences = Math.floor((now.getTime() - effectiveStart) / period) + 1;
+
+				// Get the people for this intake (from intakes array or medication takenBy)
+				const takenByJson = row.takenByJson ? JSON.parse(row.takenByJson) : [];
+				const intake = intakes[blisterIdx];
+				const intakePerson = intake?.takenBy;
+				const peopleForThisIntake: (string | null)[] = intakePerson
+					? [intakePerson]
+					: takenByJson.length > 0
+						? takenByJson
+						: [null];
+
+				// Generate expected dose IDs and check if they're taken
+				for (let i = 0; i < occurrences; i++) {
+					const doseDate = new Date(effectiveStart + i * period);
+					const dateOnlyMs = new Date(doseDate.getFullYear(), doseDate.getMonth(), doseDate.getDate()).getTime();
+					const baseDoseId = `${row.id}-${blisterIdx}-${dateOnlyMs}`;
+
+					// Check if each person has taken this dose
+					for (const person of peopleForThisIntake) {
+						const doseId = person ? `${baseDoseId}-${person}` : baseDoseId;
+						if (takenDoseIds.has(doseId)) {
+							consumedUntilNow += blister.usage;
+						}
+					}
+				}
 			});
 
-      const currentPills = Math.max(0, originalTotalPills - consumedUntilNow);
+			const currentStock = Math.max(0, originalTotalPills - consumedUntilNow);
+
+			// Calculate usage for the planning period
+			// Always use the user-selected start date for the usage calculation.
+			// Using max(now, start) would cause asymmetric counting when now falls
+			// between morning and evening doses on the start day (e.g., morning dose
+			// skipped but evening counted), leading to confusing off-by-one results.
+			// The stock already reflects consumed doses, so no double-counting occurs.
+			// When includeUntilStart is true, calculate from now to end (useful for trip planning)
+			const effectivePlannerStart = includeUntilStart ? now : start;
+			const usageTotal = calculateUsageInRange(blisters, effectivePlannerStart, end);
+
 			const blistersNeeded = pillsPerBlister > 0 ? Math.ceil(usageTotal / pillsPerBlister) : 0;
 
-      // Calculate current stock using realistic consumption order (loose first, then blisters)
-      const consumed = originalTotalPills - currentPills;
-      const looseConsumed = Math.min(consumed, looseTablets);
-      const loosePillsRemaining = looseTablets - looseConsumed;
-      const blisterPillsConsumed = consumed - looseConsumed;
+			// Calculate AVAILABLE = stock AFTER the planned period (currentStock - usageTotal)
+			const availableAfterPeriod = Math.max(0, currentStock - usageTotal);
+
+			let fullBlisters: number;
+			let loosePills: number;
+
+			if (packageType === "bottle") {
+				// Bottle type: no blisters, everything is loose pills
+				fullBlisters = 0;
+				loosePills = availableAfterPeriod;
+			} else {
+				// Blister type: calculate stock breakdown
+				// Consumption order: loose pills first, then from blisters
+				const totalConsumedByEnd = originalTotalPills - availableAfterPeriod;
+				const looseConsumedByEnd = Math.min(totalConsumedByEnd, looseTablets);
+				const loosePillsRemaining = Math.max(0, looseTablets - looseConsumedByEnd);
+				const blisterPillsConsumed = totalConsumedByEnd - looseConsumedByEnd;
 				const originalBlisterPills = originalTotalPills - looseTablets;
 				const blisterPillsRemaining = Math.max(0, originalBlisterPills - blisterPillsConsumed);
 
-      const fullBlisters = pillsPerBlister > 0 ? Math.floor(blisterPillsRemaining / pillsPerBlister) : 0;
+				fullBlisters = pillsPerBlister > 0 ? Math.floor(blisterPillsRemaining / pillsPerBlister) : 0;
 				const openBlisterPills = pillsPerBlister > 0 ? blisterPillsRemaining % pillsPerBlister : 0;
-      const loosePills = loosePillsRemaining + openBlisterPills; // Combine open blister + remaining loose
+				loosePills = loosePillsRemaining + openBlisterPills; // Combine open blister + remaining loose
+			}
 
-      const enough = currentPills >= usageTotal;
+			const enough = currentStock >= usageTotal;
 			return {
 				medicationId: row.id,
 				medicationName: row.name,
-        totalPills: currentPills,
+				totalPills: currentStock,
 				plannerUsage: usageTotal,
 				blisterSize: pillsPerBlister,
 				blistersNeeded,
 				fullBlisters,
 				loosePills,
 				enough,
+				packageType,
 			};
 		});
 
 		return payload;
 	});
+
+	// ---------------------------------------------------------------------------
+	// POST /medications/dismiss-until - Set dismissedUntil date for multiple medications
+	// This is more robust than storing individual dose IDs (which can change with schedule updates)
+	// ---------------------------------------------------------------------------
+	const dismissUntilSchema = z.object({
+		medicationIds: z.array(z.number().int().positive()).min(1),
+		until: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, "Date must be in YYYY-MM-DD format"),
+	});
+
+	app.post<{ Body: z.infer<typeof dismissUntilSchema> }>("/medications/dismiss-until", async (req, reply) => {
+		const parsed = dismissUntilSchema.safeParse(req.body);
+		if (!parsed.success) {
+			return reply.status(400).send({ error: parsed.error.errors[0]?.message ?? "Invalid input" });
+		}
+
+		const userId = await getUserId(req, reply);
+		const { medicationIds, until } = parsed.data;
+
+		// Update dismissedUntil for all specified medications owned by this user
+		let updatedCount = 0;
+		for (const medId of medicationIds) {
+			const result = await db
+				.update(medications)
+				.set({ dismissedUntil: until })
+				.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
+			if (result.rowsAffected > 0) {
+				updatedCount++;
+			}
+		}
+
+		return { success: true, updatedCount };
+	});
+
+	// ---------------------------------------------------------------------------
+	// DELETE /medications/:id/dismiss-until - Clear dismissedUntil for a medication
+	// ---------------------------------------------------------------------------
+	app.delete<{ Params: { id: string } }>("/medications/:id/dismiss-until", async (req, reply) => {
+		const medId = parseInt(req.params.id, 10);
+		if (Number.isNaN(medId)) {
+			return reply.status(400).send({ error: "Invalid medication ID" });
+		}
+
+		const userId = await getUserId(req, reply);
+
+		await db
+			.update(medications)
+			.set({ dismissedUntil: null })
+			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
+
+		return { success: true };
+	});
 }
 
-function calculateUsageInRange(blisters: Array<{ usage: number; every: number; start: string }>, start: Date, end: Date) {
+function calculateUsageInRange(
+	blisters: Array<{ usage: number; every: number; start: string }>,
+	start: Date,
+	end: Date
+) {
 	let total = 0;
+	const msPerDay = 86400000;
 	blisters.forEach((blister) => {
-    const blisterStart = new Date(blister.start);
+		const blisterStart = parseLocalDateTime(blister.start);
 		if (Number.isNaN(blisterStart.getTime())) return;
-    // iterate occurrences from blisterStart up to end
-    for (let dt = new Date(blisterStart); dt < end; dt.setDate(dt.getDate() + blister.every)) {
-      if (dt >= start && dt < end) total += blister.usage;
+
+		const every = Math.max(1, blister.every);
+
+		// Skip ahead to the first occurrence at or after start to avoid
+		// iterating through months/years of past doses
+		const dt = new Date(blisterStart);
+		if (dt < start) {
+			const daysToSkip = Math.floor((start.getTime() - dt.getTime()) / (every * msPerDay));
+			dt.setDate(dt.getDate() + daysToSkip * every);
+			// Fine-tune: advance until we reach or pass start
+			while (dt < start) {
+				dt.setDate(dt.getDate() + every);
+			}
+		}
+
+		// Count occurrences in [start, end)
+		for (; dt < end; dt.setDate(dt.getDate() + every)) {
+			total += blister.usage;
 		}
 	});
 	return Number(total.toFixed(2));

backend/src/routes/oidc.ts

@@ -1,9 +1,9 @@
-import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import { createHash, randomBytes } from "node:crypto";
+import { eq } from "drizzle-orm";
+import type { FastifyInstance, FastifyReply } from "fastify";
 import * as client from "openid-client";
-import { randomBytes, createHash } from "crypto";
 import { db } from "../db/client.js";
-import { users, refreshTokens } from "../db/schema.js";
-import { eq, sql } from "drizzle-orm";
+import { refreshTokens, users } from "../db/schema.js";
 import { env } from "../plugins/env.js";
 
 // =============================================================================
@@ -18,11 +18,7 @@ async function getOIDCConfig(): Promise<client.Configuration> {
 		throw new Error("OIDC not configured");
 	}
 
-  oidcConfig = await client.discovery(
-    new URL(env.OIDC_ISSUER_URL),
-    env.OIDC_CLIENT_ID,
-    env.OIDC_CLIENT_SECRET
-  );
+	oidcConfig = await client.discovery(new URL(env.OIDC_ISSUER_URL), env.OIDC_CLIENT_ID, env.OIDC_CLIENT_SECRET);
 
 	return oidcConfig;
 }
@@ -55,10 +51,10 @@ function getFrontendUrl(): string {
 export async function oidcRoutes(app: FastifyInstance) {
 	if (!env.OIDC_ENABLED) {
 		// Register a disabled route that returns an error
-    app.get("/auth/oidc/login", async (request, reply) => {
+		app.get("/auth/oidc/login", async (_request, reply) => {
 			return reply.status(400).send({ error: "OIDC authentication is not enabled" });
 		});
-    app.get("/auth/oidc/callback", async (request, reply) => {
+		app.get("/auth/oidc/callback", async (_request, reply) => {
 			return reply.status(400).send({ error: "OIDC authentication is not enabled" });
 		});
 		return;
@@ -67,7 +63,7 @@ export async function oidcRoutes(app: FastifyInstance) {
 	// ---------------------------------------------------------------------------
 	// GET /auth/oidc/login - Initiates OIDC flow
 	// ---------------------------------------------------------------------------
-  app.get("/auth/oidc/login", async (request, reply) => {
+	app.get("/auth/oidc/login", async (_request, reply) => {
 		try {
 			const config = await getOIDCConfig();
 
@@ -151,7 +147,11 @@ export async function oidcRoutes(app: FastifyInstance) {
 				const redirectUri = env.OIDC_REDIRECT_URI!;
 
 				// Exchange code for tokens
-        const tokens = await client.authorizationCodeGrant(config, new URL(request.url, `http://${request.headers.host}`), {
+				// Build complete callback URL with query parameters for validation
+				const callbackUrl = new URL(redirectUri);
+				callbackUrl.search = new URLSearchParams(request.query as Record<string, string>).toString();
+
+				const tokens = await client.authorizationCodeGrant(config, callbackUrl, {
 					pkceCodeVerifier: storedVerifier.value,
 					expectedState: state,
 				});
@@ -166,7 +166,8 @@ export async function oidcRoutes(app: FastifyInstance) {
 
 				// Extract username from configured claim
 				const usernameClaim = env.OIDC_USERNAME_CLAIM;
-        let username = (userInfo as any)[usernameClaim] || userInfo.preferred_username || userInfo.email || userInfo.sub;
+				const username =
+					(userInfo as any)[usernameClaim] || userInfo.preferred_username || userInfo.email || userInfo.sub;
 				const oidcSubject = userInfo.sub;
 
 				if (!username || !oidcSubject) {
@@ -179,16 +180,14 @@ export async function oidcRoutes(app: FastifyInstance) {
 				reply.clearCookie("oidc_state", { path: "/" });
 
 				// Find or create user
-        let user = await findOrCreateOIDCUser(username, oidcSubject, reply);
+				const user = await findOrCreateOIDCUser(username, oidcSubject, reply);
 
 				if (!user) {
 					return reply.redirect(`${getFrontendUrl()}/?error=oidc_user_creation_failed`);
 				}
 
 				// Update last login
-        await db.update(users)
-          .set({ lastLoginAt: new Date() })
-          .where(eq(users.id, user.id));
+				await db.update(users).set({ lastLoginAt: new Date() }).where(eq(users.id, user.id));
 
 				// Issue JWT tokens (same as local auth)
 				const accessToken = await generateAccessToken(app, user.id, user.username);
@@ -202,14 +201,15 @@ export async function oidcRoutes(app: FastifyInstance) {
 				});
 
 				// Set cookies (use app's centralized cookie options)
-        console.log(`[OIDC] Setting cookies for user ${user.username}, NODE_ENV=${env.NODE_ENV}, secure=${app.config.cookieOptions.secure}`);
+				request.log.debug(
+					`[OIDC] Setting cookies for user ${user.username}, NODE_ENV=${env.NODE_ENV}, secure=${app.config.cookieOptions.secure}`
+				);
 				setAuthCookies(app, reply, accessToken, refreshToken);
 
 				// Redirect to frontend dashboard
 				// In dev: CORS_ORIGINS contains the frontend URL
 				const frontendUrl = env.CORS_ORIGINS.split(",")[0] || "http://localhost:5173";
 				return reply.redirect(`${frontendUrl}/dashboard`);
-        
 			} catch (err: any) {
 				console.error("[OIDC] Callback error:", err);
 				return reply.redirect(`${getFrontendUrl()}/?error=oidc_callback_failed`);
@@ -224,36 +224,29 @@ export async function oidcRoutes(app: FastifyInstance) {
 async function findOrCreateOIDCUser(
 	username: string,
 	oidcSubject: string,
-  reply: FastifyReply
+	_reply: FastifyReply
 ): Promise<{ id: number; username: string } | null> {
-  
 	// First, try to find user by OIDC subject (most reliable)
-  const [existingBySubject] = await db.select()
-    .from(users)
-    .where(eq(users.oidcSubject, oidcSubject));
+	const [existingBySubject] = await db.select().from(users).where(eq(users.oidcSubject, oidcSubject));
 
 	if (existingBySubject) {
 		return { id: existingBySubject.id, username: existingBySubject.username };
 	}
 
 	// Check if username already exists (potential collision)
-  const [existingByUsername] = await db.select()
-    .from(users)
-    .where(eq(users.username, username));
+	const [existingByUsername] = await db.select().from(users).where(eq(users.username, username));
 
 	if (existingByUsername) {
 		// Username collision! Check if it's a local user without OIDC linked
 		if (existingByUsername.authProvider === "local" && !existingByUsername.oidcSubject) {
 			// Local user exists without SSO - link this OIDC account to existing user
-      await db.update(users)
-        .set({ oidcSubject: oidcSubject })
-        .where(eq(users.id, existingByUsername.id));
-      console.log(`[OIDC] Linked OIDC to existing local user: ${username}`);
+			await db.update(users).set({ oidcSubject: oidcSubject }).where(eq(users.id, existingByUsername.id));
+			// Linked OIDC to existing local user
 			return { id: existingByUsername.id, username: existingByUsername.username };
 		} else if (existingByUsername.oidcSubject && existingByUsername.oidcSubject !== oidcSubject) {
 			// User already has a DIFFERENT OIDC subject - create new user with suffix
 			username = `${username}_sso`;
-      console.log(`[OIDC] Username collision (different OIDC subject), using: ${username}`);
+			// Username collision (different OIDC subject), use suffixed name
 		}
 	}
 
@@ -264,7 +257,8 @@ async function findOrCreateOIDCUser(
 	}
 
 	// Create new OIDC user
-  const [newUser] = await db.insert(users)
+	const [newUser] = await db
+		.insert(users)
 		.values({
 			username,
 			passwordHash: null,
@@ -274,7 +268,7 @@ async function findOrCreateOIDCUser(
 		})
 		.returning({ id: users.id, username: users.username });
 
-  console.log(`[OIDC] Created new user: ${newUser.username} (ID: ${newUser.id})`);
+	// New OIDC user created
 	return newUser;
 }
 
@@ -282,10 +276,7 @@ async function findOrCreateOIDCUser(
 // JWT Token Generation (reused from auth.ts logic)
 // =============================================================================
 async function generateAccessToken(app: FastifyInstance, userId: number, username: string): Promise<string> {
-  return app.jwt.sign(
-    { sub: userId, username },
-    { expiresIn: `${env.ACCESS_TOKEN_TTL_MINUTES}m` }
-  );
+	return app.jwt.sign({ sub: userId, username }, { expiresIn: `${env.ACCESS_TOKEN_TTL_MINUTES}m` });
 }
 
 async function generateRefreshToken(

backend/src/routes/planner.ts

@@ -1,22 +1,29 @@
-import { FastifyInstance } from "fastify";
+import type { FastifyInstance, FastifyRequest } from "fastify";
 import nodemailer from "nodemailer";
-import { updateReminderSentTime, updateUserReminderSentTime } from "../services/reminder-scheduler.js";
-import { loadUserSettings, sendShoutrrrNotification } from "./settings.js";
-import { getDateLocale, getTranslations, t, type Language } from "../i18n/translations.js";
-import type { AuthUser } from "../types/fastify.js";
-import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
+import {
+	getDateLocale,
+	getFooterHtml,
+	getFooterPlain,
+	getTranslations,
+	type Language,
+	t,
+} from "../i18n/translations.js";
+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 { loadUserSettings, sendShoutrrrNotification } from "./settings.js";
 
 // Escape HTML to prevent XSS in email templates
 function escapeHtml(text: string): string {
 	const htmlEscapes: Record<string, string> = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#39;',
+		"&": "&amp;",
+		"<": "&lt;",
+		">": "&gt;",
+		'"': "&quot;",
+		"'": "&#39;",
 	};
-  return text.replace(/[&<>"']/g, char => htmlEscapes[char] || char);
+	return text.replace(/[&<>"']/g, (char) => htmlEscapes[char] || char);
 }
 
 type PlannerRow = {
@@ -29,6 +36,7 @@ type PlannerRow = {
 	fullBlisters: number;
 	loosePills: number;
 	enough: boolean;
+	packageType?: string;
 };
 
 type SendEmailBody = {
@@ -44,6 +52,7 @@ type LowStockItem = {
 	medsLeft: number;
 	daysLeft: number | null;
 	depletionDate: string | null;
+	isCritical?: boolean;
 };
 
 type ReminderEmailBody = {
@@ -57,91 +66,143 @@ export async function plannerRoutes(app: FastifyInstance) {
 	app.addHook("preHandler", requireAuth);
 
 	// Helper to get user ID from request
-  async function getUserId(request: any): Promise<number> {
+	async function getUserId(request: FastifyRequest): Promise<number> {
 		if (!env.AUTH_ENABLED) {
 			return getAnonymousUserId();
 		}
-    const authUser = request.user as AuthUser | null;
+		const authUser = request.user as unknown as AuthUser | null;
 		if (!authUser?.id) {
 			throw new Error("User not authenticated");
 		}
 		return authUser.id;
 	}
 
+	// Demand calculator notification (supports email and push)
 	app.post<{ Body: SendEmailBody }>("/planner/send-email", async (request, reply) => {
 		const { email, from, until, rows, language: bodyLanguage } = request.body;
 
-    if (!email || !rows || rows.length === 0) {
-      return reply.status(400).send({ error: "Missing email or planner data" });
+		if (!rows || rows.length === 0) {
+			return reply.status(400).send({ error: "Missing planner data" });
 		}
 
+		// Load user settings for notification channels
+		const userId = await getUserId(request);
+		const userSettings = await loadUserSettings(userId);
+		const notificationSettings = {
+			emailEnabled: userSettings.emailEnabled,
+			shoutrrrEnabled: userSettings.shoutrrrEnabled,
+			shoutrrrUrl: userSettings.shoutrrrUrl || "",
+		};
+
+		// Get locale from user settings or use the language passed in the body
+		const language: Language = (userSettings.language as Language) || bodyLanguage || "en";
+		const locale = getDateLocale(language);
+		const tr = getTranslations(language);
+		const dc = tr.demandCalculator;
+
+		// Format dates for display - escape to prevent XSS even though toLocaleDateString should be safe
+		const fromDate = escapeHtml(
+			new Date(from).toLocaleDateString(locale, {
+				year: "numeric",
+				month: "long",
+				day: "numeric",
+			})
+		);
+		const untilDate = escapeHtml(
+			new Date(until).toLocaleDateString(locale, {
+				year: "numeric",
+				month: "long",
+				day: "numeric",
+			})
+		);
+
+		const outOfStockCount = rows.filter((r) => !r.enough).length;
+		const summaryText = outOfStockCount > 0 ? t(dc.summaryOutOfStock, { count: outOfStockCount }) : dc.summaryAllOk;
+
+		// Build plain text (shared between email and push)
+		const plainText = `${dc.title}
+${t(dc.description, { from: fromDate, until: untilDate })}
+
+${summaryText}
+
+${rows
+	.map((r) => {
+		const isBottle = r.packageType === "bottle";
+		const usage = `${r.plannerUsage} ${tr.common.pills}`;
+		const needed = isBottle ? "–" : `${r.blistersNeeded} × ${r.blisterSize}`;
+		const loosePills = Math.round((Number(r.loosePills) || 0) * 10) / 10;
+		const available = isBottle
+			? `${loosePills} ${tr.common.pills}`
+			: `${r.fullBlisters} ${tr.common.blisters}${loosePills > 0 ? ` + ${loosePills} ${tr.common.pills}` : ""}`;
+		const status = r.enough ? dc.statusEnough : dc.statusEmpty;
+		return `${r.medicationName}: ${usage}, ${needed}, ${available} - ${status}`;
+	})
+	.join("\n")}
+
+---
+${getFooterPlain(language)}`;
+
+		const results: { email?: boolean; push?: boolean; errors: string[] } = { errors: [] };
+
+		// Send email if enabled
+		if (notificationSettings.emailEnabled && email) {
 			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
-    const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
+			const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
 			const smtpSecure = process.env.SMTP_SECURE === "true";
 			const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
-    if (!smtpHost || !smtpUser) {
-      return reply.status(400).send({ error: "SMTP not configured" });
-    }
-
-    // Get locale from user settings or use the language passed in the body
-    let language: Language = bodyLanguage || "en";
-    const authUser = request.user as unknown as AuthUser | null;
-    if (authUser?.id) {
-      const userSettings = await loadUserSettings(authUser.id);
-      language = userSettings.language;
-    }
-    const locale = getDateLocale(language);
-
-    // Format dates for display
-    const fromDate = new Date(from).toLocaleDateString(locale, {
-      year: "numeric",
-      month: "long",
-      day: "numeric",
-    });
-    const untilDate = new Date(until).toLocaleDateString(locale, {
-      year: "numeric",
-      month: "long",
-      day: "numeric",
-    });
-
+			if (smtpHost && smtpUser) {
 				// Build HTML table with horizontal scroll for mobile
+				// Escape/coerce all user-provided values to prevent XSS
 				const tableRows = rows
-      .map(
-        (row) => `
+					.map((row) => {
+						const safeName = escapeHtml(row.medicationName);
+						const safePlannerUsage = Number(row.plannerUsage) || 0;
+						const safeBlistersNeeded = Number(row.blistersNeeded) || 0;
+						const safeBlisterSize = Number(row.blisterSize) || 0;
+						const safeFullBlisters = Number(row.fullBlisters) || 0;
+						const safeLoosePills = Math.round((Number(row.loosePills) || 0) * 10) / 10;
+						const isBottle = row.packageType === "bottle";
+
+						// "Blisters needed" column: dash for bottles
+						const neededCell = isBottle ? "–" : `${safeBlistersNeeded} × ${safeBlisterSize}`;
+
+						// "Available" column: match frontend format
+						let availableCell: string;
+						if (isBottle) {
+							availableCell = `${safeLoosePills} ${tr.common.pills}`;
+						} else {
+							availableCell = `${safeFullBlisters} ${tr.common.blisters}`;
+							if (safeLoosePills > 0) {
+								availableCell += ` + ${safeLoosePills} ${tr.common.pills}`;
+							}
+						}
+
+						return `
         <tr>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${escapeHtml(row.medicationName)}</td>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;"><strong>${row.totalPills}</strong></td>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;"><strong>${row.plannerUsage}</strong></td>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.blistersNeeded} × ${row.blisterSize}</td>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.fullBlisters}${row.loosePills > 0 ? ` (+${row.loosePills})` : ""}</td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${safeName}</td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;"><strong>${safePlannerUsage}</strong> ${tr.common.pills}</td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${neededCell}</td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${availableCell}</td>
           <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">
             <span style="display: inline-block; padding: 4px 10px; border-radius: 12px; font-size: 12px; font-weight: 600; ${
-              row.enough
-                ? "background: #d1fae5; color: #065f46;"
-                : "background: #fee2e2; color: #991b1b;"
+							row.enough ? "background: #d1fae5; color: #065f46;" : "background: #fee2e2; color: #991b1b;"
 						}">
-              ${row.enough ? "✓ OK" : "✗ Out of Stock"}
+              ${row.enough ? dc.statusEnough : dc.statusEmpty}
             </span>
           </td>
         </tr>
-      `
-      )
+      `;
+					})
 					.join("");
 
-    const outOfStockCount = rows.filter((r) => !r.enough).length;
-    const summaryText =
-      outOfStockCount > 0
-        ? `⚠️ ${outOfStockCount} medication${outOfStockCount > 1 ? "s" : ""} will be out of stock during this period.`
-        : "✓ All medications have sufficient supply for this period.";
-
 				const html = `
       <div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
         <div style="background: white; border-radius: 12px; padding: 16px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
-          <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">MedAssist-ng - Demand Calculator</h2>
-          <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">Supply overview from <strong>${fromDate}</strong> to <strong>${untilDate}</strong></p>
+          <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${dc.title}</h2>
+          <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">${t(dc.description, { from: `<strong>${fromDate}</strong>`, until: `<strong>${untilDate}</strong>` })}</p>
           
           <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; ${
 						outOfStockCount > 0
@@ -157,12 +218,11 @@ export async function plannerRoutes(app: FastifyInstance) {
             <table style="width: 100%; border-collapse: collapse; background: white; min-width: 550px;">
               <thead>
                 <tr style="background: #f3f4f6;">
-                  <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Medication</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Stock</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Usage</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Needed</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Available</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Status</th>
+                  <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.medication}</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.usage}</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.needed}</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.available}</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.status}</th>
                 </tr>
               </thead>
               <tbody>
@@ -172,21 +232,11 @@ export async function plannerRoutes(app: FastifyInstance) {
           </div>
 
           <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
-          <p style="color: #9ca3af; font-size: 11px; margin: 0;">Sent from MedAssist-ng Medication Planner</p>
+          <p style="color: #9ca3af; font-size: 11px; margin: 0;">${getFooterHtml(language)}</p>
         </div>
       </div>
     `;
 
-    const plainText = `MedAssist-ng - Demand Calculator
-Supply overview from ${fromDate} to ${untilDate}
-
-${summaryText}
-
-${rows.map((r) => `${r.medicationName}: ${r.totalPills} pills in stock, ${r.plannerUsage} pills needed, ${r.fullBlisters} blisters available${r.loosePills > 0 ? ` (+${r.loosePills} loose)` : ""} (${r.blistersNeeded} needed) - ${r.enough ? "Enough" : "OUT OF STOCK"}`).join("\n")}
-
----
-Sent from MedAssist-ng Medication Planner`;
-
 				try {
 					const transporter = nodemailer.createTransport({
 						host: smtpHost,
@@ -201,21 +251,63 @@ Sent from MedAssist-ng Medication Planner`;
 					await transporter.sendMail({
 						from: smtpFrom,
 						to: email,
-        subject: `MedAssist-ng - Supply Overview (${fromDate} - ${untilDate})`,
+						subject: t(dc.subject, { from: fromDate, until: untilDate }),
 						text: plainText,
 						html,
 					});
 
-      return reply.send({ success: true, message: "Email sent successfully" });
+					results.email = true;
 				} catch (error) {
 					const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      return reply.status(500).send({ error: `Failed to send email: ${errorMessage}` });
+					results.errors.push(`Email: ${errorMessage}`);
+				}
+			}
+		}
+
+		// Send push notification if enabled
+		if (notificationSettings.shoutrrrEnabled && notificationSettings.shoutrrrUrl) {
+			const pushTitle = t(dc.subject, { from: fromDate, until: untilDate });
+			const pushMessage = `${summaryText}\n\n${rows
+				.map((r) => {
+					const usage = `${r.plannerUsage} ${tr.common.pills}`;
+					const status = r.enough ? dc.statusEnough : dc.statusEmpty;
+					return `${r.enough ? "✓" : "✗"} ${r.medicationName}: ${usage} - ${status}`;
+				})
+				.join("\n")}\n\n---\n${getFooterPlain(language)}`;
+
+			try {
+				const pushResult = await sendShoutrrrNotification(notificationSettings.shoutrrrUrl, pushTitle, pushMessage);
+				if (pushResult.success) {
+					results.push = true;
+				} else {
+					results.errors.push(`Push: ${pushResult.error}`);
+				}
+			} catch (error) {
+				const errorMessage = error instanceof Error ? error.message : "Unknown error";
+				results.errors.push(`Push: ${errorMessage}`);
+			}
+		}
+
+		// Build response message
+		const sentChannels: string[] = [];
+		if (results.email) sentChannels.push("email");
+		if (results.push) sentChannels.push("push");
+
+		if (sentChannels.length > 0) {
+			return reply.send({
+				success: true,
+				message: `Notification sent via ${sentChannels.join(" and ")}`,
+			});
+		} else if (results.errors.length > 0) {
+			return reply.status(500).send({ error: results.errors.join("; ") });
+		} else {
+			return reply.status(400).send({ error: "No notification channels configured" });
 		}
 	});
 
 	// Reminder notification for low stock medications (supports email and push)
 	app.post<{ Body: ReminderEmailBody }>("/reminder/send-email", async (request, reply) => {
-    const { email, lowStock, language: bodyLanguage } = request.body;
+		const { email, lowStock } = request.body;
 
 		if (!lowStock || lowStock.length === 0) {
 			return reply.status(400).send({ error: "Missing low stock data" });
@@ -230,92 +322,149 @@ Sent from MedAssist-ng Medication Planner`;
 			shoutrrrUrl: userSettings.shoutrrrUrl || "",
 		};
 
+		// Get translations based on user language
+		const language = (userSettings.language as Language) || "en";
+		const tr = getTranslations(language);
+
 		const results: { email?: boolean; push?: boolean; errors: string[] } = { errors: [] };
 
-    // Separate empty from low stock medications
-    const emptyMeds = lowStock.filter(r => r.medsLeft <= 0);
-    const lowMeds = lowStock.filter(r => r.medsLeft > 0);
+		// Separate into 3 categories: empty, critical, and low stock
+		const emptyMeds = lowStock.filter((r) => r.medsLeft <= 0);
+		const criticalMeds = lowStock.filter((r) => r.medsLeft > 0 && r.isCritical !== false);
+		const lowStockMeds = lowStock.filter((r) => r.medsLeft > 0 && r.isCritical === false);
+
+		// Build shared notification content (method-agnostic)
+		const titleParts: string[] = [];
+		if (emptyMeds.length > 0) {
+			titleParts.push(`🚨 ${emptyMeds.length} ${tr.push.empty}`);
+		}
+		if (criticalMeds.length > 0) {
+			titleParts.push(`🚨 ${criticalMeds.length} ${tr.push.critical}`);
+		}
+		if (lowStockMeds.length > 0) {
+			titleParts.push(`⚠️ ${lowStockMeds.length} ${tr.push.lowStock}`);
+		}
+		const notificationTitle = `MedAssist: ${titleParts.join(", ")} - ${tr.push.reorderNow}`;
+
+		// Build description text
+		let descriptionText: string;
+		if (emptyMeds.length > 0 && (criticalMeds.length > 0 || lowStockMeds.length > 0)) {
+			descriptionText = tr.stockReminder.descriptionMixed;
+		} else if (emptyMeds.length > 0) {
+			descriptionText = tr.stockReminder.descriptionEmpty;
+		} else if (criticalMeds.length > 0) {
+			descriptionText = tr.stockReminder.description;
+		} else {
+			descriptionText = tr.stockReminder.descriptionLow;
+		}
+
+		// Build section-based message (shared between email plain text and push)
+		const messageParts: string[] = [];
+		if (emptyMeds.length > 0) {
+			messageParts.push(`🚨 ${tr.push.emptySection}:`);
+			emptyMeds.forEach((r) => messageParts.push(`  • ${r.name}`));
+		}
+		if (criticalMeds.length > 0) {
+			if (messageParts.length > 0) messageParts.push("");
+			messageParts.push(`🚨 ${tr.push.criticalSection}:`);
+			criticalMeds.forEach((r) =>
+				messageParts.push(
+					`  • ${r.name}: ${t(tr.push.pillsLeft, { count: r.medsLeft })}, ${t(tr.push.daysLeft, { count: r.daysLeft ?? 0 })}`
+				)
+			);
+		}
+		if (lowStockMeds.length > 0) {
+			if (messageParts.length > 0) messageParts.push("");
+			messageParts.push(`⚠️ ${tr.push.lowStockSection}:`);
+			lowStockMeds.forEach((r) =>
+				messageParts.push(
+					`  • ${r.name}: ${t(tr.push.pillsLeft, { count: r.medsLeft })}, ${t(tr.push.daysLeft, { count: r.daysLeft ?? 0 })}`
+				)
+			);
+		}
 
 		// Send email if enabled
 		if (notificationSettings.emailEnabled && email) {
 			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
-      const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
+			const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
 			const smtpSecure = process.env.SMTP_SECURE === "true";
 			const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
 			if (smtpHost && smtpUser) {
-        // Build subject line based on what we have
-        let subjectText: string;
-        if (emptyMeds.length > 0 && lowMeds.length > 0) {
-          subjectText = `🚨 ${emptyMeds.length} Empty, ⚠️ ${lowMeds.length} Running Low`;
-        } else if (emptyMeds.length > 0) {
-          subjectText = `🚨 ${emptyMeds.length} Medication${emptyMeds.length > 1 ? "s" : ""} Empty`;
-        } else {
-          subjectText = `⚠️ ${lowMeds.length} Medication${lowMeds.length > 1 ? "s" : ""} Running Low`;
-        }
+				// Build subject line from shared title parts
+				const subjectText = titleParts.join(", ");
 
-        // Build alert box based on what we have
-        let alertHtml: string;
-        if (emptyMeds.length > 0 && lowMeds.length > 0) {
-          alertHtml = `
+				// Build alert boxes for each category
+				const alertParts: string[] = [];
+
+				if (emptyMeds.length > 0) {
+					const emptyAlert =
+						emptyMeds.length === 1
+							? tr.stockReminder.alertEmptySingle
+							: t(tr.stockReminder.alertEmptyMultiple, { count: emptyMeds.length });
+					alertParts.push(`
             <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fef2f2; border: 1px solid #dc2626;">
               <p style="margin: 0; color: #dc2626; font-weight: 600; font-size: 13px;">
-                🚨 ${emptyMeds.length} medication${emptyMeds.length > 1 ? "s" : ""} EMPTY - reorder immediately!
+                ${emptyAlert}
               </p>
-            </div>
-            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; background: #fffbeb; border: 1px solid #f59e0b;">
-              <p style="margin: 0; color: #b45309; font-weight: 500; font-size: 13px;">
-                ⚠️ ${lowMeds.length} medication${lowMeds.length > 1 ? "s" : ""} running low - reorder soon
-              </p>
-            </div>`;
-        } else if (emptyMeds.length > 0) {
-          alertHtml = `
-            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; background: #fef2f2; border: 1px solid #dc2626;">
-              <p style="margin: 0; color: #dc2626; font-weight: 600; font-size: 13px;">
-                🚨 ${emptyMeds.length} medication${emptyMeds.length > 1 ? "s" : ""} EMPTY - reorder immediately!
-              </p>
-            </div>`;
-        } else {
-          alertHtml = `
-            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; background: #fffbeb; border: 1px solid #f59e0b;">
-              <p style="margin: 0; color: #b45309; font-weight: 500; font-size: 13px;">
-                ⚠️ ${lowMeds.length} medication${lowMeds.length > 1 ? "s" : ""} running low - reorder soon
-              </p>
-            </div>`;
+            </div>`);
 				}
 
+				if (criticalMeds.length > 0) {
+					const criticalAlert =
+						criticalMeds.length === 1
+							? tr.stockReminder.alertLowSingle
+							: t(tr.stockReminder.alertLowMultiple, { count: criticalMeds.length });
+					alertParts.push(`
+            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fff7ed; border: 1px solid #ea580c;">
+              <p style="margin: 0; color: #c2410c; font-weight: 600; font-size: 13px;">
+                ${criticalAlert}
+              </p>
+            </div>`);
+				}
+
+				if (lowStockMeds.length > 0) {
+					const lowAlert =
+						lowStockMeds.length === 1
+							? tr.stockReminder.alertLowStockSingle
+							: t(tr.stockReminder.alertLowStockMultiple, { count: lowStockMeds.length });
+					alertParts.push(`
+            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fffbeb; border: 1px solid #f59e0b;">
+              <p style="margin: 0; color: #b45309; font-weight: 500; font-size: 13px;">
+                ${lowAlert}
+              </p>
+            </div>`);
+				}
+
+				const alertHtml = alertParts.join("");
+
 				// Build table rows with status indicator
 				const buildTableRow = (row: LowStockItem) => {
 					const isEmpty = row.medsLeft <= 0;
-          const statusIcon = isEmpty ? "🚨" : "⚠️";
-          const rowBg = isEmpty ? "#fef2f2" : "white";
+					const isCritical = row.isCritical !== false;
+					const statusIcon = isEmpty ? "🚨" : isCritical ? "🚨" : "⚠️";
+					const rowBg = isEmpty ? "#fef2f2" : isCritical ? "#fff7ed" : "white";
+					const safeName = escapeHtml(row.name);
+					const safeMedsLeft = Number(row.medsLeft) || 0;
+					const safeDaysLeft = Number(row.daysLeft) || 0;
+					const safeDepletionDate = row.depletionDate ? escapeHtml(String(row.depletionDate)) : "-";
 					return `
           <tr style="background: ${rowBg};">
-            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${statusIcon} ${escapeHtml(row.name)}</td>
-            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap; ${isEmpty ? "color: #dc2626; font-weight: 600;" : ""}"><strong>${row.medsLeft}</strong></td>
-            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.daysLeft ?? 0}</td>
-            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${isEmpty ? "<strong>NOW</strong>" : (row.depletionDate ?? "-")}</td>
+            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${statusIcon} ${safeName}</td>
+            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap; ${isEmpty ? "color: #dc2626; font-weight: 600;" : ""}"><strong>${safeMedsLeft}</strong></td>
+            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${safeDaysLeft}</td>
+            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${isEmpty ? `<strong>${tr.stockReminder.now}</strong>` : safeDepletionDate}</td>
           </tr>`;
 				};
 
 				const tableRows = lowStock.map(buildTableRow).join("");
 
-        // Build description text
-        let descriptionText: string;
-        if (emptyMeds.length > 0 && lowMeds.length > 0) {
-          descriptionText = "The following medications need to be reordered:";
-        } else if (emptyMeds.length > 0) {
-          descriptionText = "The following medications are EMPTY and need to be reordered immediately:";
-        } else {
-          descriptionText = "The following medications are running low and need to be reordered:";
-        }
-
 				const html = `
           <div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
             <div style="background: white; border-radius: 12px; padding: 16px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
-              <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${emptyMeds.length > 0 ? "🚨" : "⚠️"} MedAssist-ng - Reorder Reminder</h2>
+              <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${emptyMeds.length > 0 ? "🚨" : "⚠️"} MedAssist-ng - ${tr.push.reorderNow}</h2>
               <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">${descriptionText}</p>
               
               ${alertHtml}
@@ -324,10 +473,10 @@ Sent from MedAssist-ng Medication Planner`;
                 <table style="width: 100%; border-collapse: collapse; background: white; min-width: 400px;">
                   <thead>
                     <tr style="background: #f3f4f6;">
-                      <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">Medication</th>
-                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">Pills</th>
-                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">Days</th>
-                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">Runs Out</th>
+                      <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.stockReminder.tableHeaders.medication}</th>
+                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.stockReminder.tableHeaders.pills}</th>
+                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.stockReminder.tableHeaders.days}</th>
+                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.stockReminder.tableHeaders.runsOut}</th>
                     </tr>
                   </thead>
                   <tbody>
@@ -337,33 +486,12 @@ Sent from MedAssist-ng Medication Planner`;
               </div>
 
               <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
-              <p style="color: #9ca3af; font-size: 11px; margin: 0;">Sent from MedAssist-ng Medication Planner</p>
+              <p style="color: #9ca3af; font-size: 11px; margin: 0;">${getFooterHtml(language)}</p>
             </div>
           </div>
         `;
 
-        // Build plain text with sections
-        let plainTextContent: string;
-        if (emptyMeds.length > 0 && lowMeds.length > 0) {
-          plainTextContent = `🚨 EMPTY (reorder immediately):
-${emptyMeds.map((r) => `  • ${r.name}`).join("\n")}
-
-⚠️ RUNNING LOW (reorder soon):
-${lowMeds.map((r) => `  • ${r.name}: ${r.medsLeft} pills left, ${r.daysLeft ?? 0} days remaining`).join("\n")}`;
-        } else if (emptyMeds.length > 0) {
-          plainTextContent = `🚨 EMPTY (reorder immediately):
-${emptyMeds.map((r) => `  • ${r.name}`).join("\n")}`;
-        } else {
-          plainTextContent = `⚠️ Running low:
-${lowMeds.map((r) => `  • ${r.name}: ${r.medsLeft} pills left, ${r.daysLeft ?? 0} days remaining, runs out ${r.depletionDate ?? "soon"}`).join("\n")}`;
-        }
-
-        const plainText = `MedAssist-ng - Reorder Reminder
-
-${plainTextContent}
-
----
-Sent from MedAssist-ng Medication Planner`;
+				const plainText = `MedAssist-ng - ${tr.push.reorderNow}\n\n${messageParts.join("\n")}\n\n---\n${getFooterPlain(language)}`;
 
 				try {
 					const transporter = nodemailer.createTransport({
@@ -394,34 +522,10 @@ Sent from MedAssist-ng Medication Planner`;
 
 		// Send push notification if enabled
 		if (notificationSettings.shoutrrrEnabled && notificationSettings.shoutrrrUrl) {
-      // Get translations based on user language (default to 'en')
-      const tr = getTranslations((userSettings.language as Language) || "en");
-      
-      // Build clear title
-      const titleParts: string[] = [];
-      if (emptyMeds.length > 0) {
-        titleParts.push(`🚨 ${emptyMeds.length} ${tr.push.empty}`);
-      }
-      if (lowMeds.length > 0) {
-        titleParts.push(`⚠️ ${lowMeds.length} ${tr.push.low}`);
-      }
-      const title = `MedAssist: ${titleParts.join(", ")} - ${tr.push.reorderNow}`;
-      
-      // Build clear message with sections
-      const messageParts: string[] = [];
-      if (emptyMeds.length > 0) {
-        messageParts.push(`🚨 ${tr.push.emptySection}:`);
-        emptyMeds.forEach(r => messageParts.push(`  • ${r.name}`));
-      }
-      if (lowMeds.length > 0) {
-        if (emptyMeds.length > 0) messageParts.push("");
-        messageParts.push(`⚠️ ${tr.push.lowSection}:`);
-        lowMeds.forEach(r => messageParts.push(`  • ${r.name}: ${t(tr.push.pillsLeft, { count: r.medsLeft })}, ${t(tr.push.daysLeft, { count: r.daysLeft ?? 0 })}`));
-      }
-      const message = messageParts.join("\n");
+			const message = messageParts.join("\n") + `\n\n---\n${getFooterPlain(language)}`;
 
 			try {
-        const pushResult = await sendShoutrrrNotification(notificationSettings.shoutrrrUrl, title, message);
+				const pushResult = await sendShoutrrrNotification(notificationSettings.shoutrrrUrl, notificationTitle, message);
 				if (pushResult.success) {
 					results.push = true;
 				} else {
@@ -439,7 +543,9 @@ Sent from MedAssist-ng Medication Planner`;
 			updateReminderSentTime("stock", channel);
 
 			// Also update user settings in database so frontend can display the info
-      await updateUserReminderSentTime(userId, "stock", channel);
+			const firstMed = lowStock[0];
+			const medNames = lowStock.length > 1 ? `${firstMed.name} (+${lowStock.length - 1})` : firstMed?.name;
+			await updateUserReminderSentTime(userId, "stock", channel, medNames);
 		}
 
 		// Build response message
@@ -450,7 +556,7 @@ Sent from MedAssist-ng Medication Planner`;
 		if (sentChannels.length > 0) {
 			return reply.send({
 				success: true,
-        message: `Reminder sent via ${sentChannels.join(" and ")}` 
+				message: `Reminder sent via ${sentChannels.join(" and ")}`,
 			});
 		} else if (results.errors.length > 0) {
 			return reply.status(500).send({ error: results.errors.join("; ") });

backend/src/routes/refills.ts

@@ -0,0 +1,138 @@
+import { and, desc, eq } from "drizzle-orm";
+import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import { z } from "zod";
+import { db } from "../db/client.js";
+import { medications, refillHistory } from "../db/schema.js";
+import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
+import { env } from "../plugins/env.js";
+import type { AuthUser } from "../types/fastify.js";
+
+const refillSchema = z
+	.object({
+		packsAdded: z.number().int().min(0).default(0),
+		loosePillsAdded: z.number().int().min(0).default(0),
+	})
+	.refine((data) => data.packsAdded > 0 || data.loosePillsAdded > 0, {
+		message: "Must add at least one pack or some loose pills",
+	});
+
+export async function refillRoutes(app: FastifyInstance) {
+	// All refill routes require auth
+	app.addHook("preHandler", requireAuth);
+
+	// Helper to get user ID from request
+	async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<number> {
+		if (!env.AUTH_ENABLED) {
+			return getAnonymousUserId();
+		}
+		const authUser = request.user as unknown as AuthUser | null;
+		if (!authUser) {
+			reply.status(401).send({ error: "User not authenticated", code: "AUTH_REQUIRED" });
+			throw new Error("AUTH_REQUIRED");
+		}
+		return authUser.id;
+	}
+
+	// POST /medications/:id/refill - Add stock to medication
+	app.post<{ Params: { id: string } }>("/medications/:id/refill", async (req, reply) => {
+		const parsed = refillSchema.safeParse(req.body);
+		if (!parsed.success) return reply.status(400).send(parsed.error.format());
+
+		const medId = Number(req.params.id);
+		if (Number.isNaN(medId)) return reply.badRequest("Invalid medication id");
+
+		const userId = await getUserId(req, reply);
+
+		// Verify ownership
+		const [med] = await db
+			.select()
+			.from(medications)
+			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
+		if (!med) return reply.notFound("Medication not found");
+
+		const { packsAdded, loosePillsAdded } = parsed.data;
+
+		// Update medication stock
+		const newPackCount = med.packCount + packsAdded;
+		const newLooseTablets = med.looseTablets + loosePillsAdded;
+
+		await db
+			.update(medications)
+			.set({
+				packCount: newPackCount,
+				looseTablets: newLooseTablets,
+				stockAdjustment: 0, // Reset offset since we're adding to base stock
+				lastStockCorrectionAt: new Date(), // Reset consumed counter to now
+				updatedAt: new Date(),
+			})
+			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
+
+		// Create refill history entry
+		const [refill] = await db
+			.insert(refillHistory)
+			.values({
+				medicationId: medId,
+				userId,
+				packsAdded,
+				loosePillsAdded,
+			})
+			.returning();
+
+		// Calculate pills added for response (packageType-aware)
+		const isBottle = (med.packageType ?? "blister") === "bottle";
+		const pillsPerPack = isBottle ? 0 : med.blistersPerPack * med.pillsPerBlister;
+		const totalPillsAdded = isBottle ? loosePillsAdded : packsAdded * pillsPerPack + loosePillsAdded;
+		const newTotalPills = isBottle
+			? newLooseTablets + (med.stockAdjustment ?? 0)
+			: newPackCount * pillsPerPack + newLooseTablets + (med.stockAdjustment ?? 0);
+
+		return {
+			success: true,
+			refill: {
+				id: refill.id,
+				packsAdded,
+				loosePillsAdded,
+				totalPillsAdded,
+				refillDate: refill.refillDate,
+			},
+			newStock: {
+				packCount: newPackCount,
+				looseTablets: newLooseTablets,
+				totalPills: newTotalPills,
+			},
+		};
+	});
+
+	// GET /medications/:id/refills - Get refill history for a medication
+	app.get<{ Params: { id: string } }>("/medications/:id/refills", async (req, reply) => {
+		const medId = Number(req.params.id);
+		if (Number.isNaN(medId)) return reply.badRequest("Invalid medication id");
+
+		const userId = await getUserId(req, reply);
+
+		// Verify ownership
+		const [med] = await db
+			.select()
+			.from(medications)
+			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
+		if (!med) return reply.notFound("Medication not found");
+
+		// Get refill history, newest first
+		const refills = await db
+			.select()
+			.from(refillHistory)
+			.where(eq(refillHistory.medicationId, medId))
+			.orderBy(desc(refillHistory.refillDate));
+
+		const isBottle = (med.packageType ?? "blister") === "bottle";
+		const pillsPerPack = isBottle ? 0 : med.blistersPerPack * med.pillsPerBlister;
+
+		return refills.map((r) => ({
+			id: r.id,
+			packsAdded: r.packsAdded,
+			loosePillsAdded: r.loosePillsAdded,
+			totalPillsAdded: isBottle ? r.loosePillsAdded : r.packsAdded * pillsPerPack + r.loosePillsAdded,
+			refillDate: r.refillDate,
+		}));
+	});
+}

backend/src/routes/settings.ts

@@ -1,12 +1,12 @@
-import { FastifyInstance } from "fastify";
+import { eq } from "drizzle-orm";
+import type { FastifyInstance } from "fastify";
 import nodemailer from "nodemailer";
 import { db } from "../db/client.js";
 import { userSettings } from "../db/schema.js";
-import { eq } from "drizzle-orm";
-import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
+import type { Language } from "../i18n/translations.js";
+import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
-import type { Language } from "../i18n/translations.js";
 
 // Exported type for use in schedulers
 export type UserSettings = {
@@ -30,9 +30,15 @@ export type UserSettings = {
 	highStockDays: number;
 	language: Language;
 	stockCalculationMode: "automatic" | "manual";
+	shareStockStatus: boolean;
 	lastAutoEmailSent: string | null;
 	lastNotificationType: string | null;
 	lastNotificationChannel: string | null;
+	lastReminderMedName: string | null;
+	lastReminderTakenBy: string | null;
+	lastStockReminderSent: string | null;
+	lastStockReminderChannel: string | null;
+	lastStockReminderMedNames: string | null;
 };
 
 type SettingsBody = {
@@ -55,6 +61,7 @@ type SettingsBody = {
 	maxNaggingReminders: number;
 	language: string;
 	stockCalculationMode: "automatic" | "manual";
+	shareStockStatus: boolean;
 };
 
 type TestEmailBody = {
@@ -77,7 +84,7 @@ function envInt(key: string, defaultVal: number): number {
 	const val = process.env[key];
 	if (val === undefined) return defaultVal;
 	const parsed = parseInt(val, 10);
-  return isNaN(parsed) ? defaultVal : parsed;
+	return Number.isNaN(parsed) ? defaultVal : parsed;
 }
 
 // Default settings for new users - read from ENV with fallbacks
@@ -102,9 +109,15 @@ function getDefaultSettings() {
 		highStockDays: envInt("DEFAULT_HIGH_STOCK_DAYS", 180),
 		language: (process.env.DEFAULT_LANGUAGE as "en" | "de") || "en",
 		stockCalculationMode: (process.env.DEFAULT_STOCK_CALCULATION_MODE as "automatic" | "manual") || "automatic",
+		shareStockStatus: envBool("DEFAULT_SHARE_STOCK_STATUS", true),
 		lastAutoEmailSent: null,
 		lastNotificationType: null,
 		lastNotificationChannel: null,
+		lastReminderMedName: null,
+		lastReminderTakenBy: null,
+		lastStockReminderSent: null,
+		lastStockReminderChannel: null,
+		lastStockReminderMedNames: null,
 	};
 }
 
@@ -114,10 +127,13 @@ async function getOrCreateUserSettings(userId: number) {
 
 	if (!settings) {
 		// Create default settings for user (using ENV defaults)
-    [settings] = await db.insert(userSettings).values({
+		[settings] = await db
+			.insert(userSettings)
+			.values({
 				userId,
 				...getDefaultSettings(),
-    }).returning();
+			})
+			.returning();
 	}
 
 	return settings;
@@ -147,16 +163,22 @@ export async function loadUserSettings(userId: number): Promise<UserSettings> {
 		highStockDays: settings.highStockDays,
 		language: settings.language as Language,
 		stockCalculationMode: (settings.stockCalculationMode as "automatic" | "manual") ?? "automatic",
+		shareStockStatus: settings.shareStockStatus ?? true,
 		lastAutoEmailSent: settings.lastAutoEmailSent,
 		lastNotificationType: settings.lastNotificationType,
 		lastNotificationChannel: settings.lastNotificationChannel,
+		lastReminderMedName: settings.lastReminderMedName ?? null,
+		lastReminderTakenBy: settings.lastReminderTakenBy ?? null,
+		lastStockReminderSent: settings.lastStockReminderSent ?? null,
+		lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
+		lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
 	};
 }
 
 // Get all users with settings for scheduler
 export async function getAllUserSettings(): Promise<UserSettings[]> {
 	const allSettings = await db.select().from(userSettings);
-  return allSettings.map(settings => ({
+	return allSettings.map((settings) => ({
 		userId: settings.userId,
 		emailEnabled: settings.emailEnabled,
 		notificationEmail: settings.notificationEmail,
@@ -177,9 +199,15 @@ export async function getAllUserSettings(): Promise<UserSettings[]> {
 		highStockDays: settings.highStockDays,
 		language: settings.language as Language,
 		stockCalculationMode: (settings.stockCalculationMode as "automatic" | "manual") ?? "automatic",
+		shareStockStatus: settings.shareStockStatus ?? true,
 		lastAutoEmailSent: settings.lastAutoEmailSent,
 		lastNotificationType: settings.lastNotificationType,
 		lastNotificationChannel: settings.lastNotificationChannel,
+		lastReminderMedName: settings.lastReminderMedName ?? null,
+		lastReminderTakenBy: settings.lastReminderTakenBy ?? null,
+		lastStockReminderSent: settings.lastStockReminderSent ?? null,
+		lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
+		lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
 	}));
 }
 
@@ -230,9 +258,10 @@ export async function settingsRoutes(app: FastifyInstance) {
 			maxNaggingReminders: settings.maxNaggingReminders ?? 5,
 			language: settings.language,
 			stockCalculationMode: settings.stockCalculationMode ?? "automatic",
+			shareStockStatus: settings.shareStockStatus ?? true,
 			// SMTP settings (from .env - shared/server-configured)
 			smtpHost: process.env.SMTP_HOST ?? "",
-      smtpPort: parseInt(process.env.SMTP_PORT ?? "587"),
+			smtpPort: parseInt(process.env.SMTP_PORT ?? "587", 10),
 			smtpUser: process.env.SMTP_USER ?? "",
 			smtpFrom: process.env.SMTP_FROM ?? "",
 			smtpSecure: process.env.SMTP_SECURE === "true",
@@ -241,6 +270,12 @@ export async function settingsRoutes(app: FastifyInstance) {
 			lastAutoEmailSent: settings.lastAutoEmailSent,
 			lastNotificationType: settings.lastNotificationType,
 			lastNotificationChannel: settings.lastNotificationChannel,
+			lastReminderMedName: settings.lastReminderMedName ?? null,
+			lastReminderTakenBy: settings.lastReminderTakenBy ?? null,
+			// Stock reminder tracking (separate from intake)
+			lastStockReminderSent: settings.lastStockReminderSent ?? null,
+			lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
+			lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
 			// Server settings (from .env, read-only)
 			expiryWarningDays: parseInt(process.env.EXPIRY_WARNING_DAYS ?? "30", 10),
 		});
@@ -283,13 +318,12 @@ export async function settingsRoutes(app: FastifyInstance) {
 			highStockDays: body.highStockDays ?? 180,
 			language: body.language ?? "en",
 			stockCalculationMode: body.stockCalculationMode ?? "automatic",
+			shareStockStatus: body.shareStockStatus ?? true,
 			updatedAt: new Date(),
 		};
 
 		if (existingSettings.length > 0) {
-      await db.update(userSettings)
-        .set(settingsData)
-        .where(eq(userSettings.userId, userId));
+			await db.update(userSettings).set(settingsData).where(eq(userSettings.userId, userId));
 		} else {
 			await db.insert(userSettings).values({
 				userId: userId,
@@ -307,7 +341,7 @@ export async function settingsRoutes(app: FastifyInstance) {
 		const smtpHost = process.env.SMTP_HOST;
 		const smtpUser = process.env.SMTP_USER;
 		const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS;
-    const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
+		const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
 		const smtpSecure = process.env.SMTP_SECURE === "true";
 		const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
@@ -358,7 +392,11 @@ export async function settingsRoutes(app: FastifyInstance) {
 		}
 
 		try {
-      const result = await sendShoutrrrNotification(url, "MedAssist-ng Test", "This is a test notification from MedAssist-ng. If you received this, your notification configuration is working correctly!");
+			const result = await sendShoutrrrNotification(
+				url,
+				"MedAssist-ng Test",
+				"This is a test notification from MedAssist-ng. If you received this, your notification configuration is working correctly!"
+			);
 
 			if (result.success) {
 				return reply.send({ success: true, message: "Test notification sent successfully" });
@@ -372,27 +410,29 @@ export async function settingsRoutes(app: FastifyInstance) {
 	});
 }
 
-// Validate URL to prevent SSRF attacks
-function isAllowedNotificationUrl(urlStr: string): { allowed: boolean; error?: string } {
+// Validate and sanitize URL to prevent SSRF attacks
+// Returns a reconstructed URL from validated components to break taint tracking
+function sanitizeNotificationUrl(
+	urlStr: string
+): { url: string; isNtfy: boolean; auth?: { user: string; pass: string } } | { error: string } {
 	try {
-    // Convert ntfy:// to https:// for parsing
-    const normalizedUrl = urlStr.startsWith("ntfy://") 
-      ? urlStr.replace("ntfy://", "https://") 
-      : urlStr;
+		// Convert ntfy:// to https:// for parsing, track if it was ntfy
+		const isNtfy = urlStr.startsWith("ntfy://");
+		const normalizedUrl = isNtfy ? urlStr.replace("ntfy://", "https://") : urlStr;
 
 		const parsed = new URL(normalizedUrl);
 
 		// Only allow http and https protocols
-    if (!['http:', 'https:'].includes(parsed.protocol)) {
-      return { allowed: false, error: "Only HTTP/HTTPS protocols are allowed" };
+		if (!["http:", "https:"].includes(parsed.protocol)) {
+			return { error: "Only HTTP/HTTPS protocols are allowed" };
 		}
 
 		// Block private/internal IP addresses
 		const hostname = parsed.hostname.toLowerCase();
 
 		// Block localhost
-    if (hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '::1') {
-      return { allowed: false, error: "Localhost URLs are not allowed" };
+		if (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1") {
+			return { error: "Localhost URLs are not allowed" };
 		}
 
 		// Block private IP ranges (basic check)
@@ -400,66 +440,127 @@ function isAllowedNotificationUrl(urlStr: string): { allowed: boolean; error?: s
 		if (ipMatch) {
 			const [, a, b] = ipMatch.map(Number);
 			// 10.x.x.x, 172.16-31.x.x, 192.168.x.x, 169.254.x.x (link-local)
-      if (a === 10 || a === 127 || (a === 172 && b >= 16 && b <= 31) || 
-          (a === 192 && b === 168) || (a === 169 && b === 254)) {
-        return { allowed: false, error: "Private IP addresses are not allowed" };
+			if (
+				a === 10 ||
+				a === 127 ||
+				(a === 172 && b >= 16 && b <= 31) ||
+				(a === 192 && b === 168) ||
+				(a === 169 && b === 254)
+			) {
+				return { error: "Private IP addresses are not allowed" };
 			}
 		}
 
 		// Block common internal hostnames
-    if (hostname.endsWith('.local') || hostname.endsWith('.internal') || 
-        hostname.endsWith('.lan') || hostname === 'metadata.google.internal') {
-      return { allowed: false, error: "Internal hostnames are not allowed" };
+		if (
+			hostname.endsWith(".local") ||
+			hostname.endsWith(".internal") ||
+			hostname.endsWith(".lan") ||
+			hostname === "metadata.google.internal"
+		) {
+			return { error: "Internal hostnames are not allowed" };
 		}
 
-    return { allowed: true };
+		// Reconstruct URL from validated components - this breaks taint tracking
+		// because we're building a new string from validated parts, not passing through user input
+		const reconstructedUrl = `${parsed.protocol}//${parsed.host}${parsed.pathname}${parsed.search}`;
+
+		// Extract auth credentials separately for ntfy (they're in the URL but not in host)
+		const auth =
+			isNtfy && parsed.username && parsed.password ? { user: parsed.username, pass: parsed.password } : undefined;
+
+		return { url: reconstructedUrl, isNtfy, auth };
 	} catch {
-    return { allowed: false, error: "Invalid URL format" };
+		return { error: "Invalid URL format" };
 	}
 }
 
 // Send notification via Shoutrrr-compatible URL (supports ntfy, Discord, Telegram, etc.)
-export async function sendShoutrrrNotification(urlStr: string, title: string, message: string): Promise<{ success: boolean; error?: string }> {
+export async function sendShoutrrrNotification(
+	urlStr: string,
+	title: string,
+	message: string
+): Promise<{ success: boolean; error?: string }> {
 	try {
-    // Validate URL to prevent SSRF
-    const validation = isAllowedNotificationUrl(urlStr);
-    if (!validation.allowed) {
+		// Validate and sanitize URL to prevent SSRF - this reconstructs the URL
+		// from validated components, breaking taint tracking
+		const validation = sanitizeNotificationUrl(urlStr);
+		if ("error" in validation) {
 			return { success: false, error: validation.error };
 		}
 
+		// Use ONLY the reconstructed URL from validation - never the original urlStr
+		const { url: sanitizedUrl, isNtfy, auth } = validation;
+
 		let targetUrl: string;
-    let method = "POST";
+		const method = "POST";
 		let headers: Record<string, string> = {};
 		let body: string | undefined;
 
 		// Remove emojis from title for header compatibility
-    const cleanTitle = title.replace(/[\u{1F300}-\u{1F9FF}]|[\u{2600}-\u{26FF}]|[\u{2700}-\u{27BF}]|[\u{FE00}-\u{FE0F}]|[\u{2000}-\u{206F}]|⚠|️/gu, "").trim();
+		const cleanTitle = title
+			.replace(
+				/[\u{1F300}-\u{1F9FF}]|[\u{2600}-\u{26FF}]|[\u{2700}-\u{27BF}]|[\u{FE00}-\u{FE0F}]|[\u{2000}-\u{206F}]|⚠|️/gu,
+				""
+			)
+			.trim();
 
-    if (urlStr.startsWith("ntfy://")) {
-      const parsed = new URL(urlStr.replace("ntfy://", "https://"));
-      targetUrl = `https://${parsed.host}${parsed.pathname}`;
-      headers = { "Title": cleanTitle, "Tags": "pill" };
-      body = message;
+		// Determine notification type based on URL hostname
+		// Use JSON format only for known webhook services that require it
+		// Use proper URL parsing to prevent bypass attacks (e.g., evil.com?hooks.slack.com)
+		let isJsonWebhook = false;
+		try {
+			const parsedUrl = new URL(sanitizedUrl);
+			const hostname = parsedUrl.hostname.toLowerCase();
+			const pathname = parsedUrl.pathname.toLowerCase();
 
-      if (parsed.username && parsed.password) {
-        headers["Authorization"] = "Basic " + Buffer.from(`${parsed.username}:${parsed.password}`).toString("base64");
+			isJsonWebhook =
+				// Discord webhooks
+				((hostname === "discord.com" || hostname === "discordapp.com") && pathname.startsWith("/api/webhooks")) ||
+				// Slack webhooks
+				hostname === "hooks.slack.com" ||
+				hostname.endsWith(".hooks.slack.com") ||
+				// Telegram API
+				hostname === "api.telegram.org" ||
+				// Gotify (can be self-hosted, so check if "gotify" is in hostname)
+				hostname.includes("gotify");
+		} catch {
+			// If URL parsing fails, default to ntfy-style
+			isJsonWebhook = false;
 		}
-    } else if (urlStr.startsWith("https://ntfy.") || urlStr.includes("ntfy.sh") || urlStr.includes("/ntfy/")) {
-      targetUrl = urlStr;
-      headers = { "Title": cleanTitle, "Tags": "pill" };
+
+		// Default to ntfy-style (plain text with Title header) for all other HTTP URLs
+		// This works for ntfy, Apprise, and most simple push services
+		if (!isJsonWebhook) {
+			targetUrl = sanitizedUrl;
+			headers = { Title: cleanTitle, Tags: "pill" };
 			body = message;
-    } else if (urlStr.startsWith("http://") || urlStr.startsWith("https://")) {
-      targetUrl = urlStr;
+
+			// Add auth if present (extracted during sanitization)
+			if (auth) {
+				headers.Authorization = `Basic ${Buffer.from(`${auth.user}:${auth.pass}`).toString("base64")}`;
+			}
+		} else if (sanitizedUrl.startsWith("http://") || sanitizedUrl.startsWith("https://")) {
+			targetUrl = sanitizedUrl;
 			headers = { "Content-Type": "application/json" };
 			body = JSON.stringify({ title, message, text: `${title}\n\n${message}` });
 		} else {
 			return { success: false, error: "Unsupported URL format. Use ntfy:// or https:// URL" };
 		}
 
+		// SSRF protection: targetUrl is reconstructed from sanitizeNotificationUrl() which validates:
+		// - Only http/https protocols allowed
+		// - Blocks localhost (localhost, 127.0.0.1, ::1)
+		// - Blocks private IPs (10.x.x.x, 172.16-31.x.x, 192.168.x.x, 169.254.x.x)
+		// - Blocks internal hostnames (.local, .internal, .lan, metadata.google.internal)
+		// - redirect: "error" prevents redirect-based bypass attacks
+		// This is an intentional feature: users configure their own external notification services
+		// lgtm [js/request-forgery]
 		const response = await fetch(targetUrl, {
 			method,
 			headers,
 			body,
+			redirect: "error", // Don't follow redirects that could bypass validation
 		});
 
 		if (response.ok) {
@@ -473,4 +574,3 @@ export async function sendShoutrrrNotification(urlStr: string, title: string, me
 		return { success: false, error: errorMessage };
 	}
 }
-

backend/src/routes/share.ts

@@ -1,12 +1,18 @@
-import { FastifyInstance } from "fastify";
+import { randomBytes } from "node:crypto";
+import { eq } from "drizzle-orm";
+import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import { z } from "zod";
-import { randomBytes } from "crypto";
 import { db } from "../db/client.js";
 import { medications, shareTokens, userSettings, users } from "../db/schema.js";
-import { eq, and, sql } from "drizzle-orm";
-import { requireAuth, optionalAuth, getAnonymousUserId } from "../plugins/auth.js";
+import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
+import {
+	getAllTakenByForMedication,
+	parseIntakesJson,
+	parseTakenByJson,
+	personTakesMedication,
+} from "../utils/scheduler-utils.js";
 
 // Share token validity: 1 year in milliseconds
 const SHARE_TOKEN_VALIDITY_MS = 365 * 24 * 60 * 60 * 1000;
@@ -21,7 +27,7 @@ const createShareSchema = z.object({
 
 // Helper to get user ID from request
 // Returns anonymous user ID when auth is disabled
-async function getUserId(request: any, reply: any): Promise<number> {
+async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<number> {
 	// If auth is disabled, use the anonymous user
 	if (!env.AUTH_ENABLED) {
 		return getAnonymousUserId();
@@ -35,17 +41,6 @@ async function getUserId(request: any, reply: any): Promise<number> {
 	return authUser.id;
 }
 
-// Helper to parse takenByJson
-function parseTakenByJson(takenByJson: string | null | undefined): string[] {
-  if (!takenByJson) return [];
-  try {
-    const parsed = JSON.parse(takenByJson);
-    return Array.isArray(parsed) ? parsed.filter((s: unknown) => typeof s === "string" && s.trim()) : [];
-  } catch {
-    return [];
-  }
-}
-
 // =============================================================================
 // Share Routes
 // =============================================================================
@@ -61,7 +56,7 @@ export async function shareRoutes(app: FastifyInstance) {
 		if (!share) {
 			return reply.status(404).send({
 				error: "Share link not found",
-        code: "NOT_FOUND"
+				code: "NOT_FOUND",
 			});
 		}
 
@@ -88,45 +83,60 @@ export async function shareRoutes(app: FastifyInstance) {
 		// Use SQLite JSON function to check if takenBy is in the array
 		const allMeds = await db.select().from(medications).where(eq(medications.userId, share.userId));
 
-    // Filter medications where takenByJson array contains the share.takenBy value
+		// Filter medications where takenBy matches either medication-level OR any intake-level takenBy
 		const meds = allMeds.filter((med) => {
 			const takenByArray = parseTakenByJson(med.takenByJson);
-      return takenByArray.includes(share.takenBy);
+			const intakes = parseIntakesJson(
+				med.intakesJson,
+				{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
+				med.intakeRemindersEnabled ?? false
+			);
+			return personTakesMedication(share.takenBy, takenByArray, intakes);
 		});
 
 		// Parse blisters and build schedule data
 		const medicationsWithBlisters = meds.map((med) => {
-      let blisters: { usage: number; every: number; start: string }[] = [];
-      try {
-        const usageArr = JSON.parse(med.usageJson || "[]");
-        const everyArr = JSON.parse(med.everyJson || "[]");
-        const startArr = JSON.parse(med.startJson || "[]");
-        blisters = usageArr.map((usage: number, i: number) => ({
-          usage,
-          every: everyArr[i] ?? 1,
-          start: startArr[i] ?? new Date().toISOString(),
+			// Parse intakes from new format, falling back to legacy
+			const intakes = parseIntakesJson(
+				med.intakesJson,
+				{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
+				med.intakeRemindersEnabled ?? false
+			);
+
+			// Convert to legacy blisters format for backward compat
+			const blisters = intakes.map((i) => ({
+				usage: i.usage,
+				every: i.every,
+				start: i.start,
 			}));
-      } catch {
-        blisters = [];
-      }
 
 			// Parse takenBy JSON array
 			const takenByArray = parseTakenByJson(med.takenByJson);
 
-      const totalPills = med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets;
+			const totalPills =
+				(med.packageType ?? "blister") === "bottle"
+					? med.looseTablets + (med.stockAdjustment ?? 0)
+					: med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets + (med.stockAdjustment ?? 0);
 			return {
 				id: med.id,
 				name: med.name,
 				genericName: med.genericName,
 				pillWeightMg: med.pillWeightMg,
+				doseUnit: med.doseUnit ?? "mg",
 				imageUrl: med.imageUrl,
 				totalPills,
+				packageType: med.packageType ?? "blister",
 				packCount: med.packCount,
 				blistersPerPack: med.blistersPerPack,
 				looseTablets: med.looseTablets,
 				pillsPerBlister: med.pillsPerBlister,
 				takenBy: takenByArray,
-        blisters,
+				intakes, // New unified format with per-intake takenBy
+				blisters, // Legacy format for backward compat
+				dismissedUntil: med.dismissedUntil,
+				updatedAt: med.updatedAt, // For filtering out doses from previous schedule configurations
+				lastStockCorrectionAt: med.lastStockCorrectionAt?.getTime() ?? null,
+				stockAdjustment: med.stockAdjustment ?? 0,
 			};
 		});
 
@@ -137,7 +147,13 @@ export async function shareRoutes(app: FastifyInstance) {
 			medications: medicationsWithBlisters,
 			stockThresholds: {
 				lowStockDays: settings?.lowStockDays ?? 30,
+				normalStockDays: settings?.normalStockDays ?? 60,
+				highStockDays: settings?.highStockDays ?? 90,
+				reminderDaysBefore: settings?.reminderDaysBefore ?? 7,
+				expiryWarningDays: settings?.expiryWarningDays ?? 90,
 			},
+			stockCalculationMode: (settings?.stockCalculationMode as "automatic" | "manual") ?? "automatic",
+			shareStockStatus: settings?.shareStockStatus ?? true,
 		};
 	});
 
@@ -160,11 +176,16 @@ export async function shareRoutes(app: FastifyInstance) {
 
 			const { takenBy, scheduleDays } = parsed.data;
 
-      // Check if user has medications for this takenBy (search in JSON array)
+			// Check if user has medications for this takenBy (search in both medication-level and intake-level)
 			const allMeds = await db.select().from(medications).where(eq(medications.userId, userId));
 			const medsForPerson = allMeds.filter((med) => {
 				const takenByArray = parseTakenByJson(med.takenByJson);
-        return takenByArray.includes(takenBy);
+				const intakes = parseIntakesJson(
+					med.intakesJson,
+					{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
+					med.intakeRemindersEnabled ?? false
+				);
+				return personTakesMedication(takenBy, takenByArray, intakes);
 			});
 
 			if (medsForPerson.length === 0) {
@@ -200,27 +221,37 @@ export async function shareRoutes(app: FastifyInstance) {
 	// ---------------------------------------------------------------------------
 	// GET /share/people - PROTECTED: Get list of unique takenBy values
 	// ---------------------------------------------------------------------------
-  app.get(
-    "/share/people",
-    { preHandler: requireAuth },
-    async (request, reply) => {
+	app.get("/share/people", { preHandler: requireAuth }, async (request, reply) => {
 		const userId = await getUserId(request, reply);
 
-      // Get all unique takenBy values for this user (from JSON arrays)
-      const meds = await db.select({ takenByJson: medications.takenByJson })
+		// Get all unique takenBy values for this user (from both medication-level and intake-level)
+		const meds = await db
+			.select({
+				takenByJson: medications.takenByJson,
+				intakesJson: medications.intakesJson,
+				usageJson: medications.usageJson,
+				everyJson: medications.everyJson,
+				startJson: medications.startJson,
+				intakeRemindersEnabled: medications.intakeRemindersEnabled,
+			})
 			.from(medications)
 			.where(eq(medications.userId, userId));
 
-      // Collect all unique person names from all takenByJson arrays
+		// Collect all unique person names from medication-level AND intake-level takenBy
 		const allPeople = new Set<string>();
 		for (const med of meds) {
 			const takenByArray = parseTakenByJson(med.takenByJson);
-        for (const person of takenByArray) {
+			const intakes = parseIntakesJson(
+				med.intakesJson,
+				{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
+				med.intakeRemindersEnabled ?? false
+			);
+			const allForMed = getAllTakenByForMedication(takenByArray, intakes);
+			for (const person of allForMed) {
 				if (person) allPeople.add(person);
 			}
 		}
 
 		return { people: [...allPeople].sort() };
-    }
-  );
+	});
 }

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

@@ -1,32 +1,40 @@
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { and, eq, gte, lte } from "drizzle-orm";
 import nodemailer from "nodemailer";
-import { eq, and, gte, lte } from "drizzle-orm";
 import { db } from "../db/client.js";
-import { medications, doseTracking } from "../db/schema.js";
-import { readFileSync, writeFileSync, existsSync } from "fs";
-import { resolve } from "path";
+import { getDataDir } from "../db/db-utils.js";
+import { doseTracking, medications } from "../db/schema.js";
+import {
+	getDateLocale,
+	getFooterHtml,
+	getFooterPlain,
+	getTranslations,
+	type Language,
+	t,
+} from "../i18n/translations.js";
 import { getAllUserSettings, sendShoutrrrNotification, type UserSettings } from "../routes/settings.js";
-import { getTranslations, t, getDateLocale, type Language } from "../i18n/translations.js";
-import { getReminderState, updateReminderSentTime, updateUserReminderSentTime } from "./reminder-scheduler.js";
-
+import type { ServiceLogger } from "../utils/logger.js";
 // Import shared utilities
 import {
-  getTimezone,
-  parseBlisters,
-  parseTakenByJson,
-  getUpcomingIntakes,
-  getTodaysIntakes,
-  parseIntakeReminderState,
-  createDefaultIntakeReminderState,
 	cleanOldIntakeReminders,
-  type Blister,
+	createDefaultIntakeReminderState,
+	getTimezone,
+	getTodaysIntakes,
+	getUpcomingIntakes,
+	type Intake,
 	type IntakeReminderState,
+	parseIntakeReminderState,
+	parseIntakesJson,
+	parseTakenByJson,
 	type UpcomingIntake,
 } from "../utils/scheduler-utils.js";
+import { updateReminderSentTime, updateUserReminderSentTime } from "./reminder-scheduler.js";
 
 const REMINDER_MINUTES_BEFORE = parseInt(process.env.REMINDER_MINUTES_BEFORE ?? "15", 10);
 const CHECK_INTERVAL_MS = 60 * 1000; // Check every 1 minute
 
-const intakeReminderStateFile = resolve(process.cwd(), "data", "intake-reminder-state.json");
+const intakeReminderStateFile = resolve(getDataDir(), "intake-reminder-state.json");
 
 function loadIntakeReminderState(): IntakeReminderState {
 	try {
@@ -43,21 +51,19 @@ function saveIntakeReminderState(state: IntakeReminderState): void {
 	writeFileSync(intakeReminderStateFile, JSON.stringify(state, null, 2));
 }
 
-function parseBlistersFromRow(row: { usageJson: string; everyJson: string; startJson: string }): Blister[] {
-  return parseBlisters(row);
-}
-
 async function sendIntakeReminderEmail(
 	email: string,
 	intakes: UpcomingIntake[],
 	language: Language,
 	isRepeat: boolean = false,
-  repeatIntervalMinutes?: number
+	repeatIntervalMinutes?: number,
+	currentCount?: number,
+	maxCount?: number
 ): Promise<{ success: boolean; error?: 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
-  const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
+	const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
 	const smtpSecure = process.env.SMTP_SECURE === "true";
 	const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
@@ -78,11 +84,10 @@ async function sendIntakeReminderEmail(
 		return pillText;
 	};
 
-  // Helper to format medication name with takenBy (array of names)
+	// Helper to format medication name with takenBy (single person or null)
 	const formatMedName = (intake: UpcomingIntake): string => {
-    if (intake.takenBy.length > 0) {
-      const namesStr = intake.takenBy.join(", ");
-      return `${intake.medName} <span style="color: #6b7280; font-size: 12px;">${t(tr.intakeReminder.takenBy, { name: namesStr })}</span>`;
+		if (intake.takenBy) {
+			return `${intake.medName} <span style="color: #6b7280; font-size: 12px;">${t(tr.intakeReminder.takenBy, { name: intake.takenBy })}</span>`;
 		}
 		return intake.medName;
 	};
@@ -99,14 +104,31 @@ async function sendIntakeReminderEmail(
 		)
 		.join("");
 
-  const alertText = intakes.length === 1 
+	const alertText =
+		intakes.length === 1
 			? tr.intakeReminder.alertSingle
 			: t(tr.intakeReminder.alertMultiple, { count: intakes.length });
 
 	// Different description for repeat reminders
-  const description = isRepeat && repeatIntervalMinutes
-    ? `⚠️ Don't forget your medication! This reminder will be sent every ${repeatIntervalMinutes} minutes until you mark it as taken.`
-    : t(tr.intakeReminder.description, { minutes: REMINDER_MINUTES_BEFORE });
+	let description: string;
+	if (isRepeat && repeatIntervalMinutes && currentCount !== undefined && maxCount !== undefined) {
+		const remainingReminders = maxCount - currentCount;
+		if (remainingReminders <= 0) {
+			description = language === "de" ? "⚠️ Dies ist die letzte Erinnerung." : "⚠️ This is the last reminder.";
+		} else if (remainingReminders === 1) {
+			description =
+				language === "de"
+					? `ℹ️ Eine weitere Erinnerung wird in ${repeatIntervalMinutes} Minuten gesendet.`
+					: `ℹ️ One more reminder will be sent in ${repeatIntervalMinutes} minutes.`;
+		} else {
+			description =
+				language === "de"
+					? `ℹ️ ${remainingReminders} weitere Erinnerungen werden alle ${repeatIntervalMinutes} Minuten gesendet.`
+					: `ℹ️ ${remainingReminders} more reminders will be sent every ${repeatIntervalMinutes} minutes.`;
+		}
+	} else {
+		description = t(tr.intakeReminder.description, { minutes: REMINDER_MINUTES_BEFORE });
+	}
 
 	const html = `
     <div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
@@ -135,7 +157,7 @@ async function sendIntakeReminderEmail(
 
         <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
         <p style="color: #9ca3af; font-size: 11px; margin: 0;">
-          ${tr.intakeReminder.footer}
+          ${getFooterHtml(language)}
         </p>
       </div>
     </div>
@@ -156,17 +178,19 @@ async function sendIntakeReminderEmail(
 
 ${description}
 
-${intakes.map((i) => {
-    const takenByStr = i.takenBy.length > 0 ? ` ${t(tr.intakeReminder.takenBy, { name: i.takenBy.join(", ") })}` : "";
+${intakes
+	.map((i) => {
+		const takenByStr = i.takenBy ? ` ${t(tr.intakeReminder.takenBy, { name: i.takenBy })}` : "";
 		return `${i.medName}${takenByStr}: ${formatDosagePlain(i)} - ${i.intakeTimeStr}`;
-  }).join("\n")}
+	})
+	.join("\n")}
 
 ---
-${tr.intakeReminder.footer}`;
+${getFooterPlain(language)}`;
 
 	const subject = isRepeat
-    ? `[Reminder] ${t(tr.intakeReminder.subject, { medications: intakes.map(i => i.medName).join(", ") })}`
-    : t(tr.intakeReminder.subject, { medications: intakes.map(i => i.medName).join(", ") });
+		? `[Reminder] ${t(tr.intakeReminder.subject, { medications: intakes.map((i) => i.medName).join(", ") })}`
+		: t(tr.intakeReminder.subject, { medications: intakes.map((i) => i.medName).join(", ") });
 
 	try {
 		const transporter = nodemailer.createTransport({
@@ -194,18 +218,18 @@ ${tr.intakeReminder.footer}`;
 	}
 }
 
-async function checkAndSendIntakeReminders(logger: { info: (msg: string) => void; error: (msg: string) => void }): Promise<void> {
-  logger.info(`[IntakeReminder] Checking for intake reminders...`);
+async function checkAndSendIntakeReminders(logger: ServiceLogger): Promise<void> {
+	logger.debug(`[IntakeReminder] Checking for intake reminders...`);
 
 	// Get all user settings to iterate over each user
 	const allUserSettings = await getAllUserSettings();
 
 	if (allUserSettings.length === 0) {
-    logger.info(`[IntakeReminder] No users with settings found`);
+		logger.debug(`[IntakeReminder] No users with settings found`);
 		return; // No users with settings
 	}
 
-  logger.info(`[IntakeReminder] Found ${allUserSettings.length} users to check`);
+	logger.debug(`[IntakeReminder] Found ${allUserSettings.length} users to check`);
 
 	for (const userSettings of allUserSettings) {
 		await checkAndSendIntakeRemindersForUser(userSettings, logger);
@@ -214,34 +238,46 @@ async function checkAndSendIntakeReminders(logger: { info: (msg: string) => void
 
 async function checkAndSendIntakeRemindersForUser(
 	settings: UserSettings & { userId: number },
-  logger: { info: (msg: string) => void; error: (msg: string) => void }
+	logger: ServiceLogger
 ): Promise<void> {
 	const language = settings.language;
 	const tr = getTranslations(language);
 
-  logger.info(`[IntakeReminder] Checking user ${settings.userId} - repeat:${settings.repeatRemindersEnabled} skip:${settings.skipRemindersForTakenDoses}`);
+	logger.debug(
+		`[IntakeReminder] Checking user ${settings.userId} - repeat:${settings.repeatRemindersEnabled} skip:${settings.skipRemindersForTakenDoses}`
+	);
 
 	// Check if any intake reminder notifications are enabled (granular check)
 	const emailEnabled = settings.emailEnabled && settings.notificationEmail && settings.emailIntakeReminders;
 	const shoutrrrEnabled = settings.shoutrrrEnabled && settings.shoutrrrUrl && settings.shoutrrrIntakeReminders;
 
 	if (!emailEnabled && !shoutrrrEnabled) {
-    logger.info(`[IntakeReminder] User ${settings.userId}: No intake notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`);
+		logger.debug(
+			`[IntakeReminder] User ${settings.userId}: No intake notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`
+		);
 		return; // No intake reminder notifications enabled for this user
 	}
 
-  logger.info(`[IntakeReminder] User ${settings.userId}: Notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`);
+	logger.debug(
+		`[IntakeReminder] User ${settings.userId}: Notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`
+	);
 
 	// Get all medications with intake reminders enabled for this user
-  const rows = await db.select().from(medications).where(eq(medications.userId, settings.userId)).orderBy(medications.id);
-  const medsWithReminders = rows.filter(row => row.intakeRemindersEnabled);
+	const rows = await db
+		.select()
+		.from(medications)
+		.where(eq(medications.userId, settings.userId))
+		.orderBy(medications.id);
+	const medsWithReminders = rows.filter((row) => row.intakeRemindersEnabled);
 
 	if (medsWithReminders.length === 0) {
-    logger.info(`[IntakeReminder] User ${settings.userId}: No medications have reminders enabled`);
+		logger.debug(`[IntakeReminder] User ${settings.userId}: No medications have reminders enabled`);
 		return; // No medications have reminders enabled for this user
 	}
 
-  logger.info(`[IntakeReminder] User ${settings.userId}: Found ${medsWithReminders.length} medications with reminders`);
+	logger.debug(
+		`[IntakeReminder] User ${settings.userId}: Found ${medsWithReminders.length} medications with reminders`
+	);
 
 	const state = loadIntakeReminderState();
 	const allUpcoming: (UpcomingIntake & { medicationId: number; blisterIndex: number })[] = [];
@@ -256,60 +292,120 @@ async function checkAndSendIntakeRemindersForUser(
 	const todayEnd = new Date(now.toLocaleString("en-US", { timeZone: tz }));
 	todayEnd.setHours(23, 59, 59, 999);
 
-  logger.info(`[IntakeReminder] User ${settings.userId}: Today range: ${todayStart.toISOString()} to ${todayEnd.toISOString()}`);
+	logger.debug(
+		`[IntakeReminder] User ${settings.userId}: Today range: ${todayStart.toISOString()} to ${todayEnd.toISOString()}`
+	);
 
 	// Find intakes: upcoming ones in reminder window + past ones for repeat reminders
 	for (const med of medsWithReminders) {
-    const blisters = parseBlistersFromRow(med);
-    const takenByArray = parseTakenByJson(med.takenByJson);
+		// 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);
 
-    logger.info(`[IntakeReminder] User ${settings.userId}: Processing medication "${med.name}" with ${blisters.length} blisters`);
+		logger.debug(
+			`[IntakeReminder] User ${settings.userId}: Processing medication "${med.name}" with ${intakes.length} intakes`
+		);
 
-    // Process each blister separately to track blisterIndex
-    blisters.forEach((blister, blisterIndex) => {
-      logger.info(`[IntakeReminder] User ${settings.userId}: Blister ${blisterIndex} - start: ${blister.start}, every: ${blister.every} days, usage: ${blister.usage}`);
+		// 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
+			logger.debug(
+				`[IntakeReminder] User ${settings.userId}: Intake ${actualIndex} - start: ${intake.start}, every: ${intake.every} days, usage: ${intake.usage}, takenBy: ${intake.takenBy || "(none)"}`
+			);
 
 			// Always get upcoming intakes (15 min before) for first reminders
-      const upcomingIntakes = getUpcomingIntakes(med.name, [blister], REMINDER_MINUTES_BEFORE, takenByArray, med.pillWeightMg, locale, tz);
-      logger.info(`[IntakeReminder] User ${settings.userId}: Blister ${blisterIndex} found ${upcomingIntakes.length} upcoming intakes (reminder window)`);
+			const upcomingIntakes = getUpcomingIntakes(
+				med.name,
+				[intake],
+				REMINDER_MINUTES_BEFORE,
+				medicationTakenBy,
+				med.pillWeightMg,
+				locale,
+				tz,
+				undefined, // nowOverride
+				med.id,
+				med.doseUnit ?? "mg"
+			);
+			logger.debug(
+				`[IntakeReminder] User ${settings.userId}: Intake ${actualIndex} found ${upcomingIntakes.length} upcoming intakes (reminder window)`
+			);
 
 			// Add upcoming intakes for first reminders
-      allUpcoming.push(...upcomingIntakes.map(intake => ({
-        ...intake,
+			allUpcoming.push(
+				...upcomingIntakes.map((upcomingIntake) => ({
+					...upcomingIntake,
 					medicationId: med.id,
-        blisterIndex,
-      })));
+					blisterIndex: actualIndex,
+				}))
+			);
 
 			// If repeat reminders enabled, also check for missed intakes (past the intake time)
 			if (settings.repeatRemindersEnabled) {
-        const allTodaysIntakes = getTodaysIntakes(med.name, [blister], takenByArray, med.pillWeightMg, locale, tz);
-        logger.info(`[IntakeReminder] User ${settings.userId}: Blister ${blisterIndex} - all today's intakes: ${allTodaysIntakes.length}, times: ${allTodaysIntakes.map(i => i.intakeTime.toISOString()).join(', ')}`);
-        const missedIntakes = allTodaysIntakes.filter(intake => intake.intakeTime.getTime() < now.getTime());
-        logger.info(`[IntakeReminder] User ${settings.userId}: Blister ${blisterIndex} found ${missedIntakes.length} missed intakes (past intake time)`);
+				const allTodaysIntakes = getTodaysIntakes(
+					med.name,
+					[intake],
+					medicationTakenBy,
+					med.pillWeightMg,
+					locale,
+					tz,
+					med.id,
+					med.doseUnit ?? "mg"
+				);
+				logger.debug(
+					`[IntakeReminder] User ${settings.userId}: Intake ${actualIndex} - all today's intakes: ${allTodaysIntakes.length}, times: ${allTodaysIntakes.map((i) => i.intakeTime.toISOString()).join(", ")}`
+				);
+				const missedIntakes = allTodaysIntakes.filter(
+					(todayIntake) => todayIntake.intakeTime.getTime() < now.getTime()
+				);
+				logger.debug(
+					`[IntakeReminder] User ${settings.userId}: Intake ${actualIndex} found ${missedIntakes.length} missed intakes (past intake time)`
+				);
 
 				// Add missed intakes for repeat reminders (only if not already in upcoming list)
-        const upcomingTimes = new Set(upcomingIntakes.map(i => i.intakeTime.getTime()));
-        allUpcoming.push(...missedIntakes
-          .filter(intake => !upcomingTimes.has(intake.intakeTime.getTime()))
-          .map(intake => ({
-            ...intake,
+				const upcomingTimes = new Set(upcomingIntakes.map((i) => i.intakeTime.getTime()));
+				allUpcoming.push(
+					...missedIntakes
+						.filter((missed) => !upcomingTimes.has(missed.intakeTime.getTime()))
+						.map((missed) => ({
+							...missed,
 							medicationId: med.id,
-            blisterIndex,
-          })));
+							blisterIndex: actualIndex,
+						}))
+				);
 			}
 		});
 	}
 
-  logger.info(`[IntakeReminder] User ${settings.userId}: Total ${allUpcoming.length} intakes for today`);
+	logger.debug(`[IntakeReminder] User ${settings.userId}: Total ${allUpcoming.length} intakes for today`);
 
 	if (allUpcoming.length === 0) {
-    logger.info(`[IntakeReminder] User ${settings.userId}: No intakes for today`);
+		logger.debug(`[IntakeReminder] User ${settings.userId}: No intakes for today`);
 		return; // No upcoming intakes for today
 	}
 
 	// Determine which doses need reminders (new or repeated)
 	const nowMs = Date.now();
-  let remindersToSend: typeof allUpcoming = [];
+	const maxReminders = settings.maxNaggingReminders ?? 5;
+	type ReminderWithCount = (typeof allUpcoming)[number] & {
+		currentSendCount: number; // 0 = advance reminder (no counter), 1+ = nagging count
+		maxReminders: number;
+		isAdvanceReminder: boolean; // true if this is the 15-min-before reminder
+	};
+	let remindersToSend: ReminderWithCount[] = [];
 
 	for (const intake of allUpcoming) {
 		const key = `user_${settings.userId}:${intake.medName}:${intake.intakeTime.getTime()}`;
@@ -318,21 +414,58 @@ async function checkAndSendIntakeRemindersForUser(
 		const isIntakePast = intakeTimeMs < nowMs;
 
 		if (!existingEntry) {
-      // New dose - always send first reminder (upcoming or already missed)
-      remindersToSend.push(intake);
-      logger.info(`[IntakeReminder] User ${settings.userId}: First reminder for "${intake.medName}" at ${intake.intakeTimeStr} (${isIntakePast ? 'missed' : 'upcoming'})`);
+			// New dose - send first reminder
+			if (isIntakePast) {
+				// Intake time already passed and we have no state entry. Check how recently it was missed.
+				const minutesSinceIntake = (nowMs - intakeTimeMs) / 60000;
+				const gracePeriodMinutes = (settings.reminderRepeatIntervalMinutes ?? 30) + REMINDER_MINUTES_BEFORE;
+
+				if (minutesSinceIntake <= gracePeriodMinutes) {
+					// Recently missed — scheduler likely recovered from sleep/restart.
+					// Send a catch-up reminder (counts as first nagging reminder).
+					remindersToSend.push({ ...intake, currentSendCount: 1, maxReminders, isAdvanceReminder: false });
+					logger.info(
+						`[IntakeReminder] User ${settings.userId}: Catch-up reminder for recently missed "${intake.medName}" at ${intake.intakeTimeStr} (${Math.round(minutesSinceIntake)} min ago)`
+					);
+				} else {
+					// Long ago — seed state without notification (user likely already noticed)
+					state.reminders[key] = {
+						firstSentAt: nowMs,
+						lastSentAt: nowMs,
+						sendCount: 0,
+						advanceSent: false,
+					};
+					logger.debug(
+						`[IntakeReminder] User ${settings.userId}: Seeding state for old past "${intake.medName}" at ${intake.intakeTimeStr} (no notification — ${Math.round(minutesSinceIntake)} min ago)`
+					);
+				}
+			} else {
+				// Upcoming - this is advance reminder (no counter)
+				remindersToSend.push({ ...intake, currentSendCount: 0, maxReminders, isAdvanceReminder: true });
+				logger.debug(
+					`[IntakeReminder] User ${settings.userId}: Advance reminder for "${intake.medName}" at ${intake.intakeTimeStr}`
+				);
+			}
 		} else if (settings.repeatRemindersEnabled && isIntakePast) {
-      // Repeat reminder - only for intakes that are already past (missed)
+			// Intake time passed - check if we need to send nagging reminder
 			const intervalMs = settings.reminderRepeatIntervalMinutes * 60 * 1000;
 			const timeSinceLastReminder = nowMs - existingEntry.lastSentAt;
-      const maxReminders = settings.maxNaggingReminders ?? 5;
 
-      if (existingEntry.sendCount >= maxReminders) {
-        // Max reminders reached - stop nagging
-        logger.info(`[IntakeReminder] User ${settings.userId}: Max reminders (${maxReminders}) reached for "${intake.medName}" at ${intake.intakeTimeStr}`);
+			// If only advance reminder was sent (sendCount=0), first nagging has count=1
+			// Otherwise increment from current sendCount
+			const currentNaggingCount = existingEntry.sendCount;
+
+			if (currentNaggingCount >= maxReminders) {
+				// Max nagging reminders reached - stop
+				logger.debug(
+					`[IntakeReminder] User ${settings.userId}: Max nagging (${maxReminders}) reached for "${intake.medName}" at ${intake.intakeTimeStr}`
+				);
 			} else if (timeSinceLastReminder >= intervalMs) {
-        remindersToSend.push(intake);
-        logger.info(`[IntakeReminder] User ${settings.userId}: Repeat reminder for missed "${intake.medName}" at ${intake.intakeTimeStr} (${existingEntry.sendCount + 1}/${maxReminders})`);
+				const nextSendCount = currentNaggingCount + 1;
+				remindersToSend.push({ ...intake, currentSendCount: nextSendCount, maxReminders, isAdvanceReminder: false });
+				logger.debug(
+					`[IntakeReminder] User ${settings.userId}: Nagging reminder for "${intake.medName}" at ${intake.intakeTimeStr} (${nextSendCount}/${maxReminders})`
+				);
 			}
 		}
 		// Else: Already sent and either repeats disabled or intake not yet past - skip
@@ -345,7 +478,10 @@ async function checkAndSendIntakeRemindersForUser(
 	// If skipRemindersForTakenDoses is enabled, filter out doses that were already taken today
 	if (settings.skipRemindersForTakenDoses) {
 		// Query doses marked as taken today (takenAt is timestamp, stored as seconds since epoch)
-    const takenToday = await db.select().from(doseTracking).where(
+		const takenToday = await db
+			.select()
+			.from(doseTracking)
+			.where(
 				and(
 					eq(doseTracking.userId, settings.userId),
 					gte(doseTracking.takenAt, todayStart),
@@ -353,29 +489,40 @@ async function checkAndSendIntakeRemindersForUser(
 				)
 			);
 
-    const takenDoseIds = new Set(takenToday.map(d => d.doseId));
+		const takenDoseIds = new Set(takenToday.map((d) => d.doseId));
 
 		// Filter out reminders for doses that were already taken
-    remindersToSend = remindersToSend.filter(intake => {
-      const timestamp = intake.intakeTime.getTime();
+		remindersToSend = remindersToSend.filter((intake) => {
+			// Convert to date-only timestamp (midnight) to match frontend dose ID format
+			const intakeDate = intake.intakeTime;
+			const dateOnlyMs = new Date(intakeDate.getFullYear(), intakeDate.getMonth(), intakeDate.getDate()).getTime();
 
 			// Check both with and without person suffix
-      if (intake.takenBy.length > 0) {
-        // For multi-person medications, check if any person has taken it
-        const anyTaken = intake.takenBy.some(person => {
-          const doseId = `${intake.medicationId}-${intake.blisterIndex}-${timestamp}-${person}`;
-          return takenDoseIds.has(doseId);
-        });
-        return !anyTaken; // Skip if any person has taken it
+			if (intake.takenBy) {
+				// For person-specific intake, check if that person has taken it
+				const doseId = `${intake.medicationId}-${intake.blisterIndex}-${dateOnlyMs}-${intake.takenBy}`;
+				const isTaken = takenDoseIds.has(doseId);
+				if (isTaken) {
+					logger.debug(
+						`[IntakeReminder] User ${settings.userId}: Skipping "${intake.medName}" - dose ${doseId} already taken`
+					);
+				}
+				return !isTaken;
 			} else {
-        // For non-person-specific medications
-        const doseId = `${intake.medicationId}-${intake.blisterIndex}-${timestamp}`;
-        return !takenDoseIds.has(doseId);
+				// For non-person-specific intakes
+				const doseId = `${intake.medicationId}-${intake.blisterIndex}-${dateOnlyMs}`;
+				const isTaken = takenDoseIds.has(doseId);
+				if (isTaken) {
+					logger.debug(
+						`[IntakeReminder] User ${settings.userId}: Skipping "${intake.medName}" - dose ${doseId} already taken`
+					);
+				}
+				return !isTaken;
 			}
 		});
 
 		if (remindersToSend.length === 0) {
-      logger.info(`[IntakeReminder] User ${settings.userId}: All doses taken, skipping reminders`);
+			logger.debug(`[IntakeReminder] User ${settings.userId}: All doses taken, skipping reminders`);
 			return;
 		}
 	}
@@ -385,7 +532,7 @@ async function checkAndSendIntakeRemindersForUser(
 	// Determine if this is a repeat reminder:
 	// - Any intake already has a state entry AND is past (repeat after first reminder)
 	// - OR intake is past even without state entry (missed the 15-min window)
-  const isRepeatReminder = remindersToSend.some(intake => {
+	const isRepeatReminder = remindersToSend.some((intake) => {
 		const intakeTimeMs = intake.intakeTime.getTime();
 		const isIntakePast = intakeTimeMs < nowMs;
 		return isIntakePast; // Use repeat message for ANY missed intake
@@ -396,12 +543,19 @@ async function checkAndSendIntakeRemindersForUser(
 
 	// Send email if enabled for intake reminders
 	if (emailEnabled) {
+		// Calculate counts for repeat reminder text
+		const hasNaggingReminder = remindersToSend.some((r) => !r.isAdvanceReminder);
+		const highestSendCount = Math.max(...remindersToSend.map((r) => r.currentSendCount));
+		const maxReminderCount = remindersToSend[0]?.maxReminders ?? 5;
+
 		const result = await sendIntakeReminderEmail(
 			settings.notificationEmail!,
 			remindersToSend,
 			language,
 			isRepeatReminder,
-      settings.reminderRepeatIntervalMinutes
+			settings.reminderRepeatIntervalMinutes,
+			hasNaggingReminder ? highestSendCount : undefined,
+			hasNaggingReminder ? maxReminderCount : undefined
 		);
 		emailSuccess = result.success;
 		if (result.success) {
@@ -413,17 +567,50 @@ async function checkAndSendIntakeRemindersForUser(
 
 	// Send Shoutrrr notification if enabled for intake reminders
 	if (shoutrrrEnabled) {
-    const title = isRepeatReminder
-      ? (language === 'de' ? '⚠️ Medikamenten-Erinnerung' : '⚠️ Medication Reminder')
-      : t(tr.push.intakeTitle, { minutes: REMINDER_MINUTES_BEFORE });
+		// Check if any reminder is a nagging reminder (not advance)
+		const hasNaggingReminder = remindersToSend.some((r) => !r.isAdvanceReminder);
+		const highestSendCount = Math.max(...remindersToSend.map((r) => r.currentSendCount));
+		const maxReminderCount = remindersToSend[0]?.maxReminders ?? 5;
 
-    const repeatNote = isRepeatReminder && settings.reminderRepeatIntervalMinutes
-      ? `\n\n⚠️ This reminder will be sent every ${settings.reminderRepeatIntervalMinutes} minutes until marked as taken.`
-      : '';
+		let title: string;
+		if (hasNaggingReminder && highestSendCount > 0) {
+			// Nagging reminder - show counter
+			const counterStr = `(${highestSendCount}/${maxReminderCount})`;
+			title =
+				language === "de"
+					? `⚠️ Erinnerung: Medikamenteneinnahme ${counterStr}`
+					: `⚠️ Reminder: Medication intake ${counterStr}`;
+		} else {
+			// Advance reminder - no counter
+			title = t(tr.push.intakeTitle, { minutes: REMINDER_MINUTES_BEFORE });
+		}
 
-    const message = remindersToSend
+		// Only show repeat note for nagging reminders, not for advance reminders
+		let repeatNote = "";
+		if (hasNaggingReminder && settings.reminderRepeatIntervalMinutes) {
+			const remainingReminders = maxReminderCount - highestSendCount;
+			if (remainingReminders <= 0) {
+				// Last reminder
+				repeatNote = language === "de" ? "\n\n⚠️ Dies ist die letzte Erinnerung." : "\n\n⚠️ This is the last reminder.";
+			} else if (remainingReminders === 1) {
+				// One more reminder
+				repeatNote =
+					language === "de"
+						? `\n\nℹ️ Eine weitere Erinnerung wird in ${settings.reminderRepeatIntervalMinutes} Minuten gesendet.`
+						: `\n\nℹ️ One more reminder will be sent in ${settings.reminderRepeatIntervalMinutes} minutes.`;
+			} else {
+				// Multiple reminders remaining
+				repeatNote =
+					language === "de"
+						? `\n\nℹ️ ${remainingReminders} weitere Erinnerungen werden alle ${settings.reminderRepeatIntervalMinutes} Minuten gesendet.`
+						: `\n\nℹ️ ${remainingReminders} more reminders will be sent every ${settings.reminderRepeatIntervalMinutes} minutes.`;
+			}
+		}
+
+		const message =
+			remindersToSend
 				.map((i) => {
-        const takenByStr = i.takenBy.length > 0 ? ` ${t(tr.intakeReminder.takenBy, { name: i.takenBy.join(", ") })}` : "";
+					const takenByStr = i.takenBy ? ` ${t(tr.intakeReminder.takenBy, { name: i.takenBy })}` : "";
 					let dosage = `${i.usage} ${i.usage === 1 ? tr.common.pill : tr.common.pills}`;
 					if (i.pillWeightMg) {
 						const totalMg = i.usage * i.pillWeightMg;
@@ -431,7 +618,9 @@ async function checkAndSendIntakeRemindersForUser(
 					}
 					return `• ${i.medName}${takenByStr}: ${dosage} @ ${i.intakeTimeStr}`;
 				})
-      .join("\n") + repeatNote;
+				.join("\n") +
+			repeatNote +
+			`\n\n---\n${getFooterPlain(language)}`;
 
 		const result = await sendShoutrrrNotification(settings.shoutrrrUrl!, title, message);
 		shoutrrrSuccess = result.success;
@@ -450,21 +639,44 @@ async function checkAndSendIntakeRemindersForUser(
 			const existing = state.reminders[key];
 
 			if (existing) {
-        // Update existing entry (repeat)
+				// Update existing entry
+				if (intake.isAdvanceReminder) {
+					// Advance reminder - don't increment nagging count
+					state.reminders[key] = {
+						...existing,
+						lastSentAt: nowMs,
+						advanceSent: true,
+					};
+				} else {
+					// Nagging reminder - increment count
 					state.reminders[key] = {
 						firstSentAt: existing.firstSentAt,
 						lastSentAt: nowMs,
 						sendCount: existing.sendCount + 1,
+						advanceSent: existing.advanceSent,
+					};
+				}
+			} else {
+				// Create new entry
+				if (intake.isAdvanceReminder) {
+					// Advance reminder - sendCount stays 0
+					state.reminders[key] = {
+						firstSentAt: nowMs,
+						lastSentAt: nowMs,
+						sendCount: 0,
+						advanceSent: true,
 					};
 				} else {
-        // Create new entry (first send)
+					// First nagging reminder - sendCount starts at 1
 					state.reminders[key] = {
 						firstSentAt: nowMs,
 						lastSentAt: nowMs,
 						sendCount: 1,
+						advanceSent: false,
 					};
 				}
 			}
+		}
 
 		// Clean up old entries (remove doses from past days)
 		state.reminders = cleanOldIntakeReminders(state.reminders, tz);
@@ -476,13 +688,17 @@ async function checkAndSendIntakeRemindersForUser(
 		updateReminderSentTime("intake", channel);
 
 		// Also update user settings in database so frontend can display the info
-    await updateUserReminderSentTime(settings.userId, "intake", channel);
+		// Get the first reminder's medication name and taken by for display
+		const firstReminder = remindersToSend[0];
+		const medName = firstReminder?.medName;
+		const takenBy = firstReminder?.takenBy || undefined;
+		await updateUserReminderSentTime(settings.userId, "intake", channel, medName, takenBy);
 	}
 }
 
 let intakeCheckInterval: NodeJS.Timeout | null = null;
 
-export function startIntakeReminderScheduler(logger: { info: (msg: string) => void; error: (msg: string) => void }): void {
+export function startIntakeReminderScheduler(logger: ServiceLogger): void {
 	logger.info(`[IntakeReminder] Starting intake reminder scheduler (checks every minute)...`);
 
 	// Run immediately on start

backend/src/services/reminder-scheduler.ts

@@ -1,32 +1,32 @@
-import nodemailer from "nodemailer";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
 import { eq } from "drizzle-orm";
+import nodemailer from "nodemailer";
 import { db } from "../db/client.js";
+import { getDataDir } from "../db/db-utils.js";
 import { medications, userSettings } from "../db/schema.js";
-import { readFileSync, writeFileSync, existsSync } from "fs";
-import { resolve } from "path";
-import { loadUserSettings, getAllUserSettings, sendShoutrrrNotification, type UserSettings } from "../routes/settings.js";
-import { getTranslations, t, type Language } from "../i18n/translations.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 shared utilities
 import {
-  getTimezone,
+	type Blister,
+	calculateDepletionInfo,
+	createDefaultReminderState,
 	formatInTimezone,
 	getCurrentHourInTimezone,
-  getTodayInTimezone,
-  getNextScheduledTime,
 	getMsUntilNextCheck,
+	getNextScheduledTime,
+	getTimezone,
+	getTodayInTimezone,
 	parseBlisters,
-  calculateDailyUsage,
-  calculateDepletionInfo,
 	parseReminderState,
-  createDefaultReminderState,
-  type Blister,
 	type ReminderState,
 } from "../utils/scheduler-utils.js";
 
 const REMINDER_HOUR = parseInt(process.env.REMINDER_HOUR ?? "6", 10); // Default 6:00 AM local time
 
-const reminderStateFile = resolve(process.cwd(), "data", "reminder-state.json");
+const reminderStateFile = resolve(getDataDir(), "reminder-state.json");
 
 function loadReminderState(): ReminderState {
 	try {
@@ -47,7 +47,10 @@ export function getReminderState(): ReminderState {
 	return loadReminderState();
 }
 
-export function updateReminderSentTime(type: "stock" | "intake" = "stock", channel: "email" | "push" | "both" = "email"): void {
+export function updateReminderSentTime(
+	type: "stock" | "intake" = "stock",
+	channel: "email" | "push" | "both" = "email"
+): void {
 	const state = loadReminderState();
 	const today = getTodayInTimezone();
 	saveReminderState({
@@ -60,19 +63,39 @@ export function updateReminderSentTime(type: "stock" | "intake" = "stock", chann
 }
 
 // Update user settings in database when reminder is sent
+// Stock and intake reminders are tracked separately so neither overwrites the other
 export async function updateUserReminderSentTime(
 	userId: number,
 	type: "stock" | "intake" = "stock",
-  channel: "email" | "push" | "both" = "email"
+	channel: "email" | "push" | "both" = "email",
+	medName?: string,
+	takenBy?: string
 ): Promise<void> {
 	const now = new Date().toISOString();
-  await db.update(userSettings)
+	if (type === "stock") {
+		// Write to dedicated stock reminder columns only — do NOT touch the shared
+		// lastNotificationType column, as that would block intake reminder display
+		await db
+			.update(userSettings)
+			.set({
+				lastStockReminderSent: now,
+				lastStockReminderChannel: channel,
+				lastStockReminderMedNames: medName ?? null,
+			})
+			.where(eq(userSettings.userId, userId));
+	} else {
+		// Write to intake reminder columns
+		await db
+			.update(userSettings)
 			.set({
 				lastAutoEmailSent: now,
 				lastNotificationType: type,
 				lastNotificationChannel: channel,
+				lastReminderMedName: medName ?? null,
+				lastReminderTakenBy: takenBy ?? null,
 			})
 			.where(eq(userSettings.userId, userId));
+	}
 }
 
 function parseBlistersFromRow(row: { usageJson: string; everyJson: string; startJson: string }): Blister[] {
@@ -86,14 +109,21 @@ type LowStockItem = {
 	depletionDate: string | null;
 };
 
-async function getMedicationsNeedingReminder(userId: number, reminderDaysBefore: number, language: Language): Promise<LowStockItem[]> {
+async function getMedicationsNeedingReminder(
+	userId: number,
+	reminderDaysBefore: number,
+	language: Language
+): Promise<LowStockItem[]> {
 	const rows = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
 
 	const lowStock: LowStockItem[] = [];
 
 	for (const row of rows) {
 		const blisters = parseBlistersFromRow(row);
-    const totalPills = row.packCount * row.blistersPerPack * row.pillsPerBlister + row.looseTablets;
+		const totalPills =
+			(row.packageType ?? "blister") === "bottle"
+				? row.looseTablets + (row.stockAdjustment ?? 0)
+				: row.packCount * row.blistersPerPack * row.pillsPerBlister + row.looseTablets + (row.stockAdjustment ?? 0);
 		const { daysLeft, depletionDate } = calculateDepletionInfo({ count: totalPills, blisters }, language);
 
 		// Check if medication runs out within reminderDaysBefore days
@@ -110,11 +140,16 @@ async function getMedicationsNeedingReminder(userId: number, reminderDaysBefore:
 	return lowStock;
 }
 
-async function sendReminderEmail(email: string, lowStock: LowStockItem[], language: Language, isRepeatDaily: boolean = false): Promise<{ success: boolean; error?: string }> {
+async function sendReminderEmail(
+	email: string,
+	lowStock: LowStockItem[],
+	language: Language,
+	isRepeatDaily: boolean = false
+): Promise<{ success: boolean; error?: 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
-  const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
+	const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
 	const smtpSecure = process.env.SMTP_SECURE === "true";
 	const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
@@ -136,7 +171,8 @@ async function sendReminderEmail(email: string, lowStock: LowStockItem[], langua
 		)
 		.join("");
 
-  const alertText = lowStock.length === 1 
+	const alertText =
+		lowStock.length === 1
 			? tr.stockReminder.alertSingle
 			: t(tr.stockReminder.alertMultiple, { count: lowStock.length });
 
@@ -170,7 +206,7 @@ async function sendReminderEmail(email: string, lowStock: LowStockItem[], langua
 
         <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
         <p style="color: #9ca3af; font-size: 11px; margin: 0;">
-          ${tr.stockReminder.footer}
+          ${getFooterHtml(language)}
         </p>
         ${isRepeatDaily ? `<p style="color: #9ca3af; font-size: 11px; margin: 8px 0 0 0; font-style: italic;">${tr.stockReminder.repeatDailyNote}</p>` : ""}
       </div>
@@ -184,9 +220,9 @@ ${tr.stockReminder.description}
 ${lowStock.map((r) => `${r.name}: ${r.medsLeft} ${tr.common.pills}, ${r.daysLeft ?? 0} ${tr.common.days}, ${tr.stockReminder.tableHeaders.runsOut}: ${r.depletionDate ?? tr.common.soon}`).join("\n")}
 
 ---
-${tr.stockReminder.footer}${isRepeatDaily ? `\n\n${tr.stockReminder.repeatDailyNote}` : ""}`;
+${getFooterPlain(language)}${isRepeatDaily ? `\n\n${tr.stockReminder.repeatDailyNote}` : ""}`;
 
-  const subjectPlural = lowStock.length === 1 ? "" : (language === "de" ? "e" : "s");
+	const subjectPlural = lowStock.length === 1 ? "" : language === "de" ? "e" : "s";
 	const subject = t(tr.stockReminder.subject, { count: lowStock.length, s: subjectPlural, e: subjectPlural });
 
 	try {
@@ -215,12 +251,12 @@ ${tr.stockReminder.footer}${isRepeatDaily ? `\n\n${tr.stockReminder.repeatDailyN
 	}
 }
 
-async function checkAndSendReminder(logger: { info: (msg: string) => void; error: (msg: string) => void }): Promise<void> {
+async function checkAndSendReminder(logger: ServiceLogger): Promise<void> {
 	// Get all user settings to iterate over each user
 	const allUserSettings = await getAllUserSettings();
 
 	if (allUserSettings.length === 0) {
-    logger.info("[Reminder] No users with settings found");
+		logger.debug("[Reminder] No users with settings found");
 		return;
 	}
 
@@ -231,7 +267,7 @@ async function checkAndSendReminder(logger: { info: (msg: string) => void; error
 
 async function checkAndSendReminderForUser(
 	settings: UserSettings & { userId: number },
-  logger: { info: (msg: string) => void; error: (msg: string) => void }
+	logger: ServiceLogger
 ): Promise<void> {
 	const language = settings.language;
 	const tr = getTranslations(language);
@@ -268,7 +304,12 @@ async function checkAndSendReminderForUser(
 
 	// Send email if enabled
 	if (emailEnabled) {
-    const result = await sendReminderEmail(settings.notificationEmail!, allLowStock, language, settings.repeatDailyReminders);
+		const result = await sendReminderEmail(
+			settings.notificationEmail!,
+			allLowStock,
+			language,
+			settings.repeatDailyReminders
+		);
 		emailSuccess = result.success;
 		if (result.success) {
 			logger.info(`[Reminder] User ${settings.userId}: Email sent successfully to ${settings.notificationEmail}`);
@@ -279,30 +320,34 @@ async function checkAndSendReminderForUser(
 
 	// Send Shoutrrr notification if enabled
 	if (shoutrrrEnabled) {
-    // Separate empty from low stock medications
-    const emptyMeds = allLowStock.filter(m => m.medsLeft <= 0);
-    const lowMeds = allLowStock.filter(m => m.medsLeft > 0);
+		// Separate empty from critical stock medications (all auto-reminder meds are critical by definition)
+		const emptyMeds = allLowStock.filter((m) => m.medsLeft <= 0);
+		const criticalMeds = allLowStock.filter((m) => m.medsLeft > 0);
 
 		// Build clear title
 		const titleParts: string[] = [];
 		if (emptyMeds.length > 0) {
 			titleParts.push(`🚨 ${emptyMeds.length} ${tr.push.empty || "Empty"}`);
 		}
-    if (lowMeds.length > 0) {
-      titleParts.push(`⚠️ ${lowMeds.length} ${tr.push.low || "Low"}`);
+		if (criticalMeds.length > 0) {
+			titleParts.push(`🚨 ${criticalMeds.length} ${tr.push.critical || "Critical"}`);
 		}
 		const title = `MedAssist: ${titleParts.join(", ")} - ${tr.push.reorderNow || "Reorder Now!"}`;
 
 		// Build clear message with sections
 		const messageParts: string[] = [];
 		if (emptyMeds.length > 0) {
-      messageParts.push(`🚨 ${tr.push.emptySection || "EMPTY (reorder immediately)"}:`);
-      emptyMeds.forEach(m => messageParts.push(`  • ${m.name}`));
+			messageParts.push(`🚨 ${tr.push.emptySection || "Empty (reorder immediately)"}:`);
+			emptyMeds.forEach((m) => messageParts.push(`  • ${m.name}`));
 		}
-    if (lowMeds.length > 0) {
+		if (criticalMeds.length > 0) {
 			if (emptyMeds.length > 0) messageParts.push("");
-      messageParts.push(`⚠️ ${tr.push.lowSection || "RUNNING LOW (reorder soon)"}:`);
-      lowMeds.forEach(m => messageParts.push(`  • ${m.name}: ${t(tr.push.pillsLeft, { count: m.medsLeft })}, ${t(tr.push.daysLeft, { count: m.daysLeft ?? 0 })}`));
+			messageParts.push(`🚨 ${tr.push.criticalSection || "Running critically low"}:`);
+			criticalMeds.forEach((m) =>
+				messageParts.push(
+					`  • ${m.name}: ${t(tr.push.pillsLeft, { count: m.medsLeft })}, ${t(tr.push.daysLeft, { count: m.daysLeft ?? 0 })}`
+				)
+			);
 		}
 
 		if (settings.repeatDailyReminders) {
@@ -310,7 +355,7 @@ async function checkAndSendReminderForUser(
 			messageParts.push(tr.push.repeatDailyNote);
 		}
 
-    const message = messageParts.join("\n");
+		const message = messageParts.join("\n") + `\n\n---\n${getFooterPlain(language)}`;
 
 		const result = await sendShoutrrrNotification(settings.shoutrrrUrl!, title, message);
 		shoutrrrSuccess = result.success;
@@ -335,13 +380,16 @@ async function checkAndSendReminderForUser(
 		});
 
 		// Also update user settings in database so frontend can display the info
-    await updateUserReminderSentTime(settings.userId, "stock", channel);
+		// For stock reminders, show the first medication name
+		const firstMed = allLowStock[0];
+		const medNames = allLowStock.length > 1 ? `${firstMed.name} (+${allLowStock.length - 1})` : firstMed?.name;
+		await updateUserReminderSentTime(settings.userId, "stock", channel, medNames);
 	}
 }
 
 let schedulerTimeout: NodeJS.Timeout | null = null;
 
-function scheduleNextCheck(logger: { info: (msg: string) => void; error: (msg: string) => void }): void {
+function scheduleNextCheck(logger: ServiceLogger): void {
 	const msUntilNext = getMsUntilNextCheck(REMINDER_HOUR);
 	const nextTime = getNextScheduledTime(REMINDER_HOUR);
 
@@ -352,7 +400,9 @@ function scheduleNextCheck(logger: { info: (msg: string) => void; error: (msg: s
 		nextScheduledCheck: nextTime.toISOString(),
 	});
 
-  logger.info(`[Reminder] Next check scheduled for ${formatInTimezone(nextTime)} (${getTimezone()}) (in ${Math.round(msUntilNext / 1000 / 60)} minutes)`);
+	logger.debug(
+		`[Reminder] Next check scheduled for ${formatInTimezone(nextTime)} (${getTimezone()}) (in ${Math.round(msUntilNext / 1000 / 60)} minutes)`
+	);
 
 	schedulerTimeout = setTimeout(() => {
 		checkAndSendReminder(logger).catch((err) => logger.error(`[Reminder] Error: ${err}`));
@@ -361,7 +411,7 @@ function scheduleNextCheck(logger: { info: (msg: string) => void; error: (msg: s
 	}, msUntilNext);
 }
 
-export function startReminderScheduler(logger: { info: (msg: string) => void; error: (msg: string) => void }): void {
+export function startReminderScheduler(logger: ServiceLogger): void {
 	logger.info(`[Reminder] Starting reminder scheduler (timezone: ${getTimezone()})...`);
 
 	// Check if we need to run immediately (missed today's check)

backend/src/test/auth.test.ts

@@ -1,13 +1,13 @@
 /**
  * E2E Tests for auth routes with AUTH_ENABLED=true
  */
-import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from "vitest";
-import Fastify, { FastifyInstance } from "fastify";
+
 import cookie from "@fastify/cookie";
 import jwt from "@fastify/jwt";
 import sensible from "@fastify/sensible";
-import { createClient, Client } from "@libsql/client";
-import { drizzle } from "drizzle-orm/libsql";
+import type { Client } from "@libsql/client";
+import Fastify, { type FastifyInstance } from "fastify";
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 // Use vi.hoisted to create the db BEFORE mocks are set up
 const { testClient, testDb } = vi.hoisted(() => {
@@ -327,7 +327,7 @@ describe("Auth Routes (AUTH_ENABLED=true)", () => {
 	describe("POST /auth/refresh", () => {
 		it("should refresh access token with valid refresh token", async () => {
 			// Login first to get tokens
-      const loginResponse = await app.inject({
+			const _loginResponse = await app.inject({
 				method: "POST",
 				url: "/auth/login",
 				payload: {
@@ -682,4 +682,62 @@ describe("Auth Routes (AUTH_ENABLED=true)", () => {
 			expect(response.statusCode).toBe(401);
 		});
 	});
+
+	describe("DELETE /auth/me - Delete Account", () => {
+		it("should delete user account and all data", async () => {
+			// Register and login
+			await app.inject({
+				method: "POST",
+				url: "/auth/register",
+				payload: {
+					username: "deleteuser",
+					password: "TestPassword123",
+				},
+			});
+
+			const login = await app.inject({
+				method: "POST",
+				url: "/auth/login",
+				payload: {
+					username: "deleteuser",
+					password: "TestPassword123",
+				},
+			});
+
+			const accessToken = login.cookies.find((c: any) => c.name === "access_token");
+
+			// Delete account
+			const response = await app.inject({
+				method: "DELETE",
+				url: "/auth/me",
+				cookies: {
+					access_token: accessToken?.value ?? "",
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json().ok).toBe(true);
+
+			// Verify can't login anymore
+			const loginAgain = await app.inject({
+				method: "POST",
+				url: "/auth/login",
+				payload: {
+					username: "deleteuser",
+					password: "TestPassword123",
+				},
+			});
+
+			expect(loginAgain.statusCode).toBe(401);
+		});
+
+		it("should reject delete without auth", async () => {
+			const response = await app.inject({
+				method: "DELETE",
+				url: "/auth/me",
+			});
+
+			expect(response.statusCode).toBe(401);
+		});
+	});
 });

backend/src/test/doses.test.ts

@@ -2,15 +2,8 @@
  * Tests for /doses/taken API endpoints.
  * Tests marking doses as taken, listing taken doses, and unmarking.
  */
-import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
-import {
-  buildTestApp,
-  closeTestApp,
-  clearTestData,
-  createTestUser,
-  createTestMedication,
-  TestContext,
-} from "./setup.js";
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { buildTestApp, clearTestData, closeTestApp, createTestUser, type TestContext } from "./setup.js";
 
 // =============================================================================
 // Route Registration
@@ -22,7 +15,7 @@ async function registerDoseRoutes(ctx: TestContext) {
 	const { app, client } = ctx;
 
 	// GET /doses/taken - List all taken doses
-  app.get("/doses/taken", async (request, reply) => {
+	app.get("/doses/taken", async (_request, _reply) => {
 		// In test mode, use user ID 1 (will be created in tests)
 		const userId = 1;
 
@@ -69,17 +62,68 @@ async function registerDoseRoutes(ctx: TestContext) {
 	});
 
 	// DELETE /doses/taken/:doseId - Unmark a dose
-  app.delete<{ Params: { doseId: string } }>("/doses/taken/:doseId", async (request, reply) => {
+	app.delete<{ Params: { doseId: string } }>("/doses/taken/:doseId", async (request, _reply) => {
 		const userId = 1;
 		const { doseId } = request.params;
 
+		// Check if this dose was also dismissed
+		const existing = await client.execute({
+			sql: `SELECT id, dismissed FROM dose_tracking WHERE user_id = ? AND dose_id = ?`,
+			args: [userId, doseId],
+		});
+
+		if (existing.rows.length > 0 && existing.rows[0].dismissed) {
+			// Already dismissed - keep the record as-is (don't delete)
+			// The dose stays dismissed, we just ignore the undo request
+		} else {
+			// Not dismissed - delete the record entirely
 			await client.execute({
 				sql: `DELETE FROM dose_tracking WHERE user_id = ? AND dose_id = ?`,
 				args: [userId, doseId],
 			});
+		}
 
 		return { success: true };
 	});
+
+	// POST /doses/dismiss - Dismiss missed doses without deducting stock
+	app.post<{ Body: { doseIds: string[] } }>("/doses/dismiss", async (request, reply) => {
+		const userId = 1;
+		const { doseIds } = request.body || {};
+
+		if (!doseIds || !Array.isArray(doseIds) || doseIds.length === 0) {
+			return reply.status(400).send({ error: "doseIds array is required" });
+		}
+
+		let dismissedCount = 0;
+		for (const doseId of doseIds) {
+			// Check if already exists
+			const existing = await client.execute({
+				sql: `SELECT id, dismissed FROM dose_tracking WHERE user_id = ? AND dose_id = ?`,
+				args: [userId, doseId],
+			});
+
+			if (existing.rows.length > 0) {
+				// Update to dismissed if not already
+				if (!existing.rows[0].dismissed) {
+					await client.execute({
+						sql: `UPDATE dose_tracking SET dismissed = 1 WHERE id = ?`,
+						args: [existing.rows[0].id],
+					});
+					dismissedCount++;
+				}
+			} else {
+				// Insert new dismissed record
+				await client.execute({
+					sql: `INSERT INTO dose_tracking (user_id, dose_id, dismissed) VALUES (?, ?, 1)`,
+					args: [userId, doseId],
+				});
+				dismissedCount++;
+			}
+		}
+
+		return { success: true, dismissedCount };
+	});
 }
 
 // =============================================================================
@@ -307,6 +351,43 @@ describe("Dose Tracking API", () => {
 			expect(response.statusCode).toBe(200);
 			expect(response.json()).toEqual({ success: true });
 		});
+
+		it("should preserve dismissed status when unmarking a dose", async () => {
+			const doseId = "1-0-1735344000000";
+
+			// First dismiss the dose
+			await ctx.app.inject({
+				method: "POST",
+				url: "/doses/dismiss",
+				payload: { doseIds: [doseId] },
+			});
+
+			// Verify it's dismissed
+			let result = await ctx.client.execute({
+				sql: `SELECT dismissed, taken_at FROM dose_tracking WHERE dose_id = ?`,
+				args: [doseId],
+			});
+			expect(result.rows[0].dismissed).toBe(1);
+			const originalTakenAt = result.rows[0].taken_at;
+
+			// Now try to unmark it (undo) - should keep the dismissed record
+			const response = await ctx.app.inject({
+				method: "DELETE",
+				url: `/doses/taken/${encodeURIComponent(doseId)}`,
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ success: true });
+
+			// Verify the record still exists and is still dismissed
+			result = await ctx.client.execute({
+				sql: `SELECT dose_id, dismissed, taken_at FROM dose_tracking WHERE dose_id = ?`,
+				args: [doseId],
+			});
+			expect(result.rows.length).toBe(1);
+			expect(result.rows[0].dismissed).toBe(1);
+			expect(result.rows[0].taken_at).toBe(originalTakenAt); // unchanged
+		});
 	});
 
 	// ---------------------------------------------------------------------------
@@ -361,4 +442,101 @@ describe("Dose Tracking API", () => {
 			expect(getResponse.json().doses[0].doseId).toBe(doseId);
 		});
 	});
+
+	// ---------------------------------------------------------------------------
+	// Dismiss Doses Tests (POST /doses/dismiss)
+	// ---------------------------------------------------------------------------
+
+	describe("POST /doses/dismiss", () => {
+		it("should dismiss multiple doses", async () => {
+			const doseIds = ["1-0-1735344000000", "1-0-1735430400000"];
+
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: "/doses/dismiss",
+				payload: { doseIds },
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ success: true, dismissedCount: 2 });
+
+			// Verify in database
+			const result = await ctx.client.execute({
+				sql: `SELECT dose_id, dismissed FROM dose_tracking WHERE user_id = ? AND dismissed = 1`,
+				args: [userId],
+			});
+			expect(result.rows.length).toBe(2);
+		});
+
+		it("should not double-count already dismissed doses", async () => {
+			const doseId = "1-0-1735344000000";
+
+			// Dismiss once
+			await ctx.app.inject({
+				method: "POST",
+				url: "/doses/dismiss",
+				payload: { doseIds: [doseId] },
+			});
+
+			// Dismiss again
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: "/doses/dismiss",
+				payload: { doseIds: [doseId] },
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ success: true, dismissedCount: 0 });
+		});
+
+		it("should reject empty doseIds array", async () => {
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: "/doses/dismiss",
+				payload: { doseIds: [] },
+			});
+
+			expect(response.statusCode).toBe(400);
+			expect(response.json()).toEqual({ error: "doseIds array is required" });
+		});
+
+		it("should reject missing doseIds", async () => {
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: "/doses/dismiss",
+				payload: {},
+			});
+
+			expect(response.statusCode).toBe(400);
+			expect(response.json()).toEqual({ error: "doseIds array is required" });
+		});
+
+		it("should dismiss a dose that was already taken (convert to dismissed)", async () => {
+			const doseId = "1-0-1735344000000";
+
+			// First mark as taken
+			await ctx.app.inject({
+				method: "POST",
+				url: "/doses/taken",
+				payload: { doseId },
+			});
+
+			// Then dismiss it
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: "/doses/dismiss",
+				payload: { doseIds: [doseId] },
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ success: true, dismissedCount: 1 });
+
+			// Verify it's now dismissed
+			const result = await ctx.client.execute({
+				sql: `SELECT dismissed FROM dose_tracking WHERE user_id = ? AND dose_id = ?`,
+				args: [userId, doseId],
+			});
+			expect(result.rows[0].dismissed).toBe(1);
+		});
+	});
 });

backend/src/test/env.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { z } from "zod";
 
 // Mock process.exit to prevent tests from exiting
@@ -8,23 +8,44 @@ vi.spyOn(process, "exit").mockImplementation(mockExit as any);
 // Re-create the schema from env.ts for testing
 const EnvSchema = z.object({
 	NODE_ENV: z.enum(["development", "production", "test"]).default("production"),
-  PORT: z.string().transform((v) => parseInt(v, 10)).default("3000"),
+	PORT: z
+		.string()
+		.transform((v) => parseInt(v, 10))
+		.default("3000"),
 	CORS_ORIGINS: z.string().default("http://localhost:5173,http://localhost:4173"),
 	LOG_LEVEL: z.string().default("info"),
-  AUTH_ENABLED: z.string().transform((v) => v === "true").default("false"),
-  REGISTRATION_ENABLED: z.string().transform((v) => v === "true").default("false"),
+	AUTH_ENABLED: z
+		.string()
+		.transform((v) => v === "true")
+		.default("false"),
+	REGISTRATION_ENABLED: z
+		.string()
+		.transform((v) => v === "true")
+		.default("false"),
 	JWT_SECRET: z.string().min(10).optional(),
 	REFRESH_SECRET: z.string().min(10).optional(),
 	COOKIE_SECRET: z.string().min(10).optional(),
-  ACCESS_TOKEN_TTL_MINUTES: z.string().transform((v) => parseInt(v, 10)).default("15"),
-  REFRESH_TOKEN_TTL_DAYS: z.string().transform((v) => parseInt(v, 10)).default("7"),
-  OIDC_ENABLED: z.string().transform((v) => v === "true").default("false"),
+	ACCESS_TOKEN_TTL_MINUTES: z
+		.string()
+		.transform((v) => parseInt(v, 10))
+		.default("15"),
+	REFRESH_TOKEN_TTL_DAYS: z
+		.string()
+		.transform((v) => parseInt(v, 10))
+		.default("7"),
+	OIDC_ENABLED: z
+		.string()
+		.transform((v) => v === "true")
+		.default("false"),
 	OIDC_ISSUER_URL: z.string().url().optional(),
 	OIDC_CLIENT_ID: z.string().optional(),
 	OIDC_CLIENT_SECRET: z.string().optional(),
 	OIDC_REDIRECT_URI: z.string().url().optional(),
 	OIDC_SCOPES: z.string().default("openid profile email"),
-  OIDC_AUTO_CREATE_USERS: z.string().transform((v) => v === "true").default("true"),
+	OIDC_AUTO_CREATE_USERS: z
+		.string()
+		.transform((v) => v === "true")
+		.default("true"),
 	OIDC_USERNAME_CLAIM: z.string().default("preferred_username"),
 	OIDC_PROVIDER_NAME: z.string().default("SSO"),
 });

backend/src/test/export.test.ts

@@ -2,16 +2,17 @@
  * Tests for /export and /import API endpoints.
  * Tests export/import functionality with schema-independent format.
  */
-import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
+
+import { randomBytes } from "node:crypto";
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import {
 	buildTestApp,
-  closeTestApp,
 	clearTestData,
-  createTestUser,
+	closeTestApp,
 	createTestMedication,
-  TestContext,
+	createTestUser,
+	type TestContext,
 } from "./setup.js";
-import { randomBytes } from "crypto";
 
 // =============================================================================
 // Route Registration (simplified test routes)
@@ -36,7 +37,7 @@ async function registerExportRoutes(ctx: TestContext) {
 	}
 
 	// GET /export
-  app.get<{ Querystring: { includeSensitive?: string } }>("/export", async (request, reply) => {
+	app.get<{ Querystring: { includeSensitive?: string } }>("/export", async (request, _reply) => {
 		const includeSensitive = request.query.includeSensitive === "true";
 
 		// Load medications
@@ -86,7 +87,7 @@ async function registerExportRoutes(ctx: TestContext) {
 					medicationRef: exportId,
 					scheduleIndex: parseInt(parts[1], 10),
 					scheduledTime: new Date(parseInt(parts[2], 10)).toISOString(),
-          takenAt: d.taken_at ? new Date(d.taken_at as number * 1000).toISOString() : new Date().toISOString(),
+					takenAt: d.taken_at ? new Date((d.taken_at as number) * 1000).toISOString() : new Date().toISOString(),
 					markedBy: d.marked_by,
 				};
 			})
@@ -98,7 +99,7 @@ async function registerExportRoutes(ctx: TestContext) {
 			args: [userId],
 		});
 
-    let settings = undefined;
+		let settings;
 		if (settingsResult.rows.length > 0) {
 			const s = settingsResult.rows[0];
 			settings = {
@@ -133,7 +134,7 @@ async function registerExportRoutes(ctx: TestContext) {
 		const shareLinks = sharesResult.rows.map((s) => ({
 			takenBy: s.taken_by,
 			scheduleDays: s.schedule_days ?? 30,
-      expiresAt: s.expires_at ? new Date(s.expires_at as number * 1000).toISOString() : null,
+			expiresAt: s.expires_at ? new Date((s.expires_at as number) * 1000).toISOString() : null,
 			regenerateToken: true,
 		}));
 
@@ -210,12 +211,7 @@ async function registerExportRoutes(ctx: TestContext) {
 
 			await client.execute({
 				sql: `INSERT INTO dose_tracking (user_id, dose_id, taken_at, marked_by) VALUES (?, ?, ?, ?)`,
-        args: [
-          userId,
-          doseId,
-          Math.floor(new Date(dose.takenAt).getTime() / 1000),
-          dose.markedBy || null,
-        ],
+				args: [userId, doseId, Math.floor(new Date(dose.takenAt).getTime() / 1000), dose.markedBy || null],
 			});
 		}
 
@@ -518,9 +514,7 @@ describe("Export/Import API", () => {
 							looseTablets: 5,
 						},
 						pillWeightMg: 250,
-            schedules: [
-              { usage: 1, every: 1, start: "2025-01-15T08:00:00.000Z", remind: true },
-            ],
+						schedules: [{ usage: 1, every: 1, start: "2025-01-15T08:00:00.000Z", remind: true }],
 						expiryDate: "2027-12-31",
 						notes: "Test notes",
 						intakeRemindersEnabled: true,
@@ -820,9 +814,7 @@ describe("Export/Import API", () => {
 							pillsPerBlister: 10,
 							looseTablets: 0,
 						},
-            schedules: [
-              { usage: 1, every: 1, start: "2025-01-15T08:00:00.000Z" },
-            ],
+						schedules: [{ usage: 1, every: 1, start: "2025-01-15T08:00:00.000Z" }],
 					},
 				],
 				doseHistory: [],

backend/src/test/integration.test.ts

@@ -2,14 +2,14 @@
  * Integration Tests - Testing interactions between multiple routes/features
  * These tests verify critical app behavior that spans multiple components.
  */
-import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from "vitest";
-import Fastify, { FastifyInstance } from "fastify";
+
 import cookie from "@fastify/cookie";
 import jwt from "@fastify/jwt";
-import sensible from "@fastify/sensible";
 import fastifyMultipart from "@fastify/multipart";
-import { createClient, Client } from "@libsql/client";
-import { drizzle } from "drizzle-orm/libsql";
+import sensible from "@fastify/sensible";
+import type { Client } from "@libsql/client";
+import Fastify, { type FastifyInstance } from "fastify";
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 // Use vi.hoisted to create the db BEFORE mocks are set up
 const { testClient, testDb } = vi.hoisted(() => {
@@ -76,18 +76,25 @@ async function createSchema(client: Client) {
 		    name text NOT NULL,
 		    generic_name text,
 		    taken_by_json text NOT NULL DEFAULT '[]',
+		    package_type text NOT NULL DEFAULT 'blister',
 		    pack_count integer NOT NULL DEFAULT 1,
 		    blisters_per_pack integer NOT NULL DEFAULT 1,
 		    pills_per_blister integer NOT NULL DEFAULT 1,
+		    total_pills integer,
 		    loose_tablets integer NOT NULL DEFAULT 0,
+		    stock_adjustment integer NOT NULL DEFAULT 0,
+		    last_stock_correction_at integer,
 		    pill_weight_mg integer,
+		    dose_unit text DEFAULT 'mg',
 		    usage_json text NOT NULL DEFAULT '[]',
 		    every_json text NOT NULL DEFAULT '[]',
 		    start_json text NOT NULL DEFAULT '[]',
+		    intakes_json text NOT NULL DEFAULT '[]',
 		    image_url text,
 		    expiry_date text,
 		    notes text,
 		    intake_reminders_enabled integer NOT NULL DEFAULT 0,
+		    dismissed_until text,
 		    updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
 		    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
 		  )`,
@@ -114,9 +121,15 @@ async function createSchema(client: Client) {
       expiry_warning_days integer NOT NULL DEFAULT 90,
       language text NOT NULL DEFAULT 'en',
       stock_calculation_mode text NOT NULL DEFAULT 'automatic',
+      share_stock_status integer NOT NULL DEFAULT 1,
       last_auto_email_sent text,
       last_notification_type text,
       last_notification_channel text,
+      last_reminder_med_name text,
+      last_reminder_taken_by text,
+      last_stock_reminder_sent text,
+      last_stock_reminder_channel text,
+      last_stock_reminder_med_names text,
       updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
@@ -136,6 +149,7 @@ async function createSchema(client: Client) {
       dose_id text NOT NULL,
       taken_at integer NOT NULL DEFAULT (strftime('%s','now')),
       marked_by text,
+      dismissed integer NOT NULL DEFAULT 0,
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
 	];
@@ -160,7 +174,7 @@ async function clearData(client: Client) {
 
 describe("Integration Tests", () => {
 	let app: FastifyInstance;
-  const userId = 999999999;
+	const _userId = 999999999;
 
 	beforeAll(async () => {
 		await createSchema(testClient);
@@ -355,6 +369,196 @@ describe("Integration Tests", () => {
 		});
 	});
 
+	// ---------------------------------------------------------------------------
+	// Dose ID Migration on Schedule Changes
+	// ---------------------------------------------------------------------------
+
+	describe("Dose ID migration when schedule changes", () => {
+		it("should migrate dose IDs when weekly start day changes", async () => {
+			// Create a weekly medication starting Friday Oct 17
+			const createRes = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Weekly Med",
+					blisters: [{ usage: 1, every: 7, start: "2025-10-17T08:00:00" }],
+				},
+			});
+			const medId = createRes.json().id;
+
+			// Mark doses for Fridays (Oct 17, Oct 24, Oct 31)
+			const fri17 = new Date(2025, 9, 17).getTime(); // Oct 17
+			const fri24 = new Date(2025, 9, 24).getTime(); // Oct 24
+			const fri31 = new Date(2025, 9, 31).getTime(); // Oct 31
+
+			for (const ts of [fri17, fri24, fri31]) {
+				await app.inject({
+					method: "POST",
+					url: "/doses/taken",
+					payload: { doseId: `${medId}-0-${ts}` },
+				});
+			}
+
+			// Verify 3 doses exist
+			const before = await testClient.execute({
+				sql: `SELECT COUNT(*) as count FROM dose_tracking WHERE dose_id LIKE ?`,
+				args: [`${medId}-%`],
+			});
+			expect(before.rows[0].count).toBe(3);
+
+			// Change start to Saturday Oct 18 (shifts all future and past IDs)
+			await app.inject({
+				method: "PUT",
+				url: `/medications/${medId}`,
+				payload: {
+					name: "Weekly Med",
+					blisters: [{ usage: 1, every: 7, start: "2025-10-18T08:00:00" }],
+				},
+			});
+
+			// Doses should be migrated to Saturday dates
+			const sat18 = new Date(2025, 9, 18).getTime(); // Oct 18
+			const sat25 = new Date(2025, 9, 25).getTime(); // Oct 25
+			const nov1 = new Date(2025, 10, 1).getTime(); // Nov 1
+
+			const after = await testClient.execute({
+				sql: `SELECT dose_id FROM dose_tracking WHERE dose_id LIKE ? ORDER BY dose_id`,
+				args: [`${medId}-%`],
+			});
+			expect(after.rows.length).toBe(3);
+			const ids = after.rows.map((r: { dose_id: string }) => r.dose_id);
+			expect(ids).toContain(`${medId}-0-${sat18}`);
+			expect(ids).toContain(`${medId}-0-${sat25}`);
+			expect(ids).toContain(`${medId}-0-${nov1}`);
+		});
+
+		it("should migrate dose IDs with person suffix when schedule changes", async () => {
+			// Create weekly medication with takenBy person
+			const createRes = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Person Med",
+					intakes: [{ usage: 1, every: 7, start: "2025-10-17T08:00:00", takenBy: "Alice" }],
+				},
+			});
+			const medId = createRes.json().id;
+
+			// Mark dose with person suffix
+			const fri17 = new Date(2025, 9, 17).getTime();
+			await app.inject({
+				method: "POST",
+				url: "/doses/taken",
+				payload: { doseId: `${medId}-0-${fri17}-Alice` },
+			});
+
+			// Change start day
+			await app.inject({
+				method: "PUT",
+				url: `/medications/${medId}`,
+				payload: {
+					name: "Person Med",
+					intakes: [{ usage: 1, every: 7, start: "2025-10-18T08:00:00", takenBy: "Alice" }],
+				},
+			});
+
+			// Dose should be migrated with person suffix preserved
+			const sat18 = new Date(2025, 9, 18).getTime();
+			const after = await testClient.execute({
+				sql: `SELECT dose_id FROM dose_tracking WHERE dose_id LIKE ?`,
+				args: [`${medId}-%`],
+			});
+			expect(after.rows.length).toBe(1);
+			expect(after.rows[0].dose_id).toBe(`${medId}-0-${sat18}-Alice`);
+		});
+
+		it("should not migrate dose IDs when only time-of-day changes", async () => {
+			// Create daily medication at 08:00
+			const createRes = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Daily Med",
+					blisters: [{ usage: 1, every: 1, start: "2025-10-17T08:00:00" }],
+				},
+			});
+			const medId = createRes.json().id;
+
+			// Mark dose
+			const oct17 = new Date(2025, 9, 17).getTime();
+			await app.inject({
+				method: "POST",
+				url: "/doses/taken",
+				payload: { doseId: `${medId}-0-${oct17}` },
+			});
+
+			// Change only time from 08:00 to 20:00 (same date)
+			await app.inject({
+				method: "PUT",
+				url: `/medications/${medId}`,
+				payload: {
+					name: "Daily Med",
+					blisters: [{ usage: 1, every: 1, start: "2025-10-17T20:00:00" }],
+				},
+			});
+
+			// Dose ID should remain unchanged (dateOnlyMs is the same)
+			const after = await testClient.execute({
+				sql: `SELECT dose_id FROM dose_tracking WHERE dose_id LIKE ?`,
+				args: [`${medId}-%`],
+			});
+			expect(after.rows.length).toBe(1);
+			expect(after.rows[0].dose_id).toBe(`${medId}-0-${oct17}`);
+		});
+
+		it("should migrate dose IDs when interval changes from daily to every-other-day", async () => {
+			// Create daily medication starting Oct 17
+			const createRes = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Interval Med",
+					blisters: [{ usage: 1, every: 1, start: "2025-10-17T08:00:00" }],
+				},
+			});
+			const medId = createRes.json().id;
+
+			// Mark doses for Oct 17, 18, 19
+			const oct17 = new Date(2025, 9, 17).getTime();
+			const oct18 = new Date(2025, 9, 18).getTime();
+			const oct19 = new Date(2025, 9, 19).getTime();
+
+			for (const ts of [oct17, oct18, oct19]) {
+				await app.inject({
+					method: "POST",
+					url: "/doses/taken",
+					payload: { doseId: `${medId}-0-${ts}` },
+				});
+			}
+
+			// Change to every 2 days (Oct 17, 19, 21, ...)
+			await app.inject({
+				method: "PUT",
+				url: `/medications/${medId}`,
+				payload: {
+					name: "Interval Med",
+					blisters: [{ usage: 1, every: 2, start: "2025-10-17T08:00:00" }],
+				},
+			});
+
+			// Oct 17 stays (matches), Oct 18 → Oct 19 (nearest), Oct 19 → no match (already used)
+			// Actually: Oct 17 is exact match (no migration needed), Oct 18 maps to Oct 19 (within 1 day = half of 2),
+			// Oct 19 was the original schedule date but the new schedule also has Oct 19,
+			// which was already taken by Oct 18's migration
+			const after = await testClient.execute({
+				sql: `SELECT dose_id FROM dose_tracking WHERE dose_id LIKE ? ORDER BY dose_id`,
+				args: [`${medId}-%`],
+			});
+			// We should have at least the doses that could be mapped
+			expect(after.rows.length).toBeGreaterThanOrEqual(2);
+		});
+	});
+
 	// ---------------------------------------------------------------------------
 	// Share Link + Dose Tracking Integration
 	// ---------------------------------------------------------------------------
@@ -696,7 +900,16 @@ describe("Integration Tests", () => {
 	describe("Planner usage calculation", () => {
 		it("should calculate correct usage for daily medication", async () => {
 			// Create medication: 2 packs × 3 blisters × 10 pills = 60 pills total
-      // Schedule: 1 pill daily starting Jan 1
+			// Schedule: 1 pill daily starting tomorrow (future date)
+			const tomorrow = new Date();
+			tomorrow.setDate(tomorrow.getDate() + 1);
+			tomorrow.setHours(8, 0, 0, 0);
+			const intakeStart = tomorrow.toISOString();
+
+			const planEnd = new Date(tomorrow);
+			planEnd.setDate(planEnd.getDate() + 10);
+			const planEndStr = planEnd.toISOString();
+
 			await app.inject({
 				method: "POST",
 				url: "/medications",
@@ -706,17 +919,17 @@ describe("Integration Tests", () => {
 					blistersPerPack: 3,
 					pillsPerBlister: 10,
 					looseTablets: 0,
-          blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+					blisters: [{ usage: 1, every: 1, start: intakeStart }],
 				},
 			});
 
-      // Calculate usage for Jan 1-10 (10 days = 10 pills needed)
+			// Calculate usage for 10 days starting tomorrow
 			const response = await app.inject({
 				method: "POST",
 				url: "/medications/usage",
 				payload: {
-          startDate: "2025-01-01T00:00:00.000Z",
-          endDate: "2025-01-11T00:00:00.000Z", // 10 days
+					startDate: intakeStart,
+					endDate: planEndStr, // 10 days
 				},
 			});
 
@@ -725,13 +938,22 @@ describe("Integration Tests", () => {
 			expect(data).toHaveLength(1);
 			expect(data[0].medicationName).toBe("Daily Med");
 			expect(data[0].plannerUsage).toBe(10); // 10 days × 1 pill
-      // Note: 'enough' depends on current stock after consumption since start date
-      // Since test runs ~364 days after Jan 1, most pills are consumed
+			expect(data[0].totalPills).toBe(60); // Current stock is full (no consumption yet)
+			expect(data[0].enough).toBe(true);
 		});
 
 		it("should detect insufficient stock", async () => {
 			// Create medication: 1 pack × 1 blister × 5 pills = 5 pills total
-      // Schedule: 1 pill daily
+			// Schedule: 1 pill daily starting tomorrow
+			const tomorrow = new Date();
+			tomorrow.setDate(tomorrow.getDate() + 1);
+			tomorrow.setHours(8, 0, 0, 0);
+			const intakeStart = tomorrow.toISOString();
+
+			const planEnd = new Date(tomorrow);
+			planEnd.setDate(planEnd.getDate() + 10);
+			const planEndStr = planEnd.toISOString();
+
 			await app.inject({
 				method: "POST",
 				url: "/medications",
@@ -741,17 +963,17 @@ describe("Integration Tests", () => {
 					blistersPerPack: 1,
 					pillsPerBlister: 5,
 					looseTablets: 0,
-          blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+					blisters: [{ usage: 1, every: 1, start: intakeStart }],
 				},
 			});
 
-      // Calculate usage for 10 days (needs 10 pills, only have 5 originally)
+			// Calculate usage for 10 days (needs 10 pills, only have 5)
 			const response = await app.inject({
 				method: "POST",
 				url: "/medications/usage",
 				payload: {
-          startDate: "2025-01-01T00:00:00.000Z",
-          endDate: "2025-01-11T00:00:00.000Z",
+					startDate: intakeStart,
+					endDate: planEndStr,
 				},
 			});
 
@@ -763,7 +985,16 @@ describe("Integration Tests", () => {
 
 		it("should calculate weekly medication usage correctly", async () => {
 			// Create medication: 10 pills total
-      // Schedule: 1 pill every 7 days starting Jan 1
+			// Schedule: 1 pill every 7 days starting tomorrow
+			const tomorrow = new Date();
+			tomorrow.setDate(tomorrow.getDate() + 1);
+			tomorrow.setHours(8, 0, 0, 0);
+			const intakeStart = tomorrow.toISOString();
+
+			const planEnd = new Date(tomorrow);
+			planEnd.setDate(planEnd.getDate() + 35); // 35 days to get 5 weekly doses
+			const planEndStr = planEnd.toISOString();
+
 			await app.inject({
 				method: "POST",
 				url: "/medications",
@@ -772,29 +1003,42 @@ describe("Integration Tests", () => {
 					packCount: 1,
 					blistersPerPack: 1,
 					pillsPerBlister: 10,
-          blisters: [{ usage: 1, every: 7, start: "2025-01-01T08:00:00.000Z" }],
+					blisters: [{ usage: 1, every: 7, start: intakeStart }],
 				},
 			});
 
-      // Calculate usage for 30 days (should need ~4-5 pills)
+			// Calculate usage for 35 days (should need 5 pills)
 			const response = await app.inject({
 				method: "POST",
 				url: "/medications/usage",
 				payload: {
-          startDate: "2025-01-01T00:00:00.000Z",
-          endDate: "2025-01-31T00:00:00.000Z", // 30 days
+					startDate: intakeStart,
+					endDate: planEndStr,
 				},
 			});
 
 			expect(response.statusCode).toBe(200);
 			const data = response.json();
-      // Jan 1, 8, 15, 22, 29 = 5 doses
+			// Day 0, 7, 14, 21, 28 = 5 doses
 			expect(data[0].plannerUsage).toBe(5);
 		});
 
 		it("should handle multiple intake schedules per medication", async () => {
 			// Create medication with morning and evening doses
 			// 30 pills total, 1.5 pills per day (1 morning + 0.5 evening)
+			const tomorrow = new Date();
+			tomorrow.setDate(tomorrow.getDate() + 1);
+			tomorrow.setHours(8, 0, 0, 0);
+			const morningStart = tomorrow.toISOString();
+
+			const eveningStart = new Date(tomorrow);
+			eveningStart.setHours(20, 0, 0, 0);
+			const eveningStartStr = eveningStart.toISOString();
+
+			const planEnd = new Date(tomorrow);
+			planEnd.setDate(planEnd.getDate() + 10);
+			const planEndStr = planEnd.toISOString();
+
 			await app.inject({
 				method: "POST",
 				url: "/medications",
@@ -804,8 +1048,8 @@ describe("Integration Tests", () => {
 					blistersPerPack: 1,
 					pillsPerBlister: 30,
 					blisters: [
-            { usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" },   // Morning: 1 pill
-            { usage: 0.5, every: 1, start: "2025-01-01T20:00:00.000Z" }, // Evening: 0.5 pill
+						{ usage: 1, every: 1, start: morningStart }, // Morning: 1 pill
+						{ usage: 0.5, every: 1, start: eveningStartStr }, // Evening: 0.5 pill
 					],
 				},
 			});
@@ -815,8 +1059,8 @@ describe("Integration Tests", () => {
 				method: "POST",
 				url: "/medications/usage",
 				payload: {
-          startDate: "2025-01-01T00:00:00.000Z",
-          endDate: "2025-01-11T00:00:00.000Z",
+					startDate: morningStart,
+					endDate: planEndStr,
 				},
 			});
 
@@ -828,6 +1072,15 @@ describe("Integration Tests", () => {
 
 		it("should calculate correct blisters needed", async () => {
 			// 10 pills per blister, need 25 pills → need 3 blisters
+			const tomorrow = new Date();
+			tomorrow.setDate(tomorrow.getDate() + 1);
+			tomorrow.setHours(8, 0, 0, 0);
+			const intakeStart = tomorrow.toISOString();
+
+			const planEnd = new Date(tomorrow);
+			planEnd.setDate(planEnd.getDate() + 10);
+			const planEndStr = planEnd.toISOString();
+
 			await app.inject({
 				method: "POST",
 				url: "/medications",
@@ -836,7 +1089,7 @@ describe("Integration Tests", () => {
 					packCount: 5,
 					blistersPerPack: 1,
 					pillsPerBlister: 10,
-          blisters: [{ usage: 2.5, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+					blisters: [{ usage: 2.5, every: 1, start: intakeStart }],
 				},
 			});
 
@@ -845,8 +1098,8 @@ describe("Integration Tests", () => {
 				method: "POST",
 				url: "/medications/usage",
 				payload: {
-          startDate: "2025-01-01T00:00:00.000Z",
-          endDate: "2025-01-11T00:00:00.000Z",
+					startDate: intakeStart,
+					endDate: planEndStr,
 				},
 			});
 
@@ -932,5 +1185,256 @@ describe("Integration Tests", () => {
 			expect(data[0].plannerUsage).toBe(10);
 			expect(data[0].enough).toBe(true); // 45 > 10
 		});
+
+		it("should use user-selected start date, not current time (fix asymmetric counting)", async () => {
+			// Regression test: When a planner range starts today, the old code used
+			// max(now, start) as the effective start. If now was between the morning
+			// dose (07:00) and evening dose (20:00), morning was skipped but evening
+			// counted, giving an asymmetric result (e.g., 5 instead of 6).
+			//
+			// Example: medication with daily morning (07:00) + evening (20:00) intakes,
+			// planner range [today 01:00, today+3 01:00).
+			// Old code at 15:00: morning 07:00 < 15:00 → skipped, evening 20:00 ≥ 15:00 → counted
+			// Result: 2 morning + 3 evening = 5 instead of 3+3 = 6.
+
+			// Use a past start date so the intakes predate the planner range
+			const intakeStart = "2025-01-01T07:00:00.000Z";
+			const intakeEvening = "2025-01-01T20:00:00.000Z";
+
+			// Plan range: Feb 9 00:00 to Feb 12 00:00 UTC (3 full days)
+			const planStart = "2026-02-09T00:00:00.000Z";
+			const planEnd = "2026-02-12T00:00:00.000Z";
+
+			await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Twice Daily Med Asymmetric",
+					packCount: 5,
+					blistersPerPack: 5,
+					pillsPerBlister: 10,
+					blisters: [
+						{ usage: 1, every: 1, start: intakeStart },
+						{ usage: 1, every: 1, start: intakeEvening },
+					],
+				},
+			});
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/medications/usage",
+				payload: {
+					startDate: planStart,
+					endDate: planEnd,
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+			const data = response.json();
+			// Both morning and evening should have exactly 3 occurrences each
+			// (Feb 9, 10, 11) for a total of 6, regardless of current time
+			expect(data[0].plannerUsage).toBe(6);
+		});
+
+		it("should handle planner range starting before blister start", async () => {
+			// Blister starts on Feb 10, planner range starts Feb 9
+			// Should only count doses from Feb 10 onwards
+			const intakeMorning = "2026-02-10T07:00:00.000Z";
+			const intakeEvening = "2026-02-10T20:00:00.000Z";
+
+			await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Recent Start Med",
+					packCount: 1,
+					blistersPerPack: 1,
+					pillsPerBlister: 30,
+					blisters: [
+						{ usage: 1, every: 1, start: intakeMorning },
+						{ usage: 1, every: 1, start: intakeEvening },
+					],
+				},
+			});
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/medications/usage",
+				payload: {
+					startDate: "2026-02-09T00:00:00.000Z",
+					endDate: "2026-02-12T00:00:00.000Z",
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+			const data = response.json();
+			// Only Feb 10 and Feb 11 have doses (blister starts Feb 10)
+			expect(data[0].plannerUsage).toBe(4); // 2 days × 2 intakes
+		});
+	});
+
+	// ---------------------------------------------------------------------------
+	// Dismiss Until (Clear Missed Doses)
+	// ---------------------------------------------------------------------------
+
+	describe("Dismiss Until functionality", () => {
+		it("should set dismissedUntil for multiple medications", async () => {
+			// Create two medications
+			const med1Res = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Med 1",
+					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+				},
+			});
+			const med1Id = med1Res.json().id;
+
+			const med2Res = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Med 2",
+					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+				},
+			});
+			const med2Id = med2Res.json().id;
+
+			// Set dismissedUntil for both
+			const dismissRes = await app.inject({
+				method: "POST",
+				url: "/medications/dismiss-until",
+				payload: {
+					medicationIds: [med1Id, med2Id],
+					until: "2025-01-15",
+				},
+			});
+
+			expect(dismissRes.statusCode).toBe(200);
+			expect(dismissRes.json().success).toBe(true);
+			expect(dismissRes.json().updatedCount).toBe(2);
+
+			// Verify dismissedUntil is set via GET
+			const medsRes = await app.inject({
+				method: "GET",
+				url: "/medications",
+			});
+			const meds = medsRes.json();
+			const med1 = meds.find((m: any) => m.id === med1Id);
+			const med2 = meds.find((m: any) => m.id === med2Id);
+
+			expect(med1.dismissedUntil).toBe("2025-01-15");
+			expect(med2.dismissedUntil).toBe("2025-01-15");
+		});
+
+		it("should clear dismissedUntil for a medication", async () => {
+			// Create medication
+			const createRes = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Med to Clear",
+					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+				},
+			});
+			const medId = createRes.json().id;
+
+			// Set dismissedUntil
+			await app.inject({
+				method: "POST",
+				url: "/medications/dismiss-until",
+				payload: {
+					medicationIds: [medId],
+					until: "2025-01-20",
+				},
+			});
+
+			// Clear it
+			const clearRes = await app.inject({
+				method: "DELETE",
+				url: `/medications/${medId}/dismiss-until`,
+			});
+
+			expect(clearRes.statusCode).toBe(200);
+			expect(clearRes.json().success).toBe(true);
+
+			// Verify it's cleared
+			const medsRes = await app.inject({
+				method: "GET",
+				url: "/medications",
+			});
+			const med = medsRes.json().find((m: any) => m.id === medId);
+			expect(med.dismissedUntil).toBeNull();
+		});
+
+		it("should reject invalid date format", async () => {
+			const createRes = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "Med",
+					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+				},
+			});
+			const medId = createRes.json().id;
+
+			const res = await app.inject({
+				method: "POST",
+				url: "/medications/dismiss-until",
+				payload: {
+					medicationIds: [medId],
+					until: "01-15-2025", // Wrong format
+				},
+			});
+
+			expect(res.statusCode).toBe(400);
+		});
+
+		it("should reject empty medicationIds array", async () => {
+			const res = await app.inject({
+				method: "POST",
+				url: "/medications/dismiss-until",
+				payload: {
+					medicationIds: [],
+					until: "2025-01-15",
+				},
+			});
+
+			expect(res.statusCode).toBe(400);
+		});
+
+		it("should not update medications belonging to other users", async () => {
+			// Create medication for user 999999999
+			const createRes = await app.inject({
+				method: "POST",
+				url: "/medications",
+				payload: {
+					name: "My Med",
+					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+				},
+			});
+			const medId = createRes.json().id;
+
+			// Try to dismiss a medication that doesn't exist (ID 99999)
+			const dismissRes = await app.inject({
+				method: "POST",
+				url: "/medications/dismiss-until",
+				payload: {
+					medicationIds: [99999],
+					until: "2025-01-15",
+				},
+			});
+
+			expect(dismissRes.statusCode).toBe(200);
+			expect(dismissRes.json().updatedCount).toBe(0); // Nothing updated
+
+			// Our med should still have no dismissedUntil
+			const medsRes = await app.inject({
+				method: "GET",
+				url: "/medications",
+			});
+			const med = medsRes.json().find((m: any) => m.id === medId);
+			expect(med.dismissedUntil).toBeNull();
+		});
 	});
 });

backend/src/test/medications.test.ts

@@ -2,14 +2,14 @@
  * Tests for /medications API endpoints.
  * Tests CRUD operations for medications.
  */
-import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import {
 	buildTestApp,
-  closeTestApp,
 	clearTestData,
-  createTestUser,
+	closeTestApp,
 	createTestMedication,
-  TestContext,
+	createTestUser,
+	type TestContext,
 } from "./setup.js";
 
 // =============================================================================
@@ -20,7 +20,7 @@ async function registerMedicationRoutes(ctx: TestContext) {
 	const { app, client } = ctx;
 
 	// GET /medications - List all medications
-  app.get("/medications", async (request, reply) => {
+	app.get("/medications", async (_request, _reply) => {
 		const userId = 1;
 
 		const result = await client.execute({
@@ -664,8 +664,7 @@ describe("Medications API", () => {
 
 			const [med] = response.json();
 			// Total = (2 packs × 3 blisters × 10 pills) + 5 loose = 65
-      const totalPills =
-        med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets;
+			const totalPills = med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets;
 			expect(totalPills).toBe(65);
 		});
 	});

backend/src/test/planner.test.ts

@@ -1,10 +1,16 @@
-import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from "vitest";
-import Fastify, { FastifyInstance } from "fastify";
-import { createClient, Client } from "@libsql/client";
-import { drizzle } from "drizzle-orm/libsql";
+import type { Client } from "@libsql/client";
+import Fastify, { type FastifyInstance } from "fastify";
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 // Create test database and mocks before anything else (hoisted)
-const { testClient, testDb, mockSendMail, mockSendShoutrrr, mockUpdateReminderSentTime, mockUpdateUserReminderSentTime } = vi.hoisted(() => {
+const {
+	testClient,
+	testDb,
+	mockSendMail,
+	mockSendShoutrrr,
+	mockUpdateReminderSentTime,
+	mockUpdateUserReminderSentTime,
+} = vi.hoisted(() => {
 	const { createClient } = require("@libsql/client");
 	const { drizzle } = require("drizzle-orm/libsql");
 	const client = createClient({ url: ":memory:" });
@@ -57,7 +63,7 @@ vi.mock("../services/reminder-scheduler.js", () => ({
 
 // Mock sendShoutrrrNotification from settings
 vi.mock("../routes/settings.js", async (importOriginal) => {
-  const original = await importOriginal() as any;
+	const original = (await importOriginal()) as any;
 	return {
 		...original,
 		sendShoutrrrNotification: mockSendShoutrrr,
@@ -104,9 +110,15 @@ async function createSchema(client: Client) {
       expiry_warning_days integer NOT NULL DEFAULT 90,
       language text NOT NULL DEFAULT 'en',
       stock_calculation_mode text NOT NULL DEFAULT 'automatic',
+      share_stock_status integer NOT NULL DEFAULT 1,
       last_auto_email_sent text,
       last_notification_type text,
       last_notification_channel text,
+      last_reminder_med_name text,
+      last_reminder_taken_by text,
+      last_stock_reminder_sent text,
+      last_stock_reminder_channel text,
+      last_stock_reminder_med_names text,
       updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
@@ -153,21 +165,6 @@ describe("Planner Routes", () => {
 	});
 
 	describe("POST /planner/send-email", () => {
-    it("should reject request with missing email", async () => {
-      const response = await app.inject({
-        method: "POST",
-        url: "/planner/send-email",
-        payload: {
-          from: "2025-01-01",
-          until: "2025-01-31",
-          rows: [{ medicationName: "Test", totalPills: 10, plannerUsage: 5, enough: true }],
-        },
-      });
-
-      expect(response.statusCode).toBe(400);
-      expect(response.json()).toEqual({ error: "Missing email or planner data" });
-    });
-
 		it("should reject request with missing rows", async () => {
 			const response = await app.inject({
 				method: "POST",
@@ -181,10 +178,16 @@ describe("Planner Routes", () => {
 			});
 
 			expect(response.statusCode).toBe(400);
-      expect(response.json()).toEqual({ error: "Missing email or planner data" });
+			expect(response.json()).toEqual({ error: "Missing planner data" });
+		});
+
+		it("should return error when no notification channels configured", async () => {
+			// User settings exist but email/shoutrrr disabled
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 0, 0, 'en')`,
+				args: [999999999],
 			});
 
-    it("should reject when SMTP is not configured", async () => {
 			const response = await app.inject({
 				method: "POST",
 				url: "/planner/send-email",
@@ -209,7 +212,7 @@ describe("Planner Routes", () => {
 			});
 
 			expect(response.statusCode).toBe(400);
-      expect(response.json()).toEqual({ error: "SMTP not configured" });
+			expect(response.json()).toEqual({ error: "No notification channels configured" });
 		});
 
 		it("should send email successfully when SMTP is configured", async () => {
@@ -218,6 +221,12 @@ describe("Planner Routes", () => {
 			process.env.SMTP_USER = "user@test.com";
 			process.env.SMTP_PASS = "password";
 
+			// Enable email in user settings
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
+				args: [999999999],
+			});
+
 			mockSendMail.mockResolvedValueOnce({ messageId: "123" });
 
 			const response = await app.inject({
@@ -245,7 +254,7 @@ describe("Planner Routes", () => {
 			});
 
 			expect(response.statusCode).toBe(200);
-      expect(response.json()).toEqual({ success: true, message: "Email sent successfully" });
+			expect(response.json()).toEqual({ success: true, message: "Notification sent via email" });
 			expect(mockSendMail).toHaveBeenCalledTimes(1);
 
 			// Cleanup
@@ -259,6 +268,11 @@ describe("Planner Routes", () => {
 			process.env.SMTP_USER = "user@test.com";
 			process.env.SMTP_PASS = "password";
 
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
+				args: [999999999],
+			});
+
 			mockSendMail.mockResolvedValueOnce({ messageId: "123" });
 
 			const response = await app.inject({
@@ -300,7 +314,7 @@ describe("Planner Routes", () => {
 
 			// Check that HTML contains out of stock warning
 			const mailCall = mockSendMail.mock.calls[0][0];
-      expect(mailCall.html).toContain("Out of Stock");
+			expect(mailCall.html).toContain("Empty");
 			expect(mailCall.html).toContain("1 medication");
 
 			delete process.env.SMTP_HOST;
@@ -313,6 +327,11 @@ describe("Planner Routes", () => {
 			process.env.SMTP_USER = "user@test.com";
 			process.env.SMTP_PASS = "password";
 
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
+				args: [999999999],
+			});
+
 			mockSendMail.mockRejectedValueOnce(new Error("Connection refused"));
 
 			const response = await app.inject({
@@ -339,7 +358,7 @@ describe("Planner Routes", () => {
 			});
 
 			expect(response.statusCode).toBe(500);
-      expect(response.json().error).toContain("Failed to send email");
+			expect(response.json().error).toContain("Email:");
 			expect(response.json().error).toContain("Connection refused");
 
 			delete process.env.SMTP_HOST;
@@ -352,6 +371,12 @@ describe("Planner Routes", () => {
 			process.env.SMTP_USER = "user@test.com";
 			process.env.SMTP_PASS = "password";
 
+			// User settings with German language
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'de')`,
+				args: [999999999],
+			});
+
 			mockSendMail.mockResolvedValueOnce({ messageId: "123" });
 
 			const response = await app.inject({
@@ -382,12 +407,178 @@ describe("Planner Routes", () => {
 
 			// German date format should be used
 			const mailCall = mockSendMail.mock.calls[0][0];
-      expect(mailCall.subject).toContain("Supply Overview");
+			expect(mailCall.subject).toContain("Bestandsübersicht");
 
 			delete process.env.SMTP_HOST;
 			delete process.env.SMTP_USER;
 			delete process.env.SMTP_PASS;
 		});
+
+		it("should send push notification when shoutrrr is enabled", async () => {
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
+				args: [999999999],
+			});
+
+			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/planner/send-email",
+				payload: {
+					email: "test@example.com",
+					from: "2025-01-01",
+					until: "2025-01-31",
+					rows: [
+						{
+							medicationId: 1,
+							medicationName: "Aspirin",
+							totalPills: 30,
+							plannerUsage: 10,
+							blisterSize: 10,
+							blistersNeeded: 1,
+							fullBlisters: 3,
+							loosePills: 0,
+							enough: true,
+						},
+					],
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ success: true, message: "Notification sent via push" });
+			expect(mockSendShoutrrr).toHaveBeenCalledTimes(1);
+
+			// Verify push message contains medication info
+			const [_url, title, message] = mockSendShoutrrr.mock.calls[0];
+			expect(title).toContain("Supply Overview");
+			expect(message).toContain("Aspirin");
+		});
+
+		it("should send both email and push when both enabled", async () => {
+			process.env.SMTP_HOST = "smtp.test.com";
+			process.env.SMTP_USER = "user@test.com";
+			process.env.SMTP_PASS = "password";
+
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 1, 1, 'ntfy://localhost/test', 'en')`,
+				args: [999999999],
+			});
+
+			mockSendMail.mockResolvedValueOnce({ messageId: "123" });
+			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/planner/send-email",
+				payload: {
+					email: "test@example.com",
+					from: "2025-01-01",
+					until: "2025-01-31",
+					rows: [
+						{
+							medicationId: 1,
+							medicationName: "Aspirin",
+							totalPills: 5,
+							plannerUsage: 30,
+							blisterSize: 10,
+							blistersNeeded: 3,
+							fullBlisters: 0,
+							loosePills: 5,
+							enough: false,
+						},
+					],
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ success: true, message: "Notification sent via email and push" });
+			expect(mockSendMail).toHaveBeenCalledTimes(1);
+			expect(mockSendShoutrrr).toHaveBeenCalledTimes(1);
+
+			// Verify push message contains out of stock info
+			const [_url, _title, message] = mockSendShoutrrr.mock.calls[0];
+			expect(message).toContain("Aspirin");
+			expect(message).toContain("Empty");
+
+			delete process.env.SMTP_HOST;
+			delete process.env.SMTP_USER;
+			delete process.env.SMTP_PASS;
+		});
+
+		it("should send push with German translations", async () => {
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'de')`,
+				args: [999999999],
+			});
+
+			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/planner/send-email",
+				payload: {
+					email: "test@example.com",
+					from: "2025-01-01",
+					until: "2025-01-31",
+					rows: [
+						{
+							medicationId: 1,
+							medicationName: "Aspirin",
+							totalPills: 5,
+							plannerUsage: 30,
+							blisterSize: 10,
+							blistersNeeded: 3,
+							fullBlisters: 0,
+							loosePills: 5,
+							enough: false,
+						},
+					],
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+
+			// Check German translations in push
+			const [_url, title] = mockSendShoutrrr.mock.calls[0];
+			expect(title).toContain("Bestandsübersicht");
+		});
+
+		it("should handle push error gracefully", async () => {
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
+				args: [999999999],
+			});
+
+			mockSendShoutrrr.mockResolvedValueOnce({ success: false, error: "Connection failed" });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/planner/send-email",
+				payload: {
+					email: "test@example.com",
+					from: "2025-01-01",
+					until: "2025-01-31",
+					rows: [
+						{
+							medicationId: 1,
+							medicationName: "Aspirin",
+							totalPills: 30,
+							plannerUsage: 10,
+							blisterSize: 10,
+							blistersNeeded: 1,
+							fullBlisters: 3,
+							loosePills: 0,
+							enough: true,
+						},
+					],
+				},
+			});
+
+			expect(response.statusCode).toBe(500);
+			expect(response.json().error).toContain("Push:");
+			expect(response.json().error).toContain("Connection failed");
+		});
 	});
 
 	describe("POST /reminder/send-email", () => {
@@ -430,9 +621,7 @@ describe("Planner Routes", () => {
 				url: "/reminder/send-email",
 				payload: {
 					email: "test@example.com",
-          lowStock: [
-            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
-          ],
+					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
 				},
 			});
 
@@ -458,9 +647,7 @@ describe("Planner Routes", () => {
 				url: "/reminder/send-email",
 				payload: {
 					email: "test@example.com",
-          lowStock: [
-            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
-          ],
+					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
 				},
 			});
 
@@ -499,10 +686,10 @@ describe("Planner Routes", () => {
 
 			expect(response.statusCode).toBe(200);
 
-      // Check email contains EMPTY warning
+			// Check email contains empty warning
 			const mailCall = mockSendMail.mock.calls[0][0];
 			expect(mailCall.subject).toContain("Empty");
-      expect(mailCall.html).toContain("EMPTY");
+			expect(mailCall.html).toContain("empty");
 
 			delete process.env.SMTP_HOST;
 			delete process.env.SMTP_USER;
@@ -537,7 +724,7 @@ describe("Planner Routes", () => {
 
 			const mailCall = mockSendMail.mock.calls[0][0];
 			expect(mailCall.subject).toContain("Empty");
-      expect(mailCall.subject).toContain("Running Low");
+			expect(mailCall.subject).toContain("Critical");
 
 			delete process.env.SMTP_HOST;
 			delete process.env.SMTP_USER;
@@ -561,9 +748,7 @@ describe("Planner Routes", () => {
 				url: "/reminder/send-email",
 				payload: {
 					email: "test@example.com",
-          lowStock: [
-            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
-          ],
+					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
 				},
 			});
 
@@ -588,9 +773,7 @@ describe("Planner Routes", () => {
 				url: "/reminder/send-email",
 				payload: {
 					email: "test@example.com",
-          lowStock: [
-            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
-          ],
+					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
 				},
 			});
 
@@ -617,9 +800,7 @@ describe("Planner Routes", () => {
 				url: "/reminder/send-email",
 				payload: {
 					email: "test@example.com",
-          lowStock: [
-            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
-          ],
+					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
 				},
 			});
 
@@ -646,9 +827,7 @@ describe("Planner Routes", () => {
 				url: "/reminder/send-email",
 				payload: {
 					email: "test@example.com",
-          lowStock: [
-            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
-          ],
+					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
 				},
 			});
 
@@ -669,9 +848,7 @@ describe("Planner Routes", () => {
 				url: "/reminder/send-email",
 				payload: {
 					email: "test@example.com",
-          lowStock: [
-            { name: "Aspirin", medsLeft: 0, daysLeft: 0, depletionDate: null },
-          ],
+					lowStock: [{ name: "Aspirin", medsLeft: 0, daysLeft: 0, depletionDate: null }],
 				},
 			});
 
@@ -679,7 +856,7 @@ describe("Planner Routes", () => {
 			expect(mockSendShoutrrr).toHaveBeenCalledTimes(1);
 
 			// Check German translations are used
-      const [title, message] = mockSendShoutrrr.mock.calls[0].slice(1);
+			const [title, _message] = mockSendShoutrrr.mock.calls[0].slice(1);
 			expect(title).toContain("Leer");
 		});
 
@@ -696,9 +873,7 @@ describe("Planner Routes", () => {
 				url: "/reminder/send-email",
 				payload: {
 					email: "test@example.com",
-          lowStock: [
-            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
-          ],
+					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
 				},
 			});
 
@@ -706,5 +881,103 @@ describe("Planner Routes", () => {
 			expect(response.json().error).toContain("Push:");
 			expect(response.json().error).toContain("Network error");
 		});
+
+		it("should differentiate critical and low stock in push notification", async () => {
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
+				args: [999999999],
+			});
+
+			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/reminder/send-email",
+				payload: {
+					email: "test@example.com",
+					lowStock: [
+						{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03", isCritical: true },
+						{ name: "Ibuprofen", medsLeft: 49, daysLeft: 24, depletionDate: "2025-01-24", isCritical: false },
+					],
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+
+			const [_url, title, message] = mockSendShoutrrr.mock.calls[0];
+			// Title should contain both Critical and Low labels
+			expect(title).toContain("Critical");
+			expect(title).toContain("Low");
+			// Message should have separate sections
+			expect(message).toContain("Running critically low");
+			expect(message).toContain("Aspirin");
+			expect(message).toContain("Running low");
+			expect(message).toContain("Ibuprofen");
+		});
+
+		it("should differentiate critical and low stock in email", async () => {
+			process.env.SMTP_HOST = "smtp.test.com";
+			process.env.SMTP_USER = "user@test.com";
+			process.env.SMTP_PASS = "password";
+
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
+				args: [999999999],
+			});
+
+			mockSendMail.mockResolvedValueOnce({ messageId: "123" });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/reminder/send-email",
+				payload: {
+					email: "test@example.com",
+					lowStock: [
+						{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03", isCritical: true },
+						{ name: "Ibuprofen", medsLeft: 49, daysLeft: 24, depletionDate: "2025-01-24", isCritical: false },
+					],
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+
+			const mailCall = mockSendMail.mock.calls[0][0];
+			// Subject should contain both Critical and Low
+			expect(mailCall.subject).toContain("Critical");
+			expect(mailCall.subject).toContain("Low");
+			// HTML should have separate alert boxes
+			expect(mailCall.html).toContain("critically low");
+			expect(mailCall.html).toContain("running low");
+
+			delete process.env.SMTP_HOST;
+			delete process.env.SMTP_USER;
+			delete process.env.SMTP_PASS;
+		});
+
+		it("should label all meds as critical when isCritical not provided", async () => {
+			await testClient.execute({
+				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
+				args: [999999999],
+			});
+
+			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
+
+			const response = await app.inject({
+				method: "POST",
+				url: "/reminder/send-email",
+				payload: {
+					email: "test@example.com",
+					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
+				},
+			});
+
+			expect(response.statusCode).toBe(200);
+
+			const [_url, title, message] = mockSendShoutrrr.mock.calls[0];
+			// Should be treated as critical (backwards compat)
+			expect(title).toContain("Critical");
+			expect(title).not.toContain("Low");
+			expect(message).toContain("Running critically low");
+		});
 	});
 });

backend/src/test/refills.test.ts

@@ -0,0 +1,396 @@
+/**
+ * Tests for /medications/:id/refill and /medications/:id/refills API endpoints.
+ * Tests adding refills to medication stock and retrieving refill history.
+ */
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import {
+	buildTestApp,
+	clearTestData,
+	closeTestApp,
+	createTestMedication,
+	createTestUser,
+	type TestContext,
+} from "./setup.js";
+
+// Store userId at module level so routes can access it
+let currentUserId = 1;
+
+// =============================================================================
+// Route Registration
+// =============================================================================
+
+async function registerRefillRoutes(ctx: TestContext) {
+	const { app, client } = ctx;
+
+	// POST /medications/:id/refill - Add stock and record history
+	app.post<{ Params: { id: string }; Body: { packsAdded?: number; loosePillsAdded?: number } }>(
+		"/medications/:id/refill",
+		async (request, reply) => {
+			const userId = currentUserId;
+			const medId = parseInt(request.params.id, 10);
+			const { packsAdded = 0, loosePillsAdded = 0 } = request.body || {};
+
+			// Validate input
+			if (packsAdded < 0 || loosePillsAdded < 0) {
+				return reply.status(400).send({ error: "packsAdded and loosePillsAdded must be non-negative" });
+			}
+			if (packsAdded === 0 && loosePillsAdded === 0) {
+				return reply
+					.status(400)
+					.send({ error: "At least one of packsAdded or loosePillsAdded must be greater than 0" });
+			}
+
+			// Check medication exists and belongs to user
+			const medResult = await client.execute({
+				sql: `SELECT id, pack_count, loose_tablets, blisters_per_pack, pills_per_blister 
+              FROM medications WHERE id = ? AND user_id = ?`,
+				args: [medId, userId],
+			});
+
+			if (medResult.rows.length === 0) {
+				return reply.status(404).send({ error: "Medication not found" });
+			}
+
+			const med = medResult.rows[0];
+			const newPackCount = (med.pack_count as number) + packsAdded;
+			const newLooseTablets = (med.loose_tablets as number) + loosePillsAdded;
+			const pillsPerPack = (med.blisters_per_pack as number) * (med.pills_per_blister as number);
+			const totalPillsAdded = packsAdded * pillsPerPack + loosePillsAdded;
+
+			// Update medication stock
+			await client.execute({
+				sql: `UPDATE medications SET pack_count = ?, loose_tablets = ? WHERE id = ?`,
+				args: [newPackCount, newLooseTablets, medId],
+			});
+
+			// Record refill history
+			await client.execute({
+				sql: `INSERT INTO refill_history (medication_id, user_id, packs_added, loose_pills_added) 
+              VALUES (?, ?, ?, ?)`,
+				args: [medId, userId, packsAdded, loosePillsAdded],
+			});
+
+			return {
+				success: true,
+				pillsAdded: totalPillsAdded,
+				newPackCount,
+				newLooseTablets,
+			};
+		}
+	);
+
+	// GET /medications/:id/refills - Get refill history
+	app.get<{ Params: { id: string } }>("/medications/:id/refills", async (request, reply) => {
+		const userId = currentUserId;
+		const medId = parseInt(request.params.id, 10);
+
+		// Check medication exists and belongs to user
+		const medResult = await client.execute({
+			sql: `SELECT id FROM medications WHERE id = ? AND user_id = ?`,
+			args: [medId, userId],
+		});
+
+		if (medResult.rows.length === 0) {
+			return reply.status(404).send({ error: "Medication not found" });
+		}
+
+		// Get refill history, newest first
+		const refillResult = await client.execute({
+			sql: `SELECT id, packs_added, loose_pills_added, refill_date 
+            FROM refill_history 
+            WHERE medication_id = ? AND user_id = ?
+            ORDER BY refill_date DESC`,
+			args: [medId, userId],
+		});
+
+		return {
+			refills: refillResult.rows.map((r) => ({
+				id: r.id,
+				packsAdded: r.packs_added,
+				loosePillsAdded: r.loose_pills_added,
+				refillDate: r.refill_date,
+			})),
+		};
+	});
+}
+
+// =============================================================================
+// Tests
+// =============================================================================
+
+describe("Refill API", () => {
+	let ctx: TestContext;
+	let userId: number;
+	let medId: number;
+
+	beforeAll(async () => {
+		ctx = await buildTestApp();
+		await registerRefillRoutes(ctx);
+		await ctx.app.ready();
+	});
+
+	afterAll(async () => {
+		await closeTestApp(ctx);
+	});
+
+	beforeEach(async () => {
+		await clearTestData(ctx.client);
+		// Create test user
+		userId = await createTestUser(ctx.client, { username: "testuser" });
+		// Update the module-level userId so routes use the correct one
+		currentUserId = userId;
+		// Create a test medication with 1 pack (10 blisters × 10 pills = 100 pills/pack)
+		medId = await createTestMedication(ctx.client, {
+			userId,
+			name: "Test Med",
+			packCount: 1,
+			blistersPerPack: 10,
+			pillsPerBlister: 10,
+			looseTablets: 5,
+		});
+	});
+
+	// ---------------------------------------------------------------------------
+	// POST /medications/:id/refill
+	// ---------------------------------------------------------------------------
+
+	describe("POST /medications/:id/refill", () => {
+		it("should add packs to medication stock", async () => {
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 2 },
+			});
+
+			expect(response.statusCode).toBe(200);
+			const data = response.json();
+			expect(data.success).toBe(true);
+			expect(data.pillsAdded).toBe(200); // 2 packs × 100 pills
+			expect(data.newPackCount).toBe(3); // 1 + 2
+
+			// Verify in database
+			const result = await ctx.client.execute({
+				sql: `SELECT pack_count FROM medications WHERE id = ?`,
+				args: [medId],
+			});
+			expect(result.rows[0].pack_count).toBe(3);
+		});
+
+		it("should add loose pills to medication stock", async () => {
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { loosePillsAdded: 15 },
+			});
+
+			expect(response.statusCode).toBe(200);
+			const data = response.json();
+			expect(data.success).toBe(true);
+			expect(data.pillsAdded).toBe(15);
+			expect(data.newLooseTablets).toBe(20); // 5 + 15
+
+			// Verify in database
+			const result = await ctx.client.execute({
+				sql: `SELECT loose_tablets FROM medications WHERE id = ?`,
+				args: [medId],
+			});
+			expect(result.rows[0].loose_tablets).toBe(20);
+		});
+
+		it("should add both packs and loose pills", async () => {
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 1, loosePillsAdded: 10 },
+			});
+
+			expect(response.statusCode).toBe(200);
+			const data = response.json();
+			expect(data.success).toBe(true);
+			expect(data.pillsAdded).toBe(110); // 1 pack (100) + 10 loose
+			expect(data.newPackCount).toBe(2);
+			expect(data.newLooseTablets).toBe(15);
+		});
+
+		it("should record refill in history", async () => {
+			await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 2, loosePillsAdded: 5 },
+			});
+
+			// Check history
+			const result = await ctx.client.execute({
+				sql: `SELECT packs_added, loose_pills_added FROM refill_history WHERE medication_id = ?`,
+				args: [medId],
+			});
+			expect(result.rows.length).toBe(1);
+			expect(result.rows[0].packs_added).toBe(2);
+			expect(result.rows[0].loose_pills_added).toBe(5);
+		});
+
+		it("should reject refill with zero amounts", async () => {
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 0, loosePillsAdded: 0 },
+			});
+
+			expect(response.statusCode).toBe(400);
+			expect(response.json().error).toContain("At least one");
+		});
+
+		it("should reject refill with negative amounts", async () => {
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: -1 },
+			});
+
+			expect(response.statusCode).toBe(400);
+			expect(response.json().error).toContain("non-negative");
+		});
+
+		it("should return 404 for non-existent medication", async () => {
+			const response = await ctx.app.inject({
+				method: "POST",
+				url: `/medications/99999/refill`,
+				payload: { packsAdded: 1 },
+			});
+
+			expect(response.statusCode).toBe(404);
+			expect(response.json().error).toBe("Medication not found");
+		});
+	});
+
+	// ---------------------------------------------------------------------------
+	// GET /medications/:id/refills
+	// ---------------------------------------------------------------------------
+
+	describe("GET /medications/:id/refills", () => {
+		it("should return empty array when no refills", async () => {
+			const response = await ctx.app.inject({
+				method: "GET",
+				url: `/medications/${medId}/refills`,
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json()).toEqual({ refills: [] });
+		});
+
+		it("should return refill history newest first", async () => {
+			// Add two refills with different values so we can identify them
+			await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 1, loosePillsAdded: 0 },
+			});
+
+			// Increase delay to ensure different timestamps (SQLite datetime has second precision)
+			await new Promise((r) => setTimeout(r, 1100));
+
+			await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 0, loosePillsAdded: 20 },
+			});
+
+			const response = await ctx.app.inject({
+				method: "GET",
+				url: `/medications/${medId}/refills`,
+			});
+
+			expect(response.statusCode).toBe(200);
+			const data = response.json();
+			expect(data.refills).toHaveLength(2);
+
+			// Newest first (loose pills - added second)
+			expect(data.refills[0].packsAdded).toBe(0);
+			expect(data.refills[0].loosePillsAdded).toBe(20);
+
+			// Older (packs - added first)
+			expect(data.refills[1].packsAdded).toBe(1);
+			expect(data.refills[1].loosePillsAdded).toBe(0);
+
+			// Each entry should have an id and refillDate
+			for (const refill of data.refills) {
+				expect(refill.id).toBeTypeOf("number");
+				expect(refill.refillDate).toBeTruthy();
+			}
+		});
+
+		it("should return 404 for non-existent medication", async () => {
+			const response = await ctx.app.inject({
+				method: "GET",
+				url: `/medications/99999/refills`,
+			});
+
+			expect(response.statusCode).toBe(404);
+			expect(response.json().error).toBe("Medication not found");
+		});
+	});
+
+	// ---------------------------------------------------------------------------
+	// Cascade Delete Tests
+	// ---------------------------------------------------------------------------
+
+	describe("Cascade Delete", () => {
+		it("should delete refill history when medication is deleted", async () => {
+			// Add a refill
+			await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 1 },
+			});
+
+			// Verify refill exists
+			let result = await ctx.client.execute({
+				sql: `SELECT COUNT(*) as count FROM refill_history WHERE medication_id = ?`,
+				args: [medId],
+			});
+			expect(result.rows[0].count).toBe(1);
+
+			// Delete medication
+			await ctx.client.execute({
+				sql: `DELETE FROM medications WHERE id = ?`,
+				args: [medId],
+			});
+
+			// Verify refill history was cascade deleted
+			result = await ctx.client.execute({
+				sql: `SELECT COUNT(*) as count FROM refill_history WHERE medication_id = ?`,
+				args: [medId],
+			});
+			expect(result.rows[0].count).toBe(0);
+		});
+
+		it("should delete refill history when user is deleted", async () => {
+			// Add a refill
+			await ctx.app.inject({
+				method: "POST",
+				url: `/medications/${medId}/refill`,
+				payload: { packsAdded: 1 },
+			});
+
+			// Verify refill exists
+			let result = await ctx.client.execute({
+				sql: `SELECT COUNT(*) as count FROM refill_history WHERE user_id = ?`,
+				args: [userId],
+			});
+			expect(result.rows[0].count).toBe(1);
+
+			// Delete user
+			await ctx.client.execute({
+				sql: `DELETE FROM users WHERE id = ?`,
+				args: [userId],
+			});
+
+			// Verify refill history was cascade deleted
+			result = await ctx.client.execute({
+				sql: `SELECT COUNT(*) as count FROM refill_history WHERE user_id = ?`,
+				args: [userId],
+			});
+			expect(result.rows[0].count).toBe(0);
+		});
+	});
+});

backend/src/test/server.test.ts

@@ -1,20 +1,20 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import Fastify from "fastify";
+import { existsSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { resolve } from "node:path";
+import cookie from "@fastify/cookie";
 import cors from "@fastify/cors";
 import sensible from "@fastify/sensible";
-import cookie from "@fastify/cookie";
-import { mkdirSync, rmSync, existsSync } from "fs";
-import { resolve } from "path";
-import { tmpdir } from "os";
+import Fastify from "fastify";
+import { afterEach, describe, expect, it } from "vitest";
 
 // Import from utils to avoid index.ts import side effects (server start)
 import {
-  parseCorsOrigins,
+	buildAppConfig,
 	buildBaseCookieOptions,
 	buildRefreshCookieOptions,
-  buildAppConfig,
 	ensureImagesDirectory,
 	getJwtConfig,
+	parseCorsOrigins,
 } from "../utils/server-config.js";
 
 describe("Index.ts Utility Functions", () => {
@@ -247,7 +247,7 @@ describe("Server Bootstrap", () => {
 			await app.register(cookie, { secret: "test-cookie-secret" });
 
 			// Add a test route that sets a cookie
-      app.get("/set-cookie", async (request, reply) => {
+			app.get("/set-cookie", async (_request, reply) => {
 				reply.setCookie("test", "value", { path: "/" });
 				return { ok: true };
 			});
@@ -317,7 +317,10 @@ describe("Server Bootstrap", () => {
 	describe("CORS Origins Parsing", () => {
 		it("should parse comma-separated origins", () => {
 			const originsEnv = "http://localhost:5173,http://localhost:4173";
-      const origins = originsEnv.split(",").map((o) => o.trim()).filter(Boolean);
+			const origins = originsEnv
+				.split(",")
+				.map((o) => o.trim())
+				.filter(Boolean);
 
 			expect(origins).toHaveLength(2);
 			expect(origins[0]).toBe("http://localhost:5173");
@@ -326,7 +329,10 @@ describe("Server Bootstrap", () => {
 
 		it("should handle single origin", () => {
 			const originsEnv = "https://myapp.example.com";
-      const origins = originsEnv.split(",").map((o) => o.trim()).filter(Boolean);
+			const origins = originsEnv
+				.split(",")
+				.map((o) => o.trim())
+				.filter(Boolean);
 
 			expect(origins).toHaveLength(1);
 			expect(origins[0]).toBe("https://myapp.example.com");
@@ -334,14 +340,20 @@ describe("Server Bootstrap", () => {
 
 		it("should filter out empty strings", () => {
 			const originsEnv = "http://localhost:5173,,http://localhost:4173,";
-      const origins = originsEnv.split(",").map((o) => o.trim()).filter(Boolean);
+			const origins = originsEnv
+				.split(",")
+				.map((o) => o.trim())
+				.filter(Boolean);
 
 			expect(origins).toHaveLength(2);
 		});
 
 		it("should trim whitespace", () => {
 			const originsEnv = " http://localhost:5173 , http://localhost:4173 ";
-      const origins = originsEnv.split(",").map((o) => o.trim()).filter(Boolean);
+			const origins = originsEnv
+				.split(",")
+				.map((o) => o.trim())
+				.filter(Boolean);
 
 			expect(origins).toEqual(["http://localhost:5173", "http://localhost:4173"]);
 		});
@@ -398,9 +410,7 @@ describe("Server Bootstrap", () => {
 			const app = Fastify({ logger: false });
 
 			// Try to listen on an invalid port
-      await expect(
-        app.listen({ port: -1, host: "127.0.0.1" })
-      ).rejects.toThrow();
+			await expect(app.listen({ port: -1, host: "127.0.0.1" })).rejects.toThrow();
 
 			await app.close();
 		});
@@ -453,11 +463,11 @@ describe("Cookie Options", () => {
 describe("Rate Limiting", () => {
 	it("should configure rate limit settings", () => {
 		const rateLimitConfig = {
-      max: 100,
+			max: 300,
 			timeWindow: "1 minute",
 		};
 
-    expect(rateLimitConfig.max).toBe(100);
+		expect(rateLimitConfig.max).toBe(300);
 		expect(rateLimitConfig.timeWindow).toBe("1 minute");
 	});
 });

backend/src/test/services.test.ts

@@ -1,33 +1,39 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { readFileSync, writeFileSync, existsSync, unlinkSync } from "fs";
-import { resolve } from "path";
-import { tmpdir } from "os";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
 // Import actual utility functions from scheduler-utils
 import {
-  getTimezone,
-  formatInTimezone,
-  getCurrentHourInTimezone,
-  getTodayInTimezone,
-  getNextScheduledTime,
-  getMsUntilNextCheck,
-  parseBlisters,
-  parseTakenByJson,
+	type Blister,
 	calculateDailyUsage,
 	calculateDepletionInfo,
-  getUpcomingIntakes,
-  getTodaysIntakes,
-  createDefaultReminderState,
-  createDefaultIntakeReminderState,
-  parseReminderState,
-  parseIntakeReminderState,
 	cleanOldIntakeReminders,
-  type Blister,
-  type ReminderState,
-  type IntakeReminderState,
-  type UpcomingIntake,
+	createDefaultIntakeReminderState,
+	createDefaultReminderState,
+	formatInTimezone,
+	getCurrentHourInTimezone,
+	getMsUntilNextCheck,
+	getNextScheduledTime,
+	getTimezone,
+	getTodayInTimezone,
+	getTodaysIntakes,
+	getUpcomingIntakes,
+	type Intake,
+	parseBlisters,
+	parseIntakeReminderState,
+	parseReminderState,
+	parseTakenByJson,
 } from "../utils/scheduler-utils.js";
 
+// Helper to convert Blister to Intake for tests
+function blisterToIntake(blister: Blister, takenBy: string | null = null, intakeRemindersEnabled = false): Intake {
+	return {
+		usage: blister.usage,
+		every: blister.every,
+		start: blister.start,
+		takenBy,
+		intakeRemindersEnabled,
+	};
+}
+
 describe("Scheduler Utils - Timezone Functions", () => {
 	let originalTz: string | undefined;
 
@@ -267,7 +273,7 @@ describe("Scheduler Utils - Daily Usage Calculation", () => {
 
 		it("should calculate daily usage for weekly dose", () => {
 			const blisters: Blister[] = [{ usage: 1, every: 7, start: "2025-01-01T08:00" }];
-      expect(calculateDailyUsage(blisters)).toBeCloseTo(1/7, 5);
+			expect(calculateDailyUsage(blisters)).toBeCloseTo(1 / 7, 5);
 		});
 
 		it("should calculate daily usage for mixed schedules", () => {
@@ -338,61 +344,113 @@ describe("Scheduler Utils - Depletion Calculation", () => {
 describe("Scheduler Utils - Upcoming Intakes", () => {
 	describe("getUpcomingIntakes", () => {
 		it("should return empty array when no intakes in window", () => {
-      const blisters: Blister[] = [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }];
-      // Set "now" to a time far from any scheduled intake
-      const now = new Date("2025-01-01T12:00:00.000Z").getTime();
+			// With parseLocalDateTime, times are treated as local - use same format for consistency
+			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00" })];
+			// Set "now" to a time far from any scheduled intake (12:00 local)
+			const now = new Date(2025, 0, 1, 12, 0, 0).getTime();
 
-      const result = getUpcomingIntakes("TestMed", blisters, 15, [], null, "en-US", "UTC", now);
+			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
 			expect(result).toEqual([]);
 		});
 
 		it("should find intake within reminder window", () => {
-      // Schedule intake at 08:00, check at 07:45 (15 minutes before)
-      const blisters: Blister[] = [{ usage: 2, every: 1, start: "2025-01-01T08:00:00.000Z" }];
-      const now = new Date("2025-01-01T07:45:00.000Z").getTime();
+			// Schedule intake at 08:00 local, check at 07:45 local (15 minutes before)
+			const intakes: Intake[] = [blisterToIntake({ usage: 2, every: 1, start: "2025-01-01T08:00:00" }, "Alice")];
+			const now = new Date(2025, 0, 1, 7, 45, 0).getTime();
 
-      const result = getUpcomingIntakes("TestMed", blisters, 15, ["Alice"], 500, "en-US", "UTC", now);
+			const result = getUpcomingIntakes("TestMed", intakes, 15, [], 500, "en-US", "UTC", now);
 
 			expect(result).toHaveLength(1);
 			expect(result[0].medName).toBe("TestMed");
 			expect(result[0].usage).toBe(2);
-      expect(result[0].takenBy).toEqual(["Alice"]);
+			expect(result[0].takenBy).toBe("Alice");
 			expect(result[0].pillWeightMg).toBe(500);
 		});
 
 		it("should skip blisters with zero interval", () => {
-      const blisters: Blister[] = [{ usage: 1, every: 0, start: "2025-01-01T08:00:00.000Z" }];
-      const now = new Date("2025-01-01T07:45:00.000Z").getTime();
+			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 0, start: "2025-01-01T08:00:00" })];
+			const now = new Date(2025, 0, 1, 7, 45, 0).getTime();
 
-      const result = getUpcomingIntakes("TestMed", blisters, 15, [], null, "en-US", "UTC", now);
+			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
 			expect(result).toEqual([]);
 		});
 
 		it("should handle multiple blisters", () => {
-      // Two intakes at 08:00 and 08:01
-      const blisters: Blister[] = [
-        { usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" },
-        { usage: 2, every: 1, start: "2025-01-01T08:01:00.000Z" },
+			// Two intakes at 08:00 and 08:01 local
+			const intakes: Intake[] = [
+				blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00" }),
+				blisterToIntake({ usage: 2, every: 1, start: "2025-01-01T08:01:00" }),
 			];
-      const now = new Date("2025-01-01T07:45:00.000Z").getTime();
+			const now = new Date(2025, 0, 1, 7, 45, 0).getTime();
 
-      const result = getUpcomingIntakes("TestMed", blisters, 15, [], null, "en-US", "UTC", now);
+			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
 
 			// Both should be found as they're within the window
 			expect(result.length).toBeGreaterThanOrEqual(1);
 		});
+
+		it("should catch up missed advance reminder when notify window passed but intake still future", () => {
+			// Intake at 15:57, reminder 15 min before = 15:42
+			// Scheduler was down at 15:42, now running at 15:50 (intake still in future)
+			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T15:57:00" })];
+			// "now" = 15:50 local time on the same day — past the 15:42 notify window, but before 15:57 intake
+			const now = new Date(2025, 0, 1, 15, 50, 0).getTime();
+
+			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
+
+			// Should still return the intake as a catch-up advance reminder
+			expect(result).toHaveLength(1);
+			expect(result[0].medName).toBe("TestMed");
+			expect(result[0].usage).toBe(1);
+		});
+
+		it("should catch up missed advance reminder even 1 minute before intake", () => {
+			// Intake at 08:00, reminder at 07:45. Scheduler catches up at 07:59.
+			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00" })];
+			const now = new Date(2025, 0, 1, 7, 59, 30).getTime();
+
+			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
+
+			expect(result).toHaveLength(1);
+		});
+
+		it("should not catch up for intakes already in the past", () => {
+			// Intake at 08:00, reminder at 07:45. Now = 08:05 (intake already past).
+			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00" })];
+			const now = new Date(2025, 0, 1, 8, 5, 0).getTime();
+
+			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
+
+			// Should NOT return — intake is past, handled by getTodaysIntakes instead
+			expect(result).toHaveLength(0);
+		});
+
+		it("should catch up for recurring intake on later day", () => {
+			// Intake started Jan 1 at 10:00, every 1 day. Now = Jan 3 at 09:50 (past notify, before intake)
+			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T10:00:00" })];
+			const now = new Date(2025, 0, 3, 9, 50, 0).getTime();
+
+			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
+
+			// Should return today's occurrence via catch-up
+			expect(result).toHaveLength(1);
+			// The intake time should be Jan 3 at 10:00
+			expect(result[0].intakeTime.getHours()).toBe(10);
+			expect(result[0].intakeTime.getDate()).toBe(3);
+		});
 	});
 
 	describe("getTodaysIntakes", () => {
 		it("should return all intakes for today", () => {
 			// Daily medication at 08:00 starting yesterday
-      const blisters: Blister[] = [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }];
+			// With parseLocalDateTime, "08:00:00.000Z" is treated as 08:00 local time
+			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" })];
 
-      // Get intakes for 2025-01-02 (today's intake should be at 08:00)
-      const result = getTodaysIntakes("TestMed", blisters, [], null, "en-US", "UTC");
+			// Get intakes for today (today's intake should be at 08:00 local)
+			const result = getTodaysIntakes("TestMed", intakes, [], null, "en-US", "UTC");
 
 			expect(result.length).toBeGreaterThanOrEqual(1);
-      const intake = result.find(i => i.intakeTime.getUTCHours() === 8);
+			const intake = result.find((i) => i.intakeTime.getHours() === 8);
 			expect(intake).toBeDefined();
 			expect(intake?.medName).toBe("TestMed");
 			expect(intake?.usage).toBe(1);
@@ -403,18 +461,23 @@ describe("Scheduler Utils - Upcoming Intakes", () => {
 			const todayMidnight = new Date();
 			todayMidnight.setUTCHours(0, 1, 0, 0);
 
-      const blisters: Blister[] = [{ 
+			const intakes: Intake[] = [
+				blisterToIntake(
+					{
 						usage: 2,
 						every: 1,
-        start: todayMidnight.toISOString() 
-      }];
+						start: todayMidnight.toISOString(),
+					},
+					"Bob"
+				),
+			];
 
-      const result = getTodaysIntakes("PastMed", blisters, ["Bob"], 250, "en-US", "UTC");
+			const result = getTodaysIntakes("PastMed", intakes, [], 250, "en-US", "UTC");
 
 			expect(result).toHaveLength(1);
 			expect(result[0].medName).toBe("PastMed");
 			expect(result[0].usage).toBe(2);
-      expect(result[0].takenBy).toEqual(["Bob"]);
+			expect(result[0].takenBy).toBe("Bob");
 			expect(result[0].pillWeightMg).toBe(250);
 		});
 
@@ -426,12 +489,12 @@ describe("Scheduler Utils - Upcoming Intakes", () => {
 			const evening = new Date(today);
 			evening.setUTCHours(20, 0, 0, 0);
 
-      const blisters: Blister[] = [
-        { usage: 1, every: 1, start: morning.toISOString() },
-        { usage: 1, every: 1, start: evening.toISOString() },
+			const intakes: Intake[] = [
+				blisterToIntake({ usage: 1, every: 1, start: morning.toISOString() }),
+				blisterToIntake({ usage: 1, every: 1, start: evening.toISOString() }),
 			];
 
-      const result = getTodaysIntakes("MultiMed", blisters, [], null, "en-US", "UTC");
+			const result = getTodaysIntakes("MultiMed", intakes, [], null, "en-US", "UTC");
 
 			expect(result.length).toBeGreaterThanOrEqual(2);
 		});
@@ -441,32 +504,40 @@ describe("Scheduler Utils - Upcoming Intakes", () => {
 			const lastWeek = new Date();
 			lastWeek.setDate(lastWeek.getDate() - 7);
 
-      const blisters: Blister[] = [{ 
+			const intakes: Intake[] = [
+				blisterToIntake({
 					usage: 1,
 					every: 7,
-        start: lastWeek.toISOString() 
-      }];
+					start: lastWeek.toISOString(),
+				}),
+			];
 
 			// If today is not the same day of week, should return empty
-      const result = getTodaysIntakes("WeeklyMed", blisters, [], null, "en-US", "UTC");
+			const result = getTodaysIntakes("WeeklyMed", intakes, [], null, "en-US", "UTC");
 
 			// This test might return 0 or 1 depending on the day
 			expect(Array.isArray(result)).toBe(true);
 		});
 
-    it("should handle timezone correctly", () => {
-      // 23:00 in Europe/Berlin on a specific date
-      const blisters: Blister[] = [{ 
+		it("should handle local time correctly (ignore Z suffix)", () => {
+			// With parseLocalDateTime, the Z suffix is ignored and time is treated as local server time
+			// The intakeTimeStr is then formatted for the target timezone (Europe/Berlin)
+			// So if server is in UTC, 14:00 server time becomes 15:00 Europe/Berlin time
+			const intakes: Intake[] = [
+				blisterToIntake({
 					usage: 1,
 					every: 1,
-        start: "2025-01-01T22:00:00.000Z" // 23:00 Berlin time
-      }];
+					start: "2025-01-01T14:00:00.000Z", // Treated as 14:00 server local time
+				}),
+			];
 
-      const result = getTodaysIntakes("TzMed", blisters, [], null, "de-DE", "Europe/Berlin");
+			const result = getTodaysIntakes("TzMed", intakes, [], null, "de-DE", "Europe/Berlin");
 
 			expect(Array.isArray(result)).toBe(true);
 			if (result.length > 0) {
-        expect(result[0].intakeTimeStr).toContain("23:");
+				// The intakeTimeStr should be a valid time format (HH:MM)
+				// Exact value depends on server timezone vs target timezone offset
+				expect(result[0].intakeTimeStr).toMatch(/^\d{2}:\d{2}$/);
 			}
 		});
 	});
@@ -532,8 +603,8 @@ describe("Scheduler Utils - State Management", () => {
 			const json = JSON.stringify({
 				reminders: {
 					"med1:123": { firstSentAt: 1000, lastSentAt: 2000, sendCount: 2 },
-          "med2:456": { firstSentAt: 3000, lastSentAt: 3000, sendCount: 1 }
-        } 
+					"med2:456": { firstSentAt: 3000, lastSentAt: 3000, sendCount: 1 },
+				},
 			});
 
 			const state = parseIntakeReminderState(json);
@@ -572,7 +643,11 @@ describe("Scheduler Utils - State Management", () => {
 			yesterday.setDate(yesterday.getDate() - 1);
 
 			const reminders = {
-        [`med1:${yesterday.getTime()}`]: { firstSentAt: yesterday.getTime(), lastSentAt: yesterday.getTime(), sendCount: 1 },
+				[`med1:${yesterday.getTime()}`]: {
+					firstSentAt: yesterday.getTime(),
+					lastSentAt: yesterday.getTime(),
+					sendCount: 1,
+				},
 				[`med2:${today.getTime()}`]: { firstSentAt: today.getTime(), lastSentAt: today.getTime(), sendCount: 1 },
 			};
 
@@ -608,7 +683,7 @@ describe("Scheduler Utils - State Management", () => {
 		it("should handle malformed entries (invalid timestamp in key)", () => {
 			const reminders = {
 				"med1:invalid": { firstSentAt: 1000, lastSentAt: 1000, sendCount: 1 },
-        "med2:notanumber": { firstSentAt: 2000, lastSentAt: 2000, sendCount: 1 }
+				"med2:notanumber": { firstSentAt: 2000, lastSentAt: 2000, sendCount: 1 },
 			};
 			const cleaned = cleanOldIntakeReminders(reminders, "Europe/Berlin");
 			// NaN from parseInt will cause these to be filtered out (invalid < todayStart)

backend/src/test/settings.test.ts

@@ -2,14 +2,14 @@
  * Tests for /settings API endpoints.
  * Tests user settings CRUD operations.
  */
-import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import {
 	buildTestApp,
-  closeTestApp,
 	clearTestData,
+	closeTestApp,
 	createTestUser,
 	setUserSettings,
-  TestContext,
+	type TestContext,
 } from "./setup.js";
 
 // =============================================================================
@@ -20,7 +20,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
 	const { app, client } = ctx;
 
 	// GET /settings - Get user settings
-  app.get("/settings", async (request, reply) => {
+	app.get("/settings", async (_request, _reply) => {
 		const userId = 1;
 
 		const result = await client.execute({
@@ -51,6 +51,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
 				expiryWarningDays: 90,
 				language: "en",
 				stockCalculationMode: "automatic",
+				shareStockStatus: true,
 			};
 		}
 
@@ -76,6 +77,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
 			expiryWarningDays: s.expiry_warning_days,
 			language: s.language,
 			stockCalculationMode: s.stock_calculation_mode,
+			shareStockStatus: Boolean(s.share_stock_status ?? 1),
 		};
 	});
 
@@ -102,6 +104,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
 			expiryWarningDays?: number;
 			language?: string;
 			stockCalculationMode?: "automatic" | "manual";
+			shareStockStatus?: boolean;
 		};
 	}>("/settings", async (request, reply) => {
 		const userId = 1;
@@ -123,7 +126,10 @@ async function registerSettingsRoutes(ctx: TestContext) {
 		if (body.stockCalculationMode && !["automatic", "manual"].includes(body.stockCalculationMode)) {
 			return reply.status(400).send({ error: "stockCalculationMode must be 'automatic' or 'manual'" });
 		}
-    if (body.reminderRepeatIntervalMinutes !== undefined && (body.reminderRepeatIntervalMinutes < 5 || body.reminderRepeatIntervalMinutes > 480)) {
+		if (
+			body.reminderRepeatIntervalMinutes !== undefined &&
+			(body.reminderRepeatIntervalMinutes < 5 || body.reminderRepeatIntervalMinutes > 480)
+		) {
 			return reply.status(400).send({ error: "reminderRepeatIntervalMinutes must be between 5 and 480" });
 		}
 		if (body.maxNaggingReminders !== undefined && (body.maxNaggingReminders < 1 || body.maxNaggingReminders > 20)) {
@@ -147,8 +153,8 @@ async function registerSettingsRoutes(ctx: TestContext) {
           reminder_days_before, repeat_daily_reminders, skip_reminders_for_taken_doses,
           repeat_reminders_enabled, reminder_repeat_interval_minutes, max_nagging_reminders,
           low_stock_days, normal_stock_days, high_stock_days,
-          expiry_warning_days, language, stock_calculation_mode
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          expiry_warning_days, language, stock_calculation_mode, share_stock_status
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
 				args: [
 					userId,
 					body.emailEnabled ? 1 : 0,
@@ -171,6 +177,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
 					body.expiryWarningDays ?? 90,
 					body.language || "en",
 					body.stockCalculationMode || "automatic",
+					body.shareStockStatus !== false ? 1 : 0,
 				],
 			});
 		} else {
@@ -197,6 +204,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
           expiry_warning_days = ?,
           language = ?,
           stock_calculation_mode = ?,
+          share_stock_status = ?,
           updated_at = strftime('%s','now')
         WHERE user_id = ?`,
 				args: [
@@ -220,6 +228,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
 					body.expiryWarningDays ?? 90,
 					body.language || "en",
 					body.stockCalculationMode || "automatic",
+					body.shareStockStatus !== false ? 1 : 0,
 					userId,
 				],
 			});
@@ -539,6 +548,64 @@ describe("Settings API", () => {
 		});
 	});
 
+	// ---------------------------------------------------------------------------
+	// Share Stock Status
+	// ---------------------------------------------------------------------------
+
+	describe("Share Stock Status", () => {
+		it("should default to true (show stock on shared links)", async () => {
+			const response = await ctx.app.inject({
+				method: "GET",
+				url: "/settings",
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json().shareStockStatus).toBe(true);
+		});
+
+		it("should disable share stock status", async () => {
+			const response = await ctx.app.inject({
+				method: "PUT",
+				url: "/settings",
+				payload: { shareStockStatus: false },
+			});
+
+			expect(response.statusCode).toBe(200);
+
+			const getResponse = await ctx.app.inject({
+				method: "GET",
+				url: "/settings",
+			});
+
+			expect(getResponse.json().shareStockStatus).toBe(false);
+		});
+
+		it("should re-enable share stock status", async () => {
+			// Disable first
+			await ctx.app.inject({
+				method: "PUT",
+				url: "/settings",
+				payload: { shareStockStatus: false },
+			});
+
+			// Re-enable
+			const response = await ctx.app.inject({
+				method: "PUT",
+				url: "/settings",
+				payload: { shareStockStatus: true },
+			});
+
+			expect(response.statusCode).toBe(200);
+
+			const getResponse = await ctx.app.inject({
+				method: "GET",
+				url: "/settings",
+			});
+
+			expect(getResponse.json().shareStockStatus).toBe(true);
+		});
+	});
+
 	// ---------------------------------------------------------------------------
 	// Repeat Reminders & Skip Reminders Settings
 	// ---------------------------------------------------------------------------

backend/src/test/setup.ts

@@ -2,15 +2,22 @@
  * Test setup and utilities for MedAssist backend API tests.
  * Uses in-memory SQLite for isolation between test files.
  */
-import Fastify, { FastifyInstance } from "fastify";
+
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import cookie from "@fastify/cookie";
 import jwt from "@fastify/jwt";
-import sensible from "@fastify/sensible";
 import fastifyMultipart from "@fastify/multipart";
-import { createClient, Client } from "@libsql/client";
+import sensible from "@fastify/sensible";
+import { type Client, createClient } from "@libsql/client";
 import { drizzle } from "drizzle-orm/libsql";
-import { beforeAll, afterAll, beforeEach } from "vitest";
-import { getTableCreationSQL } from "../db/schema-sql.js";
+import { migrate } from "drizzle-orm/libsql/migrator";
+import Fastify, { type FastifyInstance } from "fastify";
+
+// Get migrations folder path
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const migrationsFolder = resolve(__dirname, "../../drizzle");
 
 // Type for our test database
 export type TestDb = ReturnType<typeof drizzle>;
@@ -61,14 +68,11 @@ export async function buildTestApp(): Promise<TestContext> {
 }
 
 /**
- * Create test database schema
+ * Create test database schema using drizzle-kit migrations
  */
 async function runTestMigrations(client: Client): Promise<void> {
-  const tableCreations = getTableCreationSQL();
-
-  for (const sql of tableCreations) {
-    await client.execute(sql);
-  }
+	const db = drizzle(client);
+	await migrate(db, { migrationsFolder });
 }
 
 // =============================================================================
@@ -83,10 +87,7 @@ export interface CreateUserOptions {
 /**
  * Create a test user and return the ID
  */
-export async function createTestUser(
-  client: Client,
-  options: CreateUserOptions = {}
-): Promise<number> {
+export async function createTestUser(client: Client, options: CreateUserOptions = {}): Promise<number> {
 	const { username = `user_${Date.now()}`, authProvider = "local" } = options;
 
 	const result = await client.execute({
@@ -117,10 +118,7 @@ export interface CreateMedicationOptions {
 /**
  * Create a test medication and return the ID
  */
-export async function createTestMedication(
-  client: Client,
-  options: CreateMedicationOptions
-): Promise<number> {
+export async function createTestMedication(client: Client, options: CreateMedicationOptions): Promise<number> {
 	const {
 		userId,
 		name = "Test Medication",
@@ -182,17 +180,8 @@ export interface CreateShareTokenOptions {
 /**
  * Create a test share token and return the token string
  */
-export async function createTestShareToken(
-  client: Client,
-  options: CreateShareTokenOptions
-): Promise<string> {
-  const {
-    userId,
-    takenBy,
-    token = `test_token_${Date.now()}`,
-    scheduleDays = 30,
-    expiresAt = null,
-  } = options;
+export async function createTestShareToken(client: Client, options: CreateShareTokenOptions): Promise<string> {
+	const { userId, takenBy, token = `test_token_${Date.now()}`, scheduleDays = 30, expiresAt = null } = options;
 
 	await client.execute({
 		sql: `INSERT INTO share_tokens (user_id, token, taken_by, schedule_days, expires_at)
@@ -213,16 +202,8 @@ export interface CreateDoseTrackingOptions {
 /**
  * Create a dose tracking record
  */
-export async function createTestDoseTracking(
-  client: Client,
-  options: CreateDoseTrackingOptions
-): Promise<void> {
-  const {
-    userId,
-    doseId,
-    markedBy = null,
-    takenAt = Math.floor(Date.now() / 1000),
-  } = options;
+export async function createTestDoseTracking(client: Client, options: CreateDoseTrackingOptions): Promise<void> {
+	const { userId, doseId, markedBy = null, takenAt = Math.floor(Date.now() / 1000) } = options;
 
 	await client.execute({
 		sql: `INSERT INTO dose_tracking (user_id, dose_id, marked_by, taken_at)
@@ -235,16 +216,14 @@ export interface UpdateUserSettingsOptions {
 	userId: number;
 	stockCalculationMode?: "automatic" | "manual";
 	lowStockDays?: number;
+	shareStockStatus?: boolean;
 }
 
 /**
  * Create or update user settings
  */
-export async function setUserSettings(
-  client: Client,
-  options: UpdateUserSettingsOptions
-): Promise<void> {
-  const { userId, stockCalculationMode = "automatic", lowStockDays = 30 } = options;
+export async function setUserSettings(client: Client, options: UpdateUserSettingsOptions): Promise<void> {
+	const { userId, stockCalculationMode = "automatic", lowStockDays = 30, shareStockStatus } = options;
 
 	// Check if settings exist
 	const existing = await client.execute({
@@ -254,13 +233,19 @@ export async function setUserSettings(
 
 	if (existing.rows.length > 0) {
 		await client.execute({
-      sql: `UPDATE user_settings SET stock_calculation_mode = ?, low_stock_days = ? WHERE user_id = ?`,
-      args: [stockCalculationMode, lowStockDays, userId],
+			sql: `UPDATE user_settings SET stock_calculation_mode = ?, low_stock_days = ?${shareStockStatus !== undefined ? ", share_stock_status = ?" : ""} WHERE user_id = ?`,
+			args:
+				shareStockStatus !== undefined
+					? [stockCalculationMode, lowStockDays, shareStockStatus ? 1 : 0, userId]
+					: [stockCalculationMode, lowStockDays, userId],
 		});
 	} else {
 		await client.execute({
-      sql: `INSERT INTO user_settings (user_id, stock_calculation_mode, low_stock_days) VALUES (?, ?, ?)`,
-      args: [userId, stockCalculationMode, lowStockDays],
+			sql: `INSERT INTO user_settings (user_id, stock_calculation_mode, low_stock_days${shareStockStatus !== undefined ? ", share_stock_status" : ""}) VALUES (?, ?, ?${shareStockStatus !== undefined ? ", ?" : ""})`,
+			args:
+				shareStockStatus !== undefined
+					? [userId, stockCalculationMode, lowStockDays, shareStockStatus ? 1 : 0]
+					: [userId, stockCalculationMode, lowStockDays],
 		});
 	}
 }
@@ -282,6 +267,7 @@ export async function closeTestApp(ctx: TestContext): Promise<void> {
  */
 export async function clearTestData(client: Client): Promise<void> {
 	// Order matters due to foreign keys
+	await client.execute("DELETE FROM refill_history");
 	await client.execute("DELETE FROM dose_tracking");
 	await client.execute("DELETE FROM share_tokens");
 	await client.execute("DELETE FROM refresh_tokens");

backend/src/test/share.test.ts

@@ -2,15 +2,16 @@
  * Tests for share link API endpoints.
  * Tests creating share tokens, accessing shared schedules, and marking doses via share links.
  */
-import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import {
 	buildTestApp,
-  closeTestApp,
 	clearTestData,
-  createTestUser,
+	closeTestApp,
 	createTestMedication,
 	createTestShareToken,
-  TestContext,
+	createTestUser,
+	setUserSettings,
+	type TestContext,
 } from "./setup.js";
 
 // =============================================================================
@@ -40,7 +41,7 @@ async function registerShareRoutes(ctx: TestContext) {
 		});
 
 		const hasMatchingMed = meds.rows.some((m) => {
-      const takenByList: string[] = JSON.parse(m.taken_by_json as string || "[]");
+			const takenByList: string[] = JSON.parse((m.taken_by_json as string) || "[]");
 			return takenByList.includes(takenBy);
 		});
 
@@ -103,13 +104,13 @@ async function registerShareRoutes(ctx: TestContext) {
 
 		const medications = medsResult.rows
 			.filter((m) => {
-        const takenByList: string[] = JSON.parse(m.taken_by_json as string || "[]");
+				const takenByList: string[] = JSON.parse((m.taken_by_json as string) || "[]");
 				return takenByList.includes(share.taken_by as string);
 			})
 			.map((m) => {
-        const usageArr: number[] = JSON.parse(m.usage_json as string || "[]");
-        const everyArr: number[] = JSON.parse(m.every_json as string || "[]");
-        const startArr: string[] = JSON.parse(m.start_json as string || "[]");
+				const usageArr: number[] = JSON.parse((m.usage_json as string) || "[]");
+				const everyArr: number[] = JSON.parse((m.every_json as string) || "[]");
+				const startArr: string[] = JSON.parse((m.start_json as string) || "[]");
 
 				return {
 					id: m.id,
@@ -118,15 +119,13 @@ async function registerShareRoutes(ctx: TestContext) {
 					pillWeightMg: m.pill_weight_mg,
 					imageUrl: m.image_url,
 					totalPills:
-            (m.pack_count as number) *
-              (m.blisters_per_pack as number) *
-              (m.pills_per_blister as number) +
+						(m.pack_count as number) * (m.blisters_per_pack as number) * (m.pills_per_blister as number) +
 						(m.loose_tablets as number),
 					packCount: m.pack_count,
 					blistersPerPack: m.blisters_per_pack,
 					looseTablets: m.loose_tablets,
 					pillsPerBlister: m.pills_per_blister,
-          takenBy: JSON.parse(m.taken_by_json as string || "[]"),
+					takenBy: JSON.parse((m.taken_by_json as string) || "[]"),
 					blisters: usageArr.map((usage, i) => ({
 						usage,
 						every: everyArr[i] || 1,
@@ -143,6 +142,14 @@ async function registerShareRoutes(ctx: TestContext) {
 
 		const lowStockDays = settingsResult.rows.length > 0 ? (settingsResult.rows[0].low_stock_days as number) : 30;
 
+		// Get shareStockStatus setting
+		const shareStockResult = await client.execute({
+			sql: `SELECT share_stock_status FROM user_settings WHERE user_id = ?`,
+			args: [share.user_id],
+		});
+		const shareStockStatus =
+			shareStockResult.rows.length > 0 ? Boolean(shareStockResult.rows[0].share_stock_status ?? 1) : true;
+
 		return {
 			takenBy: share.taken_by,
 			sharedBy: share.owner_username,
@@ -151,6 +158,7 @@ async function registerShareRoutes(ctx: TestContext) {
 			stockThresholds: {
 				lowStockDays,
 			},
+			shareStockStatus,
 		};
 	});
 
@@ -184,9 +192,7 @@ async function registerShareRoutes(ctx: TestContext) {
 	});
 
 	// POST /share/:token/doses - Mark dose via share link
-  app.post<{ Params: { token: string }; Body: { doseId: string } }>(
-    "/share/:token/doses",
-    async (request, reply) => {
+	app.post<{ Params: { token: string }; Body: { doseId: string } }>("/share/:token/doses", async (request, reply) => {
 		const { token } = request.params;
 		const { doseId } = request.body || {};
 
@@ -222,13 +228,10 @@ async function registerShareRoutes(ctx: TestContext) {
 		});
 
 		return { success: true };
-    }
-  );
+	});
 
 	// DELETE /share/:token/doses/:doseId - Unmark dose via share link
-  app.delete<{ Params: { token: string; doseId: string } }>(
-    "/share/:token/doses/:doseId",
-    async (request, reply) => {
+	app.delete<{ Params: { token: string; doseId: string } }>("/share/:token/doses/:doseId", async (request, reply) => {
 		const { token, doseId } = request.params;
 
 		const shareResult = await client.execute({
@@ -248,11 +251,10 @@ async function registerShareRoutes(ctx: TestContext) {
 		});
 
 		return { success: true };
-    }
-  );
+	});
 
 	// GET /share/people - Get unique takenBy values
-  app.get("/share/people", async (request, reply) => {
+	app.get("/share/people", async (_request, _reply) => {
 		const userId = 1;
 
 		const result = await client.execute({
@@ -262,7 +264,7 @@ async function registerShareRoutes(ctx: TestContext) {
 
 		const peopleSet = new Set<string>();
 		for (const row of result.rows) {
-      const takenByList: string[] = JSON.parse(row.taken_by_json as string || "[]");
+			const takenByList: string[] = JSON.parse((row.taken_by_json as string) || "[]");
 			takenByList.forEach((p) => peopleSet.add(p));
 		}
 
@@ -429,6 +431,41 @@ describe("Share Link API", () => {
 			expect(med.blisters).toHaveLength(1);
 			expect(med.blisters[0].usage).toBe(1);
 			expect(med.blisters[0].every).toBe(1);
+
+			// shareStockStatus should default to true
+			expect(data.shareStockStatus).toBe(true);
+		});
+
+		it("should respect shareStockStatus setting when disabled", async () => {
+			// Create medication
+			await createTestMedication(ctx.client, {
+				userId,
+				name: "TestMed",
+				takenBy: ["Daniel"],
+				packCount: 1,
+				blistersPerPack: 1,
+				pillsPerBlister: 10,
+				looseTablets: 0,
+				blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
+			});
+
+			// Set shareStockStatus to false
+			await setUserSettings(ctx.client, { userId, shareStockStatus: false });
+
+			// Create share token
+			const token = await createTestShareToken(ctx.client, {
+				userId,
+				takenBy: "Daniel",
+				scheduleDays: 30,
+			});
+
+			const response = await ctx.app.inject({
+				method: "GET",
+				url: `/share/${token}`,
+			});
+
+			expect(response.statusCode).toBe(200);
+			expect(response.json().shareStockStatus).toBe(false);
 		});
 
 		it("should return 404 for invalid token", async () => {

backend/src/test/stock-calculation.test.ts

@@ -2,16 +2,16 @@
  * Tests for stock calculation modes (automatic vs manual).
  * Tests the /medications/usage endpoint with different settings.
  */
-import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import {
 	buildTestApp,
-  closeTestApp,
 	clearTestData,
-  createTestUser,
-  createTestMedication,
+	closeTestApp,
 	createTestDoseTracking,
+	createTestMedication,
+	createTestUser,
 	setUserSettings,
-  TestContext,
+	type TestContext,
 } from "./setup.js";
 
 // =============================================================================
@@ -22,9 +22,7 @@ async function registerUsageRoutes(ctx: TestContext) {
 	const { app, client } = ctx;
 
 	// POST /medications/usage - Calculate medication usage for a date range
-  app.post<{ Body: { startDate: string; endDate: string } }>(
-    "/medications/usage",
-    async (request, reply) => {
+	app.post<{ Body: { startDate: string; endDate: string } }>("/medications/usage", async (request, reply) => {
 		const userId = 1;
 		const { startDate, endDate } = request.body || {};
 
@@ -41,9 +39,7 @@ async function registerUsageRoutes(ctx: TestContext) {
 			args: [userId],
 		});
 		const stockMode =
-        settingsResult.rows.length > 0
-          ? (settingsResult.rows[0].stock_calculation_mode as string)
-          : "automatic";
+			settingsResult.rows.length > 0 ? (settingsResult.rows[0].stock_calculation_mode as string) : "automatic";
 
 		// Get all medications
 		const medsResult = await client.execute({
@@ -55,9 +51,7 @@ async function registerUsageRoutes(ctx: TestContext) {
 
 		for (const med of medsResult.rows) {
 			const totalPills =
-          (med.pack_count as number) *
-            (med.blisters_per_pack as number) *
-            (med.pills_per_blister as number) +
+				(med.pack_count as number) * (med.blisters_per_pack as number) * (med.pills_per_blister as number) +
 				(med.loose_tablets as number);
 
 			const blisterSize = med.pills_per_blister as number;
@@ -77,7 +71,7 @@ async function registerUsageRoutes(ctx: TestContext) {
 					const scheduleStart = new Date(startArr[i] || start);
 
 					// Count doses from scheduleStart to end within the range
-            let current = new Date(scheduleStart);
+					const current = new Date(scheduleStart);
 					while (current <= end) {
 						if (current >= start) {
 							plannerUsage += usage;
@@ -92,11 +86,7 @@ async function registerUsageRoutes(ctx: TestContext) {
                   WHERE user_id = ? 
                   AND taken_at >= ? 
                   AND taken_at <= ?`,
-            args: [
-              userId,
-              Math.floor(start.getTime() / 1000),
-              Math.floor(end.getTime() / 1000),
-            ],
+					args: [userId, Math.floor(start.getTime() / 1000), Math.floor(end.getTime() / 1000)],
 				});
 
 				// Filter to doses for this medication
@@ -133,11 +123,10 @@ async function registerUsageRoutes(ctx: TestContext) {
 		}
 
 		return results;
-    }
-  );
+	});
 
 	// GET /medications - List medications (for checking stock)
-  app.get("/medications", async (request, reply) => {
+	app.get("/medications", async (_request, _reply) => {
 		const userId = 1;
 
 		const result = await client.execute({
@@ -153,9 +142,7 @@ async function registerUsageRoutes(ctx: TestContext) {
 			pillsPerBlister: m.pills_per_blister,
 			looseTablets: m.loose_tablets,
 			totalPills:
-        (m.pack_count as number) *
-          (m.blisters_per_pack as number) *
-          (m.pills_per_blister as number) +
+				(m.pack_count as number) * (m.blisters_per_pack as number) * (m.pills_per_blister as number) +
 				(m.loose_tablets as number),
 		}));
 	});

backend/src/test/translations.test.ts

@@ -1,8 +1,8 @@
 /**
  * Tests for translations module
  */
-import { describe, it, expect } from "vitest";
-import { getTranslations, t, getDateLocale, type Language } from "../i18n/translations.js";
+import { describe, expect, it } from "vitest";
+import { getDateLocale, getTranslations, type Language, t } from "../i18n/translations.js";
 
 describe("Translations Module", () => {
 	describe("getTranslations", () => {
@@ -69,8 +69,8 @@ describe("Translations Module", () => {
 		});
 
 		it("should replace multiple placeholders", () => {
-      const result = t("{count} {type} running low", { count: 3, type: "medications" });
-      expect(result).toBe("3 medications running low");
+			const result = t("{count} {type} running critically low", { count: 3, type: "medications" });
+			expect(result).toBe("3 medications running critically low");
 		});
 
 		it("should replace same placeholder multiple times", () => {
@@ -98,7 +98,7 @@ describe("Translations Module", () => {
 
 			// Stock reminder subject
 			const subject = t(translations.stockReminder.subject, { count: 3, s: "s" });
-      expect(subject).toBe("MedAssist-ng Auto-Reminder: 3 Medications Running Low");
+			expect(subject).toBe("MedAssist-ng Auto-Reminder: 3 Medications Running Critically Low");
 
 			// Intake reminder description
 			const description = t(translations.intakeReminder.description, { minutes: 30 });
@@ -113,7 +113,7 @@ describe("Translations Module", () => {
 			const translations = getTranslations("de");
 
 			const subject = t(translations.stockReminder.subject, { count: 2, e: "e" });
-      expect(subject).toBe("MedAssist-ng Auto-Erinnerung: 2 Medikamente wird knapp");
+			expect(subject).toBe("MedAssist-ng Auto-Erinnerung: 2 Medikamente kritisch niedrig");
 
 			const takenBy = t(translations.intakeReminder.takenBy, { name: "Daniel" });
 			expect(takenBy).toBe("für Daniel");

backend/src/utils/logger.ts

@@ -0,0 +1,46 @@
+/**
+ * Simple startup logger that respects LOG_LEVEL environment variable.
+ * Used for code that runs before Fastify is initialized (db/client.ts, migrations).
+ * Once Fastify is running, use app.log instead.
+ */
+
+const LOG_LEVELS: Record<string, number> = {
+	silent: 60,
+	fatal: 60,
+	error: 50,
+	warn: 40,
+	info: 30,
+	debug: 20,
+	trace: 10,
+};
+
+function getLevel(): number {
+	const envLevel = (process.env.LOG_LEVEL || "info").toLowerCase();
+	return LOG_LEVELS[envLevel] ?? LOG_LEVELS.info;
+}
+
+function shouldLog(level: string): boolean {
+	return LOG_LEVELS[level] >= getLevel();
+}
+
+export const log = {
+	debug(msg: string): void {
+		if (shouldLog("debug")) console.log(msg);
+	},
+	info(msg: string): void {
+		if (shouldLog("info")) console.log(msg);
+	},
+	warn(msg: string): void {
+		if (shouldLog("warn")) console.warn(msg);
+	},
+	error(msg: string): void {
+		if (shouldLog("error")) console.error(msg);
+	},
+};
+
+/** Logger interface for services that receive a logger from the caller */
+export type ServiceLogger = {
+	info: (msg: string) => void;
+	debug: (msg: string) => void;
+	error: (msg: string) => void;
+};

backend/src/utils/scheduler-utils.ts

@@ -5,8 +5,18 @@
 
 import { getDateLocale, type Language } from "../i18n/translations.js";
 
+// Legacy type - individual blister schedule (DEPRECATED: use Intake instead)
 export type Blister = { usage: number; every: number; start: string };
 
+// New unified intake type with per-intake takenBy
+export type Intake = {
+	usage: number;
+	every: number;
+	start: string;
+	takenBy: string | null; // Person taking this specific intake (null = use medication-level takenBy)
+	intakeRemindersEnabled: boolean;
+};
+
 // =============================================================================
 // Timezone utilities
 // =============================================================================
@@ -24,7 +34,7 @@ export function formatInTimezone(date: Date, tz?: string): string {
 		month: "2-digit",
 		year: "numeric",
 		hour: "2-digit",
-    minute: "2-digit"
+		minute: "2-digit",
 	});
 }
 
@@ -34,7 +44,7 @@ export function getCurrentHourInTimezone(tz?: string): number {
 	const timeStr = now.toLocaleString("en-US", {
 		timeZone: tz ?? getTimezone(),
 		hour: "numeric",
-    hour12: false 
+		hour12: false,
 	});
 	return parseInt(timeStr, 10);
 }
@@ -59,11 +69,11 @@ export function getNextScheduledTime(reminderHour: number, tz?: string): Date {
 		day: "2-digit",
 		hour: "2-digit",
 		minute: "2-digit",
-    hour12: false
+		hour12: false,
 	});
 
 	const parts = formatter.formatToParts(now);
-  const getPart = (type: string) => parts.find(p => p.type === type)?.value || "0";
+	const getPart = (type: string) => parts.find((p) => p.type === type)?.value || "0";
 
 	const currentHour = parseInt(getPart("hour"), 10);
 	const currentMinute = parseInt(getPart("minute"), 10);
@@ -84,7 +94,7 @@ export function getNextScheduledTime(reminderHour: number, tz?: string): Date {
 		timeZone: timezone,
 		year: "numeric",
 		month: "2-digit",
-    day: "2-digit"
+		day: "2-digit",
 	});
 	const [targetYear, targetMonth, targetDay] = targetFormatter.format(targetDate).split("-").map(Number);
 
@@ -96,7 +106,7 @@ export function getNextScheduledTime(reminderHour: number, tz?: string): Date {
 	const checkFormatter = new Intl.DateTimeFormat("en-US", {
 		timeZone: timezone,
 		hour: "2-digit",
-    hour12: false
+		hour12: false,
 	});
 
 	// Adjust based on the difference
@@ -119,7 +129,35 @@ export function getMsUntilNextCheck(reminderHour: number, tz?: string): number {
 // Blister/medication parsing utilities
 // =============================================================================
 
-/** Parse blister schedules from JSON columns */
+/**
+ * Parse an ISO datetime string to local timestamp.
+ * Extracts date/time components directly from the string to avoid
+ * timezone conversion issues with Z suffix.
+ *
+ * "2026-01-23T20:55:00" → treated as local time 20:55
+ * "2026-01-23T20:55:00.000Z" → also treated as local time 20:55 (Z ignored)
+ */
+export function parseLocalDateTime(isoString: string): Date {
+	// Extract components: YYYY-MM-DDTHH:MM:SS (ignore Z and milliseconds)
+	const match = isoString.match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):?(\d{2})?/);
+	if (!match) {
+		// Fallback to Date parsing if format doesn't match
+		return new Date(isoString);
+	}
+
+	const [, year, month, day, hour, minute, second] = match;
+	// Create date using local time interpretation (no UTC conversion)
+	return new Date(
+		parseInt(year, 10),
+		parseInt(month, 10) - 1, // Month is 0-indexed
+		parseInt(day, 10),
+		parseInt(hour, 10),
+		parseInt(minute, 10),
+		parseInt(second ?? "0", 10)
+	);
+}
+
+/** Parse blister schedules from JSON columns (DEPRECATED: use parseIntakesJson instead) */
 export function parseBlisters(row: { usageJson: string; everyJson: string; startJson: string }): Blister[] {
 	try {
 		const usage = JSON.parse(row.usageJson) as number[];
@@ -136,6 +174,59 @@ export function parseBlisters(row: { usageJson: string; everyJson: string; start
 	}
 }
 
+/**
+ * Parse intakes from the new unified intakesJson format.
+ * Falls back to legacy parallel arrays if intakesJson is empty.
+ * @param intakesJson - The new unified JSON string
+ * @param legacyRow - Optional legacy row with usageJson, everyJson, startJson for fallback
+ * @param medicationIntakeRemindersEnabled - Medication-level intakeRemindersEnabled (fallback for legacy)
+ */
+export function parseIntakesJson(
+	intakesJson: string | null | undefined,
+	legacyRow?: { usageJson: string; everyJson: string; startJson: string },
+	medicationIntakeRemindersEnabled?: boolean
+): Intake[] {
+	// Try new format first
+	if (intakesJson) {
+		try {
+			const parsed = JSON.parse(intakesJson);
+			if (Array.isArray(parsed) && parsed.length > 0) {
+				return parsed.map((intake: any) => ({
+					usage: typeof intake.usage === "number" ? intake.usage : 0,
+					every: typeof intake.every === "number" ? intake.every : 1,
+					start: typeof intake.start === "string" ? intake.start : new Date().toISOString(),
+					takenBy: typeof intake.takenBy === "string" && intake.takenBy.trim() ? intake.takenBy.trim() : null,
+					intakeRemindersEnabled:
+						typeof intake.intakeRemindersEnabled === "boolean" ? intake.intakeRemindersEnabled : false,
+				}));
+			}
+		} catch {
+			// Fall through to legacy parsing
+		}
+	}
+
+	// Fallback to legacy parallel arrays
+	if (legacyRow) {
+		const blisters = parseBlisters(legacyRow);
+		return blisters.map((b) => ({
+			usage: b.usage,
+			every: b.every,
+			start: b.start,
+			takenBy: null, // Legacy format has no per-intake takenBy
+			intakeRemindersEnabled: medicationIntakeRemindersEnabled ?? false,
+		}));
+	}
+
+	return [];
+}
+
+/**
+ * Convert intakes to legacy blister format (for backward compatibility)
+ */
+export function intakesToBlisters(intakes: Intake[]): Blister[] {
+	return intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start }));
+}
+
 /** Parse takenByJson to array of strings */
 export function parseTakenByJson(takenByJson: string | null | undefined): string[] {
 	if (!takenByJson) return [];
@@ -147,6 +238,28 @@ export function parseTakenByJson(takenByJson: string | null | undefined): string
 	}
 }
 
+/**
+ * Get all unique takenBy values from both medication-level and intake-level.
+ * Used for filtering and sharing functionality.
+ */
+export function getAllTakenByForMedication(medicationTakenBy: string[], intakes: Intake[]): string[] {
+	const allPeople = new Set<string>(medicationTakenBy);
+	for (const intake of intakes) {
+		if (intake.takenBy) {
+			allPeople.add(intake.takenBy);
+		}
+	}
+	return Array.from(allPeople);
+}
+
+/**
+ * Check if a person takes this medication (either via medication-level or intake-level takenBy).
+ */
+export function personTakesMedication(person: string, medicationTakenBy: string[], intakes: Intake[]): boolean {
+	if (medicationTakenBy.includes(person)) return true;
+	return intakes.some((intake) => intake.takenBy === person);
+}
+
 // =============================================================================
 // Stock calculation utilities
 // =============================================================================
@@ -181,24 +294,30 @@ export function calculateDepletionInfo(
 
 export type UpcomingIntake = {
 	medName: string;
+	medicationId?: number;
+	blisterIndex?: number;
 	usage: number;
 	intakeTime: Date;
 	intakeTimeStr: string;
-  takenBy: string[];
+	takenBy: string | null; // Single person for this intake (null = no specific person)
 	pillWeightMg: number | null;
+	doseUnit?: string;
 };
 
 /**
  * Get all intakes for today (past and future) - used for repeat reminders.
  * Returns all intakes scheduled for today in user's timezone.
+ * Now uses per-intake takenBy instead of medication-level.
  */
 export function getTodaysIntakes(
 	medName: string,
-  blisters: Blister[], 
-  takenBy: string[], 
+	intakes: Intake[],
+	medicationTakenBy: string[], // Medication-level takenBy as fallback
 	pillWeightMg: number | null,
 	locale: string,
-  tz?: string
+	tz?: string,
+	medicationId?: number,
+	doseUnit?: string
 ): UpcomingIntake[] {
 	const timezone = tz ?? getTimezone();
 	const now = new Date();
@@ -210,14 +329,19 @@ export function getTodaysIntakes(
 	const todayEnd = new Date(now.toLocaleString("en-US", { timeZone: timezone }));
 	todayEnd.setHours(23, 59, 59, 999);
 
-  const intakes: UpcomingIntake[] = [];
+	const result: UpcomingIntake[] = [];
 
-  for (const blister of blisters) {
-    const startTime = new Date(blister.start).getTime();
-    const intervalMs = blister.every * 24 * 60 * 60 * 1000;
+	for (let blisterIdx = 0; blisterIdx < intakes.length; blisterIdx++) {
+		const intake = intakes[blisterIdx];
+		const startTime = parseLocalDateTime(intake.start).getTime();
+		const intervalMs = intake.every * 24 * 60 * 60 * 1000;
 
 		if (intervalMs <= 0) continue;
 
+		// Determine takenBy for this intake
+		// If intake has its own takenBy, use it; otherwise null (no specific person)
+		const effectiveTakenBy = intake.takenBy || null;
+
 		// Find all occurrences that fall within today
 		let currentTime = startTime;
 
@@ -232,56 +356,65 @@ export function getTodaysIntakes(
 		while (currentTime <= todayEnd.getTime()) {
 			if (currentTime >= todayStart.getTime()) {
 				const intakeDate = new Date(currentTime);
-        intakes.push({
+				result.push({
 					medName,
-          usage: blister.usage,
+					medicationId,
+					blisterIndex: blisterIdx,
+					usage: intake.usage,
 					intakeTime: intakeDate,
 					intakeTimeStr: intakeDate.toLocaleTimeString(locale, {
 						hour: "2-digit",
 						minute: "2-digit",
-            timeZone: timezone
+						timeZone: timezone,
 					}),
-          takenBy,
+					takenBy: effectiveTakenBy,
 					pillWeightMg,
+					doseUnit,
 				});
 			}
 			currentTime += intervalMs;
 		}
 	}
 
-  return intakes;
+	return result;
 }
 
 /**
  * Get upcoming intakes that fall within the reminder window.
  * Returns intakes that should be notified about right now.
+ * Now uses per-intake takenBy instead of medication-level.
  */
 export function getUpcomingIntakes(
 	medName: string,
-  blisters: Blister[], 
+	intakes: Intake[],
 	minutesBefore: number,
-  takenBy: string[], 
+	medicationTakenBy: string[], // Medication-level takenBy as fallback
 	pillWeightMg: number | null,
 	locale: string,
 	tz?: string,
-  nowOverride?: number
+	nowOverride?: number,
+	medicationId?: number,
+	doseUnit?: string
 ): UpcomingIntake[] {
 	const now = nowOverride ?? Date.now();
 	const timezone = tz ?? getTimezone();
 
-  // Window to detect if "now" is the right time to send reminder
-  // We check if the notify time (intake - minutesBefore) falls within current minute ±1
-  const windowStart = now - 2 * 60 * 1000; // 2 minutes ago (catch slightly late checks)
-  const windowEnd = now + 1 * 60 * 1000; // 1 minute from now
+	// Get the current minute (truncated to minute boundary for precise matching)
+	const currentMinuteStart = Math.floor(now / 60000) * 60000;
+	const currentMinuteEnd = currentMinuteStart + 60000;
 
 	const upcoming: UpcomingIntake[] = [];
 
-  for (const blister of blisters) {
-    const startTime = new Date(blister.start).getTime();
-    const intervalMs = blister.every * 24 * 60 * 60 * 1000;
+	for (let blisterIdx = 0; blisterIdx < intakes.length; blisterIdx++) {
+		const intake = intakes[blisterIdx];
+		const startTime = parseLocalDateTime(intake.start).getTime();
+		const intervalMs = intake.every * 24 * 60 * 60 * 1000;
 
 		if (intervalMs <= 0) continue;
 
+		// Determine takenBy for this intake
+		const effectiveTakenBy = intake.takenBy || null;
+
 		// Find the next scheduled intake time (could be today or in the future)
 		let nextTime = startTime;
 
@@ -295,10 +428,14 @@ export function getUpcomingIntakes(
 			// And the next occurrence
 			const nextOccurrence = startTime + (intervals + 1) * intervalMs;
 
-      // If today's occurrence is within the reminder window, use it
-      // (intake hasn't happened yet, we should remind)
+			// If today's occurrence notification time falls in current minute and intake hasn't happened
 			const currentNotifyTime = currentOccurrence - minutesBefore * 60 * 1000;
-      if (currentNotifyTime >= windowStart && currentOccurrence > now) {
+			if (currentNotifyTime >= currentMinuteStart && currentOccurrence > now) {
+				nextTime = currentOccurrence;
+			} else if (currentNotifyTime < currentMinuteStart && currentOccurrence > now) {
+				// CATCH-UP: The notify window was missed (e.g. due to system sleep/restart)
+				// but the intake time is still in the future — include it so the advance
+				// reminder can still be sent rather than falling into a dead zone.
 				nextTime = currentOccurrence;
 			} else {
 				nextTime = nextOccurrence;
@@ -308,19 +445,30 @@ export function getUpcomingIntakes(
 		// Calculate when we should notify for this intake
 		const notifyTime = nextTime - minutesBefore * 60 * 1000;
 
-    if (notifyTime >= windowStart && notifyTime <= windowEnd) {
+		// Match if:
+		// 1. notifyTime falls within the current minute (normal case), OR
+		// 2. notifyTime is in the past but intakeTime is still in the future (catch-up
+		//    for missed advance reminder window — e.g. scheduler was down during the
+		//    exact notification minute due to system sleep, restart, or heavy load)
+		const isInCurrentMinute = notifyTime >= currentMinuteStart && notifyTime < currentMinuteEnd;
+		const isMissedButStillUpcoming = notifyTime < currentMinuteStart && nextTime > now;
+
+		if (isInCurrentMinute || isMissedButStillUpcoming) {
 			const intakeDate = new Date(nextTime);
 			upcoming.push({
 				medName,
-        usage: blister.usage,
+				medicationId,
+				blisterIndex: blisterIdx,
+				usage: intake.usage,
 				intakeTime: intakeDate,
 				intakeTimeStr: intakeDate.toLocaleTimeString(locale, {
 					hour: "2-digit",
 					minute: "2-digit",
-          timeZone: timezone
+					timeZone: timezone,
 				}),
-        takenBy,
+				takenBy: effectiveTakenBy,
 				pillWeightMg,
+				doseUnit,
 			});
 		}
 	}
@@ -344,7 +492,8 @@ export type ReminderState = {
 export type IntakeReminderEntry = {
 	firstSentAt: number; // Timestamp when first reminder was sent
 	lastSentAt: number; // Timestamp when last reminder was sent
-  sendCount: number;     // How many times reminder was sent
+	sendCount: number; // How many times NAGGING reminder was sent (not counting advance)
+	advanceSent?: boolean; // Whether the advance reminder (15 min before) was sent
 };
 
 export type IntakeReminderState = {
@@ -415,7 +564,10 @@ export function parseIntakeReminderState(json: string): IntakeReminderState {
 
 /** Clean up old intake reminder entries (older than given milliseconds) */
 /** Clean up old intake reminder entries (using timezone-aware day check) */
-export function cleanOldIntakeReminders(reminders: Record<string, IntakeReminderEntry>, tz: string): Record<string, IntakeReminderEntry> {
+export function cleanOldIntakeReminders(
+	reminders: Record<string, IntakeReminderEntry>,
+	tz: string
+): Record<string, IntakeReminderEntry> {
 	// Get start of today in user's timezone
 	const now = new Date();
 	const todayStart = new Date(now.toLocaleString("en-US", { timeZone: tz }));

backend/src/utils/server-config.ts

@@ -3,9 +3,10 @@
  * Exported separately to allow testing without triggering server start.
  */
 
-import { existsSync, mkdirSync } from "fs";
-import { resolve } from "path";
+import { existsSync, mkdirSync } from "node:fs";
+import { resolve } from "node:path";
 import type { CookieSerializeOptions } from "@fastify/cookie";
+import { getDataDir } from "../db/db-utils.js";
 
 /**
  * Parse comma-separated CORS origins string
@@ -20,10 +21,7 @@ export function parseCorsOrigins(originsStr: string): string[] {
 /**
  * Build base cookie options for access token
  */
-export function buildBaseCookieOptions(
-  accessTtlMinutes: number,
-  isProduction: boolean
-): CookieSerializeOptions {
+export function buildBaseCookieOptions(accessTtlMinutes: number, isProduction: boolean): CookieSerializeOptions {
 	return {
 		httpOnly: true,
 		secure: isProduction,
@@ -67,14 +65,8 @@ export interface AppConfig {
 }
 
 export function buildAppConfig(options: AppConfigOptions): AppConfig {
-  const cookieOptions = buildBaseCookieOptions(
-    options.accessTtlMinutes,
-    options.isProduction
-  );
-  const refreshCookieOptions = buildRefreshCookieOptions(
-    cookieOptions,
-    options.refreshTtlDays
-  );
+	const cookieOptions = buildBaseCookieOptions(options.accessTtlMinutes, options.isProduction);
+	const refreshCookieOptions = buildRefreshCookieOptions(cookieOptions, options.refreshTtlDays);
 
 	return {
 		accessSecret: options.jwtSecret || "",
@@ -90,8 +82,7 @@ export function buildAppConfig(options: AppConfigOptions): AppConfig {
  * Ensure images directory exists
  */
 export function ensureImagesDirectory(cwd?: string): string {
-  const basePath = cwd || process.cwd();
-  const imagesDir = resolve(basePath, "data/images");
+	const imagesDir = resolve(getDataDir(cwd), "images");
 	if (!existsSync(imagesDir)) {
 		mkdirSync(imagesDir, { recursive: true });
 	}
@@ -110,10 +101,7 @@ export interface JwtConfig {
 }
 
 export function getJwtConfig(authEnabled: boolean, jwtSecret?: string): JwtConfig {
-  const effectiveSecret =
-    authEnabled && jwtSecret
-      ? jwtSecret
-      : "auth-disabled-no-secret-needed";
+	const effectiveSecret = authEnabled && jwtSecret ? jwtSecret : "auth-disabled-no-secret-needed";
 
 	return {
 		secret: effectiveSecret,

biome.json

@@ -0,0 +1,54 @@
+{
+	"$schema": "https://biomejs.dev/schemas/2.3.12/schema.json",
+	"assist": { "actions": { "source": { "organizeImports": "on" } } },
+	"files": {
+		"includes": ["backend/src/**/*.ts", "frontend/src/**/*.ts", "frontend/src/**/*.tsx", "frontend/src/**/*.css", "frontend/e2e/**/*.ts", "frontend/playwright.config.ts"]
+	},
+	"linter": {
+		"enabled": true,
+		"rules": {
+			"recommended": true,
+			"complexity": {
+				"noForEach": "off"
+			},
+			"suspicious": {
+				"noExplicitAny": "warn",
+				"useIterableCallbackReturn": "off",
+				"noImplicitAnyLet": "warn",
+				"noArrayIndexKey": "warn",
+				"noAssignInExpressions": "off"
+			},
+			"style": {
+				"noNonNullAssertion": "off",
+				"useConst": "error",
+				"noParameterAssign": "off"
+			},
+			"correctness": {
+				"noUnusedVariables": "warn",
+				"noUnusedImports": "warn",
+				"noUnusedFunctionParameters": "warn",
+				"useExhaustiveDependencies": "warn"
+			},
+			"a11y": {
+				"useKeyWithClickEvents": "warn",
+				"noSvgWithoutTitle": "off",
+				"noStaticElementInteractions": "off",
+				"useButtonType": "off",
+				"noLabelWithoutControl": "warn"
+			}
+		}
+	},
+	"formatter": {
+		"enabled": true,
+		"indentStyle": "tab",
+		"indentWidth": 2,
+		"lineWidth": 120
+	},
+	"javascript": {
+		"formatter": {
+			"quoteStyle": "double",
+			"semicolons": "always",
+			"trailingCommas": "es5"
+		}
+	}
+}

docker-compose.dev.yml

@@ -6,9 +6,12 @@ services:
     volumes:
       - ./backend:/app
       - backend_node_modules:/app/node_modules
-      - ./backend/data:/app/data
+      - ./data:/app/data
     env_file:
       - .env
+    environment:
+      - DATA_DIR=/app/data
+      - RATE_LIMIT_MAX=1000
     ports:
       - "3000:3000"
     security_opt:
@@ -27,6 +30,8 @@ services:
     volumes:
       - ./frontend:/app
       - frontend_node_modules:/app/node_modules
+    environment:
+      - BACKEND_URL=http://backend-dev:3000
     ports:
       - "5173:5173"
     security_opt:

docker-compose.yml

@@ -7,6 +7,7 @@ services:
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      - DATA_DIR=/app/data
     volumes:
       - ./data:/app/data
     ports:
@@ -34,6 +35,8 @@ services:
   frontend:
     image: ghcr.io/danielvolz/medassist-ng-frontend:latest
     container_name: medassist-ng-frontend
+    environment:
+      - BACKEND_URL=backend:3000
     ports:
       - "4174:8080"
     networks:

docs/PROJECT_SETUP.md

@@ -0,0 +1,80 @@
+# GitHub Project Setup
+
+This repository includes a GitHub Actions workflow that automatically adds new issues to a GitHub Project for tracking feature requests and bugs.
+
+## Setup Steps
+
+### 1. Create a GitHub Project
+
+1. Go to your GitHub profile → **Projects** → **New project**
+2. Choose the **Board** template (recommended for feature tracking)
+3. Name it e.g. **MedAssist-ng Roadmap**
+4. Configure the default columns:
+   - **Triage** – New issues land here
+   - **Backlog** – Accepted but not yet started
+   - **In Progress** – Currently being worked on
+   - **Done** – Completed
+
+### 2. Create a Personal Access Token (PAT)
+
+The workflow needs a token with project permissions. The built-in `GITHUB_TOKEN` does not support GitHub Projects.
+
+1. Go to **Settings** → **Developer settings** → **Personal access tokens** → **Fine-grained tokens**
+2. Click **Generate new token**
+3. Set:
+   - **Token name**: `add-to-project`
+   - **Expiration**: Choose an appropriate duration
+   - **Repository access**: Select **Only select repositories** → `DanielVolz/medassist-ng`
+   - **Permissions**:
+     - Repository permissions: **Issues** → Read
+     - Organization permissions (if applicable): **Projects** → Read and write
+   - For **user-owned projects**, you need a **classic** token with the `project` scope instead
+4. Copy the generated token
+
+### 3. Add Repository Secrets and Variables
+
+1. Go to the repository → **Settings** → **Secrets and variables** → **Actions**
+2. Add a **secret**:
+   - Name: `ADD_TO_PROJECT_PAT`
+   - Value: The PAT from step 2
+3. Add a **variable** (under the **Variables** tab):
+   - Name: `PROJECT_URL`
+   - Value: The full URL of your GitHub Project (e.g. `https://github.com/users/DanielVolz/projects/1`)
+
+### 4. Verify
+
+1. Create a test issue using the **✨ Feature Request** template
+2. Check the **Actions** tab to see the workflow run
+3. Verify the issue appears in your GitHub Project under **Triage**
+
+## How It Works
+
+The workflow (`.github/workflows/add-to-project.yml`) triggers when:
+- A new issue is **opened**
+- A label is **added** to an existing issue
+
+Issues with any of these labels are automatically added to the project:
+- `enhancement` – Feature requests
+- `bug` – Bug reports
+- `triage` – New issues needing review
+
+Both the feature request and bug report issue templates automatically apply the `triage` label, so all new issues from templates are captured.
+
+## Customization
+
+### Adding more labels
+
+Edit `.github/workflows/add-to-project.yml` and add labels to the `labeled` field:
+
+```yaml
+labeled: enhancement, bug, triage, documentation
+```
+
+### Restricting to feature requests only
+
+Change the `labeled` field to only include `enhancement`:
+
+```yaml
+labeled: enhancement
+label-operator: OR
+```