Merge pull request #82: refactor: make session join leave platform-neutral

Convert join/leave interaction commands to PlatformUser, PlatformGroup, and PlatformMessageRef. Persist and look up participants by platform identity while keeping Telegram callbacks intact. Add V017 migration and TDD coverage. Bump version to 2.1.1.

.env.example

@@ -15,3 +15,10 @@ POSTGRES_PASSWORD=StrongPasswordForDatabase
 
 # Локальный порт веб-интерфейса GM-Relay
 GMRELAY_WEB_PORT=8080
+
+# === Backup ===
+# Сколько дней хранить дампы PostgreSQL (default: 7)
+BACKUP_RETENTION_DAYS=7
+
+# Имя Docker volume для резервных копий БД
+BACKUP_VOLUME_NAME=game_pgbackups

.gitea/workflows/deploy.yml

@@ -6,7 +6,7 @@ on:
       - main 
 
 env:
-  VERSION: 1.10.4
+  VERSION: 2.1.1
 
 jobs:
   # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
@@ -51,9 +51,34 @@ jobs:
           docker push git.codeanddice.ru/toutsu/gmrelay-web:latest
           docker push git.codeanddice.ru/toutsu/gmrelay-web:${{ env.VERSION }}
 
+  # ЧАСТЬ 1.5: Сканируем собранные образы на уязвимости
+  scan-images:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Trivy
+        run: |
+          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin
+
+      - name: Scan Bot image
+        run: |
+          trivy image \
+            --severity HIGH,CRITICAL \
+            --exit-code 1 \
+            --format table \
+            git.codeanddice.ru/toutsu/gmrelay-bot:${{ env.VERSION }}
+
+      - name: Scan Web image
+        run: |
+          trivy image \
+            --severity HIGH,CRITICAL \
+            --exit-code 1 \
+            --format table \
+            git.codeanddice.ru/toutsu/gmrelay-web:${{ env.VERSION }}
+
   # ЧАСТЬ 2: Запускаем эти образы на самом сервере
   deploy:
-    needs: build-and-push
+    needs: scan-images
     runs-on: ubuntu-latest # Тот же локальный раннер
     steps:
       - name: Checkout repository

.gitea/workflows/pr-checks.yml

@@ -20,14 +20,59 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore
 
+      - name: Verify Trivy dependency scan inputs
+        run: |
+          lock_count="$(find . -name packages.lock.json -not -path "*/bin/*" -not -path "*/obj/*" | tee trivy-targets.txt | wc -l)"
+          echo "Trivy NuGet lock files: ${lock_count}"
+          if [ "${lock_count}" -eq 0 ]; then
+            echo "::error::No packages.lock.json files found. Trivy would scan 0 NuGet dependency files."
+            exit 1
+          fi
+
+      # ── Linting ──
+
+      - name: Lint C# code style
+        run: dotnet format --verify-no-changes --verbosity diagnostic
+
+      # ── Security ──
+
+      - name: Check NuGet packages for vulnerabilities
+        run: |
+          dotnet list package --vulnerable --include-transitive 2>&1 | tee nuget-audit.txt
+          if grep -qi "has the following vulnerable packages" nuget-audit.txt; then
+            echo "::error::Vulnerable NuGet packages found!"
+            exit 1
+          fi
+          echo "No vulnerable packages detected."
+
+      - name: Install Trivy
+        run: |
+          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin
+          trivy --version
+
+      - name: Trivy filesystem security scan
+        run: |
+          set +e
+          trivy fs --scanners vuln,misconfig,secret --exit-code 1 --severity HIGH,CRITICAL . 2>&1 | tee trivy-scan.log
+          trivy_exit="${PIPESTATUS[0]}"
+          if ! grep -Eq "Number of language-specific files[[:space:]]+num=[1-9][0-9]*" trivy-scan.log; then
+            echo "::error::Trivy did not detect any language-specific dependency files."
+            exit 1
+          fi
+          exit "${trivy_exit}"
+
+      # ── Build (includes SAST via SecurityCodeScan Roslyn analyzer) ──
+
       - name: Build Shared
         run: dotnet build src/GmRelay.Shared/GmRelay.Shared.csproj --no-restore
 
-      - name: Build Bot (compile check)
+      - name: Build Bot (compile check, includes SAST)
         run: dotnet build src/GmRelay.Bot/GmRelay.Bot.csproj --no-restore
 
-      - name: Build Web (compile check)
+      - name: Build Web (compile check, includes SAST)
         run: dotnet build src/GmRelay.Web/GmRelay.Web.csproj --no-restore
 
+      # ── Tests ──
+
       - name: Run tests
-        run: dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --verbosity normal
+        run: dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --verbosity normal

.hermes/plans/gmrelay-issue-15.md

@@ -1,343 +0,0 @@
-# Issue #15: Session Audit Log Implementation Plan
-
-> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task.
-
-**Goal:** Add transparent audit history for every session change, visible to GM in Web Dashboard.
-
-**Architecture:** PostgreSQL audit table + Dapper queries. Automatic logging inside mutating SessionService methods. New Razor page for GM history view.
-
-**Tech Stack:** C# 12, Blazor SSR, Dapper, PostgreSQL, xUnit.
-
-**Branch:** `issue-15-session-audit-log` (includes mobile UI bugfix cherry-pick)
-
-**Version Bump:** `1.10.1` → `1.10.2`
-
----
-
-## Task 1: Database Migration (V013)
-
-**Objective:** Create `session_audit_log` table.
-
-**File:** Create `src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql`
-
-```sql
-CREATE EXTENSION IF NOT EXISTS "pgcrypto";
-
-CREATE TABLE session_audit_log (
-    id                  UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    session_id          UUID NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
-    actor_telegram_id   BIGINT NOT NULL,
-    actor_name          VARCHAR(255) NOT NULL,
-    change_type          VARCHAR(50) NOT NULL,
-                        CHECK (change_type IN ('Title','Time','Link','MaxPlayers','Status','WaitlistPromote','PlayerRemoved','BatchRescheduled','Cancelled')),
-    old_value           TEXT,
-    new_value           TEXT,
-    changed_at          TIMESTAMPTZ NOT NULL DEFAULT now()
-);
-
-CREATE INDEX ix_session_audit_log_session_id ON session_audit_log(session_id);
-CREATE INDEX ix_session_audit_log_changed_at ON session_audit_log(changed_at);
-```
-
-**Step 2:** Verify migration compiles: `psql $DATABASE_URL -f src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql` (optional, CI will test)
-
-**Step 3:** Commit: `git add src/GmRelay.Bot/Migrations/V013__add_session_audit_log.sql && git commit -m "chore(#15): add session_audit_log migration"`
-
----
-
-## Task 2: Domain Model & Interface Methods
-
-**Objective:** Add `SessionAuditLogEntry` record and two new methods to `ISessionStore`.
-
-**Files:**
-- Modify: `src/GmRelay.Web/Services/ISessionStore.cs`
-- Modify: `src/GmRelay.Web/Services/SessionService.cs`
-
-**Step 1: Add record to ISessionStore.cs** (after PlayerAttendanceStats)
-
-```csharp
-public sealed record SessionAuditLogEntry(
-    Guid Id,
-    Guid SessionId,
-    long ActorTelegramId,
-    string ActorName,
-    string ChangeType,
-    string? OldValue,
-    string? NewValue,
-    DateTime ChangedAt
-);
-```
-
-**Step 2: Add methods to ISessionStore interface**
-
-```csharp
-Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue);
-Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId);
-```
-
-**Step 3: Implement in SessionService.cs**
-
-```csharp
-public async Task LogSessionChangeAsync(Guid sessionId, long actorTelegramId, string actorName, string changeType, string? oldValue, string? newValue)
-{
-    using var connection = new NpgsqlConnection(connectionString);
-    await connection.ExecuteAsync(
-        "INSERT INTO session_audit_log (session_id, actor_telegram_id, actor_name, change_type, old_value, new_value) VALUES (@sessionId, @actorTelegramId, @actorName, @changeType, @oldValue, @newValue)",
-        new { sessionId, actorTelegramId, actorName, changeType, oldValue, newValue });
-}
-
-public async Task<List<SessionAuditLogEntry>> GetSessionHistoryAsync(Guid sessionId)
-{
-    using var connection = new NpgsqlConnection(connectionString);
-    var entries = await connection.QueryAsync<SessionAuditLogEntry>(
-        "SELECT id, session_id as SessionId, actor_telegram_id as ActorTelegramId, actor_name as ActorName, change_type as ChangeType, old_value as OldValue, new_value as NewValue, changed_at as ChangedAt FROM session_audit_log WHERE session_id = @sessionId ORDER BY changed_at DESC",
-        new { sessionId });
-    return entries.ToList();
-}
-```
-
-**Step 4:** Commit: `git add -A && git commit -m "feat(#15): add SessionAuditLogEntry and audit store methods"`
-
----
-
-## Task 3: Instrument Mutating Methods
-
-**Objective:** Auto-log changes in key methods. Only log when value actually changes.
-
-**File:** Modify `src/GmRelay.Web/Services/SessionService.cs`
-
-**Step 1: Instrument UpdateSessionAsync**
-
-Before executing UPDATE, read current session. After UPDATE, compare and log each changed field:
-
-```csharp
-// After var currentSession = await GetSessionAsync(sessionId);
-// Before the UPDATE SQL:
-
-if (currentSession is not null)
-{
-    if (currentSession.Title != title)
-        await LogSessionChangeAsync(sessionId, /* actor will be passed from caller */ ...);
-}
-```
-
-**Problem:** SessionService doesn't know the actor (GM) telegram ID. Solution: add `long actorTelegramId` parameter to mutating methods, or use a decorator pattern.
-
-**Better approach:** Instrument in `AuthorizedSessionService` which already has `gmId`. That is the authorized wrapper.
-
-**Revised approach:** Add `IAuditLogger` interface and inject it. Or simpler: change `ISessionStore` mutating methods to accept `long actorTelegramId` and `string actorName` as last parameters.
-
-**Simpler approach for this plan:** Since all mutating methods in `ISessionStore` are called through `AuthorizedSessionService`, instrument in `AuthorizedSessionService` methods AFTER the underlying `SessionService` call. BUT we need old values. 
-
-**Final approach:** Change `ISessionStore` methods to include `actorTelegramId` parameter, and inside `SessionService` fetch old values and log.
-
-Let's add `long actorTelegramId` parameter to:
-- `UpdateSessionAsync`
-- `PromoteWaitlistedPlayerAsync`
-- `RemovePlayerFromSessionAsync`
-- `RescheduleBatchAsync`
-
-Wait, this is a bigger change. Let's be more pragmatic: add a new `IAuditService` that can be called from `AuthorizedSessionService` after mutations. `IAuditService` just wraps `ISessionStore.LogSessionChangeAsync`.
-
-Actually, simplest: add `actorTelegramId` and `actorName` parameters to `LogSessionChangeAsync` and call it from `AuthorizedSessionService` after each mutation. For old/new values, read the session before mutation in AuthorizedSessionService.
-
-**Plan:**
-- `AuthorizedSessionService.UpdateSessionForGmAsync`: read session before update, call update, then log differences.
-- Same pattern for other mutating methods.
-
-**Step 1: Read current session in AuthorizedSessionService.UpdateSessionForGmAsync**
-
-```csharp
-public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
-{
-    var groupId = await EnforceSessionOwnershipAsync(sessionId, gmId);
-    var before = await store.GetSessionAsync(sessionId);  // add this
-    await store.UpdateSessionAsync(sessionId, groupId, title, scheduledAt, joinLink, maxPlayers);
-    if (before is not null)
-    {
-        if (before.Title != title)
-            await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Title", before.Title, title);
-        if (before.ScheduledAt != scheduledAt)
-            await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Time", before.ScheduledAt.ToString("O"), scheduledAt.ToString("O"));
-        if (before.JoinLink != joinLink)
-            await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "Link", before.JoinLink, joinLink);
-        if (before.MaxPlayers != maxPlayers)
-            await store.LogSessionChangeAsync(sessionId, gmId, "ГМ", "MaxPlayers", before.MaxPlayers?.ToString(), maxPlayers?.ToString());
-    }
-}
-```
-
-Wait, `EnforceSessionOwnershipAsync` returns `groupId` but we need it. Let me check the current AuthorizedSessionService code... We saw earlier it does `await EnforceSessionOwnershipAsync(sessionId, gmId)` then calls `store.UpdateSessionAsync`.
-
-Actually, looking at the compact output from earlier, `AuthorizedSessionService` has `EnforceSessionOwnershipAsync` as a private helper. Let me verify.
-
-From the compact output of AuthorizedSessionService earlier:
-```
-public async Task UpdateSessionForGmAsync(Guid sessionId, long gmId, string title, DateTime scheduledAt, string joinLink, int? maxPlayers)
-{
-    var groupId = await EnforceSessionOwnershipAsync(sessionId, gmId);
-    await store.UpdateSessionAsync(sessionId, groupId, title, scheduledAt, joinLink, maxPlayers);
-}
-```
-
-So it DOES return groupId. Perfect.
-
-But we need actor name. We can use the GM's display name from `GetGroupManagementForGmAsync` or just hardcode "ГМ" for now. Or we can query the player name. For simplicity, use "ГМ" + telegram ID, or query the player display name.
-
-Actually, let's query the GM name from the group or just use telegram ID as identifier. Since this is audit log, having human-readable name is better. We can pass `actorName` to the log method.
-
-Simpler: In `AuthorizedSessionService`, after `EnforceSessionOwnershipAsync`, we already know the group. We can get the GM name from group or just use a generic "ГМ" label. Actually, the telegram ID is sufficient for audit, and the display name can be resolved later in the UI.
-
-Let's just log `actor_telegram_id` and use "ГМ" as actor_name. Or better, query the player display name if needed.
-
-For this plan, let's keep it simple: log with `gmId` as actor_telegram_id and `"ГМ"` as actor_name. The UI can resolve the name.
-
-**Step 2: Instrument all mutating AuthorizedSessionService methods**
-
-Do this for:
-- `UpdateSessionForGmAsync` (Title, Time, Link, MaxPlayers)
-- `RescheduleBatchForGmAsync` (BatchRescheduled)
-- `PromoteWaitlistedPlayerForGmAsync` (WaitlistPromote)
-- `RemovePlayerFromSessionForGmAsync` (PlayerRemoved)
-- `UpdateBatchDetailsForGmAsync` (Title, Link)
-- `UpdateBatchNotificationModeForGmAsync` (maybe skip, internal)
-- `DeleteSessionHandler` in Bot features (Cancelled) — this is in Bot layer, not Web
-
-For Cancelled status, we need to instrument `CancelSessionHandler` in Bot. But the Bot handlers don't use `ISessionStore` directly... they use `SessionService` or direct SQL. Let me check.
-
-Actually, for this plan, focus on Web layer mutations first. Bot layer can be a follow-up.
-
-**Step 3: Commit:** `git add -A && git commit -m "feat(#15): instrument audit logging in AuthorizedSessionService"`
-
----
-
-## Task 4: Web Page - SessionHistory.razor
-
-**Objective:** GM-visible timeline of session changes.
-
-**Files:**
-- Create: `src/GmRelay.Web/Components/Pages/SessionHistory.razor`
-- Modify: `src/GmRelay.Web/Components/Pages/GroupDetails.razor` (add "История" link)
-- Modify: `src/GmRelay.Web/Components/Pages/EditSession.razor` (add "История" link)
-
-**Step 1: Create SessionHistory.razor**
-
-Route: `@page "/session/{SessionId:guid}/history"`
-
-Layout: table with columns: Время, Актор, Тип изменения, Было, Стало.
-
-Colors: use existing CSS variables.
-
-**Step 2: Add navigation links**
-
-In GroupDetails.razor sessions table: add 📜 История column/link.
-In EditSession.razor: add button "📜 История изменений" linking to `/session/{SessionId}/history`.
-
-**Step 3: Commit:** `git add -A && git commit -m "feat(#15): add SessionHistory.razor page with audit timeline"`
-
----
-
-## Task 5: FakeSessionStore + TDD Tests
-
-**Objective:** Test audit logging. RED-GREEN-REFACTOR.
-
-**Files:**
-- Modify: `tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs`
-
-**Step 1: RED — Write failing test**
-
-```csharp
-[Fact]
-public async Task UpdateSessionForGmAsync_LogsAudit_WhenTitleChanges()
-{
-    var gmId = 1001L;
-    var groupId = Guid.NewGuid();
-    var sessionId = Guid.NewGuid();
-    var store = new FakeSessionStore(
-        groups: [new(groupId, 42, "Alpha", gmId)],
-        sessions: [new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)]);
-    var service = new AuthorizedSessionService(store);
-
-    await service.UpdateSessionForGmAsync(sessionId, gmId, "Updated Title", DateTime.UtcNow.AddDays(1), "https://example.test/b", 5);
-
-    Assert.Single(store.LogEntries);
-    Assert.Equal("Title", store.LogEntries[0].ChangeType);
-    Assert.Equal("Session A", store.LogEntries[0].OldValue);
-    Assert.Equal("Updated Title", store.LogEntries[0].NewValue);
-}
-```
-
-Run: `dotnet test tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs --filter "FullyQualifiedName~LogsAudit" -v n`
-Expected: FAIL (FakeSessionStore doesn't have LogSessionChangeAsync / LogEntries)
-
-**Step 2: GREEN — Add to FakeSessionStore**
-
-Add `List<SessionAuditLogEntry> LogEntries` and implement `LogSessionChangeAsync` / `GetSessionHistoryAsync`.
-
-**Step 3: Refactor — Add more tests**
-
-- No audit when values unchanged
-- Audit for time change
-- Audit for link change
-- Audit for max players change
-- GetSessionHistoryAsync returns entries ordered by time desc
-
-**Step 4: Full suite**
-Run: `dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj`
-Expected: all pass
-
-**Step 5: Commit:** `git add -A && git commit -m "test(#15): add audit logging TDD tests"`
-
----
-
-## Task 6: Bump Version & Docs
-
-**Objective:** Update version and documentation.
-
-**Files:**
-- Modify: `Directory.Build.props`
-- Modify: `compose.yaml`
-- Modify: `README.md`
-- Modify: Wiki «Руководство ГМа»
-
-**Step 1: Bump version to 1.10.2**
-
-**Step 2: Update README** — add "📜 История изменений сессии" bullet in Web Dashboard section.
-
-**Step 3: Update wiki** — add subsection «Журнал действий» with description of how to access `/session/{id}/history`, what change types are tracked, and how to read the timeline.
-
-**Step 4: Commit:** `git add -A && git commit -m "docs(#15): bump version to 1.10.2 and add audit log docs"`
-
----
-
-## Task 7: Push & PR
-
-**Step 1:** `git push origin issue-15-session-audit-log`
-
-**Step 2:** Create PR via `mcp_gitea_pull_request_write`
-
-**Step 3:** Wait CI (`mcp_gitea_actions_run_read`)
-
-**Step 4:** Merge PR
-
-**Step 5:** Create tag `v1.10.2` and release
-
----
-
-## Verification Checklist
-
-- [ ] Migration V013 applied successfully
-- [ ] `SessionAuditLogEntry` record defined in `ISessionStore.cs`
-- [ ] `LogSessionChangeAsync` and `GetSessionHistoryAsync` implemented in `SessionService.cs`
-- [ ] `AuthorizedSessionService` logs on value changes only
-- [ ] `SessionHistory.razor` renders timeline for GM
-- [ ] Links from GroupDetails and EditSession pages
-- [ ] `FakeSessionStore` implements audit methods
-- [ ] TDD tests: RED → GREEN → all pass
-- [ ] Full `dotnet test` suite: all pass
-- [ ] Version bumped to 1.10.2
-- [ ] README and wiki updated
-- [ ] CI run success
-- [ ] PR merged to main
-- [ ] Tag `v1.10.2` created
-- [ ] Release published

.hermes/plans/gmrelay-issue-19.md

@@ -1,480 +0,0 @@
-# Issue #19: выровнять /newsession с batch-сценарием лендинга — Implementation Plan
-
-> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task.
-
-**Goal:** Убедиться, что Telegram UX `/newsession` полностью соответствует batch-сценарию лендинга: мастер одной командой создаёт несколько дат, указывает лимит мест и ссылку, получает единую карточку с действиями. Обеспечить покрытие acceptance criteria регрессионными тестами и устранить найденные расхождения.
-
-**Architecture:** Сценарий уже реализован в `CreateSessionHandler` + `NewSessionCommandParser` + `SessionBatchRenderer`. Основная задача — добавить недостающие тесты на «точный» landing-сценарий (несколько явных дат, не recurring), проверить отсутствие частичных сессий при любых ошибках, и убедиться, что карточка содержит все обещанные элементы.
-
-**Tech Stack:** .NET 10, xUnit, Dapper, Npgsql, Telegram.Bot, Native AOT.
-
----
-
-## Контекст кодовой базы
-
-- `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs` — создание batch, транзакция БД, отправка карточки.
-- `src/GmRelay.Bot/Features/Sessions/CreateSession/NewSessionCommandParser.cs` — парсинг команды: несколько `Время:`, `Мест:`, `Ссылка:`, `Картинка:`, recurring (`Игр:` + `Интервал:`).
-- `src/GmRelay.Shared/Rendering/SessionBatchRenderer.cs` — рендеринг HTML-карточки с кнопками.
-- `src/GmRelay.Shared/Rendering/BatchMessageEditor.cs` — редактирование batch-сообщения (text/photo).
-- `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs` — роутинг команд, текст `/help`.
-- `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs` — тесты парсера.
-- `tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs` — smoke-тест всего landing-флоу через `FakeTelegramMessenger`.
-- `tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs` — тесты рендерера.
-
----
-
-### Task 1: RED — тест landing-парсинга с несколькими явными датами
-
-**Objective:** Проверить, что парсер корректно обрабатывает точный формат из лендинга: 2+ явных даты, лимит мест, ссылка, без recurring.
-
-**Files:**
-- Modify: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs`
-
-**Step 1: Write failing test**
-
-```csharp
-[Fact]
-public void Parse_ShouldHandleLandingBatchWithMultipleExplicitDates()
-{
-    var nowUtc = new DateTimeOffset(2026, 4, 23, 12, 0, 0, TimeSpan.Zero);
-    var text = """
-        /newsession
-        Название: Landing Batch Game
-        Время: 15.05.2026 19:30
-        Время: 22.05.2026 19:30
-        Мест: 4
-        Ссылка: https://example.test/landing
-        """;
-
-    var result = NewSessionCommandParser.Parse(text, nowUtc);
-
-    Assert.True(result.IsValid);
-    Assert.Equal("Landing Batch Game", result.Title);
-    Assert.Equal("https://example.test/landing", result.Link);
-    Assert.Equal(4, result.MaxPlayers);
-    Assert.Equal(2, result.ScheduledTimes.Count);
-    Assert.Equal(new DateTimeOffset(2026, 5, 15, 16, 30, 0, TimeSpan.Zero), result.ScheduledTimes[0]);
-    Assert.Equal(new DateTimeOffset(2026, 5, 22, 16, 30, 0, TimeSpan.Zero), result.ScheduledTimes[1]);
-    Assert.Empty(result.PastTimeInputs);
-    Assert.Empty(result.InvalidTimeInputs);
-    Assert.Empty(result.InvalidSeatLimitInputs);
-    Assert.Empty(result.InvalidRecurringInputs);
-}
-```
-
-**Step 2: Run test to verify failure**
-
-Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Parse_ShouldHandleLandingBatchWithMultipleExplicitDates" -v n`
-
-Expected: PASS (функциональность уже реализована, но теста не было). Если FAIL — исправить парсер перед продолжением.
-
-**Step 3: Commit**
-
-```bash
-git add tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/NewSessionCommandParserTests.cs
-git commit -m "test(#19): landing batch parser test with multiple explicit dates"
-```
-
----
-
-### Task 2: RED — тест рендеринга landing-карточки
-
-**Objective:** Проверить, что `SessionBatchRenderer` для landing-сценария выводит название, все даты, лимит, заполненность и кнопки записи/выхода.
-
-**Files:**
-- Modify: `tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs`
-
-**Step 1: Write failing test**
-
-```csharp
-[Fact]
-public void Render_ShouldProduceLandingBatchCardWithAllRequiredElements()
-{
-    var sessionId1 = Guid.NewGuid();
-    var sessionId2 = Guid.NewGuid();
-    var sessions = new[]
-    {
-        new SessionBatchDto(sessionId1, new DateTime(2026, 5, 15, 16, 30, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
-        new SessionBatchDto(sessionId2, new DateTime(2026, 5, 22, 16, 30, 0, DateTimeKind.Utc), SessionStatus.Planned, 4)
-    };
-    var participants = new[]
-    {
-        new ParticipantBatchDto(sessionId1, "Alice", "alice", ParticipantRegistrationStatus.Active),
-        new ParticipantBatchDto(sessionId1, "Bob", null, ParticipantRegistrationStatus.Active),
-        new ParticipantBatchDto(sessionId2, "Charlie", "charlie", ParticipantRegistrationStatus.Waitlisted)
-    };
-
-    var result = SessionBatchRenderer.Render("Landing Batch Game", sessions, participants);
-    var text = result.Text;
-    var buttons = result.Markup.InlineKeyboard.SelectMany(row => row).ToList();
-
-    Assert.Contains("Landing Batch Game", text);
-    Assert.Contains("15 мая 2026, 19:30", text);
-    Assert.Contains("22 мая 2026, 19:30", text);
-    Assert.Contains("Места: 2/4", text);
-    Assert.Contains("Места: 0/4", text);
-    Assert.Contains("@alice", text);
-    Assert.Contains("Bob", text);
-    Assert.Contains("Лист ожидания (1)", text);
-    Assert.Contains("@charlie", text);
-
-    Assert.Equal(4, buttons.Count);
-    Assert.Contains($"join_session:{sessionId1}", buttons.Select(b => b.CallbackData));
-    Assert.Contains($"leave_session:{sessionId1}", buttons.Select(b => b.CallbackData));
-    Assert.Contains($"join_session:{sessionId2}", buttons.Select(b => b.CallbackData));
-    Assert.Contains($"leave_session:{sessionId2}", buttons.Select(b => b.CallbackData));
-}
-```
-
-**Step 2: Run test to verify failure**
-
-Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Render_ShouldProduceLandingBatchCardWithAllRequiredElements" -v n`
-
-Expected: PASS (рендерер уже реализован, тест отсутствовал).
-
-**Step 3: Commit**
-
-```bash
-git add tests/GmRelay.Bot.Tests/Rendering/SessionBatchRendererTests.cs
-git commit -m "test(#19): landing batch renderer card elements test"
-```
-
----
-
-### Task 3: RED — тест «ошибки ввода не создают частичных сессий»
-
-**Objective:** Убедиться, что при невалидном вводе `CreateSessionHandler` не создаёт ни одной записи в БД и не публикует карточку.
-
-**Files:**
-- Create: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/CreateSessionHandlerTests.cs`
-- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs` (если найдена уязвимость)
-
-**Step 1: Write failing test**
-
-```csharp
-using GmRelay.Bot.Features.Sessions.CreateSession;
-using Npgsql;
-using Telegram.Bot;
-using Microsoft.Extensions.Logging.Abstractions;
-
-namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
-
-public sealed class CreateSessionHandlerTests
-{
-    // Примечание: полноценный интеграционный тест с реальной БД требует TestContainer.
-    // Для Native AOT проекта используем подход с in-memory фейком через рефакторинг хендлера.
-    // Ниже — тест-спецификация, которую реализуем через FakeDataSource или рефакторинг.
-}
-```
-
-Поскольку `CreateSessionHandler` напрямую зависит от `NpgsqlDataSource` и `ITelegramBotClient`, для unit-тестирования нужно либо:
-а) использовать интеграционный тест с PostgreSQL (TestContainers), либо
-б) рефакторить хендлер, выделив `ISessionRepository`.
-
-**Рекомендуемый подход (YAGNI):** добавить интеграционный тест в smoke-стиле через `FakeTelegramMessenger`, дополнив `TelegramLandingSmokeScenario` сценарием «invalid command does not publish anything».
-
-**Step 1 (реализация):** Дописать тест в `TelegramLandingPromisesSmokeTests.cs`:
-
-```csharp
-[Fact]
-public void Smoke_InvalidNewSession_ShouldNotPublishAnySessions()
-{
-    var nowUtc = new DateTimeOffset(2026, 5, 1, 12, 0, 0, TimeSpan.Zero);
-    var invalidText = """
-        /newsession
-        Название: Bad Game
-        Время: 01.01.2020 19:30
-        """; // нет ссылки
-
-    var parseResult = NewSessionCommandParser.Parse(invalidText, nowUtc);
-
-    Assert.False(parseResult.IsValid);
-    Assert.Empty(parseResult.ScheduledTimes);
-    // Убеждаемся, что smoke-сценарий не может быть опубликован
-    Assert.Throws<InvalidOperationException>(() =>
-        TelegramLandingSmokeScenario.Publish(parseResult, SessionNotificationMode.GroupAndDirect));
-}
-```
-
-В `TelegramLandingSmokeScenario.Publish` добавить guard:
-```csharp
-if (!parseResult.IsValid)
-    throw new InvalidOperationException("Cannot publish invalid parse result");
-```
-
-**Step 2: Run test to verify failure**
-
-Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Smoke_InvalidNewSession_ShouldNotPublishAnySessions" -v n`
-
-Expected: FAIL — guard ещё не добавлен.
-
-**Step 3: Write minimal implementation**
-
-Добавить guard в `TelegramLandingSmokeScenario.Publish`:
-```csharp
-if (!parseResult.IsValid)
-    throw new InvalidOperationException("Cannot publish invalid parse result");
-```
-
-**Step 4: Run test to verify pass**
-
-Expected: PASS.
-
-**Step 5: Commit**
-
-```bash
-git add tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs
-git add src/GmRelay.Bot/... # если были изменения
-# (файл CreateSessionHandler.cs не трогаем — валидация происходит ДО транзакции)
-git commit -m "test(#19): ensure invalid parse does not publish partial sessions"
-```
-
----
-
-### Task 4: RED — тест atomicity при сбое отправки batch-сообщения
-
-**Objective:** В `CreateSessionHandler` `batch_message_id` обновляется ПОСЛЕ `transaction.Commit()`. Если отправка сообщения в Telegram падает, сессии созданы, но `batch_message_id` не записан — игроки не увидят карточку. Нужно либо доказать, что это обработано, либо исправить.
-
-**Files:**
-- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs`
-
-**Step 1: Анализ кода**
-
-Текущий порядок в `CreateSessionHandler`:
-1. Валидация (до транзакции) ✓
-2. `BEGIN TRANSACTION`
-3. INSERT players, groups, sessions
-4. `COMMIT`
-5. `SessionBatchRenderer.Render`
-6. `botClient.SendMessage/SendPhoto`
-7. `UPDATE sessions SET batch_message_id = ...` (вне транзакции!)
-
-Если шаг 6 падает — сессии «висят» без published message. Это частичное создание.
-
-**Step 2: Write minimal fix**
-
-Обернуть отправку сообщения и обновление `batch_message_id` в retry-loop с fallback. Если после N попыток не удалось — отправить GM уведомление об ошибке и оставить сессии (не удалять, чтобы не терять данные), но сделать так, чтобы `batch_message_id` обновлялся только при успешной отправке.
-
-```csharp
-// Внутри CreateSessionHandler, после Commit:
-Message? batchMessage = null;
-var sendAttempts = 0;
-const int maxAttempts = 3;
-Exception? lastSendException = null;
-
-while (batchMessage is null && sendAttempts < maxAttempts)
-{
-    sendAttempts++;
-    try
-    {
-        batchMessage = await SendBatchMessageAsync(...); // extracted method
-    }
-    catch (Exception ex)
-    {
-        lastSendException = ex;
-        logger.LogWarning(ex, "Attempt {Attempt} failed to send batch message for {BatchId}", sendAttempts, batchId);
-        if (sendAttempts < maxAttempts)
-            await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
-    }
-}
-
-if (batchMessage is not null)
-{
-    await connection.ExecuteAsync(
-        "UPDATE sessions SET batch_message_id = @MsgId WHERE batch_id = @BatchId",
-        new { MsgId = batchMessage.MessageId, BatchId = batchId });
-}
-else
-{
-    logger.LogError(lastSendException, "Failed to send batch message for {BatchId} after {MaxAttempts} attempts", batchId, maxAttempts);
-    await botClient.SendMessage(
-        chatId,
-        $"⚠️ Сессии созданы, но не удалось опубликовать карточку. Пожалуйста, используйте /listsessions.\n\nОшибка: {lastSendException?.Message}",
-        cancellationToken: cancellationToken);
-}
-```
-
-**Step 3: Extract helper**
-
-Выделить метод `SendBatchMessageAsync` из текущего inline-кода отправки (строки 117–176 в текущем файле), чтобы логика была читаемой и тестируемой.
-
-**Step 4: Run tests**
-
-Run: `dotnet test tests/GmRelay.Bot.Tests/ -v n`
-
-Expected: все существующие тесты PASS, новая логика не ломает smoke-тест (т.к. smoke-тест не использует реальный `CreateSessionHandler`).
-
-**Step 5: Commit**
-
-```bash
-git add src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs
-git commit -m "fix(#19): retry batch message send and prevent orphaned sessions without batch_message_id"
-```
-
----
-
-### Task 5: RED — smoke-тест полного landing-сценария с явными датами
-
-**Objective:** Дополнить `TelegramLandingPromisesSmokeTests` полным сквозным сценарием: парсинг → публикация → запись → выход → проверка карточки.
-
-**Files:**
-- Modify: `tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs`
-
-**Step 1: Write failing test**
-
-```csharp
-[Fact]
-public void Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle()
-{
-    var nowUtc = new DateTimeOffset(2026, 5, 1, 12, 0, 0, TimeSpan.Zero);
-    var text = """
-        /newsession
-        Название: Landing Explicit Batch
-        Время: 15.05.2026 19:30
-        Время: 22.05.2026 19:30
-        Мест: 3
-        Ссылка: https://example.test/explicit
-        """;
-
-    var parseResult = NewSessionCommandParser.Parse(text, nowUtc);
-    Assert.True(parseResult.IsValid);
-    Assert.Equal(2, parseResult.ScheduledTimes.Count);
-    Assert.Equal(3, parseResult.MaxPlayers);
-
-    var scenario = TelegramLandingSmokeScenario.Publish(parseResult, SessionNotificationMode.GroupAndDirect);
-    Assert.Contains("Landing Explicit Batch", scenario.LastMessage.Text);
-    Assert.Contains("15 мая 2026, 19:30", scenario.LastMessage.Text);
-    Assert.Contains("22 мая 2026, 19:30", scenario.LastMessage.Text);
-    Assert.Contains("Места: 0/3", scenario.LastMessage.Text);
-
-    var callbacks = CallbackData(scenario.LastMessage.Markup);
-    Assert.Equal(4, callbacks.Count); // join+leave для каждой из 2 сессий
-
-    var firstSessionId = scenario.Sessions[0].Id;
-    var alice = scenario.Join(firstSessionId, 1001, "Alice", "alice");
-    var bob = scenario.Join(firstSessionId, 1002, "Bob", "bob");
-    var carol = scenario.Join(firstSessionId, 1003, "Carol", "carol");
-
-    Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, alice));
-    Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, bob));
-    Assert.Equal(ParticipantRegistrationStatus.Waitlisted, scenario.RegistrationStatus(firstSessionId, carol));
-    Assert.Contains("Места: 2/3", scenario.LastMessage.Text);
-    Assert.Contains("@alice", scenario.LastMessage.Text);
-    Assert.Contains("@bob", scenario.LastMessage.Text);
-    Assert.Contains("@carol", scenario.LastMessage.Text);
-
-    scenario.Leave(firstSessionId, alice);
-    Assert.False(scenario.HasParticipant(firstSessionId, alice));
-    Assert.Equal(ParticipantRegistrationStatus.Active, scenario.RegistrationStatus(firstSessionId, carol));
-    Assert.DoesNotContain("@alice", scenario.LastMessage.Text);
-    Assert.Contains("@carol", scenario.LastMessage.Text);
-}
-```
-
-**Step 2: Run test to verify failure**
-
-Run: `dotnet test tests/GmRelay.Bot.Tests/ --filter "FullyQualifiedName~Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle" -v n`
-
-Expected: PASS (функциональность уже существует, тест добавляет регрессионное покрытие).
-
-**Step 3: Commit**
-
-```bash
-git add tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs
-git commit -m "test(#19): full lifecycle smoke test for explicit-dates landing batch"
-```
-
----
-
-### Task 6: Проверка и обновление `/help` текста
-
-**Objective:** Убедиться, что текст `/help` точно отражает landing-формат и упоминает batch-сценарий.
-
-**Files:**
-- Modify: `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs`
-
-**Step 1: Read current `/help` text**
-
-Текущий `/help` уже содержит:
-```
-/newsession
-Название: My Game
-Время: 15.05.2026 19:30
-Время: 22.05.2026 19:30
-Мест: 4
-Ссылка: https://link
-Картинка: https://cover
-
-Для регулярного расписания можно указать одну дату:
-Игр: 4
-Интервал: 7
-```
-
-**Step 2: Verify alignment**
-
-- Формат совпадает с лендингом ✓
-- Упоминается `Мест:` ✓
-- Упоминается несколько `Время:` ✓
-- Упоминается `Ссылка:` ✓
-
-Никаких изменений не требуется. Если тестировщик считает, что help недостаточно явно описывает batch-сценарий — добавить заголовок:
-```
-<b>Создать набор сессий (batch):</b>
-```
-
-**Step 3: Commit (если изменения были)**
-
-```bash
-git add src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs
-git commit -m "docs(#19): clarify batch scenario in /help text"
-```
-
----
-
-### Task 7: Финальный прогон и cleanup
-
-**Objective:** Убедиться, что все тесты проходят, нет warnings, и план соответствует acceptance criteria.
-
-**Files:**
-- Все изменённые файлы
-
-**Step 1: Run full test suite**
-
-```bash
-dotnet test tests/GmRelay.Bot.Tests/ -v n
-```
-
-Expected: все тесты PASS.
-
-**Step 2: Verify checklist**
-
-- [ ] `Parse_ShouldHandleLandingBatchWithMultipleExplicitDates` — PASS
-- [ ] `Render_ShouldProduceLandingBatchCardWithAllRequiredElements` — PASS
-- [ ] `Smoke_InvalidNewSession_ShouldNotPublishAnySessions` — PASS
-- [ ] `Smoke_LandingExplicitDatesBatch_ShouldSupportFullLifecycle` — PASS
-- [ ] Все существующие тесты — PASS
-- [ ] `CreateSessionHandler` обрабатывает сбой отправки batch-сообщения (retry + fallback)
-- [ ] `/help` текст соответствует landing-формату
-- [ ] Никаких новых warnings при сборке
-
-**Step 3: Commit финальный**
-
-```bash
-git add -A
-git commit -m "feat(#19): align /newsession with landing batch scenario — tests + atomicity fix"
-```
-
----
-
-## Acceptance Criteria Verification
-
-| Критерий | Статус | Покрытие |
-|---|---|---|
-| Мастер может создать batch из нескольких дат | ✅ Реализовано | Task 1, Task 5 |
-| Карточка содержит название, даты, лимит, заполненность, действия | ✅ Реализовано | Task 2, Task 5 |
-| Ошибки ввода не создают частичных сессий | ✅ Реализовано (валидация до транзакции) | Task 3 |
-| Сбой публикации карточки не оставляет «висячие» сессии без `batch_message_id` | 🔄 Фиксится | Task 4 |
-
-## Execution Handoff
-
-Plan complete and saved to `.hermes/plans/gmrelay-issue-19.md`. Ready to execute using subagent-driven-development — dispatch a fresh subagent per task with two-stage review (spec compliance then code quality). Shall I proceed?

Directory.Build.props

@@ -1,10 +1,15 @@
 <Project>
   <PropertyGroup>
-    <Version>1.10.4</Version>
+    <Version>2.1.1</Version>
     <TargetFramework>net10.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="all" />
+  </ItemGroup>
 </Project>

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Toutsu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

README.md

@@ -4,7 +4,7 @@
 
 Проект разработан с упором на производительность, архитектуру Vertical Slice, Native AOT (для бота) и удобство развертывания с использованием .NET Aspire.
 
-**Текущая версия:** `v1.10.2`.
+**Текущая версия:** `v2.0.1`.
 
 ---
 
@@ -16,7 +16,7 @@
 - **⚡ Быстрые повторы расписания**: Для регулярной кампании можно указать одну дату, количество игр и интервал, а бот сам развернёт повторяющийся batch.
 - **✋ Интерактивная запись и выход**: Игроки записываются на конкретные даты и самостоятельно снимают запись нажатием одной кнопки.
 - **👥 Лимит мест и лист ожидания**: ГМ задаёт максимальный состав, бот не переполняет сессию, автоматически ведёт очередь ожидания и освобождённое место отдаёт первому ожидающему.
-- **📁 Поддержка Форумов (Telegram Topics)**: Бот автоматически создает тему во вложенных чатах Telegram под каждую новую пачку игр.
+- **📁 Поддержка Форумов (Telegram Topics)**: Если `/newsession` запущен в теме форума Telegram, расписание и групповые уведомления остаются в этой теме; при запуске из корня форума бот создает отдельную тему и сообщает о необходимости прав admin/Manage Topics, если их не хватает.
 - **❌ Управление сессиями**: Owner и назначенные co-GM могут создавать, отменять, удалять и переносить игры из Telegram через `/listsessions`; публичный пост записи показывает только кнопки игроков.
 - **🔄 Голосование за перенос**: Быстрый поиск свободного места с через свободное недель и кнопками новых времени и дедлайном.
 - **🔔 Уведомления**: Игрок получают за 24 часа, напоминание за 1 час, ссылку перед игрой, отмены и переносы; групповые уведомления при этом остаются.
@@ -105,6 +105,44 @@ docker compose up -d
 2. Создайте группу через `/newgroup`.
 3. Откройте Mini App или Web Dashboard для расширенного управления.
 
+## 💾 Backup и восстановление
+
+Проект включает автоматический ежедневный backup PostgreSQL через сервис `db-backup` в Docker Compose.
+
+### Как это работает
+- **Каждый день в 03:00** выполняется `pg_dump` базы `gmrelay_db`.
+- Дампы сжимаются (`gzip`) и сохраняются в volume `pgbackups` (`/backups`).
+- Формат имени: `gmrelay_db_YYYYMMDD_HHMMSS.sql.gz`.
+- Ротация: по умолчанию хранятся последние **7 дней** (настраивается через `BACKUP_RETENTION_DAYS`).
+
+### Проверка бэкапов
+```bash
+docker compose exec db-backup ls -la /backups
+```
+
+### Ручное создание дампа
+```bash
+docker compose exec db-backup sh -c "pg_dump -h db -U gmrelay -d gmrelay_db | gzip > /backups/gmrelay_db_manual.sql.gz"
+```
+
+### Восстановление из бэкапа
+```bash
+# Использовать последний автоматический бэкап
+./scripts/restore.sh
+
+# Или указать конкретный файл
+./scripts/restore.sh backups/gmrelay_db_20260512_030000.sql.gz
+```
+
+> [!WARNING]
+> Восстановление **перезаписывает текущую базу данных**. Убедитесь, что вы понимаете последствия, прежде чем запускать `restore.sh`.
+
+### Переменные окружения (опциональные)
+```env
+BACKUP_RETENTION_DAYS=7
+BACKUP_VOLUME_NAME=game_pgbackups
+```
+
 ---
 
 ## 🗂 Структура репозитория

compose.yaml

@@ -16,8 +16,40 @@ services:
       timeout: 3s
       retries: 10
 
+  db-backup:
+    image: postgres:17-alpine
+    restart: unless-stopped
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      POSTGRES_USER: gmrelay
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in .env}
+      POSTGRES_DB: gmrelay_db
+      PGPASSWORD: ${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in .env}
+      BACKUP_RETENTION_DAYS: ${BACKUP_RETENTION_DAYS:-7}
+    volumes:
+      - pgbackups:/backups
+    networks:
+      - gmrelay
+    entrypoint: ["sh", "-c"]
+    command:
+      - |
+        cat > /usr/local/bin/backup.sh << 'EOF'
+        #!/bin/sh
+        set -e
+        TMPFILE="/tmp/backup_$$.sql"
+        pg_dump -h db -U gmrelay -d gmrelay_db > "$TMPFILE"
+        gzip "$TMPFILE"
+        mv "$TMPFILE.gz" "/backups/gmrelay_db_$(date +%Y%m%d_%H%M%S).sql.gz"
+        find /backups -name 'gmrelay_db_*.sql.gz' -type f -mtime +${BACKUP_RETENTION_DAYS} -delete
+        EOF
+        chmod +x /usr/local/bin/backup.sh
+        echo "0 3 * * * /usr/local/bin/backup.sh" | crontab -
+        crond -f
+
   bot:
-    image: git.codeanddice.ru/toutsu/gmrelay-bot:1.10.4
+    image: git.codeanddice.ru/toutsu/gmrelay-bot:2.1.1
     restart: always
     depends_on:
       db:
@@ -28,9 +60,14 @@ services:
       - "Telegram__MiniAppUrl=${TELEGRAM_MINI_APP_URL:-}"
     networks:
       - gmrelay
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://localhost:8081/health || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
 
   web:
-    image: git.codeanddice.ru/toutsu/gmrelay-web:1.10.4
+    image: git.codeanddice.ru/toutsu/gmrelay-web:2.1.1
     restart: always
     depends_on:
       db:
@@ -46,12 +83,19 @@ services:
       - web_keys:/app/dataprotection-keys
     networks:
       - gmrelay
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://localhost:8080/health || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
 
 volumes:
   pgdata:
     name: ${POSTGRES_VOLUME_NAME:-game_pgdata}
   web_keys:
     name: ${WEB_KEYS_VOLUME_NAME:-gmrelay_web_keys}
+  pgbackups:
+    name: ${BACKUP_VOLUME_NAME:-game_pgbackups}
 
 networks:
   gmrelay:

docs/superpowers/plans/2026-05-15-platform-messenger-contracts.md

@@ -0,0 +1,560 @@
+# Platform Messenger Contracts Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Implement issue #24 by adding platform-neutral platform identity and messaging contracts, then routing the Telegram session flows through a Telegram adapter without changing Telegram behavior.
+
+**Architecture:** Keep update routing and Telegram update parsing at the `GmRelay.Bot.Infrastructure.Telegram` boundary, but move outbound messaging decisions behind `GmRelay.Shared.Platform.IPlatformMessenger`. `GmRelay.Shared` owns platform-neutral DTOs and contracts; `GmRelay.Bot` owns `TelegramPlatformMessenger`, which translates neutral requests into `Telegram.Bot` calls and reuses the existing Telegram renderers/editing rules.
+
+**Tech Stack:** .NET 10, C# preview, xUnit, Dapper.AOT constraints, Telegram.Bot in `GmRelay.Bot` only, platform-neutral shared contracts in `GmRelay.Shared`.
+
+---
+
+## Issue Context
+
+- Gitea issue: #24, `refactor: ввести PlatformKind, PlatformUser, PlatformGroup и IPlatformMessenger`
+- Labels: `area:bot`, `area:platform`, `area:shared`, `platform:multi`, `type:refactor`, `pending-approval`
+- Acceptance criteria:
+  - New contracts live in a platform-neutral layer.
+  - Telegram flow goes through the adapter without behavior changes.
+  - A future DiscordBot can reference the contract without depending on Telegram assemblies.
+
+## Proposed Version Bump
+
+Current version is `2.0.0` in:
+
+- `Directory.Build.props`
+- `compose.yaml`
+- `.gitea/workflows/deploy.yml`
+- `src/GmRelay.Web/Components/Layout/NavMenu.razor`
+
+Issue label is `type:refactor`; per workflow rules this is not a major bump and has no user-facing feature label. Proposed bump: `2.0.0` -> `2.0.1`.
+
+## Files
+
+- Create: `src/GmRelay.Shared/Platform/PlatformKind.cs`
+- Create: `src/GmRelay.Shared/Platform/PlatformUser.cs`
+- Create: `src/GmRelay.Shared/Platform/PlatformGroup.cs`
+- Create: `src/GmRelay.Shared/Platform/PlatformMessageContracts.cs`
+- Create: `src/GmRelay.Shared/Platform/IPlatformMessenger.cs`
+- Create: `src/GmRelay.Bot/Infrastructure/Telegram/TelegramPlatformMessenger.cs`
+- Create: `tests/GmRelay.Bot.Tests/Platform/PlatformContractsTests.cs`
+- Create: `tests/GmRelay.Bot.Tests/Infrastructure/Telegram/TelegramPlatformMessengerSourceTests.cs`
+- Modify: `src/GmRelay.Bot/Program.cs`
+- Modify: `src/GmRelay.Bot/Features/Notifications/DirectSessionNotificationSender.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/PromoteWaitlistedPlayerHandler.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/RescheduleSession/InitiateRescheduleHandler.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleVoteHandler.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs`
+- Modify: `src/GmRelay.Bot/Features/Sessions/ExportCalendar/ExportCalendarHandler.cs`
+- Modify: version files listed above
+
+## Design
+
+### Shared Contracts
+
+`PlatformKind` is a sentinel enum where `Max` is not a sendable platform:
+
+```csharp
+namespace GmRelay.Shared.Platform;
+
+public enum PlatformKind
+{
+    Telegram = 0,
+    Discord = 1,
+    Max = 2
+}
+```
+
+`PlatformUser` and `PlatformGroup` carry external platform identity while keeping current Telegram IDs representable as strings:
+
+```csharp
+namespace GmRelay.Shared.Platform;
+
+public sealed record PlatformUser(
+    PlatformKind Platform,
+    string ExternalUserId,
+    string DisplayName,
+    string? ExternalUsername);
+
+public sealed record PlatformGroup(
+    PlatformKind Platform,
+    string ExternalGroupId,
+    string DisplayName,
+    string? ExternalChannelId = null,
+    string? ExternalThreadId = null);
+```
+
+Outbound message contracts stay independent of Telegram/Discord SDK types:
+
+```csharp
+using GmRelay.Shared.Rendering;
+
+namespace GmRelay.Shared.Platform;
+
+public sealed record PlatformMessageRef(
+    PlatformKind Platform,
+    string ExternalGroupId,
+    string? ExternalThreadId,
+    string ExternalMessageId);
+
+public sealed record PlatformMessageAction(
+    string Key,
+    string Label,
+    string Payload);
+
+public sealed record PlatformScheduleMessage(
+    PlatformGroup Group,
+    SessionBatchViewModel View,
+    PlatformMessageRef? ExistingMessage,
+    string? ImageReference = null);
+
+public sealed record PlatformPrivateMessage(
+    PlatformUser Recipient,
+    string HtmlText);
+
+public sealed record PlatformInteractionReply(
+    string InteractionId,
+    string Text,
+    bool ShowAlert = false);
+
+public sealed record PlatformCalendarFile(
+    PlatformGroup Group,
+    string FileName,
+    byte[] Content,
+    string CaptionHtml,
+    IReadOnlyList<PlatformMessageAction> Actions);
+```
+
+`IPlatformMessenger` exposes the required outward operations:
+
+```csharp
+namespace GmRelay.Shared.Platform;
+
+public interface IPlatformMessenger
+{
+    Task<PlatformMessageRef> SendScheduleAsync(PlatformScheduleMessage message, CancellationToken ct);
+    Task UpdateScheduleAsync(PlatformScheduleMessage message, CancellationToken ct);
+    Task SendGroupMessageAsync(PlatformGroup group, string htmlText, CancellationToken ct);
+    Task SendPrivateMessageAsync(PlatformPrivateMessage message, CancellationToken ct);
+    Task AnswerInteractionAsync(PlatformInteractionReply reply, CancellationToken ct);
+    Task SendCalendarFileAsync(PlatformCalendarFile file, CancellationToken ct);
+}
+```
+
+### Telegram Adapter
+
+`TelegramPlatformMessenger` lives in `GmRelay.Bot.Infrastructure.Telegram`, depends on `ITelegramBotClient`, and translates neutral DTOs to existing Telegram calls:
+
+- `SendScheduleAsync` renders `SessionBatchViewModel` with `TelegramSessionBatchRenderer.Render`.
+- `UpdateScheduleAsync` calls `BatchMessageEditor.EditBatchMessageAsync`.
+- `SendGroupMessageAsync` calls `SendMessage` with `ParseMode.Html` and optional `messageThreadId`.
+- `SendPrivateMessageAsync` calls `SendMessage` to `PlatformUser.ExternalUserId`.
+- `AnswerInteractionAsync` calls `AnswerCallbackQuery`.
+- `SendCalendarFileAsync` calls `SendDocument` and maps URL actions to inline keyboard buttons.
+
+### Handler Scope
+
+Refactor outbound Telegram calls in these flows to `IPlatformMessenger`:
+
+- Join/leave/promote waitlist schedule updates and callback replies.
+- Cancel schedule update, group cancellation message, direct notification and callback reply.
+- Reschedule initiation, voting message updates, immediate reschedule schedule update, direct notifications and callback replies.
+- Export calendar file sending.
+
+Keep Telegram inbound DTOs at the boundary for now:
+
+- `UpdateRouter` still receives `Telegram.Bot.Types.Update`.
+- Text message parsing in reschedule input still receives `Telegram.Bot.Types.Message`.
+- `CreateSessionHandler` can keep photo/topic creation via `ITelegramBotClient` because issue #24 targets outbound schedule/interaction/private/calendar contract, not replacing all Telegram update primitives in one PR.
+
+## Tasks
+
+### Task 1: RED - Shared Contract Tests
+
+**Files:**
+- Create: `tests/GmRelay.Bot.Tests/Platform/PlatformContractsTests.cs`
+
+- [ ] **Step 1: Write failing tests for neutral contracts**
+
+```csharp
+using GmRelay.Shared.Platform;
+using GmRelay.Shared.Rendering;
+
+namespace GmRelay.Bot.Tests.Platform;
+
+public sealed class PlatformContractsTests
+{
+    [Fact]
+    public void PlatformKind_ShouldDefineTelegramDiscordAndMaxSentinel()
+    {
+        Assert.Equal(0, (int)PlatformKind.Telegram);
+        Assert.Equal(1, (int)PlatformKind.Discord);
+        Assert.Equal(2, (int)PlatformKind.Max);
+    }
+
+    [Fact]
+    public void PlatformContracts_ShouldBeTelegramAssemblyFree()
+    {
+        var contractTypes = new[]
+        {
+            typeof(PlatformUser),
+            typeof(PlatformGroup),
+            typeof(PlatformMessageRef),
+            typeof(PlatformMessageAction),
+            typeof(PlatformScheduleMessage),
+            typeof(PlatformPrivateMessage),
+            typeof(PlatformInteractionReply),
+            typeof(PlatformCalendarFile),
+            typeof(IPlatformMessenger)
+        };
+
+        Assert.All(contractTypes, type =>
+            Assert.DoesNotContain(
+                "Telegram",
+                string.Join(" ", type.Assembly.GetReferencedAssemblies().Select(value => value.Name)),
+                StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Fact]
+    public void PlatformScheduleMessage_ShouldCarrySharedViewModelWithoutPlatformTypes()
+    {
+        var sessionId = Guid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa");
+        var view = SessionBatchViewBuilder.Build(
+            "Campaign",
+            [new SessionBatchDto(sessionId, new DateTime(2026, 5, 15, 16, 0, 0, DateTimeKind.Utc), "Planned", 4, "https://example.test/game")],
+            []);
+        var group = new PlatformGroup(PlatformKind.Discord, "guild-1", "Guild", "channel-1", "thread-1");
+
+        var message = new PlatformScheduleMessage(group, view, ExistingMessage: null);
+
+        Assert.Equal(PlatformKind.Discord, message.Group.Platform);
+        Assert.Same(view, message.View);
+    }
+}
+```
+
+- [ ] **Step 2: Run tests and verify RED**
+
+Run:
+
+```powershell
+dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter PlatformContractsTests
+```
+
+Expected: compile failure because `GmRelay.Shared.Platform` types do not exist.
+
+### Task 2: GREEN - Add Shared Contracts
+
+**Files:**
+- Create: `src/GmRelay.Shared/Platform/PlatformKind.cs`
+- Create: `src/GmRelay.Shared/Platform/PlatformUser.cs`
+- Create: `src/GmRelay.Shared/Platform/PlatformGroup.cs`
+- Create: `src/GmRelay.Shared/Platform/PlatformMessageContracts.cs`
+- Create: `src/GmRelay.Shared/Platform/IPlatformMessenger.cs`
+
+- [ ] **Step 1: Add the contract files exactly as described in the Design section**
+- [ ] **Step 2: Run PlatformContractsTests and verify GREEN**
+
+Run:
+
+```powershell
+dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter PlatformContractsTests
+```
+
+Expected: `Passed`.
+
+### Task 3: RED - Adapter and Flow Source Tests
+
+**Files:**
+- Create: `tests/GmRelay.Bot.Tests/Infrastructure/Telegram/TelegramPlatformMessengerSourceTests.cs`
+
+- [ ] **Step 1: Write source tests for adapter wiring and target flows**
+
+```csharp
+namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
+
+public sealed class TelegramPlatformMessengerSourceTests
+{
+    [Fact]
+    public async Task Program_ShouldRegisterTelegramPlatformMessenger()
+    {
+        var program = await ReadRepositoryFileAsync("src/GmRelay.Bot/Program.cs");
+
+        Assert.Contains("IPlatformMessenger", program, StringComparison.Ordinal);
+        Assert.Contains("TelegramPlatformMessenger", program, StringComparison.Ordinal);
+    }
+
+    [Theory]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/CreateSession/PromoteWaitlistedPlayerHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/RescheduleSession/InitiateRescheduleHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleVoteHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/ExportCalendar/ExportCalendarHandler.cs")]
+    public async Task SessionFlows_ShouldUsePlatformMessengerForOutboundTelegramWork(string relativePath)
+    {
+        var source = await ReadRepositoryFileAsync(relativePath);
+
+        Assert.Contains("IPlatformMessenger", source, StringComparison.Ordinal);
+        Assert.DoesNotContain("BatchMessageEditor.EditBatchMessageAsync", source, StringComparison.Ordinal);
+        Assert.DoesNotContain(".AnswerCallbackQuery(", source, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task TelegramPlatformMessenger_ShouldOwnTelegramBotClientCalls()
+    {
+        var source = await ReadRepositoryFileAsync("src/GmRelay.Bot/Infrastructure/Telegram/TelegramPlatformMessenger.cs");
+
+        Assert.Contains("ITelegramBotClient", source, StringComparison.Ordinal);
+        Assert.Contains("BatchMessageEditor.EditBatchMessageAsync", source, StringComparison.Ordinal);
+        Assert.Contains("AnswerCallbackQuery", source, StringComparison.Ordinal);
+        Assert.Contains("SendDocument", source, StringComparison.Ordinal);
+    }
+
+    private static async Task<string> ReadRepositoryFileAsync(string relativePath)
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var candidate = Path.Combine(directory.FullName, relativePath);
+            if (File.Exists(candidate))
+            {
+                return await File.ReadAllTextAsync(candidate);
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
+    }
+}
+```
+
+- [ ] **Step 2: Run tests and verify RED**
+
+Run:
+
+```powershell
+dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter TelegramPlatformMessengerSourceTests
+```
+
+Expected: failures because `TelegramPlatformMessenger` is missing and handlers still call Telegram APIs directly.
+
+### Task 4: GREEN - Implement TelegramPlatformMessenger and Registration
+
+**Files:**
+- Create: `src/GmRelay.Bot/Infrastructure/Telegram/TelegramPlatformMessenger.cs`
+- Modify: `src/GmRelay.Bot/Program.cs`
+
+- [ ] **Step 1: Implement adapter**
+
+Implementation notes:
+
+- Parse Telegram chat/thread/message IDs from neutral string IDs with `long.Parse` and `int.Parse`.
+- Use `ParseMode.Html` for HTML text.
+- Map `PlatformMessageAction` URLs to `InlineKeyboardButton.WithUrl`.
+- Return a `PlatformMessageRef` with message IDs converted to strings.
+
+- [ ] **Step 2: Register adapter**
+
+Add `using GmRelay.Shared.Platform;` and register:
+
+```csharp
+builder.Services.AddSingleton<IPlatformMessenger, TelegramPlatformMessenger>();
+```
+
+- [ ] **Step 3: Run adapter source tests**
+
+Run:
+
+```powershell
+dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter TelegramPlatformMessengerSourceTests
+```
+
+Expected: some handler source tests still fail until Task 5.
+
+### Task 5: GREEN - Refactor Session Flows Through Adapter
+
+**Files:**
+- Modify target handler files listed in Task 3
+- Modify: `src/GmRelay.Bot/Features/Notifications/DirectSessionNotificationSender.cs`
+
+- [ ] **Step 1: Replace constructor dependencies**
+
+Use `IPlatformMessenger messenger` in target handlers for outbound operations. Keep `ITelegramBotClient` only where the handler still performs inbound Telegram-specific work that is out of scope, such as message deletion or forum topic creation.
+
+- [ ] **Step 2: Convert Telegram IDs to neutral platform objects**
+
+Use helper code equivalent to:
+
+```csharp
+private static PlatformGroup TelegramGroup(long chatId, string? title, int? threadId = null)
+    => new(
+        PlatformKind.Telegram,
+        chatId.ToString(System.Globalization.CultureInfo.InvariantCulture),
+        title ?? "Telegram chat",
+        ExternalChannelId: chatId.ToString(System.Globalization.CultureInfo.InvariantCulture),
+        ExternalThreadId: threadId?.ToString(System.Globalization.CultureInfo.InvariantCulture));
+
+private static PlatformUser TelegramUser(long telegramId, string displayName, string? username = null)
+    => new(
+        PlatformKind.Telegram,
+        telegramId.ToString(System.Globalization.CultureInfo.InvariantCulture),
+        displayName,
+        username);
+```
+
+- [ ] **Step 3: Replace schedule updates**
+
+Build `SessionBatchViewModel` as before, then call:
+
+```csharp
+await messenger.UpdateScheduleAsync(
+    new PlatformScheduleMessage(
+        group,
+        view,
+        new PlatformMessageRef(PlatformKind.Telegram, group.ExternalGroupId, group.ExternalThreadId, messageId.ToString(System.Globalization.CultureInfo.InvariantCulture))),
+    ct);
+```
+
+- [ ] **Step 4: Replace interaction replies**
+
+Use:
+
+```csharp
+await messenger.AnswerInteractionAsync(
+    new PlatformInteractionReply(command.CallbackQueryId, text, showAlert: false),
+    ct);
+```
+
+- [ ] **Step 5: Replace direct notifications**
+
+`DirectSessionNotificationSender` should become a small compatibility service over `IPlatformMessenger`:
+
+```csharp
+await messenger.SendPrivateMessageAsync(
+    new PlatformPrivateMessage(
+        new PlatformUser(PlatformKind.Telegram, recipient.TelegramId.ToString(CultureInfo.InvariantCulture), recipient.DisplayName, null),
+        htmlText),
+    ct);
+```
+
+- [ ] **Step 6: Replace calendar file sending**
+
+`ExportCalendarHandler` builds the same ICS bytes and calls `SendCalendarFileAsync`, preserving the subscription URL button as a `PlatformMessageAction`.
+
+- [ ] **Step 7: Run target source tests**
+
+Run:
+
+```powershell
+dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter TelegramPlatformMessengerSourceTests
+```
+
+Expected: `Passed`.
+
+### Task 6: Regression Tests
+
+**Files:**
+- Existing tests only unless a compiler failure exposes a missing using or changed behavior.
+
+- [ ] **Step 1: Run rendering and routing tests**
+
+Run:
+
+```powershell
+dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj --filter "FullyQualifiedName~Rendering|FullyQualifiedName~Telegram|FullyQualifiedName~RescheduleSession"
+```
+
+Expected: `Passed`.
+
+- [ ] **Step 2: Run all tests**
+
+Run:
+
+```powershell
+dotnet test tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj
+```
+
+Expected: `Passed`.
+
+- [ ] **Step 3: Build solution**
+
+Run:
+
+```powershell
+dotnet build GM-Relay.slnx
+```
+
+Expected: `Build succeeded` with warnings treated as errors.
+
+### Task 7: Version Bump
+
+**Files:**
+- Modify: `Directory.Build.props`
+- Modify: `compose.yaml`
+- Modify: `.gitea/workflows/deploy.yml`
+- Modify: `src/GmRelay.Web/Components/Layout/NavMenu.razor`
+
+- [ ] **Step 1: Update all four version locations to `2.0.1`**
+- [ ] **Step 2: Verify sync**
+
+Run:
+
+```powershell
+rg -n "2\\.0\\.0|2\\.0\\.1" Directory.Build.props compose.yaml .gitea/workflows/deploy.yml src/GmRelay.Web/Components/Layout/NavMenu.razor
+```
+
+Expected: no `2.0.0` matches in these files and `2.0.1` appears in all required locations.
+
+### Task 8: Documentation Review
+
+**Files:**
+- Review: `README.md`
+- Review: `docs/adr/002-platform-neutral-batch-rendering.md`
+
+- [ ] **Step 1: Check README and ADR for platform contract accuracy**
+- [ ] **Step 2: Update docs if they now misrepresent platform-neutral responsibilities**
+
+Expected likely doc change: README currently lists current version as `v1.15.0`, which is already inconsistent with repo version `2.0.0`. If this PR bumps to `2.0.1`, update that line to `v2.0.1`.
+
+### Task 9: Commit, PR, CI, Review, Merge, Deploy, Release
+
+**Files:**
+- Stage only files intentionally changed for issue #24.
+
+- [ ] **Step 1: Create branch**
+
+```powershell
+git checkout -b codex/refactor/issue-24-platform-messenger
+```
+
+- [ ] **Step 2: Commit**
+
+```powershell
+git add src/GmRelay.Shared/Platform src/GmRelay.Bot tests/GmRelay.Bot.Tests Directory.Build.props compose.yaml .gitea/workflows/deploy.yml src/GmRelay.Web/Components/Layout/NavMenu.razor README.md docs/adr/002-platform-neutral-batch-rendering.md
+git commit -m "refactor: add platform messenger contracts"
+```
+
+- [ ] **Step 3: Push and create PR via Gitea**
+- [ ] **Step 4: Wait for PR CI and fix failures if any**
+- [ ] **Step 5: Run code review subagent and address findings**
+- [ ] **Step 6: Merge PR after CI and review**
+- [ ] **Step 7: Monitor deploy workflow**
+- [ ] **Step 8: Create release `v2.0.1` with Russian release notes**
+- [ ] **Step 9: Close issue #24 with PR and release links**
+
+## Self-Review
+
+- Spec coverage: all issue acceptance criteria map to Shared contracts, Telegram adapter, handler source tests, and build/test verification.
+- Placeholder scan: no `TBD`, `TODO`, or "fill later" placeholders are left in this plan.
+- Type consistency: all snippets use `GmRelay.Shared.Platform`, `PlatformKind.Telegram`, `PlatformMessageRef`, and `IPlatformMessenger` consistently.
+- Scope control: inbound Telegram update parsing remains out of scope; outbound schedule/private/interaction/calendar operations are in scope.

docs/superpowers/plans/2026-05-18-platform-neutral-join-leave.md

@@ -0,0 +1,599 @@
+# Platform-Neutral Join Leave Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Implement Gitea issue #25 by making join/leave session interactions use platform-neutral command models while preserving Telegram callback behavior, seat limits, and waitlist semantics.
+
+**Architecture:** Telegram callback routing remains in `UpdateRouter`, but it becomes an adapter that converts callback data into `PlatformUser`, `PlatformGroup`, and `PlatformMessageRef` values. `JoinSessionHandler` and `LeaveSessionHandler` operate on those neutral values, persist players by `(platform, external_user_id)`, and update schedules through `IPlatformMessenger`.
+
+**Tech Stack:** .NET 10, xUnit, Dapper, Npgsql, Gitea Actions.
+
+---
+
+## Issue Context
+
+- Issue: `#25 refactor: obobshchit JoinSession i LeaveSession pod platform-neutral interactions`
+- Labels: `area:bot`, `area:platform`, `area:shared`, `platform:multi`, `type:refactor`
+- Version bump: patch, `2.1.0` -> `2.1.1`. The issue is labeled refactor, not breaking; do not use a major bump without explicit approval.
+- Existing untracked file: `CLAUDE.md`; do not stage or modify it.
+
+## File Map
+
+- Create: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionCommandTests.cs`
+  - Reflection tests proving join/leave command records expose neutral properties and no Telegram-specific identity/message fields.
+- Create: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionSqlTests.cs`
+  - Source-level regression tests for handler SQL and messenger boundaries.
+- Modify: `tests/GmRelay.Bot.Tests/Infrastructure/Database/PlatformIdentityMigrationTests.cs`
+  - Add a migration test for nullable legacy `players.telegram_id`, required for non-Telegram player inserts.
+- Create: `src/GmRelay.Bot/Migrations/V017__allow_platform_neutral_players.sql`
+  - Drop `NOT NULL` from legacy Telegram-only player columns.
+- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs`
+  - Change `JoinSessionCommand` to neutral properties and query/upsert players by platform identity.
+- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs`
+  - Change `LeaveSessionCommand` to neutral properties and find participants by platform identity.
+- Modify: `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs`
+  - Convert Telegram callback data into neutral command values using `TelegramPlatformIds`.
+- Modify: version files after implementation:
+  - `Directory.Build.props`
+  - `compose.yaml`
+  - `.gitea/workflows/deploy.yml`
+  - `src/GmRelay.Web/Components/Layout/NavMenu.razor`
+
+## Task 1: RED - Command Model Tests
+
+**Files:**
+- Create: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionCommandTests.cs`
+
+- [ ] **Step 1: Write failing command-shape tests**
+
+```csharp
+using GmRelay.Bot.Features.Sessions.CreateSession;
+using GmRelay.Shared.Platform;
+
+namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
+
+public sealed class PlatformNeutralSessionInteractionCommandTests
+{
+    [Fact]
+    public void JoinSessionCommand_ShouldExposePlatformNeutralInteractionContext()
+    {
+        AssertProperty<JoinSessionCommand>("SessionId", typeof(Guid));
+        AssertProperty<JoinSessionCommand>("User", typeof(PlatformUser));
+        AssertProperty<JoinSessionCommand>("InteractionId", typeof(string));
+        AssertProperty<JoinSessionCommand>("Group", typeof(PlatformGroup));
+        AssertProperty<JoinSessionCommand>("ScheduleMessage", typeof(PlatformMessageRef));
+        AssertNoTelegramSpecificProperties<JoinSessionCommand>();
+    }
+
+    [Fact]
+    public void LeaveSessionCommand_ShouldExposePlatformNeutralInteractionContext()
+    {
+        AssertProperty<LeaveSessionCommand>("SessionId", typeof(Guid));
+        AssertProperty<LeaveSessionCommand>("User", typeof(PlatformUser));
+        AssertProperty<LeaveSessionCommand>("InteractionId", typeof(string));
+        AssertProperty<LeaveSessionCommand>("Group", typeof(PlatformGroup));
+        AssertProperty<LeaveSessionCommand>("ScheduleMessage", typeof(PlatformMessageRef));
+        AssertNoTelegramSpecificProperties<LeaveSessionCommand>();
+    }
+
+    private static void AssertProperty<T>(string name, Type expectedType)
+    {
+        var property = Assert.Single(typeof(T).GetProperties(), property => property.Name == name);
+
+        Assert.Equal(expectedType, property.PropertyType);
+    }
+
+    private static void AssertNoTelegramSpecificProperties<T>()
+    {
+        var names = typeof(T).GetProperties().Select(property => property.Name).ToArray();
+
+        Assert.DoesNotContain(names, name => name.Contains("Telegram", StringComparison.Ordinal));
+        Assert.DoesNotContain("ChatId", names);
+        Assert.DoesNotContain("MessageId", names);
+        Assert.DoesNotContain("TelegramUserId", names);
+        Assert.DoesNotContain("TelegramUsername", names);
+    }
+}
+```
+
+- [ ] **Step 2: Verify RED**
+
+Run:
+
+```powershell
+dotnet test .\tests\GmRelay.Bot.Tests\GmRelay.Bot.Tests.csproj --filter PlatformNeutralSessionInteractionCommandTests
+```
+
+Expected: FAIL because `JoinSessionCommand` and `LeaveSessionCommand` still expose `TelegramUserId`, `ChatId`, and `MessageId`, and do not expose `User`, `Group`, or `ScheduleMessage`.
+
+## Task 2: RED - SQL and Boundary Tests
+
+**Files:**
+- Create: `tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionSqlTests.cs`
+- Modify: `tests/GmRelay.Bot.Tests/Infrastructure/Database/PlatformIdentityMigrationTests.cs`
+
+- [ ] **Step 1: Write failing handler source tests**
+
+```csharp
+namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
+
+public sealed class PlatformNeutralSessionInteractionSqlTests
+{
+    [Fact]
+    public async Task JoinSessionHandler_ShouldPersistPlayersByPlatformIdentity()
+    {
+        var handler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs");
+
+        Assert.Contains("platform, external_user_id", handler, StringComparison.Ordinal);
+        Assert.Contains("ON CONFLICT (platform, external_user_id)", handler, StringComparison.Ordinal);
+        Assert.Contains("ExternalUserId", handler, StringComparison.Ordinal);
+        Assert.Contains("ExternalUsername", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("TelegramPlatformIds.", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("command.TelegramUserId", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("command.TelegramUsername", handler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task LeaveSessionHandler_ShouldFindParticipantsByPlatformIdentity()
+    {
+        var handler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs");
+
+        Assert.Contains("p.platform = @Platform", handler, StringComparison.Ordinal);
+        Assert.Contains("p.external_user_id = @ExternalUserId", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("p.telegram_id = @TelegramUserId", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("TelegramPlatformIds.", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("command.TelegramUserId", handler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task SessionInteractionHandlers_ShouldUpdateSchedulesThroughCommandMessageReference()
+    {
+        var joinHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs");
+        var leaveHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs");
+
+        Assert.Contains("new PlatformScheduleMessage(", joinHandler, StringComparison.Ordinal);
+        Assert.Contains("command.Group", joinHandler, StringComparison.Ordinal);
+        Assert.Contains("command.ScheduleMessage", joinHandler, StringComparison.Ordinal);
+        Assert.Contains("new PlatformScheduleMessage(", leaveHandler, StringComparison.Ordinal);
+        Assert.Contains("command.Group", leaveHandler, StringComparison.Ordinal);
+        Assert.Contains("command.ScheduleMessage", leaveHandler, StringComparison.Ordinal);
+    }
+
+    private static async Task<string> ReadRepositoryFileAsync(string relativePath)
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var candidate = Path.Combine(directory.FullName, relativePath);
+            if (File.Exists(candidate))
+            {
+                return await File.ReadAllTextAsync(candidate);
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
+    }
+}
+```
+
+- [ ] **Step 2: Add failing migration assertion**
+
+Append to `PlatformIdentityMigrationTests`:
+
+```csharp
+[Fact]
+public async Task MigrationV017_ShouldAllowPlayersWithoutLegacyTelegramId()
+{
+    var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V017__allow_platform_neutral_players.sql");
+
+    Assert.Contains("ALTER TABLE players", migration, StringComparison.Ordinal);
+    Assert.Contains("telegram_id DROP NOT NULL", migration, StringComparison.Ordinal);
+}
+```
+
+- [ ] **Step 3: Verify RED**
+
+Run:
+
+```powershell
+dotnet test .\tests\GmRelay.Bot.Tests\GmRelay.Bot.Tests.csproj --filter "PlatformNeutralSessionInteractionSqlTests|MigrationV017_ShouldAllowPlayersWithoutLegacyTelegramId"
+```
+
+Expected: FAIL because handlers still use Telegram-specific properties and the V017 migration file does not exist.
+
+## Task 3: GREEN - Add Migration
+
+**Files:**
+- Create: `src/GmRelay.Bot/Migrations/V017__allow_platform_neutral_players.sql`
+
+- [ ] **Step 1: Create the migration**
+
+```sql
+-- =============================================================
+-- V017: Allow platform-neutral players
+-- =============================================================
+-- Legacy Telegram identity columns remain for backward compatibility,
+-- but non-Telegram platform users do not have Telegram ids.
+-- =============================================================
+
+ALTER TABLE players
+    ALTER COLUMN telegram_id DROP NOT NULL;
+```
+
+- [ ] **Step 2: Verify migration test turns green**
+
+Run:
+
+```powershell
+dotnet test .\tests\GmRelay.Bot.Tests\GmRelay.Bot.Tests.csproj --filter MigrationV017_ShouldAllowPlayersWithoutLegacyTelegramId
+```
+
+Expected: PASS.
+
+## Task 4: GREEN - Refactor JoinSessionCommand and Handler
+
+**Files:**
+- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs`
+
+- [ ] **Step 1: Replace command record**
+
+Replace the existing `JoinSessionCommand` declaration with:
+
+```csharp
+public sealed record JoinSessionCommand(
+    Guid SessionId,
+    PlatformUser User,
+    string InteractionId,
+    PlatformGroup Group,
+    PlatformMessageRef ScheduleMessage);
+```
+
+- [ ] **Step 2: Replace player upsert**
+
+Use platform identity parameters:
+
+```csharp
+var platform = command.User.Platform.ToString();
+var legacyTelegramId = command.User.Platform == PlatformKind.Telegram
+    ? long.Parse(command.User.ExternalUserId, CultureInfo.InvariantCulture)
+    : (long?)null;
+var legacyTelegramUsername = command.User.Platform == PlatformKind.Telegram
+    ? command.User.ExternalUsername
+    : null;
+
+var playerId = await connection.ExecuteScalarAsync<Guid>(
+    @"INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
+      VALUES (@LegacyTelegramId, @Name, @LegacyTelegramUsername, @Platform, @ExternalUserId, @ExternalUsername)
+      ON CONFLICT (platform, external_user_id)
+      WHERE platform IS NOT NULL AND external_user_id IS NOT NULL
+      DO UPDATE
+      SET display_name = EXCLUDED.display_name,
+          telegram_username = COALESCE(EXCLUDED.telegram_username, players.telegram_username),
+          platform = EXCLUDED.platform,
+          external_user_id = EXCLUDED.external_user_id,
+          external_username = EXCLUDED.external_username
+      RETURNING id;",
+    new
+    {
+        LegacyTelegramId = legacyTelegramId,
+        Name = command.User.DisplayName,
+        LegacyTelegramUsername = legacyTelegramUsername,
+        Platform = platform,
+        command.User.ExternalUserId,
+        command.User.ExternalUsername
+    },
+    transaction);
+```
+
+Add `using System.Globalization;` at the top.
+
+- [ ] **Step 3: Update participant display query**
+
+Change the participant projection to prefer platform-neutral username:
+
+```sql
+COALESCE(p.external_username, p.telegram_username) as TelegramUsername
+```
+
+- [ ] **Step 4: Update schedule message and interaction reply usage**
+
+Use:
+
+```csharp
+await messenger.UpdateScheduleAsync(
+    new PlatformScheduleMessage(
+        command.Group,
+        view,
+        command.ScheduleMessage),
+    ct);
+```
+
+and:
+
+```csharp
+private Task AnswerAsync(string interactionId, string text, CancellationToken ct) =>
+    messenger.AnswerInteractionAsync(new PlatformInteractionReply(interactionId, text), ct);
+```
+
+Replace all `command.CallbackQueryId` calls with `command.InteractionId`.
+
+- [ ] **Step 5: Verify command and SQL tests for join**
+
+Run:
+
+```powershell
+dotnet test .\tests\GmRelay.Bot.Tests\GmRelay.Bot.Tests.csproj --filter "JoinSessionCommand_ShouldExposePlatformNeutralInteractionContext|JoinSessionHandler_ShouldPersistPlayersByPlatformIdentity"
+```
+
+Expected: PASS for join-focused tests.
+
+## Task 5: GREEN - Refactor LeaveSessionCommand and Handler
+
+**Files:**
+- Modify: `src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs`
+
+- [ ] **Step 1: Replace command record**
+
+Replace the existing `LeaveSessionCommand` declaration with:
+
+```csharp
+public sealed record LeaveSessionCommand(
+    Guid SessionId,
+    PlatformUser User,
+    string InteractionId,
+    PlatformGroup Group,
+    PlatformMessageRef ScheduleMessage);
+```
+
+- [ ] **Step 2: Replace participant lookup**
+
+Use platform identity instead of Telegram id:
+
+```csharp
+var platform = command.User.Platform.ToString();
+
+var participant = await connection.QuerySingleOrDefaultAsync<LeaveSessionParticipantDto>(
+    """
+    SELECT sp.id AS ParticipantRowId,
+           p.display_name AS DisplayName,
+           sp.registration_status AS RegistrationStatus
+    FROM session_participants sp
+    JOIN players p ON p.id = sp.player_id
+    WHERE sp.session_id = @SessionId
+      AND p.platform = @Platform
+      AND p.external_user_id = @ExternalUserId
+      AND sp.is_gm = false
+    FOR UPDATE OF sp
+    """,
+    new { command.SessionId, Platform = platform, command.User.ExternalUserId },
+    transaction);
+```
+
+- [ ] **Step 3: Update participant display query**
+
+Change the participant projection to:
+
+```sql
+COALESCE(p.external_username, p.telegram_username) AS TelegramUsername
+```
+
+- [ ] **Step 4: Update schedule message and interaction reply usage**
+
+Use:
+
+```csharp
+await messenger.UpdateScheduleAsync(
+    new PlatformScheduleMessage(
+        command.Group,
+        view,
+        command.ScheduleMessage),
+    ct);
+```
+
+Replace all `command.CallbackQueryId` calls with `command.InteractionId`.
+
+- [ ] **Step 5: Verify leave tests**
+
+Run:
+
+```powershell
+dotnet test .\tests\GmRelay.Bot.Tests\GmRelay.Bot.Tests.csproj --filter "LeaveSessionCommand_ShouldExposePlatformNeutralInteractionContext|LeaveSessionHandler_ShouldFindParticipantsByPlatformIdentity|SessionInteractionHandlers_ShouldUpdateSchedulesThroughCommandMessageReference"
+```
+
+Expected: PASS.
+
+## Task 6: GREEN - Convert Telegram Router to Neutral Commands
+
+**Files:**
+- Modify: `src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs`
+
+- [ ] **Step 1: Add local conversion values in `HandleCallbackQueryAsync`**
+
+After parsing `action`, add:
+
+```csharp
+var user = TelegramPlatformIds.User(
+    query.From.Id,
+    query.From.FirstName + (string.IsNullOrEmpty(query.From.LastName) ? "" : $" {query.From.LastName}"),
+    query.From.Username);
+var group = TelegramPlatformIds.Group(message.Chat.Id, message.MessageThreadId, message.Chat.Title);
+var scheduleMessage = TelegramPlatformIds.Message(message.Chat.Id, message.MessageThreadId, message.MessageId);
+```
+
+- [ ] **Step 2: Update join command construction**
+
+```csharp
+var command = new JoinSessionCommand(
+    SessionId: joinSessionId,
+    User: user,
+    InteractionId: query.Id,
+    Group: group,
+    ScheduleMessage: scheduleMessage);
+```
+
+- [ ] **Step 3: Update leave command construction**
+
+```csharp
+var command = new LeaveSessionCommand(
+    SessionId: leaveSessionId,
+    User: user,
+    InteractionId: query.Id,
+    Group: group,
+    ScheduleMessage: scheduleMessage);
+```
+
+- [ ] **Step 4: Verify compile**
+
+Run:
+
+```powershell
+dotnet test .\tests\GmRelay.Bot.Tests\GmRelay.Bot.Tests.csproj --filter PlatformNeutralSessionInteractionCommandTests
+```
+
+Expected: PASS.
+
+## Task 7: REFACTOR - Clean Up and Full Test Pass
+
+**Files:**
+- Modify only files already listed if cleanup is needed.
+
+- [ ] **Step 1: Remove now-unused Telegram handler imports**
+
+Check `JoinSessionHandler.cs` and `LeaveSessionHandler.cs` for unused:
+
+```csharp
+using GmRelay.Bot.Infrastructure.Telegram;
+```
+
+Remove it from handlers if no longer needed.
+
+- [ ] **Step 2: Run focused tests**
+
+```powershell
+dotnet test .\tests\GmRelay.Bot.Tests\GmRelay.Bot.Tests.csproj --filter "PlatformNeutralSessionInteractionCommandTests|PlatformNeutralSessionInteractionSqlTests|PlatformIdentityMigrationTests"
+```
+
+Expected: PASS.
+
+- [ ] **Step 3: Run full test suite**
+
+```powershell
+dotnet test .\GM-Relay.slnx
+```
+
+Expected: PASS.
+
+- [ ] **Step 4: Build solution**
+
+```powershell
+dotnet build .\GM-Relay.slnx
+```
+
+Expected: PASS.
+
+## Task 8: Version Bump
+
+**Files:**
+- Modify: `Directory.Build.props`
+- Modify: `compose.yaml`
+- Modify: `.gitea/workflows/deploy.yml`
+- Modify: `src/GmRelay.Web/Components/Layout/NavMenu.razor`
+
+- [ ] **Step 1: Update version from `2.1.0` to `2.1.1`**
+
+Expected exact replacements:
+
+```xml
+<Version>2.1.1</Version>
+```
+
+```yaml
+VERSION: 2.1.1
+```
+
+```yaml
+image: git.codeanddice.ru/toutsu/gmrelay-bot:2.1.1
+image: git.codeanddice.ru/toutsu/gmrelay-web:2.1.1
+```
+
+```razor
+<div class="nav-version">v2.1.1</div>
+```
+
+- [ ] **Step 2: Verify synchronized versions**
+
+Run:
+
+```powershell
+rg "<Version>|image: git.codeanddice.ru/toutsu/gmrelay-|VERSION:|nav-version" Directory.Build.props compose.yaml .gitea\workflows\deploy.yml src\GmRelay.Web\Components\Layout\NavMenu.razor
+```
+
+Expected: all project image/app/deploy UI versions show `2.1.1`.
+
+## Task 9: PR, CI, Review, Merge, Deploy, Release
+
+**Files:**
+- No additional source changes expected.
+
+- [ ] **Step 1: Create branch after approval**
+
+```powershell
+git checkout -b refactor/issue-25-platform-neutral-join-leave
+```
+
+- [ ] **Step 2: Stage only intended files**
+
+```powershell
+git add docs/superpowers/plans/2026-05-18-platform-neutral-join-leave.md tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionCommandTests.cs tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionSqlTests.cs tests/GmRelay.Bot.Tests/Infrastructure/Database/PlatformIdentityMigrationTests.cs src/GmRelay.Bot/Migrations/V017__allow_platform_neutral_players.sql src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs Directory.Build.props compose.yaml .gitea/workflows/deploy.yml src/GmRelay.Web/Components/Layout/NavMenu.razor
+```
+
+- [ ] **Step 3: Commit**
+
+```powershell
+git commit -m "refactor: make session join leave platform-neutral"
+```
+
+- [ ] **Step 4: Push and create Gitea PR**
+
+```powershell
+git push -u origin refactor/issue-25-platform-neutral-join-leave
+```
+
+PR title:
+
+```text
+refactor: make session join leave platform-neutral
+```
+
+PR body:
+
+```markdown
+## Summary
+- Closes #25.
+- Converts join/leave session interaction commands from Telegram-specific fields to platform-neutral `PlatformUser`, `PlatformGroup`, and `PlatformMessageRef`.
+- Persists and looks up session participants by `(platform, external_user_id)`.
+- Keeps Telegram callback data and schedule update behavior intact.
+
+## Test plan
+- `dotnet test .\tests\GmRelay.Bot.Tests\GmRelay.Bot.Tests.csproj --filter "PlatformNeutralSessionInteractionCommandTests|PlatformNeutralSessionInteractionSqlTests|PlatformIdentityMigrationTests"`
+- `dotnet test .\GM-Relay.slnx`
+- `dotnet build .\GM-Relay.slnx`
+
+## Workflow
+- [ ] CI passes
+- [ ] Code review approved
+- [ ] Deployed
+- [ ] Release published
+```
+
+- [ ] **Step 5: Watch CI, request review, merge, deploy, release**
+
+Use Gitea MCP for PR creation, CI polling, review, merge, deploy monitoring, and release `v2.1.1`. Close issue #25 after release and add a comment linking the PR and release.
+
+## Self-Review
+
+- Spec coverage: issue scope is covered by neutral command records, Telegram adapter conversion, platform identity SQL, messenger-based schedule updates, and tests.
+- Placeholder scan: no `TBD`, `TODO`, or "fill later" steps remain.
+- Type consistency: commands consistently use `PlatformUser User`, `string InteractionId`, `PlatformGroup Group`, and `PlatformMessageRef ScheduleMessage`.

scripts/restore.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+# GM-Relay PostgreSQL Backup Restore Script
+# Usage: ./scripts/restore.sh [backup_file]
+# If no file is provided, uses the most recent backup.
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+
+# Check required env
+if [ -z "${POSTGRES_PASSWORD:-}" ]; then
+    if [ -f "${PROJECT_ROOT}/.env" ]; then
+        # shellcheck source=/dev/null
+        set -a
+        . "${PROJECT_ROOT}/.env"
+        set +a
+    fi
+fi
+
+if [ -z "${POSTGRES_PASSWORD:-}" ]; then
+    echo "ERROR: POSTGRES_PASSWORD is not set. Please set it in your environment or .env file."
+    exit 1
+fi
+
+BACKUP_DIR="${PROJECT_ROOT}/backups"
+
+# Determine backup file
+if [ $# -ge 1 ]; then
+    BACKUP_FILE="$1"
+else
+    BACKUP_FILE=$(find "${BACKUP_DIR}" -name 'gmrelay_db_*.sql.gz' -type f -printf '%T+ %p\n' 2>/dev/null | sort -r | head -n1 | cut -d' ' -f2-)
+    if [ -z "${BACKUP_FILE}" ]; then
+        echo "ERROR: No backup files found in ${BACKUP_DIR}."
+        exit 1
+    fi
+fi
+
+if [ ! -f "${BACKUP_FILE}" ]; then
+    echo "ERROR: Backup file not found: ${BACKUP_FILE}"
+    exit 1
+fi
+
+echo "=================================================="
+echo "  GM-Relay PostgreSQL Restore"
+echo "=================================================="
+echo ""
+echo "Backup file: ${BACKUP_FILE}"
+echo "Database:    gmrelay_db"
+echo "User:        gmrelay"
+echo ""
+read -p "This will OVERWRITE the current database. Are you sure? [y/N] " CONFIRM
+
+if [[ ! "${CONFIRM}" =~ ^[Yy]$ ]]; then
+    echo "Restore cancelled."
+    exit 0
+fi
+
+echo ""
+echo "Restoring database from ${BACKUP_FILE}..."
+
+# Restore using docker compose exec to leverage the running postgres container
+COMPOSE_ARGS="-f ${PROJECT_ROOT}/compose.yaml"
+
+docker compose ${COMPOSE_ARGS} exec -T -e PGPASSWORD="${POSTGRES_PASSWORD}" db psql \
+    -U gmrelay \
+    -d gmrelay_db \
+    -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;" 2>/dev/null || true
+
+gunzip -c "${BACKUP_FILE}" | docker compose ${COMPOSE_ARGS} exec -T -e PGPASSWORD="${POSTGRES_PASSWORD}" db psql \
+    -U gmrelay \
+    -d gmrelay_db
+
+echo ""
+echo "=================================================="
+echo "  Restore completed successfully!"
+echo "=================================================="

src/GmRelay.AppHost/packages.lock.json

@@ -0,0 +1,687 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net10.0": {
+      "Aspire.Dashboard.Sdk.win-x64": {
+        "type": "Direct",
+        "requested": "[13.2.1, )",
+        "resolved": "13.2.1",
+        "contentHash": "KLB9rXwY8kg2taWwxsJFoK0cAuupSZurcv1zTyYMqLyNuwvYYjs65Yz3g/cgh22QlUfOT3tOh+Jzk5MdJhy5+w=="
+      },
+      "Aspire.Hosting.AppHost": {
+        "type": "Direct",
+        "requested": "[13.2.1, )",
+        "resolved": "13.2.1",
+        "contentHash": "4B/eoZPwOobxpMpvYnqe/EcXabjPhZJhfxlHXv5gdKd16duoWbHnvvAZJsVI3WUpakCwmsCiTrT4sNGfW8H+IQ==",
+        "dependencies": {
+          "AspNetCore.HealthChecks.Uris": "9.0.0",
+          "Aspire.Hosting": "13.2.1",
+          "Google.Protobuf": "3.33.5",
+          "Grpc.AspNetCore": "2.76.0",
+          "Grpc.Net.ClientFactory": "2.76.0",
+          "Grpc.Tools": "2.78.0",
+          "Humanizer.Core": "2.14.1",
+          "JsonPatch.Net": "3.3.0",
+          "KubernetesClient": "18.0.13",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "10.0.5",
+          "Microsoft.Extensions.FileSystemGlobbing": "10.0.5",
+          "Microsoft.Extensions.Hosting": "10.0.5",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Http": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5",
+          "ModelContextProtocol": "1.0.0",
+          "Newtonsoft.Json": "13.0.4",
+          "Polly.Core": "8.6.5",
+          "Semver": "3.0.0",
+          "StreamJsonRpc": "2.22.23",
+          "System.IO.Hashing": "10.0.3"
+        }
+      },
+      "Aspire.Hosting.Orchestration.win-x64": {
+        "type": "Direct",
+        "requested": "[13.2.1, )",
+        "resolved": "13.2.1",
+        "contentHash": "39lRUH4WuCsBaYB7fZH1/r81SSJIXrA8WphBlAdP1QT95+1sKQHzXJuXU4nzKpBLv4oZmjcWzvA+FDMGZbWmkw=="
+      },
+      "Aspire.Hosting.PostgreSQL": {
+        "type": "Direct",
+        "requested": "[13.2.1, )",
+        "resolved": "13.2.1",
+        "contentHash": "7F/nmeplR9cYE/B/E1haRjnkoBRQ/voMXpnK/SNJoXSFs4Vb/g00CDDvI/xfH3SAV7Xq8ekWa9ZbX56JuQ+YiA==",
+        "dependencies": {
+          "AspNetCore.HealthChecks.NpgSql": "9.0.0",
+          "AspNetCore.HealthChecks.Uris": "9.0.0",
+          "Aspire.Hosting": "13.2.1",
+          "Google.Protobuf": "3.33.5",
+          "Grpc.AspNetCore": "2.76.0",
+          "Grpc.Net.ClientFactory": "2.76.0",
+          "Grpc.Tools": "2.78.0",
+          "Humanizer.Core": "2.14.1",
+          "JsonPatch.Net": "3.3.0",
+          "KubernetesClient": "18.0.13",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.25",
+          "Microsoft.Extensions.FileSystemGlobbing": "10.0.5",
+          "Microsoft.Extensions.Hosting": "10.0.5",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Http": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5",
+          "ModelContextProtocol": "1.0.0",
+          "Newtonsoft.Json": "13.0.4",
+          "Polly.Core": "8.6.5",
+          "Semver": "3.0.0",
+          "StreamJsonRpc": "2.22.23",
+          "System.IO.Hashing": "10.0.3"
+        }
+      },
+      "SecurityCodeScan.VS2019": {
+        "type": "Direct",
+        "requested": "[5.6.7, )",
+        "resolved": "5.6.7",
+        "contentHash": "WIE9RJswdSc2j+rLz2gW6U+gMUjMHzY2j7C/CL8/R2olXNM/+twarfMnWqm+rZodDBvaYDApJyxM8mVYf9FGrQ=="
+      },
+      "Aspire.Hosting": {
+        "type": "Transitive",
+        "resolved": "13.2.1",
+        "contentHash": "GY/T5iK2F4K3Sk60VUeVnTX1MhCjSaX48+qPUjA/rI1x1ONHevHzFj+Gc3fNlGEaZGY8L87hSxwGrV+Bjd5EJw==",
+        "dependencies": {
+          "AspNetCore.HealthChecks.Uris": "9.0.0",
+          "Google.Protobuf": "3.33.5",
+          "Grpc.AspNetCore": "2.76.0",
+          "Grpc.Net.ClientFactory": "2.76.0",
+          "Grpc.Tools": "2.78.0",
+          "Humanizer.Core": "2.14.1",
+          "JsonPatch.Net": "3.3.0",
+          "KubernetesClient": "18.0.13",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.25",
+          "Microsoft.Extensions.FileSystemGlobbing": "10.0.5",
+          "Microsoft.Extensions.Hosting": "10.0.5",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Http": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5",
+          "ModelContextProtocol": "1.0.0",
+          "Newtonsoft.Json": "13.0.4",
+          "Polly.Core": "8.6.5",
+          "Semver": "3.0.0",
+          "StreamJsonRpc": "2.22.23",
+          "System.IO.Hashing": "10.0.3"
+        }
+      },
+      "AspNetCore.HealthChecks.NpgSql": {
+        "type": "Transitive",
+        "resolved": "9.0.0",
+        "contentHash": "npc58/AD5zuVxERdhCl2Kb7WnL37mwX42SJcXIwvmEig0/dugOLg3SIwtfvvh3TnvTwR/sk5LYNkkPaBdks61A==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11",
+          "Npgsql": "8.0.3"
+        }
+      },
+      "AspNetCore.HealthChecks.Uris": {
+        "type": "Transitive",
+        "resolved": "9.0.0",
+        "contentHash": "XYdNlA437KeF8p9qOpZFyNqAN+c0FXt/JjTvzH/Qans0q0O3pPE8KPnn39ucQQjR/Roum1vLTP3kXiUs8VHyuA==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11",
+          "Microsoft.Extensions.Http": "8.0.0"
+        }
+      },
+      "Fractions": {
+        "type": "Transitive",
+        "resolved": "7.3.0",
+        "contentHash": "2bETFWLBc8b7Ut2SVi+bxhGVwiSpknHYGBh2PADyGWONLkTxT7bKyDRhF8ao+XUv90tq8Fl7GTPxSI5bacIRJw=="
+      },
+      "Google.Protobuf": {
+        "type": "Transitive",
+        "resolved": "3.33.5",
+        "contentHash": "XEzLpCTosZb5I6eGSPn7rAES0VfkJkn3Cqydh0W39POdZwkdhPhOmAROTFJF9g0ardst4ulNXRm/q/iXwNu+Qw=="
+      },
+      "Grpc.AspNetCore": {
+        "type": "Transitive",
+        "resolved": "2.76.0",
+        "contentHash": "LyXMmpN2Ba0TE35SOLSKbGqIYtJuhc1UgiaGfoW1X8KJERV70QI5KGW+ckEY7MrXoFWN/uWo4B70siVhbDmCgQ==",
+        "dependencies": {
+          "Google.Protobuf": "3.31.1",
+          "Grpc.AspNetCore.Server.ClientFactory": "2.76.0",
+          "Grpc.Tools": "2.76.0"
+        }
+      },
+      "Grpc.AspNetCore.Server": {
+        "type": "Transitive",
+        "resolved": "2.76.0",
+        "contentHash": "diSC/ZeNdSdxHdYSOpYwuSBBDYpuNVtJQFJfiBB0WrYOQ4lVMmdxuUZJcViahQyo8pCvS3Mueo5lqFxwwMF/iw==",
+        "dependencies": {
+          "Grpc.Net.Common": "2.76.0"
+        }
+      },
+      "Grpc.AspNetCore.Server.ClientFactory": {
+        "type": "Transitive",
+        "resolved": "2.76.0",
+        "contentHash": "y5KGO1GO0N2L/hCCMR05mmoK8j+v8rKvZ+9nothAxKx2Tf2CwV8f4TM5K0GkKfDsp4vrc4lm90MU6E+DeN7YIw==",
+        "dependencies": {
+          "Grpc.AspNetCore.Server": "2.76.0",
+          "Grpc.Net.ClientFactory": "2.76.0"
+        }
+      },
+      "Grpc.Core.Api": {
+        "type": "Transitive",
+        "resolved": "2.76.0",
+        "contentHash": "cSxC2tdnFdXXuBgIn1pjc4YBx7LXTCp4M0qn+SMBS35VWZY+cEQYLWTBDDhdBH1HzU7BV+ncVZlniGQHMpRJKQ=="
+      },
+      "Grpc.Net.Client": {
+        "type": "Transitive",
+        "resolved": "2.76.0",
+        "contentHash": "K1oldmqw2+Gn69nGRzZLhqSiUZwelX1GrBu/cUl9wNf1C0uB61vFS6JcxUUv9P8VoUJhFsmV44JA6lI2EUt4xw==",
+        "dependencies": {
+          "Grpc.Net.Common": "2.76.0",
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.0"
+        }
+      },
+      "Grpc.Net.ClientFactory": {
+        "type": "Transitive",
+        "resolved": "2.76.0",
+        "contentHash": "XI+kO69L9AV8B9N0UQOmH911r6MOEp9huHiavEsY56DJYuzJ9KAxNGy37dpV6CLbgCaN2uKmpOsZ9Pao6bmpVQ==",
+        "dependencies": {
+          "Grpc.Net.Client": "2.76.0",
+          "Microsoft.Extensions.Http": "8.0.0"
+        }
+      },
+      "Grpc.Net.Common": {
+        "type": "Transitive",
+        "resolved": "2.76.0",
+        "contentHash": "bZpiMVYgvpB44/wBh1RotrkqC7bg2FOasLri2GhR3hMKyzsiTxCoDE49YjPrJeFc4RW0wS8u+EInI09sjxVFRA==",
+        "dependencies": {
+          "Grpc.Core.Api": "2.76.0"
+        }
+      },
+      "Grpc.Tools": {
+        "type": "Transitive",
+        "resolved": "2.78.0",
+        "contentHash": "6jPG2gHon+w2PczW8jjrCRnW/g9eEfCdd7aK6mDooptWtuPsV3ZxAwKKEx7LGEDVoT4c2SViRl8Yu3L1XiWIIg=="
+      },
+      "Humanizer.Core": {
+        "type": "Transitive",
+        "resolved": "2.14.1",
+        "contentHash": "lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw=="
+      },
+      "Json.More.Net": {
+        "type": "Transitive",
+        "resolved": "2.1.0",
+        "contentHash": "qtwsyAsL55y2vB2/sK4Pjg3ZyVzD5KKSpV3lOAMHlnjFfsjQ/86eHJfQT9aV1YysVXzF4+xyHOZbh7Iu3YQ7Lg=="
+      },
+      "JsonPatch.Net": {
+        "type": "Transitive",
+        "resolved": "3.3.0",
+        "contentHash": "GIcMMDtzfzVfIpQgey8w7dhzcw6jG5nD4DDAdQCTmHfblkCvN7mI8K03to8YyUhKMl4PTR6D6nLSvWmyOGFNTg==",
+        "dependencies": {
+          "JsonPointer.Net": "5.2.0"
+        }
+      },
+      "JsonPointer.Net": {
+        "type": "Transitive",
+        "resolved": "5.2.0",
+        "contentHash": "qe1F7Tr/p4mgwLPU9P60MbYkp+xnL2uCPnWXGgzfR/AZCunAZIC0RZ32dLGJJEhSuLEfm0YF/1R3u5C7mEVq+w==",
+        "dependencies": {
+          "Humanizer.Core": "2.14.1",
+          "Json.More.Net": "2.1.0"
+        }
+      },
+      "KubernetesClient": {
+        "type": "Transitive",
+        "resolved": "18.0.13",
+        "contentHash": "X5IuxmydftB148XeULtc7rD5/RvqLuW5SzkIjFovPgJpvV4RAoRqNPruVB7GEFu1Xg+zHVIk88WqdV8JjbgHbA==",
+        "dependencies": {
+          "Fractions": "7.3.0",
+          "YamlDotNet": "16.3.0"
+        }
+      },
+      "MessagePack": {
+        "type": "Transitive",
+        "resolved": "2.5.192",
+        "contentHash": "Jtle5MaFeIFkdXtxQeL9Tu2Y3HsAQGoSntOzrn6Br/jrl6c8QmG22GEioT5HBtZJR0zw0s46OnKU8ei2M3QifA==",
+        "dependencies": {
+          "MessagePack.Annotations": "2.5.192",
+          "Microsoft.NET.StringTools": "17.6.3"
+        }
+      },
+      "MessagePack.Annotations": {
+        "type": "Transitive",
+        "resolved": "2.5.192",
+        "contentHash": "jaJuwcgovWIZ8Zysdyf3b7b34/BrADw4v82GaEZymUhDd3ScMPrYd/cttekeDteJJPXseJxp04yTIcxiVUjTWg=="
+      },
+      "Microsoft.Extensions.AI.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.3.0",
+        "contentHash": "hDjDvUERvUH3HBMs2MDusOcGJBjAHOG5pJIU2x/HZEa4e1UthNKt89cwMi3B+ogJo6skki1XFjfgGN3ksnVqvQ=="
+      },
+      "Microsoft.Extensions.Caching.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.3",
+        "contentHash": "5dtXBvI8t3z8pF4tB38JYgi/enCL/DwSXxpqShgFz3SHJ7IzqFIMs6Gu5ik8sNZzcO9qQs3xIDpB3vDamkYG+Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.3"
+        }
+      },
+      "Microsoft.Extensions.Configuration": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "8Rx5sqg04FttxrumyG6bmoRuFRgYzK6IVwF1i0/o0cXfKBdDeVpJejKHtJCMjyg9E/DNMVqpqOGe/tCT5gYvVA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "P09QpTHjqHmCLQOTC+WyLkoRNxek4NIvfWt+TnU0etoDUSRxcltyd6+j/ouRbMdLR0j44GqGO+lhI2M4fAHG4g==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Binder": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "99Z4rjyXopb1MIazDSPcvwYCUdYNO01Cf1GUs2WUjIFAbkGmwzj2vPa2k+3pheJRV+YgNd2QqRKHAri0oBAU4Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.CommandLine": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "or9fOLopMUTJOQVJ3bou4aD6PwvsiKf4kZC4EE5sRRKSkmh+wfk/LekJXRjAX88X+1JA9zHjDo+5fiQ7z3MY/A==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.EnvironmentVariables": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "tchMGQ+zVTO40np/Zzg2Li/TIR8bksQgg4UVXZa0OzeFCKWnIYtxE2FVs+eSmjPGCjMS2voZbwN/mUcYfpSTuA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.FileExtensions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "OhTr0O79dP49734lLTqVveivVX9sDXxbI/8vjELAZTHXqoN90mdpgTAgwicJED42iaHMCcZcK6Bj+8wNyBikaw==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Json": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "brBM/WP0YAUYh2+QqSYVdK8eQHYQTtTEUJXJ+84Zkdo2buGLja9VSrMIhgoeBUU7JBmcskAib8Lb/N83bvxgYQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.FileExtensions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.UserSecrets": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "fhdG6UV9lIp70QhNkVyaHciUVq25IPFkczheVJL9bIFvmnJ+Zghaie6dWkDbbVmxZlHl9gj3zTDxMxJs5zNhIA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Json": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "v1SVsowG6YE1YnHVGmLWz57YTRCQRx9pH5ebIESXfm5isI9gA3QaMyg/oMTzPpXYZwSAVDzYItGJKfmV+pqXkQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "iVMtq9eRvzyhx8949EGT0OCYJfXi737SbRVzWXE5GrOgGj5AaZ9eUuxA/BSUfmOMALKn/g8KfFaNQw0eiB3lyA=="
+      },
+      "Microsoft.Extensions.Diagnostics": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "vAJHd4yOpmKoK+jBuYV7a3y+Ab9U4ARCc29b6qvMy276RgJFw9LFs0DdsPqOL3ahwzyrX7tM+i4cCxU/RX0qAg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "/nYGrpa9/0BZofrVpBbbj+Ns8ZesiPE0V/KxsuHgDgHQopIzN54nRaQGSuvPw16/kI9sW1Zox5yyAPqvf0Jz6A==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "REdt95QXHscGdtw/UUgyCW2lF9DJcAOJxmebKW2IkgUjuCAdMODIi2HNOWg5utW98nm8ekgV0Gjqs/sljwwqMw==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "NrIMTy7dpqxAvA6kHAYH8cXID/YgeNOy0OqFKpLtkPu5X4WS/basX91UszANzVrMNRAICJ2GOnGiRxJtsRyEQw=="
+      },
+      "Microsoft.Extensions.FileProviders.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "nCBmCx0Xemlu65ZiWMcXbvfvtznKxf4/YYKF9R28QkqdI9lTikedGqzJ28/xmdGGsxUnsP5/3TQGpiPwVjK0dA==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.FileProviders.Physical": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "dMu5kUPSfol1Rqhmr6nWPSmbFjDe9w6bkoKithG17bWTZA0UyKirTatM5mqYUN3mGpNA0MorlusIoVTh6J7o5g==",
+        "dependencies": {
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileSystemGlobbing": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.FileSystemGlobbing": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "mOE3ARusNQR0a5x8YOcnUbfyyXGqoAWQtEc7qFOfNJgruDWQLo39Re+3/Lzj5pLPFuFYj8hN4dgKzaSQDKiOCw=="
+      },
+      "Microsoft.Extensions.Hosting": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "8i7e5IBdiKLNqt/+ciWrS8U95Rv5DClaaj7ulkZbimnCi4uREWd+lXzkp3joofFuIPOlAzV4AckxLTIELv2jdg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.Configuration.CommandLine": "10.0.5",
+          "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.5",
+          "Microsoft.Extensions.Configuration.FileExtensions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Json": "10.0.5",
+          "Microsoft.Extensions.Configuration.UserSecrets": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.5",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.5",
+          "Microsoft.Extensions.Logging.Console": "10.0.5",
+          "Microsoft.Extensions.Logging.Debug": "10.0.5",
+          "Microsoft.Extensions.Logging.EventLog": "10.0.5",
+          "Microsoft.Extensions.Logging.EventSource": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Hosting.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "+Wb7KAMVZTomwJkQrjuPTe5KBzGod7N8XeG+ScxRlkPOB4sZLG4ccVwjV4Phk5BCJt7uIMnGHVoN6ZMVploX+g==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Http": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "AiFvHYM8nP0wPC7bGPI3NHQlSYSLqjjT7DMJUuuxhd+7pz3O89iu2gdQfgACy5DxsXENiok5i1bMacJL7KR8jA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "+XTMKQyDWg4ODoNHU/BN3BaI1jhGO7VCS+BnzT/4IauiG6y2iPAte7MyD7rHKS+hNP0TkFkjrae8DFjDUxtcxg==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "9HOdqlDtPptVcmKAjsQ/Nr5Rxfq6FMYLdhvZh1lVmeKR738qeYecQD7+ldooXf+u2KzzR1kafSphWngIM3C6ug==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Configuration": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "cSgxsDgfP0+gmVRPVoNHI/KIDavIZxh+CxE6tSLPlYTogqccDnjBFI9CgEsiNuMP6+fiuXUwhhlTz36uUEpwbQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Console": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "PMs2gha2v24hvH5o5KQem5aNK4mN0BhhCWlMqsg9tzifWKzjeQi2tyPOP/RaWMVvalOhVLcrmoMYPqbnia/epg==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Debug": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "/VacEkBQ02A8PBXSa6YpbIXCuisYy6JJr62/+ANJDZE+RMBfZMcXJXLfr/LpyLE6pgdp17Wxlt7e7R9zvkwZ3Q==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.EventLog": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "0ezhWYJS4/6KrqQel9JL+Tr4n+4EX2TF5EYiaysBWNNEM2c3Gtj1moD39esfgk8OHblSX+UFjtZ3z0c4i9tRvw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "System.Diagnostics.EventLog": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.EventSource": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "vN+aq1hBFXyYvY5Ow9WyeR66drKQxRZmas4lAjh6QWfryPkjTn1uLtX5AFIxyDaZj78v5TG2sELUyvrXpAPQQw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Options": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "MDaQMdUplw0AIRhWWmbLA7yQEXaLIHb+9CTroTiNS8OlI0LMXS4LCxtopqauiqGCWlRgJ+xyraVD8t6veRAFbw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Options.ConfigurationExtensions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "BB9uUW3+6Rxu1R97OB1H/13lUF8P2+H1+eDhpZlK30kDh/6E4EKHBUqTp+ilXQmZLzsRErxON8aBSR6WpUKJdg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "/HUHJ0tw/LQvD0DZrz50eQy/3z7PfX7WWEaXnjKTV9/TNdcgFlNTZGo49QhS7PTmhDqMyHRMqAXSBxLh0vso4g=="
+      },
+      "Microsoft.NET.StringTools": {
+        "type": "Transitive",
+        "resolved": "17.6.3",
+        "contentHash": "N0ZIanl1QCgvUumEL1laasU0a7sOE5ZwLZVTn0pAePnfhq8P7SvTjF8Axq+CnavuQkmdQpGNXQ1efZtu5kDFbA=="
+      },
+      "Microsoft.VisualStudio.Threading.Only": {
+        "type": "Transitive",
+        "resolved": "17.13.61",
+        "contentHash": "vl5a2URJYCO5m+aZZtNlAXAMz28e2pUotRuoHD7RnCWOCeoyd8hWp5ZBaLNYq4iEj2oeJx5ZxiSboAjVmB20Qg==",
+        "dependencies": {
+          "Microsoft.VisualStudio.Validation": "17.8.8"
+        }
+      },
+      "Microsoft.VisualStudio.Validation": {
+        "type": "Transitive",
+        "resolved": "17.8.8",
+        "contentHash": "rWXThIpyQd4YIXghNkiv2+VLvzS+MCMKVRDR0GAMlflsdo+YcAN2g2r5U1Ah98OFjQMRexTFtXQQ2LkajxZi3g=="
+      },
+      "ModelContextProtocol": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "W7UX8AQ1qMjXyCDcpP25u/L1W2vIIgfhLX/B2ZtTU1VUyILXdmVbdRjkQesKVPT/wPMpYXIHUcZJTPdsGfKSfQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "10.0.3",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.3",
+          "ModelContextProtocol.Core": "1.0.0"
+        }
+      },
+      "ModelContextProtocol.Core": {
+        "type": "Transitive",
+        "resolved": "1.0.0",
+        "contentHash": "QKboiQEq2MJMGeQ029Gy6xqge88abm0Px9lnG7hueOyf+EDCxi5SUATV+Df7GwT+NwWzkEsYG271bUQD+LGhEg==",
+        "dependencies": {
+          "Microsoft.Extensions.AI.Abstractions": "10.3.0",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.3"
+        }
+      },
+      "Nerdbank.Streams": {
+        "type": "Transitive",
+        "resolved": "2.12.87",
+        "contentHash": "oDKOeKZ865I5X8qmU3IXMyrAnssYEiYWTobPGdrqubN3RtTzEHIv+D6fwhdcfrdhPJzHjCkK/ORztR/IsnmA6g==",
+        "dependencies": {
+          "Microsoft.VisualStudio.Threading.Only": "17.13.61",
+          "Microsoft.VisualStudio.Validation": "17.8.8"
+        }
+      },
+      "Newtonsoft.Json": {
+        "type": "Transitive",
+        "resolved": "13.0.4",
+        "contentHash": "pdgNNMai3zv51W5aq268sujXUyx7SNdE2bj1wZcWjAQrKMFZV260lbqYop1d2GM67JI1huLRwxo9ZqnfF/lC6A=="
+      },
+      "Npgsql": {
+        "type": "Transitive",
+        "resolved": "8.0.3",
+        "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.0"
+        }
+      },
+      "Polly.Core": {
+        "type": "Transitive",
+        "resolved": "8.6.5",
+        "contentHash": "t+sUVrIwvo7UmsgHGgOG9F0GDZSRIm47u2ylH17Gvcv1q5hNEwgD5GoBlFyc0kh/pebmPyrAgvGsR/65ZBaXlg=="
+      },
+      "Semver": {
+        "type": "Transitive",
+        "resolved": "3.0.0",
+        "contentHash": "9jZCicsVgTebqkAujRWtC9J1A5EQVlu0TVKHcgoCuv345ve5DYf4D1MjhKEnQjdRZo6x/vdv6QQrYFs7ilGzLA==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "5.0.1"
+        }
+      },
+      "StreamJsonRpc": {
+        "type": "Transitive",
+        "resolved": "2.22.23",
+        "contentHash": "Ahq6uUFPnU9alny5h4agyX74th3PRq3NQCRNaDOqWcx20WT06mH/wENSk5IbHDc8BmfreQVEIBx5IXLBbsLFIA==",
+        "dependencies": {
+          "MessagePack": "2.5.192",
+          "Microsoft.VisualStudio.Threading.Only": "17.13.61",
+          "Microsoft.VisualStudio.Validation": "17.8.8",
+          "Nerdbank.Streams": "2.12.87",
+          "Newtonsoft.Json": "13.0.3"
+        }
+      },
+      "System.Diagnostics.EventLog": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "wugvy+pBVzjQEnRs9wMTWwoaeNFX3hsaHeVHFDIvJSWXp7wfmNWu3mxAwBIE6pyW+g6+rHa1Of5fTzb0QVqUTA=="
+      },
+      "System.IO.Hashing": {
+        "type": "Transitive",
+        "resolved": "10.0.3",
+        "contentHash": "La6ICwsdTKhVX+LKN+pvFjQRR3LhLwq3uKdi2knjLzRyPYBSydF4cjXidYxIiTcDD6XVYdsBWQEI8ZxiZ/OdIg=="
+      },
+      "YamlDotNet": {
+        "type": "Transitive",
+        "resolved": "16.3.0",
+        "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
+      }
+    }
+  }
+}

src/GmRelay.Bot/Dockerfile

@@ -30,8 +30,16 @@ RUN dotnet publish "GmRelay.Bot.csproj" -c Release -a $TARGETARCH -o /app/publis
 FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble AS final
 WORKDIR /app
 
+# Устанавливаем wget для healthcheck
+RUN apt-get update && apt-get install -y --no-install-recommends wget \
+    && rm -rf /var/lib/apt/lists/*
+
 # Копируем только AOT-результаты из билда
 COPY --from=build /app/publish .
 
+EXPOSE 8081
+
+USER $APP_UID
+
 # Запуск скомпилированного AOT бинарного файла напрямую
 ENTRYPOINT ["./GmRelay.Bot"]

src/GmRelay.Bot/Features/Confirmation/HandleRsvp/HandleRsvpHandler.cs

@@ -21,7 +21,8 @@ internal sealed record SessionContext(
     DateTime ScheduledAt,
     string Status,
     long GmTelegramId,
-    long TelegramChatId);
+    long TelegramChatId,
+    int? ThreadId);
 
 internal sealed record ParticipantRsvp(
     long TelegramId,
@@ -95,7 +96,8 @@ public sealed class HandleRsvpHandler(
                    s.scheduled_at AS ScheduledAt,
                    s.status AS Status,
                    g.gm_telegram_id AS GmTelegramId,
-                   g.telegram_chat_id AS TelegramChatId
+                   g.telegram_chat_id AS TelegramChatId,
+                   s.thread_id AS ThreadId
             FROM sessions s
             JOIN game_groups g ON g.id = s.group_id
             WHERE s.id = @SessionId
@@ -191,6 +193,7 @@ public sealed class HandleRsvpHandler(
                 {
                     await bot.SendMessage(
                         chatId: session.TelegramChatId,
+                        messageThreadId: session.ThreadId,
                         text: $"🎉 Игра «{session.Title}» подтверждена! Все участники на месте.",
                         cancellationToken: ct);
                 }

src/GmRelay.Bot/Features/Confirmation/SendConfirmation/ISendConfirmationHandler.cs

@@ -0,0 +1,6 @@
+namespace GmRelay.Bot.Features.Confirmation.SendConfirmation;
+
+public interface ISendConfirmationHandler
+{
+    Task HandleAsync(Guid sessionId, CancellationToken ct);
+}

src/GmRelay.Bot/Features/Confirmation/SendConfirmation/SendConfirmationHandler.cs

@@ -15,6 +15,7 @@ internal sealed record SessionInfo(
     DateTime ScheduledAt,
     Guid GroupId,
     long TelegramChatId,
+    int? ThreadId,
     string NotificationMode);
 
 internal sealed record ParticipantInfo(
@@ -32,7 +33,7 @@ public sealed class SendConfirmationHandler(
     NpgsqlDataSource dataSource,
     ITelegramBotClient bot,
     DirectSessionNotificationSender directSender,
-    ILogger<SendConfirmationHandler> logger)
+    ILogger<SendConfirmationHandler> logger) : ISendConfirmationHandler
 {
     public async Task HandleAsync(Guid sessionId, CancellationToken ct)
     {
@@ -43,6 +44,7 @@ public sealed class SendConfirmationHandler(
             """
             SELECT s.id, s.title, s.scheduled_at AS ScheduledAt, s.group_id AS GroupId,
                    g.telegram_chat_id AS TelegramChatId,
+                   s.thread_id AS ThreadId,
                    s.notification_mode AS NotificationMode
             FROM sessions s
             JOIN game_groups g ON g.id = s.group_id
@@ -99,18 +101,21 @@ public sealed class SendConfirmationHandler(
         // 4. Send to group
         var message = await bot.SendMessage(
             chatId: session.TelegramChatId,
+            messageThreadId: session.ThreadId,
             text: text,
             replyMarkup: keyboard,
             cancellationToken: ct);
 
-        // 5. Update session status and store message ID
+        // 5. Update session status, store message ID, and mark confirmation sent
         await connection.ExecuteAsync(
             """
             UPDATE sessions
             SET status = @Status,
                 confirmation_message_id = @MessageId,
+                confirmation_sent_at = now(),
                 updated_at = now()
             WHERE id = @SessionId
+              AND confirmation_sent_at IS NULL
             """,
             new
             {

src/GmRelay.Bot/Features/Notifications/DirectSessionNotificationSender.cs

@@ -1,12 +1,12 @@
-using Telegram.Bot;
-using Telegram.Bot.Types.Enums;
+using GmRelay.Bot.Infrastructure.Telegram;
+using GmRelay.Shared.Platform;
 
 namespace GmRelay.Bot.Features.Notifications;
 
 public sealed record DirectNotificationRecipient(long TelegramId, string DisplayName);
 
 public sealed class DirectSessionNotificationSender(
-    ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     ILogger<DirectSessionNotificationSender> logger)
 {
     public async Task SendAsync(
@@ -20,11 +20,11 @@ public sealed class DirectSessionNotificationSender(
         {
             try
             {
-                await bot.SendMessage(
-                    chatId: recipient.TelegramId,
-                    text: htmlText,
-                    parseMode: ParseMode.Html,
-                    cancellationToken: ct);
+                await messenger.SendPrivateMessageAsync(
+                    new PlatformPrivateMessage(
+                        TelegramPlatformIds.User(recipient.TelegramId, recipient.DisplayName),
+                        htmlText),
+                    ct);
             }
             catch (Exception ex)
             {

src/GmRelay.Bot/Features/Reminders/SendJoinLink/ISendJoinLinkHandler.cs

@@ -0,0 +1,6 @@
+namespace GmRelay.Bot.Features.Reminders.SendJoinLink;
+
+public interface ISendJoinLinkHandler
+{
+    Task HandleAsync(Guid sessionId, CancellationToken ct);
+}

src/GmRelay.Bot/Features/Reminders/SendJoinLink/SendJoinLinkHandler.cs

@@ -14,6 +14,7 @@ internal sealed record JoinLinkSession(
     string JoinLink,
     DateTime ScheduledAt,
     long TelegramChatId,
+    int? ThreadId,
     string NotificationMode);
 
 internal sealed record ConfirmedPlayer(
@@ -31,7 +32,7 @@ public sealed class SendJoinLinkHandler(
     NpgsqlDataSource dataSource,
     ITelegramBotClient bot,
     DirectSessionNotificationSender directSender,
-    ILogger<SendJoinLinkHandler> logger)
+    ILogger<SendJoinLinkHandler> logger) : ISendJoinLinkHandler
 {
     public async Task HandleAsync(Guid sessionId, CancellationToken ct)
     {
@@ -42,6 +43,7 @@ public sealed class SendJoinLinkHandler(
             """
             SELECT s.id, s.title, s.join_link AS JoinLink, s.scheduled_at AS ScheduledAt,
                    g.telegram_chat_id AS TelegramChatId,
+                   s.thread_id AS ThreadId,
                    s.notification_mode AS NotificationMode
             FROM sessions s
             JOIN game_groups g ON g.id = s.group_id
@@ -94,6 +96,7 @@ public sealed class SendJoinLinkHandler(
         // 4. Send
         var message = await bot.SendMessage(
             chatId: session.TelegramChatId,
+            messageThreadId: session.ThreadId,
             text: text,
             cancellationToken: ct);
 

src/GmRelay.Bot/Features/Reminders/SendOneHourReminder/ISendOneHourReminderHandler.cs

@@ -0,0 +1,6 @@
+namespace GmRelay.Bot.Features.Reminders.SendOneHourReminder;
+
+public interface ISendOneHourReminderHandler
+{
+    Task HandleAsync(Guid sessionId, CancellationToken ct);
+}

src/GmRelay.Bot/Features/Reminders/SendOneHourReminder/SendOneHourReminderHandler.cs

@@ -15,7 +15,7 @@ internal sealed record OneHourReminderSession(
 public sealed class SendOneHourReminderHandler(
     NpgsqlDataSource dataSource,
     DirectSessionNotificationSender directSender,
-    ILogger<SendOneHourReminderHandler> logger)
+    ILogger<SendOneHourReminderHandler> logger) : ISendOneHourReminderHandler
 {
     public async Task HandleAsync(Guid sessionId, CancellationToken ct)
     {

src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs

@@ -1,10 +1,9 @@
 using Dapper;
 using GmRelay.Bot.Features.Notifications;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using GmRelay.Shared.Rendering;
 using Npgsql;
-using Telegram.Bot;
-using Telegram.Bot.Types;
 using GmRelay.Bot.Infrastructure.Telegram;
 
 namespace GmRelay.Bot.Features.Sessions.CreateSession;
@@ -14,6 +13,7 @@ public sealed record CancelSessionCommand(
     long TelegramUserId,
     string CallbackQueryId,
     long ChatId,
+    int? MessageThreadId,
     int MessageId);
 
 // DTOs for AOT compilation
@@ -21,7 +21,7 @@ internal sealed record CancelSessionInfoDto(string Title, Guid BatchId, int? Bat
 
 public sealed class CancelSessionHandler(
     NpgsqlDataSource dataSource,
-    ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     DirectSessionNotificationSender directSender,
     ILogger<CancelSessionHandler> logger)
 {
@@ -29,7 +29,7 @@ public sealed class CancelSessionHandler(
     {
         await using var connection = await dataSource.OpenConnectionAsync(ct);
         await using var transaction = await connection.BeginTransactionAsync(ct);
-        
+
         // 1. Проверяем, что запрос делает управляющий данной группы.
         var session = await connection.QuerySingleOrDefaultAsync<CancelSessionInfoDto>(
             """
@@ -51,13 +51,13 @@ public sealed class CancelSessionHandler(
 
         if (session == null)
         {
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия не найдена.", cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Сессия не найдена.", ct);
             return;
         }
 
         if (!session.CanManage)
         {
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, "Только owner или co-GM может отменять сессию.", showAlert: true, cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Только owner или co-GM может отменять сессию.", ct, showAlert: true);
             return;
         }
 
@@ -69,7 +69,7 @@ public sealed class CancelSessionHandler(
 
         // 3. Загружаем весь батч для перерисовки
         var batchSessions = await connection.QueryAsync<SessionBatchDto>(
-            @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers
+            @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers, join_link as JoinLink
               FROM sessions
               WHERE batch_id = @BatchId
               ORDER BY scheduled_at",
@@ -104,22 +104,24 @@ public sealed class CancelSessionHandler(
 
         // 4. Перерисовываем сообщение
         var view = SessionBatchViewBuilder.Build(session.Title, batchSessions.ToList(), batchParticipants.ToList());
-        var renderResult = TelegramSessionBatchRenderer.Render(view);
 
         try
         {
-            await BatchMessageEditor.EditBatchMessageAsync(
-                bot,
-                chatId: command.ChatId,
-                messageId: session.BatchMessageId ?? command.MessageId,
-                text: renderResult.Text,
-                replyMarkup: renderResult.Markup,
+            var messageId = session.BatchMessageId ?? command.MessageId;
+            await messenger.UpdateScheduleAsync(
+                new PlatformScheduleMessage(
+                    TelegramPlatformIds.Group(command.ChatId, command.MessageThreadId),
+                    view,
+                    TelegramPlatformIds.Message(command.ChatId, command.MessageThreadId, messageId)),
                 ct);
 
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия отменена!", cancellationToken: ct);
-            
+            await AnswerAsync(command.CallbackQueryId, "Сессия отменена!", ct);
+
             // Опционально: написать отдельное сообщение в чат
-            await bot.SendMessage(command.ChatId, $"❌ <b>Внимание!</b> Сессия \"{System.Net.WebUtility.HtmlEncode(session.Title)}\" отменена.", parseMode: Telegram.Bot.Types.Enums.ParseMode.Html, cancellationToken: ct);
+            await messenger.SendGroupMessageAsync(
+                TelegramPlatformIds.Group(command.ChatId, command.MessageThreadId),
+                $"❌ <b>Внимание!</b> Сессия \"{System.Net.WebUtility.HtmlEncode(session.Title)}\" отменена.",
+                ct);
 
             var mode = SessionNotificationModeExtensions.FromDatabaseValue(session.NotificationMode);
             if (mode.ShouldSendDirectMessages())
@@ -135,7 +137,10 @@ public sealed class CancelSessionHandler(
         catch (Exception ex)
         {
             logger.LogError(ex, "Failed to update batch message after cancelling session {SessionId}", command.SessionId);
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, "Ошибка при обновлении сообщения.", cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Ошибка при обновлении сообщения.", ct);
         }
     }
+
+    private Task AnswerAsync(string callbackQueryId, string text, CancellationToken ct, bool showAlert = false) =>
+        messenger.AnswerInteractionAsync(new PlatformInteractionReply(callbackQueryId, text, showAlert), ct);
 }

src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs

@@ -77,11 +77,14 @@ public sealed class CreateSessionHandler(
         {
             await connection.ExecuteAsync(
                 """
-                INSERT INTO players (telegram_id, display_name, telegram_username)
-                VALUES (@TgId, @Name, @Username)
+                INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
+                VALUES (@TgId, @Name, @Username, 'Telegram', @TgId::TEXT, @Username)
                 ON CONFLICT (telegram_id) DO UPDATE
                 SET display_name = EXCLUDED.display_name,
-                    telegram_username = EXCLUDED.telegram_username;
+                    telegram_username = EXCLUDED.telegram_username,
+                    platform = COALESCE(players.platform, 'Telegram'),
+                    external_user_id = COALESCE(players.external_user_id, EXCLUDED.telegram_id::TEXT),
+                    external_username = COALESCE(players.external_username, EXCLUDED.telegram_username);
                 """,
                 new { TgId = gmId, Name = gmName, Username = gmUsername },
                 transaction);
@@ -94,10 +97,10 @@ public sealed class CreateSessionHandler(
                            FROM group_managers gm
                            JOIN players p ON p.id = gm.player_id
                            WHERE gm.group_id = g.id
-                             AND p.telegram_id = @GmId
+                             AND COALESCE(p.external_user_id, p.telegram_id::TEXT) = @GmId::TEXT
                        ) AS CanManage
                 FROM game_groups g
-                WHERE g.telegram_chat_id = @ChatId
+                WHERE COALESCE(g.external_group_id, g.telegram_chat_id::TEXT) = @ChatId::TEXT
                 """,
                 new { ChatId = chatId, GmId = gmId },
                 transaction);
@@ -107,8 +110,8 @@ public sealed class CreateSessionHandler(
             {
                 groupId = await connection.ExecuteScalarAsync<Guid>(
                     """
-                    INSERT INTO game_groups (telegram_chat_id, name, gm_telegram_id)
-                    VALUES (@ChatId, @ChatName, @GmId)
+                    INSERT INTO game_groups (telegram_chat_id, name, gm_telegram_id, platform, external_group_id)
+                    VALUES (@ChatId, @ChatName, @GmId, 'Telegram', @ChatId::TEXT)
                     RETURNING id;
                     """,
                     new { ChatId = chatId, ChatName = chatTitle, GmId = gmId },
@@ -119,7 +122,7 @@ public sealed class CreateSessionHandler(
                     INSERT INTO group_managers (group_id, player_id, role)
                     SELECT @GroupId, p.id, @OwnerRole
                     FROM players p
-                    WHERE p.telegram_id = @GmId
+                    WHERE COALESCE(p.external_user_id, p.telegram_id::TEXT) = @GmId::TEXT
                     ON CONFLICT (group_id, player_id) DO NOTHING
                     """,
                     new { GroupId = groupId, GmId = gmId, OwnerRole = GroupManagerRoleExtensions.OwnerValue },
@@ -144,14 +147,31 @@ public sealed class CreateSessionHandler(
                     transaction);
             }
 
-            int? messageThreadId = null;
-            if (message.Chat.IsForum)
+            var topicDestination = TelegramTopicRouting.ResolveNewScheduleDestination(
+                message.Chat.IsForum,
+                message.MessageThreadId);
+            var messageThreadId = topicDestination.MessageThreadId;
+            var topicCreatedByBot = topicDestination.TopicCreatedByBot;
+            if (topicDestination.ShouldCreateForumTopic)
             {
-                var topic = await botClient.CreateForumTopic(
-                    chatId: chatId,
-                    name: $"🎲 Игры: {title}",
-                    cancellationToken: cancellationToken);
-                messageThreadId = topic.MessageThreadId;
+                try
+                {
+                    var topic = await botClient.CreateForumTopic(
+                        chatId: chatId,
+                        name: $"🎲 Игры: {title}",
+                        cancellationToken: cancellationToken);
+                    messageThreadId = topic.MessageThreadId;
+                }
+                catch (Telegram.Bot.Exceptions.ApiRequestException ex)
+                    when (TelegramTopicRouting.IsMissingForumTopicRightsError(ex.Message))
+                {
+                    await transaction.RollbackAsync(cancellationToken);
+                    await botClient.SendMessage(
+                        chatId,
+                        TelegramTopicRouting.MissingForumTopicRightsMessage,
+                        cancellationToken: cancellationToken);
+                    return;
+                }
             }
 
             var batchId = Guid.NewGuid();
@@ -161,8 +181,8 @@ public sealed class CreateSessionHandler(
             {
                 var sessionId = await connection.ExecuteScalarAsync<Guid>(
                     """
-                    INSERT INTO sessions (batch_id, group_id, title, join_link, scheduled_at, status, thread_id, max_players)
-                    VALUES (@BatchId, @GroupId, @Title, @Link, @ScheduledAt, @Status, @ThreadId, @MaxPlayers)
+                    INSERT INTO sessions (batch_id, group_id, title, join_link, scheduled_at, status, thread_id, topic_created_by_bot, max_players)
+                    VALUES (@BatchId, @GroupId, @Title, @Link, @ScheduledAt, @Status, @ThreadId, @TopicCreatedByBot, @MaxPlayers)
                     RETURNING id;
                     """,
                     new
@@ -173,12 +193,13 @@ public sealed class CreateSessionHandler(
                         Link = link,
                         ScheduledAt = scheduledAt,
                         ThreadId = messageThreadId,
+                        TopicCreatedByBot = topicCreatedByBot,
                         MaxPlayers = parseResult.MaxPlayers,
                         Status = SessionStatus.Planned
                     },
                     transaction);
 
-                sessions.Add(new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, parseResult.MaxPlayers));
+                sessions.Add(new SessionBatchDto(sessionId, scheduledAt.UtcDateTime, SessionStatus.Planned, parseResult.MaxPlayers, link));
             }
 
             await transaction.CommitAsync(cancellationToken);

src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs

@@ -1,28 +1,25 @@
+using System.Globalization;
 using Dapper;
 using Npgsql;
-using Telegram.Bot;
-using Telegram.Bot.Types;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using GmRelay.Shared.Rendering;
-using GmRelay.Bot.Infrastructure.Telegram;
 
 namespace GmRelay.Bot.Features.Sessions.CreateSession;
 
 public sealed record JoinSessionCommand(
     Guid SessionId,
-    long TelegramUserId,
-    string DisplayName,
-    string? TelegramUsername,
-    string CallbackQueryId,
-    long ChatId,
-    int MessageId);
+    PlatformUser User,
+    string InteractionId,
+    PlatformGroup Group,
+    PlatformMessageRef ScheduleMessage);
 
 // DTOs for AOT compilation
 internal sealed record JoinSessionBatchDto(Guid BatchId, string Title, int? MaxPlayers);
 
 public sealed class JoinSessionHandler(
     NpgsqlDataSource dataSource,
-    ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     ILogger<JoinSessionHandler> logger)
 {
     public async Task HandleAsync(JoinSessionCommand command, CancellationToken ct)
@@ -34,12 +31,35 @@ public sealed class JoinSessionHandler(
         try
         {
             // 1. Убеждаемся, что игрок есть в базе
+            var platform = command.User.Platform.ToString();
+            var legacyTelegramId = command.User.Platform == PlatformKind.Telegram
+                ? long.Parse(command.User.ExternalUserId, CultureInfo.InvariantCulture)
+                : (long?)null;
+            var legacyTelegramUsername = command.User.Platform == PlatformKind.Telegram
+                ? command.User.ExternalUsername
+                : null;
+
             var playerId = await connection.ExecuteScalarAsync<Guid>(
-                @"INSERT INTO players (telegram_id, display_name, telegram_username) 
-                  VALUES (@TgId, @Name, @Username)
-                  ON CONFLICT (telegram_id) DO UPDATE SET display_name = EXCLUDED.display_name, telegram_username = EXCLUDED.telegram_username
+                @"INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
+                  VALUES (@LegacyTelegramId, @Name, @LegacyTelegramUsername, @Platform, @ExternalUserId, @ExternalUsername)
+                  ON CONFLICT (platform, external_user_id)
+                  WHERE platform IS NOT NULL AND external_user_id IS NOT NULL
+                  DO UPDATE
+                  SET display_name = EXCLUDED.display_name,
+                      telegram_username = COALESCE(EXCLUDED.telegram_username, players.telegram_username),
+                      platform = EXCLUDED.platform,
+                      external_user_id = EXCLUDED.external_user_id,
+                      external_username = EXCLUDED.external_username
                   RETURNING id;",
-                new { TgId = command.TelegramUserId, Name = command.DisplayName, Username = command.TelegramUsername },
+                new
+                {
+                    LegacyTelegramId = legacyTelegramId,
+                    Name = command.User.DisplayName,
+                    LegacyTelegramUsername = legacyTelegramUsername,
+                    Platform = platform,
+                    command.User.ExternalUserId,
+                    command.User.ExternalUsername
+                },
                 transaction);
 
             // 2. Блокируем сессию на время расчета мест, чтобы параллельные нажатия не переполнили состав.
@@ -54,7 +74,7 @@ public sealed class JoinSessionHandler(
             if (batchInfo is null)
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия не найдена.", cancellationToken: ct);
+                await AnswerAsync(command.InteractionId, "Сессия не найдена.", ct);
                 return;
             }
 
@@ -75,7 +95,7 @@ public sealed class JoinSessionHandler(
                 var alreadyText = existingRegistrationStatus == ParticipantRegistrationStatus.Waitlisted
                     ? "Вы уже в листе ожидания!"
                     : "Вы уже записаны!";
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, alreadyText, cancellationToken: ct);
+                await AnswerAsync(command.InteractionId, alreadyText, ct);
                 return;
             }
 
@@ -109,13 +129,13 @@ public sealed class JoinSessionHandler(
             if (inserted == 0)
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Вы уже записаны!", cancellationToken: ct);
+                await AnswerAsync(command.InteractionId, "Вы уже записаны!", ct);
                 return;
             }
 
             // Загружаем весь батч для перерисовки
             var batchSessions = await connection.QueryAsync<SessionBatchDto>(
-                @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers
+                @"SELECT id as SessionId, scheduled_at as ScheduledAt, status as Status, max_players as MaxPlayers, join_link as JoinLink
                   FROM sessions
                   WHERE batch_id = @BatchId
                   ORDER BY scheduled_at",
@@ -124,7 +144,7 @@ public sealed class JoinSessionHandler(
             var batchParticipants = await connection.QueryAsync<ParticipantBatchDto>(
                 @"SELECT sp.session_id as SessionId,
                          p.display_name as DisplayName,
-                         p.telegram_username as TelegramUsername,
+                         COALESCE(p.external_username, p.telegram_username) as TelegramUsername,
                          sp.registration_status as RegistrationStatus
                   FROM session_participants sp
                   JOIN players p ON sp.player_id = p.id
@@ -138,20 +158,17 @@ public sealed class JoinSessionHandler(
 
             // 4. Перерисовываем сообщение
             var view = SessionBatchViewBuilder.Build(batchInfo.Title, batchSessions.ToList(), batchParticipants.ToList());
-            var renderResult = TelegramSessionBatchRenderer.Render(view);
-
-            await BatchMessageEditor.EditBatchMessageAsync(
-                bot,
-                chatId: command.ChatId,
-                messageId: command.MessageId,
-                text: renderResult.Text,
-                replyMarkup: renderResult.Markup,
+            await messenger.UpdateScheduleAsync(
+                new PlatformScheduleMessage(
+                    command.Group,
+                    view,
+                    command.ScheduleMessage),
                 ct);
 
             var callbackText = registrationStatus == ParticipantRegistrationStatus.Waitlisted
                 ? "Основной состав заполнен. Вы добавлены в лист ожидания."
                 : "Вы успешно записаны!";
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, callbackText, cancellationToken: ct);
+            await AnswerAsync(command.InteractionId, callbackText, ct);
         }
         catch (Exception ex)
         {
@@ -164,7 +181,10 @@ public sealed class JoinSessionHandler(
             var errorText = transactionCommitted
                 ? "Регистрация сохранена, но не удалось обновить сообщение расписания."
                 : "Произошла ошибка при регистрации.";
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, errorText, cancellationToken: ct);
+            await AnswerAsync(command.InteractionId, errorText, ct);
         }
     }
+
+    private Task AnswerAsync(string interactionId, string text, CancellationToken ct) =>
+        messenger.AnswerInteractionAsync(new PlatformInteractionReply(interactionId, text), ct);
 }

src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs

@@ -1,18 +1,17 @@
 using Dapper;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using GmRelay.Shared.Rendering;
 using Npgsql;
-using Telegram.Bot;
-using GmRelay.Bot.Infrastructure.Telegram;
 
 namespace GmRelay.Bot.Features.Sessions.CreateSession;
 
 public sealed record LeaveSessionCommand(
     Guid SessionId,
-    long TelegramUserId,
-    string CallbackQueryId,
-    long ChatId,
-    int MessageId);
+    PlatformUser User,
+    string InteractionId,
+    PlatformGroup Group,
+    PlatformMessageRef ScheduleMessage);
 
 internal sealed record LeaveSessionInfoDto(string Title, Guid BatchId, string Status, int? MaxPlayers);
 internal sealed record LeaveSessionParticipantDto(Guid ParticipantRowId, string DisplayName, string RegistrationStatus);
@@ -20,7 +19,7 @@ internal sealed record LeaveSessionPromotionDto(Guid ParticipantRowId, string Di
 
 public sealed class LeaveSessionHandler(
     NpgsqlDataSource dataSource,
-    ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     ILogger<LeaveSessionHandler> logger)
 {
     public async Task HandleAsync(LeaveSessionCommand command, CancellationToken ct)
@@ -47,17 +46,19 @@ public sealed class LeaveSessionHandler(
             if (session is null)
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия не найдена.", cancellationToken: ct);
+                await AnswerAsync(command.InteractionId, "Сессия не найдена.", ct);
                 return;
             }
 
             if (SessionStatus.IsCancelled(session.Status))
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия уже отменена.", cancellationToken: ct);
+                await AnswerAsync(command.InteractionId, "Сессия уже отменена.", ct);
                 return;
             }
 
+            var platform = command.User.Platform.ToString();
+
             var participant = await connection.QuerySingleOrDefaultAsync<LeaveSessionParticipantDto>(
                 """
                 SELECT sp.id AS ParticipantRowId,
@@ -66,17 +67,18 @@ public sealed class LeaveSessionHandler(
                 FROM session_participants sp
                 JOIN players p ON p.id = sp.player_id
                 WHERE sp.session_id = @SessionId
-                  AND p.telegram_id = @TelegramUserId
+                  AND p.platform = @Platform
+                  AND p.external_user_id = @ExternalUserId
                   AND sp.is_gm = false
                 FOR UPDATE OF sp
                 """,
-                new { command.SessionId, command.TelegramUserId },
+                new { command.SessionId, Platform = platform, command.User.ExternalUserId },
                 transaction);
 
             if (participant is null)
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Вы не записаны на эту сессию.", cancellationToken: ct);
+                await AnswerAsync(command.InteractionId, "Вы не записаны на эту сессию.", ct);
                 return;
             }
 
@@ -157,7 +159,8 @@ public sealed class LeaveSessionHandler(
                 SELECT id AS SessionId,
                        scheduled_at AS ScheduledAt,
                        status AS Status,
-                       max_players AS MaxPlayers
+                       max_players AS MaxPlayers,
+                       join_link AS JoinLink
                 FROM sessions
                 WHERE batch_id = @BatchId
                 ORDER BY scheduled_at
@@ -169,7 +172,7 @@ public sealed class LeaveSessionHandler(
                 """
                 SELECT sp.session_id AS SessionId,
                        p.display_name AS DisplayName,
-                       p.telegram_username AS TelegramUsername,
+                       COALESCE(p.external_username, p.telegram_username) AS TelegramUsername,
                        sp.registration_status AS RegistrationStatus
                 FROM session_participants sp
                 JOIN players p ON sp.player_id = p.id
@@ -184,14 +187,11 @@ public sealed class LeaveSessionHandler(
             transactionCommitted = true;
 
             var view = SessionBatchViewBuilder.Build(session.Title, batchSessions, batchParticipants);
-            var renderResult = TelegramSessionBatchRenderer.Render(view);
-
-            await BatchMessageEditor.EditBatchMessageAsync(
-                bot,
-                chatId: command.ChatId,
-                messageId: command.MessageId,
-                text: renderResult.Text,
-                replyMarkup: renderResult.Markup,
+            await messenger.UpdateScheduleAsync(
+                new PlatformScheduleMessage(
+                    command.Group,
+                    view,
+                    command.ScheduleMessage),
                 ct);
 
             var callbackText = participant.RegistrationStatus == ParticipantRegistrationStatus.Waitlisted
@@ -200,7 +200,7 @@ public sealed class LeaveSessionHandler(
                     ? "Вы отписались от сессии."
                     : $"Вы отписались от сессии. Место получил(а) {promotedDisplayName}.";
 
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, callbackText, cancellationToken: ct);
+            await AnswerAsync(command.InteractionId, callbackText, ct);
         }
         catch (Exception ex)
         {
@@ -213,7 +213,10 @@ public sealed class LeaveSessionHandler(
             var errorText = transactionCommitted
                 ? "Запись снята, но не удалось обновить сообщение расписания."
                 : "Произошла ошибка при отмене записи.";
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, errorText, cancellationToken: ct);
+            await AnswerAsync(command.InteractionId, errorText, ct);
         }
     }
+
+    private Task AnswerAsync(string interactionId, string text, CancellationToken ct) =>
+        messenger.AnswerInteractionAsync(new PlatformInteractionReply(interactionId, text), ct);
 }

src/GmRelay.Bot/Features/Sessions/CreateSession/PromoteWaitlistedPlayerHandler.cs

@@ -1,8 +1,8 @@
 using Dapper;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using GmRelay.Shared.Rendering;
 using Npgsql;
-using Telegram.Bot;
 using GmRelay.Bot.Infrastructure.Telegram;
 
 namespace GmRelay.Bot.Features.Sessions.CreateSession;
@@ -19,7 +19,7 @@ internal sealed record WaitlistedParticipantDto(Guid ParticipantRowId, string Di
 
 public sealed class PromoteWaitlistedPlayerHandler(
     NpgsqlDataSource dataSource,
-    ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     ILogger<PromoteWaitlistedPlayerHandler> logger)
 {
     public async Task HandleAsync(PromoteWaitlistedPlayerCommand command, CancellationToken ct)
@@ -53,14 +53,14 @@ public sealed class PromoteWaitlistedPlayerHandler(
             if (session is null)
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия не найдена.", cancellationToken: ct);
+                await AnswerAsync(command.CallbackQueryId, "Сессия не найдена.", ct);
                 return;
             }
 
             if (!session.CanManage)
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Только owner или co-GM может поднимать игроков из листа ожидания.", showAlert: true, cancellationToken: ct);
+                await AnswerAsync(command.CallbackQueryId, "Только owner или co-GM может поднимать игроков из листа ожидания.", ct, showAlert: true);
                 return;
             }
 
@@ -89,14 +89,14 @@ public sealed class PromoteWaitlistedPlayerHandler(
             if (waitlistedParticipants == 0)
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Лист ожидания пуст.", cancellationToken: ct);
+                await AnswerAsync(command.CallbackQueryId, "Лист ожидания пуст.", ct);
                 return;
             }
 
             if (!SessionCapacityRules.CanPromoteWaitlistedPlayer(session.MaxPlayers, activeParticipants, waitlistedParticipants))
             {
                 await transaction.RollbackAsync(ct);
-                await bot.AnswerCallbackQuery(command.CallbackQueryId, "Нет свободных мест. Увеличьте лимит перед повышением игрока.", showAlert: true, cancellationToken: ct);
+                await AnswerAsync(command.CallbackQueryId, "Нет свободных мест. Увеличьте лимит перед повышением игрока.", ct, showAlert: true);
                 return;
             }
 
@@ -137,7 +137,8 @@ public sealed class PromoteWaitlistedPlayerHandler(
                 SELECT id AS SessionId,
                        scheduled_at AS ScheduledAt,
                        status AS Status,
-                       max_players AS MaxPlayers
+                       max_players AS MaxPlayers,
+                       join_link AS JoinLink
                 FROM sessions
                 WHERE batch_id = @BatchId
                 ORDER BY scheduled_at
@@ -164,17 +165,15 @@ public sealed class PromoteWaitlistedPlayerHandler(
             transactionCommitted = true;
 
             var view = SessionBatchViewBuilder.Build(session.Title, batchSessions, batchParticipants);
-            var renderResult = TelegramSessionBatchRenderer.Render(view);
-
-            await BatchMessageEditor.EditBatchMessageAsync(
-                bot,
-                chatId: command.ChatId,
-                messageId: session.BatchMessageId ?? command.MessageId,
-                text: renderResult.Text,
-                replyMarkup: renderResult.Markup,
+            var messageId = session.BatchMessageId ?? command.MessageId;
+            await messenger.UpdateScheduleAsync(
+                new PlatformScheduleMessage(
+                    TelegramPlatformIds.Group(command.ChatId),
+                    view,
+                    TelegramPlatformIds.Message(command.ChatId, threadId: null, messageId)),
                 ct);
 
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, $"{promoted.DisplayName} переведен(а) в основной состав.", cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, $"{promoted.DisplayName} переведен(а) в основной состав.", ct);
         }
         catch (Exception ex)
         {
@@ -187,7 +186,10 @@ public sealed class PromoteWaitlistedPlayerHandler(
             var errorText = transactionCommitted
                 ? "Игрок повышен, но не удалось обновить сообщение расписания."
                 : "Ошибка при обновлении листа ожидания.";
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, errorText, cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, errorText, ct);
         }
     }
+
+    private Task AnswerAsync(string callbackQueryId, string text, CancellationToken ct, bool showAlert = false) =>
+        messenger.AnswerInteractionAsync(new PlatformInteractionReply(callbackQueryId, text, showAlert), ct);
 }

src/GmRelay.Bot/Features/Sessions/ExportCalendar/ExportCalendarHandler.cs

@@ -1,11 +1,11 @@
 using System.Text;
 using Dapper;
+using GmRelay.Bot.Infrastructure.Telegram;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using Microsoft.Extensions.Configuration;
 using Npgsql;
-using Telegram.Bot;
 using Telegram.Bot.Types;
-using Telegram.Bot.Types.ReplyMarkups;
 
 namespace GmRelay.Bot.Features.Sessions.ExportCalendar;
 
@@ -13,7 +13,7 @@ internal sealed record CalendarSessionDto(Guid Id, string Title, DateTime Schedu
 
 public sealed class ExportCalendarHandler(
     NpgsqlDataSource dataSource,
-    ITelegramBotClient botClient,
+    IPlatformMessenger messenger,
     IConfiguration configuration)
 {
     public async Task HandleAsync(Message message, CancellationToken cancellationToken)
@@ -34,10 +34,10 @@ public sealed class ExportCalendarHandler(
 
         if (sessionsList.Count == 0)
         {
-            await botClient.SendMessage(
-                chatId: message.Chat.Id,
-                text: "📭 У этой группы нет запланированных сессий для экспорта.",
-                cancellationToken: cancellationToken);
+            await messenger.SendGroupMessageAsync(
+                TelegramPlatformIds.Group(message.Chat.Id, message.MessageThreadId),
+                "📭 У этой группы нет запланированных сессий для экспорта.",
+                cancellationToken);
             return;
         }
 
@@ -63,9 +63,7 @@ public sealed class ExportCalendarHandler(
         sb.AppendLine("END:VCALENDAR");
 
         var bytes = Encoding.UTF8.GetBytes(sb.ToString());
-        using var stream = new MemoryStream(bytes);
 
-        var inputFile = InputFile.FromStream(stream, "schedule.ics");
 
         // Create calendar subscription
         string? subscriptionUrl = null;
@@ -93,20 +91,23 @@ public sealed class ExportCalendarHandler(
             }
         }
 
-        var replyMarkup = subscriptionUrl is not null
-            ? new InlineKeyboardMarkup(new[]
+        var actions = subscriptionUrl is not null
+            ? new[]
             {
-                new[] { InlineKeyboardButton.WithUrl("🔗 Подписаться на календарь", subscriptionUrl) }
-            })
-            : null;
+                new PlatformMessageAction(
+                    "calendar-subscription",
+                    "🔗 Подписаться на календарь",
+                    subscriptionUrl)
+            }
+            : Array.Empty<PlatformMessageAction>();
 
-        await botClient.SendDocument(
-             chatId: message.Chat.Id,
-             document: inputFile,
-             caption: "📅 <b>Ваш календарь игр!</b>\nОткройте файл на устройстве, чтобы добавить события в свой календарь.",
-             parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-             replyMarkup: replyMarkup,
-             messageThreadId: message.MessageThreadId,
-             cancellationToken: cancellationToken);
+        await messenger.SendCalendarFileAsync(
+            new PlatformCalendarFile(
+                TelegramPlatformIds.Group(message.Chat.Id, message.MessageThreadId),
+                "schedule.ics",
+                bytes,
+                "📅 <b>Ваш календарь игр!</b>\nОткройте файл на устройстве, чтобы добавить события в свой календарь.",
+                actions),
+            cancellationToken);
     }
 }

src/GmRelay.Bot/Features/Sessions/ListSessions/DeleteSessionHandler.cs

@@ -1,6 +1,7 @@
 using Dapper;
 using Npgsql;
 using Telegram.Bot;
+using GmRelay.Bot.Infrastructure.Telegram;
 using GmRelay.Shared.Domain;
 
 namespace GmRelay.Bot.Features.Sessions.ListSessions;
@@ -12,7 +13,13 @@ public sealed record DeleteSessionCommand(
     long ChatId,
     int MessageId);
 
-internal sealed record DeleteSessionInfoDto(string Title, Guid BatchId, bool CanManage, int? ThreadId);
+internal sealed record DeleteSessionInfoDto(
+    string Title,
+    Guid BatchId,
+    Guid GroupId,
+    bool CanManage,
+    int? ThreadId,
+    bool TopicCreatedByBot);
 
 public sealed class DeleteSessionHandler(
     NpgsqlDataSource dataSource,
@@ -29,7 +36,9 @@ public sealed class DeleteSessionHandler(
             """
             SELECT s.title AS Title,
                    s.batch_id AS BatchId,
+                   s.group_id AS GroupId,
                    s.thread_id AS ThreadId,
+                   s.topic_created_by_bot AS TopicCreatedByBot,
                    EXISTS (
                        SELECT 1
                        FROM group_managers gm
@@ -57,15 +66,23 @@ public sealed class DeleteSessionHandler(
         // 2. Delete session
         await connection.ExecuteAsync("DELETE FROM sessions WHERE id = @Id", new { Id = command.SessionId }, transaction);
 
-        // 3. Check if any sessions are left in the batch
-        var remainingInBatch = await connection.ExecuteScalarAsync<int>(
-            "SELECT COUNT(*) FROM sessions WHERE batch_id = @BatchId",
-            new { BatchId = session.BatchId }, transaction);
+        var remainingInTopic = session.ThreadId.HasValue
+            ? await connection.ExecuteScalarAsync<int>(
+                """
+                SELECT COUNT(*)
+                FROM sessions
+                WHERE group_id = @GroupId
+                  AND thread_id = @ThreadId
+                """,
+                new { session.GroupId, ThreadId = session.ThreadId.Value },
+                transaction)
+            : 0;
 
         await transaction.CommitAsync(ct);
 
-        // 4. If no sessions left and we have a forum topic, delete the topic
-        if (remainingInBatch == 0 && session.ThreadId.HasValue)
+        // 4. If no sessions are left in a bot-owned forum topic, delete the topic.
+        if (session.ThreadId.HasValue &&
+            TelegramTopicRouting.ShouldDeleteForumTopic(session.TopicCreatedByBot, remainingInTopic))
         {
             try
             {
@@ -113,7 +130,7 @@ public sealed class DeleteSessionHandler(
 
         if (sessionsList.Count == 0)
         {
-            try { await bot.EditMessageText(command.ChatId, command.MessageId, "📭 В этой группе нет предстоящих игр.", cancellationToken: ct); } catch {}
+            try { await bot.EditMessageText(command.ChatId, command.MessageId, "📭 В этой группе нет предстоящих игр.", cancellationToken: ct); } catch { }
             return;
         }
 

src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs

@@ -1,6 +1,7 @@
 using Dapper;
 using GmRelay.Bot.Features.Notifications;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using GmRelay.Shared.Rendering;
 using Npgsql;
 using Telegram.Bot;
@@ -14,7 +15,7 @@ namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
 
 internal sealed record AwaitingProposalDto(
     Guid Id, Guid SessionId, string Title, DateTime CurrentScheduledAt,
-    Guid BatchId, int? BatchMessageId, long TelegramChatId, string NotificationMode);
+    Guid BatchId, int? BatchMessageId, long TelegramChatId, int? ThreadId, string NotificationMode);
 
 internal sealed record VoteParticipantDto(
     Guid PlayerId,
@@ -33,6 +34,7 @@ internal sealed record VoteParticipantDto(
 public sealed class HandleRescheduleTimeInputHandler(
     NpgsqlDataSource dataSource,
     ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     DirectSessionNotificationSender directSender,
     ILogger<HandleRescheduleTimeInputHandler> logger)
 {
@@ -57,6 +59,7 @@ public sealed class HandleRescheduleTimeInputHandler(
             SELECT rp.id AS Id, rp.session_id AS SessionId, s.title AS Title, s.scheduled_at AS CurrentScheduledAt,
                    s.batch_id AS BatchId, s.batch_message_id AS BatchMessageId,
                    g.telegram_chat_id AS TelegramChatId,
+                   s.thread_id AS ThreadId,
                    s.notification_mode AS NotificationMode
             FROM reschedule_proposals rp
             JOIN sessions s ON s.id = rp.session_id
@@ -82,11 +85,10 @@ public sealed class HandleRescheduleTimeInputHandler(
         // 2. Parse voting input
         if (!RescheduleVotingInput.TryParse(text, DateTimeOffset.UtcNow, out var votingInput, out var parseError))
         {
-            await bot.SendMessage(
-                chatId: chatId,
-                text: $"⚠️ {parseError}\n\nИспользуйте формат:\n<code>25.04.2026 19:30\n26.04.2026 18:00\nДедлайн: 25.04.2026 12:00</code>",
-                parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-                cancellationToken: ct);
+            await messenger.SendGroupMessageAsync(
+                TelegramPlatformIds.Group(chatId, proposal.ThreadId),
+                $"⚠️ {parseError}\n\nИспользуйте формат:\n<code>25.04.2026 19:30\n26.04.2026 18:00\nДедлайн: 25.04.2026 12:00</code>",
+                ct);
             return true;
         }
 
@@ -161,6 +163,7 @@ public sealed class HandleRescheduleTimeInputHandler(
 
         var voteMsg = await bot.SendMessage(
             chatId: chatId,
+            messageThreadId: proposal.ThreadId,
             text: voteText,
             parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
             replyMarkup: keyboard,
@@ -224,6 +227,8 @@ public sealed class HandleRescheduleTimeInputHandler(
             UPDATE sessions
             SET scheduled_at = @NewTime,
                 status = @Status,
+                confirmation_message_id = NULL,
+                confirmation_sent_at = NULL,
                 one_hour_reminder_processed_at = NULL,
                 updated_at = now()
             WHERE id = @SessionId
@@ -238,11 +243,10 @@ public sealed class HandleRescheduleTimeInputHandler(
 
         await transaction.CommitAsync(ct);
 
-        await bot.SendMessage(
-            chatId: chatId,
-            text: $"✅ Сессия «{proposal.Title}» перенесена!\n\n📅 Новое время: <b>{newTime.ToOffset(TimeSpan.FromHours(3)).ToString("d MMMM yyyy, HH:mm", System.Globalization.CultureInfo.GetCultureInfo("ru-RU"))}</b> (МСК)\n\n<i>Участников нет — голосование не требуется.</i>",
-            parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-            cancellationToken: ct);
+        await messenger.SendGroupMessageAsync(
+            TelegramPlatformIds.Group(chatId, proposal.ThreadId),
+            $"✅ Сессия «{proposal.Title}» перенесена!\n\n📅 Новое время: <b>{newTime.ToOffset(TimeSpan.FromHours(3)).ToString("d MMMM yyyy, HH:mm", System.Globalization.CultureInfo.GetCultureInfo("ru-RU"))}</b> (МСК)\n\n<i>Участников нет — голосование не требуется.</i>",
+            ct);
 
         // Re-render batch message with updated time
         await TryUpdateBatchMessage(proposal, ct);
@@ -357,7 +361,7 @@ public sealed class HandleRescheduleTimeInputHandler(
             await using var conn = await dataSource.OpenConnectionAsync(ct);
 
             var batchSessions = (await conn.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                 new { proposal.BatchId })).ToList();
 
             var batchParticipants = (await conn.QueryAsync<ParticipantBatchDto>(
@@ -377,14 +381,12 @@ public sealed class HandleRescheduleTimeInputHandler(
             if (proposal.BatchMessageId.HasValue)
             {
                 var view = SessionBatchViewBuilder.Build(proposal.Title, batchSessions, batchParticipants);
-                var renderResult = TelegramSessionBatchRenderer.Render(view);
 
-                await BatchMessageEditor.EditBatchMessageAsync(
-                    bot,
-                    chatId: proposal.TelegramChatId,
-                    messageId: proposal.BatchMessageId.Value,
-                    text: renderResult.Text,
-                    replyMarkup: renderResult.Markup,
+                await messenger.UpdateScheduleAsync(
+                    new PlatformScheduleMessage(
+                        TelegramPlatformIds.Group(proposal.TelegramChatId, proposal.ThreadId),
+                        view,
+                        TelegramPlatformIds.Message(proposal.TelegramChatId, proposal.ThreadId, proposal.BatchMessageId.Value)),
                     ct);
             }
             else

src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleVoteHandler.cs

@@ -1,5 +1,6 @@
 using Dapper;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using Npgsql;
 using Telegram.Bot;
 
@@ -22,6 +23,7 @@ internal sealed record VoteProposalDto(
 public sealed class HandleRescheduleVoteHandler(
     NpgsqlDataSource dataSource,
     ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     ILogger<HandleRescheduleVoteHandler> logger)
 {
     public async Task HandleAsync(HandleRescheduleVoteCommand command, CancellationToken ct)
@@ -46,20 +48,13 @@ public sealed class HandleRescheduleVoteHandler(
 
         if (proposal is null)
         {
-            await bot.AnswerCallbackQuery(
-                command.CallbackQueryId,
-                "Голосование уже завершено или не найдено.",
-                cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Голосование уже завершено или не найдено.", ct);
             return;
         }
 
         if (proposal.VotingDeadlineAt <= DateTimeOffset.UtcNow)
         {
-            await bot.AnswerCallbackQuery(
-                command.CallbackQueryId,
-                "Дедлайн уже прошёл. Результаты скоро будут применены.",
-                showAlert: true,
-                cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Дедлайн уже прошёл. Результаты скоро будут применены.", ct, showAlert: true);
             return;
         }
 
@@ -78,10 +73,7 @@ public sealed class HandleRescheduleVoteHandler(
 
         if (playerId is null)
         {
-            await bot.AnswerCallbackQuery(
-                command.CallbackQueryId,
-                "Вы не являетесь участником этой сессии.",
-                cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Вы не являетесь участником этой сессии.", ct);
             return;
         }
 
@@ -169,9 +161,9 @@ public sealed class HandleRescheduleVoteHandler(
             logger.LogWarning(ex, "Failed to update reschedule vote message for proposal {ProposalId}", proposal.Id);
         }
 
-        await bot.AnswerCallbackQuery(
-            command.CallbackQueryId,
-            "Ваш голос учтён. До дедлайна его можно изменить.",
-            cancellationToken: ct);
+        await AnswerAsync(command.CallbackQueryId, "Ваш голос учтён. До дедлайна его можно изменить.", ct);
     }
+
+    private Task AnswerAsync(string callbackQueryId, string text, CancellationToken ct, bool showAlert = false) =>
+        messenger.AnswerInteractionAsync(new PlatformInteractionReply(callbackQueryId, text, showAlert), ct);
 }

src/GmRelay.Bot/Features/Sessions/RescheduleSession/InitiateRescheduleHandler.cs

@@ -1,7 +1,8 @@
 using Dapper;
+using GmRelay.Bot.Infrastructure.Telegram;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using Npgsql;
-using Telegram.Bot;
 
 namespace GmRelay.Bot.Features.Sessions.RescheduleSession;
 
@@ -12,6 +13,7 @@ public sealed record InitiateRescheduleCommand(
     long TelegramUserId,
     string CallbackQueryId,
     long ChatId,
+    int? MessageThreadId,
     int MessageId);
 
 // ── DTOs ─────────────────────────────────────────────────────────────
@@ -27,7 +29,7 @@ internal sealed record RescheduleSessionInfoDto(string Title, bool CanManage);
 /// </summary>
 public sealed class InitiateRescheduleHandler(
     NpgsqlDataSource dataSource,
-    ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     ILogger<InitiateRescheduleHandler> logger)
 {
     public async Task HandleAsync(InitiateRescheduleCommand command, CancellationToken ct)
@@ -52,14 +54,13 @@ public sealed class InitiateRescheduleHandler(
 
         if (session is null)
         {
-            await bot.AnswerCallbackQuery(command.CallbackQueryId, "Сессия не найдена.", cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Сессия не найдена.", ct);
             return;
         }
 
         if (!session.CanManage)
         {
-            await bot.AnswerCallbackQuery(command.CallbackQueryId,
-                "Только owner или co-GM может переносить сессию.", showAlert: true, cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Только owner или co-GM может переносить сессию.", ct, showAlert: true);
             return;
         }
 
@@ -75,8 +76,7 @@ public sealed class InitiateRescheduleHandler(
 
         if (hasActive)
         {
-            await bot.AnswerCallbackQuery(command.CallbackQueryId,
-                "Уже есть активный запрос на перенос этой сессии.", showAlert: true, cancellationToken: ct);
+            await AnswerAsync(command.CallbackQueryId, "Уже есть активный запрос на перенос этой сессии.", ct, showAlert: true);
             return;
         }
 
@@ -91,22 +91,28 @@ public sealed class InitiateRescheduleHandler(
         logger.LogInformation("Reschedule initiated for session {SessionId} by GM {GmId}", command.SessionId, command.TelegramUserId);
 
         // 4. Prompt GM in chat
-        await bot.AnswerCallbackQuery(command.CallbackQueryId,
-            "Введите 2-3 варианта времени и дедлайн голосования.", cancellationToken: ct);
+        await AnswerAsync(command.CallbackQueryId, "Введите 2-3 варианта времени и дедлайн голосования.", ct);
 
-        await bot.SendMessage(
-            chatId: command.ChatId,
-            text: $"""
-                ⏰ Укажите 2-3 варианта времени для сессии «{session.Title}» и дедлайн голосования.
+        var prompt = string.Join(
+            "\n",
+            new[]
+            {
+                $"⏰ Укажите 2-3 варианта времени для сессии «{session.Title}» и дедлайн голосования.",
+                "",
+                "Формат:",
+                "<code>25.04.2026 19:30",
+                "26.04.2026 18:00",
+                "Дедлайн: 25.04.2026 12:00</code>",
+                "",
+                "Дедлайн должен быть в будущем и раньше первого предложенного времени."
+            });
 
-                Формат:
-                <code>25.04.2026 19:30
-                26.04.2026 18:00
-                Дедлайн: 25.04.2026 12:00</code>
-
-                Дедлайн должен быть в будущем и раньше первого предложенного времени.
-                """,
-            parseMode: Telegram.Bot.Types.Enums.ParseMode.Html,
-            cancellationToken: ct);
+        await messenger.SendGroupMessageAsync(
+            TelegramPlatformIds.Group(command.ChatId, command.MessageThreadId),
+            prompt,
+            ct);
     }
+
+    private Task AnswerAsync(string callbackQueryId, string text, CancellationToken ct, bool showAlert = false) =>
+        messenger.AnswerInteractionAsync(new PlatformInteractionReply(callbackQueryId, text, showAlert), ct);
 }

src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs

@@ -1,6 +1,8 @@
 using Dapper;
 using GmRelay.Bot.Features.Notifications;
+using GmRelay.Bot.Infrastructure.Scheduling;
 using GmRelay.Shared.Domain;
+using GmRelay.Shared.Platform;
 using GmRelay.Shared.Rendering;
 using Npgsql;
 using Telegram.Bot;
@@ -19,12 +21,15 @@ internal sealed record DueRescheduleProposalDto(
     int? BatchMessageId,
     int? VoteMessageId,
     long TelegramChatId,
+    int? ThreadId,
     string NotificationMode);
 
 public sealed class RescheduleVotingDeadlineService(
     NpgsqlDataSource dataSource,
     ITelegramBotClient bot,
+    IPlatformMessenger messenger,
     DirectSessionNotificationSender directSender,
+    ISystemClock clock,
     ILogger<RescheduleVotingDeadlineService> logger) : BackgroundService
 {
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -55,10 +60,11 @@ public sealed class RescheduleVotingDeadlineService(
                 FROM reschedule_proposals
                 WHERE status = 'Voting'
                   AND voting_deadline_at IS NOT NULL
-                  AND voting_deadline_at <= now()
+                  AND voting_deadline_at <= @Now
                 ORDER BY voting_deadline_at
                 LIMIT 25
-                """)).ToList();
+                """,
+                new { Now = clock.UtcNow.UtcDateTime })).ToList();
 
             foreach (var proposalId in proposalIds)
             {
@@ -90,6 +96,7 @@ public sealed class RescheduleVotingDeadlineService(
                    s.batch_id AS BatchId,
                    s.batch_message_id AS BatchMessageId,
                    s.notification_mode AS NotificationMode,
+                   s.thread_id AS ThreadId,
                    g.telegram_chat_id AS TelegramChatId
             FROM reschedule_proposals rp
             JOIN sessions s ON s.id = rp.session_id
@@ -97,10 +104,10 @@ public sealed class RescheduleVotingDeadlineService(
             WHERE rp.id = @ProposalId
               AND rp.status = 'Voting'
               AND rp.voting_deadline_at IS NOT NULL
-              AND rp.voting_deadline_at <= now()
+              AND rp.voting_deadline_at <= @Now
             FOR UPDATE
             """,
-            new { ProposalId = proposalId },
+            new { ProposalId = proposalId, Now = clock.UtcNow.UtcDateTime },
             transaction);
 
         if (proposal is null)
@@ -166,6 +173,7 @@ public sealed class RescheduleVotingDeadlineService(
                 SET scheduled_at = @NewTime,
                     status = @Status,
                     confirmation_message_id = NULL,
+                    confirmation_sent_at = NULL,
                     link_message_id = NULL,
                     one_hour_reminder_processed_at = NULL,
                     updated_at = now()
@@ -286,7 +294,7 @@ public sealed class RescheduleVotingDeadlineService(
             await using var connection = await dataSource.OpenConnectionAsync(ct);
 
             var batchSessions = (await connection.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                 new { proposal.BatchId })).ToList();
 
             var batchParticipants = (await connection.QueryAsync<ParticipantBatchDto>(
@@ -306,23 +314,20 @@ public sealed class RescheduleVotingDeadlineService(
             if (proposal.BatchMessageId.HasValue)
             {
                 var view = SessionBatchViewBuilder.Build(proposal.Title, batchSessions, batchParticipants);
-                var renderResult = TelegramSessionBatchRenderer.Render(view);
 
-                await BatchMessageEditor.EditBatchMessageAsync(
-                    bot,
-                    chatId: proposal.TelegramChatId,
-                    messageId: proposal.BatchMessageId.Value,
-                    text: renderResult.Text,
-                    replyMarkup: renderResult.Markup,
+                await messenger.UpdateScheduleAsync(
+                    new PlatformScheduleMessage(
+                        TelegramPlatformIds.Group(proposal.TelegramChatId, proposal.ThreadId),
+                        view,
+                        TelegramPlatformIds.Message(proposal.TelegramChatId, proposal.ThreadId, proposal.BatchMessageId.Value)),
                     ct);
             }
             else
             {
-                await bot.SendMessage(
-                    chatId: proposal.TelegramChatId,
-                    text: $"📣 Расписание обновлено после голосования за перенос сессии «{System.Net.WebUtility.HtmlEncode(proposal.Title)}».",
-                    parseMode: ParseMode.Html,
-                    cancellationToken: ct);
+                await messenger.SendGroupMessageAsync(
+                    TelegramPlatformIds.Group(proposal.TelegramChatId, proposal.ThreadId),
+                    $"📣 Расписание обновлено после голосования за перенос сессии «{System.Net.WebUtility.HtmlEncode(proposal.Title)}».",
+                    ct);
             }
         }
         catch (Exception ex)

src/GmRelay.Bot/Infrastructure/Health/BotHealthCheckHostedService.cs

@@ -0,0 +1,101 @@
+using System.Net;
+
+namespace GmRelay.Bot.Infrastructure.Health;
+
+public sealed class BotHealthCheckHostedService : IHostedService
+{
+    private readonly ILogger<BotHealthCheckHostedService> _logger;
+    private readonly string _prefix;
+    private HttpListener? _listener;
+    private CancellationTokenSource? _cts;
+    private Task? _listenerTask;
+
+    public BotHealthCheckHostedService(
+        ILogger<BotHealthCheckHostedService> logger,
+        IConfiguration configuration)
+    {
+        _logger = logger;
+        _prefix = configuration.GetValue("HealthCheck:Prefix", "http://+:8081/")!;
+    }
+
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        _cts = new CancellationTokenSource();
+        _listener = new HttpListener();
+        _listener.Prefixes.Add(_prefix);
+        _listener.Start();
+
+        _logger.LogInformation("Health check server started on {Prefix}", _prefix);
+
+        _listenerTask = Task.Run(async () => await ListenAsync(_cts.Token), cancellationToken);
+
+        return Task.CompletedTask;
+    }
+
+    public async Task StopAsync(CancellationToken cancellationToken)
+    {
+        _cts?.Cancel();
+        _listener?.Stop();
+
+        if (_listenerTask != null)
+        {
+            await Task.WhenAny(_listenerTask, Task.Delay(TimeSpan.FromSeconds(5), cancellationToken));
+        }
+
+        _listener?.Close();
+        _logger.LogInformation("Health check server stopped");
+    }
+
+    private async Task ListenAsync(CancellationToken cancellationToken)
+    {
+        while (_listener?.IsListening == true && !cancellationToken.IsCancellationRequested)
+        {
+            try
+            {
+                var context = await _listener.GetContextAsync();
+                _ = Task.Run(() => HandleRequestAsync(context), cancellationToken);
+            }
+            catch (HttpListenerException) when (cancellationToken.IsCancellationRequested)
+            {
+                break;
+            }
+            catch (ObjectDisposedException)
+            {
+                break;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error in health check listener");
+            }
+        }
+    }
+
+    private async Task HandleRequestAsync(HttpListenerContext context)
+    {
+        var response = context.Response;
+        try
+        {
+            var request = context.Request;
+
+            if (request.Url?.AbsolutePath == "/health")
+            {
+                response.StatusCode = (int)HttpStatusCode.OK;
+                response.ContentType = "application/json";
+                var body = "{\"status\":\"healthy\"}"u8.ToArray();
+                await response.OutputStream.WriteAsync(body);
+            }
+            else
+            {
+                response.StatusCode = (int)HttpStatusCode.NotFound;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error handling health check request");
+        }
+        finally
+        {
+            response.Close();
+        }
+    }
+}

src/GmRelay.Bot/Infrastructure/Scheduling/ISessionTriggerStore.cs

@@ -0,0 +1,86 @@
+using Dapper;
+using GmRelay.Shared.Domain;
+using Npgsql;
+
+namespace GmRelay.Bot.Infrastructure.Scheduling;
+
+public interface ISessionTriggerStore
+{
+    Task<IReadOnlyList<Guid>> GetSessionsNeedingConfirmationAsync(DateTimeOffset now, CancellationToken ct);
+    Task<IReadOnlyList<Guid>> GetSessionsNeedingOneHourReminderAsync(DateTimeOffset now, CancellationToken ct);
+    Task<IReadOnlyList<Guid>> GetSessionsNeedingJoinLinkAsync(DateTimeOffset now, CancellationToken ct);
+}
+
+public sealed class DbSessionTriggerStore(NpgsqlDataSource dataSource) : ISessionTriggerStore
+{
+    private static readonly TimeSpan ConfirmationLeadTime = TimeSpan.FromHours(24);
+    private static readonly TimeSpan OneHourReminderLeadTime = TimeSpan.FromHours(1);
+    private static readonly TimeSpan JoinLinkLeadTime = TimeSpan.FromMinutes(5);
+
+    public async Task<IReadOnlyList<Guid>> GetSessionsNeedingConfirmationAsync(DateTimeOffset now, CancellationToken ct)
+    {
+        await using var connection = await dataSource.OpenConnectionAsync(ct);
+
+        var results = await connection.QueryAsync<Guid>(
+            """
+            SELECT id
+            FROM sessions
+            WHERE status = @Planned
+              AND scheduled_at - @LeadTime <= @Now
+              AND confirmation_sent_at IS NULL
+            """,
+            new
+            {
+                Planned = SessionStatus.Planned,
+                LeadTime = ConfirmationLeadTime,
+                Now = now.UtcDateTime
+            });
+
+        return results.ToList();
+    }
+
+    public async Task<IReadOnlyList<Guid>> GetSessionsNeedingOneHourReminderAsync(DateTimeOffset now, CancellationToken ct)
+    {
+        await using var connection = await dataSource.OpenConnectionAsync(ct);
+
+        var results = await connection.QueryAsync<Guid>(
+            """
+            SELECT id
+            FROM sessions
+            WHERE status IN (@Confirmed, @ConfirmationSent)
+              AND scheduled_at - @LeadTime <= @Now
+              AND one_hour_reminder_processed_at IS NULL
+            """,
+            new
+            {
+                Confirmed = SessionStatus.Confirmed,
+                ConfirmationSent = SessionStatus.ConfirmationSent,
+                LeadTime = OneHourReminderLeadTime,
+                Now = now.UtcDateTime
+            });
+
+        return results.ToList();
+    }
+
+    public async Task<IReadOnlyList<Guid>> GetSessionsNeedingJoinLinkAsync(DateTimeOffset now, CancellationToken ct)
+    {
+        await using var connection = await dataSource.OpenConnectionAsync(ct);
+
+        var results = await connection.QueryAsync<Guid>(
+            """
+            SELECT id
+            FROM sessions
+            WHERE status = @Confirmed
+              AND scheduled_at - @LeadTime <= @Now
+              AND link_message_id IS NULL
+            """,
+            new
+            {
+                Confirmed = SessionStatus.Confirmed,
+                LeadTime = JoinLinkLeadTime,
+                Now = now.UtcDateTime
+            });
+
+        return results.ToList();
+    }
+}

src/GmRelay.Bot/Infrastructure/Scheduling/ISystemClock.cs

@@ -0,0 +1,16 @@
+namespace GmRelay.Bot.Infrastructure.Scheduling;
+
+public interface ISystemClock
+{
+    DateTimeOffset UtcNow { get; }
+}
+
+public sealed class SystemClock : ISystemClock
+{
+    public DateTimeOffset UtcNow => DateTimeOffset.UtcNow;
+}
+
+public sealed class FakeSystemClock : ISystemClock
+{
+    public DateTimeOffset UtcNow { get; set; } = DateTimeOffset.UtcNow;
+}

src/GmRelay.Bot/Infrastructure/Scheduling/SessionSchedulerService.cs

@@ -1,31 +1,27 @@
-using Dapper;
-using GmRelay.Shared.Domain;
 using GmRelay.Bot.Features.Confirmation.SendConfirmation;
 using GmRelay.Bot.Features.Reminders.SendJoinLink;
 using GmRelay.Bot.Features.Reminders.SendOneHourReminder;
-using Npgsql;
 
 namespace GmRelay.Bot.Infrastructure.Scheduling;
 
 /// <summary>
 /// Stateless scheduler: wakes every 60 seconds, queries PostgreSQL for actionable sessions.
-/// Two triggers:
+/// Three triggers:
 ///   T-24h: send confirmation request with inline keyboard
+///   T-1h:  send one-hour direct reminder
 ///   T-5min: send join link to all confirmed players
 ///
 /// If the Raspberry Pi reboots, nothing is lost — all state is in the DB.
 /// </summary>
 public sealed class SessionSchedulerService(
-    NpgsqlDataSource dataSource,
-    SendConfirmationHandler confirmationHandler,
-    SendOneHourReminderHandler oneHourReminderHandler,
-    SendJoinLinkHandler joinLinkHandler,
+    ISessionTriggerStore triggerStore,
+    ISendConfirmationHandler confirmationHandler,
+    ISendOneHourReminderHandler oneHourReminderHandler,
+    ISendJoinLinkHandler joinLinkHandler,
+    ISystemClock clock,
     ILogger<SessionSchedulerService> logger) : BackgroundService
 {
     private static readonly TimeSpan TickInterval = TimeSpan.FromMinutes(1);
-    private static readonly TimeSpan ConfirmationLeadTime = TimeSpan.FromHours(24);
-    private static readonly TimeSpan OneHourReminderLeadTime = TimeSpan.FromHours(1);
-    private static readonly TimeSpan JoinLinkLeadTime = TimeSpan.FromMinutes(5);
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
@@ -33,14 +29,11 @@ public sealed class SessionSchedulerService(
 
         using var timer = new PeriodicTimer(TickInterval);
 
-        // Run immediately on startup, then on each tick
         do
         {
             try
             {
-                await ProcessConfirmationTriggers(stoppingToken);
-                await ProcessOneHourReminderTriggers(stoppingToken);
-                await ProcessJoinLinkTriggers(stoppingToken);
+                await TickAsync(stoppingToken);
             }
             catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
             {
@@ -57,57 +50,30 @@ public sealed class SessionSchedulerService(
     }
 
     /// <summary>
-    /// T-1h trigger: process direct reminders according to the session notification mode.
+    /// Runs a single scheduler tick using the current clock time.
+    /// Public so it can be called from integration tests with a fake clock.
     /// </summary>
-    private async Task ProcessOneHourReminderTriggers(CancellationToken ct)
+    public async Task TickAsync(CancellationToken ct)
     {
-        await using var connection = await dataSource.OpenConnectionAsync(ct);
+        var now = clock.UtcNow;
 
-        var sessionIds = await connection.QueryAsync<Guid>(
-            """
-            SELECT id
-            FROM sessions
-            WHERE status IN (@Confirmed, @ConfirmationSent)
-              AND scheduled_at - @LeadTime <= now()
-              AND one_hour_reminder_processed_at IS NULL
-            """,
-            new
-            {
-                Confirmed = SessionStatus.Confirmed,
-                ConfirmationSent = SessionStatus.ConfirmationSent,
-                LeadTime = OneHourReminderLeadTime
-            });
-
-        foreach (var sessionId in sessionIds)
-        {
-            try
-            {
-                await oneHourReminderHandler.HandleAsync(sessionId, ct);
-                logger.LogInformation("One-hour reminder processed for session {SessionId}", sessionId);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Failed to process one-hour reminder for session {SessionId}", sessionId);
-            }
-        }
+        await ProcessConfirmationTriggers(now, ct);
+        await ProcessOneHourReminderTriggers(now, ct);
+        await ProcessJoinLinkTriggers(now, ct);
     }
 
-    /// <summary>
-    /// T-24h trigger: find sessions that need confirmation requests sent.
-    /// Condition: status='Planned' AND scheduled_at minus 24h is in the past.
-    /// </summary>
-    private async Task ProcessConfirmationTriggers(CancellationToken ct)
+    private async Task ProcessConfirmationTriggers(DateTimeOffset now, CancellationToken ct)
     {
-        await using var connection = await dataSource.OpenConnectionAsync(ct);
-
-        var sessionIds = await connection.QueryAsync<Guid>(
-            """
-            SELECT id
-            FROM sessions
-            WHERE status = @Planned
-              AND scheduled_at - @LeadTime <= now()
-            """,
-            new { Planned = SessionStatus.Planned, LeadTime = ConfirmationLeadTime });
+        IReadOnlyList<Guid> sessionIds;
+        try
+        {
+            sessionIds = await triggerStore.GetSessionsNeedingConfirmationAsync(now, ct);
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Failed to query confirmation triggers");
+            return;
+        }
 
         foreach (var sessionId in sessionIds)
         {
@@ -123,23 +89,45 @@ public sealed class SessionSchedulerService(
         }
     }
 
-    /// <summary>
-    /// T-5min trigger: find confirmed sessions that need join links sent.
-    /// Condition: status='Confirmed' AND scheduled_at minus 5min is in the past AND link not yet sent.
-    /// </summary>
-    private async Task ProcessJoinLinkTriggers(CancellationToken ct)
+    private async Task ProcessOneHourReminderTriggers(DateTimeOffset now, CancellationToken ct)
     {
-        await using var connection = await dataSource.OpenConnectionAsync(ct);
+        IReadOnlyList<Guid> sessionIds;
+        try
+        {
+            sessionIds = await triggerStore.GetSessionsNeedingOneHourReminderAsync(now, ct);
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Failed to query one-hour reminder triggers");
+            return;
+        }
 
-        var sessionIds = await connection.QueryAsync<Guid>(
-            """
-            SELECT id
-            FROM sessions
-            WHERE status = @Confirmed
-              AND scheduled_at - @LeadTime <= now()
-              AND link_message_id IS NULL
-            """,
-            new { Confirmed = SessionStatus.Confirmed, LeadTime = JoinLinkLeadTime });
+        foreach (var sessionId in sessionIds)
+        {
+            try
+            {
+                await oneHourReminderHandler.HandleAsync(sessionId, ct);
+                logger.LogInformation("One-hour reminder processed for session {SessionId}", sessionId);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Failed to process one-hour reminder for session {SessionId}", sessionId);
+            }
+        }
+    }
+
+    private async Task ProcessJoinLinkTriggers(DateTimeOffset now, CancellationToken ct)
+    {
+        IReadOnlyList<Guid> sessionIds;
+        try
+        {
+            sessionIds = await triggerStore.GetSessionsNeedingJoinLinkAsync(now, ct);
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Failed to query join-link triggers");
+            return;
+        }
 
         foreach (var sessionId in sessionIds)
         {

src/GmRelay.Bot/Infrastructure/Telegram/TelegramPlatformIds.cs

@@ -0,0 +1,29 @@
+using System.Globalization;
+using GmRelay.Shared.Platform;
+
+namespace GmRelay.Bot.Infrastructure.Telegram;
+
+internal static class TelegramPlatformIds
+{
+    public static PlatformGroup Group(long chatId, int? threadId = null, string? displayName = null) =>
+        new(
+            PlatformKind.Telegram,
+            chatId.ToString(CultureInfo.InvariantCulture),
+            displayName ?? "Telegram chat",
+            ExternalChannelId: chatId.ToString(CultureInfo.InvariantCulture),
+            ExternalThreadId: threadId?.ToString(CultureInfo.InvariantCulture));
+
+    public static PlatformUser User(long telegramId, string displayName, string? username = null) =>
+        new(
+            PlatformKind.Telegram,
+            telegramId.ToString(CultureInfo.InvariantCulture),
+            displayName,
+            username);
+
+    public static PlatformMessageRef Message(long chatId, int? threadId, int messageId) =>
+        new(
+            PlatformKind.Telegram,
+            chatId.ToString(CultureInfo.InvariantCulture),
+            threadId?.ToString(CultureInfo.InvariantCulture),
+            messageId.ToString(CultureInfo.InvariantCulture));
+}

src/GmRelay.Bot/Infrastructure/Telegram/TelegramPlatformMessenger.cs

@@ -0,0 +1,196 @@
+using System.Globalization;
+using GmRelay.Shared.Platform;
+using Telegram.Bot;
+using Telegram.Bot.Types;
+using Telegram.Bot.Types.Enums;
+using Telegram.Bot.Types.ReplyMarkups;
+
+namespace GmRelay.Bot.Infrastructure.Telegram;
+
+public sealed class TelegramPlatformMessenger(
+    ITelegramBotClient bot,
+    ILogger<TelegramPlatformMessenger> logger) : IPlatformMessenger
+{
+    public async Task<PlatformMessageRef> SendScheduleAsync(PlatformScheduleMessage message, CancellationToken ct)
+    {
+        EnsureTelegram(message.Group.Platform);
+
+        var chatId = ParseLong(message.Group.ExternalGroupId);
+        var threadId = ParseNullableInt(message.Group.ExternalThreadId);
+        var renderResult = TelegramSessionBatchRenderer.Render(message.View);
+        Message sentMessage;
+
+        if (!string.IsNullOrWhiteSpace(message.ImageReference) && renderResult.Text.Length <= 1024)
+        {
+            try
+            {
+                sentMessage = await bot.SendPhoto(
+                    chatId: chatId,
+                    messageThreadId: threadId,
+                    photo: InputFile.FromString(message.ImageReference),
+                    caption: renderResult.Text,
+                    parseMode: ParseMode.Html,
+                    replyMarkup: renderResult.Markup,
+                    cancellationToken: ct);
+            }
+            catch (Exception ex)
+            {
+                logger.LogWarning(ex, "Failed to send Telegram schedule image for group {ExternalGroupId}", message.Group.ExternalGroupId);
+                sentMessage = await SendScheduleTextMessage(chatId, threadId, renderResult.Text, renderResult.Markup, ct);
+            }
+        }
+        else
+        {
+            if (!string.IsNullOrWhiteSpace(message.ImageReference))
+            {
+                await TrySendScheduleImageOnly(chatId, threadId, message.View.Title, message.ImageReference, ct);
+            }
+
+            sentMessage = await SendScheduleTextMessage(chatId, threadId, renderResult.Text, renderResult.Markup, ct);
+        }
+
+        return new PlatformMessageRef(
+            PlatformKind.Telegram,
+            message.Group.ExternalGroupId,
+            message.Group.ExternalThreadId,
+            sentMessage.MessageId.ToString(CultureInfo.InvariantCulture));
+    }
+
+    public async Task UpdateScheduleAsync(PlatformScheduleMessage message, CancellationToken ct)
+    {
+        EnsureTelegram(message.Group.Platform);
+        var existingMessage = message.ExistingMessage;
+        if (existingMessage is null)
+        {
+            throw new ArgumentException("Existing schedule message reference is required.", nameof(message));
+        }
+
+        EnsureTelegram(existingMessage.Platform);
+        if (!string.Equals(message.Group.ExternalGroupId, existingMessage.ExternalGroupId, StringComparison.Ordinal) ||
+            !string.Equals(message.Group.ExternalThreadId, existingMessage.ExternalThreadId, StringComparison.Ordinal))
+        {
+            throw new ArgumentException("Existing schedule message reference must match the schedule group.", nameof(message));
+        }
+
+        var renderResult = TelegramSessionBatchRenderer.Render(message.View);
+        await BatchMessageEditor.EditBatchMessageAsync(
+            bot,
+            chatId: ParseLong(existingMessage.ExternalGroupId),
+            messageId: ParseInt(existingMessage.ExternalMessageId),
+            text: renderResult.Text,
+            replyMarkup: renderResult.Markup,
+            ct);
+    }
+
+    public Task SendGroupMessageAsync(PlatformGroup group, string htmlText, CancellationToken ct)
+    {
+        EnsureTelegram(group.Platform);
+        return bot.SendMessage(
+            chatId: ParseLong(group.ExternalGroupId),
+            messageThreadId: ParseNullableInt(group.ExternalThreadId),
+            text: htmlText,
+            parseMode: ParseMode.Html,
+            cancellationToken: ct);
+    }
+
+    public Task SendPrivateMessageAsync(PlatformPrivateMessage message, CancellationToken ct)
+    {
+        EnsureTelegram(message.Recipient.Platform);
+        return bot.SendMessage(
+            chatId: ParseLong(message.Recipient.ExternalUserId),
+            text: message.HtmlText,
+            parseMode: ParseMode.Html,
+            cancellationToken: ct);
+    }
+
+    public Task AnswerInteractionAsync(PlatformInteractionReply reply, CancellationToken ct) =>
+        bot.AnswerCallbackQuery(
+            callbackQueryId: reply.InteractionId,
+            text: reply.Text,
+            showAlert: reply.ShowAlert,
+            cancellationToken: ct);
+
+    public async Task SendCalendarFileAsync(PlatformCalendarFile file, CancellationToken ct)
+    {
+        EnsureTelegram(file.Group.Platform);
+
+        using var stream = new MemoryStream(file.Content);
+        await bot.SendDocument(
+            chatId: ParseLong(file.Group.ExternalGroupId),
+            messageThreadId: ParseNullableInt(file.Group.ExternalThreadId),
+            document: InputFile.FromStream(stream, file.FileName),
+            caption: file.CaptionHtml,
+            parseMode: ParseMode.Html,
+            replyMarkup: BuildActionsMarkup(file.Actions),
+            cancellationToken: ct);
+    }
+
+    private async Task<Message> SendScheduleTextMessage(
+        long chatId,
+        int? threadId,
+        string text,
+        InlineKeyboardMarkup markup,
+        CancellationToken ct) =>
+        await bot.SendMessage(
+            chatId: chatId,
+            messageThreadId: threadId,
+            text: text,
+            parseMode: ParseMode.Html,
+            replyMarkup: markup,
+            cancellationToken: ct);
+
+    private async Task TrySendScheduleImageOnly(
+        long chatId,
+        int? threadId,
+        string title,
+        string imageReference,
+        CancellationToken ct)
+    {
+        try
+        {
+            await bot.SendPhoto(
+                chatId: chatId,
+                messageThreadId: threadId,
+                photo: InputFile.FromString(imageReference),
+                caption: $"🎲 {System.Net.WebUtility.HtmlEncode(title)}",
+                parseMode: ParseMode.Html,
+                cancellationToken: ct);
+        }
+        catch (Exception ex)
+        {
+            logger.LogWarning(ex, "Failed to send Telegram schedule image for chat {ChatId}", chatId);
+        }
+    }
+
+    private static InlineKeyboardMarkup? BuildActionsMarkup(IReadOnlyList<PlatformMessageAction> actions)
+    {
+        if (actions.Count == 0)
+        {
+            return null;
+        }
+
+        return new InlineKeyboardMarkup(
+            actions.Select(action => new[]
+            {
+                Uri.TryCreate(action.Payload, UriKind.Absolute, out var uri) &&
+                (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
+                    ? InlineKeyboardButton.WithUrl(action.Label, action.Payload)
+                    : InlineKeyboardButton.WithCallbackData(action.Label, action.Payload)
+            }));
+    }
+
+    private static void EnsureTelegram(PlatformKind platform)
+    {
+        if (platform != PlatformKind.Telegram)
+        {
+            throw new NotSupportedException($"Telegram messenger cannot send messages for platform {platform}.");
+        }
+    }
+
+    private static long ParseLong(string value) => long.Parse(value, CultureInfo.InvariantCulture);
+
+    private static int ParseInt(string value) => int.Parse(value, CultureInfo.InvariantCulture);
+
+    private static int? ParseNullableInt(string? value) =>
+        string.IsNullOrWhiteSpace(value) ? null : int.Parse(value, CultureInfo.InvariantCulture);
+}

src/GmRelay.Bot/Infrastructure/Telegram/TelegramSessionBatchRenderer.cs

@@ -21,6 +21,11 @@ public static class TelegramSessionBatchRenderer
                 ? $"👥 Места: {session.ActivePlayerCount}/{session.MaxPlayers.Value}\n"
                 : $"👥 Игроки ({session.ActivePlayerCount}):\n";
 
+            if (!string.IsNullOrEmpty(session.JoinLink))
+            {
+                messageText += $"🔗 <a href=\"{System.Net.WebUtility.HtmlEncode(session.JoinLink)}\">Ссылка на игру</a>\n";
+            }
+
             if (session.ActivePlayers.Count > 0)
             {
                 messageText += string.Join("\n", session.ActivePlayers.Select(p =>

src/GmRelay.Bot/Infrastructure/Telegram/TelegramTopicRouting.cs

@@ -0,0 +1,40 @@
+namespace GmRelay.Bot.Infrastructure.Telegram;
+
+public sealed record TelegramTopicDestination(
+    int? MessageThreadId,
+    bool ShouldCreateForumTopic,
+    bool TopicCreatedByBot);
+
+public static class TelegramTopicRouting
+{
+    public const string MissingForumTopicRightsMessage =
+        "Не удалось создать Telegram topic. Сделайте бота admin и включите право Manage Topics, затем повторите команду.";
+
+    public static TelegramTopicDestination ResolveNewScheduleDestination(
+        bool chatIsForum,
+        int? incomingMessageThreadId)
+    {
+        if (!chatIsForum)
+        {
+            return new TelegramTopicDestination(null, ShouldCreateForumTopic: false, TopicCreatedByBot: false);
+        }
+
+        if (incomingMessageThreadId.HasValue)
+        {
+            return new TelegramTopicDestination(
+                incomingMessageThreadId,
+                ShouldCreateForumTopic: false,
+                TopicCreatedByBot: false);
+        }
+
+        return new TelegramTopicDestination(null, ShouldCreateForumTopic: true, TopicCreatedByBot: true);
+    }
+
+    public static bool ShouldDeleteForumTopic(bool topicCreatedByBot, int remainingSessionsInTopic) =>
+        topicCreatedByBot && remainingSessionsInTopic == 0;
+
+    public static bool IsMissingForumTopicRightsError(string apiError) =>
+        apiError.Contains("not enough rights", StringComparison.OrdinalIgnoreCase) ||
+        apiError.Contains("CHAT_ADMIN_REQUIRED", StringComparison.OrdinalIgnoreCase) ||
+        apiError.Contains("not an administrator", StringComparison.OrdinalIgnoreCase);
+}

src/GmRelay.Bot/Infrastructure/Telegram/UpdateRouter.cs

@@ -69,18 +69,22 @@ public sealed class UpdateRouter(
 
         var parts = data.Split(':', 3);
         var action = parts[0];
+        var user = TelegramPlatformIds.User(
+            query.From.Id,
+            query.From.FirstName + (string.IsNullOrEmpty(query.From.LastName) ? "" : $" {query.From.LastName}"),
+            query.From.Username);
+        var group = TelegramPlatformIds.Group(message.Chat.Id, message.MessageThreadId, message.Chat.Title);
+        var scheduleMessage = TelegramPlatformIds.Message(message.Chat.Id, message.MessageThreadId, message.MessageId);
 
         if (action == "join_session" && parts.Length >= 2 && Guid.TryParse(parts[1], out var joinSessionId))
         {
             var command = new JoinSessionCommand(
                 SessionId: joinSessionId,
-                TelegramUserId: query.From.Id,
-                DisplayName: query.From.FirstName + (string.IsNullOrEmpty(query.From.LastName) ? "" : $" {query.From.LastName}"),
-                TelegramUsername: query.From.Username,
-                CallbackQueryId: query.Id,
-                ChatId: message.Chat.Id,
-                MessageId: message.MessageId);
-            
+                User: user,
+                InteractionId: query.Id,
+                Group: group,
+                ScheduleMessage: scheduleMessage);
+
             await joinSessionHandler.HandleAsync(command, ct);
             return;
         }
@@ -89,10 +93,10 @@ public sealed class UpdateRouter(
         {
             var command = new LeaveSessionCommand(
                 SessionId: leaveSessionId,
-                TelegramUserId: query.From.Id,
-                CallbackQueryId: query.Id,
-                ChatId: message.Chat.Id,
-                MessageId: message.MessageId);
+                User: user,
+                InteractionId: query.Id,
+                Group: group,
+                ScheduleMessage: scheduleMessage);
 
             await leaveSessionHandler.HandleAsync(command, ct);
             return;
@@ -105,6 +109,7 @@ public sealed class UpdateRouter(
                 TelegramUserId: query.From.Id,
                 CallbackQueryId: query.Id,
                 ChatId: message.Chat.Id,
+                MessageThreadId: message.MessageThreadId,
                 MessageId: message.MessageId);
 
             await cancelSessionHandler.HandleAsync(command, ct);
@@ -144,6 +149,7 @@ public sealed class UpdateRouter(
                 TelegramUserId: query.From.Id,
                 CallbackQueryId: query.Id,
                 ChatId: message.Chat.Id,
+                MessageThreadId: message.MessageThreadId,
                 MessageId: message.MessageId);
 
             await initiateRescheduleHandler.HandleAsync(command, ct);

src/GmRelay.Bot/Migrations/V012__add_attendance_stats.sql

@@ -47,7 +47,7 @@ BEGIN
     SELECT
         pt.player_id,
         p.display_name,
-        p.telegram_username,
+        COALESCE(p.external_username, p.telegram_username) AS telegram_username,
         pt.total_sessions,
         pt.confirmed_count,
         pt.declined_count,

src/GmRelay.Bot/Migrations/V014__add_confirmation_sent_at.sql

@@ -0,0 +1,13 @@
+ALTER TABLE sessions
+    ADD COLUMN confirmation_sent_at TIMESTAMPTZ;
+
+-- Update existing ConfirmationSent sessions to have a sentinel value
+-- so they don't get re-processed after migration
+UPDATE sessions
+SET confirmation_sent_at = now()
+WHERE status = 'ConfirmationSent';
+
+-- Partial index for efficient T-24h query
+CREATE INDEX ix_sessions_confirmation_reminders ON sessions (scheduled_at)
+    WHERE status = 'Planned'
+      AND confirmation_sent_at IS NULL;

src/GmRelay.Bot/Migrations/V015__add_topic_ownership.sql

@@ -0,0 +1,6 @@
+ALTER TABLE sessions
+    ADD COLUMN topic_created_by_bot BOOLEAN NOT NULL DEFAULT FALSE;
+
+UPDATE sessions
+SET topic_created_by_bot = TRUE
+WHERE thread_id IS NOT NULL;

src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql

@@ -0,0 +1,119 @@
+-- =============================================================
+-- V016: Add platform identity columns and platform_messages table
+-- =============================================================
+-- Scope: Prepare schema for multi-platform support (Discord, etc).
+-- Legacy telegram_* columns are retained for backward compatibility.
+-- =============================================================
+
+-- -- Players: platform-agnostic identity
+ALTER TABLE players
+    ADD COLUMN platform          VARCHAR(50),
+    ADD COLUMN external_user_id  VARCHAR(255),
+    ADD COLUMN external_username VARCHAR(255);
+
+CREATE UNIQUE INDEX ix_players_platform_external_user_id
+    ON players (platform, external_user_id)
+    WHERE platform IS NOT NULL AND external_user_id IS NOT NULL;
+
+-- -- Game groups: platform-agnostic identity
+ALTER TABLE game_groups
+    ADD COLUMN platform           VARCHAR(50),
+    ADD COLUMN external_group_id  VARCHAR(255),
+    ADD COLUMN external_channel_id VARCHAR(255);
+
+CREATE UNIQUE INDEX ix_game_groups_platform_external_group_id
+    ON game_groups (platform, external_group_id)
+    WHERE platform IS NOT NULL AND external_group_id IS NOT NULL;
+
+-- -- Backfill existing Telegram data
+UPDATE players
+   SET platform          = 'Telegram',
+       external_user_id  = telegram_id::TEXT,
+       external_username = telegram_username
+ WHERE platform IS NULL;
+
+UPDATE game_groups
+   SET platform          = 'Telegram',
+       external_group_id = telegram_chat_id::TEXT
+ WHERE platform IS NULL;
+
+-- -- Platform messages: store per-platform message references
+CREATE TABLE platform_messages (
+    id                   UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    platform             VARCHAR(50) NOT NULL,
+    group_id             UUID REFERENCES game_groups(id) ON DELETE CASCADE,
+    batch_id             UUID,
+    session_id           UUID REFERENCES sessions(id) ON DELETE CASCADE,
+    external_channel_id  VARCHAR(255),
+    external_thread_id   VARCHAR(255),
+    external_message_id  VARCHAR(255) NOT NULL,
+    purpose              VARCHAR(50) NOT NULL,
+    created_at           TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+
+CREATE INDEX ix_platform_messages_group_id     ON platform_messages(group_id);
+CREATE INDEX ix_platform_messages_batch_id     ON platform_messages(batch_id);
+CREATE INDEX ix_platform_messages_session_id   ON platform_messages(session_id);
+CREATE INDEX ix_platform_messages_platform_message
+    ON platform_messages (platform, external_message_id);
+
+-- -- Recreate attendance stats function for new columns (prod back-compat)
+CREATE OR REPLACE FUNCTION get_group_attendance_stats(p_group_id UUID)
+RETURNS TABLE (
+    player_id           UUID,
+    display_name        VARCHAR,
+    telegram_username   VARCHAR,
+    total_sessions      BIGINT,
+    confirmed_count     BIGINT,
+    declined_count      BIGINT,
+    no_response_count   BIGINT,
+    waitlisted_count    BIGINT,
+    cancellation_affected_count BIGINT,
+    attendance_rate     NUMERIC
+) AS $$
+BEGIN
+    RETURN QUERY
+    WITH player_sessions AS (
+        SELECT
+            sp.player_id,
+            s.id                AS session_id,
+            sp.rsvp_status,
+            sp.registration_status,
+            s.status            AS session_status,
+            s.scheduled_at
+        FROM session_participants sp
+        JOIN sessions s ON s.id = sp.session_id
+        WHERE s.group_id = p_group_id
+    ),
+    player_totals AS (
+        SELECT
+            ps.player_id,
+            COUNT(*) FILTER (WHERE ps.session_status <> 'Cancelled')                      AS total_sessions,
+            COUNT(*) FILTER (WHERE ps.rsvp_status = 'Confirmed' AND ps.session_status <> 'Cancelled') AS confirmed_count,
+            COUNT(*) FILTER (WHERE ps.rsvp_status = 'Declined' AND ps.session_status <> 'Cancelled')  AS declined_count,
+            COUNT(*) FILTER (WHERE ps.rsvp_status = 'Pending' AND ps.scheduled_at < NOW() AND ps.session_status <> 'Cancelled') AS no_response_count,
+            COUNT(*) FILTER (WHERE ps.registration_status = 'Waitlisted' AND ps.session_status <> 'Cancelled') AS waitlisted_count,
+            COUNT(*) FILTER (WHERE ps.session_status = 'Cancelled')                        AS cancellation_affected_count
+        FROM player_sessions ps
+        GROUP BY ps.player_id
+    )
+    SELECT
+        pt.player_id,
+        p.display_name,
+        COALESCE(p.external_username, p.telegram_username) AS telegram_username,
+        pt.total_sessions,
+        pt.confirmed_count,
+        pt.declined_count,
+        pt.no_response_count,
+        pt.waitlisted_count,
+        pt.cancellation_affected_count,
+        ROUND(
+            100.0 * pt.confirmed_count
+            / NULLIF(pt.total_sessions, 0),
+            1
+        ) AS attendance_rate
+    FROM player_totals pt
+    JOIN players p ON p.id = pt.player_id
+    ORDER BY pt.confirmed_count DESC, pt.total_sessions DESC;
+END;
+$$ LANGUAGE plpgsql STABLE;

src/GmRelay.Bot/Migrations/V017__allow_platform_neutral_players.sql

@@ -0,0 +1,9 @@
+-- =============================================================
+-- V017: Allow platform-neutral players
+-- =============================================================
+-- Legacy Telegram identity columns remain for backward compatibility,
+-- but non-Telegram platform users do not have Telegram ids.
+-- =============================================================
+
+ALTER TABLE players
+    ALTER COLUMN telegram_id DROP NOT NULL;

src/GmRelay.Bot/Program.cs

@@ -6,9 +6,11 @@ using GmRelay.Bot.Features.Reminders.SendOneHourReminder;
 using GmRelay.Bot.Features.Sessions.CreateSession;
 using GmRelay.Bot.Features.Sessions.RescheduleSession;
 using GmRelay.Bot.Infrastructure.Database;
+using GmRelay.Bot.Infrastructure.Health;
 using GmRelay.Bot.Infrastructure.Logging;
 using GmRelay.Bot.Infrastructure.Scheduling;
 using GmRelay.Bot.Infrastructure.Telegram;
+using GmRelay.Shared.Platform;
 using Npgsql;
 using Telegram.Bot;
 
@@ -49,13 +51,17 @@ builder.Services.AddSingleton<ITelegramBotClient>(sp =>
     return new TelegramBotClient(token);
 });
 builder.Services.AddSingleton<ITelegramUpdateSource, TelegramUpdateSource>();
+builder.Services.AddSingleton<IPlatformMessenger, TelegramPlatformMessenger>();
 
 // ── Feature handlers (explicit registration — AOT safe) ──────────────
 builder.Services.AddSingleton<SendConfirmationHandler>();
+builder.Services.AddSingleton<ISendConfirmationHandler>(sp => sp.GetRequiredService<SendConfirmationHandler>());
 builder.Services.AddSingleton<DirectSessionNotificationSender>();
 builder.Services.AddSingleton<HandleRsvpHandler>();
 builder.Services.AddSingleton<SendJoinLinkHandler>();
+builder.Services.AddSingleton<ISendJoinLinkHandler>(sp => sp.GetRequiredService<SendJoinLinkHandler>());
 builder.Services.AddSingleton<SendOneHourReminderHandler>();
+builder.Services.AddSingleton<ISendOneHourReminderHandler>(sp => sp.GetRequiredService<SendOneHourReminderHandler>());
 builder.Services.AddSingleton<CreateSessionHandler>();
 builder.Services.AddSingleton<JoinSessionHandler>();
 builder.Services.AddSingleton<LeaveSessionHandler>();
@@ -74,10 +80,17 @@ builder.Services.AddSingleton<ITelegramUpdateHandler>(sp => sp.GetRequiredServic
 builder.Services.AddHostedService<TelegramMiniAppMenuButtonService>();
 builder.Services.AddHostedService<TelegramBotService>();
 
+// ── Clock and scheduling ──────────────────────────────────────────────
+builder.Services.AddSingleton<ISystemClock, SystemClock>();
+builder.Services.AddSingleton<ISessionTriggerStore, DbSessionTriggerStore>();
+
 // ── Session scheduler ────────────────────────────────────────────────
 builder.Services.AddHostedService<SessionSchedulerService>();
 builder.Services.AddHostedService<RescheduleVotingDeadlineService>();
 
+// ── Health check server ──────────────────────────────────────────────
+builder.Services.AddHostedService<BotHealthCheckHostedService>();
+
 var host = builder.Build();
 
 // ── Run database migrations on startup ───────────────────────────────

src/GmRelay.Bot/packages.lock.json

@@ -0,0 +1,689 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net10.0": {
+      "Aspire.Npgsql": {
+        "type": "Direct",
+        "requested": "[13.2.2, )",
+        "resolved": "13.2.2",
+        "contentHash": "nEYgziWN7hksgEQEWy24JypcMCU8gKYcIIyPL05JfdXxUWuPRLotH/KOeuHevAjSEOYkL3dtGakBkJAuPobGmA==",
+        "dependencies": {
+          "AspNetCore.HealthChecks.NpgSql": "9.0.0",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "10.0.5",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5",
+          "Npgsql.DependencyInjection": "10.0.1",
+          "Npgsql.OpenTelemetry": "10.0.1",
+          "OpenTelemetry.Extensions.Hosting": "1.15.0"
+        }
+      },
+      "Dapper": {
+        "type": "Direct",
+        "requested": "[2.1.72, )",
+        "resolved": "2.1.72",
+        "contentHash": "ns4mGqQd9a/MhP8m6w556vVlZIa0/MfUu03zrxjZC/jlr1uVCsUac8bkdB+Fs98Llbd56rRSo1eZH5VVmeGZyw=="
+      },
+      "Dapper.AOT": {
+        "type": "Direct",
+        "requested": "[1.0.48, )",
+        "resolved": "1.0.48",
+        "contentHash": "rsLM3yKr4g+YKKox9lhc8D+kz67P7Q9+xdyn1LmCsoYr1kYpJSm+Nt6slo5UrfUrcTiGJ57zUlyO8XUdV7G7iA=="
+      },
+      "dbup-postgresql": {
+        "type": "Direct",
+        "requested": "[7.0.1, )",
+        "resolved": "7.0.1",
+        "contentHash": "mRnmENWWPuuMZ538gOd1mZnzucx6FQk0anmw3EABjGfcbp24FDb9QdGepYrDiaM8K9s5/gd49+5cmBOlniH/lg==",
+        "dependencies": {
+          "Npgsql": "10.0.1",
+          "dbup-core": "6.1.1"
+        }
+      },
+      "Microsoft.DotNet.ILCompiler": {
+        "type": "Direct",
+        "requested": "[10.0.5, )",
+        "resolved": "10.0.5",
+        "contentHash": "yadTZIkStCVsG8nGwvfroSfBApPsgjQbodQyaIfp53dgayE0qhZpywixiCB6lx57JYQ+KVg1m1AFLrj54pxpZg=="
+      },
+      "Microsoft.Extensions.Hosting": {
+        "type": "Direct",
+        "requested": "[10.0.5, )",
+        "resolved": "10.0.5",
+        "contentHash": "8i7e5IBdiKLNqt/+ciWrS8U95Rv5DClaaj7ulkZbimnCi4uREWd+lXzkp3joofFuIPOlAzV4AckxLTIELv2jdg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.Configuration.CommandLine": "10.0.5",
+          "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.5",
+          "Microsoft.Extensions.Configuration.FileExtensions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Json": "10.0.5",
+          "Microsoft.Extensions.Configuration.UserSecrets": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.5",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.5",
+          "Microsoft.Extensions.Logging.Console": "10.0.5",
+          "Microsoft.Extensions.Logging.Debug": "10.0.5",
+          "Microsoft.Extensions.Logging.EventLog": "10.0.5",
+          "Microsoft.Extensions.Logging.EventSource": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.NET.ILLink.Tasks": {
+        "type": "Direct",
+        "requested": "[10.0.5, )",
+        "resolved": "10.0.5",
+        "contentHash": "A+5ZuQ0f449tM+MQrhf6R9ZX7lYpjk/ODEwLYKrnF6111rtARx8fVsm4YznUnQiKnnXfaXNBqgxmil6RW3L3SA=="
+      },
+      "Npgsql": {
+        "type": "Direct",
+        "requested": "[10.0.2, )",
+        "resolved": "10.0.2",
+        "contentHash": "q5RfBI+wywJSFUNDE1L4ZbHEHCFTblo8Uf6A6oe4feOUFYiUQXyAf9GBh5qEZpvJaHiEbpBPkQumjEhXCJxdrg==",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.0"
+        }
+      },
+      "SecurityCodeScan.VS2019": {
+        "type": "Direct",
+        "requested": "[5.6.7, )",
+        "resolved": "5.6.7",
+        "contentHash": "WIE9RJswdSc2j+rLz2gW6U+gMUjMHzY2j7C/CL8/R2olXNM/+twarfMnWqm+rZodDBvaYDApJyxM8mVYf9FGrQ=="
+      },
+      "Telegram.Bot": {
+        "type": "Direct",
+        "requested": "[22.9.5.3, )",
+        "resolved": "22.9.5.3",
+        "contentHash": "7u8rZU9Vx9XEyIm6pB+dAlITsi1v63I+hKo7IEXGiQZnVjzvZgPs9yDCP17/Cwm7lgjCNEqknlbv/yoBnsUYFw==",
+        "dependencies": {
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
+        }
+      },
+      "AspNetCore.HealthChecks.NpgSql": {
+        "type": "Transitive",
+        "resolved": "9.0.0",
+        "contentHash": "npc58/AD5zuVxERdhCl2Kb7WnL37mwX42SJcXIwvmEig0/dugOLg3SIwtfvvh3TnvTwR/sk5LYNkkPaBdks61A==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11",
+          "Npgsql": "8.0.3"
+        }
+      },
+      "dbup-core": {
+        "type": "Transitive",
+        "resolved": "6.1.1",
+        "contentHash": "kgpuyJVEFJHoIj/slnc994Go88aoeZqNDfGHDBr4sh7CsEWwJhOTCt/FJqO4ziUImL5L0NEY0kxxOiNgPKI2Fw==",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.0"
+        }
+      },
+      "Microsoft.Extensions.AmbientMetadata.Application": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "CNrEjaOCZ8d1HtB0mvpiX4EWxLkee2xy+CsYXxmsEYJSFgw3OmF9pIhP/tCTeYBHhpsKJj5wM63G8IBFGxAcsw==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.2",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.2",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.2"
+        }
+      },
+      "Microsoft.Extensions.Compliance.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "1a4xDAT6fRyP8t419q3WvWMmMslDTvI7OAZLWBhn5rysFG0bl5xFenTswd1xAbT/3u3mx4Xyb5bPx+V+18tJeQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2",
+          "Microsoft.Extensions.ObjectPool": "10.0.2"
+        }
+      },
+      "Microsoft.Extensions.Configuration": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "8Rx5sqg04FttxrumyG6bmoRuFRgYzK6IVwF1i0/o0cXfKBdDeVpJejKHtJCMjyg9E/DNMVqpqOGe/tCT5gYvVA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "P09QpTHjqHmCLQOTC+WyLkoRNxek4NIvfWt+TnU0etoDUSRxcltyd6+j/ouRbMdLR0j44GqGO+lhI2M4fAHG4g==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Binder": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "99Z4rjyXopb1MIazDSPcvwYCUdYNO01Cf1GUs2WUjIFAbkGmwzj2vPa2k+3pheJRV+YgNd2QqRKHAri0oBAU4Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.CommandLine": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "or9fOLopMUTJOQVJ3bou4aD6PwvsiKf4kZC4EE5sRRKSkmh+wfk/LekJXRjAX88X+1JA9zHjDo+5fiQ7z3MY/A==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.EnvironmentVariables": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "tchMGQ+zVTO40np/Zzg2Li/TIR8bksQgg4UVXZa0OzeFCKWnIYtxE2FVs+eSmjPGCjMS2voZbwN/mUcYfpSTuA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.FileExtensions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "OhTr0O79dP49734lLTqVveivVX9sDXxbI/8vjELAZTHXqoN90mdpgTAgwicJED42iaHMCcZcK6Bj+8wNyBikaw==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Json": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "brBM/WP0YAUYh2+QqSYVdK8eQHYQTtTEUJXJ+84Zkdo2buGLja9VSrMIhgoeBUU7JBmcskAib8Lb/N83bvxgYQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.FileExtensions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Configuration.UserSecrets": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "fhdG6UV9lIp70QhNkVyaHciUVq25IPFkczheVJL9bIFvmnJ+Zghaie6dWkDbbVmxZlHl9gj3zTDxMxJs5zNhIA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Json": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "v1SVsowG6YE1YnHVGmLWz57YTRCQRx9pH5ebIESXfm5isI9gA3QaMyg/oMTzPpXYZwSAVDzYItGJKfmV+pqXkQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "iVMtq9eRvzyhx8949EGT0OCYJfXi737SbRVzWXE5GrOgGj5AaZ9eUuxA/BSUfmOMALKn/g8KfFaNQw0eiB3lyA=="
+      },
+      "Microsoft.Extensions.DependencyInjection.AutoActivation": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "Z/OI261l7LnxyODKPx0trQyIHFyicCR/akfn64lGOjPcf4FpAZ7ePAGl2HPvQBUBSNfPTF0gWeCfuFmyftMgYA==",
+        "dependencies": {
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.2"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "vAJHd4yOpmKoK+jBuYV7a3y+Ab9U4ARCc29b6qvMy276RgJFw9LFs0DdsPqOL3ahwzyrX7tM+i4cCxU/RX0qAg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "/nYGrpa9/0BZofrVpBbbj+Ns8ZesiPE0V/KxsuHgDgHQopIzN54nRaQGSuvPw16/kI9sW1Zox5yyAPqvf0Jz6A==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.ExceptionSummarization": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "3qMK1D40D10kb5TdBtFJpzz6/WH0NinWs68ZZS8jCFgHMXDiOjGiPOneMmIocCP/wnUUW4Hzf8lMsIE1xIGxDA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "REdt95QXHscGdtw/UUgyCW2lF9DJcAOJxmebKW2IkgUjuCAdMODIi2HNOWg5utW98nm8ekgV0Gjqs/sljwwqMw==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "NrIMTy7dpqxAvA6kHAYH8cXID/YgeNOy0OqFKpLtkPu5X4WS/basX91UszANzVrMNRAICJ2GOnGiRxJtsRyEQw=="
+      },
+      "Microsoft.Extensions.Features": {
+        "type": "Transitive",
+        "resolved": "10.0.2",
+        "contentHash": "X7tm2aV2w3lN9roSSGhl19lz4w76HvdiuKNhIv2XOiorYII9XCm66o/z9IJ0+QwkgvEv5gMZDM6rV6uwABHEQQ=="
+      },
+      "Microsoft.Extensions.FileProviders.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "nCBmCx0Xemlu65ZiWMcXbvfvtznKxf4/YYKF9R28QkqdI9lTikedGqzJ28/xmdGGsxUnsP5/3TQGpiPwVjK0dA==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.FileProviders.Physical": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "dMu5kUPSfol1Rqhmr6nWPSmbFjDe9w6bkoKithG17bWTZA0UyKirTatM5mqYUN3mGpNA0MorlusIoVTh6J7o5g==",
+        "dependencies": {
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileSystemGlobbing": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.FileSystemGlobbing": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "mOE3ARusNQR0a5x8YOcnUbfyyXGqoAWQtEc7qFOfNJgruDWQLo39Re+3/Lzj5pLPFuFYj8hN4dgKzaSQDKiOCw=="
+      },
+      "Microsoft.Extensions.Hosting.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "+Wb7KAMVZTomwJkQrjuPTe5KBzGod7N8XeG+ScxRlkPOB4sZLG4ccVwjV4Phk5BCJt7uIMnGHVoN6ZMVploX+g==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Http": {
+        "type": "Transitive",
+        "resolved": "10.0.2",
+        "contentHash": "egUPC0xydb1ugCMcRyJ6zaOGOzx7N4coOVlGeLcIsXhUf1xHHwZeX+ob7JuG0dXExFduHYE/t+4/4y8BLlBKmw==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.2",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2",
+          "Microsoft.Extensions.Diagnostics": "10.0.2",
+          "Microsoft.Extensions.Logging": "10.0.2",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.2",
+          "Microsoft.Extensions.Options": "10.0.2"
+        }
+      },
+      "Microsoft.Extensions.Http.Diagnostics": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "I0FBgF6yZRwYH9E3KQ2vHm80YZ7YBj+52GDsmOWXPBv/p15b/wUoNupV9kw3LnSNVsWMqlGbiuZgBnHpMwPh+Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Http": "10.0.2",
+          "Microsoft.Extensions.Telemetry": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Http.Resilience": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "Lg+OjBW+ODDbM4Ax4LoERvQ1dqSZ8I2gQc2+B0/WOWl2+PunLJ3xb3x8MtHGfcb/Mp98RoMpwRKm6Aj9mzXwrA==",
+        "dependencies": {
+          "Microsoft.Extensions.Http.Diagnostics": "10.2.0",
+          "Microsoft.Extensions.ObjectPool": "10.0.2",
+          "Microsoft.Extensions.Resilience": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Logging": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "+XTMKQyDWg4ODoNHU/BN3BaI1jhGO7VCS+BnzT/4IauiG6y2iPAte7MyD7rHKS+hNP0TkFkjrae8DFjDUxtcxg==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "9HOdqlDtPptVcmKAjsQ/Nr5Rxfq6FMYLdhvZh1lVmeKR738qeYecQD7+ldooXf+u2KzzR1kafSphWngIM3C6ug==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Configuration": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "cSgxsDgfP0+gmVRPVoNHI/KIDavIZxh+CxE6tSLPlYTogqccDnjBFI9CgEsiNuMP6+fiuXUwhhlTz36uUEpwbQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.5",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Console": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "PMs2gha2v24hvH5o5KQem5aNK4mN0BhhCWlMqsg9tzifWKzjeQi2tyPOP/RaWMVvalOhVLcrmoMYPqbnia/epg==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Debug": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "/VacEkBQ02A8PBXSa6YpbIXCuisYy6JJr62/+ANJDZE+RMBfZMcXJXLfr/LpyLE6pgdp17Wxlt7e7R9zvkwZ3Q==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.EventLog": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "0ezhWYJS4/6KrqQel9JL+Tr4n+4EX2TF5EYiaysBWNNEM2c3Gtj1moD39esfgk8OHblSX+UFjtZ3z0c4i9tRvw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "System.Diagnostics.EventLog": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.EventSource": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "vN+aq1hBFXyYvY5Ow9WyeR66drKQxRZmas4lAjh6QWfryPkjTn1uLtX5AFIxyDaZj78v5TG2sELUyvrXpAPQQw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Logging": "10.0.5",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.ObjectPool": {
+        "type": "Transitive",
+        "resolved": "10.0.2",
+        "contentHash": "kpCp4m7nwJVBcRKWXYHdVK/W0dkKyyFOjCmKVdO+zKThWvUxP1V+jVEP9FGpqRu4GPl9041SEXu2f+U/l825nQ=="
+      },
+      "Microsoft.Extensions.Options": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "MDaQMdUplw0AIRhWWmbLA7yQEXaLIHb+9CTroTiNS8OlI0LMXS4LCxtopqauiqGCWlRgJ+xyraVD8t6veRAFbw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Options.ConfigurationExtensions": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "BB9uUW3+6Rxu1R97OB1H/13lUF8P2+H1+eDhpZlK30kDh/6E4EKHBUqTp+ilXQmZLzsRErxON8aBSR6WpUKJdg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.5",
+          "Microsoft.Extensions.Options": "10.0.5",
+          "Microsoft.Extensions.Primitives": "10.0.5"
+        }
+      },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "/HUHJ0tw/LQvD0DZrz50eQy/3z7PfX7WWEaXnjKTV9/TNdcgFlNTZGo49QhS7PTmhDqMyHRMqAXSBxLh0vso4g=="
+      },
+      "Microsoft.Extensions.Resilience": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "v4WOdAOFxB3AcsUkZWNcHL3mYzs4KAPtHO8rkoQlFKOBoD3KyjjAL+h3tRwSK5i4UpF/yhxsQRY0JxKj4osxxw==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics": "10.0.2",
+          "Microsoft.Extensions.Diagnostics.ExceptionSummarization": "10.2.0",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.2",
+          "Microsoft.Extensions.Telemetry.Abstractions": "10.2.0",
+          "Polly.Extensions": "8.4.2",
+          "Polly.RateLimiting": "8.4.2"
+        }
+      },
+      "Microsoft.Extensions.ServiceDiscovery": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "AHTPfiKodj66xA8RwRkFD4q11V2AvzcuDsujv6ViPkOPtvBEYcPVplHakK56pPzWlX08MDS+TAQXfFXAeP7J5w==",
+        "dependencies": {
+          "Microsoft.Extensions.Http": "10.0.2",
+          "Microsoft.Extensions.ServiceDiscovery.Abstractions": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.ServiceDiscovery.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "sANlOvfqfw/yfych4CLlHSKSWzIie6mQG7w83gVur1foNOafyHxcgpoQMvBf+KiB4Tpls6P1/Z77IIQSK8hxFg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.2",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.2",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.2",
+          "Microsoft.Extensions.Features": "10.0.2",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.2",
+          "Microsoft.Extensions.Options": "10.0.2",
+          "Microsoft.Extensions.Primitives": "10.0.2"
+        }
+      },
+      "Microsoft.Extensions.Telemetry": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "ssW5gosYlewNH/ISTyaLD/XfJT4GSjwShOUKv61fpXrqVmHkhuIA/5bBAGStM1XbzJjt9IG2vzfdHTu4zlX9Ew==",
+        "dependencies": {
+          "Microsoft.Extensions.AmbientMetadata.Application": "10.2.0",
+          "Microsoft.Extensions.DependencyInjection.AutoActivation": "10.2.0",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.2",
+          "Microsoft.Extensions.ObjectPool": "10.0.2",
+          "Microsoft.Extensions.Telemetry.Abstractions": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Telemetry.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "6V4V6NX6RLUYWwV89DeW/4zK5xOycYHWhsfMXSpKVGgMHfXcczmbk6hBeqTnRPzhpATYcOWlmA6hk1jgdxUugA==",
+        "dependencies": {
+          "Microsoft.Extensions.Compliance.Abstractions": "10.2.0",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.2",
+          "Microsoft.Extensions.ObjectPool": "10.0.2",
+          "Microsoft.Extensions.Options": "10.0.2"
+        }
+      },
+      "Npgsql.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "10.0.1",
+        "contentHash": "YHFa4vD27sNIfv6s5q8Zi1fLvKfmK1xcpMv0PUvXOxDFbRmuMRSHwpZTbPvsAlj97q1/o7DfyynLqfqrCm1VnA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
+          "Npgsql": "10.0.1"
+        }
+      },
+      "Npgsql.OpenTelemetry": {
+        "type": "Transitive",
+        "resolved": "10.0.1",
+        "contentHash": "G9fEIBaHggZXWfDSDnKLc0XwKcbuU6i2eXp7zDqpgYxbhCmIN9fRgaSOGyyMNHSo/yY1IB4G4CjW5VO/SKRR0g==",
+        "dependencies": {
+          "Npgsql": "10.0.1",
+          "OpenTelemetry.API": "1.14.0"
+        }
+      },
+      "OpenTelemetry": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "N0i6WjPoHPbZyms1ugbDIFAJFuGlpeExJMU/+XSL0lQRUkg/D0utFkDoLXf8Z1km5B+xVZ2GyMXXiX8qdeNmPg==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.0",
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Api": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "fX+fkCysfPut+qCcT3bKqyX4QN9Saf4CgX8HLOHywEVD+Xr7sULtfuypITpoDysjx8R59dn/3mWhgimMH8cm/g=="
+      },
+      "OpenTelemetry.Api.ProviderBuilderExtensions": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
+          "OpenTelemetry.Api": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "FEXJepcseTGbATiCkUfP7ipoFEYYfl/0UmmUwi0KxCPg9PaUA8ab2P1LGopK+/HExasJ1ZutFhZrN6WvUIR23g==",
+        "dependencies": {
+          "OpenTelemetry": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Extensions.Hosting": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "u8n/W8yIlqv0BXZmvId1iVaeWXG42tGKdTkuLYg5g57Y/r9CeUNzqtrSHNdG5IoO8iPX79w3v+WsbAHgUQbfeg==",
+        "dependencies": {
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
+          "OpenTelemetry": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Instrumentation.AspNetCore": {
+        "type": "Transitive",
+        "resolved": "1.15.2",
+        "contentHash": "2nPd7r0ug/gd6/CNFL6Rlu+RSQ9WYGSGHAYQ1ssbSqyzKJpqTunfx2I/1O0WB5k+L0cyXbG4XVZpoSoUc3M7wg==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
+        }
+      },
+      "OpenTelemetry.Instrumentation.Http": {
+        "type": "Transitive",
+        "resolved": "1.15.1",
+        "contentHash": "vFO4Fj/dXkoVNGo/nhoGpO2zYQmZwr4jTID7oRGo+XlQ8LqksyZjUXQ4p39RfUvTID7IzzL8Qe71tW7CcAFymA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.0",
+          "Microsoft.Extensions.Options": "10.0.0",
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
+        }
+      },
+      "OpenTelemetry.Instrumentation.Runtime": {
+        "type": "Transitive",
+        "resolved": "1.15.1",
+        "contentHash": "cpPwlUT5HXcLGPaIgsbSy0W9eFYAPGVbTP1p8/uyQ4Osvf5BJuPpEXE7crL09SmEd44r0DGNKDtsqxaAz0HxQw==",
+        "dependencies": {
+          "OpenTelemetry.Api": "[1.15.3, 2.0.0)"
+        }
+      },
+      "Polly.Core": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "BpE2I6HBYYA5tF0Vn4eoQOGYTYIK1BlF5EXVgkWGn3mqUUjbXAr13J6fZVbp7Q3epRR8yshacBMlsHMhpOiV3g=="
+      },
+      "Polly.Extensions": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "GZ9vRVmR0jV2JtZavt+pGUsQ1O1cuRKG7R7VOZI6ZDy9y6RNPvRvXK1tuS4ffUrv8L0FTea59oEuQzgS0R7zSA==",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
+          "Microsoft.Extensions.Options": "8.0.0",
+          "Polly.Core": "8.4.2"
+        }
+      },
+      "Polly.RateLimiting": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "ehTImQ/eUyO07VYW2WvwSmU9rRH200SKJ/3jku9rOkyWE0A2JxNFmAVms8dSn49QLSjmjFRRSgfNyOgr/2PSmA==",
+        "dependencies": {
+          "Polly.Core": "8.4.2",
+          "System.Threading.RateLimiting": "8.0.0"
+        }
+      },
+      "System.Diagnostics.EventLog": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "wugvy+pBVzjQEnRs9wMTWwoaeNFX3hsaHeVHFDIvJSWXp7wfmNWu3mxAwBIE6pyW+g6+rHa1Of5fTzb0QVqUTA=="
+      },
+      "System.Threading.RateLimiting": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "7mu9v0QDv66ar3DpGSZHg9NuNcxDaaAcnMULuZlaTpP9+hwXhrxNGsF5GmLkSHxFdb5bBc1TzeujsRgTrPWi+Q=="
+      },
+      "gmrelay.servicedefaults": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Http.Resilience": "[10.2.0, )",
+          "Microsoft.Extensions.ServiceDiscovery": "[10.2.0, )",
+          "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.15.3, )",
+          "OpenTelemetry.Extensions.Hosting": "[1.15.3, )",
+          "OpenTelemetry.Instrumentation.AspNetCore": "[1.15.2, )",
+          "OpenTelemetry.Instrumentation.Http": "[1.15.1, )",
+          "OpenTelemetry.Instrumentation.Runtime": "[1.15.1, )"
+        }
+      },
+      "gmrelay.shared": {
+        "type": "Project"
+      }
+    },
+    "net10.0/win-x64": {
+      "Microsoft.DotNet.ILCompiler": {
+        "type": "Direct",
+        "requested": "[10.0.5, )",
+        "resolved": "10.0.5",
+        "contentHash": "yadTZIkStCVsG8nGwvfroSfBApPsgjQbodQyaIfp53dgayE0qhZpywixiCB6lx57JYQ+KVg1m1AFLrj54pxpZg==",
+        "dependencies": {
+          "runtime.win-x64.Microsoft.DotNet.ILCompiler": "10.0.5"
+        }
+      },
+      "runtime.win-x64.Microsoft.DotNet.ILCompiler": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "vblLkpVhSDYOmrEW0jypX7YVtLg7idU1QzUyx45ZdZ2sFUSSf3mYFCr0FW3+KZgXWpN1ve9ZPrxNywvHISF4bA=="
+      },
+      "System.Diagnostics.EventLog": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "wugvy+pBVzjQEnRs9wMTWwoaeNFX3hsaHeVHFDIvJSWXp7wfmNWu3mxAwBIE6pyW+g6+rHa1Of5fTzb0QVqUTA=="
+      }
+    }
+  }
+}

src/GmRelay.ServiceDefaults/packages.lock.json

@@ -0,0 +1,181 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net10.0": {
+      "Microsoft.Extensions.Http.Resilience": {
+        "type": "Direct",
+        "requested": "[10.2.0, )",
+        "resolved": "10.2.0",
+        "contentHash": "Lg+OjBW+ODDbM4Ax4LoERvQ1dqSZ8I2gQc2+B0/WOWl2+PunLJ3xb3x8MtHGfcb/Mp98RoMpwRKm6Aj9mzXwrA==",
+        "dependencies": {
+          "Microsoft.Extensions.Http.Diagnostics": "10.2.0",
+          "Microsoft.Extensions.Resilience": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.ServiceDiscovery": {
+        "type": "Direct",
+        "requested": "[10.2.0, )",
+        "resolved": "10.2.0",
+        "contentHash": "AHTPfiKodj66xA8RwRkFD4q11V2AvzcuDsujv6ViPkOPtvBEYcPVplHakK56pPzWlX08MDS+TAQXfFXAeP7J5w==",
+        "dependencies": {
+          "Microsoft.Extensions.ServiceDiscovery.Abstractions": "10.2.0"
+        }
+      },
+      "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+        "type": "Direct",
+        "requested": "[1.15.3, )",
+        "resolved": "1.15.3",
+        "contentHash": "FEXJepcseTGbATiCkUfP7ipoFEYYfl/0UmmUwi0KxCPg9PaUA8ab2P1LGopK+/HExasJ1ZutFhZrN6WvUIR23g==",
+        "dependencies": {
+          "OpenTelemetry": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Extensions.Hosting": {
+        "type": "Direct",
+        "requested": "[1.15.3, )",
+        "resolved": "1.15.3",
+        "contentHash": "u8n/W8yIlqv0BXZmvId1iVaeWXG42tGKdTkuLYg5g57Y/r9CeUNzqtrSHNdG5IoO8iPX79w3v+WsbAHgUQbfeg==",
+        "dependencies": {
+          "OpenTelemetry": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Instrumentation.AspNetCore": {
+        "type": "Direct",
+        "requested": "[1.15.2, )",
+        "resolved": "1.15.2",
+        "contentHash": "2nPd7r0ug/gd6/CNFL6Rlu+RSQ9WYGSGHAYQ1ssbSqyzKJpqTunfx2I/1O0WB5k+L0cyXbG4XVZpoSoUc3M7wg==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
+        }
+      },
+      "OpenTelemetry.Instrumentation.Http": {
+        "type": "Direct",
+        "requested": "[1.15.1, )",
+        "resolved": "1.15.1",
+        "contentHash": "vFO4Fj/dXkoVNGo/nhoGpO2zYQmZwr4jTID7oRGo+XlQ8LqksyZjUXQ4p39RfUvTID7IzzL8Qe71tW7CcAFymA==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
+        }
+      },
+      "OpenTelemetry.Instrumentation.Runtime": {
+        "type": "Direct",
+        "requested": "[1.15.1, )",
+        "resolved": "1.15.1",
+        "contentHash": "cpPwlUT5HXcLGPaIgsbSy0W9eFYAPGVbTP1p8/uyQ4Osvf5BJuPpEXE7crL09SmEd44r0DGNKDtsqxaAz0HxQw==",
+        "dependencies": {
+          "OpenTelemetry.Api": "[1.15.3, 2.0.0)"
+        }
+      },
+      "SecurityCodeScan.VS2019": {
+        "type": "Direct",
+        "requested": "[5.6.7, )",
+        "resolved": "5.6.7",
+        "contentHash": "WIE9RJswdSc2j+rLz2gW6U+gMUjMHzY2j7C/CL8/R2olXNM/+twarfMnWqm+rZodDBvaYDApJyxM8mVYf9FGrQ=="
+      },
+      "Microsoft.Extensions.AmbientMetadata.Application": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "CNrEjaOCZ8d1HtB0mvpiX4EWxLkee2xy+CsYXxmsEYJSFgw3OmF9pIhP/tCTeYBHhpsKJj5wM63G8IBFGxAcsw=="
+      },
+      "Microsoft.Extensions.Compliance.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "1a4xDAT6fRyP8t419q3WvWMmMslDTvI7OAZLWBhn5rysFG0bl5xFenTswd1xAbT/3u3mx4Xyb5bPx+V+18tJeQ=="
+      },
+      "Microsoft.Extensions.DependencyInjection.AutoActivation": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "Z/OI261l7LnxyODKPx0trQyIHFyicCR/akfn64lGOjPcf4FpAZ7ePAGl2HPvQBUBSNfPTF0gWeCfuFmyftMgYA=="
+      },
+      "Microsoft.Extensions.Diagnostics.ExceptionSummarization": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "3qMK1D40D10kb5TdBtFJpzz6/WH0NinWs68ZZS8jCFgHMXDiOjGiPOneMmIocCP/wnUUW4Hzf8lMsIE1xIGxDA=="
+      },
+      "Microsoft.Extensions.Http.Diagnostics": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "I0FBgF6yZRwYH9E3KQ2vHm80YZ7YBj+52GDsmOWXPBv/p15b/wUoNupV9kw3LnSNVsWMqlGbiuZgBnHpMwPh+Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Telemetry": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Resilience": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "v4WOdAOFxB3AcsUkZWNcHL3mYzs4KAPtHO8rkoQlFKOBoD3KyjjAL+h3tRwSK5i4UpF/yhxsQRY0JxKj4osxxw==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.ExceptionSummarization": "10.2.0",
+          "Microsoft.Extensions.Telemetry.Abstractions": "10.2.0",
+          "Polly.Extensions": "8.4.2",
+          "Polly.RateLimiting": "8.4.2"
+        }
+      },
+      "Microsoft.Extensions.ServiceDiscovery.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "sANlOvfqfw/yfych4CLlHSKSWzIie6mQG7w83gVur1foNOafyHxcgpoQMvBf+KiB4Tpls6P1/Z77IIQSK8hxFg=="
+      },
+      "Microsoft.Extensions.Telemetry": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "ssW5gosYlewNH/ISTyaLD/XfJT4GSjwShOUKv61fpXrqVmHkhuIA/5bBAGStM1XbzJjt9IG2vzfdHTu4zlX9Ew==",
+        "dependencies": {
+          "Microsoft.Extensions.AmbientMetadata.Application": "10.2.0",
+          "Microsoft.Extensions.DependencyInjection.AutoActivation": "10.2.0",
+          "Microsoft.Extensions.Telemetry.Abstractions": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Telemetry.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "6V4V6NX6RLUYWwV89DeW/4zK5xOycYHWhsfMXSpKVGgMHfXcczmbk6hBeqTnRPzhpATYcOWlmA6hk1jgdxUugA==",
+        "dependencies": {
+          "Microsoft.Extensions.Compliance.Abstractions": "10.2.0"
+        }
+      },
+      "OpenTelemetry": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "N0i6WjPoHPbZyms1ugbDIFAJFuGlpeExJMU/+XSL0lQRUkg/D0utFkDoLXf8Z1km5B+xVZ2GyMXXiX8qdeNmPg==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Api": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "fX+fkCysfPut+qCcT3bKqyX4QN9Saf4CgX8HLOHywEVD+Xr7sULtfuypITpoDysjx8R59dn/3mWhgimMH8cm/g=="
+      },
+      "OpenTelemetry.Api.ProviderBuilderExtensions": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
+        "dependencies": {
+          "OpenTelemetry.Api": "1.15.3"
+        }
+      },
+      "Polly.Core": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "BpE2I6HBYYA5tF0Vn4eoQOGYTYIK1BlF5EXVgkWGn3mqUUjbXAr13J6fZVbp7Q3epRR8yshacBMlsHMhpOiV3g=="
+      },
+      "Polly.Extensions": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "GZ9vRVmR0jV2JtZavt+pGUsQ1O1cuRKG7R7VOZI6ZDy9y6RNPvRvXK1tuS4ffUrv8L0FTea59oEuQzgS0R7zSA==",
+        "dependencies": {
+          "Polly.Core": "8.4.2"
+        }
+      },
+      "Polly.RateLimiting": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "ehTImQ/eUyO07VYW2WvwSmU9rRH200SKJ/3jku9rOkyWE0A2JxNFmAVms8dSn49QLSjmjFRRSgfNyOgr/2PSmA==",
+        "dependencies": {
+          "Polly.Core": "8.4.2"
+        }
+      }
+    }
+  }
+}

src/GmRelay.Shared/Domain/MoscowTime.cs

@@ -21,7 +21,7 @@ public static class MoscowTime
 
     public static bool TryParseMoscow(string text, out DateTimeOffset utcTime)
     {
-        if (DateTime.TryParseExact(text, new[] { "dd.MM.yyyy HH:mm", "dd.MM.yyyy H:mm", "d.MM.yyyy HH:mm" }, 
+        if (DateTime.TryParseExact(text, new[] { "dd.MM.yyyy HH:mm", "dd.MM.yyyy H:mm", "d.MM.yyyy HH:mm" },
             System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out var localDt))
         {
             utcTime = new DateTimeOffset(localDt, MoscowOffset).ToUniversalTime();

src/GmRelay.Shared/Platform/IPlatformMessenger.cs

@@ -0,0 +1,16 @@
+namespace GmRelay.Shared.Platform;
+
+public interface IPlatformMessenger
+{
+    Task<PlatformMessageRef> SendScheduleAsync(PlatformScheduleMessage message, CancellationToken ct);
+
+    Task UpdateScheduleAsync(PlatformScheduleMessage message, CancellationToken ct);
+
+    Task SendGroupMessageAsync(PlatformGroup group, string htmlText, CancellationToken ct);
+
+    Task SendPrivateMessageAsync(PlatformPrivateMessage message, CancellationToken ct);
+
+    Task AnswerInteractionAsync(PlatformInteractionReply reply, CancellationToken ct);
+
+    Task SendCalendarFileAsync(PlatformCalendarFile file, CancellationToken ct);
+}

src/GmRelay.Shared/Platform/PlatformGroup.cs

@@ -0,0 +1,8 @@
+namespace GmRelay.Shared.Platform;
+
+public sealed record PlatformGroup(
+    PlatformKind Platform,
+    string ExternalGroupId,
+    string DisplayName,
+    string? ExternalChannelId = null,
+    string? ExternalThreadId = null);

src/GmRelay.Shared/Platform/PlatformKind.cs

@@ -0,0 +1,8 @@
+namespace GmRelay.Shared.Platform;
+
+public enum PlatformKind
+{
+    Telegram = 0,
+    Discord = 1,
+    Max = 2
+}

src/GmRelay.Shared/Platform/PlatformMessageContracts.cs

@@ -0,0 +1,36 @@
+using GmRelay.Shared.Rendering;
+
+namespace GmRelay.Shared.Platform;
+
+public sealed record PlatformMessageRef(
+    PlatformKind Platform,
+    string ExternalGroupId,
+    string? ExternalThreadId,
+    string ExternalMessageId);
+
+public sealed record PlatformMessageAction(
+    string Key,
+    string Label,
+    string Payload);
+
+public sealed record PlatformScheduleMessage(
+    PlatformGroup Group,
+    SessionBatchViewModel View,
+    PlatformMessageRef? ExistingMessage,
+    string? ImageReference = null);
+
+public sealed record PlatformPrivateMessage(
+    PlatformUser Recipient,
+    string HtmlText);
+
+public sealed record PlatformInteractionReply(
+    string InteractionId,
+    string Text,
+    bool ShowAlert = false);
+
+public sealed record PlatformCalendarFile(
+    PlatformGroup Group,
+    string FileName,
+    byte[] Content,
+    string CaptionHtml,
+    IReadOnlyList<PlatformMessageAction> Actions);

src/GmRelay.Shared/Platform/PlatformUser.cs

@@ -0,0 +1,7 @@
+namespace GmRelay.Shared.Platform;
+
+public sealed record PlatformUser(
+    PlatformKind Platform,
+    string ExternalUserId,
+    string DisplayName,
+    string? ExternalUsername);

src/GmRelay.Shared/Rendering/SessionBatchDto.cs

@@ -1,4 +1,4 @@
 namespace GmRelay.Shared.Rendering;
 
-public sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status, int? MaxPlayers);
+public sealed record SessionBatchDto(Guid SessionId, DateTime ScheduledAt, string Status, int? MaxPlayers, string JoinLink);
 public sealed record ParticipantBatchDto(Guid SessionId, string DisplayName, string? TelegramUsername, string RegistrationStatus);

src/GmRelay.Shared/Rendering/SessionBatchViewBuilder.cs

@@ -38,6 +38,7 @@ public static class SessionBatchViewBuilder
                 session.ScheduledAt,
                 session.Status,
                 session.MaxPlayers,
+                session.JoinLink,
                 activePlayers.Count,
                 activePlayers,
                 waitlistedPlayers,

src/GmRelay.Shared/Rendering/SessionBatchViewModel.cs

@@ -11,6 +11,7 @@ public sealed record SessionViewItem(
     DateTime ScheduledAt,
     string Status,
     int? MaxPlayers,
+    string JoinLink,
     int ActivePlayerCount,
     IReadOnlyList<PlayerViewItem> ActivePlayers,
     IReadOnlyList<PlayerViewItem> WaitlistedPlayers,

src/GmRelay.Shared/packages.lock.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net10.0": {
+      "SecurityCodeScan.VS2019": {
+        "type": "Direct",
+        "requested": "[5.6.7, )",
+        "resolved": "5.6.7",
+        "contentHash": "WIE9RJswdSc2j+rLz2gW6U+gMUjMHzY2j7C/CL8/R2olXNM/+twarfMnWqm+rZodDBvaYDApJyxM8mVYf9FGrQ=="
+      }
+    }
+  }
+}

src/GmRelay.Web/Components/App.razor

@@ -10,7 +10,7 @@
     <ResourcePreloader />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
+    <link href="https://fonts.googleapis.com/css2?family=Cinzel+Decorative:wght@400;700&family=Cinzel:wght@400;600;700&family=Jura:wght@400;500;600;700&display=swap" rel="stylesheet" />
     <link rel="stylesheet" href="@Assets["app.css"]" />
     <link rel="stylesheet" href="@Assets["GmRelay.Web.styles.css"]" />
     <script src="https://telegram.org/js/telegram-web-app.js"></script>

src/GmRelay.Web/Components/Layout/MainLayout.razor.css

@@ -30,8 +30,9 @@
 
 /* === Error UI === */
 #blazor-error-ui {
-    background: var(--bg-secondary);
-    border-top: 1px solid var(--border-color);
+    background: var(--status-danger-bg);
+    color: var(--status-danger);
+    border-top: 1px solid rgba(239, 68, 68, 0.15);
     bottom: 0;
     box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.3);
     box-sizing: border-box;
@@ -41,8 +42,9 @@
     position: fixed;
     width: 100%;
     z-index: 1000;
-    color: var(--text-secondary);
     font-size: 0.875rem;
+    font-family: 'Jura', sans-serif;
+    font-weight: 500;
 }
 
     #blazor-error-ui .reload {

src/GmRelay.Web/Components/Layout/NavMenu.razor

@@ -2,7 +2,7 @@
 
 <div class="nav-header">
     <a class="nav-brand" href="">
-        <span class="nav-brand-icon">🐢</span>
+        <img src="logo.png" alt="GM-Relay" class="nav-brand-icon" />
         <span class="nav-brand-text">GM-Relay</span>
     </a>
     <button class="nav-toggle" @onclick="ToggleMenu" aria-label="Переключить меню">
@@ -56,7 +56,7 @@
                     </button>
                 </form>
 
-                <div class="nav-version">v1.10.4</div>
+                <div class="nav-version">v2.1.1</div>
             </div>
         </Authorized>
         <NotAuthorized>
@@ -79,4 +79,4 @@
 
     private void ToggleMenu() => isOpen = !isOpen;
     private void CloseMenu() => isOpen = false;
-}
+}

src/GmRelay.Web/Components/Layout/NavMenu.razor.css

@@ -16,19 +16,18 @@
 }
 
 .nav-brand-icon {
-    font-size: 1.5rem;
-    line-height: 1;
-    vertical-align: middle;
-    margin-top: -2px;
+    width: 1.5rem;
+    height: 1.5rem;
+    object-fit: contain;
+    display: block;
 }
 
 .nav-brand-text {
+    font-family: 'Cinzel Decorative', 'Cinzel', serif;
     font-size: 1.125rem;
     font-weight: 700;
-    background: var(--accent-gradient);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-clip: text;
+    letter-spacing: 0.04em;
+    color: var(--text-primary);
 }
 
 .nav-toggle {
@@ -87,9 +86,10 @@
 }
 
 .nav-section ::deep .nav-item.active {
-    background: rgba(124, 58, 237, 0.15);
-    color: var(--accent-primary);
-    border: 1px solid rgba(124, 58, 237, 0.2);
+    background: linear-gradient(135deg, rgba(139, 92, 246, 0.15) 0%, rgba(34, 211, 238, 0.08) 100%);
+    color: var(--text-accent);
+    border: 1px solid rgba(139, 92, 246, 0.25);
+    box-shadow: 0 0 12px rgba(139, 92, 246, 0.1);
 }
 
 .nav-icon {
@@ -145,7 +145,7 @@
     border: 1px solid transparent;
     border-radius: var(--radius-sm);
     color: var(--text-muted);
-    font-family: 'Inter', sans-serif;
+    font-family: 'Jura', sans-serif;
     font-size: 0.8125rem;
     cursor: pointer;
     transition: all var(--transition-normal);
@@ -198,6 +198,7 @@
     }
 
     .nav-header {
+        padding-left: 3.75rem;
         padding-right: 0.75rem;
     }
 }

src/GmRelay.Web/Components/Pages/Login.razor

@@ -8,7 +8,7 @@
 
 <div class="login-page">
     <div class="login-card">
-        <div class="login-logo">🎲</div>
+        <img src="logo.png" alt="GM-Relay" class="login-logo" />
         <h1 class="login-title">GM-Relay</h1>
         <p class="login-subtitle">Войдите через Telegram для управления игровыми сессиями</p>
 

src/GmRelay.Web/Components/Pages/MiniApp.razor

@@ -8,7 +8,7 @@
 
 <div class="mini-app-page">
     <div class="mini-app-auth-card" data-auth-status="@miniAppAuthStatus">
-        <div class="mini-app-logo">🎲</div>
+        <img src="logo.png" alt="GM-Relay" class="mini-app-logo" />
         <h1>GM-Relay</h1>
         <p>@statusMessage</p>
 

src/GmRelay.Web/Dockerfile

@@ -18,8 +18,10 @@ RUN dotnet publish "GmRelay.Web.csproj" -c Release -o /app/publish /p:UseAppHost
 # Stage 2: Runtime
 FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS final
 WORKDIR /app
-RUN apt-get update && apt-get install -y libgssapi-krb5-2 && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends libgssapi-krb5-2 wget && rm -rf /var/lib/apt/lists/*
 COPY --from=build /app/publish .
+RUN mkdir -p /app/dataprotection-keys && chown -R $APP_UID:$APP_UID /app/dataprotection-keys
 ENV ASPNETCORE_URLS=http://+:8080
 EXPOSE 8080
+USER $APP_UID
 ENTRYPOINT ["dotnet", "GmRelay.Web.dll"]

src/GmRelay.Web/Health/NpgsqlHealthCheck.cs

@@ -0,0 +1,25 @@
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Npgsql;
+
+namespace GmRelay.Web.Health;
+
+public sealed class NpgsqlHealthCheck(NpgsqlDataSource dataSource) : IHealthCheck
+{
+    public async Task<HealthCheckResult> CheckHealthAsync(
+        HealthCheckContext context,
+        CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await using var connection = await dataSource.OpenConnectionAsync(cancellationToken);
+            await using var command = connection.CreateCommand();
+            command.CommandText = "SELECT 1";
+            await command.ExecuteScalarAsync(cancellationToken);
+            return HealthCheckResult.Healthy();
+        }
+        catch (Exception ex)
+        {
+            return HealthCheckResult.Unhealthy("PostgreSQL is unavailable", ex);
+        }
+    }
+}

src/GmRelay.Web/Program.cs

@@ -1,9 +1,13 @@
 using GmRelay.Web.Components;
+using GmRelay.Web.Health;
 using GmRelay.Web.Services;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
 using System.Security.Claims;
+using System.Text.Json;
 using Telegram.Bot;
 using Npgsql;
 
@@ -12,6 +16,10 @@ var builder = WebApplication.CreateBuilder(args);
 // Add Aspire service defaults
 builder.AddServiceDefaults();
 
+// Add health checks
+builder.Services.AddHealthChecks()
+    .AddCheck<NpgsqlHealthCheck>("npgsql");
+
 // Add Data Protection
 builder.Services.AddDataProtection()
     .PersistKeysToFileSystem(new DirectoryInfo("/app/dataprotection-keys"));
@@ -83,6 +91,26 @@ app.MapStaticAssets();
 app.MapRazorComponents<App>()
     .AddInteractiveServerRenderMode();
 
+// Health check endpoints
+app.MapHealthChecks("/health", new HealthCheckOptions
+{
+    ResponseWriter = async (context, report) =>
+    {
+        context.Response.ContentType = "application/json";
+        var response = new
+        {
+            status = report.Status == HealthStatus.Healthy ? "healthy" : "unhealthy",
+            timestamp = DateTimeOffset.UtcNow.ToString("O")
+        };
+        await context.Response.WriteAsJsonAsync(response);
+    }
+});
+
+app.MapHealthChecks("/alive", new HealthCheckOptions
+{
+    Predicate = r => r.Tags.Contains("live")
+});
+
 // Endpoint to handle Telegram Login callback
 app.MapGet("/auth/telegram", async (HttpContext context, TelegramAuthService authService) =>
 {

src/GmRelay.Web/Services/SessionService.cs

@@ -38,7 +38,8 @@ public sealed record WebSession(
     int? MaxPlayers,
     int ActivePlayerCount,
     int WaitlistedPlayerCount,
-    string NotificationMode = SessionNotificationModeExtensions.GroupAndDirectValue);
+    string NotificationMode = SessionNotificationModeExtensions.GroupAndDirectValue,
+    int? ThreadId = null);
 
 public sealed record WebParticipant(
     Guid Id,
@@ -73,7 +74,8 @@ internal sealed record WebBatchSessionRow(
     int? BatchMessageId,
     long TelegramChatId,
     int? ThreadId,
-    string NotificationMode);
+    string NotificationMode,
+    bool TopicCreatedByBot = false);
 internal sealed record WebTemplateGroupDto(long TelegramChatId);
 
 public sealed class SessionService(
@@ -240,11 +242,14 @@ public sealed class SessionService(
 
         await conn.ExecuteAsync(
             """
-            INSERT INTO players (telegram_id, display_name, telegram_username)
-            VALUES (@TelegramId, @DisplayName, @TelegramUsername)
+            INSERT INTO players (telegram_id, display_name, telegram_username, platform, external_user_id, external_username)
+            VALUES (@TelegramId, @DisplayName, @TelegramUsername, 'Telegram', @TelegramId::TEXT, @TelegramUsername)
             ON CONFLICT (telegram_id) DO UPDATE
             SET display_name = EXCLUDED.display_name,
-                telegram_username = EXCLUDED.telegram_username
+                telegram_username = EXCLUDED.telegram_username,
+                platform = COALESCE(players.platform, 'Telegram'),
+                external_user_id = COALESCE(players.external_user_id, EXCLUDED.telegram_id::TEXT),
+                external_username = COALESCE(players.external_username, EXCLUDED.telegram_username)
             """,
             new
             {
@@ -314,7 +319,8 @@ public sealed class SessionService(
                      s.max_players AS MaxPlayers,
                      COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
                      COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount,
-                     s.notification_mode AS NotificationMode
+                     s.notification_mode AS NotificationMode,
+                     s.thread_id AS ThreadId
               FROM sessions s
               JOIN game_groups g ON g.id = s.group_id
               LEFT JOIN LATERAL (
@@ -351,7 +357,8 @@ public sealed class SessionService(
                      s.max_players AS MaxPlayers,
                      COALESCE(active_counts.count, 0)::int AS ActivePlayerCount,
                      COALESCE(waitlist_counts.count, 0)::int AS WaitlistedPlayerCount,
-                     s.notification_mode AS NotificationMode
+                     s.notification_mode AS NotificationMode,
+                     s.thread_id AS ThreadId
               FROM sessions s
               JOIN game_groups g ON g.id = s.group_id
               LEFT JOIN LATERAL (
@@ -409,7 +416,8 @@ public sealed class SessionService(
                      s.max_players AS MaxPlayers,
                      0 AS ActivePlayerCount,
                      0 AS WaitlistedPlayerCount,
-                     s.notification_mode AS NotificationMode
+                     s.notification_mode AS NotificationMode,
+                     s.thread_id AS ThreadId
               FROM sessions s
               JOIN game_groups g ON g.id = s.group_id
               WHERE s.id = @Id AND s.group_id = @GroupId",
@@ -463,7 +471,11 @@ public sealed class SessionService(
                            "\n" +
                            $"👥 Мест: <b>{(maxPlayers.HasValue ? maxPlayers.Value.ToString(System.Globalization.CultureInfo.InvariantCulture) : "без лимита")}</b>";
 
-        await bot.SendMessage(oldSession.TelegramChatId, notification, parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
+        await bot.SendMessage(
+            chatId: oldSession.TelegramChatId,
+            messageThreadId: oldSession.ThreadId,
+            text: notification,
+            parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
 
         var mode = SessionNotificationModeExtensions.FromDatabaseValue(oldSession.NotificationMode);
         if (mode.ShouldSendDirectMessages())
@@ -490,7 +502,8 @@ public sealed class SessionService(
                      s.max_players AS MaxPlayers,
                      0 AS ActivePlayerCount,
                      0 AS WaitlistedPlayerCount,
-                     s.notification_mode AS NotificationMode
+                     s.notification_mode AS NotificationMode,
+                     s.thread_id AS ThreadId
               FROM sessions s
               JOIN game_groups g ON g.id = s.group_id
               WHERE s.id = @SessionId AND s.group_id = @GroupId
@@ -567,8 +580,9 @@ public sealed class SessionService(
         await transaction.CommitAsync();
 
         await bot.SendMessage(
-            session.TelegramChatId,
-            $"⬆️ <b>{System.Net.WebUtility.HtmlEncode(promoted.DisplayName)}</b> переведен(а) из листа ожидания в основной состав «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
+            chatId: session.TelegramChatId,
+            messageThreadId: session.ThreadId,
+            text: $"⬆️ <b>{System.Net.WebUtility.HtmlEncode(promoted.DisplayName)}</b> переведен(а) из листа ожидания в основной состав «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
             parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
 
         if (session.BatchMessageId.HasValue)
@@ -612,7 +626,8 @@ public sealed class SessionService(
                      s.max_players AS MaxPlayers,
                      0 AS ActivePlayerCount,
                      0 AS WaitlistedPlayerCount,
-                     s.notification_mode AS NotificationMode
+                     s.notification_mode AS NotificationMode,
+                     s.thread_id AS ThreadId
               FROM sessions s
               JOIN game_groups g ON g.id = s.group_id
               WHERE s.id = @SessionId AND s.group_id = @GroupId
@@ -697,15 +712,17 @@ public sealed class SessionService(
         await transaction.CommitAsync();
 
         await bot.SendMessage(
-            session.TelegramChatId,
-            $"🚪 <b>{System.Net.WebUtility.HtmlEncode(participant.DisplayName)}</b> удален(а) из сессии «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
+            chatId: session.TelegramChatId,
+            messageThreadId: session.ThreadId,
+            text: $"🚪 <b>{System.Net.WebUtility.HtmlEncode(participant.DisplayName)}</b> удален(а) из сессии «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
             parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
 
         if (promoted is not null)
         {
             await bot.SendMessage(
-                session.TelegramChatId,
-                $"⬆️ <b>{System.Net.WebUtility.HtmlEncode(promoted.DisplayName)}</b> переведен(а) из листа ожидания в основной состав «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
+                chatId: session.TelegramChatId,
+                messageThreadId: session.ThreadId,
+                text: $"⬆️ <b>{System.Net.WebUtility.HtmlEncode(promoted.DisplayName)}</b> переведен(а) из листа ожидания в основной состав «{System.Net.WebUtility.HtmlEncode(session.Title)}».",
                 parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
 
             if (session.BatchMessageId.HasValue)
@@ -813,6 +830,7 @@ public sealed class SessionService(
                    s.batch_message_id AS BatchMessageId,
                    g.telegram_chat_id AS TelegramChatId,
                    s.thread_id AS ThreadId,
+                   s.topic_created_by_bot AS TopicCreatedByBot,
                    s.notification_mode AS NotificationMode
             FROM sessions s
             JOIN game_groups g ON g.id = s.group_id
@@ -865,7 +883,11 @@ public sealed class SessionService(
                            $"🗓 Новое начало: <b>{firstScheduledAt.FormatMoscow()}</b> (МСК)\n" +
                            $"↔️ Шаг: <b>{intervalDays} дн.</b>";
 
-        await bot.SendMessage(firstSession.TelegramChatId, notification, parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
+        await bot.SendMessage(
+            chatId: firstSession.TelegramChatId,
+            messageThreadId: firstSession.ThreadId,
+            text: notification,
+            parseMode: Telegram.Bot.Types.Enums.ParseMode.Html);
 
         var mode = SessionNotificationModeExtensions.FromDatabaseValue(firstSession.NotificationMode);
         if (mode.ShouldSendDirectMessages())
@@ -892,6 +914,7 @@ public sealed class SessionService(
                    s.batch_message_id AS BatchMessageId,
                    g.telegram_chat_id AS TelegramChatId,
                    s.thread_id AS ThreadId,
+                   s.topic_created_by_bot AS TopicCreatedByBot,
                    s.notification_mode AS NotificationMode
             FROM sessions s
             JOIN game_groups g ON g.id = s.group_id
@@ -920,8 +943,8 @@ public sealed class SessionService(
             var scheduledAt = BatchSchedulePlanner.ShiftForClone(sourceSession.ScheduledAt, interval);
             var sessionId = await conn.ExecuteScalarAsync<Guid>(
                 """
-                INSERT INTO sessions (batch_id, group_id, title, join_link, scheduled_at, status, thread_id, max_players, notification_mode)
-                VALUES (@BatchId, @GroupId, @Title, @JoinLink, @ScheduledAt, @Status, @ThreadId, @MaxPlayers, @NotificationMode)
+                INSERT INTO sessions (batch_id, group_id, title, join_link, scheduled_at, status, thread_id, topic_created_by_bot, max_players, notification_mode)
+                VALUES (@BatchId, @GroupId, @Title, @JoinLink, @ScheduledAt, @Status, @ThreadId, @TopicCreatedByBot, @MaxPlayers, @NotificationMode)
                 RETURNING id
                 """,
                 new
@@ -933,12 +956,13 @@ public sealed class SessionService(
                     ScheduledAt = scheduledAt,
                     Status = SessionStatus.Planned,
                     ThreadId = threadId,
+                    sourceSession.TopicCreatedByBot,
                     sourceSession.MaxPlayers,
                     sourceSession.NotificationMode
                 },
                 transaction);
 
-            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers));
+            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, sourceSession.MaxPlayers, batchJoinLink));
         }
 
         await transaction.CommitAsync();
@@ -1147,7 +1171,7 @@ public sealed class SessionService(
                 },
                 transaction);
 
-            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, template.MaxPlayers));
+            renderedSessions.Add(new SessionBatchDto(sessionId, scheduledAt, SessionStatus.Planned, template.MaxPlayers, template.JoinLink));
         }
 
         await transaction.CommitAsync();
@@ -1245,7 +1269,7 @@ public sealed class SessionService(
             await using var conn = await dataSource.OpenConnectionAsync();
 
             var sessions = (await conn.QueryAsync<SessionBatchDto>(
-                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
+                "SELECT id AS SessionId, scheduled_at AS ScheduledAt, status AS Status, max_players AS MaxPlayers, join_link AS JoinLink FROM sessions WHERE batch_id = @BatchId ORDER BY scheduled_at",
                 new { BatchId = batchId })).ToList();
 
             var participants = (await conn.QueryAsync<ParticipantBatchDto>(

src/GmRelay.Web/Services/TelegramSessionBatchRenderer.cs

@@ -20,6 +20,11 @@ public static class TelegramSessionBatchRenderer
                 ? $"👥 Места: {session.ActivePlayerCount}/{session.MaxPlayers.Value}\n"
                 : $"👥 Игроки ({session.ActivePlayerCount}):\n";
 
+            if (!string.IsNullOrEmpty(session.JoinLink))
+            {
+                messageText += $"🔗 <a href=\"{System.Net.WebUtility.HtmlEncode(session.JoinLink)}\">Ссылка на игру</a>\n";
+            }
+
             if (session.ActivePlayers.Count > 0)
             {
                 messageText += string.Join("\n", session.ActivePlayers.Select(p =>

src/GmRelay.Web/packages.lock.json

@@ -0,0 +1,250 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net10.0": {
+      "Aspire.Npgsql": {
+        "type": "Direct",
+        "requested": "[13.2.2, )",
+        "resolved": "13.2.2",
+        "contentHash": "nEYgziWN7hksgEQEWy24JypcMCU8gKYcIIyPL05JfdXxUWuPRLotH/KOeuHevAjSEOYkL3dtGakBkJAuPobGmA==",
+        "dependencies": {
+          "AspNetCore.HealthChecks.NpgSql": "9.0.0",
+          "Npgsql.DependencyInjection": "10.0.1",
+          "Npgsql.OpenTelemetry": "10.0.1",
+          "OpenTelemetry.Extensions.Hosting": "1.15.0"
+        }
+      },
+      "Dapper": {
+        "type": "Direct",
+        "requested": "[2.1.72, )",
+        "resolved": "2.1.72",
+        "contentHash": "ns4mGqQd9a/MhP8m6w556vVlZIa0/MfUu03zrxjZC/jlr1uVCsUac8bkdB+Fs98Llbd56rRSo1eZH5VVmeGZyw=="
+      },
+      "Microsoft.AspNetCore.App.Internal.Assets": {
+        "type": "Direct",
+        "requested": "[10.0.5, )",
+        "resolved": "10.0.5",
+        "contentHash": "Oxw9Ps1/nd6c/EMCAI13AeJFEqXezAvCEOshMjUWmL7LeGirHJNzytR2e/3jINYg0j2TmPvNUowGHf+gp8zDSQ=="
+      },
+      "Npgsql": {
+        "type": "Direct",
+        "requested": "[10.0.2, )",
+        "resolved": "10.0.2",
+        "contentHash": "q5RfBI+wywJSFUNDE1L4ZbHEHCFTblo8Uf6A6oe4feOUFYiUQXyAf9GBh5qEZpvJaHiEbpBPkQumjEhXCJxdrg=="
+      },
+      "SecurityCodeScan.VS2019": {
+        "type": "Direct",
+        "requested": "[5.6.7, )",
+        "resolved": "5.6.7",
+        "contentHash": "WIE9RJswdSc2j+rLz2gW6U+gMUjMHzY2j7C/CL8/R2olXNM/+twarfMnWqm+rZodDBvaYDApJyxM8mVYf9FGrQ=="
+      },
+      "Telegram.Bot": {
+        "type": "Direct",
+        "requested": "[22.9.6.1, )",
+        "resolved": "22.9.6.1",
+        "contentHash": "I0eaMaETcWIhMn4uu4RGd9e6PLJOjaOG3QAcKPsTcS80H3TF6gqj3UF9NKu4ZY90ul6Y6NiWToHkg/PsvxkotA=="
+      },
+      "AspNetCore.HealthChecks.NpgSql": {
+        "type": "Transitive",
+        "resolved": "9.0.0",
+        "contentHash": "npc58/AD5zuVxERdhCl2Kb7WnL37mwX42SJcXIwvmEig0/dugOLg3SIwtfvvh3TnvTwR/sk5LYNkkPaBdks61A==",
+        "dependencies": {
+          "Npgsql": "8.0.3"
+        }
+      },
+      "Microsoft.Extensions.AmbientMetadata.Application": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "CNrEjaOCZ8d1HtB0mvpiX4EWxLkee2xy+CsYXxmsEYJSFgw3OmF9pIhP/tCTeYBHhpsKJj5wM63G8IBFGxAcsw=="
+      },
+      "Microsoft.Extensions.Compliance.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "1a4xDAT6fRyP8t419q3WvWMmMslDTvI7OAZLWBhn5rysFG0bl5xFenTswd1xAbT/3u3mx4Xyb5bPx+V+18tJeQ=="
+      },
+      "Microsoft.Extensions.DependencyInjection.AutoActivation": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "Z/OI261l7LnxyODKPx0trQyIHFyicCR/akfn64lGOjPcf4FpAZ7ePAGl2HPvQBUBSNfPTF0gWeCfuFmyftMgYA=="
+      },
+      "Microsoft.Extensions.Diagnostics.ExceptionSummarization": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "3qMK1D40D10kb5TdBtFJpzz6/WH0NinWs68ZZS8jCFgHMXDiOjGiPOneMmIocCP/wnUUW4Hzf8lMsIE1xIGxDA=="
+      },
+      "Microsoft.Extensions.Http.Diagnostics": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "I0FBgF6yZRwYH9E3KQ2vHm80YZ7YBj+52GDsmOWXPBv/p15b/wUoNupV9kw3LnSNVsWMqlGbiuZgBnHpMwPh+Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Telemetry": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Http.Resilience": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "Lg+OjBW+ODDbM4Ax4LoERvQ1dqSZ8I2gQc2+B0/WOWl2+PunLJ3xb3x8MtHGfcb/Mp98RoMpwRKm6Aj9mzXwrA==",
+        "dependencies": {
+          "Microsoft.Extensions.Http.Diagnostics": "10.2.0",
+          "Microsoft.Extensions.Resilience": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Resilience": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "v4WOdAOFxB3AcsUkZWNcHL3mYzs4KAPtHO8rkoQlFKOBoD3KyjjAL+h3tRwSK5i4UpF/yhxsQRY0JxKj4osxxw==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.ExceptionSummarization": "10.2.0",
+          "Microsoft.Extensions.Telemetry.Abstractions": "10.2.0",
+          "Polly.Extensions": "8.4.2",
+          "Polly.RateLimiting": "8.4.2"
+        }
+      },
+      "Microsoft.Extensions.ServiceDiscovery": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "AHTPfiKodj66xA8RwRkFD4q11V2AvzcuDsujv6ViPkOPtvBEYcPVplHakK56pPzWlX08MDS+TAQXfFXAeP7J5w==",
+        "dependencies": {
+          "Microsoft.Extensions.ServiceDiscovery.Abstractions": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.ServiceDiscovery.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "sANlOvfqfw/yfych4CLlHSKSWzIie6mQG7w83gVur1foNOafyHxcgpoQMvBf+KiB4Tpls6P1/Z77IIQSK8hxFg=="
+      },
+      "Microsoft.Extensions.Telemetry": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "ssW5gosYlewNH/ISTyaLD/XfJT4GSjwShOUKv61fpXrqVmHkhuIA/5bBAGStM1XbzJjt9IG2vzfdHTu4zlX9Ew==",
+        "dependencies": {
+          "Microsoft.Extensions.AmbientMetadata.Application": "10.2.0",
+          "Microsoft.Extensions.DependencyInjection.AutoActivation": "10.2.0",
+          "Microsoft.Extensions.Telemetry.Abstractions": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Telemetry.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "6V4V6NX6RLUYWwV89DeW/4zK5xOycYHWhsfMXSpKVGgMHfXcczmbk6hBeqTnRPzhpATYcOWlmA6hk1jgdxUugA==",
+        "dependencies": {
+          "Microsoft.Extensions.Compliance.Abstractions": "10.2.0"
+        }
+      },
+      "Npgsql.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "10.0.1",
+        "contentHash": "YHFa4vD27sNIfv6s5q8Zi1fLvKfmK1xcpMv0PUvXOxDFbRmuMRSHwpZTbPvsAlj97q1/o7DfyynLqfqrCm1VnA==",
+        "dependencies": {
+          "Npgsql": "10.0.1"
+        }
+      },
+      "Npgsql.OpenTelemetry": {
+        "type": "Transitive",
+        "resolved": "10.0.1",
+        "contentHash": "G9fEIBaHggZXWfDSDnKLc0XwKcbuU6i2eXp7zDqpgYxbhCmIN9fRgaSOGyyMNHSo/yY1IB4G4CjW5VO/SKRR0g==",
+        "dependencies": {
+          "Npgsql": "10.0.1",
+          "OpenTelemetry.API": "1.14.0"
+        }
+      },
+      "OpenTelemetry": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "N0i6WjPoHPbZyms1ugbDIFAJFuGlpeExJMU/+XSL0lQRUkg/D0utFkDoLXf8Z1km5B+xVZ2GyMXXiX8qdeNmPg==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Api": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "fX+fkCysfPut+qCcT3bKqyX4QN9Saf4CgX8HLOHywEVD+Xr7sULtfuypITpoDysjx8R59dn/3mWhgimMH8cm/g=="
+      },
+      "OpenTelemetry.Api.ProviderBuilderExtensions": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
+        "dependencies": {
+          "OpenTelemetry.Api": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "FEXJepcseTGbATiCkUfP7ipoFEYYfl/0UmmUwi0KxCPg9PaUA8ab2P1LGopK+/HExasJ1ZutFhZrN6WvUIR23g==",
+        "dependencies": {
+          "OpenTelemetry": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Extensions.Hosting": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "u8n/W8yIlqv0BXZmvId1iVaeWXG42tGKdTkuLYg5g57Y/r9CeUNzqtrSHNdG5IoO8iPX79w3v+WsbAHgUQbfeg==",
+        "dependencies": {
+          "OpenTelemetry": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Instrumentation.AspNetCore": {
+        "type": "Transitive",
+        "resolved": "1.15.2",
+        "contentHash": "2nPd7r0ug/gd6/CNFL6Rlu+RSQ9WYGSGHAYQ1ssbSqyzKJpqTunfx2I/1O0WB5k+L0cyXbG4XVZpoSoUc3M7wg==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
+        }
+      },
+      "OpenTelemetry.Instrumentation.Http": {
+        "type": "Transitive",
+        "resolved": "1.15.1",
+        "contentHash": "vFO4Fj/dXkoVNGo/nhoGpO2zYQmZwr4jTID7oRGo+XlQ8LqksyZjUXQ4p39RfUvTID7IzzL8Qe71tW7CcAFymA==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
+        }
+      },
+      "OpenTelemetry.Instrumentation.Runtime": {
+        "type": "Transitive",
+        "resolved": "1.15.1",
+        "contentHash": "cpPwlUT5HXcLGPaIgsbSy0W9eFYAPGVbTP1p8/uyQ4Osvf5BJuPpEXE7crL09SmEd44r0DGNKDtsqxaAz0HxQw==",
+        "dependencies": {
+          "OpenTelemetry.Api": "[1.15.3, 2.0.0)"
+        }
+      },
+      "Polly.Core": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "BpE2I6HBYYA5tF0Vn4eoQOGYTYIK1BlF5EXVgkWGn3mqUUjbXAr13J6fZVbp7Q3epRR8yshacBMlsHMhpOiV3g=="
+      },
+      "Polly.Extensions": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "GZ9vRVmR0jV2JtZavt+pGUsQ1O1cuRKG7R7VOZI6ZDy9y6RNPvRvXK1tuS4ffUrv8L0FTea59oEuQzgS0R7zSA==",
+        "dependencies": {
+          "Polly.Core": "8.4.2"
+        }
+      },
+      "Polly.RateLimiting": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "ehTImQ/eUyO07VYW2WvwSmU9rRH200SKJ/3jku9rOkyWE0A2JxNFmAVms8dSn49QLSjmjFRRSgfNyOgr/2PSmA==",
+        "dependencies": {
+          "Polly.Core": "8.4.2"
+        }
+      },
+      "gmrelay.servicedefaults": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Http.Resilience": "[10.2.0, )",
+          "Microsoft.Extensions.ServiceDiscovery": "[10.2.0, )",
+          "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.15.3, )",
+          "OpenTelemetry.Extensions.Hosting": "[1.15.3, )",
+          "OpenTelemetry.Instrumentation.AspNetCore": "[1.15.2, )",
+          "OpenTelemetry.Instrumentation.Http": "[1.15.1, )",
+          "OpenTelemetry.Instrumentation.Runtime": "[1.15.1, )"
+        }
+      },
+      "gmrelay.shared": {
+        "type": "Project"
+      }
+    }
+  }
+}

tests/GmRelay.Bot.Tests/Features/Landing/TelegramLandingPromisesSmokeTests.cs

@@ -147,6 +147,7 @@ public sealed class TelegramLandingPromisesSmokeTests
             string title,
             IReadOnlyList<DateTimeOffset> scheduledTimes,
             int? maxPlayers,
+            string joinLink,
             SessionNotificationMode notificationMode)
         {
             Title = title;
@@ -156,7 +157,8 @@ public sealed class TelegramLandingPromisesSmokeTests
                     Guid.NewGuid(),
                     scheduledAt.UtcDateTime,
                     SessionStatus.Planned,
-                    maxPlayers))
+                    maxPlayers,
+                    joinLink))
                 .ToList();
         }
 
@@ -173,6 +175,7 @@ public sealed class TelegramLandingPromisesSmokeTests
                 parseResult.Title!,
                 parseResult.ScheduledTimes,
                 parseResult.MaxPlayers,
+                parseResult.Link!,
                 notificationMode);
 
             scenario.RenderBatch();
@@ -318,7 +321,8 @@ public sealed class TelegramLandingPromisesSmokeTests
                         session.Id,
                         session.ScheduledAt,
                         session.Status,
-                        session.MaxPlayers))
+                        session.MaxPlayers,
+                        session.JoinLink))
                     .ToList(),
                 participants
                     .Select(participant => new ParticipantBatchDto(
@@ -371,7 +375,8 @@ public sealed class TelegramLandingPromisesSmokeTests
         Guid Id,
         DateTime ScheduledAt,
         string Status,
-        int? MaxPlayers)
+        int? MaxPlayers,
+        string JoinLink)
     {
         public DateTime ScheduledAt { get; set; } = ScheduledAt;
     }

tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionCommandTests.cs

@@ -0,0 +1,47 @@
+using GmRelay.Bot.Features.Sessions.CreateSession;
+using GmRelay.Shared.Platform;
+
+namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
+
+public sealed class PlatformNeutralSessionInteractionCommandTests
+{
+    [Fact]
+    public void JoinSessionCommand_ShouldExposePlatformNeutralInteractionContext()
+    {
+        AssertProperty<JoinSessionCommand>("SessionId", typeof(Guid));
+        AssertProperty<JoinSessionCommand>("User", typeof(PlatformUser));
+        AssertProperty<JoinSessionCommand>("InteractionId", typeof(string));
+        AssertProperty<JoinSessionCommand>("Group", typeof(PlatformGroup));
+        AssertProperty<JoinSessionCommand>("ScheduleMessage", typeof(PlatformMessageRef));
+        AssertNoTelegramSpecificProperties<JoinSessionCommand>();
+    }
+
+    [Fact]
+    public void LeaveSessionCommand_ShouldExposePlatformNeutralInteractionContext()
+    {
+        AssertProperty<LeaveSessionCommand>("SessionId", typeof(Guid));
+        AssertProperty<LeaveSessionCommand>("User", typeof(PlatformUser));
+        AssertProperty<LeaveSessionCommand>("InteractionId", typeof(string));
+        AssertProperty<LeaveSessionCommand>("Group", typeof(PlatformGroup));
+        AssertProperty<LeaveSessionCommand>("ScheduleMessage", typeof(PlatformMessageRef));
+        AssertNoTelegramSpecificProperties<LeaveSessionCommand>();
+    }
+
+    private static void AssertProperty<T>(string name, Type expectedType)
+    {
+        var property = Assert.Single(typeof(T).GetProperties(), property => property.Name == name);
+
+        Assert.Equal(expectedType, property.PropertyType);
+    }
+
+    private static void AssertNoTelegramSpecificProperties<T>()
+    {
+        var names = typeof(T).GetProperties().Select(property => property.Name).ToArray();
+
+        Assert.DoesNotContain(names, name => name.Contains("Telegram", StringComparison.Ordinal));
+        Assert.DoesNotContain("ChatId", names);
+        Assert.DoesNotContain("MessageId", names);
+        Assert.DoesNotContain("TelegramUserId", names);
+        Assert.DoesNotContain("TelegramUsername", names);
+    }
+}

tests/GmRelay.Bot.Tests/Features/Sessions/CreateSession/PlatformNeutralSessionInteractionSqlTests.cs

@@ -0,0 +1,61 @@
+namespace GmRelay.Bot.Tests.Features.Sessions.CreateSession;
+
+public sealed class PlatformNeutralSessionInteractionSqlTests
+{
+    [Fact]
+    public async Task JoinSessionHandler_ShouldPersistPlayersByPlatformIdentity()
+    {
+        var handler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs");
+
+        Assert.Contains("platform, external_user_id", handler, StringComparison.Ordinal);
+        Assert.Contains("ON CONFLICT (platform, external_user_id)", handler, StringComparison.Ordinal);
+        Assert.Contains("ExternalUserId", handler, StringComparison.Ordinal);
+        Assert.Contains("ExternalUsername", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("TelegramPlatformIds.", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("command.TelegramUserId", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("command.TelegramUsername", handler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task LeaveSessionHandler_ShouldFindParticipantsByPlatformIdentity()
+    {
+        var handler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs");
+
+        Assert.Contains("p.platform = @Platform", handler, StringComparison.Ordinal);
+        Assert.Contains("p.external_user_id = @ExternalUserId", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("p.telegram_id = @TelegramUserId", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("TelegramPlatformIds.", handler, StringComparison.Ordinal);
+        Assert.DoesNotContain("command.TelegramUserId", handler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task SessionInteractionHandlers_ShouldUpdateSchedulesThroughCommandMessageReference()
+    {
+        var joinHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs");
+        var leaveHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs");
+
+        Assert.Contains("new PlatformScheduleMessage(", joinHandler, StringComparison.Ordinal);
+        Assert.Contains("command.Group", joinHandler, StringComparison.Ordinal);
+        Assert.Contains("command.ScheduleMessage", joinHandler, StringComparison.Ordinal);
+        Assert.Contains("new PlatformScheduleMessage(", leaveHandler, StringComparison.Ordinal);
+        Assert.Contains("command.Group", leaveHandler, StringComparison.Ordinal);
+        Assert.Contains("command.ScheduleMessage", leaveHandler, StringComparison.Ordinal);
+    }
+
+    private static async Task<string> ReadRepositoryFileAsync(string relativePath)
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var candidate = Path.Combine(directory.FullName, relativePath);
+            if (File.Exists(candidate))
+            {
+                return await File.ReadAllTextAsync(candidate);
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
+    }
+}

tests/GmRelay.Bot.Tests/GmRelay.Bot.Tests.csproj

@@ -7,8 +7,13 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />

tests/GmRelay.Bot.Tests/Infrastructure/Database/PlatformIdentityMigrationTests.cs

@@ -0,0 +1,127 @@
+namespace GmRelay.Bot.Tests.Infrastructure.Database;
+
+public sealed class PlatformIdentityMigrationTests
+{
+    [Fact]
+    public async Task MigrationV016_ShouldAddPlatformIdentityColumns()
+    {
+        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql");
+
+        Assert.Contains("players", migration, StringComparison.Ordinal);
+        Assert.Contains("platform", migration, StringComparison.Ordinal);
+        Assert.Contains("external_user_id", migration, StringComparison.Ordinal);
+        Assert.Contains("external_username", migration, StringComparison.Ordinal);
+
+        Assert.Contains("game_groups", migration, StringComparison.Ordinal);
+        Assert.Contains("external_group_id", migration, StringComparison.Ordinal);
+        Assert.Contains("external_channel_id", migration, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task MigrationV016_ShouldCreatePlatformMessagesTable()
+    {
+        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql");
+
+        Assert.Contains("CREATE TABLE platform_messages", migration, StringComparison.Ordinal);
+        Assert.Contains("platform", migration, StringComparison.Ordinal);
+        Assert.Contains("group_id", migration, StringComparison.Ordinal);
+        Assert.Contains("batch_id", migration, StringComparison.Ordinal);
+        Assert.Contains("session_id", migration, StringComparison.Ordinal);
+        Assert.Contains("external_thread_id", migration, StringComparison.Ordinal);
+        Assert.Contains("external_message_id", migration, StringComparison.Ordinal);
+        Assert.Contains("purpose", migration, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task MigrationV016_ShouldBackfillExistingTelegramData()
+    {
+        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql");
+
+        Assert.Contains("UPDATE players", migration, StringComparison.Ordinal);
+        Assert.Contains("UPDATE game_groups", migration, StringComparison.Ordinal);
+        Assert.Contains("'Telegram'", migration, StringComparison.Ordinal);
+        Assert.Contains("telegram_id", migration, StringComparison.Ordinal);
+        Assert.Contains("telegram_chat_id", migration, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task MigrationV016_ShouldNotDropLegacyTelegramColumns()
+    {
+        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V016__add_platform_identity.sql");
+
+        Assert.DoesNotContain("DROP COLUMN telegram_id", migration, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("DROP COLUMN telegram_chat_id", migration, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("DROP COLUMN telegram_username", migration, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("DROP COLUMN gm_telegram_id", migration, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task Code_ShouldQueryPlayersUsingExternalUserIdFallback()
+    {
+        var createHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs");
+
+        Assert.Contains("external_user_id", createHandler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task Code_ShouldQueryGroupsUsingExternalGroupIdFallback()
+    {
+        var createHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs");
+
+        Assert.Contains("external_group_id", createHandler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task JoinSessionHandler_ShouldDualWritePlatformIdentity()
+    {
+        var handler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs");
+
+        Assert.Contains("external_user_id", handler, StringComparison.Ordinal);
+        Assert.Contains("external_username", handler, StringComparison.Ordinal);
+        Assert.Contains("platform", handler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task WebSessionService_ShouldDualWritePlatformIdentity()
+    {
+        var service = await ReadRepositoryFileAsync("src/GmRelay.Web/Services/SessionService.cs");
+
+        Assert.Contains("external_user_id", service, StringComparison.Ordinal);
+        Assert.Contains("external_username", service, StringComparison.Ordinal);
+        Assert.Contains("platform", service, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task AttendanceStatsFunction_ShouldReferenceExternalUsername()
+    {
+        var statsMigration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V012__add_attendance_stats.sql");
+
+        Assert.Contains("external_username", statsMigration, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task MigrationV017_ShouldAllowPlayersWithoutLegacyTelegramId()
+    {
+        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V017__allow_platform_neutral_players.sql");
+
+        Assert.Contains("ALTER TABLE players", migration, StringComparison.Ordinal);
+        Assert.Contains("telegram_id DROP NOT NULL", migration, StringComparison.Ordinal);
+    }
+
+    private static async Task<string> ReadRepositoryFileAsync(string relativePath)
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var candidate = Path.Combine(directory.FullName, relativePath);
+            if (File.Exists(candidate))
+            {
+                return await File.ReadAllTextAsync(candidate);
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
+    }
+}

tests/GmRelay.Bot.Tests/Infrastructure/Health/BotHealthCheckHostedServiceTests.cs

@@ -0,0 +1,54 @@
+using System.Net;
+using System.Net.Sockets;
+using GmRelay.Bot.Infrastructure.Health;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace GmRelay.Bot.Tests.Infrastructure.Health;
+
+public sealed class BotHealthCheckHostedServiceTests : IDisposable
+{
+    private readonly BotHealthCheckHostedService _service;
+    private readonly int _port;
+
+    public BotHealthCheckHostedServiceTests()
+    {
+        _port = GetAvailablePort();
+        var config = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                ["HealthCheck:Prefix"] = $"http://localhost:{_port}/"
+            })
+            .Build();
+
+        _service = new BotHealthCheckHostedService(
+            NullLogger<BotHealthCheckHostedService>.Instance,
+            config);
+    }
+
+    public void Dispose()
+    {
+        _service.StopAsync(CancellationToken.None).Wait(TimeSpan.FromSeconds(5));
+    }
+
+    [Fact]
+    public async Task HealthEndpoint_ShouldReturn200_WhenServiceIsRunning()
+    {
+        await _service.StartAsync(CancellationToken.None);
+
+        using var client = new HttpClient();
+        client.Timeout = TimeSpan.FromSeconds(5);
+        var response = await client.GetAsync($"http://localhost:{_port}/health");
+
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+    }
+
+    private static int GetAvailablePort()
+    {
+        var listener = new TcpListener(IPAddress.Loopback, 0);
+        listener.Start();
+        var port = ((IPEndPoint)listener.LocalEndpoint).Port;
+        listener.Stop();
+        return port;
+    }
+}

tests/GmRelay.Bot.Tests/Infrastructure/Scheduling/SessionSchedulerServiceTests.cs

@@ -0,0 +1,214 @@
+using GmRelay.Bot.Features.Confirmation.SendConfirmation;
+using GmRelay.Bot.Features.Reminders.SendJoinLink;
+using GmRelay.Bot.Features.Reminders.SendOneHourReminder;
+using GmRelay.Bot.Infrastructure.Scheduling;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace GmRelay.Bot.Tests.Infrastructure.Scheduling;
+
+public sealed class SessionSchedulerServiceTests
+{
+    private readonly FakeSystemClock _clock = new();
+    private readonly FakeSessionTriggerStore _store = new();
+    private readonly FakeSendConfirmationHandler _confirmationHandler = new();
+    private readonly FakeSendOneHourReminderHandler _oneHourHandler = new();
+    private readonly FakeSendJoinLinkHandler _joinLinkHandler = new();
+
+    private SessionSchedulerService CreateSut()
+    {
+        return new SessionSchedulerService(
+            _store,
+            _confirmationHandler,
+            _oneHourHandler,
+            _joinLinkHandler,
+            _clock,
+            NullLogger<SessionSchedulerService>.Instance);
+    }
+
+    [Fact]
+    public async Task TickAsync_WhenSessionNeedsConfirmation_CallsConfirmationHandler()
+    {
+        var sessionId = Guid.NewGuid();
+        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
+        _clock.UtcNow = now;
+        _store.SessionsNeedingConfirmation = [sessionId];
+
+        var sut = CreateSut();
+        await sut.TickAsync(CancellationToken.None);
+
+        Assert.Single(_confirmationHandler.Calls);
+        Assert.Equal(sessionId, _confirmationHandler.Calls[0]);
+    }
+
+    [Fact]
+    public async Task TickAsync_WhenSessionNeedsOneHourReminder_CallsOneHourHandler()
+    {
+        var sessionId = Guid.NewGuid();
+        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
+        _clock.UtcNow = now;
+        _store.SessionsNeedingOneHourReminder = [sessionId];
+
+        var sut = CreateSut();
+        await sut.TickAsync(CancellationToken.None);
+
+        Assert.Single(_oneHourHandler.Calls);
+        Assert.Equal(sessionId, _oneHourHandler.Calls[0]);
+    }
+
+    [Fact]
+    public async Task TickAsync_WhenSessionNeedsJoinLink_CallsJoinLinkHandler()
+    {
+        var sessionId = Guid.NewGuid();
+        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
+        _clock.UtcNow = now;
+        _store.SessionsNeedingJoinLink = [sessionId];
+
+        var sut = CreateSut();
+        await sut.TickAsync(CancellationToken.None);
+
+        Assert.Single(_joinLinkHandler.Calls);
+        Assert.Equal(sessionId, _joinLinkHandler.Calls[0]);
+    }
+
+    [Fact]
+    public async Task TickAsync_WhenMultipleTriggers_AllHandlersCalled()
+    {
+        var confirmId = Guid.NewGuid();
+        var remindId = Guid.NewGuid();
+        var linkId = Guid.NewGuid();
+        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
+        _clock.UtcNow = now;
+        _store.SessionsNeedingConfirmation = [confirmId];
+        _store.SessionsNeedingOneHourReminder = [remindId];
+        _store.SessionsNeedingJoinLink = [linkId];
+
+        var sut = CreateSut();
+        await sut.TickAsync(CancellationToken.None);
+
+        Assert.Single(_confirmationHandler.Calls);
+        Assert.Single(_oneHourHandler.Calls);
+        Assert.Single(_joinLinkHandler.Calls);
+    }
+
+    [Fact]
+    public async Task TickAsync_WhenNoSessions_NothingCalled()
+    {
+        var sut = CreateSut();
+        await sut.TickAsync(CancellationToken.None);
+
+        Assert.Empty(_confirmationHandler.Calls);
+        Assert.Empty(_oneHourHandler.Calls);
+        Assert.Empty(_joinLinkHandler.Calls);
+    }
+
+    [Fact]
+    public async Task TickAsync_WhenConfirmationAlreadySent_DoesNotCallAgain()
+    {
+        var sessionId = Guid.NewGuid();
+        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
+        _clock.UtcNow = now;
+        _store.SessionsNeedingConfirmation = [sessionId];
+
+        var sut = CreateSut();
+        await sut.TickAsync(CancellationToken.None);
+        Assert.Single(_confirmationHandler.Calls);
+
+        // Simulate idempotency: store no longer returns the session
+        _store.SessionsNeedingConfirmation = [];
+        await sut.TickAsync(CancellationToken.None);
+
+        Assert.Single(_confirmationHandler.Calls);
+    }
+
+    [Fact]
+    public async Task TickAsync_WhenHandlerThrows_LogsErrorAndContinues()
+    {
+        var goodId = Guid.NewGuid();
+        var badId = Guid.NewGuid();
+        var now = new DateTimeOffset(2026, 5, 15, 10, 0, 0, TimeSpan.Zero);
+        _clock.UtcNow = now;
+        _store.SessionsNeedingConfirmation = [badId, goodId];
+        _confirmationHandler.ThrowFor.Add(badId);
+
+        var sut = CreateSut();
+        await sut.TickAsync(CancellationToken.None);
+
+        Assert.Equal(2, _confirmationHandler.Calls.Count);
+        Assert.Equal(badId, _confirmationHandler.Calls[0]);
+        Assert.Equal(goodId, _confirmationHandler.Calls[1]);
+    }
+
+    [Fact]
+    public async Task TickAsync_WhenStoreThrows_LogsErrorAndDoesNotCrash()
+    {
+        _store.ThrowOnConfirmationQuery = true;
+        var sut = CreateSut();
+
+        var ex = await Record.ExceptionAsync(() => sut.TickAsync(CancellationToken.None));
+        Assert.Null(ex);
+    }
+
+    private sealed class FakeSendConfirmationHandler : ISendConfirmationHandler
+    {
+        public List<Guid> Calls { get; } = [];
+        public HashSet<Guid> ThrowFor { get; } = [];
+
+        public Task HandleAsync(Guid sessionId, CancellationToken ct)
+        {
+            Calls.Add(sessionId);
+            if (ThrowFor.Contains(sessionId))
+                throw new InvalidOperationException($"Boom for {sessionId}");
+            return Task.CompletedTask;
+        }
+    }
+
+    private sealed class FakeSendOneHourReminderHandler : ISendOneHourReminderHandler
+    {
+        public List<Guid> Calls { get; } = [];
+
+        public Task HandleAsync(Guid sessionId, CancellationToken ct)
+        {
+            Calls.Add(sessionId);
+            return Task.CompletedTask;
+        }
+    }
+
+    private sealed class FakeSendJoinLinkHandler : ISendJoinLinkHandler
+    {
+        public List<Guid> Calls { get; } = [];
+
+        public Task HandleAsync(Guid sessionId, CancellationToken ct)
+        {
+            Calls.Add(sessionId);
+            return Task.CompletedTask;
+        }
+    }
+
+    private sealed class FakeSessionTriggerStore : ISessionTriggerStore
+    {
+        public List<Guid> SessionsNeedingConfirmation { get; set; } = [];
+        public List<Guid> SessionsNeedingOneHourReminder { get; set; } = [];
+        public List<Guid> SessionsNeedingJoinLink { get; set; } = [];
+        public bool ThrowOnConfirmationQuery { get; set; }
+
+        public Task<IReadOnlyList<Guid>> GetSessionsNeedingConfirmationAsync(
+            DateTimeOffset now, CancellationToken ct)
+        {
+            if (ThrowOnConfirmationQuery)
+                throw new InvalidOperationException("Store boom");
+            return Task.FromResult<IReadOnlyList<Guid>>(SessionsNeedingConfirmation);
+        }
+
+        public Task<IReadOnlyList<Guid>> GetSessionsNeedingOneHourReminderAsync(
+            DateTimeOffset now, CancellationToken ct)
+        {
+            return Task.FromResult<IReadOnlyList<Guid>>(SessionsNeedingOneHourReminder);
+        }
+
+        public Task<IReadOnlyList<Guid>> GetSessionsNeedingJoinLinkAsync(
+            DateTimeOffset now, CancellationToken ct)
+        {
+            return Task.FromResult<IReadOnlyList<Guid>>(SessionsNeedingJoinLink);
+        }
+    }
+}

tests/GmRelay.Bot.Tests/Infrastructure/Telegram/TelegramPlatformMessengerSourceTests.cs

@@ -0,0 +1,60 @@
+namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
+
+public sealed class TelegramPlatformMessengerSourceTests
+{
+    [Fact]
+    public async Task Program_ShouldRegisterTelegramPlatformMessenger()
+    {
+        var program = await ReadRepositoryFileAsync("src/GmRelay.Bot/Program.cs");
+
+        Assert.Contains("IPlatformMessenger", program, StringComparison.Ordinal);
+        Assert.Contains("TelegramPlatformMessenger", program, StringComparison.Ordinal);
+    }
+
+    [Theory]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/CreateSession/JoinSessionHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/CreateSession/LeaveSessionHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/CreateSession/PromoteWaitlistedPlayerHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/RescheduleSession/InitiateRescheduleHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleVoteHandler.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs")]
+    [InlineData("src/GmRelay.Bot/Features/Sessions/ExportCalendar/ExportCalendarHandler.cs")]
+    public async Task SessionFlows_ShouldUsePlatformMessengerForOutboundTelegramWork(string relativePath)
+    {
+        var source = await ReadRepositoryFileAsync(relativePath);
+
+        Assert.Contains("IPlatformMessenger", source, StringComparison.Ordinal);
+        Assert.DoesNotContain("BatchMessageEditor.EditBatchMessageAsync", source, StringComparison.Ordinal);
+        Assert.DoesNotContain(".AnswerCallbackQuery(", source, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task TelegramPlatformMessenger_ShouldOwnTelegramBotClientCalls()
+    {
+        var source = await ReadRepositoryFileAsync("src/GmRelay.Bot/Infrastructure/Telegram/TelegramPlatformMessenger.cs");
+
+        Assert.Contains("ITelegramBotClient", source, StringComparison.Ordinal);
+        Assert.Contains("BatchMessageEditor.EditBatchMessageAsync", source, StringComparison.Ordinal);
+        Assert.Contains("AnswerCallbackQuery", source, StringComparison.Ordinal);
+        Assert.Contains("SendDocument", source, StringComparison.Ordinal);
+    }
+
+    private static async Task<string> ReadRepositoryFileAsync(string relativePath)
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var candidate = Path.Combine(directory.FullName, relativePath);
+            if (File.Exists(candidate))
+            {
+                return await File.ReadAllTextAsync(candidate);
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
+    }
+}

tests/GmRelay.Bot.Tests/Infrastructure/Telegram/TelegramPlatformMessengerTests.cs

@@ -0,0 +1,44 @@
+using GmRelay.Bot.Infrastructure.Telegram;
+using GmRelay.Shared.Platform;
+using GmRelay.Shared.Rendering;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
+
+public sealed class TelegramPlatformMessengerTests
+{
+    [Fact]
+    public async Task UpdateScheduleAsync_ShouldRejectNonTelegramExistingMessageReference()
+    {
+        var messenger = CreateMessenger();
+        var message = new PlatformScheduleMessage(
+            new PlatformGroup(PlatformKind.Telegram, "100", "Telegram group"),
+            CreateView(),
+            new PlatformMessageRef(PlatformKind.Discord, "100", null, "200"));
+
+        await Assert.ThrowsAsync<NotSupportedException>(
+            () => messenger.UpdateScheduleAsync(message, CancellationToken.None));
+    }
+
+    [Fact]
+    public async Task UpdateScheduleAsync_ShouldRejectMismatchedGroupAndExistingMessageReference()
+    {
+        var messenger = CreateMessenger();
+        var message = new PlatformScheduleMessage(
+            new PlatformGroup(PlatformKind.Telegram, "100", "Telegram group", ExternalThreadId: "7"),
+            CreateView(),
+            new PlatformMessageRef(PlatformKind.Telegram, "101", "7", "200"));
+
+        var exception = await Assert.ThrowsAsync<ArgumentException>(
+            () => messenger.UpdateScheduleAsync(message, CancellationToken.None));
+
+        Assert.Equal("message", exception.ParamName);
+        Assert.Contains("Existing schedule message reference must match the schedule group.", exception.Message);
+    }
+
+    private static TelegramPlatformMessenger CreateMessenger() =>
+        new(null!, NullLogger<TelegramPlatformMessenger>.Instance);
+
+    private static SessionBatchViewModel CreateView() =>
+        new("Test batch", []);
+}

tests/GmRelay.Bot.Tests/Infrastructure/Telegram/TelegramTopicIntegrationSmokeTests.cs

@@ -0,0 +1,76 @@
+namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
+
+public sealed class TelegramTopicIntegrationSmokeTests
+{
+    [Fact]
+    public async Task BotAndWebCode_ShouldPersistAndUseTopicOwnership()
+    {
+        var migration = await ReadRepositoryFileAsync("src/GmRelay.Bot/Migrations/V015__add_topic_ownership.sql");
+        var createHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/CreateSessionHandler.cs");
+        var deleteHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/ListSessions/DeleteSessionHandler.cs");
+
+        Assert.Contains("topic_created_by_bot", migration, StringComparison.Ordinal);
+        Assert.Contains("ResolveNewScheduleDestination", createHandler, StringComparison.Ordinal);
+        Assert.Contains("message.MessageThreadId", createHandler, StringComparison.Ordinal);
+        Assert.Contains("topic_created_by_bot", createHandler, StringComparison.Ordinal);
+        Assert.Contains("MissingForumTopicRightsMessage", createHandler, StringComparison.Ordinal);
+        Assert.Contains("TopicCreatedByBot", deleteHandler, StringComparison.Ordinal);
+        Assert.Contains("ShouldDeleteForumTopic", deleteHandler, StringComparison.Ordinal);
+        Assert.Contains("remainingInTopic", deleteHandler, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task GroupNotifications_ShouldSendToStoredForumTopic()
+    {
+        var confirmationHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Confirmation/SendConfirmation/SendConfirmationHandler.cs");
+        var joinLinkHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Reminders/SendJoinLink/SendJoinLinkHandler.cs");
+        var rsvpHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Confirmation/HandleRsvp/HandleRsvpHandler.cs");
+        var cancelHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/CreateSession/CancelSessionHandler.cs");
+        var initiateRescheduleHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/RescheduleSession/InitiateRescheduleHandler.cs");
+        var rescheduleInputHandler = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/RescheduleSession/HandleRescheduleTimeInputHandler.cs");
+        var rescheduleDeadlineService = await ReadRepositoryFileAsync("src/GmRelay.Bot/Features/Sessions/RescheduleSession/RescheduleVotingDeadlineService.cs");
+
+        Assert.Contains("int? ThreadId", confirmationHandler, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", confirmationHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: session.ThreadId", confirmationHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? ThreadId", joinLinkHandler, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", joinLinkHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: session.ThreadId", joinLinkHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? ThreadId", rsvpHandler, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", rsvpHandler, StringComparison.Ordinal);
+        Assert.Contains("messageThreadId: session.ThreadId", rsvpHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? MessageThreadId", cancelHandler, StringComparison.Ordinal);
+        Assert.Contains("TelegramPlatformIds.Group(command.ChatId, command.MessageThreadId)", cancelHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? MessageThreadId", initiateRescheduleHandler, StringComparison.Ordinal);
+        Assert.Contains("TelegramPlatformIds.Group(command.ChatId, command.MessageThreadId)", initiateRescheduleHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? ThreadId", rescheduleInputHandler, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", rescheduleInputHandler, StringComparison.Ordinal);
+        Assert.Contains("TelegramPlatformIds.Group(proposal.TelegramChatId, proposal.ThreadId)", rescheduleInputHandler, StringComparison.Ordinal);
+
+        Assert.Contains("int? ThreadId", rescheduleDeadlineService, StringComparison.Ordinal);
+        Assert.Contains("s.thread_id AS ThreadId", rescheduleDeadlineService, StringComparison.Ordinal);
+        Assert.Contains("TelegramPlatformIds.Group(proposal.TelegramChatId, proposal.ThreadId)", rescheduleDeadlineService, StringComparison.Ordinal);
+    }
+
+    private static async Task<string> ReadRepositoryFileAsync(string relativePath)
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var candidate = Path.Combine(directory.FullName, relativePath);
+            if (File.Exists(candidate))
+            {
+                return await File.ReadAllTextAsync(candidate);
+            }
+
+            directory = directory.Parent;
+        }
+
+        throw new FileNotFoundException($"Could not locate repository file '{relativePath}'.");
+    }
+}

tests/GmRelay.Bot.Tests/Infrastructure/Telegram/TelegramTopicRoutingTests.cs

@@ -0,0 +1,80 @@
+using GmRelay.Bot.Infrastructure.Telegram;
+
+namespace GmRelay.Bot.Tests.Infrastructure.Telegram;
+
+public sealed class TelegramTopicRoutingTests
+{
+    [Fact]
+    public void ResolveNewScheduleDestination_UsesIncomingTopic_WhenForumCommandWasSentInsideTopic()
+    {
+        var destination = TelegramTopicRouting.ResolveNewScheduleDestination(
+            chatIsForum: true,
+            incomingMessageThreadId: 42);
+
+        Assert.Equal(42, destination.MessageThreadId);
+        Assert.False(destination.ShouldCreateForumTopic);
+        Assert.False(destination.TopicCreatedByBot);
+    }
+
+    [Fact]
+    public void ResolveNewScheduleDestination_CreatesBotOwnedTopic_WhenForumCommandWasSentInRoot()
+    {
+        var destination = TelegramTopicRouting.ResolveNewScheduleDestination(
+            chatIsForum: true,
+            incomingMessageThreadId: null);
+
+        Assert.Null(destination.MessageThreadId);
+        Assert.True(destination.ShouldCreateForumTopic);
+        Assert.True(destination.TopicCreatedByBot);
+    }
+
+    [Fact]
+    public void ResolveNewScheduleDestination_UsesPlainChat_WhenChatIsNotForum()
+    {
+        var destination = TelegramTopicRouting.ResolveNewScheduleDestination(
+            chatIsForum: false,
+            incomingMessageThreadId: 42);
+
+        Assert.Null(destination.MessageThreadId);
+        Assert.False(destination.ShouldCreateForumTopic);
+        Assert.False(destination.TopicCreatedByBot);
+    }
+
+    [Fact]
+    public void MissingForumTopicRightsMessage_NamesRequiredAdminRight()
+    {
+        Assert.Contains("admin", TelegramTopicRouting.MissingForumTopicRightsMessage, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("Manage Topics", TelegramTopicRouting.MissingForumTopicRightsMessage, StringComparison.Ordinal);
+    }
+
+    [Theory]
+    [InlineData("Bad Request: not enough rights to create forum topic")]
+    [InlineData("Bad Request: CHAT_ADMIN_REQUIRED")]
+    [InlineData("Forbidden: bot is not an administrator")]
+    public void IsMissingForumTopicRightsError_MatchesAdminPermissionErrors(string apiError)
+    {
+        Assert.True(TelegramTopicRouting.IsMissingForumTopicRightsError(apiError));
+    }
+
+    [Fact]
+    public void IsMissingForumTopicRightsError_IgnoresUnrelatedApiErrors()
+    {
+        Assert.False(TelegramTopicRouting.IsMissingForumTopicRightsError("Bad Request: topic name is invalid"));
+    }
+
+    [Theory]
+    [InlineData(true, 0, true)]
+    [InlineData(true, 1, false)]
+    [InlineData(false, 0, false)]
+    public void ShouldDeleteForumTopic_DeletesOnlyBotOwnedEmptyTopic(
+        bool topicCreatedByBot,
+        int remainingSessionsInTopic,
+        bool expected)
+    {
+        var shouldDelete = TelegramTopicRouting.ShouldDeleteForumTopic(
+            topicCreatedByBot,
+            remainingSessionsInTopic);
+
+        Assert.Equal(expected, shouldDelete);
+    }
+}

tests/GmRelay.Bot.Tests/Platform/PlatformContractsTests.cs

@@ -0,0 +1,54 @@
+using GmRelay.Shared.Platform;
+using GmRelay.Shared.Rendering;
+
+namespace GmRelay.Bot.Tests.Platform;
+
+public sealed class PlatformContractsTests
+{
+    [Fact]
+    public void PlatformKind_ShouldDefineTelegramDiscordAndMaxSentinel()
+    {
+        Assert.Equal(0, (int)PlatformKind.Telegram);
+        Assert.Equal(1, (int)PlatformKind.Discord);
+        Assert.Equal(2, (int)PlatformKind.Max);
+    }
+
+    [Fact]
+    public void PlatformContracts_ShouldBeTelegramAssemblyFree()
+    {
+        var contractTypes = new[]
+        {
+            typeof(PlatformUser),
+            typeof(PlatformGroup),
+            typeof(PlatformMessageRef),
+            typeof(PlatformMessageAction),
+            typeof(PlatformScheduleMessage),
+            typeof(PlatformPrivateMessage),
+            typeof(PlatformInteractionReply),
+            typeof(PlatformCalendarFile),
+            typeof(IPlatformMessenger)
+        };
+
+        Assert.All(contractTypes, type =>
+            Assert.DoesNotContain(
+                "Telegram",
+                string.Join(" ", type.Assembly.GetReferencedAssemblies().Select(value => value.Name)),
+                StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Fact]
+    public void PlatformScheduleMessage_ShouldCarrySharedViewModelWithoutPlatformTypes()
+    {
+        var sessionId = Guid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa");
+        var view = SessionBatchViewBuilder.Build(
+            "Campaign",
+            [new SessionBatchDto(sessionId, new DateTime(2026, 5, 15, 16, 0, 0, DateTimeKind.Utc), "Planned", 4, "https://example.test/game")],
+            []);
+        var group = new PlatformGroup(PlatformKind.Discord, "guild-1", "Guild", "channel-1", "thread-1");
+
+        var message = new PlatformScheduleMessage(group, view, ExistingMessage: null);
+
+        Assert.Equal(PlatformKind.Discord, message.Group.Platform);
+        Assert.Same(view, message.View);
+    }
+}

tests/GmRelay.Bot.Tests/Project/LicenseFileTests.cs

@@ -0,0 +1,46 @@
+using System;
+using System.IO;
+using Xunit;
+
+namespace GmRelay.Bot.Tests.Project;
+
+public class LicenseFileTests
+{
+    private static string GetRepoRoot()
+    {
+        var dir = AppContext.BaseDirectory;
+        while (!string.IsNullOrEmpty(dir) && !File.Exists(Path.Combine(dir, "Directory.Build.props")))
+        {
+            dir = Directory.GetParent(dir)?.FullName;
+        }
+        return dir ?? throw new InvalidOperationException("Could not find repo root");
+    }
+
+    [Fact]
+    public void LicenseFile_ExistsInRepoRoot()
+    {
+        var repoRoot = GetRepoRoot();
+        var licensePath = Path.Combine(repoRoot, "LICENSE");
+        Assert.True(File.Exists(licensePath), "LICENSE file should exist in repo root");
+    }
+
+    [Fact]
+    public void LicenseFile_ContainsMitLicenseText()
+    {
+        var repoRoot = GetRepoRoot();
+        var licensePath = Path.Combine(repoRoot, "LICENSE");
+        Assert.True(File.Exists(licensePath), "LICENSE file should exist");
+        var content = File.ReadAllText(licensePath);
+        Assert.Contains("MIT License", content);
+    }
+
+    [Fact]
+    public void Readme_ReferencesLicenseFile()
+    {
+        var repoRoot = GetRepoRoot();
+        var readmePath = Path.Combine(repoRoot, "README.md");
+        Assert.True(File.Exists(readmePath), "README.md should exist");
+        var content = File.ReadAllText(readmePath);
+        Assert.Contains("./LICENSE", content);
+    }
+}

tests/GmRelay.Bot.Tests/Rendering/SessionBatchViewBuilderTests.cs

@@ -14,9 +14,9 @@ public sealed class SessionBatchViewBuilderTests
 
         var sessions = new[]
         {
-            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
-            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null),
-            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2)
+            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4, "https://example.com/game"),
+            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null, ""),
+            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2, "https://example.com/game")
         };
         var participants = new[]
         {
@@ -38,7 +38,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldCalculatePlayerCounts()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
         var participants = new[]
         {
             new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active),
@@ -59,7 +59,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldIncludeActionsForActiveSessions()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 4, "https://example.com/game") };
         var participants = Array.Empty<ParticipantBatchDto>();
 
         var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -76,7 +76,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldNotIncludeActionsForCancelledSessions()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Cancelled, null) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
         var participants = Array.Empty<ParticipantBatchDto>();
 
         var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -88,7 +88,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldMarkWaitlistActionWhenFull()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1, "https://example.com/game") };
         var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
 
         var result = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -101,7 +101,7 @@ public sealed class SessionBatchViewBuilderTests
     public void Build_ShouldIncludePlayerUsernames()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, null) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, null, "https://example.com/game") };
         var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
 
         var result = SessionBatchViewBuilder.Build("Test", sessions, participants);

tests/GmRelay.Bot.Tests/Rendering/TelegramSessionBatchRendererTests.cs

@@ -16,9 +16,9 @@ public sealed class TelegramSessionBatchRendererTests
 
         var sessions = new[]
         {
-            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4),
-            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null),
-            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2)
+            new SessionBatchDto(secondSessionId, new DateTime(2026, 4, 27, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 4, "https://example.com/game2"),
+            new SessionBatchDto(cancelledSessionId, new DateTime(2026, 4, 28, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Cancelled, null, ""),
+            new SessionBatchDto(firstSessionId, new DateTime(2026, 4, 26, 18, 0, 0, DateTimeKind.Utc), SessionStatus.Planned, 2, "https://example.com/game1")
         };
         var participants = new[]
         {
@@ -35,6 +35,9 @@ public sealed class TelegramSessionBatchRendererTests
         Assert.Contains("Charlie", text);
         Assert.Contains("Bob", text);
         Assert.Contains("Сессия отменена", text);
+        Assert.Contains("Ссылка на игру", text);
+        Assert.Contains("https://example.com/game1", text);
+        Assert.Contains("https://example.com/game2", text);
 
         var buttons = markup.InlineKeyboard.SelectMany(row => row).ToList();
         Assert.Equal(4, buttons.Count); // 2 sessions x 2 buttons each
@@ -51,7 +54,7 @@ public sealed class TelegramSessionBatchRendererTests
     public void Render_ShouldSkipButtonsForCancelledSessions()
     {
         var cancelledSessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(cancelledSessionId, DateTime.UtcNow, SessionStatus.Cancelled, null) };
+        var sessions = new[] { new SessionBatchDto(cancelledSessionId, DateTime.UtcNow, SessionStatus.Cancelled, null, "") };
         var participants = Array.Empty<ParticipantBatchDto>();
 
         var view = SessionBatchViewBuilder.Build("Test", sessions, participants);
@@ -64,7 +67,7 @@ public sealed class TelegramSessionBatchRendererTests
     public void Render_ShouldShowWaitlistButtonWhenFull()
     {
         var sessionId = Guid.NewGuid();
-        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1) };
+        var sessions = new[] { new SessionBatchDto(sessionId, DateTime.UtcNow, SessionStatus.Planned, 1, "https://example.com/game") };
         var participants = new[] { new ParticipantBatchDto(sessionId, "Alice", "alice", ParticipantRegistrationStatus.Active) };
 
         var view = SessionBatchViewBuilder.Build("Test", sessions, participants);

tests/GmRelay.Bot.Tests/Web/AuthorizedSessionServiceTests.cs

@@ -244,6 +244,50 @@ public sealed class AuthorizedSessionServiceTests
         Assert.Empty(store.LogEntries);
     }
 
+    [Fact]
+    public async Task GetSessionHistoryForGmAsync_ReturnsHistory_WhenSessionBelongsToOwnedGroup()
+    {
+        var gmId = 1001L;
+        var groupId = Guid.NewGuid();
+        var sessionId = Guid.NewGuid();
+        var store = new FakeSessionStore(
+            groups:
+            [
+                new(groupId, 42, "Alpha", gmId)
+            ],
+            sessions:
+            [
+                new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
+            ]);
+        var service = new AuthorizedSessionService(store);
+
+        var history = await service.GetSessionHistoryForGmAsync(sessionId, gmId);
+
+        Assert.NotNull(history);
+        Assert.Empty(history);
+    }
+
+    [Fact]
+    public async Task GetSessionHistoryForGmAsync_ReturnsNull_WhenSessionBelongsToAnotherGm()
+    {
+        var groupId = Guid.NewGuid();
+        var sessionId = Guid.NewGuid();
+        var store = new FakeSessionStore(
+            groups:
+            [
+                new(groupId, 42, "Alpha", 2002L)
+            ],
+            sessions:
+            [
+                new(sessionId, groupId, "Session A", DateTime.UtcNow, "Planned", "https://example.test/a", Guid.NewGuid(), 10, 42, 4, 1, 0)
+            ]);
+        var service = new AuthorizedSessionService(store);
+
+        var history = await service.GetSessionHistoryForGmAsync(sessionId, 1001L);
+
+        Assert.Null(history);
+    }
+
     [Fact]
     public async Task PromoteWaitlistedPlayerForGmAsync_PromotesOwnedSession()
     {

tests/GmRelay.Bot.Tests/Web/WebHealthEndpointTests.cs

@@ -0,0 +1,86 @@
+using GmRelay.Web.Health;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Npgsql;
+using System.Net;
+using System.Text.Json;
+
+namespace GmRelay.Bot.Tests.Web;
+
+public sealed class WebHealthEndpointTests
+{
+    private static WebApplication CreateTestApp(HealthStatus npgsqlStatus)
+    {
+        var builder = WebApplication.CreateBuilder();
+        builder.WebHost.UseTestServer();
+        builder.Services.AddHealthChecks()
+            .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"])
+            .AddCheck("npgsql", () => new HealthCheckResult(npgsqlStatus));
+
+        var app = builder.Build();
+        app.MapHealthChecks("/health", new HealthCheckOptions
+        {
+            ResponseWriter = async (context, report) =>
+            {
+                context.Response.ContentType = "application/json";
+                var response = new
+                {
+                    status = report.Status == HealthStatus.Healthy ? "healthy" : "unhealthy",
+                    timestamp = DateTimeOffset.UtcNow.ToString("O")
+                };
+                await context.Response.WriteAsJsonAsync(response);
+            }
+        });
+        app.MapHealthChecks("/alive", new HealthCheckOptions
+        {
+            Predicate = r => r.Tags.Contains("live")
+        });
+
+        return app;
+    }
+
+    [Fact]
+    public async Task HealthEndpoint_ShouldReturn200AndJson_WhenHealthy()
+    {
+        await using var app = CreateTestApp(HealthStatus.Healthy);
+        await app.StartAsync();
+        using var client = app.GetTestClient();
+
+        var response = await client.GetAsync("/health");
+
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        var content = await response.Content.ReadAsStringAsync();
+        using var doc = JsonDocument.Parse(content);
+        Assert.Equal("healthy", doc.RootElement.GetProperty("status").GetString());
+        Assert.NotNull(doc.RootElement.GetProperty("timestamp").GetString());
+    }
+
+    [Fact]
+    public async Task HealthEndpoint_ShouldReturn503_WhenDatabaseUnavailable()
+    {
+        await using var app = CreateTestApp(HealthStatus.Unhealthy);
+        await app.StartAsync();
+        using var client = app.GetTestClient();
+
+        var response = await client.GetAsync("/health");
+
+        Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode);
+    }
+
+    [Fact]
+    public async Task NpgsqlHealthCheck_ShouldReturnUnhealthy_WhenDatabaseIsInaccessible()
+    {
+        var dataSource = NpgsqlDataSource.Create("Host=localhost;Port=5432;Database=gmrelay_db;Username=gmrelay;Password=fake");
+        var healthCheck = new NpgsqlHealthCheck(dataSource);
+
+        var result = await healthCheck.CheckHealthAsync(new HealthCheckContext());
+
+        Assert.Equal(HealthStatus.Unhealthy, result.Status);
+        Assert.NotNull(result.Exception);
+    }
+}

tests/GmRelay.Bot.Tests/packages.lock.json

@@ -0,0 +1,400 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net10.0": {
+      "coverlet.collector": {
+        "type": "Direct",
+        "requested": "[6.0.4, )",
+        "resolved": "6.0.4",
+        "contentHash": "lkhqpF8Pu2Y7IiN7OntbsTtdbpR1syMsm2F3IgX6ootA4ffRqWL5jF7XipHuZQTdVuWG/gVAAcf8mjk8Tz0xPg=="
+      },
+      "Microsoft.AspNetCore.Mvc.Testing": {
+        "type": "Direct",
+        "requested": "[10.0.5, )",
+        "resolved": "10.0.5",
+        "contentHash": "MfacYQ7jNzj6073YobyoFfXpNmGqrV1UCywTM339DOcYpfalcM4K4heFjV5k3dDkKkWOGWO/DV3hdmVRqFkIxA==",
+        "dependencies": {
+          "Microsoft.AspNetCore.TestHost": "10.0.5",
+          "Microsoft.Extensions.DependencyModel": "10.0.5"
+        }
+      },
+      "Microsoft.NET.Test.Sdk": {
+        "type": "Direct",
+        "requested": "[17.14.1, )",
+        "resolved": "17.14.1",
+        "contentHash": "HJKqKOE+vshXra2aEHpi2TlxYX7Z9VFYkr+E5rwEvHC8eIXiyO+K9kNm8vmNom3e2rA56WqxU+/N9NJlLGXsJQ==",
+        "dependencies": {
+          "Microsoft.CodeCoverage": "17.14.1",
+          "Microsoft.TestPlatform.TestHost": "17.14.1"
+        }
+      },
+      "SecurityCodeScan.VS2019": {
+        "type": "Direct",
+        "requested": "[5.6.7, )",
+        "resolved": "5.6.7",
+        "contentHash": "WIE9RJswdSc2j+rLz2gW6U+gMUjMHzY2j7C/CL8/R2olXNM/+twarfMnWqm+rZodDBvaYDApJyxM8mVYf9FGrQ=="
+      },
+      "xunit": {
+        "type": "Direct",
+        "requested": "[2.9.3, )",
+        "resolved": "2.9.3",
+        "contentHash": "TlXQBinK35LpOPKHAqbLY4xlEen9TBafjs0V5KnA4wZsoQLQJiirCR4CbIXvOH8NzkW4YeJKP5P/Bnrodm0h9Q==",
+        "dependencies": {
+          "xunit.analyzers": "1.18.0",
+          "xunit.assert": "2.9.3",
+          "xunit.core": "[2.9.3]"
+        }
+      },
+      "xunit.runner.visualstudio": {
+        "type": "Direct",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "5mj99LvCqrq3CNi06xYdyIAXOEh+5b33F2nErCzI5zWiDdLHXiPXEWFSUAF8zlIv0ZWqjZNCwHTQeAPYbF3pCg=="
+      },
+      "Aspire.Npgsql": {
+        "type": "Transitive",
+        "resolved": "13.2.2",
+        "contentHash": "nEYgziWN7hksgEQEWy24JypcMCU8gKYcIIyPL05JfdXxUWuPRLotH/KOeuHevAjSEOYkL3dtGakBkJAuPobGmA==",
+        "dependencies": {
+          "AspNetCore.HealthChecks.NpgSql": "9.0.0",
+          "Npgsql.DependencyInjection": "10.0.1",
+          "Npgsql.OpenTelemetry": "10.0.1",
+          "OpenTelemetry.Extensions.Hosting": "1.15.0"
+        }
+      },
+      "AspNetCore.HealthChecks.NpgSql": {
+        "type": "Transitive",
+        "resolved": "9.0.0",
+        "contentHash": "npc58/AD5zuVxERdhCl2Kb7WnL37mwX42SJcXIwvmEig0/dugOLg3SIwtfvvh3TnvTwR/sk5LYNkkPaBdks61A==",
+        "dependencies": {
+          "Npgsql": "8.0.3"
+        }
+      },
+      "Dapper": {
+        "type": "Transitive",
+        "resolved": "2.1.72",
+        "contentHash": "ns4mGqQd9a/MhP8m6w556vVlZIa0/MfUu03zrxjZC/jlr1uVCsUac8bkdB+Fs98Llbd56rRSo1eZH5VVmeGZyw=="
+      },
+      "Dapper.AOT": {
+        "type": "Transitive",
+        "resolved": "1.0.48",
+        "contentHash": "rsLM3yKr4g+YKKox9lhc8D+kz67P7Q9+xdyn1LmCsoYr1kYpJSm+Nt6slo5UrfUrcTiGJ57zUlyO8XUdV7G7iA=="
+      },
+      "dbup-core": {
+        "type": "Transitive",
+        "resolved": "6.1.1",
+        "contentHash": "kgpuyJVEFJHoIj/slnc994Go88aoeZqNDfGHDBr4sh7CsEWwJhOTCt/FJqO4ziUImL5L0NEY0kxxOiNgPKI2Fw=="
+      },
+      "dbup-postgresql": {
+        "type": "Transitive",
+        "resolved": "7.0.1",
+        "contentHash": "mRnmENWWPuuMZ538gOd1mZnzucx6FQk0anmw3EABjGfcbp24FDb9QdGepYrDiaM8K9s5/gd49+5cmBOlniH/lg==",
+        "dependencies": {
+          "Npgsql": "10.0.1",
+          "dbup-core": "6.1.1"
+        }
+      },
+      "Microsoft.AspNetCore.TestHost": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "PJEdrZnnhvxIEXzDdvdZ38GvpdaiUfKkZ99kudS8riJwhowFb/Qh26Wjk9smrCWcYdMFQmpN5epGiL4o1s8LYA=="
+      },
+      "Microsoft.CodeCoverage": {
+        "type": "Transitive",
+        "resolved": "17.14.1",
+        "contentHash": "pmTrhfFIoplzFVbhVwUquT+77CbGH+h4/3mBpdmIlYtBi9nAB+kKI6dN3A/nV4DFi3wLLx/BlHIPK+MkbQ6Tpg=="
+      },
+      "Microsoft.Extensions.AmbientMetadata.Application": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "CNrEjaOCZ8d1HtB0mvpiX4EWxLkee2xy+CsYXxmsEYJSFgw3OmF9pIhP/tCTeYBHhpsKJj5wM63G8IBFGxAcsw=="
+      },
+      "Microsoft.Extensions.Compliance.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "1a4xDAT6fRyP8t419q3WvWMmMslDTvI7OAZLWBhn5rysFG0bl5xFenTswd1xAbT/3u3mx4Xyb5bPx+V+18tJeQ=="
+      },
+      "Microsoft.Extensions.DependencyInjection.AutoActivation": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "Z/OI261l7LnxyODKPx0trQyIHFyicCR/akfn64lGOjPcf4FpAZ7ePAGl2HPvQBUBSNfPTF0gWeCfuFmyftMgYA=="
+      },
+      "Microsoft.Extensions.DependencyModel": {
+        "type": "Transitive",
+        "resolved": "10.0.5",
+        "contentHash": "xA4kkL+QS6KCAOKz/O0oquHs44Ob8J7zpBCNt3wjkBWDg5aCqfwG8rWWLsg5V86AM0sB849g9JjPjIdksTCIKg=="
+      },
+      "Microsoft.Extensions.Diagnostics.ExceptionSummarization": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "3qMK1D40D10kb5TdBtFJpzz6/WH0NinWs68ZZS8jCFgHMXDiOjGiPOneMmIocCP/wnUUW4Hzf8lMsIE1xIGxDA=="
+      },
+      "Microsoft.Extensions.Http.Diagnostics": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "I0FBgF6yZRwYH9E3KQ2vHm80YZ7YBj+52GDsmOWXPBv/p15b/wUoNupV9kw3LnSNVsWMqlGbiuZgBnHpMwPh+Q==",
+        "dependencies": {
+          "Microsoft.Extensions.Telemetry": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Http.Resilience": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "Lg+OjBW+ODDbM4Ax4LoERvQ1dqSZ8I2gQc2+B0/WOWl2+PunLJ3xb3x8MtHGfcb/Mp98RoMpwRKm6Aj9mzXwrA==",
+        "dependencies": {
+          "Microsoft.Extensions.Http.Diagnostics": "10.2.0",
+          "Microsoft.Extensions.Resilience": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Resilience": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "v4WOdAOFxB3AcsUkZWNcHL3mYzs4KAPtHO8rkoQlFKOBoD3KyjjAL+h3tRwSK5i4UpF/yhxsQRY0JxKj4osxxw==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.ExceptionSummarization": "10.2.0",
+          "Microsoft.Extensions.Telemetry.Abstractions": "10.2.0",
+          "Polly.Extensions": "8.4.2",
+          "Polly.RateLimiting": "8.4.2"
+        }
+      },
+      "Microsoft.Extensions.ServiceDiscovery": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "AHTPfiKodj66xA8RwRkFD4q11V2AvzcuDsujv6ViPkOPtvBEYcPVplHakK56pPzWlX08MDS+TAQXfFXAeP7J5w==",
+        "dependencies": {
+          "Microsoft.Extensions.ServiceDiscovery.Abstractions": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.ServiceDiscovery.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "sANlOvfqfw/yfych4CLlHSKSWzIie6mQG7w83gVur1foNOafyHxcgpoQMvBf+KiB4Tpls6P1/Z77IIQSK8hxFg=="
+      },
+      "Microsoft.Extensions.Telemetry": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "ssW5gosYlewNH/ISTyaLD/XfJT4GSjwShOUKv61fpXrqVmHkhuIA/5bBAGStM1XbzJjt9IG2vzfdHTu4zlX9Ew==",
+        "dependencies": {
+          "Microsoft.Extensions.AmbientMetadata.Application": "10.2.0",
+          "Microsoft.Extensions.DependencyInjection.AutoActivation": "10.2.0",
+          "Microsoft.Extensions.Telemetry.Abstractions": "10.2.0"
+        }
+      },
+      "Microsoft.Extensions.Telemetry.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.2.0",
+        "contentHash": "6V4V6NX6RLUYWwV89DeW/4zK5xOycYHWhsfMXSpKVGgMHfXcczmbk6hBeqTnRPzhpATYcOWlmA6hk1jgdxUugA==",
+        "dependencies": {
+          "Microsoft.Extensions.Compliance.Abstractions": "10.2.0"
+        }
+      },
+      "Microsoft.TestPlatform.ObjectModel": {
+        "type": "Transitive",
+        "resolved": "17.14.1",
+        "contentHash": "xTP1W6Mi6SWmuxd3a+jj9G9UoC850WGwZUps1Wah9r1ZxgXhdJfj1QqDLJkFjHDCvN42qDL2Ps5KjQYWUU0zcQ=="
+      },
+      "Microsoft.TestPlatform.TestHost": {
+        "type": "Transitive",
+        "resolved": "17.14.1",
+        "contentHash": "d78LPzGKkJwsJXAQwsbJJ7LE7D1wB+rAyhHHAaODF+RDSQ0NgMjDFkSA1Djw18VrxO76GlKAjRUhl+H8NL8Z+Q==",
+        "dependencies": {
+          "Microsoft.TestPlatform.ObjectModel": "17.14.1",
+          "Newtonsoft.Json": "13.0.3"
+        }
+      },
+      "Newtonsoft.Json": {
+        "type": "Transitive",
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
+      },
+      "Npgsql": {
+        "type": "Transitive",
+        "resolved": "10.0.2",
+        "contentHash": "q5RfBI+wywJSFUNDE1L4ZbHEHCFTblo8Uf6A6oe4feOUFYiUQXyAf9GBh5qEZpvJaHiEbpBPkQumjEhXCJxdrg=="
+      },
+      "Npgsql.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "10.0.1",
+        "contentHash": "YHFa4vD27sNIfv6s5q8Zi1fLvKfmK1xcpMv0PUvXOxDFbRmuMRSHwpZTbPvsAlj97q1/o7DfyynLqfqrCm1VnA==",
+        "dependencies": {
+          "Npgsql": "10.0.1"
+        }
+      },
+      "Npgsql.OpenTelemetry": {
+        "type": "Transitive",
+        "resolved": "10.0.1",
+        "contentHash": "G9fEIBaHggZXWfDSDnKLc0XwKcbuU6i2eXp7zDqpgYxbhCmIN9fRgaSOGyyMNHSo/yY1IB4G4CjW5VO/SKRR0g==",
+        "dependencies": {
+          "Npgsql": "10.0.1",
+          "OpenTelemetry.API": "1.14.0"
+        }
+      },
+      "OpenTelemetry": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "N0i6WjPoHPbZyms1ugbDIFAJFuGlpeExJMU/+XSL0lQRUkg/D0utFkDoLXf8Z1km5B+xVZ2GyMXXiX8qdeNmPg==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Api": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "fX+fkCysfPut+qCcT3bKqyX4QN9Saf4CgX8HLOHywEVD+Xr7sULtfuypITpoDysjx8R59dn/3mWhgimMH8cm/g=="
+      },
+      "OpenTelemetry.Api.ProviderBuilderExtensions": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
+        "dependencies": {
+          "OpenTelemetry.Api": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Exporter.OpenTelemetryProtocol": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "FEXJepcseTGbATiCkUfP7ipoFEYYfl/0UmmUwi0KxCPg9PaUA8ab2P1LGopK+/HExasJ1ZutFhZrN6WvUIR23g==",
+        "dependencies": {
+          "OpenTelemetry": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Extensions.Hosting": {
+        "type": "Transitive",
+        "resolved": "1.15.3",
+        "contentHash": "u8n/W8yIlqv0BXZmvId1iVaeWXG42tGKdTkuLYg5g57Y/r9CeUNzqtrSHNdG5IoO8iPX79w3v+WsbAHgUQbfeg==",
+        "dependencies": {
+          "OpenTelemetry": "1.15.3"
+        }
+      },
+      "OpenTelemetry.Instrumentation.AspNetCore": {
+        "type": "Transitive",
+        "resolved": "1.15.2",
+        "contentHash": "2nPd7r0ug/gd6/CNFL6Rlu+RSQ9WYGSGHAYQ1ssbSqyzKJpqTunfx2I/1O0WB5k+L0cyXbG4XVZpoSoUc3M7wg==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
+        }
+      },
+      "OpenTelemetry.Instrumentation.Http": {
+        "type": "Transitive",
+        "resolved": "1.15.1",
+        "contentHash": "vFO4Fj/dXkoVNGo/nhoGpO2zYQmZwr4jTID7oRGo+XlQ8LqksyZjUXQ4p39RfUvTID7IzzL8Qe71tW7CcAFymA==",
+        "dependencies": {
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
+        }
+      },
+      "OpenTelemetry.Instrumentation.Runtime": {
+        "type": "Transitive",
+        "resolved": "1.15.1",
+        "contentHash": "cpPwlUT5HXcLGPaIgsbSy0W9eFYAPGVbTP1p8/uyQ4Osvf5BJuPpEXE7crL09SmEd44r0DGNKDtsqxaAz0HxQw==",
+        "dependencies": {
+          "OpenTelemetry.Api": "[1.15.3, 2.0.0)"
+        }
+      },
+      "Polly.Core": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "BpE2I6HBYYA5tF0Vn4eoQOGYTYIK1BlF5EXVgkWGn3mqUUjbXAr13J6fZVbp7Q3epRR8yshacBMlsHMhpOiV3g=="
+      },
+      "Polly.Extensions": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "GZ9vRVmR0jV2JtZavt+pGUsQ1O1cuRKG7R7VOZI6ZDy9y6RNPvRvXK1tuS4ffUrv8L0FTea59oEuQzgS0R7zSA==",
+        "dependencies": {
+          "Polly.Core": "8.4.2"
+        }
+      },
+      "Polly.RateLimiting": {
+        "type": "Transitive",
+        "resolved": "8.4.2",
+        "contentHash": "ehTImQ/eUyO07VYW2WvwSmU9rRH200SKJ/3jku9rOkyWE0A2JxNFmAVms8dSn49QLSjmjFRRSgfNyOgr/2PSmA==",
+        "dependencies": {
+          "Polly.Core": "8.4.2"
+        }
+      },
+      "Telegram.Bot": {
+        "type": "Transitive",
+        "resolved": "22.9.6.1",
+        "contentHash": "I0eaMaETcWIhMn4uu4RGd9e6PLJOjaOG3QAcKPsTcS80H3TF6gqj3UF9NKu4ZY90ul6Y6NiWToHkg/PsvxkotA=="
+      },
+      "xunit.abstractions": {
+        "type": "Transitive",
+        "resolved": "2.0.3",
+        "contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg=="
+      },
+      "xunit.analyzers": {
+        "type": "Transitive",
+        "resolved": "1.18.0",
+        "contentHash": "OtFMHN8yqIcYP9wcVIgJrq01AfTxijjAqVDy/WeQVSyrDC1RzBWeQPztL49DN2syXRah8TYnfvk035s7L95EZQ=="
+      },
+      "xunit.assert": {
+        "type": "Transitive",
+        "resolved": "2.9.3",
+        "contentHash": "/Kq28fCE7MjOV42YLVRAJzRF0WmEqsmflm0cfpMjGtzQ2lR5mYVj1/i0Y8uDAOLczkL3/jArrwehfMD0YogMAA=="
+      },
+      "xunit.core": {
+        "type": "Transitive",
+        "resolved": "2.9.3",
+        "contentHash": "BiAEvqGvyme19wE0wTKdADH+NloYqikiU0mcnmiNyXaF9HyHmE6sr/3DC5vnBkgsWaE6yPyWszKSPSApWdRVeQ==",
+        "dependencies": {
+          "xunit.extensibility.core": "[2.9.3]",
+          "xunit.extensibility.execution": "[2.9.3]"
+        }
+      },
+      "xunit.extensibility.core": {
+        "type": "Transitive",
+        "resolved": "2.9.3",
+        "contentHash": "kf3si0YTn2a8J8eZNb+zFpwfoyvIrQ7ivNk5ZYA5yuYk1bEtMe4DxJ2CF/qsRgmEnDr7MnW1mxylBaHTZ4qErA==",
+        "dependencies": {
+          "xunit.abstractions": "2.0.3"
+        }
+      },
+      "xunit.extensibility.execution": {
+        "type": "Transitive",
+        "resolved": "2.9.3",
+        "contentHash": "yMb6vMESlSrE3Wfj7V6cjQ3S4TXdXpRqYeNEI3zsX31uTsGMJjEw6oD5F5u1cHnMptjhEECnmZSsPxB6ChZHDQ==",
+        "dependencies": {
+          "xunit.extensibility.core": "[2.9.3]"
+        }
+      },
+      "gmrelay.bot": {
+        "type": "Project",
+        "dependencies": {
+          "Aspire.Npgsql": "[13.2.2, )",
+          "Dapper": "[2.1.72, )",
+          "Dapper.AOT": "[1.0.48, )",
+          "GmRelay.ServiceDefaults": "[1.15.1, )",
+          "GmRelay.Shared": "[1.15.1, )",
+          "Npgsql": "[10.0.2, )",
+          "Telegram.Bot": "[22.9.5.3, )",
+          "dbup-postgresql": "[7.0.1, )"
+        }
+      },
+      "gmrelay.servicedefaults": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Http.Resilience": "[10.2.0, )",
+          "Microsoft.Extensions.ServiceDiscovery": "[10.2.0, )",
+          "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.15.3, )",
+          "OpenTelemetry.Extensions.Hosting": "[1.15.3, )",
+          "OpenTelemetry.Instrumentation.AspNetCore": "[1.15.2, )",
+          "OpenTelemetry.Instrumentation.Http": "[1.15.1, )",
+          "OpenTelemetry.Instrumentation.Runtime": "[1.15.1, )"
+        }
+      },
+      "gmrelay.shared": {
+        "type": "Project"
+      },
+      "gmrelay.web": {
+        "type": "Project",
+        "dependencies": {
+          "Aspire.Npgsql": "[13.2.2, )",
+          "Dapper": "[2.1.72, )",
+          "GmRelay.ServiceDefaults": "[1.15.1, )",
+          "GmRelay.Shared": "[1.15.1, )",
+          "Npgsql": "[10.0.2, )",
+          "Telegram.Bot": "[22.9.6.1, )"
+        }
+      }
+    }
+  }
+}