From e0fb77d494a51a1b9a9a5aeb4e879a8d35f6e1b4 Mon Sep 17 00:00:00 2001
From: Daniel Volz <mail@danielvolz.org>
Date: Sat, 14 Mar 2026 20:26:17 +0100
Subject: [PATCH] feat: embed medication overview into shared links

Closes #424
---
 README.md                                     |    1 +
 .../0013_add_share_medication_overview.sql    |    1 +
 backend/drizzle/meta/0013_snapshot.json       | 1228 ++++++++++++++++
 backend/drizzle/meta/_journal.json            |    7 +
 backend/src/db/db-utils.ts                    |    2 +
 backend/src/db/schema.ts                      |    2 +
 backend/src/routes/export.ts                  |    3 +
 backend/src/routes/settings.ts                |    9 +
 backend/src/routes/share.ts                   |   18 +-
 backend/src/services/coverage.ts              |   33 +-
 backend/src/test/e2e-routes.test.ts           |    1 +
 backend/src/test/integration.test.ts          |    1 +
 backend/src/test/planner.test.ts              |    1 +
 backend/src/test/services.test.ts             |   11 +
 backend/src/test/setup.ts                     |   55 +-
 backend/src/utils/scheduler-utils.ts          |    1 +
 frontend/src/components/ShareDialog.tsx       |   66 +-
 .../SharedMedicationOverviewSection.tsx       |  194 +++
 frontend/src/components/SharedSchedule.tsx    | 1257 ++++++++---------
 frontend/src/components/index.ts              |    1 +
 frontend/src/hooks/useSettings.ts             |  178 ++-
 frontend/src/hooks/useShare.ts                |   20 +-
 frontend/src/i18n/de.json                     |    8 +-
 frontend/src/i18n/en.json                     |    8 +-
 frontend/src/pages/SettingsPage.tsx           |   13 +-
 frontend/src/pages/SharedOverviewPage.tsx     |  353 +----
 frontend/src/styles/schedule-mobile-edit.css  |  109 +-
 .../src/test/components/ShareDialog.test.tsx  |   20 +-
 .../test/components/SharedSchedule.test.tsx   |  118 ++
 .../SharedScheduleTodayOnly.test.tsx          |    3 +-
 frontend/src/test/hooks/useSettings.test.ts   |   50 +-
 frontend/src/test/hooks/useShare.test.ts      |    2 +-
 frontend/src/test/pages/SettingsPage.test.tsx |   26 +-
 .../test/pages/SharedOverviewPage.test.tsx    |  100 +-
 frontend/src/types/index.ts                   |    4 +-
 35 files changed, 2607 insertions(+), 1297 deletions(-)
 create mode 100644 backend/drizzle/0013_add_share_medication_overview.sql
 create mode 100644 backend/drizzle/meta/0013_snapshot.json
 create mode 100644 frontend/src/components/SharedMedicationOverviewSection.tsx

diff --git a/README.md b/README.md
index 64f7005..d52f28d 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@ Share your medication schedule with others via a public link.
 ### Multi-Person Support
 - Manage medications for multiple people
 - Share schedules via link. Recipients can mark doses as taken, you see it live
+- Optionally embed the medication overview directly on shared links via a settings toggle
 
 ### Data Export & Import
 - Export all your data (medications, dose history, settings) as JSON
