Доработан менеджер состояний.

BotPages.Core/Navigation/IStateStore.cs

@@ -8,7 +8,7 @@
         /// <summary>
         /// Получает состояние пользователя.
         /// </summary>
-        Task<UserState> GetAsync(long userId, CancellationToken ct);
+        Task<UserState> GetAsync(string transportId, long userId, CancellationToken ct);
 
         /// <summary>
         /// Сохраняет состояние пользователя.

BotPages.Core/Navigation/InMemoryStateStore.cs

@@ -6,17 +6,21 @@
     /// </summary>
     public sealed class InMemoryStateStore : IStateStore
     {
-        private readonly Dictionary<long, UserState> _store = new();
+        private readonly Dictionary<(string chatClientId, long userId), UserState> _store = new();
 
         /// <summary>
         /// Получает состояние пользователя, создавая новое при отсутствии.
         /// </summary>
-        public Task<UserState> GetAsync(long userId, CancellationToken ct)
+        public Task<UserState> GetAsync(string chatClientId, long userId, CancellationToken ct)
         {
-            if (!_store.TryGetValue(userId, out var st))
+            if (!_store.TryGetValue((chatClientId, userId), out var st))
             {
-                st = new UserState { UserId = userId };
-                _store[userId] = st;
+                st = new UserState 
+                {
+                    UserId = userId, 
+                    ChatClientId = chatClientId,
+                };
+                _store[(chatClientId, userId)] = st;
             }
             return Task.FromResult(st);
         }
@@ -26,7 +30,7 @@
         /// </summary>
         public Task SaveAsync(UserState state, CancellationToken ct)
         {
-            _store[state.UserId] = state;
+            _store[(state.ChatClientId, state.UserId)] = state;
             return Task.CompletedTask;
         }
     }

BotPages.Core/Navigation/NavEntry.cs

@@ -0,0 +1,7 @@
+namespace BotPages.Core
+{
+    /// <summary>
+    /// Запись навигационного стека: страница и её аргументы.
+    /// </summary>
+    public sealed record NavEntry(string PageId, object? Args = null);
+}

BotPages.Core/Navigation/NavigationService.cs

@@ -22,7 +22,7 @@
         /// </summary>
         public async Task PushAsync(string pageId, object? args, UpdateContext ctx, CancellationToken ct)
         {
-            var state = await _store.GetAsync(ctx.User.Id, ct);
+            var state = await _store.GetAsync(ctx.Client.Id, ctx.User.Id, ct);
             state.Stack.Add(new NavEntry(pageId, args));
             await _store.SaveAsync(state, ct);
 
@@ -35,7 +35,7 @@
         /// </summary>
         public async Task ReplaceAsync(string pageId, object? args, UpdateContext ctx, CancellationToken ct)
         {
-            var state = await _store.GetAsync(ctx.User.Id, ct);
+            var state = await _store.GetAsync(ctx.Client.Id, ctx.User.Id, ct);
             if (state.Stack.Count > 0) state.Stack[^1] = new NavEntry(pageId, args);
             else state.Stack.Add(new NavEntry(pageId, args));
             await _store.SaveAsync(state, ct);
@@ -49,7 +49,7 @@
         /// </summary>
         public async Task PopAsync(UpdateContext ctx, CancellationToken ct)
         {
-            var state = await _store.GetAsync(ctx.User.Id, ct);
+            var state = await _store.GetAsync(ctx.Client.Id, ctx.User.Id, ct);
             if (state.Stack.Count == 0) return;
 
             var currentId = state.Stack[^1].PageId;
@@ -92,7 +92,7 @@
         /// </summary>
         public async Task<NavEntry?> CurrentAsync(UpdateContext ctx, CancellationToken ct)
         {
-            var state = await _store.GetAsync(ctx.User.Id, ct);
+            var state = await _store.GetAsync(ctx.Client.Id, ctx.User.Id, ct);
             return state.Stack.Count == 0 ? null : state.Stack[^1];
         }
 
@@ -101,7 +101,7 @@
         /// </summary>
         public async Task<IReadOnlyList<NavEntry>> StackAsync(UpdateContext ctx, CancellationToken ct)
         {
-            var state = await _store.GetAsync(ctx.User.Id, ct);
+            var state = await _store.GetAsync(ctx.Client.Id, ctx.User.Id, ct);
             return state.Stack.AsReadOnly();
         }
     }

BotPages.Core/Navigation/UserState.cs

@@ -8,7 +8,12 @@
         /// <summary>
         /// Идентификатор пользователя.
         /// </summary>
-        public long UserId { get; init; }
+        public required long UserId { get; init; }
+
+        /// <summary>
+        /// Идентификатор клиента чата.
+        /// </summary>
+        public required string ChatClientId { get; init; }
 
         /// <summary>
         /// Навигационный стек страниц.