diff --git a/backend/drizzle/0013_add_share_medication_overview.sql b/backend/drizzle/0013_add_share_medication_overview.sql
new file mode 100644
index 0000000..e474265
--- /dev/null
+++ b/backend/drizzle/0013_add_share_medication_overview.sql
@@ -0,0 +1 @@
+ALTER TABLE `user_settings` ADD `share_medication_overview` integer DEFAULT false NOT NULL;
\ No newline at end of file
diff --git a/backend/drizzle/meta/0013_snapshot.json b/backend/drizzle/meta/0013_snapshot.json
new file mode 100644
index 0000000..4e89724
--- /dev/null
+++ b/backend/drizzle/meta/0013_snapshot.json
@@ -0,0 +1,1228 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "be57622d-1bd6-425e-90ba-41952f2f15d6",
+  "prevId": "66cf7f2e-59bf-41dd-ad1b-4fcd81519019",
+  "tables": {
+    "api_keys": {
+      "name": "api_keys",
+      "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
+        },
+        "key_hash": {
+          "name": "key_hash",
+          "type": "text(128)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token_prefix": {
+          "name": "token_prefix",
+          "type": "text(24)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'write'"
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "last_used_at": {
+          "name": "last_used_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_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": {
+        "api_keys_key_hash_unique": {
+          "name": "api_keys_key_hash_unique",
+          "columns": [
+            "key_hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "api_keys_user_id_users_id_fk": {
+          "name": "api_keys_user_id_users_id_fk",
+          "tableFrom": "api_keys",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "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
+        },
+        "taken_source": {
+          "name": "taken_source",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'manual'"
+        },
+        "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'"
+        },
+        "medication_form": {
+          "name": "medication_form",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'tablet'"
+        },
+        "pill_form": {
+          "name": "pill_form",
+          "type": "text(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "lifecycle_category": {
+          "name": "lifecycle_category",
+          "type": "text(30)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'refill_when_empty'"
+        },
+        "package_amount_value": {
+          "name": "package_amount_value",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "package_amount_unit": {
+          "name": "package_amount_unit",
+          "type": "text(10)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'ml'"
+        },
+        "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
+        },
+        "medication_start_date": {
+          "name": "medication_start_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "medication_end_date": {
+          "name": "medication_end_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "auto_mark_obsolete_after_end_date": {
+          "name": "auto_mark_obsolete_after_end_date",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "is_obsolete": {
+          "name": "is_obsolete",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "obsolete_at": {
+          "name": "obsolete_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "prescription_enabled": {
+          "name": "prescription_enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "prescription_authorized_refills": {
+          "name": "prescription_authorized_refills",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "prescription_remaining_refills": {
+          "name": "prescription_remaining_refills",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "prescription_low_refill_threshold": {
+          "name": "prescription_low_refill_threshold",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "prescription_expiry_date": {
+          "name": "prescription_expiry_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": 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
+        },
+        "used_prescription": {
+          "name": "used_prescription",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "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
+        },
+        "email_prescription_reminders": {
+          "name": "email_prescription_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
+        },
+        "shoutrrr_prescription_reminders": {
+          "name": "shoutrrr_prescription_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
+        },
+        "share_medication_overview": {
+          "name": "share_medication_overview",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "upcoming_today_only": {
+          "name": "upcoming_today_only",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "share_schedule_today_only": {
+          "name": "share_schedule_today_only",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "swap_dashboard_main_sections": {
+          "name": "swap_dashboard_main_sections",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "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
+        },
+        "last_prescription_reminder_sent": {
+          "name": "last_prescription_reminder_sent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_prescription_reminder_channel": {
+          "name": "last_prescription_reminder_channel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_prescription_reminder_med_names": {
+          "name": "last_prescription_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": {}
+  }
+}
\ No newline at end of file
diff --git a/backend/drizzle/meta/_journal.json b/backend/drizzle/meta/_journal.json
index 8de4b25..9b2cefe 100644
--- a/backend/drizzle/meta/_journal.json
+++ b/backend/drizzle/meta/_journal.json
@@ -92,6 +92,13 @@
       "when": 1772881208026,
       "tag": "0012_add_api_keys_and_package_amount_columns",
       "breakpoints": true
+    },
+    {
+      "idx": 13,
+      "version": "6",
+      "when": 1773348659979,
+      "tag": "0013_add_share_medication_overview",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/backend/src/db/db-utils.ts b/backend/src/db/db-utils.ts
index 65e5484..7488341 100644
--- a/backend/src/db/db-utils.ts
+++ b/backend/src/db/db-utils.ts
@@ -149,6 +149,8 @@ export async function runAlterMigrations(client: Client): Promise<{ success: boo
 		`ALTER TABLE user_settings ADD COLUMN last_stock_reminder_med_names text`,
 		// Added for share stock visibility toggle
 		`ALTER TABLE user_settings ADD COLUMN share_stock_status integer NOT NULL DEFAULT 1`,
+		// Added for integrated share overview visibility on shared links
+		`ALTER TABLE user_settings ADD COLUMN share_medication_overview integer NOT NULL DEFAULT 0`,
 		// Added for timeline visibility toggles (dashboard + shared schedule)
 		`ALTER TABLE user_settings ADD COLUMN upcoming_today_only integer NOT NULL DEFAULT 0`,
 		`ALTER TABLE user_settings ADD COLUMN share_schedule_today_only integer NOT NULL DEFAULT 0`,
diff --git a/backend/src/db/schema.ts b/backend/src/db/schema.ts
index 4b0337b..f4310aa 100644
--- a/backend/src/db/schema.ts
+++ b/backend/src/db/schema.ts
@@ -109,6 +109,8 @@ export const userSettings = sqliteTable("user_settings", {
 	stockCalculationMode: text("stock_calculation_mode", { length: 20 }).notNull().default("automatic"),
 	// Whether shared schedule links show stock status (Critical/Low/Normal) to intake users
 	shareStockStatus: integer("share_stock_status", { mode: "boolean" }).notNull().default(true),
+	// Whether shared schedule links also embed the medication overview section
+	shareMedicationOverview: integer("share_medication_overview", { mode: "boolean" }).notNull().default(false),
 	// UI timeline visibility preferences
 	upcomingTodayOnly: integer("upcoming_today_only", { mode: "boolean" }).notNull().default(false),
 	shareScheduleTodayOnly: integer("share_schedule_today_only", { mode: "boolean" }).notNull().default(false),
diff --git a/backend/src/routes/export.ts b/backend/src/routes/export.ts
index 7a7b4ec..02470dc 100644
--- a/backend/src/routes/export.ts
+++ b/backend/src/routes/export.ts
@@ -136,6 +136,7 @@ const settingsExportSchema = z
 		language: z.string().default("en"),
 		stockCalculationMode: z.enum(["automatic", "manual"]).default("automatic"),
 		shareStockStatus: z.boolean().default(true),
+		shareMedicationOverview: z.boolean().default(false),
 	})
 	.optional();
 
@@ -503,6 +504,7 @@ export async function exportRoutes(app: FastifyInstance) {
 						language: settings.language,
 						stockCalculationMode: settings.stockCalculationMode,
 						shareStockStatus: settings.shareStockStatus,
+						shareMedicationOverview: settings.shareMedicationOverview ?? false,
 					}
 				: undefined;
 
@@ -793,6 +795,7 @@ export async function exportRoutes(app: FastifyInstance) {
 					language: importData.settings.language ?? "en",
 					stockCalculationMode: importData.settings.stockCalculationMode ?? "automatic",
 					shareStockStatus: importData.settings.shareStockStatus ?? true,
+					shareMedicationOverview: importData.settings.shareMedicationOverview ?? false,
 				});
 			}
 
diff --git a/backend/src/routes/settings.ts b/backend/src/routes/settings.ts
index a1ebd24..42617e8 100644
--- a/backend/src/routes/settings.ts
+++ b/backend/src/routes/settings.ts
@@ -33,6 +33,7 @@ export type UserSettings = {
 	language: Language;
 	stockCalculationMode: "automatic" | "manual";
 	shareStockStatus: boolean;
+	shareMedicationOverview: boolean;
 	upcomingTodayOnly: boolean;
 	shareScheduleTodayOnly: boolean;
 	swapDashboardMainSections: boolean;
@@ -72,6 +73,7 @@ type SettingsBody = {
 	language: string;
 	stockCalculationMode: "automatic" | "manual";
 	shareStockStatus: boolean;
+	shareMedicationOverview: boolean;
 	upcomingTodayOnly: boolean;
 	shareScheduleTodayOnly: boolean;
 	swapDashboardMainSections: boolean;
@@ -221,6 +223,7 @@ function getDefaultSettings() {
 		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),
+		shareMedicationOverview: envBool("DEFAULT_SHARE_MEDICATION_OVERVIEW", false),
 		upcomingTodayOnly: envBool("DEFAULT_UPCOMING_TODAY_ONLY", false),
 		shareScheduleTodayOnly: envBool("DEFAULT_SHARE_SCHEDULE_TODAY_ONLY", false),
 		swapDashboardMainSections: false,
@@ -283,6 +286,7 @@ export async function loadUserSettings(userId: number): Promise<UserSettings> {
 		language: settings.language as Language,
 		stockCalculationMode: (settings.stockCalculationMode as "automatic" | "manual") ?? "automatic",
 		shareStockStatus: settings.shareStockStatus ?? true,
+		shareMedicationOverview: settings.shareMedicationOverview ?? false,
 		upcomingTodayOnly: settings.upcomingTodayOnly ?? false,
 		shareScheduleTodayOnly: settings.shareScheduleTodayOnly ?? false,
 		swapDashboardMainSections: settings.swapDashboardMainSections ?? false,
@@ -327,6 +331,7 @@ export async function getAllUserSettings(): Promise<UserSettings[]> {
 		language: settings.language as Language,
 		stockCalculationMode: (settings.stockCalculationMode as "automatic" | "manual") ?? "automatic",
 		shareStockStatus: settings.shareStockStatus ?? true,
+		shareMedicationOverview: settings.shareMedicationOverview ?? false,
 		upcomingTodayOnly: settings.upcomingTodayOnly ?? false,
 		shareScheduleTodayOnly: settings.shareScheduleTodayOnly ?? false,
 		swapDashboardMainSections: settings.swapDashboardMainSections ?? false,
@@ -411,6 +416,7 @@ export async function settingsRoutes(app: FastifyInstance) {
 				language: settings.language,
 				stockCalculationMode: settings.stockCalculationMode ?? "automatic",
 				shareStockStatus: settings.shareStockStatus ?? true,
+				shareMedicationOverview: settings.shareMedicationOverview ?? false,
 				upcomingTodayOnly: settings.upcomingTodayOnly ?? false,
 				shareScheduleTodayOnly: settings.shareScheduleTodayOnly ?? false,
 				swapDashboardMainSections: settings.swapDashboardMainSections ?? false,
@@ -477,6 +483,7 @@ export async function settingsRoutes(app: FastifyInstance) {
 						language: { type: "string", enum: ["en", "de"] },
 						stockCalculationMode: { type: "string", enum: ["automatic", "manual"] },
 						shareStockStatus: { type: "boolean" },
+						shareMedicationOverview: { type: "boolean" },
 						upcomingTodayOnly: { type: "boolean" },
 						shareScheduleTodayOnly: { type: "boolean" },
 						swapDashboardMainSections: { type: "boolean" },
@@ -504,6 +511,7 @@ export async function settingsRoutes(app: FastifyInstance) {
 						language: "en",
 						stockCalculationMode: "automatic",
 						shareStockStatus: true,
+						shareMedicationOverview: false,
 						upcomingTodayOnly: false,
 						shareScheduleTodayOnly: false,
 						swapDashboardMainSections: false,
@@ -554,6 +562,7 @@ export async function settingsRoutes(app: FastifyInstance) {
 				language: body.language ?? "en",
 				stockCalculationMode: body.stockCalculationMode ?? "automatic",
 				shareStockStatus: body.shareStockStatus ?? true,
+				shareMedicationOverview: body.shareMedicationOverview ?? false,
 				upcomingTodayOnly: body.upcomingTodayOnly ?? false,
 				shareScheduleTodayOnly: body.shareScheduleTodayOnly ?? false,
 				swapDashboardMainSections: body.swapDashboardMainSections ?? false,
diff --git a/backend/src/routes/share.ts b/backend/src/routes/share.ts
index c7c21a1..60b45e3 100644
--- a/backend/src/routes/share.ts
+++ b/backend/src/routes/share.ts
@@ -56,6 +56,10 @@ const shareReadResponseSchema = {
 		sharedBy: { type: "string" },
 		scheduleDays: { type: "integer" },
 		medications: { type: "array", items: { type: "object", additionalProperties: true } },
+		shareMedicationOverview: { type: "boolean" },
+		medicationOverview: {
+			anyOf: [{ type: "array", items: { type: "object", additionalProperties: true } }, { type: "null" }],
+		},
 		stockThresholds: { type: "object", additionalProperties: { type: "number" } },
 		stockCalculationMode: { type: "string", enum: ["automatic", "manual"] },
 		shareStockStatus: { type: "boolean" },
@@ -241,11 +245,23 @@ export async function shareRoutes(app: FastifyInstance) {
 				};
 			});
 
+			const shareMedicationOverview = settings?.shareMedicationOverview ?? false;
+			const medicationOverview = shareMedicationOverview
+				? buildSharedMedicationOverview({
+						medications: meds,
+						doses: await db.select().from(doseTracking).where(eq(doseTracking.userId, share.userId)),
+						thresholdDays: settings?.lowStockDays ?? 30,
+						showStockStatus: settings?.shareStockStatus ?? true,
+					})
+				: null;
+
 			return {
 				takenBy: share.takenBy,
 				sharedBy: owner?.username ?? null,
 				scheduleDays: share.scheduleDays,
 				medications: medicationsWithBlisters,
+				shareMedicationOverview,
+				medicationOverview,
 				stockThresholds: {
 					lowStockDays: settings?.lowStockDays ?? 30,
 					normalStockDays: settings?.normalStockDays ?? 60,
@@ -328,7 +344,7 @@ export async function shareRoutes(app: FastifyInstance) {
 				medications: meds,
 				doses,
 				thresholdDays: settings?.lowStockDays ?? 30,
-				shareStockStatus: settings?.shareStockStatus ?? true,
+				showStockStatus: settings?.shareStockStatus ?? true,
 			});
 
 			return {
diff --git a/backend/src/services/coverage.ts b/backend/src/services/coverage.ts
index 660cf31..d68dfb9 100644
--- a/backend/src/services/coverage.ts
+++ b/backend/src/services/coverage.ts
@@ -29,7 +29,7 @@ export type SharedMedicationOverviewItem = {
 	daysLeft: number | null;
 	nextIntakeDate: string | null;
 	depletionDate: string | null;
-	priority: "normal" | "high" | null;
+	priority: "normal" | "high" | "out-of-stock" | null;
 	expiryDate: string | null;
 	medicationStartDate: string | null;
 	prescriptionEnabled: boolean;
@@ -135,13 +135,23 @@ function toNullableDate(value: string | null): string | null {
 	return value.trim() ? value : null;
 }
 
+function computeOverviewPriority(
+	currentStock: number,
+	daysLeft: number | null,
+	thresholdDays: number
+): "normal" | "high" | "out-of-stock" {
+	if (currentStock <= 0 || daysLeft === 0) return "out-of-stock";
+	if (daysLeft !== null && daysLeft <= thresholdDays) return "high";
+	return "normal";
+}
+
 export function buildSharedMedicationOverview(options: {
 	medications: MedicationRow[];
 	doses: DoseRow[];
 	thresholdDays: number;
-	shareStockStatus: boolean;
+	showStockStatus?: boolean;
 }): SharedMedicationOverviewItem[] {
-	const { medications: medicationRows, doses, thresholdDays, shareStockStatus } = options;
+	const { medications: medicationRows, doses, thresholdDays, showStockStatus = true } = options;
 
 	const dosesByMedication = new Map<number, DoseRow[]>();
 	for (const dose of doses) {
@@ -178,7 +188,12 @@ export function buildSharedMedicationOverview(options: {
 		const daysLeft = dailyDoseRate > 0 ? Math.floor(currentStock / dailyDoseRate) : null;
 		const depletionDate =
 			daysLeft === null ? null : toDateOnlyString(new Date(todayDate.getTime() + daysLeft * MS_PER_DAY));
-		const priority: "normal" | "high" = daysLeft !== null && daysLeft <= thresholdDays ? "high" : "normal";
+		const priority = computeOverviewPriority(currentStock, daysLeft, thresholdDays);
+		const visibleCurrentStock = showStockStatus ? currentStock : null;
+		const visibleCapacity = showStockStatus ? capacity : null;
+		const visibleDaysLeft = showStockStatus ? daysLeft : null;
+		const visibleDepletionDate = showStockStatus ? depletionDate : null;
+		const visiblePriority = showStockStatus ? priority : null;
 
 		return {
 			name: medication.name,
@@ -190,12 +205,12 @@ export function buildSharedMedicationOverview(options: {
 			pillsPerBlister: medication.pillsPerBlister,
 			totalPills: medication.totalPills,
 			looseTablets: medication.looseTablets,
-			currentStock: shareStockStatus ? currentStock : null,
-			capacity: shareStockStatus ? capacity : null,
-			daysLeft: shareStockStatus ? daysLeft : null,
+			currentStock: visibleCurrentStock,
+			capacity: visibleCapacity,
+			daysLeft: visibleDaysLeft,
 			nextIntakeDate: computeNextIntakeDate(intakes, todayDateOnly),
-			depletionDate: shareStockStatus ? depletionDate : null,
-			priority: shareStockStatus ? priority : null,
+			depletionDate: visibleDepletionDate,
+			priority: visiblePriority,
 			expiryDate: toNullableDate(medication.expiryDate),
 			medicationStartDate: toNullableDate(medication.medicationStartDate),
 			prescriptionEnabled: medication.prescriptionEnabled ?? false,
diff --git a/backend/src/test/e2e-routes.test.ts b/backend/src/test/e2e-routes.test.ts
index d750607..6c034b9 100644
--- a/backend/src/test/e2e-routes.test.ts
+++ b/backend/src/test/e2e-routes.test.ts
@@ -146,6 +146,7 @@ async function createSchema(client: Client) {
       language text NOT NULL DEFAULT 'en',
       stock_calculation_mode text NOT NULL DEFAULT 'automatic',
       share_stock_status integer NOT NULL DEFAULT 1,
+	share_medication_overview integer NOT NULL DEFAULT 0,
 	upcoming_today_only integer NOT NULL DEFAULT 0,
 	share_schedule_today_only integer NOT NULL DEFAULT 0,
 	swap_dashboard_main_sections integer NOT NULL DEFAULT 0,
diff --git a/backend/src/test/integration.test.ts b/backend/src/test/integration.test.ts
index fae8546..a066d38 100644
--- a/backend/src/test/integration.test.ts
+++ b/backend/src/test/integration.test.ts
@@ -140,6 +140,7 @@ async function createSchema(client: Client) {
       language text NOT NULL DEFAULT 'en',
       stock_calculation_mode text NOT NULL DEFAULT 'automatic',
       share_stock_status integer NOT NULL DEFAULT 1,
+	share_medication_overview integer NOT NULL DEFAULT 0,
 	upcoming_today_only integer NOT NULL DEFAULT 0,
 	share_schedule_today_only integer NOT NULL DEFAULT 0,
 	swap_dashboard_main_sections integer NOT NULL DEFAULT 0,
diff --git a/backend/src/test/planner.test.ts b/backend/src/test/planner.test.ts
index 9262ecc..9282e73 100644
--- a/backend/src/test/planner.test.ts
+++ b/backend/src/test/planner.test.ts
@@ -157,6 +157,7 @@ async function createSchema(client: Client) {
       language text NOT NULL DEFAULT 'en',
       stock_calculation_mode text NOT NULL DEFAULT 'automatic',
       share_stock_status integer NOT NULL DEFAULT 1,
+	share_medication_overview integer NOT NULL DEFAULT 0,
 	upcoming_today_only integer NOT NULL DEFAULT 0,
 	share_schedule_today_only integer NOT NULL DEFAULT 0,
 	swap_dashboard_main_sections integer NOT NULL DEFAULT 0,
diff --git a/backend/src/test/services.test.ts b/backend/src/test/services.test.ts
index cbe11c1..19f3186 100644
--- a/backend/src/test/services.test.ts
+++ b/backend/src/test/services.test.ts
@@ -21,6 +21,7 @@ import {
 	parseIntakeReminderState,
 	parseReminderState,
 	parseTakenByJson,
+	personTakesMedication,
 } from "../utils/scheduler-utils.js";
 
 // Helper to convert Blister to Intake for tests
@@ -151,6 +152,16 @@ describe("Scheduler Utils - Timezone Functions", () => {
 	});
 });
 
+describe("Scheduler Utils - Sharing", () => {
+	it("treats the all-share sentinel as matching intake-specific assignees", () => {
+		const intakes = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }, "Max")];
+
+		expect(personTakesMedication("all", [], intakes)).toBe(true);
+		expect(personTakesMedication("Max", [], intakes)).toBe(true);
+		expect(personTakesMedication("Anna", [], intakes)).toBe(false);
+	});
+});
+
 describe("Scheduler Utils - Blister Parsing", () => {
 	describe("parseBlisters", () => {
 		it("should parse valid blister JSON arrays", () => {
diff --git a/backend/src/test/setup.ts b/backend/src/test/setup.ts
index ba996de..d38e205 100644
--- a/backend/src/test/setup.ts
+++ b/backend/src/test/setup.ts
@@ -218,13 +218,20 @@ export interface UpdateUserSettingsOptions {
 	stockCalculationMode?: "automatic" | "manual";
 	lowStockDays?: number;
 	shareStockStatus?: boolean;
+	shareMedicationOverview?: boolean;
 }
 
 /**
  * Create or update user settings
  */
 export async function setUserSettings(client: Client, options: UpdateUserSettingsOptions): Promise<void> {
-	const { userId, stockCalculationMode = "automatic", lowStockDays = 30, shareStockStatus } = options;
+	const {
+		userId,
+		stockCalculationMode = "automatic",
+		lowStockDays = 30,
+		shareStockStatus,
+		shareMedicationOverview,
+	} = options;
 
 	// Check if settings exist
 	const existing = await client.execute({
@@ -233,20 +240,46 @@ export async function setUserSettings(client: Client, options: UpdateUserSetting
 	});
 
 	if (existing.rows.length > 0) {
+		const updateArgs = [stockCalculationMode, lowStockDays] as Array<string | number>;
+		let updateSql = "UPDATE user_settings SET stock_calculation_mode = ?, low_stock_days = ?";
+
+		if (shareStockStatus !== undefined) {
+			updateSql += ", share_stock_status = ?";
+			updateArgs.push(shareStockStatus ? 1 : 0);
+		}
+
+		if (shareMedicationOverview !== undefined) {
+			updateSql += ", share_medication_overview = ?";
+			updateArgs.push(shareMedicationOverview ? 1 : 0);
+		}
+
+		updateSql += " WHERE user_id = ?";
+		updateArgs.push(userId);
+
 		await client.execute({
-			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],
+			sql: updateSql,
+			args: updateArgs,
 		});
 	} else {
+		const insertColumns = ["user_id", "stock_calculation_mode", "low_stock_days"];
+		const insertPlaceholders = ["?", "?", "?"];
+		const insertArgs = [userId, stockCalculationMode, lowStockDays] as Array<string | number>;
+
+		if (shareStockStatus !== undefined) {
+			insertColumns.push("share_stock_status");
+			insertPlaceholders.push("?");
+			insertArgs.push(shareStockStatus ? 1 : 0);
+		}
+
+		if (shareMedicationOverview !== undefined) {
+			insertColumns.push("share_medication_overview");
+			insertPlaceholders.push("?");
+			insertArgs.push(shareMedicationOverview ? 1 : 0);
+		}
+
 		await client.execute({
-			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],
+			sql: `INSERT INTO user_settings (${insertColumns.join(", ")}) VALUES (${insertPlaceholders.join(", ")})`,
+			args: insertArgs,
 		});
 	}
 }
diff --git a/backend/src/utils/scheduler-utils.ts b/backend/src/utils/scheduler-utils.ts
index dd1a208..4e2aa47 100644
--- a/backend/src/utils/scheduler-utils.ts
+++ b/backend/src/utils/scheduler-utils.ts
@@ -292,6 +292,7 @@ export function getAllTakenByForMedication(medicationTakenBy: string[], intakes:
  * 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 (person === "all") return medicationTakenBy.length > 0 || intakes.some((intake) => intake.takenBy !== null);
 	if (medicationTakenBy.includes(person)) return true;
 	return intakes.some((intake) => intake.takenBy === person);
 }
diff --git a/frontend/src/components/ShareDialog.tsx b/frontend/src/components/ShareDialog.tsx
index 166b596..83f6966 100644
--- a/frontend/src/components/ShareDialog.tsx
+++ b/frontend/src/components/ShareDialog.tsx
@@ -4,7 +4,6 @@
  */
 
 import { Check, Copy, Link2, X } from "lucide-react";
-import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 export interface ShareDialogProps {
@@ -41,49 +40,9 @@ export function ShareDialog({
 	onCopyShareLink,
 }: ShareDialogProps) {
 	const { t } = useTranslation();
-	const [overviewCopied, setOverviewCopied] = useState(false);
 	const closeLabel = t("common.close");
 	const copyLabel = shareCopied ? t("share.copied") : t("share.copyLink");
-	const overviewCopyLabel = overviewCopied ? t("share.copied") : t("share.copyOverviewLink");
-	const overviewLink = shareLink ? `${shareLink}/overview` : null;
-
-	useEffect(() => {
-		if (!shareLink) {
-			setOverviewCopied(false);
-		}
-	}, [shareLink]);
-
-	const copyOverviewLink = async () => {
-		if (!overviewLink) return;
-
-		const markCopied = () => {
-			setOverviewCopied(true);
-			setTimeout(() => setOverviewCopied(false), 2000);
-		};
-
-		if (navigator.clipboard?.writeText) {
-			try {
-				await navigator.clipboard.writeText(overviewLink);
-				markCopied();
-				return;
-			} catch {
-				// Fall back to textarea-based copy.
-			}
-		}
-
-		const textarea = document.createElement("textarea");
-		textarea.value = overviewLink;
-		textarea.style.position = "fixed";
-		textarea.style.opacity = "0";
-		document.body.appendChild(textarea);
-		textarea.select();
-		try {
-			document.execCommand("copy");
-			markCopied();
-		} finally {
-			document.body.removeChild(textarea);
-		}
-	};
+	const getPersonLabel = (person: string) => (person === "all" ? t("share.allPeople") : person);
 
 	// ESC is handled by the global handler in App.tsx to avoid double history.back()
 
@@ -152,34 +111,13 @@ export function ShareDialog({
 										{shareCopied ? <Check size={18} aria-hidden="true" /> : <Copy size={18} aria-hidden="true" />}
 									</button>
 								</div>
-								<p className="share-link-label">{t("share.overviewLink")}</p>
-								<div className="share-link-box">
-									<input
-										type="text"
-										value={overviewLink ?? ""}
-										readOnly
-										className="share-link-input"
-										onClick={(e) => (e.target as HTMLInputElement).select()}
-									/>
-									<button
-										type="button"
-										className="btn-copy icon-only tooltip-trigger"
-										onClick={copyOverviewLink}
-										aria-label={overviewCopyLabel}
-										data-tooltip={overviewCopyLabel}
-									>
-										{overviewCopied ? <Check size={18} aria-hidden="true" /> : <Copy size={18} aria-hidden="true" />}
-									</button>
-								</div>
 								{shareCopied && <span className="share-copied-hint">{t("share.copied")}</span>}
-								{overviewCopied && <span className="share-copied-hint">{t("share.copied")}</span>}
 								<div className="share-dialog-footer">
 									<button
 										className="ghost"
 										onClick={() => {
 											onShareLinkChange(null);
 											onShareCopiedChange(false);
-											setOverviewCopied(false);
 										}}
 									>
 										{t("share.generateAnother")}
@@ -201,7 +139,7 @@ export function ShareDialog({
 								>
 									{sharePeople.map((person) => (
 										<option key={person} value={person}>
-											{person}
+											{getPersonLabel(person)}
 										</option>
 									))}
 								</select>
diff --git a/frontend/src/components/SharedMedicationOverviewSection.tsx b/frontend/src/components/SharedMedicationOverviewSection.tsx
new file mode 100644
index 0000000..83fbe78
--- /dev/null
+++ b/frontend/src/components/SharedMedicationOverviewSection.tsx
@@ -0,0 +1,194 @@
+import { useTranslation } from "react-i18next";
+import type { SharedMedicationOverviewItem } from "../types";
+import { formatDate } from "../utils/formatters";
+import { MedicationAvatar } from "./MedicationAvatar";
+
+function formatPackageInfo(medication: SharedMedicationOverviewItem): string {
+	if (medication.packageType === "blister") {
+		return `${medication.packCount} x ${medication.blistersPerPack} x ${medication.pillsPerBlister}`;
+	}
+
+	if (medication.totalPills !== null) {
+		return `${medication.packCount} x ${medication.totalPills}`;
+	}
+
+	return `${medication.packCount}`;
+}
+
+function getOverviewStatus(
+	priority: SharedMedicationOverviewItem["priority"]
+): { className: string; labelKey: string } | null {
+	if (priority === null) return null;
+	if (priority === "out-of-stock") {
+		return { className: "danger", labelKey: "status.outOfStock" };
+	}
+	if (priority === "high") {
+		return { className: "warning", labelKey: "status.lowStock" };
+	}
+	return { className: "normal", labelKey: "status.normal" };
+}
+
+export interface SharedMedicationOverviewSectionProps {
+	takenBy: string;
+	sharedBy: string | null;
+	medications: SharedMedicationOverviewItem[];
+	showTitle?: boolean;
+	onMedicationImageClick?: (imageUrl: string, name: string) => void;
+}
+
+export function SharedMedicationOverviewSection({
+	takenBy,
+	medications,
+	showTitle = true,
+	onMedicationImageClick,
+}: SharedMedicationOverviewSectionProps) {
+	const { t } = useTranslation();
+	const renderMedicationAvatar = (name: string, imageUrl: string | null) => {
+		const isClickable = Boolean(imageUrl && onMedicationImageClick);
+
+		return (
+			<div
+				className={isClickable ? "med-avatar clickable" : undefined}
+				onClick={() => {
+					if (imageUrl && onMedicationImageClick) onMedicationImageClick(imageUrl, name);
+				}}
+				onKeyDown={(e) => {
+					if ((e.key === "Enter" || e.key === " ") && imageUrl && onMedicationImageClick) {
+						onMedicationImageClick(imageUrl, name);
+					}
+				}}
+			>
+				<MedicationAvatar name={name} imageUrl={imageUrl} size="sm" />
+			</div>
+		);
+	};
+
+	return (
+		<section className="shared-overview-inline-section" aria-label={t("sharedOverview.title", { person: takenBy })}>
+			{showTitle ? (
+				<div className="shared-overview-section-header">
+					<h2>{t("sharedOverview.title", { person: takenBy })}</h2>
+				</div>
+			) : null}
+			{medications.length === 0 ? (
+				<p className="shared-schedule-empty">{t("sharedOverview.noMedications")}</p>
+			) : (
+				<>
+					<div className="shared-overview-table-wrap">
+						<table className="shared-overview-table">
+							<thead>
+								<tr>
+									<th>{t("sharedOverview.columns.name")}</th>
+									<th>{t("sharedOverview.columns.package")}</th>
+									<th>{t("sharedOverview.columns.stock")}</th>
+									<th>{t("sharedOverview.columns.daysLeft")}</th>
+									<th>{t("sharedOverview.columns.depletion")}</th>
+									<th>{t("sharedOverview.columns.priority")}</th>
+								</tr>
+							</thead>
+							<tbody>
+								{medications.map((medication) => {
+									const overviewStatus = getOverviewStatus(medication.priority);
+
+									return (
+										<tr key={`${medication.name}-${medication.medicationStartDate ?? "no-start"}`}>
+											<td>
+												<div className="shared-overview-medication-cell">
+													{renderMedicationAvatar(medication.name, medication.imageUrl)}
+													<div className="shared-overview-medication-text">
+														<div className="shared-overview-med-name">
+															<strong>{medication.name}</strong>
+															{medication.genericName ? (
+																<span className="shared-overview-med-generic">{medication.genericName}</span>
+															) : null}
+														</div>
+													</div>
+												</div>
+											</td>
+											<td>{formatPackageInfo(medication)}</td>
+											<td>
+												<span className="shared-overview-stock-value">
+													{medication.currentStock === null || medication.capacity === null
+														? "-"
+														: t("sharedOverview.stock.of", {
+																current: medication.currentStock,
+																capacity: medication.capacity,
+															})}
+												</span>
+											</td>
+											<td>{medication.daysLeft === null ? "-" : medication.daysLeft}</td>
+											<td>
+												<span className="shared-overview-date-value">{formatDate(medication.depletionDate)}</span>
+											</td>
+											<td>
+												{overviewStatus === null ? (
+													"-"
+												) : (
+													<span className={`shared-overview-priority ${overviewStatus.className}`}>
+														{t(overviewStatus.labelKey)}
+													</span>
+												)}
+											</td>
+										</tr>
+									);
+								})}
+							</tbody>
+						</table>
+					</div>
+
+					<div className="shared-overview-cards">
+						{medications.map((medication) => {
+							const overviewStatus = getOverviewStatus(medication.priority);
+
+							return (
+								<article
+									className="shared-overview-card"
+									key={`${medication.name}-${medication.medicationStartDate ?? "no-start"}`}
+								>
+									<div className="shared-overview-card-title">
+										{renderMedicationAvatar(medication.name, medication.imageUrl)}
+										<div className="shared-overview-medication-text">
+											<div className="shared-overview-med-name">
+												<strong>{medication.name}</strong>
+												{medication.genericName ? (
+													<span className="shared-overview-med-generic">{medication.genericName}</span>
+												) : null}
+											</div>
+										</div>
+									</div>
+									<div className="shared-overview-card-grid">
+										<span>{t("sharedOverview.columns.package")}</span>
+										<strong>{formatPackageInfo(medication)}</strong>
+										<span>{t("sharedOverview.columns.stock")}</span>
+										<strong>
+											<span className="shared-overview-stock-value">
+												{medication.currentStock === null || medication.capacity === null
+													? "-"
+													: t("sharedOverview.stock.of", {
+															current: medication.currentStock,
+															capacity: medication.capacity,
+														})}
+											</span>
+										</strong>
+										<span>{t("sharedOverview.columns.daysLeft")}</span>
+										<strong>{medication.daysLeft === null ? "-" : medication.daysLeft}</strong>
+
+										<span>{t("sharedOverview.columns.depletion")}</span>
+										<strong>
+											<span className="shared-overview-date-value">{formatDate(medication.depletionDate)}</span>
+										</strong>
+									</div>
+									{overviewStatus ? (
+										<span className={`shared-overview-priority ${overviewStatus.className}`}>
+											{t(overviewStatus.labelKey)}
+										</span>
+									) : null}
+								</article>
+							);
+						})}
+					</div>
+				</>
+			)}
+		</section>
+	);
+}
diff --git a/frontend/src/components/SharedSchedule.tsx b/frontend/src/components/SharedSchedule.tsx
index bc86b1c..8e0998c 100644
--- a/frontend/src/components/SharedSchedule.tsx
+++ b/frontend/src/components/SharedSchedule.tsx
@@ -4,41 +4,23 @@
 /* biome-ignore-all lint/style/noNestedTernary: rendering branches are intentionally explicit in schedule UI */
 /* biome-ignore-all lint/correctness/useExhaustiveDependencies: modal and helper callbacks are stable at runtime */
 
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
 import { useEscapeKey } from "../hooks";
 import type { ExpiredLinkData, SharedScheduleData } from "../types";
-import { getMedDisplayName, getMedTotal, isLiquidContainerPackageType, isTubePackageType } from "../types";
+import {
+	allowsPillFormSelection,
+	getMedDisplayName,
+	getMedTotal,
+	isLiquidContainerPackageType,
+	isTubePackageType,
+} from "../types";
 import { getSystemLocale } from "../utils/formatters";
 import { isDoseDismissed, parseLocalDateTime } from "../utils/schedule";
 import { loadCollapsedDaysFromStorage } from "../utils/storage";
 import { MedicationAvatar } from "./MedicationAvatar";
-
-// =============================================================================
-// Stock status helper — identical to DashboardPage's getStockStatus
-// =============================================================================
-function getStockStatus(
-	daysLeft: number | null,
-	medsLeft: number,
-	thresholds: { lowStockDays: number; normalStockDays: number; highStockDays: number; criticalStockDays: number },
-	packageType?: string
-) {
-	if (isTubePackageType(packageType)) return { className: "success", label: "status.noSchedule" };
-	if (medsLeft <= 0 || daysLeft === 0) return { className: "danger", label: "status.outOfStock" };
-	if (daysLeft === null) return { className: "success", label: "status.noSchedule" };
-	if (isLiquidContainerPackageType(packageType)) {
-		const lowDays = Math.max(1, Math.floor(thresholds.criticalStockDays));
-		const criticalDays = Math.max(1, Math.ceil(lowDays / 2));
-		if (daysLeft <= criticalDays) return { className: "danger", label: "status.criticalStock" };
-		if (daysLeft <= lowDays) return { className: "warning", label: "status.lowStock" };
-		return { className: "success", label: "status.normal" };
-	}
-	if (daysLeft <= thresholds.criticalStockDays) return { className: "danger", label: "status.criticalStock" };
-	if (daysLeft < thresholds.lowStockDays) return { className: "warning", label: "status.lowStock" };
-	if (daysLeft >= thresholds.highStockDays) return { className: "high", label: "status.highStock" };
-	return { className: "success", label: "status.normal" };
-}
+import { SharedMedicationOverviewSection } from "./SharedMedicationOverviewSection";
 
 export function SharedSchedule() {
 	const { token } = useParams<{ token: string }>();
@@ -48,6 +30,7 @@ export function SharedSchedule() {
 	const [error, setError] = useState<string | null>(null);
 	const [expiredData, setExpiredData] = useState<ExpiredLinkData | null>(null);
 	const [takenDoses, setTakenDoses] = useState<Set<string>>(new Set());
+	const [automaticTakenDoses, setAutomaticTakenDoses] = useState<Set<string>>(new Set());
 	const [dismissedDoses, setDismissedDoses] = useState<Set<string>>(new Set());
 	const [lightboxImage, setLightboxImage] = useState<{ url: string; name: string } | null>(null);
 	const [showPastDays, setShowPastDays] = useState(false);
@@ -137,16 +120,6 @@ export function SharedSchedule() {
 		return t("common.pillsTotal", { count: total });
 	};
 
-	const shouldHideNoScheduleStatusForTube = (
-		med: SharedScheduleData["medications"][number] | undefined,
-		status: { className: string; label: string } | null
-	) => isTubePackageType(med?.packageType) && status?.label === "status.noSchedule";
-
-	const getVisibleStockStatus = (
-		med: SharedScheduleData["medications"][number] | undefined,
-		status: { className: string; label: string } | null
-	) => (shouldHideNoScheduleStatusForTube(med, status) ? null : status);
-
 	// Theme preference: light, dark, or system
 	type ThemePreference = "light" | "dark" | "system";
 	const [themePreference, setThemePreference] = useState<ThemePreference>(() => {
@@ -270,41 +243,49 @@ export function SharedSchedule() {
 
 	// Load taken doses from server with polling for real-time sync
 	// Separates taken and dismissed doses (like main app's useDoses hook)
-	useEffect(() => {
-		if (token) {
-			async function loadTakenDoses() {
-				try {
-					const res = await fetch(`/api/share/${token}/doses`);
-					if (res.ok) {
-						const data = await res.json();
-						const taken = new Set<string>();
-						const dismissed = new Set<string>();
-						for (const d of data.doses as Array<{ doseId: string; dismissed?: boolean }>) {
-							if (d.dismissed) {
-								dismissed.add(d.doseId);
-							} else {
-								taken.add(d.doseId);
-							}
-						}
-						setTakenDoses(taken);
-						setDismissedDoses(dismissed);
+	const loadTakenDoses = useCallback(async () => {
+		if (!token) return;
+		try {
+			const res = await fetch(`/api/share/${token}/doses`);
+			if (res.ok) {
+				const data = await res.json();
+				const taken = new Set<string>();
+				const automatic = new Set<string>();
+				const dismissed = new Set<string>();
+				for (const d of data.doses as Array<{ doseId: string; dismissed?: boolean; takenSource?: string }>) {
+					if (d.dismissed) {
+						dismissed.add(d.doseId);
 					} else {
-						setTakenDoses(new Set());
-						setDismissedDoses(new Set());
+						taken.add(d.doseId);
+						if (d.takenSource === "automatic") {
+							automatic.add(d.doseId);
+						}
 					}
-				} catch {
-					setTakenDoses(new Set());
-					setDismissedDoses(new Set());
 				}
+				setTakenDoses(taken);
+				setAutomaticTakenDoses(automatic);
+				setDismissedDoses(dismissed);
+			} else {
+				setTakenDoses(new Set());
+				setAutomaticTakenDoses(new Set());
+				setDismissedDoses(new Set());
 			}
-			loadTakenDoses();
-
-			// Poll for updates every 5 seconds (real-time sync with dashboard)
-			const interval = setInterval(loadTakenDoses, 5000);
-			return () => clearInterval(interval);
+		} catch {
+			setTakenDoses(new Set());
+			setAutomaticTakenDoses(new Set());
+			setDismissedDoses(new Set());
 		}
 	}, [token]);
 
+	useEffect(() => {
+		if (!token) return;
+		loadTakenDoses();
+
+		// Poll for updates every 5 seconds (real-time sync with dashboard)
+		const interval = setInterval(loadTakenDoses, 5000);
+		return () => clearInterval(interval);
+	}, [loadTakenDoses, token]);
+
 	// Get dose ID - for per-intake takenBy, the ID already has the person suffix
 	// This helper is kept for compatibility but since dose.id already includes the suffix, it just returns the id
 	function _getDoseId(doseId: string, _person: string | null): string {
@@ -319,14 +300,30 @@ export function SharedSchedule() {
 			next.add(doseId);
 			return next;
 		});
+		setAutomaticTakenDoses((prev) => {
+			const next = new Set(prev);
+			next.delete(doseId);
+			return next;
+		});
 
 		// Send to server
 		try {
-			await fetch(`/api/share/${token}/doses`, {
+			const response = await fetch(`/api/share/${token}/doses`, {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify({ doseId }),
 			});
+			if (!response.ok) {
+				try {
+					const data = (await response.json()) as { code?: string };
+					if (data.code === "OUT_OF_STOCK") {
+						alert(t("common.outOfStockTakeBlocked"));
+					}
+				} catch {
+					// Ignore JSON parsing errors and fall back to the optimistic rollback only.
+				}
+				throw new Error("Failed to mark shared dose as taken");
+			}
 		} catch {
 			// Revert on error
 			setTakenDoses((prev) => {
@@ -334,6 +331,8 @@ export function SharedSchedule() {
 				next.delete(doseId);
 				return next;
 			});
+		} finally {
+			loadTakenDoses();
 		}
 	}
 
@@ -344,6 +343,11 @@ export function SharedSchedule() {
 			next.delete(doseId);
 			return next;
 		});
+		setAutomaticTakenDoses((prev) => {
+			const next = new Set(prev);
+			next.delete(doseId);
+			return next;
+		});
 
 		// Send to server
 		try {
@@ -360,6 +364,8 @@ export function SharedSchedule() {
 		}
 	}
 
+	const isDoseTakenAutomatically = (doseId: string) => automaticTakenDoses.has(doseId);
+
 	useEffect(() => {
 		async function fetchData() {
 			if (!token) {
@@ -431,8 +437,8 @@ export function SharedSchedule() {
 				}));
 
 			intakes.forEach((intake, intakeIdx) => {
-				// Filter: only include intakes for this person (null = everyone, or matches share's takenBy)
-				if (intake.takenBy !== null && intake.takenBy !== data.takenBy) return;
+				// Filter: for person-specific shares, include matching intakes plus shared-for-everyone intakes.
+				if (data.takenBy !== "all" && intake.takenBy !== null && intake.takenBy !== data.takenBy) return;
 
 				const startDate = parseLocalDateTime(intake.start);
 				if (Number.isNaN(startDate.getTime())) return;
@@ -531,13 +537,12 @@ export function SharedSchedule() {
 
 	// Calculate coverage for stock status colors — matches main app's calculateCoverage logic
 	// Uses time-based automatic consumption (same as DashboardPage) for accurate stock levels
-	const { coverageByMed, depletionByMed } = useMemo(() => {
-		if (!data) return { coverageByMed: {}, depletionByMed: {} };
+	const coverageByMed = useMemo(() => {
+		if (!data) return {};
 		const MS_PER_DAY = 86_400_000;
 		const now = Date.now();
 		const calcMode = data.stockCalculationMode ?? "automatic";
 		const coverage: Record<string, { daysLeft: number | null; medsLeft: number; dailyUsage: number }> = {};
-		const depletion: Record<string, number | null> = {};
 
 		for (const med of data.medications) {
 			const intakes =
@@ -665,45 +670,39 @@ export function SharedSchedule() {
 			const medsLeft = Math.max(0, totalPills - consumed);
 			const rawDaysLeft = dailyRate > 0 ? medsLeft / dailyRate : null;
 			const daysLeft = rawDaysLeft !== null ? Math.max(0, Math.floor(rawDaysLeft)) : null;
-			const depletionMs = daysLeft !== null ? now + daysLeft * MS_PER_DAY : null;
 
 			coverage[getMedDisplayName(med)] = { daysLeft, medsLeft: Number(medsLeft.toFixed(1)), dailyUsage: dailyRate };
-			depletion[getMedDisplayName(med)] = depletionMs;
 		}
-		return { coverageByMed: coverage, depletionByMed: depletion };
+		return coverage;
 	}, [data, takenDoses]);
 
-	// Stock thresholds from API — matches DashboardPage's StockThresholds type exactly
-	const stockThresholds = useMemo(
-		() => ({
-			lowStockDays: data?.stockThresholds?.lowStockDays ?? 30,
-			normalStockDays: data?.stockThresholds?.normalStockDays ?? 60,
-			highStockDays: data?.stockThresholds?.highStockDays ?? 90,
-			criticalStockDays: data?.stockThresholds?.reminderDaysBefore ?? 7,
-			expiryWarningDays: data?.stockThresholds?.expiryWarningDays ?? 90,
-		}),
-		[data]
+	const outOfStockMedicationIds = useMemo(
+		() =>
+			new Set(
+				(data?.medications ?? [])
+					.filter((med) => (coverageByMed[getMedDisplayName(med)]?.medsLeft ?? 1) <= 0)
+					.map((med) => med.id)
+			),
+		[data, coverageByMed]
 	);
 
-	// Get worst stock status for a day's medications — identical to DashboardPage
-	function getDayStockStatus(meds: { medName: string; lastWhen: number }[]) {
-		const statuses = meds.map((item) => {
-			const coverage = coverageByMed[item.medName];
-			const med = data?.medications.find((m) => getMedDisplayName(m) === item.medName);
-			const depletionTime = depletionByMed[item.medName];
-			if (typeof depletionTime === "number" && item.lastWhen > depletionTime) return "danger";
-			if (!coverage) return "success";
-			const rawStatus = getStockStatus(coverage.daysLeft, coverage.medsLeft, stockThresholds, med?.packageType);
-			const status = getVisibleStockStatus(med, rawStatus);
-			return status?.className ?? "success";
-		});
-		const fallbackStatus = statuses.includes("warning") ? "warning" : "success";
-		return statuses.includes("danger") ? "danger" : fallbackStatus;
-	}
+	const isDoseTakenForDisplay = useCallback(
+		(doseId: string) => {
+			const medId = Number.parseInt(doseId.split("-")[0] ?? "", 10);
+			if (!Number.isNaN(medId) && outOfStockMedicationIds.has(medId)) {
+				return false;
+			}
+			return takenDoses.has(doseId);
+		},
+		[outOfStockMedicationIds, takenDoses]
+	);
 
-	// Whether to show stock status indicators on the shared schedule
-	const showStock = data?.shareStockStatus !== false;
-	const showOnlyToday = data?.shareScheduleTodayOnly === true && (data?.upcomingTodayOnly ?? true);
+	const showMedicationOverview = data?.shareMedicationOverview === true && data?.medicationOverview !== null;
+	const showOnlyToday = data?.shareScheduleTodayOnly === true;
+	const sharedPersonLabel = data?.takenBy === "all" ? t("share.allPeople") : (data?.takenBy ?? "");
+	const pageTitle = showMedicationOverview
+		? `💊 ${t("sharedOverview.title", { person: sharedPersonLabel })}`
+		: `💊 ${t("share.scheduleFor")} ${sharedPersonLabel}`;
 
 	const renderDoseUsage = (
 		med: SharedScheduleData["medications"][number] | undefined,
@@ -712,7 +711,7 @@ export function SharedSchedule() {
 
 	// Helper: check if a dose is "done" (taken, per-dose dismissed, or med-level dismissed)
 	function isDoseIdDone(doseId: string): boolean {
-		if (takenDoses.has(doseId)) return true;
+		if (isDoseTakenForDisplay(doseId)) return true;
 		if (dismissedDoses.has(doseId)) return true;
 		const parts = doseId.split("-");
 		if (parts.length >= 3) {
@@ -735,28 +734,25 @@ export function SharedSchedule() {
 
 	if (loading) {
 		return (
-			<div className="shared-schedule-page">
-				<div className="shared-schedule-loading shared-schedule-loading-skeleton" aria-busy="true">
-					<h1>💊 MedAssist-ng</h1>
+			<div className="auth-container" data-theme={resolvedTheme}>
+				<div className="auth-card" style={{ textAlign: "center" }} aria-busy="true">
+					<h1 className="auth-title">💊 MedAssist-ng</h1>
+					<p>{t("common.loading")}</p>
 					<span className="screen-reader-only">{t("common.loading")}</span>
-					<div className="skeleton-card">
-						<span className="skeleton-line skeleton-line-long" />
-						<span className="skeleton-line skeleton-line-medium" />
-						<span className="skeleton-line skeleton-line-short" />
-					</div>
 				</div>
 			</div>
 		);
 	}
 
 	if (expiredData) {
+		const expiredPersonLabel = expiredData.takenBy === "all" ? t("share.allPeople") : expiredData.takenBy;
 		return (
 			<div className="shared-schedule-page">
 				<div className="shared-schedule-error expired">
 					<h1>💊 MedAssist-ng</h1>
 					<div className="expired-icon">⏰</div>
 					<h2>{t("share.expired.title")}</h2>
-					<p className="expired-message">{t("share.expired.message", { takenBy: expiredData.takenBy })}</p>
+					<p className="expired-message">{t("share.expired.message", { takenBy: expiredPersonLabel })}</p>
 					<p className="expired-contact">{t("share.expired.contact", { username: expiredData.ownerUsername })}</p>
 					<p className="expired-date">
 						{t("share.expired.expiredOn", {
@@ -783,9 +779,7 @@ export function SharedSchedule() {
 		<div className="shared-schedule-page">
 			<div className="shared-schedule-container">
 				<header className="shared-schedule-header">
-					<h1>
-						💊 {t("share.scheduleFor")} {data.takenBy}
-					</h1>
+					<h1>{pageTitle}</h1>
 					<div className="shared-schedule-header-actions">
 						<div className={`theme-menu ${themeMenuOpen ? "open" : ""}`} ref={themeMenuRef}>
 							<button className="icon-btn" onClick={() => setThemeMenuOpen(!themeMenuOpen)} title={t("theme.title")}>
@@ -860,558 +854,547 @@ export function SharedSchedule() {
 						})()}
 				</header>
 
-				<div className="timeline">
-					{schedule.length === 0 ? (
-						<p className="shared-schedule-empty">{t("share.noSchedule")}</p>
-					) : (
-						<>
-							{/* Past days (when expanded) — rendered above toggle */}
-							{!showOnlyToday &&
-								showPastDays &&
-								pastDays.map((day) => {
-									// Get ALL dose IDs for this day (for total count and yellow styling)
-									const allDoseIds = day.meds.flatMap((item) => item.doses.map((d) => d.id));
+				{showMedicationOverview ? (
+					<SharedMedicationOverviewSection
+						takenBy={sharedPersonLabel}
+						sharedBy={data.sharedBy}
+						medications={data.medicationOverview ?? []}
+						showTitle={false}
+						onMedicationImageClick={openLightbox}
+					/>
+				) : null}
 
-									// Really taken = all doses marked as taken by human (for green "All taken")
-									const allReallyTaken = allDoseIds.length > 0 && allDoseIds.every((id) => takenDoses.has(id));
-									const takenCount = allDoseIds.filter((id) => takenDoses.has(id)).length;
+				<section className="shared-schedule-section" aria-label={t("dashboard.schedules.title")}>
+					<div className="shared-overview-section-header">
+						<h2>{t("dashboard.schedules.title")}</h2>
+					</div>
+					<div className="timeline">
+						{schedule.length === 0 ? (
+							<p className="shared-schedule-empty">{t("share.noSchedule")}</p>
+						) : (
+							<>
+								{/* Past days (when expanded) — rendered above toggle */}
+								{!showOnlyToday &&
+									showPastDays &&
+									pastDays.map((day) => {
+										// Get ALL dose IDs for this day (for total count and yellow styling)
+										const allDoseIds = day.meds.flatMap((item) => item.doses.map((d) => d.id));
 
-									// Count missed doses that are NOT dismissed (for warning icon)
-									const missedNotDismissedCount = day.meds.reduce((count, item) => {
-										const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
-										const dismissedUntilDate = med?.dismissedUntil ?? undefined;
+										// Really taken = all doses marked as taken by human (for green "All taken")
+										const allReallyTaken = allDoseIds.length > 0 && allDoseIds.every((id) => isDoseTakenForDisplay(id));
+										const takenCount = allDoseIds.filter((id) => isDoseTakenForDisplay(id)).length;
+
+										// Count missed doses that are NOT dismissed (for warning icon)
+										const missedNotDismissedCount = day.meds.reduce((count, item) => {
+											const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
+											const dismissedUntilDate = med?.dismissedUntil ?? undefined;
+											return (
+												count +
+												item.doses.reduce((doseCount, d) => {
+													if (isDoseDismissed(d.id, dismissedUntilDate)) return doseCount;
+													if (isDoseTakenForDisplay(d.id) || dismissedDoses.has(d.id)) return doseCount;
+													return doseCount + 1;
+												}, 0)
+											);
+										}, 0);
+										const hasRealMissed = missedNotDismissedCount > 0;
+
+										const isManuallyExpanded = manuallyExpandedDays.has(day.dateStr);
+										const isCollapsed = !isManuallyExpanded;
+
+										const pastMissedClass = allDoseIds.length > 0 ? "past-missed" : "";
 										return (
-											count +
-											item.doses.reduce((doseCount, d) => {
-												if (isDoseDismissed(d.id, dismissedUntilDate)) return doseCount;
-												if (takenDoses.has(d.id) || dismissedDoses.has(d.id)) return doseCount;
-												return doseCount + 1;
-											}, 0)
-										);
-									}, 0);
-									const hasRealMissed = missedNotDismissedCount > 0;
-
-									const isManuallyExpanded = manuallyExpandedDays.has(day.dateStr);
-									const isCollapsed = !isManuallyExpanded;
-
-									const pastMissedClass = allDoseIds.length > 0 ? "past-missed" : "";
-									return (
-										<div
-											key={day.dateStr}
-											className={`day-block past ${isCollapsed ? "collapsed" : ""} ${allReallyTaken ? "all-taken" : pastMissedClass}`}
-										>
 											<div
-												className="day-divider clickable"
-												onClick={() => toggleDayCollapse(day.dateStr, true)}
-												onKeyDown={(e) => {
-													if (e.key === "Enter" || e.key === " ") toggleDayCollapse(day.dateStr, true);
-												}}
-												title={isCollapsed ? t("common.expand") : t("common.collapse")}
+												key={day.dateStr}
+												className={`day-block past ${isCollapsed ? "collapsed" : ""} ${allReallyTaken ? "all-taken" : pastMissedClass}`}
 											>
-												<span className="day-collapse-icon">{isCollapsed ? "▶" : "▼"}</span>
-												<span className="day-date">{day.dateStr}</span>
-												<span className="day-summary">
-													{allReallyTaken ? (
-														<span className="day-complete">✓ {t("dashboard.schedules.allTaken")}</span>
-													) : (
-														<>
-															{hasRealMissed && (
-																<span
-																	className="day-warning"
-																	title={t("dashboard.schedules.missedDoses", { count: missedNotDismissedCount })}
-																>
-																	⚠️
+												<div
+													className="day-divider clickable"
+													onClick={() => toggleDayCollapse(day.dateStr, true)}
+													onKeyDown={(e) => {
+														if (e.key === "Enter" || e.key === " ") toggleDayCollapse(day.dateStr, true);
+													}}
+													title={isCollapsed ? t("common.expand") : t("common.collapse")}
+												>
+													<span className="day-collapse-icon">{isCollapsed ? "▶" : "▼"}</span>
+													<span className="day-date">{day.dateStr}</span>
+													<span className="day-summary">
+														{allReallyTaken ? (
+															<span className="day-complete">✓ {t("dashboard.schedules.allTaken")}</span>
+														) : (
+															<>
+																{hasRealMissed && (
+																	<span
+																		className="day-warning"
+																		title={t("dashboard.schedules.missedDoses", { count: missedNotDismissedCount })}
+																	>
+																		⚠️
+																	</span>
+																)}
+																<span className="day-progress">
+																	{takenCount}/{allDoseIds.length}
 																</span>
-															)}
+															</>
+														)}
+													</span>
+												</div>
+												{!isCollapsed &&
+													day.meds.map((item) => {
+														const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
+														const medCoverage = coverageByMed[item.medName];
+														const isEmpty = medCoverage ? medCoverage.medsLeft <= 0 : false;
+
+														return (
+															<div key={`${day.dateStr}-${item.medName}`} className="time-row">
+																<div className="time-main">
+																	<div className="med-name">
+																		<div
+																			className={med?.imageUrl ? "med-avatar clickable" : ""}
+																			onClick={() =>
+																				med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))
+																			}
+																			onKeyDown={(e) => {
+																				if (e.key === "Enter" || e.key === " ") {
+																					if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
+																				}
+																			}}
+																		>
+																			<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
+																		</div>
+																		<div className="med-name-stack">
+																			<span className="med-name-text">{item.medName}</span>
+																			{med?.genericName && (
+																				<span className="med-generic-inline">{med.genericName}</span>
+																			)}
+																		</div>
+																	</div>
+																	<div className="tag-row">
+																		<span className="tag subtle">
+																			{formatTotalUsageLabel(med, item.total, item.doses)}
+																		</span>
+																	</div>
+																</div>
+																<div className="doses-col">
+																	{item.doses.map((dose) => {
+																		const isTaken = isDoseTakenForDisplay(dose.id);
+																		const isAutomaticallyTaken =
+																			isTaken && isDoseTakenAutomatically(dose.id) && dose.when <= Date.now();
+																		return (
+																			<div key={dose.id} className={`dose-item past ${isTaken ? "all-taken" : ""}`}>
+																				<span className="dose-time">{dose.timeStr}</span>
+																				<span className="dose-usage">
+																					<span className="dose-usage-main">{renderDoseUsage(med, dose)}</span>
+																					{allowsPillFormSelection(med?.packageType) && med?.pillWeightMg && (
+																						<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
+																					)}
+																				</span>
+																				<div className="dose-checks">
+																					<div className={`dose-person ${isTaken ? "taken" : ""}`}>
+																						{dose.takenBy && <span className="person-name">{dose.takenBy}</span>}
+																						{isTaken ? (
+																							<button
+																								className="dose-btn undo"
+																								onClick={() => undoDoseTaken(dose.id)}
+																								title={t("common.undo")}
+																							>
+																								{isAutomaticallyTaken && (
+																									<span
+																										className="info-tooltip"
+																										data-tooltip={t("tooltips.automaticTaken")}
+																									>
+																										🤖
+																									</span>
+																								)}
+																								↩
+																							</button>
+																						) : (
+																							<button
+																								className={`dose-btn take${isEmpty ? " out-of-stock" : ""}`}
+																								onClick={() => markDoseTaken(dose.id)}
+																								disabled={isEmpty}
+																								title={
+																									isEmpty ? t("common.outOfStockTakeBlocked") : t("dose.markAsTaken")
+																								}
+																							>
+																								<span className="dose-btn-label">{t("dose.take")}</span>
+																								<span aria-hidden="true">{isEmpty ? "⊘" : "✓"}</span>
+																							</button>
+																						)}
+																					</div>
+																				</div>
+																			</div>
+																		);
+																	})}
+																</div>
+															</div>
+														);
+													})}
+											</div>
+										);
+									})}
+								{/* Past days toggle */}
+								{!showOnlyToday &&
+									pastDays.length > 0 &&
+									(() => {
+										const missedCount = missedPastDoseIds.length;
+										const totalPastDoses = pastDays.flatMap((d) =>
+											d.meds.flatMap((m) => m.doses.map((dose) => dose.id))
+										);
+										return (
+											<div className="past-days-header">
+												<div
+													className={`past-days-toggle ${showPastDays ? "expanded" : ""} ${missedCount > 0 ? "has-missed" : ""}`}
+													onClick={() => {
+														const wasCollapsed = !showPastDays;
+														setShowPastDays(!showPastDays);
+														if (wasCollapsed) {
+															setTimeout(() => {
+																document
+																	.querySelector(".day-block.today")
+																	?.scrollIntoView({ behavior: "smooth", block: "center" });
+															}, 50);
+														}
+													}}
+													onKeyDown={(e) => {
+														if (e.key === "Enter" || e.key === " ") setShowPastDays(!showPastDays);
+													}}
+												>
+													<span className="past-days-icon">{showPastDays ? "▼" : "▶"}</span>
+													<span className="past-days-label">
+														{showPastDays
+															? t("dashboard.schedules.hidePastDays")
+															: t("dashboard.schedules.showPastDays")}
+													</span>
+													<span className="past-days-count">
+														({t("dashboard.schedules.pastDaysCount", { count: pastDays.length })})
+													</span>
+													{missedCount > 0 ? (
+														<span
+															className="past-days-warning"
+															title={t("dashboard.schedules.missedDoses", { count: missedCount })}
+														>
+															⚠️ {missedCount}
+														</span>
+													) : totalPastDoses.length > 0 ? (
+														<span className="past-days-complete" title={t("dashboard.schedules.allTaken")}>
+															✓
+														</span>
+													) : null}
+												</div>
+											</div>
+										);
+									})()}
+								{/* Today (always visible) */}
+								{todayDay &&
+									(() => {
+										const day = todayDay;
+										const allDoseIds = day.meds.flatMap((item) => item.doses.map((d) => d.id));
+										const allDayTaken = allDoseIds.length > 0 && allDoseIds.every((id) => isDoseTakenForDisplay(id));
+										const takenCount = allDoseIds.filter((id) => isDoseTakenForDisplay(id)).length;
+										const hasAutomaticTakenDose = allDoseIds.some((id) => isDoseTakenAutomatically(id));
+
+										// Today: only collapse if manually collapsed or all taken
+										const isAutoCollapsed = allDayTaken && !hasAutomaticTakenDose;
+										const isManuallyExpanded = manuallyExpandedDays.has(day.dateStr);
+										const isManuallyCollapsed = manuallyCollapsedDays.has(day.dateStr);
+										const isCollapsed = isAutoCollapsed ? !isManuallyExpanded : isManuallyCollapsed;
+
+										return (
+											<div
+												key={day.dateStr}
+												className={`day-block ${isCollapsed ? "collapsed" : ""} ${allDayTaken ? "all-taken" : ""} today`}
+											>
+												<div
+													className="day-divider clickable"
+													onClick={() => toggleDayCollapse(day.dateStr, isAutoCollapsed)}
+													onKeyDown={(e) => {
+														if (e.key === "Enter" || e.key === " ") toggleDayCollapse(day.dateStr, isAutoCollapsed);
+													}}
+													title={isCollapsed ? t("common.expand") : t("common.collapse")}
+												>
+													<span className="day-collapse-icon">{isCollapsed ? "▶" : "▼"}</span>
+													<span className="day-date">{day.dateStr}</span>
+													<span className="day-summary">
+														{allDayTaken ? (
+															<span className="day-complete">✓ {t("dashboard.schedules.allTaken")}</span>
+														) : (
 															<span className="day-progress">
 																{takenCount}/{allDoseIds.length}
 															</span>
-														</>
-													)}
-												</span>
-											</div>
-											{!isCollapsed &&
-												day.meds.map((item) => {
-													const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
-													const medCoverage = coverageByMed[item.medName];
-													const isEmpty = showStock && medCoverage ? medCoverage.medsLeft <= 0 : false;
-													const depletionTime = depletionByMed[item.medName];
-													const willBeOutOfStock = typeof depletionTime === "number" && item.lastWhen > depletionTime;
-													const status = showStock
-														? willBeOutOfStock
-															? { className: "danger", label: "status.outOfStock" }
-															: medCoverage
-																? getStockStatus(
-																		medCoverage.daysLeft,
-																		medCoverage.medsLeft,
-																		stockThresholds,
-																		med?.packageType
-																	)
-																: null
-														: null;
-													const visibleStatus = getVisibleStockStatus(med, status);
-
-													const itemDoseIds = item.doses.map((d) => d.id);
-													const allTaken = itemDoseIds.every((id) => takenDoses.has(id));
-
-													return (
-														<div
-															key={`${day.dateStr}-${item.medName}`}
-															className={`time-row ${allTaken ? "taken" : ""}`}
-														>
-															<div className="time-main">
-																<div className="med-name">
-																	<div
-																		className={med?.imageUrl ? "med-avatar clickable" : ""}
-																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))}
-																		onKeyDown={(e) => {
-																			if (e.key === "Enter" || e.key === " ") {
-																				if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
-																			}
-																		}}
-																	>
-																		<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
-																	</div>
-																	<div className="med-name-stack">
-																		<span className="med-name-text">{item.medName}</span>
-																		{med?.genericName && <span className="med-generic-inline">{med.genericName}</span>}
-																	</div>
-																</div>
-																<div className="tag-row">
-																	<span className="tag subtle">
-																		{formatTotalUsageLabel(med, item.total, item.doses)}
-																	</span>
-																	{visibleStatus && (
-																		<span className={`status-chip small ${visibleStatus.className}`}>
-																			{t(visibleStatus.label)}
-																		</span>
-																	)}
-																</div>
-															</div>
-															<div className="doses-col">
-																{item.doses.map((dose) => {
-																	const isTaken = takenDoses.has(dose.id);
-																	return (
-																		<div key={dose.id} className="dose-item past">
-																			<span className="dose-time">{dose.timeStr}</span>
-																			<span className="dose-usage">
-																				<span className="dose-usage-main">{renderDoseUsage(med, dose)}</span>
-																				{med?.pillWeightMg && (
-																					<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																				)}
-																			</span>
-																			<div className="dose-checks">
-																				<div className={`dose-person ${isTaken ? "taken" : ""}`}>
-																					{dose.takenBy && <span className="person-name">{dose.takenBy}</span>}
-																					{isTaken ? (
-																						<button
-																							className="dose-btn undo"
-																							onClick={() => undoDoseTaken(dose.id)}
-																							title={t("common.undo")}
-																						>
-																							↩
-																						</button>
-																					) : (
-																						<button
-																							className="dose-btn take"
-																							onClick={() => markDoseTaken(dose.id)}
-																							disabled={isEmpty}
-																							title={t("dose.markAsTaken")}
-																						>
-																							<span className="dose-btn-label">{t("dose.take")}</span>
-																							<span aria-hidden="true">✓</span>
-																						</button>
-																					)}
-																				</div>
-																			</div>
-																		</div>
-																	);
-																})}
-															</div>
-														</div>
-													);
-												})}
-										</div>
-									);
-								})}
-							{/* Past days toggle */}
-							{!showOnlyToday &&
-								pastDays.length > 0 &&
-								(() => {
-									const missedCount = missedPastDoseIds.length;
-									const totalPastDoses = pastDays.flatMap((d) => d.meds.flatMap((m) => m.doses.map((dose) => dose.id)));
-									return (
-										<div className="past-days-header">
-											<div
-												className={`past-days-toggle ${showPastDays ? "expanded" : ""} ${missedCount > 0 ? "has-missed" : ""}`}
-												onClick={() => {
-													const wasCollapsed = !showPastDays;
-													setShowPastDays(!showPastDays);
-													if (wasCollapsed) {
-														setTimeout(() => {
-															document
-																.querySelector(".day-block.today")
-																?.scrollIntoView({ behavior: "smooth", block: "center" });
-														}, 50);
-													}
-												}}
-												onKeyDown={(e) => {
-													if (e.key === "Enter" || e.key === " ") setShowPastDays(!showPastDays);
-												}}
-											>
-												<span className="past-days-icon">{showPastDays ? "▼" : "▶"}</span>
-												<span className="past-days-label">
-													{showPastDays ? t("dashboard.schedules.hidePastDays") : t("dashboard.schedules.showPastDays")}
-												</span>
-												<span className="past-days-count">
-													({t("dashboard.schedules.pastDaysCount", { count: pastDays.length })})
-												</span>
-												{missedCount > 0 ? (
-													<span
-														className="past-days-warning"
-														title={t("dashboard.schedules.missedDoses", { count: missedCount })}
-													>
-														⚠️ {missedCount}
+														)}
 													</span>
-												) : totalPastDoses.length > 0 ? (
-													<span className="past-days-complete" title={t("dashboard.schedules.allTaken")}>
-														✓
-													</span>
-												) : null}
-											</div>
-										</div>
-									);
-								})()}
-							{/* Today (always visible) */}
-							{todayDay &&
-								(() => {
-									const day = todayDay;
-									const allDoseIds = day.meds.flatMap((item) => item.doses.map((d) => d.id));
-									const allDayTaken = allDoseIds.length > 0 && allDoseIds.every((id) => takenDoses.has(id));
-									const takenCount = allDoseIds.filter((id) => takenDoses.has(id)).length;
-									const worstStatus = getDayStockStatus(day.meds);
-
-									// Today: only collapse if manually collapsed or all taken
-									const isAutoCollapsed = allDayTaken;
-									const isManuallyExpanded = manuallyExpandedDays.has(day.dateStr);
-									const isManuallyCollapsed = manuallyCollapsedDays.has(day.dateStr);
-									const isCollapsed = isAutoCollapsed ? !isManuallyExpanded : isManuallyCollapsed;
-
-									return (
-										<div
-											key={day.dateStr}
-											className={`day-block ${isCollapsed ? "collapsed" : ""} ${allDayTaken ? "all-taken" : ""} today stock-${showStock ? worstStatus : "success"}`}
-										>
-											<div
-												className="day-divider clickable"
-												onClick={() => toggleDayCollapse(day.dateStr, isAutoCollapsed)}
-												onKeyDown={(e) => {
-													if (e.key === "Enter" || e.key === " ") toggleDayCollapse(day.dateStr, isAutoCollapsed);
-												}}
-												title={isCollapsed ? t("common.expand") : t("common.collapse")}
-											>
-												<span className="day-collapse-icon">{isCollapsed ? "▶" : "▼"}</span>
-												<span className="day-date">{day.dateStr}</span>
-												<span className="day-summary">
-													{allDayTaken ? (
-														<span className="day-complete">✓ {t("dashboard.schedules.allTaken")}</span>
-													) : (
-														<span className="day-progress">
-															{takenCount}/{allDoseIds.length}
-														</span>
-													)}
-												</span>
-											</div>
-											{!isCollapsed &&
-												day.meds.map((item) => {
-													const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
-													const medCoverage = coverageByMed[item.medName];
-													const isEmpty = showStock && medCoverage ? medCoverage.medsLeft <= 0 : false;
-													const depletionTime = depletionByMed[item.medName];
-													const willBeOutOfStock = typeof depletionTime === "number" && item.lastWhen > depletionTime;
-													const status = showStock
-														? willBeOutOfStock
-															? { className: "danger", label: "status.outOfStock" }
-															: medCoverage
-																? getStockStatus(
-																		medCoverage.daysLeft,
-																		medCoverage.medsLeft,
-																		stockThresholds,
-																		med?.packageType
-																	)
-																: null
-														: null;
-													const visibleStatus = getVisibleStockStatus(med, status);
-
-													const itemDoseIds = item.doses.map((d) => d.id);
-													const allTaken = itemDoseIds.every((id) => takenDoses.has(id));
-													return (
-														<div
-															key={`${day.dateStr}-${item.medName}`}
-															className={`time-row ${allTaken ? "taken" : ""}`}
-														>
-															<div className="time-main">
-																<div className="med-name">
-																	<div
-																		className={med?.imageUrl ? "med-avatar clickable" : ""}
-																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))}
-																		onKeyDown={(e) => {
-																			if (e.key === "Enter" || e.key === " ") {
-																				if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
-																			}
-																		}}
-																	>
-																		<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
-																	</div>
-																	<div className="med-name-stack">
-																		<span className="med-name-text">{item.medName}</span>
-																		{med?.genericName && <span className="med-generic-inline">{med.genericName}</span>}
-																	</div>
-																</div>
-																<div className="tag-row">
-																	<span className="tag subtle">
-																		{formatTotalUsageLabel(med, item.total, item.doses)}
-																	</span>
-																	{visibleStatus && (
-																		<span className={`status-chip small ${visibleStatus.className}`}>
-																			{t(visibleStatus.label)}
-																		</span>
-																	)}
-																</div>
-															</div>
-															<div className="doses-col">
-																{item.doses.map((dose) => {
-																	const isTaken = takenDoses.has(dose.id);
-																	const isOverdue = dose.when < Date.now() && !isTaken;
-																	return (
+												</div>
+												{!isCollapsed &&
+													day.meds.map((item) => {
+														const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
+														const medCoverage = coverageByMed[item.medName];
+														const isEmpty = medCoverage ? medCoverage.medsLeft <= 0 : false;
+														return (
+															<div key={`${day.dateStr}-${item.medName}`} className="time-row">
+																<div className="time-main">
+																	<div className="med-name">
 																		<div
-																			key={dose.id}
-																			className={`dose-item ${isOverdue ? "overdue" : ""} ${isTaken ? "all-taken" : ""}`}
+																			className={med?.imageUrl ? "med-avatar clickable" : ""}
+																			onClick={() =>
+																				med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))
+																			}
+																			onKeyDown={(e) => {
+																				if (e.key === "Enter" || e.key === " ") {
+																					if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
+																				}
+																			}}
 																		>
-																			<span className="dose-time">{dose.timeStr}</span>
-																			<span className="dose-usage">
-																				<span className="dose-usage-main">{renderDoseUsage(med, dose)}</span>
-																				{med?.pillWeightMg && (
-																					<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																				)}
-																			</span>
-																			<div className="dose-checks">
-																				<div
-																					className={`dose-person ${isTaken ? "taken" : ""} ${isOverdue ? "overdue" : ""}`}
-																				>
-																					{dose.takenBy && <span className="person-name">{dose.takenBy}</span>}
-																					{isTaken ? (
-																						<button
-																							className="dose-btn undo"
-																							onClick={() => undoDoseTaken(dose.id)}
-																							title={t("common.undo")}
-																						>
-																							↩
-																						</button>
-																					) : (
-																						<button
-																							className="dose-btn take"
-																							onClick={() => markDoseTaken(dose.id)}
-																							title={t("dose.markAsTaken")}
-																							disabled={isEmpty}
-																						>
-																							<span className="dose-btn-label">{t("dose.take")}</span>
-																							<span aria-hidden="true">✓</span>
-																						</button>
+																			<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
+																		</div>
+																		<div className="med-name-stack">
+																			<span className="med-name-text">{item.medName}</span>
+																			{med?.genericName && (
+																				<span className="med-generic-inline">{med.genericName}</span>
+																			)}
+																		</div>
+																	</div>
+																	<div className="tag-row">
+																		<span className="tag subtle">
+																			{formatTotalUsageLabel(med, item.total, item.doses)}
+																		</span>
+																	</div>
+																</div>
+																<div className="doses-col">
+																	{item.doses.map((dose) => {
+																		const isTaken = isDoseTakenForDisplay(dose.id);
+																		const isAutomaticallyTaken =
+																			isTaken && isDoseTakenAutomatically(dose.id) && dose.when <= Date.now();
+																		const isOverdue = dose.when < Date.now() && !isTaken;
+																		return (
+																			<div
+																				key={dose.id}
+																				className={`dose-item ${isOverdue ? "overdue" : ""} ${isTaken ? "all-taken" : ""}`}
+																			>
+																				<span className="dose-time">{dose.timeStr}</span>
+																				<span className="dose-usage">
+																					<span className="dose-usage-main">{renderDoseUsage(med, dose)}</span>
+																					{allowsPillFormSelection(med?.packageType) && med?.pillWeightMg && (
+																						<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
 																					)}
+																				</span>
+																				<div className="dose-checks">
+																					<div
+																						className={`dose-person ${isTaken ? "taken" : ""} ${isOverdue ? "overdue" : ""}`}
+																					>
+																						{dose.takenBy && <span className="person-name">{dose.takenBy}</span>}
+																						{isTaken ? (
+																							<button
+																								className="dose-btn undo"
+																								onClick={() => undoDoseTaken(dose.id)}
+																								title={t("common.undo")}
+																							>
+																								{isAutomaticallyTaken && (
+																									<span
+																										className="info-tooltip"
+																										data-tooltip={t("tooltips.automaticTaken")}
+																									>
+																										🤖
+																									</span>
+																								)}
+																								↩
+																							</button>
+																						) : (
+																							<button
+																								className={`dose-btn take${isEmpty ? " out-of-stock" : ""}`}
+																								onClick={() => markDoseTaken(dose.id)}
+																								title={
+																									isEmpty ? t("common.outOfStockTakeBlocked") : t("dose.markAsTaken")
+																								}
+																								disabled={isEmpty}
+																							>
+																								<span className="dose-btn-label">{t("dose.take")}</span>
+																								<span aria-hidden="true">{isEmpty ? "⊘" : "✓"}</span>
+																							</button>
+																						)}
+																					</div>
 																				</div>
 																			</div>
-																		</div>
-																	);
-																})}
+																		);
+																	})}
+																</div>
 															</div>
-														</div>
-													);
-												})}
-										</div>
-									);
-								})()}
-
-							{/* Future days toggle — identical to DashboardPage */}
-							{!showOnlyToday &&
-								futureDays.length > 0 &&
-								(() => {
-									const totalFutureDoses = futureDays.flatMap((d) =>
-										d.meds.flatMap((m) => m.doses.map((dose) => dose.id))
-									);
-									const takenFutureDoses = totalFutureDoses.filter((id) => takenDoses.has(id)).length;
-									return (
-										<div className="future-days-header">
-											<div
-												className={`future-days-toggle ${showFutureDays ? "expanded" : ""}`}
-												onClick={() => setShowFutureDays(!showFutureDays)}
-												onKeyDown={(e) => {
-													if (e.key === "Enter" || e.key === " ") setShowFutureDays(!showFutureDays);
-												}}
-											>
-												<span className="future-days-icon">{showFutureDays ? "▼" : "▶"}</span>
-												<span className="future-days-label">
-													{showFutureDays
-														? t("dashboard.schedules.hideFutureDays")
-														: t("dashboard.schedules.showFutureDays")}
-												</span>
-												<span className="future-days-count">
-													({t("dashboard.schedules.futureDaysCount", { count: futureDays.length })})
-												</span>
-												{takenFutureDoses > 0 && totalFutureDoses.length > 0 && (
-													<span className="future-days-progress">
-														{takenFutureDoses}/{totalFutureDoses.length}
-													</span>
-												)}
+														);
+													})}
 											</div>
-										</div>
-									);
-								})()}
+										);
+									})()}
 
-							{/* Future days (when expanded) — identical to DashboardPage */}
-							{!showOnlyToday &&
-								showFutureDays &&
-								futureDays.map((day) => {
-									const allDoseIds = day.meds.flatMap((item) => item.doses.map((d) => d.id));
-									const allDayTaken = allDoseIds.length > 0 && allDoseIds.every((id) => takenDoses.has(id));
-									const takenCount = allDoseIds.filter((id) => takenDoses.has(id)).length;
-									const worstStatus = getDayStockStatus(day.meds);
-
-									// Future days: collapsed by default, manual override to expand
-									const isAutoCollapsed = true;
-									const isManuallyExpanded = manuallyExpandedDays.has(day.dateStr);
-									const isCollapsed = !isManuallyExpanded;
-
-									return (
-										<div
-											key={day.dateStr}
-											className={`day-block ${isCollapsed ? "collapsed" : ""} ${allDayTaken ? "all-taken" : ""} stock-${showStock ? worstStatus : "success"}`}
-										>
-											<div
-												className="day-divider clickable"
-												onClick={() => toggleDayCollapse(day.dateStr, isAutoCollapsed)}
-												onKeyDown={(e) => {
-													if (e.key === "Enter" || e.key === " ") toggleDayCollapse(day.dateStr, isAutoCollapsed);
-												}}
-												title={isCollapsed ? t("common.expand") : t("common.collapse")}
-											>
-												<span className="day-collapse-icon">{isCollapsed ? "▶" : "▼"}</span>
-												<span className="day-date">{day.dateStr}</span>
-												<span className="day-summary">
-													{allDayTaken ? (
-														<span className="day-complete">✓ {t("dashboard.schedules.allTaken")}</span>
-													) : (
-														<span className="day-progress">
-															{takenCount}/{allDoseIds.length}
+								{/* Future days toggle — identical to DashboardPage */}
+								{!showOnlyToday &&
+									futureDays.length > 0 &&
+									(() => {
+										const totalFutureDoses = futureDays.flatMap((d) =>
+											d.meds.flatMap((m) => m.doses.map((dose) => dose.id))
+										);
+										const takenFutureDoses = totalFutureDoses.filter((id) => isDoseTakenForDisplay(id)).length;
+										return (
+											<div className="future-days-header">
+												<div
+													className={`future-days-toggle ${showFutureDays ? "expanded" : ""}`}
+													onClick={() => setShowFutureDays(!showFutureDays)}
+													onKeyDown={(e) => {
+														if (e.key === "Enter" || e.key === " ") setShowFutureDays(!showFutureDays);
+													}}
+												>
+													<span className="future-days-icon">{showFutureDays ? "▼" : "▶"}</span>
+													<span className="future-days-label">
+														{showFutureDays
+															? t("dashboard.schedules.hideFutureDays")
+															: t("dashboard.schedules.showFutureDays")}
+													</span>
+													<span className="future-days-count">
+														({t("dashboard.schedules.futureDaysCount", { count: futureDays.length })})
+													</span>
+													{takenFutureDoses > 0 && totalFutureDoses.length > 0 && (
+														<span className="future-days-progress">
+															{takenFutureDoses}/{totalFutureDoses.length}
 														</span>
 													)}
-												</span>
+												</div>
 											</div>
-											{!isCollapsed &&
-												day.meds.map((item) => {
-													const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
-													const medCoverage = coverageByMed[item.medName];
-													const depletionTime = depletionByMed[item.medName];
-													const willBeOutOfStock = typeof depletionTime === "number" && item.lastWhen > depletionTime;
-													const status = showStock
-														? willBeOutOfStock
-															? { className: "danger", label: "status.outOfStock" }
-															: medCoverage
-																? getStockStatus(
-																		medCoverage.daysLeft,
-																		medCoverage.medsLeft,
-																		stockThresholds,
-																		med?.packageType
-																	)
-																: null
-														: null;
-													const visibleStatus = getVisibleStockStatus(med, status);
+										);
+									})()}
 
-													const itemDoseIds = item.doses.map((d) => d.id);
-													const allTaken = itemDoseIds.every((id) => takenDoses.has(id));
-													return (
-														<div
-															key={`${day.dateStr}-${item.medName}`}
-															className={`time-row ${allTaken ? "taken" : ""}`}
-														>
-															<div className="time-main">
-																<div className="med-name">
-																	<div
-																		className={med?.imageUrl ? "med-avatar clickable" : ""}
-																		onClick={() => med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))}
-																		onKeyDown={(e) => {
-																			if (e.key === "Enter" || e.key === " ") {
-																				if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
+								{/* Future days (when expanded) — identical to DashboardPage */}
+								{!showOnlyToday &&
+									showFutureDays &&
+									futureDays.map((day) => {
+										const allDoseIds = day.meds.flatMap((item) => item.doses.map((d) => d.id));
+										const allDayTaken = allDoseIds.length > 0 && allDoseIds.every((id) => isDoseTakenForDisplay(id));
+										const takenCount = allDoseIds.filter((id) => isDoseTakenForDisplay(id)).length;
+
+										// Future days: collapsed by default, manual override to expand
+										const isAutoCollapsed = true;
+										const isManuallyExpanded = manuallyExpandedDays.has(day.dateStr);
+										const isCollapsed = !isManuallyExpanded;
+
+										return (
+											<div
+												key={day.dateStr}
+												className={`day-block ${isCollapsed ? "collapsed" : ""} ${allDayTaken ? "all-taken" : ""}`}
+											>
+												<div
+													className="day-divider clickable"
+													onClick={() => toggleDayCollapse(day.dateStr, isAutoCollapsed)}
+													onKeyDown={(e) => {
+														if (e.key === "Enter" || e.key === " ") toggleDayCollapse(day.dateStr, isAutoCollapsed);
+													}}
+													title={isCollapsed ? t("common.expand") : t("common.collapse")}
+												>
+													<span className="day-collapse-icon">{isCollapsed ? "▶" : "▼"}</span>
+													<span className="day-date">{day.dateStr}</span>
+													<span className="day-summary">
+														{allDayTaken ? (
+															<span className="day-complete">✓ {t("dashboard.schedules.allTaken")}</span>
+														) : (
+															<span className="day-progress">
+																{takenCount}/{allDoseIds.length}
+															</span>
+														)}
+													</span>
+												</div>
+												{!isCollapsed &&
+													day.meds.map((item) => {
+														const med = data.medications.find((m) => getMedDisplayName(m) === item.medName);
+														const medCoverage = coverageByMed[item.medName];
+														const isEmpty = medCoverage ? medCoverage.medsLeft <= 0 : false;
+														return (
+															<div key={`${day.dateStr}-${item.medName}`} className="time-row">
+																<div className="time-main">
+																	<div className="med-name">
+																		<div
+																			className={med?.imageUrl ? "med-avatar clickable" : ""}
+																			onClick={() =>
+																				med?.imageUrl && openLightbox(med.imageUrl, getMedDisplayName(med))
 																			}
-																		}}
-																	>
-																		<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
+																			onKeyDown={(e) => {
+																				if (e.key === "Enter" || e.key === " ") {
+																					if (med?.imageUrl) openLightbox(med.imageUrl, getMedDisplayName(med));
+																				}
+																			}}
+																		>
+																			<MedicationAvatar name={item.medName} imageUrl={med?.imageUrl} size="sm" />
+																		</div>
+																		<div className="med-name-stack">
+																			<span className="med-name-text">{item.medName}</span>
+																			{med?.genericName && (
+																				<span className="med-generic-inline">{med.genericName}</span>
+																			)}
+																		</div>
 																	</div>
-																	<div className="med-name-stack">
-																		<span className="med-name-text">{item.medName}</span>
-																		{med?.genericName && <span className="med-generic-inline">{med.genericName}</span>}
-																	</div>
-																</div>
-																<div className="tag-row">
-																	<span className="tag subtle">
-																		{formatTotalUsageLabel(med, item.total, item.doses)}
-																	</span>
-																	{visibleStatus && (
-																		<span className={`status-chip small ${visibleStatus.className}`}>
-																			{t(visibleStatus.label)}
+																	<div className="tag-row">
+																		<span className="tag subtle">
+																			{formatTotalUsageLabel(med, item.total, item.doses)}
 																		</span>
-																	)}
+																	</div>
 																</div>
-															</div>
-															<div className="doses-col">
-																{item.doses.map((dose) => {
-																	const isTaken = takenDoses.has(dose.id);
-																	return (
-																		<div key={dose.id} className={`dose-item future ${isTaken ? "all-taken" : ""}`}>
-																			<span className="dose-time">{dose.timeStr}</span>
-																			<span className="dose-usage">
-																				<span className="dose-usage-main">{renderDoseUsage(med, dose)}</span>
-																				{med?.pillWeightMg && (
-																					<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
-																				)}
-																			</span>
-																			<div className="dose-checks">
-																				<div className={`dose-person ${isTaken ? "taken" : ""}`}>
-																					{dose.takenBy && <span className="person-name">{dose.takenBy}</span>}
-																					{isTaken ? (
-																						<button
-																							className="dose-btn undo"
-																							onClick={() => undoDoseTaken(dose.id)}
-																							title={t("common.undo")}
-																						>
-																							↩
-																						</button>
-																					) : (
-																						<button
-																							className="dose-btn take"
-																							onClick={() => markDoseTaken(dose.id)}
-																							title={t("dose.markAsTaken")}
-																							disabled={true}
-																						>
-																							<span className="dose-btn-label">{t("dose.take")}</span>
-																							<span aria-hidden="true">✓</span>
-																						</button>
+																<div className="doses-col">
+																	{item.doses.map((dose) => {
+																		const isTaken = isDoseTakenForDisplay(dose.id);
+																		const isAutomaticallyTaken =
+																			isTaken && isDoseTakenAutomatically(dose.id) && dose.when <= Date.now();
+																		return (
+																			<div key={dose.id} className={`dose-item future ${isTaken ? "all-taken" : ""}`}>
+																				<span className="dose-time">{dose.timeStr}</span>
+																				<span className="dose-usage">
+																					<span className="dose-usage-main">{renderDoseUsage(med, dose)}</span>
+																					{allowsPillFormSelection(med?.packageType) && med?.pillWeightMg && (
+																						<span className="dose-usage-weight">{`${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"}`}</span>
 																					)}
+																				</span>
+																				<div className="dose-checks">
+																					<div className={`dose-person ${isTaken ? "taken" : ""}`}>
+																						{dose.takenBy && <span className="person-name">{dose.takenBy}</span>}
+																						{isTaken ? (
+																							<button
+																								className="dose-btn undo"
+																								onClick={() => undoDoseTaken(dose.id)}
+																								title={t("common.undo")}
+																							>
+																								{isAutomaticallyTaken && (
+																									<span
+																										className="info-tooltip"
+																										data-tooltip={t("tooltips.automaticTaken")}
+																									>
+																										🤖
+																									</span>
+																								)}
+																								↩
+																							</button>
+																						) : (
+																							<button
+																								className={`dose-btn take${isEmpty ? " out-of-stock" : ""}`}
+																								onClick={() => markDoseTaken(dose.id)}
+																								title={
+																									isEmpty ? t("common.outOfStockTakeBlocked") : t("dose.markAsTaken")
+																								}
+																								disabled={true}
+																							>
+																								<span className="dose-btn-label">{t("dose.take")}</span>
+																								<span aria-hidden="true">{isEmpty ? "⊘" : "✓"}</span>
+																							</button>
+																						)}
+																					</div>
 																				</div>
 																			</div>
-																		</div>
-																	);
-																})}
+																		);
+																	})}
+																</div>
 															</div>
-														</div>
-													);
-												})}
-										</div>
-									);
-								})}
-						</>
-					)}
-				</div>
+														);
+													})}
+											</div>
+										);
+									})}
+							</>
+						)}
+					</div>
+				</section>
 
 				<footer className="shared-schedule-footer">
 					<p>
diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts
index a7a2e2f..443df4c 100644
--- a/frontend/src/components/index.ts
+++ b/frontend/src/components/index.ts
@@ -21,6 +21,7 @@ export { default as ProfileModal } from "./ProfileModal";
 export { default as ReportModal } from "./ReportModal";
 export type { ShareDialogProps } from "./ShareDialog";
 export { ShareDialog } from "./ShareDialog";
+export { SharedMedicationOverviewSection } from "./SharedMedicationOverviewSection";
 export { SharedSchedule } from "./SharedSchedule";
 export type { TagInputProps } from "./TagInput";
 export { TagInput } from "./TagInput";
diff --git a/frontend/src/hooks/useSettings.ts b/frontend/src/hooks/useSettings.ts
index 818bd2d..cf59c7d 100644
--- a/frontend/src/hooks/useSettings.ts
+++ b/frontend/src/hooks/useSettings.ts
@@ -47,6 +47,7 @@ export interface Settings {
 	shoutrrrPrescriptionReminders: boolean;
 	stockCalculationMode: "automatic" | "manual";
 	shareStockStatus: boolean;
+	shareMedicationOverview: boolean;
 	upcomingTodayOnly: boolean;
 	shareScheduleTodayOnly: boolean;
 	swapDashboardMainSections: boolean;
@@ -98,6 +99,7 @@ const defaultSettings: Settings = {
 	shoutrrrPrescriptionReminders: true,
 	stockCalculationMode: "automatic",
 	shareStockStatus: true,
+	shareMedicationOverview: false,
 	upcomingTodayOnly: false,
 	shareScheduleTodayOnly: false,
 	swapDashboardMainSections: false,
@@ -145,6 +147,16 @@ export function useSettings(): UseSettingsReturn {
 	// loadSettings captures the current generation; if it changes before
 	// the fetch completes, the stale response is silently discarded.
 	const loadGenerationRef = useRef(0);
+	const latestSettingsRef = useRef(settings);
+	const latestSavedSettingsRef = useRef(savedSettings);
+
+	useEffect(() => {
+		latestSettingsRef.current = settings;
+	}, [settings]);
+
+	useEffect(() => {
+		latestSavedSettingsRef.current = savedSettings;
+	}, [savedSettings]);
 
 	const resetSettingsState = useCallback(() => {
 		loadGenerationRef.current += 1; // Invalidate any in-flight loadSettings
@@ -214,6 +226,69 @@ export function useSettings(): UseSettingsReturn {
 		return response;
 	}, []);
 
+	const buildSettingsPayload = useCallback(
+		(settingsToSave: Settings) => {
+			const effectiveEmailEnabled = settingsToSave.emailEnabled && !!settingsToSave.notificationEmail?.trim();
+			const effectiveShoutrrrEnabled = settingsToSave.shoutrrrEnabled && !!settingsToSave.shoutrrrUrl?.trim();
+			const hasEmailStock =
+				effectiveEmailEnabled && settingsToSave.emailStockReminders && !!settingsToSave.notificationEmail?.trim();
+			const hasShoutrrrStock =
+				effectiveShoutrrrEnabled && settingsToSave.shoutrrrStockReminders && !!settingsToSave.shoutrrrUrl?.trim();
+			const hasAnyStockReminder = hasEmailStock || hasShoutrrrStock;
+			const repeatDailyReminders = hasAnyStockReminder ? settingsToSave.repeatDailyReminders : false;
+
+			return {
+				emailEnabled: effectiveEmailEnabled,
+				notificationEmail: settingsToSave.notificationEmail,
+				reminderDaysBefore: settingsToSave.reminderDaysBefore,
+				repeatDailyReminders,
+				skipRemindersForTakenDoses: settingsToSave.skipRemindersForTakenDoses,
+				repeatRemindersEnabled: settingsToSave.repeatRemindersEnabled,
+				reminderRepeatIntervalMinutes: settingsToSave.reminderRepeatIntervalMinutes,
+				maxNaggingReminders: settingsToSave.maxNaggingReminders ?? 5,
+				lowStockDays: settingsToSave.lowStockDays,
+				normalStockDays: settingsToSave.normalStockDays,
+				highStockDays: settingsToSave.highStockDays,
+				shoutrrrEnabled: effectiveShoutrrrEnabled,
+				shoutrrrUrl: settingsToSave.shoutrrrUrl,
+				emailStockReminders: settingsToSave.emailStockReminders,
+				emailIntakeReminders: settingsToSave.emailIntakeReminders,
+				emailPrescriptionReminders: settingsToSave.emailPrescriptionReminders,
+				shoutrrrStockReminders: settingsToSave.shoutrrrStockReminders,
+				shoutrrrIntakeReminders: settingsToSave.shoutrrrIntakeReminders,
+				shoutrrrPrescriptionReminders: settingsToSave.shoutrrrPrescriptionReminders,
+				stockCalculationMode: settingsToSave.stockCalculationMode,
+				shareStockStatus: settingsToSave.shareStockStatus,
+				shareMedicationOverview: settingsToSave.shareMedicationOverview,
+				upcomingTodayOnly: settingsToSave.upcomingTodayOnly,
+				shareScheduleTodayOnly: settingsToSave.shareScheduleTodayOnly,
+				swapDashboardMainSections: settingsToSave.swapDashboardMainSections,
+				language: i18n.language,
+				smtpHost: settingsToSave.smtpHost,
+				smtpPort: settingsToSave.smtpPort,
+				smtpUser: settingsToSave.smtpUser,
+				smtpPass: settingsToSave.smtpPass || undefined,
+				smtpFrom: settingsToSave.smtpFrom,
+				smtpSecure: settingsToSave.smtpSecure,
+			};
+		},
+		[i18n.language]
+	);
+
+	const flushSettingsWithKeepalive = useCallback(
+		(settingsToSave: Settings) => {
+			const payload = buildSettingsPayload(settingsToSave);
+			void fetch("/api/settings", {
+				method: "PUT",
+				headers: { "Content-Type": "application/json" },
+				credentials: "include",
+				keepalive: true,
+				body: JSON.stringify(payload),
+			}).catch(() => {});
+		},
+		[buildSettingsPayload]
+	);
+
 	// Load settings function - exposed for manual refresh (e.g., after auth)
 	const loadSettings = useCallback(() => {
 		setSettingsLoading(true);
@@ -331,52 +406,19 @@ export function useSettings(): UseSettingsReturn {
 
 	// Internal save function (no event needed)
 	const performSave = useCallback(
-		async (settingsToSave: Settings) => {
-			// Auto-disable email if no recipient is set
-			const effectiveEmailEnabled = settingsToSave.emailEnabled && !!settingsToSave.notificationEmail?.trim();
-			// Auto-disable push if no URL is set
-			const effectiveShoutrrrEnabled = settingsToSave.shoutrrrEnabled && !!settingsToSave.shoutrrrUrl?.trim();
+		async (settingsToSave: Settings, options?: { syncState?: boolean }) => {
+			const syncState = options?.syncState ?? true;
+			const payload = buildSettingsPayload(settingsToSave);
 
-			setSettingsSaving(true);
-
-			const payload = {
-				emailEnabled: effectiveEmailEnabled,
-				notificationEmail: settingsToSave.notificationEmail,
-				reminderDaysBefore: settingsToSave.reminderDaysBefore,
-				repeatDailyReminders: settingsToSave.repeatDailyReminders,
-				skipRemindersForTakenDoses: settingsToSave.skipRemindersForTakenDoses,
-				repeatRemindersEnabled: settingsToSave.repeatRemindersEnabled,
-				reminderRepeatIntervalMinutes: settingsToSave.reminderRepeatIntervalMinutes,
-				maxNaggingReminders: settingsToSave.maxNaggingReminders ?? 5,
-				lowStockDays: settingsToSave.lowStockDays,
-				normalStockDays: settingsToSave.normalStockDays,
-				highStockDays: settingsToSave.highStockDays,
-				shoutrrrEnabled: effectiveShoutrrrEnabled,
-				shoutrrrUrl: settingsToSave.shoutrrrUrl,
-				emailStockReminders: settingsToSave.emailStockReminders,
-				emailIntakeReminders: settingsToSave.emailIntakeReminders,
-				emailPrescriptionReminders: settingsToSave.emailPrescriptionReminders,
-				shoutrrrStockReminders: settingsToSave.shoutrrrStockReminders,
-				shoutrrrIntakeReminders: settingsToSave.shoutrrrIntakeReminders,
-				shoutrrrPrescriptionReminders: settingsToSave.shoutrrrPrescriptionReminders,
-				stockCalculationMode: settingsToSave.stockCalculationMode,
-				shareStockStatus: settingsToSave.shareStockStatus,
-				upcomingTodayOnly: settingsToSave.upcomingTodayOnly,
-				shareScheduleTodayOnly: settingsToSave.shareScheduleTodayOnly,
-				swapDashboardMainSections: settingsToSave.swapDashboardMainSections,
-				language: i18n.language,
-				smtpHost: settingsToSave.smtpHost,
-				smtpPort: settingsToSave.smtpPort,
-				smtpUser: settingsToSave.smtpUser,
-				smtpPass: settingsToSave.smtpPass || undefined,
-				smtpFrom: settingsToSave.smtpFrom,
-				smtpSecure: settingsToSave.smtpSecure,
-			};
+			if (syncState) {
+				setSettingsSaving(true);
+			}
 
 			try {
 				const response = await fetchWithRefresh("/api/settings", {
 					method: "PUT",
 					headers: { "Content-Type": "application/json" },
+					keepalive: true,
 					body: JSON.stringify(payload),
 				});
 
@@ -384,19 +426,27 @@ export function useSettings(): UseSettingsReturn {
 					throw new Error(`SETTINGS_SAVE_FAILED_${response.status}`);
 				}
 
-				const updatedSettings = { ...settingsToSave };
-				setSettings(updatedSettings);
-				setSavedSettings(updatedSettings);
-				setSettingsSaved(true);
+				if (syncState) {
+					const updatedSettings = { ...settingsToSave };
+					setSettings(updatedSettings);
+					setSavedSettings(updatedSettings);
+					setSettingsSaved(true);
+				} else {
+					latestSavedSettingsRef.current = { ...settingsToSave };
+				}
 			} catch {
-				setSettingsSaved(false);
-				// Keep UI aligned with backend truth if save failed (auth/session/network/server error).
-				loadSettings();
+				if (syncState) {
+					setSettingsSaved(false);
+					// Keep UI aligned with backend truth if save failed (auth/session/network/server error).
+					loadSettings();
+				}
 			} finally {
-				setSettingsSaving(false);
+				if (syncState) {
+					setSettingsSaving(false);
+				}
 			}
 		},
-		[fetchWithRefresh, i18n.language, loadSettings]
+		[buildSettingsPayload, fetchWithRefresh, loadSettings]
 	);
 
 	// Debounced auto-save: fires whenever settings change
@@ -424,8 +474,8 @@ export function useSettings(): UseSettingsReturn {
 		}
 
 		debounceRef.current = setTimeout(() => {
-			performSave(settings);
-		}, 600);
+			void performSave(settings);
+		}, 50);
 
 		return () => {
 			if (debounceRef.current) {
@@ -434,6 +484,32 @@ export function useSettings(): UseSettingsReturn {
 		};
 	}, [settings, savedSettings, performSave]);
 
+	useEffect(() => {
+		const flushPendingSettings = () => {
+			if (JSON.stringify(latestSettingsRef.current) === JSON.stringify(latestSavedSettingsRef.current)) {
+				return;
+			}
+
+			flushSettingsWithKeepalive(latestSettingsRef.current);
+		};
+
+		window.addEventListener("pagehide", flushPendingSettings);
+
+		return () => {
+			window.removeEventListener("pagehide", flushPendingSettings);
+
+			if (debounceRef.current) {
+				clearTimeout(debounceRef.current);
+			}
+
+			if (JSON.stringify(latestSettingsRef.current) === JSON.stringify(latestSavedSettingsRef.current)) {
+				return;
+			}
+
+			flushSettingsWithKeepalive(latestSettingsRef.current);
+		};
+	}, [flushSettingsWithKeepalive]);
+
 	// Mark initial load as done after first settings load completes
 	useEffect(() => {
 		if (!settingsLoading && !initialLoadDone.current) {
diff --git a/frontend/src/hooks/useShare.ts b/frontend/src/hooks/useShare.ts
index 40b079b..a590bd0 100644
--- a/frontend/src/hooks/useShare.ts
+++ b/frontend/src/hooks/useShare.ts
@@ -7,6 +7,8 @@ import type { Medication } from "../types";
 import { withCorrelation } from "../utils/correlation";
 import { log } from "../utils/logger";
 
+const SHARE_ALL_VALUE = "all";
+
 export interface UseShareReturn {
 	showShareDialog: boolean;
 	sharePeople: string[];
@@ -43,10 +45,20 @@ export function useShare(): UseShareReturn {
 		setShareSelectedPerson("");
 		setShareSelectedDays(30);
 
-		// Get unique takenBy people from all medications (flatten arrays)
-		const allPeople = meds.flatMap((m) => m.takenBy || []);
-		const uniquePeople = [...new Set(allPeople)].filter(Boolean).sort();
-		setSharePeople(uniquePeople);
+		// Include both per-intake assignments and legacy medication-level assignments.
+		const uniquePeople = [
+			...new Set(
+				meds.flatMap((medication) => [
+					...(medication.intakes
+						?.map((intake) => intake.takenBy)
+						.filter((person): person is string => Boolean(person)) ?? []),
+					...(medication.takenBy || []),
+				])
+			),
+		]
+			.filter(Boolean)
+			.sort();
+		setSharePeople(uniquePeople.length > 0 ? [SHARE_ALL_VALUE, ...uniquePeople] : []);
 		log.info("[ShareDialog] Opened", { medicationCount: meds.length, personCount: uniquePeople.length });
 		if (uniquePeople.length > 0) {
 			setShareSelectedPerson(uniquePeople[0]);
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index 053f8db..cd5cf51 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -364,8 +364,6 @@
       "highStockDays": "Hoch (Tage)",
       "highStockTooltip": "Bestand über diesem Wert bedeutet, dass du gut versorgt bist",
       "thresholdValidation": "Werte müssen wie folgt sein: Kritisch < Niedrig < Hoch",
-      "shareStockStatus": "Bestand auf geteilten Links anzeigen",
-      "shareStockStatusDesc": "Bestandsstatus (Normal/Niedrig/Kritisch) und farbige Rahmen auf geteilten Zeitplan-Links für Einnahme-Nutzer anzeigen",
       "packageTypesNote": "Hinweis: Tubenmedikamente sind von Bestands-Erinnerungen ausgeschlossen. Flüssigbehälter-Medikamente verwenden einen einzelnen Reminder-Basiswert (Niedrig und Kritisch werden automatisch von diesem Wert abgeleitet)."
     },
     "timeline": {
@@ -377,6 +375,8 @@
       "swapDashboardSections": "Bevorstehenden Zeitplan vor Medikamentenübersicht anzeigen",
       "swapDashboardSectionsDesc": "Wenn aktiviert, wird der Bereich mit bevorstehenden Einnahmen über der Medikamentenübersicht angezeigt.",
       "sharedSection": "Geteilter Zeitplan",
+      "shareMedicationOverview": "Medikamentenübersicht auf geteilten Links anzeigen",
+      "shareMedicationOverviewDesc": "Die Medikamentenübersicht im normalen geteilten Zeitplan für Einnahme-Nutzer einbetten.",
       "shareScheduleTodayOnly": "Geteilte Links zeigen nur heute",
       "shareScheduleTodayOnlyDesc": "Vergangene und zukünftige Tage in geteilten Zeitplänen ausblenden und nur heutige Einträge zeigen."
     },
@@ -497,6 +497,7 @@
     "saveFailed": "Speichern fehlgeschlagen",
     "networkError": "Netzwerkfehler",
     "saving": "Wird gespeichert...",
+    "outOfStockTakeBlocked": "Dieses Medikament ist leer. Die Einnahme kann nicht als eingenommen markiert werden.",
     "unsavedChanges": {
       "title": "Ungespeicherte Änderungen",
       "message": "Du hast ungespeicherte Änderungen. Möchtest du die Seite wirklich verlassen?",
@@ -551,6 +552,7 @@
     "button": "Teilen",
     "title": "Zeitplan teilen",
     "description": "Generiere einen geheimen Link, um den Medikamentenplan für eine bestimmte Person zu teilen. Jeder mit diesem Link kann den Zeitplan sehen. Wenn die Person eine Dosis als eingenommen markiert, wird sie auch in deiner App als eingenommen angezeigt.",
+    "allPeople": "Alle",
     "selectPerson": "Person auswählen",
     "selectPeriod": "Zeitraum auswählen",
     "generateLink": "Link generieren",
@@ -577,7 +579,7 @@
     }
   },
   "sharedOverview": {
-    "title": "Medikamentenübersicht für {{person}}",
+    "title": "Medikamente für {{person}}",
     "sharedBy": "Geteilt von {{user}}",
     "expiredOn": "Abgelaufen am: {{date}}",
     "noMedications": "Für diesen Teilen-Link sind keine Medikamente verfügbar.",
diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
index 8469418..003e1aa 100644
--- a/frontend/src/i18n/en.json
+++ b/frontend/src/i18n/en.json
@@ -364,8 +364,6 @@
       "highStockDays": "High (days)",
       "highStockTooltip": "Stock above this value means you are well supplied",
       "thresholdValidation": "Values must be: Critical < Low < High",
-      "shareStockStatus": "Show Stock on Shared Links",
-      "shareStockStatusDesc": "Show stock status (Normal/Low/Critical) and colored borders on shared schedule links for intake users",
       "packageTypesNote": "Note: Tube medications are excluded from stock reminders. Liquid container medications use a single reminder baseline (Low and Critical are automatically derived from this value)."
     },
     "timeline": {
@@ -377,6 +375,8 @@
       "swapDashboardSections": "Show Upcoming Schedules before Medication Overview",
       "swapDashboardSectionsDesc": "When enabled, the dashboard prioritizes the upcoming schedule section above the medication overview section.",
       "sharedSection": "Shared Schedule",
+      "shareMedicationOverview": "Show medication overview on shared links",
+      "shareMedicationOverviewDesc": "Embed the medication overview section on the normal shared page for intake users.",
       "shareScheduleTodayOnly": "Shared links show only today",
       "shareScheduleTodayOnlyDesc": "Hide past and future days on shared schedule links and show only today's entries."
     },
@@ -497,6 +497,7 @@
     "saveFailed": "Failed to save",
     "networkError": "Network error",
     "saving": "Saving...",
+    "outOfStockTakeBlocked": "This medication is empty. Intake cannot be marked as taken.",
     "unsavedChanges": {
       "title": "Unsaved Changes",
       "message": "You have unsaved changes. Are you sure you want to leave?",
@@ -551,6 +552,7 @@
     "button": "Share",
     "title": "Share Schedule",
     "description": "Generate a secret link to share the medication schedule for a specific person. Anyone with this link can view the schedule. When the person marks a dose as taken, it will also be marked as taken in your app.",
+    "allPeople": "Everyone",
     "selectPerson": "Select person",
     "selectPeriod": "Select time period",
     "generateLink": "Generate Link",
@@ -577,7 +579,7 @@
     }
   },
   "sharedOverview": {
-    "title": "Medication Overview for {{person}}",
+    "title": "Medication for {{person}}",
     "sharedBy": "Shared by {{user}}",
     "expiredOn": "Expired on: {{date}}",
     "noMedications": "No medications available for this share link.",
diff --git a/frontend/src/pages/SettingsPage.tsx b/frontend/src/pages/SettingsPage.tsx
index 4f2b652..22d7662 100644
--- a/frontend/src/pages/SettingsPage.tsx
+++ b/frontend/src/pages/SettingsPage.tsx
@@ -870,18 +870,21 @@ export function SettingsPage() {
 							<div className="section-header">
 								<h3>{t("settings.timeline.sharedSection")}</h3>
 							</div>
-							<div className="setting-row compact">
+							<div className="setting-row compact" style={{ marginTop: "10px" }}>
 								<div className="setting-label">
-									<span>{t("settings.stock.shareStockStatus")}</span>
-									<span className="info-tooltip small" data-tooltip={t("settings.stock.shareStockStatusDesc")}>
+									<span>{t("settings.timeline.shareMedicationOverview")}</span>
+									<span
+										className="info-tooltip small"
+										data-tooltip={t("settings.timeline.shareMedicationOverviewDesc")}
+									>
 										ⓘ
 									</span>
 								</div>
 								<label className="toggle-switch small">
 									<input
 										type="checkbox"
-										checked={settings.shareStockStatus}
-										onChange={(e) => setSettings({ ...settings, shareStockStatus: e.target.checked })}
+										checked={settings.shareMedicationOverview}
+										onChange={(e) => setSettings({ ...settings, shareMedicationOverview: e.target.checked })}
 									/>
 									<span className="toggle-slider"></span>
 								</label>
diff --git a/frontend/src/pages/SharedOverviewPage.tsx b/frontend/src/pages/SharedOverviewPage.tsx
index 2b1e2ac..e3da3e5 100644
--- a/frontend/src/pages/SharedOverviewPage.tsx
+++ b/frontend/src/pages/SharedOverviewPage.tsx
@@ -1,356 +1,11 @@
-import { useEffect, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useParams } from "react-router-dom";
-import { MedicationAvatar } from "../components";
-import type { SharedMedicationOverviewItem, SharedMedicationOverviewResponse } from "../types";
-import { getSystemLocale } from "../utils/formatters";
-
-type ThemePreference = "light" | "dark" | "system";
-
-function getSystemTheme(): "light" | "dark" {
-	if (typeof window !== "undefined" && window.matchMedia?.("(prefers-color-scheme: light)").matches) {
-		return "light";
-	}
-	return "dark";
-}
-
-function formatPackageInfo(medication: SharedMedicationOverviewItem): string {
-	if (medication.packageType === "blister") {
-		return `${medication.packCount} x ${medication.blistersPerPack} x ${medication.pillsPerBlister}`;
-	}
-
-	if (medication.totalPills !== null) {
-		return `${medication.packCount} x ${medication.totalPills}`;
-	}
-
-	return `${medication.packCount}`;
-}
-
-function formatDate(dateValue: string | null, locale: string): string {
-	if (!dateValue) return "-";
-	const parsed = new Date(`${dateValue}T00:00:00`);
-	if (Number.isNaN(parsed.getTime())) return dateValue;
-	return parsed.toLocaleDateString(locale);
-}
+import { Navigate, useParams } from "react-router-dom";
 
 export function SharedOverviewPage() {
 	const { token } = useParams<{ token: string }>();
-	const { t, i18n } = useTranslation();
 
-	const [data, setData] = useState<SharedMedicationOverviewResponse | null>(null);
-	const [loading, setLoading] = useState(true);
-	const [error, setError] = useState<string | null>(null);
-	const [expiredAt, setExpiredAt] = useState<string | null>(null);
-
-	const [themePreference, setThemePreference] = useState<ThemePreference>(() => {
-		if (typeof window !== "undefined") {
-			const stored = localStorage.getItem("theme") as ThemePreference | null;
-			if (stored === "light" || stored === "dark" || stored === "system") return stored;
-		}
-		return "dark";
-	});
-	const [themeMenuOpen, setThemeMenuOpen] = useState(false);
-	const themeMenuRef = useRef<HTMLDivElement>(null);
-	const resolvedTheme = themePreference === "system" ? getSystemTheme() : themePreference;
-
-	useEffect(() => {
-		document.documentElement.setAttribute("data-theme", resolvedTheme);
-		localStorage.setItem("theme", themePreference);
-	}, [themePreference, resolvedTheme]);
-
-	useEffect(() => {
-		if (themePreference !== "system") return;
-		const mq = window.matchMedia?.("(prefers-color-scheme: light)");
-		if (!mq) return;
-		const handler = () => {
-			const resolved = mq.matches ? "light" : "dark";
-			document.documentElement.setAttribute("data-theme", resolved);
-		};
-		mq.addEventListener("change", handler);
-		return () => mq.removeEventListener("change", handler);
-	}, [themePreference]);
-
-	useEffect(() => {
-		if (!themeMenuOpen) return;
-		const handleClickOutside = (event: MouseEvent) => {
-			if (themeMenuRef.current && !themeMenuRef.current.contains(event.target as Node)) {
-				setThemeMenuOpen(false);
-			}
-		};
-		document.addEventListener("click", handleClickOutside);
-		return () => document.removeEventListener("click", handleClickOutside);
-	}, [themeMenuOpen]);
-
-	useEffect(() => {
-		let isCancelled = false;
-
-		async function loadOverview() {
-			if (!token) {
-				if (!isCancelled) {
-					setLoading(false);
-					setError(t("sharedOverview.error.notFound"));
-				}
-				return;
-			}
-
-			setLoading(true);
-			setError(null);
-			setExpiredAt(null);
-
-			try {
-				const response = await fetch(`/api/share/${token}/overview`);
-				const responseData = await response.json().catch(() => ({}));
-
-				if (!response.ok) {
-					if (response.status === 404) {
-						throw new Error("not_found");
-					}
-					if (response.status === 410) {
-						setExpiredAt(responseData.expiredAt ?? null);
-						throw new Error("expired");
-					}
-					if (response.status === 429) {
-						throw new Error("rate_limited");
-					}
-					throw new Error("load_failed");
-				}
-
-				if (!isCancelled) {
-					setData(responseData as SharedMedicationOverviewResponse);
-				}
-			} catch (loadError) {
-				if (isCancelled) return;
-
-				const message = loadError instanceof Error ? loadError.message : "load_failed";
-				if (message === "not_found") {
-					setError(t("sharedOverview.error.notFound"));
-					return;
-				}
-				if (message === "expired") {
-					setError(t("sharedOverview.error.expired"));
-					return;
-				}
-				if (message === "rate_limited") {
-					setError(t("sharedOverview.error.rateLimit"));
-					return;
-				}
-
-				setError(t("sharedOverview.error.generic"));
-			} finally {
-				if (!isCancelled) {
-					setLoading(false);
-				}
-			}
-		}
-
-		void loadOverview();
-
-		return () => {
-			isCancelled = true;
-		};
-	}, [token, t]);
-
-	if (loading) {
-		return (
-			<div className="shared-schedule-page">
-				<div className="shared-schedule-loading shared-schedule-loading-skeleton" aria-busy="true">
-					<h1>💊 MedAssist-ng</h1>
-					<span className="screen-reader-only">{t("common.loading")}</span>
-					<div className="skeleton-card">
-						<span className="skeleton-line skeleton-line-long" />
-						<span className="skeleton-line skeleton-line-medium" />
-						<span className="skeleton-line skeleton-line-short" />
-					</div>
-				</div>
-			</div>
-		);
+	if (!token) {
+		return <Navigate to="/" replace />;
 	}
 
-	if (error || !data) {
-		return (
-			<div className="shared-schedule-page">
-				<div className={`shared-schedule-error${expiredAt ? " expired" : ""}`}>
-					<h1>💊 MedAssist-ng</h1>
-					{expiredAt ? <div className="expired-icon">⏰</div> : null}
-					<h2>{t("sharedOverview.title")}</h2>
-					<p className="error-message">{error ?? t("sharedOverview.error.generic")}</p>
-					{expiredAt ? (
-						<p className="expired-date">
-							{t("sharedOverview.expiredOn", {
-								date: new Date(expiredAt).toLocaleDateString(getSystemLocale(i18n.language)),
-							})}
-						</p>
-					) : null}
-				</div>
-			</div>
-		);
-	}
-
-	const locale = getSystemLocale(i18n.language);
-
-	return (
-		<div className="shared-schedule-page">
-			<div className="shared-schedule-container shared-overview-container">
-				<header className="shared-schedule-header">
-					<h1>{t("sharedOverview.title", { person: data.takenBy })}</h1>
-					<p className="shared-schedule-period">{t("sharedOverview.sharedBy", { user: data.sharedBy ?? "-" })}</p>
-					<div className="shared-schedule-header-actions">
-						<div className={`theme-menu ${themeMenuOpen ? "open" : ""}`} ref={themeMenuRef}>
-							<button className="icon-btn" onClick={() => setThemeMenuOpen(!themeMenuOpen)} title={t("theme.title")}>
-								{resolvedTheme === "dark" ? "🌙" : "☀️"}
-							</button>
-							<div className="theme-dropdown">
-								<button
-									className={`theme-dropdown-item${themePreference === "light" ? " active" : ""}`}
-									onClick={() => {
-										setThemePreference("light");
-										setThemeMenuOpen(false);
-									}}
-								>
-									{t("theme.light")}
-								</button>
-								<button
-									className={`theme-dropdown-item${themePreference === "dark" ? " active" : ""}`}
-									onClick={() => {
-										setThemePreference("dark");
-										setThemeMenuOpen(false);
-									}}
-								>
-									{t("theme.dark")}
-								</button>
-								<button
-									className={`theme-dropdown-item${themePreference === "system" ? " active" : ""}`}
-									onClick={() => {
-										setThemePreference("system");
-										setThemeMenuOpen(false);
-									}}
-								>
-									{t("theme.system")}
-								</button>
-							</div>
-						</div>
-					</div>
-				</header>
-
-				{data.medications.length === 0 ? (
-					<p className="shared-schedule-empty">{t("sharedOverview.noMedications")}</p>
-				) : (
-					<>
-						<div className="shared-overview-table-wrap">
-							<table className="shared-overview-table">
-								<thead>
-									<tr>
-										<th>{t("sharedOverview.columns.name")}</th>
-										<th>{t("sharedOverview.columns.package")}</th>
-										<th>{t("sharedOverview.columns.stock")}</th>
-										<th>{t("sharedOverview.columns.daysLeft")}</th>
-										<th>
-											<div className="date-pair-stack-header">
-												<span className="date-pair-label">{t("sharedOverview.columns.nextIntake")}</span>
-												<span className="date-pair-label">{t("sharedOverview.columns.depletion")}</span>
-											</div>
-										</th>
-										<th>{t("sharedOverview.columns.priority")}</th>
-									</tr>
-								</thead>
-								<tbody>
-									{data.medications.map((medication) => {
-										const priorityKey =
-											medication.priority === "high"
-												? "sharedOverview.priority.high"
-												: "sharedOverview.priority.normal";
-										return (
-											<tr key={`${medication.name}-${medication.medicationStartDate ?? "no-start"}`}>
-												<td>
-													<div className="shared-overview-medication-cell">
-														<MedicationAvatar name={medication.name} imageUrl={medication.imageUrl} size="sm" />
-														<div className="shared-overview-medication-text">
-															<strong>{medication.name}</strong>
-															{medication.genericName ? <span>{medication.genericName}</span> : null}
-														</div>
-													</div>
-												</td>
-												<td>{formatPackageInfo(medication)}</td>
-												<td>
-													{medication.currentStock === null || medication.capacity === null
-														? "-"
-														: t("sharedOverview.stock.of", {
-																current: medication.currentStock,
-																capacity: medication.capacity,
-															})}
-												</td>
-												<td>{medication.daysLeft === null ? "-" : medication.daysLeft}</td>
-												<td>
-													<div className="date-pair-stack">
-														<div className="date-pair-entry">
-															<span className="date-pair-label">{t("sharedOverview.columns.nextIntake")}</span>
-															<span className="date-pair-value">{formatDate(medication.nextIntakeDate, locale)}</span>
-														</div>
-														<div className="date-pair-entry">
-															<span className="date-pair-label">{t("sharedOverview.columns.depletion")}</span>
-															<span className="date-pair-value">{formatDate(medication.depletionDate, locale)}</span>
-														</div>
-													</div>
-												</td>
-												<td>
-													{medication.priority === null ? (
-														"-"
-													) : (
-														<span className={`shared-overview-priority ${medication.priority}`}>{t(priorityKey)}</span>
-													)}
-												</td>
-											</tr>
-										);
-									})}
-								</tbody>
-							</table>
-						</div>
-
-						<div className="shared-overview-cards">
-							{data.medications.map((medication) => {
-								const priorityKey =
-									medication.priority === "high" ? "sharedOverview.priority.high" : "sharedOverview.priority.normal";
-								return (
-									<article
-										className="shared-overview-card"
-										key={`${medication.name}-${medication.medicationStartDate ?? "no-start"}`}
-									>
-										<div className="shared-overview-card-title">
-											<MedicationAvatar name={medication.name} imageUrl={medication.imageUrl} size="sm" />
-											<div>
-												<strong>{medication.name}</strong>
-												{medication.genericName ? <p>{medication.genericName}</p> : null}
-											</div>
-										</div>
-										<div className="shared-overview-card-grid">
-											<span>{t("sharedOverview.columns.package")}</span>
-											<strong>{formatPackageInfo(medication)}</strong>
-											<span>{t("sharedOverview.columns.stock")}</span>
-											<strong>
-												{medication.currentStock === null || medication.capacity === null
-													? "-"
-													: t("sharedOverview.stock.of", {
-															current: medication.currentStock,
-															capacity: medication.capacity,
-														})}
-											</strong>
-											<span>{t("sharedOverview.columns.daysLeft")}</span>
-											<strong>{medication.daysLeft === null ? "-" : medication.daysLeft}</strong>
-											<span>{t("sharedOverview.columns.nextIntake")}</span>
-											<strong>{formatDate(medication.nextIntakeDate, locale)}</strong>
-											<span>{t("sharedOverview.columns.depletion")}</span>
-											<strong>{formatDate(medication.depletionDate, locale)}</strong>
-										</div>
-										{medication.priority ? (
-											<span className={`shared-overview-priority ${medication.priority}`}>{t(priorityKey)}</span>
-										) : null}
-									</article>
-								);
-							})}
-						</div>
-					</>
-				)}
-			</div>
-		</div>
-	);
+	return <Navigate to={`/share/${token}`} replace />;
 }
diff --git a/frontend/src/styles/schedule-mobile-edit.css b/frontend/src/styles/schedule-mobile-edit.css
index 7f4bd01..915f03a 100644
--- a/frontend/src/styles/schedule-mobile-edit.css
+++ b/frontend/src/styles/schedule-mobile-edit.css
@@ -40,6 +40,12 @@
 	margin-bottom: 1rem;
 }
 
+.shared-overview-section-header h2 {
+	margin: 0;
+	font-size: 1.1rem;
+	font-weight: 700;
+}
+
 .shared-schedule-error.expired h2 {
 	font-size: 1.5rem;
 	color: var(--warning);
@@ -94,6 +100,12 @@
 	font-size: 1rem;
 }
 
+.shared-schedule-section {
+	display: flex;
+	flex-direction: column;
+	gap: 0.9rem;
+}
+
 .shared-timeline {
 	background: var(--bg-secondary);
 	border-radius: 12px;
@@ -143,6 +155,19 @@
 	max-width: 1080px;
 }
 
+.shared-overview-inline-section {
+	display: flex;
+	flex-direction: column;
+	gap: 0.9rem;
+	margin-bottom: 1.5rem;
+}
+
+.shared-overview-section-header {
+	display: flex;
+	flex-direction: column;
+	gap: 0.2rem;
+}
+
 .shared-overview-table-wrap {
 	overflow-x: auto;
 	border: 1px solid var(--border-primary);
@@ -153,7 +178,7 @@
 .shared-overview-table {
 	width: 100%;
 	border-collapse: collapse;
-	min-width: 780px;
+	min-width: 600px;
 }
 
 .shared-overview-table th,
@@ -187,6 +212,15 @@
 .shared-overview-medication-text {
 	display: flex;
 	flex-direction: column;
+	align-items: flex-start;
+	gap: 0.15rem;
+	min-width: 0;
+}
+
+.shared-overview-med-name {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
 	gap: 0.15rem;
 	min-width: 0;
 }
@@ -196,20 +230,28 @@
 	word-break: break-word;
 }
 
-.shared-overview-medication-text span {
+.shared-overview-medication-text .shared-overview-med-generic {
 	font-size: 0.8rem;
 	color: var(--text-secondary);
 	word-break: break-word;
 }
 
+.shared-overview-stock-value,
+.shared-overview-date-value {
+	white-space: nowrap;
+}
+
 .shared-overview-priority {
 	display: inline-flex;
 	align-items: center;
+	align-self: flex-start;
 	padding: 0.2rem 0.5rem;
 	border-radius: 999px;
 	font-size: 0.8rem;
 	font-weight: 600;
 	border: 1px solid transparent;
+	width: fit-content;
+	max-width: 100%;
 }
 
 .shared-overview-priority.normal {
@@ -224,6 +266,18 @@
 	border-color: rgba(239, 68, 68, 0.25);
 }
 
+.shared-overview-priority.warning {
+	color: var(--warning);
+	background: color-mix(in srgb, var(--warning) 12%, transparent);
+	border-color: color-mix(in srgb, var(--warning) 30%, transparent);
+}
+
+.shared-overview-priority.danger {
+	color: var(--danger);
+	background: var(--danger-bg);
+	border-color: rgba(239, 68, 68, 0.25);
+}
+
 .shared-overview-cards {
 	display: none;
 	gap: 0.75rem;
@@ -268,11 +322,6 @@
 	word-break: break-word;
 }
 
-.shared-overview-table .date-pair-stack-header,
-.shared-overview-table .date-pair-stack {
-	min-width: 150px;
-}
-
 @media (max-width: 600px) {
 	.shared-schedule-page {
 		padding: 1rem;
@@ -489,10 +538,6 @@
 	width: 100%;
 }
 
-.mobile-edit-form .date-input-display {
-	font-size: 16px !important;
-}
-
 .mobile-edit-form .blister-row {
 	display: grid;
 	grid-template-columns: 1fr 1fr;
@@ -520,17 +565,12 @@
 	grid-column: 1 / -1;
 }
 
-.mobile-edit-form .blister-row label.compact.time-label {
-	width: fit-content;
-}
-
-.mobile-edit-form .blister-row label.compact.time-label input[type="time"] {
-	width: auto;
-}
-
-.mobile-edit-form .blister-row .remove-blister-btn {
-	grid-column: 2 / 3;
-	justify-self: end;
+.blister-inputs .remind-toggle-row {
+	display: flex;
+	align-items: center;
+	gap: 0.5rem;
+	align-self: end;
+	padding-bottom: 0.5rem;
 }
 
 .mobile-edit-form .blister-row .remind-toggle-row {
@@ -540,14 +580,6 @@
 	grid-column: 1 / 2;
 }
 
-.blister-inputs .remind-toggle-row {
-	display: flex;
-	align-items: center;
-	gap: 0.5rem;
-	align-self: end;
-	padding-bottom: 0.5rem;
-}
-
 .mobile-edit-form .blister-row .datetime-inputs {
 	display: flex;
 	gap: 0.5rem;
@@ -563,6 +595,14 @@
 	min-width: 0;
 }
 
+.mobile-edit-form .blister-row label.compact.time-label {
+	width: fit-content;
+}
+
+.mobile-edit-form .blister-row label.compact.time-label input[type="time"] {
+	width: auto;
+}
+
 /* Remove blister button */
 .remove-blister-btn {
 	padding: 0.4rem !important;
@@ -579,6 +619,11 @@
 	opacity: 1;
 }
 
+.mobile-edit-form .blister-row .remove-blister-btn {
+	grid-column: 2 / 3;
+	justify-self: end;
+}
+
 .mobile-edit-form .add-blister {
 	margin-top: 0.5rem;
 	width: auto;
@@ -653,6 +698,10 @@
 	z-index: 1;
 }
 
+.mobile-edit-form .date-input-display {
+	font-size: 16px !important;
+}
+
 .date-input-native {
 	color: transparent !important;
 	caret-color: transparent !important;
diff --git a/frontend/src/test/components/ShareDialog.test.tsx b/frontend/src/test/components/ShareDialog.test.tsx
index dae7601..a7407fb 100644
--- a/frontend/src/test/components/ShareDialog.test.tsx
+++ b/frontend/src/test/components/ShareDialog.test.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { ShareDialog } from "../../components/ShareDialog";
 
@@ -45,6 +45,12 @@ describe("ShareDialog", () => {
 		expect(screen.getByRole("option", { name: "Bob" })).toBeInTheDocument();
 	});
 
+	it("renders the translated all-people option label", () => {
+		render(<ShareDialog {...defaultProps} sharePeople={["all", "Alice"]} shareSelectedPerson="all" />);
+		expect(screen.getByRole("option", { name: "share.allPeople" })).toBeInTheDocument();
+		expect(screen.getByRole("option", { name: "Alice" })).toBeInTheDocument();
+	});
+
 	it("renders period selection dropdown", () => {
 		render(<ShareDialog {...defaultProps} />);
 		// The dropdown renders with 3 options for time periods
@@ -70,7 +76,7 @@ describe("ShareDialog", () => {
 		render(<ShareDialog {...defaultProps} shareLink="http://example.com/share/abc123" />);
 		const inputs = screen.getAllByRole("textbox") as HTMLInputElement[];
 		expect(inputs[0]).toHaveValue("http://example.com/share/abc123");
-		expect(inputs[1]).toHaveValue("http://example.com/share/abc123/overview");
+		expect(inputs).toHaveLength(1);
 	});
 
 	it("calls onCopyShareLink when copy button is clicked", () => {
@@ -93,16 +99,6 @@ describe("ShareDialog", () => {
 		expect(selectMock).toHaveBeenCalled();
 	});
 
-	it("copies overview link when overview copy button is clicked", async () => {
-		render(<ShareDialog {...defaultProps} shareLink="http://example.com/share/abc123" />);
-
-		fireEvent.click(screen.getByRole("button", { name: /share\.copyOverviewLink/i }));
-
-		await waitFor(() => {
-			expect(navigator.clipboard.writeText).toHaveBeenCalledWith("http://example.com/share/abc123/overview");
-		});
-	});
-
 	it("calls person and period change callbacks", () => {
 		render(<ShareDialog {...defaultProps} />);
 
diff --git a/frontend/src/test/components/SharedSchedule.test.tsx b/frontend/src/test/components/SharedSchedule.test.tsx
index bb73bc8..3881349 100644
--- a/frontend/src/test/components/SharedSchedule.test.tsx
+++ b/frontend/src/test/components/SharedSchedule.test.tsx
@@ -23,6 +23,74 @@ function createSharedData() {
 	};
 }
 
+function createSharedDataWithEmbeddedOverview() {
+	return {
+		...createSharedData(),
+		takenBy: "all",
+		shareMedicationOverview: true,
+		medicationOverview: [
+			{
+				name: "Aspirin",
+				genericName: "Acetylsalicylic Acid",
+				imageUrl: null,
+				packageType: "blister",
+				packCount: 1,
+				blistersPerPack: 2,
+				pillsPerBlister: 10,
+				totalPills: null,
+				looseTablets: 0,
+				currentStock: 8,
+				capacity: 20,
+				daysLeft: 8,
+				nextIntakeDate: null,
+				depletionDate: "2026-01-20",
+				priority: "high",
+				expiryDate: null,
+				medicationStartDate: null,
+				prescriptionEnabled: false,
+				prescriptionRemainingRefills: null,
+			},
+		],
+	};
+}
+
+function createSharedDataWithTodayDose() {
+	const now = new Date();
+	now.setHours(10, 0, 0, 0);
+	const dateOnlyMs = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
+
+	return {
+		sharedBy: "Owner",
+		takenBy: "Max",
+		scheduleDays: 30,
+		automaticDoseId: `1-0-${dateOnlyMs}`,
+		shareStockStatus: true,
+		medications: [
+			{
+				id: 1,
+				name: "Ibuprofen",
+				genericName: null,
+				takenBy: [],
+				packageType: "blister",
+				packCount: 2,
+				blistersPerPack: 1,
+				pillsPerBlister: 10,
+				looseTablets: 0,
+				pillWeightMg: null,
+				doseUnit: "mg",
+				expiryDate: null,
+				notes: null,
+				intakeRemindersEnabled: false,
+				blisters: [{ usage: 1, every: 1, start: now.toISOString() }],
+				intakes: [{ usage: 1, every: 1, start: now.toISOString(), takenBy: null, intakeRemindersEnabled: false }],
+				updatedAt: null,
+				dismissedUntil: null,
+				lastStockCorrectionAt: null,
+			},
+		],
+	};
+}
+
 describe("SharedSchedule", () => {
 	beforeEach(() => {
 		vi.clearAllMocks();
@@ -117,4 +185,54 @@ describe("SharedSchedule", () => {
 			expect(screen.getByText("share.error")).toBeInTheDocument();
 		});
 	});
+
+	it("shows the robot marker for automatically taken shared doses", async () => {
+		const sharedData = createSharedDataWithTodayDose();
+
+		(globalThis.fetch as ReturnType<typeof vi.fn>).mockImplementation((url: string, init?: RequestInit) => {
+			if (url === "/api/share/token-123/doses" && (!init || !init.method || init.method === "GET")) {
+				return Promise.resolve({
+					ok: true,
+					json: () =>
+						Promise.resolve({
+							doses: [{ doseId: sharedData.automaticDoseId, dismissed: false, takenSource: "automatic" }],
+						}),
+				});
+			}
+			if (url === "/api/share/token-123") {
+				return Promise.resolve({ ok: true, json: () => Promise.resolve(sharedData) });
+			}
+			return Promise.reject(new Error(`Unexpected URL: ${url}`));
+		});
+
+		renderSharedSchedule("/share/token-123");
+
+		await waitFor(() => {
+			expect(screen.getByText("🤖")).toBeInTheDocument();
+		});
+	});
+
+	it("renders the embedded medication overview on the shared page when enabled", async () => {
+		const sharedData = createSharedDataWithEmbeddedOverview();
+
+		(globalThis.fetch as ReturnType<typeof vi.fn>).mockImplementation((url: string, init?: RequestInit) => {
+			if (url === "/api/share/token-123/doses" && (!init || !init.method || init.method === "GET")) {
+				return Promise.resolve({ ok: true, json: () => Promise.resolve({ doses: [] }) });
+			}
+			if (url === "/api/share/token-123") {
+				return Promise.resolve({ ok: true, json: () => Promise.resolve(sharedData) });
+			}
+			return Promise.reject(new Error(`Unexpected URL: ${url}`));
+		});
+
+		renderSharedSchedule("/share/token-123");
+
+		await waitFor(() => {
+			expect(screen.getAllByText("Aspirin").length).toBeGreaterThan(0);
+			expect(screen.getAllByText("Acetylsalicylic Acid").length).toBeGreaterThan(0);
+		});
+
+		expect(screen.getByText("sharedOverview.columns.priority")).toBeInTheDocument();
+		expect(screen.getByText("share.noSchedule")).toBeInTheDocument();
+	});
 });
diff --git a/frontend/src/test/components/SharedScheduleTodayOnly.test.tsx b/frontend/src/test/components/SharedScheduleTodayOnly.test.tsx
index 4d516b7..ca3abfb 100644
--- a/frontend/src/test/components/SharedScheduleTodayOnly.test.tsx
+++ b/frontend/src/test/components/SharedScheduleTodayOnly.test.tsx
@@ -23,6 +23,7 @@ function createSharedData(overrides: Record<string, unknown> = {}) {
 		takenBy: "Max",
 		scheduleDays: 30,
 		shareStockStatus: true,
+		upcomingTodayOnly: false,
 		shareScheduleTodayOnly: true,
 		stockCalculationMode: "automatic",
 		stockThresholds: {
@@ -73,7 +74,7 @@ describe("SharedSchedule today-only", () => {
 		vi.restoreAllMocks();
 	});
 
-	it("hides past and future sections when shareScheduleTodayOnly is enabled", async () => {
+	it("hides past and future sections when shareScheduleTodayOnly is enabled even if dashboard today-only is off", async () => {
 		const sharedData = createSharedData();
 
 		(globalThis.fetch as ReturnType<typeof vi.fn>).mockImplementation((url: string, init?: RequestInit) => {
diff --git a/frontend/src/test/hooks/useSettings.test.ts b/frontend/src/test/hooks/useSettings.test.ts
index e9d88a4..3783d2e 100644
--- a/frontend/src/test/hooks/useSettings.test.ts
+++ b/frontend/src/test/hooks/useSettings.test.ts
@@ -17,13 +17,17 @@ describe("useSettings", () => {
 		vi.restoreAllMocks();
 	});
 
-	it("initializes with default settings", () => {
+	it("initializes with default settings", async () => {
 		const { result } = renderHook(() => useSettings());
 
 		expect(result.current.settings.emailEnabled).toBe(false);
 		expect(result.current.settings.lowStockDays).toBe(30);
 		expect(result.current.settings.reminderDaysBefore).toBe(7);
 		expect(result.current.settingsLoading).toBe(true);
+
+		await waitFor(() => {
+			expect(result.current.settingsLoading).toBe(false);
+		});
 	});
 
 	it("loads settings from API on mount", async () => {
@@ -137,6 +141,50 @@ describe("useSettings", () => {
 		expect(result.current.settingsSaved).toBe(true);
 	});
 
+	it("flushes unsaved settings on pagehide with keepalive including shareMedicationOverview", async () => {
+		const fetchMock = global.fetch as ReturnType<typeof vi.fn>;
+		fetchMock.mockResolvedValueOnce({
+			ok: true,
+			json: () => Promise.resolve({ shareMedicationOverview: false }),
+		});
+
+		const { result } = renderHook(() => useSettings());
+
+		await waitFor(() => {
+			expect(result.current.settingsLoading).toBe(false);
+		});
+
+		vi.useFakeTimers();
+
+		act(() => {
+			result.current.setSettings((settings) => ({
+				...settings,
+				shareMedicationOverview: true,
+			}));
+		});
+
+		act(() => {
+			window.dispatchEvent(new Event("pagehide"));
+		});
+
+		const keepaliveCall = fetchMock.mock.calls.find(
+			([url, init]) => url === "/api/settings" && (init as RequestInit | undefined)?.keepalive === true
+		);
+
+		expect(keepaliveCall).toBeDefined();
+		expect(keepaliveCall?.[1]).toEqual(
+			expect.objectContaining({
+				method: "PUT",
+				keepalive: true,
+			})
+		);
+
+		const payload = JSON.parse(((keepaliveCall?.[1] as RequestInit).body as string) ?? "{}");
+		expect(payload.shareMedicationOverview).toBe(true);
+
+		vi.useRealTimers();
+	});
+
 	it("keeps email channel enabled when recipient is non-empty", async () => {
 		(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
 			ok: true,
diff --git a/frontend/src/test/hooks/useShare.test.ts b/frontend/src/test/hooks/useShare.test.ts
index 48c99a2..bbf2b77 100644
--- a/frontend/src/test/hooks/useShare.test.ts
+++ b/frontend/src/test/hooks/useShare.test.ts
@@ -86,7 +86,7 @@ describe("useShare", () => {
 		});
 
 		expect(result.current.showShareDialog).toBe(true);
-		expect(result.current.sharePeople).toEqual(["Alice", "Bob", "Charlie"]);
+		expect(result.current.sharePeople).toEqual(["all", "Alice", "Bob", "Charlie"]);
 		expect(result.current.shareSelectedPerson).toBe("Alice");
 		expect(window.history.pushState).toHaveBeenCalled();
 	});
diff --git a/frontend/src/test/pages/SettingsPage.test.tsx b/frontend/src/test/pages/SettingsPage.test.tsx
index b5fa724..07d5df8 100644
--- a/frontend/src/test/pages/SettingsPage.test.tsx
+++ b/frontend/src/test/pages/SettingsPage.test.tsx
@@ -200,46 +200,30 @@ describe("SettingsPage", () => {
 
 		const swapRow = screen.getByText("settings.timeline.swapDashboardSections").closest(".setting-row");
 		const upcomingRow = screen.getByText("settings.timeline.upcomingTodayOnly").closest(".setting-row");
+		const overviewRow = screen.getByText("settings.timeline.shareMedicationOverview").closest(".setting-row");
 		const sharedRow = screen.getByText("settings.timeline.shareScheduleTodayOnly").closest(".setting-row");
 
 		const swapToggle = swapRow?.querySelector('input[type="checkbox"]') as HTMLInputElement;
 		const upcomingToggle = upcomingRow?.querySelector('input[type="checkbox"]') as HTMLInputElement;
+		const overviewToggle = overviewRow?.querySelector('input[type="checkbox"]') as HTMLInputElement;
 		const sharedToggle = sharedRow?.querySelector('input[type="checkbox"]') as HTMLInputElement;
 
 		expect(swapToggle).toBeInTheDocument();
 		expect(upcomingToggle).toBeInTheDocument();
+		expect(overviewToggle).toBeInTheDocument();
 		expect(sharedToggle).toBeInTheDocument();
 
 		fireEvent.click(swapToggle);
 		fireEvent.click(upcomingToggle);
+		fireEvent.click(overviewToggle);
 		fireEvent.click(sharedToggle);
 
 		expect(setSettings).toHaveBeenCalledWith(expect.objectContaining({ swapDashboardMainSections: true }));
 		expect(setSettings).toHaveBeenCalledWith(expect.objectContaining({ upcomingTodayOnly: true }));
+		expect(setSettings).toHaveBeenCalledWith(expect.objectContaining({ shareMedicationOverview: true }));
 		expect(setSettings).toHaveBeenCalledWith(expect.objectContaining({ shareScheduleTodayOnly: true }));
 	});
 
-	it("updates share stock status toggle through setSettings", () => {
-		const setSettings = vi.fn();
-		mockContextValue = createMockContext({
-			setSettings,
-			settings: {
-				...createMockContext().settings,
-				shareStockStatus: false,
-			},
-		});
-
-		renderPage();
-
-		const shareStockRow = screen.getByText("settings.stock.shareStockStatus").closest(".setting-row");
-		const shareStockToggle = shareStockRow?.querySelector('input[type="checkbox"]') as HTMLInputElement;
-		expect(shareStockToggle).toBeInTheDocument();
-
-		fireEvent.click(shareStockToggle);
-
-		expect(setSettings).toHaveBeenCalledWith(expect.objectContaining({ shareStockStatus: true }));
-	});
-
 	it("opens export modal when export action is clicked", () => {
 		const setShowExportModal = vi.fn();
 		mockContextValue = createMockContext({ setShowExportModal });
diff --git a/frontend/src/test/pages/SharedOverviewPage.test.tsx b/frontend/src/test/pages/SharedOverviewPage.test.tsx
index e609910..cdc5a76 100644
--- a/frontend/src/test/pages/SharedOverviewPage.test.tsx
+++ b/frontend/src/test/pages/SharedOverviewPage.test.tsx
@@ -10,6 +10,7 @@ function renderSharedOverview(path: string) {
 		<MemoryRouter initialEntries={[path]}>
 			<Routes>
 				<Route path="/share/:token/overview" element={<SharedOverviewPage />} />
+				<Route path="/share/:token" element={<div>shared schedule target</div>} />
 			</Routes>
 		</MemoryRouter>
 	);
@@ -21,66 +22,13 @@ describe("SharedOverviewPage", () => {
 		window.localStorage.clear();
 	});
 
-	it("renders medication overview for valid token", async () => {
-		(globalThis.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
-			ok: true,
-			status: 200,
-			json: () =>
-				Promise.resolve({
-					takenBy: "Max",
-					sharedBy: "Owner",
-					generatedAt: "2026-03-06T10:00:00.000Z",
-					medications: [
-						{
-							name: "Aspirin",
-							genericName: "Acetylsalicylic Acid",
-							imageUrl: null,
-							packageType: "blister",
-							packCount: 1,
-							blistersPerPack: 2,
-							pillsPerBlister: 10,
-							totalPills: null,
-							looseTablets: 0,
-							currentStock: 18,
-							capacity: 20,
-							daysLeft: 18,
-							nextIntakeDate: "2026-03-07",
-							depletionDate: "2026-03-24",
-							priority: "normal",
-							expiryDate: null,
-							medicationStartDate: null,
-							prescriptionEnabled: false,
-							prescriptionRemainingRefills: null,
-						},
-					],
-				}),
-		});
-
+	it("redirects the legacy overview route to the normal shared schedule route", async () => {
 		renderSharedOverview("/share/abcdef0123456789/overview");
 
 		await waitFor(() => {
-			expect(screen.getByText("sharedOverview.title")).toBeInTheDocument();
-			expect(screen.getAllByText("Aspirin").length).toBeGreaterThan(0);
-			expect(screen.getAllByText("Acetylsalicylic Acid").length).toBeGreaterThan(0);
+			expect(screen.getByText("shared schedule target")).toBeInTheDocument();
 		});
-
-		const headerPair = document.querySelector(".shared-overview-table .date-pair-stack-header");
-		expect(headerPair).toBeInTheDocument();
-		expect(headerPair).toHaveTextContent("sharedOverview.columns.nextIntake");
-		expect(headerPair).toHaveTextContent("sharedOverview.columns.depletion");
-
-		const rowPair = document.querySelector(".shared-overview-table .date-pair-stack");
-		expect(rowPair).toBeInTheDocument();
-
-		const rowEntries = Array.from(rowPair?.querySelectorAll(".date-pair-entry") ?? []);
-		expect(rowEntries).toHaveLength(2);
-		expect(rowEntries[0]).toHaveTextContent("sharedOverview.columns.nextIntake");
-		expect(rowEntries[1]).toHaveTextContent("sharedOverview.columns.depletion");
-		expect(screen.getAllByText("sharedOverview.columns.daysLeft")).toHaveLength(2);
-		expect(screen.getByText("sharedOverview.columns.priority")).toBeInTheDocument();
-		expect(screen.getAllByText("sharedOverview.priority.normal")).toHaveLength(2);
-
-		expect(globalThis.fetch).toHaveBeenCalledWith("/api/share/abcdef0123456789/overview");
+		expect(globalThis.fetch).not.toHaveBeenCalled();
 	});
 
 	it("keeps the updated shared overview stock wording in English and German", () => {
@@ -95,46 +43,12 @@ describe("SharedOverviewPage", () => {
 		expect(de.sharedOverview.priority.high).toBe("Niedriger Bestand");
 	});
 
-	it("renders not found state for missing token", async () => {
-		(globalThis.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
-			ok: false,
-			status: 404,
-			json: () => Promise.resolve({ error: "not_found" }),
-		});
-
+	it("redirects even when the token would previously have been loaded from the overview route", async () => {
 		renderSharedOverview("/share/abcdef0123456789/overview");
 
 		await waitFor(() => {
-			expect(screen.getByText("sharedOverview.error.notFound")).toBeInTheDocument();
-		});
-	});
-
-	it("renders expired state for expired token", async () => {
-		(globalThis.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
-			ok: false,
-			status: 410,
-			json: () => Promise.resolve({ error: "expired", expiredAt: "2026-03-01T10:00:00.000Z" }),
-		});
-
-		renderSharedOverview("/share/abcdef0123456789/overview");
-
-		await waitFor(() => {
-			expect(screen.getByText("sharedOverview.error.expired")).toBeInTheDocument();
-			expect(screen.getByText("sharedOverview.expiredOn")).toBeInTheDocument();
-		});
-	});
-
-	it("renders rate-limit error state", async () => {
-		(globalThis.fetch as ReturnType<typeof vi.fn>).mockResolvedValue({
-			ok: false,
-			status: 429,
-			json: () => Promise.resolve({ error: "rate_limited" }),
-		});
-
-		renderSharedOverview("/share/abcdef0123456789/overview");
-
-		await waitFor(() => {
-			expect(screen.getByText("sharedOverview.error.rateLimit")).toBeInTheDocument();
+			expect(screen.getByText("shared schedule target")).toBeInTheDocument();
 		});
+		expect(globalThis.fetch).not.toHaveBeenCalled();
 	});
 });
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 6534fd3..892e7dc 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -254,6 +254,8 @@ export type SharedScheduleData = {
 	};
 	stockCalculationMode?: "automatic" | "manual";
 	shareStockStatus?: boolean;
+	shareMedicationOverview?: boolean;
+	medicationOverview?: SharedMedicationOverviewItem[] | null;
 	upcomingTodayOnly?: boolean;
 	shareScheduleTodayOnly?: boolean;
 };
@@ -279,7 +281,7 @@ export type SharedMedicationOverviewItem = {
 	daysLeft: number | null;
 	nextIntakeDate: string | null;
 	depletionDate: string | null;
-	priority: "normal" | "high" | null;
+	priority: "normal" | "high" | "out-of-stock" | null;
 	expiryDate: string | null;
 	medicationStartDate: string | null;
 	prescriptionEnabled: boolean;