RG-T117 PR#430 fixes

Author: ucswift

.gitignore

@@ -277,3 +277,5 @@ Web/Resgrid.WebCore/wwwroot/lib/*
 opencode.json
 .dual-graph-pro/
 .mcp.json
+/.codex
+/.claude

Core/Resgrid.Chatbot.NLU/Providers/KeywordIntentClassifier.cs

@@ -200,14 +200,14 @@ public class KeywordIntentClassifier : INLUProvider
 
 			// === Respond to Call ===
 			(R(@"^(not\s*responding|not\s+going|unable\s+to\s+respond)\s+(?:to\s+)?(.+)$"),
-				"respond_to_call", m => P2("callRef", m.Groups[2].Value.Trim(), "response", "no")),
+				"respond_to_call", m => P2("callRef", CleanReference(m.Groups[2].Value), "response", "no")),
 			(R(@"^(respond|en\s*route|going)\s+to\s+c?(\d+)$"),
 				"respond_to_call", m => P2("callId", m.Groups[2].Value, "response", "yes")),
 			// Responder shorthand: "omw to 26-1", "omw to fire", "enroute to c1445", "headed to Main St".
 			// The reference can be a call id, a call number (yy-N), or a term matched against active
 			// calls — resolved by the handler.
 			(R(@"^(omw|on\s+my\s+way|respond(?:ing)?|going|headed|enroute|en\s+route)\s+(?:to\s+)?(.+)$"),
-				"respond_to_call", m => P2("callRef", m.Groups[2].Value.Trim(), "response", "yes")),
+				"respond_to_call", m => P2("callRef", CleanReference(m.Groups[2].Value), "response", "yes")),
 
 			// === Shift Drop (must precede shift signup/detail so 'drop shift 5' isn't misread) ===
 			(R(@"^(drop|cancel|release)\s+(my\s+)?shift\s+#?(\d+)"),

Core/Resgrid.Chatbot/Handlers/CallRespondersActionHandler.cs

@@ -19,6 +19,13 @@ namespace Resgrid.Chatbot.Handlers
 	/// </summary>
 	public class CallRespondersActionHandler : IChatbotActionHandler
 	{
+		private enum ResponderMode
+		{
+			All,
+			EnRoute,
+			OnScene
+		}
+
 		private enum ResponderBucket
 		{
 			None,
@@ -56,8 +63,8 @@ public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIn
 			var culture = session.Culture;
 			try
 			{
-				intent.Parameters.TryGetValue("mode", out var mode);
-				mode = string.IsNullOrWhiteSpace(mode) ? "all" : mode.Trim().ToLowerInvariant();
+				intent.Parameters.TryGetValue("mode", out var modeValue);
+				var mode = ParseResponderMode(modeValue);
 
 				var call = await ResolveCallAsync(intent, session.DepartmentId);
 				if (call == null)
@@ -68,11 +75,11 @@ public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIn
 
 				var callLabel = string.IsNullOrWhiteSpace(call.Number) ? call.Name : $"{call.Number} {call.Name}";
 
-				// Latest status per person tied to this call.
+				// Current status per person tied to this call.
 				var actionLogs = await _actionLogsService.GetActionLogsForCallAsync(session.DepartmentId, call.CallId);
+				var currentActionLogs = await _actionLogsService.GetLastActionLogsForDepartmentAsync(session.DepartmentId) ?? new List<ActionLog>();
 				var latestPerUser = (actionLogs ?? new List<ActionLog>())
-					.GroupBy(x => x.UserId)
-					.Select(g => g.OrderByDescending(x => x.Timestamp).First())
+					.Where(x => currentActionLogs.Any(current => current.ActionLogId == x.ActionLogId && current.DestinationId == call.CallId))
 					.ToList();
 
 				var personnelLines = new StringBuilder();
@@ -94,11 +101,11 @@ public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIn
 					}
 				}
 
-				// Latest status per unit tied to this call.
+				// Current status per unit tied to this call.
 				var unitStates = await _unitsService.GetUnitStatesForCallAsync(session.DepartmentId, call.CallId);
+				var currentUnitStates = await _unitsService.GetAllLatestStatusForUnitsByDepartmentIdAsync(session.DepartmentId) ?? new List<UnitState>();
 				var latestPerUnit = (unitStates ?? new List<UnitState>())
-					.GroupBy(x => x.UnitId)
-					.Select(g => g.OrderByDescending(x => x.Timestamp).First())
+					.Where(x => currentUnitStates.Any(current => current.UnitStateId == x.UnitStateId && current.DestinationId == call.CallId))
 					.ToList();
 
 				var unitLines = new StringBuilder();
@@ -129,8 +136,8 @@ public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIn
 
 				var headerKey = mode switch
 				{
-					"enroute" => "CallResp_HeaderEnroute",
-					"onscene" => "CallResp_HeaderOnScene",
+					ResponderMode.EnRoute => "CallResp_HeaderEnroute",
+					ResponderMode.OnScene => "CallResp_HeaderOnScene",
 					_ => "CallResp_HeaderAll"
 				};
 
@@ -180,12 +187,22 @@ private async Task<Call> ResolveCallAsync(ChatbotIntent intent, int departmentId
 			return activeCalls?.Count == 1 ? activeCalls[0] : null;
 		}
 
-		private static bool BucketMatches(ResponderBucket bucket, string mode)
+		private static ResponderMode ParseResponderMode(string value)
+		{
+			var normalized = value?.Trim();
+			return !int.TryParse(normalized, out _)
+				&& Enum.TryParse(normalized, true, out ResponderMode mode)
+				&& Enum.IsDefined(typeof(ResponderMode), mode)
+					? mode
+					: ResponderMode.All;
+		}
+
+		private static bool BucketMatches(ResponderBucket bucket, ResponderMode mode)
 		{
 			return mode switch
 			{
-				"enroute" => bucket == ResponderBucket.EnRoute,
-				"onscene" => bucket == ResponderBucket.OnScene,
+				ResponderMode.EnRoute => bucket == ResponderBucket.EnRoute,
+				ResponderMode.OnScene => bucket == ResponderBucket.OnScene,
 				_ => bucket != ResponderBucket.None
 			};
 		}

Core/Resgrid.Chatbot/Handlers/MyCallsActionHandler.cs

@@ -20,7 +20,7 @@ namespace Resgrid.Chatbot.Handlers
 	/// </summary>
 	public class MyCallsActionHandler : IChatbotActionHandler
 	{
-		private const int MaxActiveCallsToScan = 25;
+		private const int MaxConcurrentCallPopulations = 5;
 		private const int MaxCallsToList = 10;
 
 		private readonly ICallsService _callsService;
@@ -118,9 +118,10 @@ private async Task<List<Call>> GetActiveCallsWithDispatchesAsync(int departmentI
 			var activeCalls = await _callsService.GetActiveCallsByDepartmentAsync(departmentId);
 			var populated = new List<Call>();
 
-			foreach (var call in (activeCalls ?? new List<Call>()).OrderByDescending(c => c.LoggedOn).Take(MaxActiveCallsToScan))
+			var orderedCalls = (activeCalls ?? new List<Call>()).OrderByDescending(c => c.LoggedOn);
+			foreach (var batch in orderedCalls.Chunk(MaxConcurrentCallPopulations))
 			{
-				populated.Add(await _callsService.PopulateCallData(call,
+				var populatedBatch = await Task.WhenAll(batch.Select(call => _callsService.PopulateCallData(call,
 					getDispatches: !forUnits,
 					getAttachments: false,
 					getNotes: false,
@@ -129,7 +130,8 @@ private async Task<List<Call>> GetActiveCallsWithDispatchesAsync(int departmentI
 					getRoleDispatches: false,
 					getProtocols: false,
 					getReferences: false,
-					getContacts: false));
+					getContacts: false)));
+				populated.AddRange(populatedBatch);
 			}
 
 			return populated;

Core/Resgrid.Chatbot/Handlers/MyScheduleActionHandler.cs

@@ -40,17 +40,18 @@ public MyScheduleActionHandler(
 		public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIntent intent, ChatbotSession session)
 		{
 			var culture = session.Culture;
+			var cultureInfo = CultureInfo.GetCultureInfo(ChatbotResources.NormalizeCulture(culture));
 			try
 			{
 				var department = await _departmentsService.GetDepartmentByIdAsync(session.DepartmentId);
 				var nowLocal = DateTime.UtcNow.TimeConverter(department);
 
 				intent.Parameters.TryGetValue("day", out var dayText);
-				var targetDate = ParseDay(dayText, nowLocal);
+				var targetDate = ParseDay(dayText, nowLocal, cultureInfo);
 				if (targetDate == null)
 					return new ChatbotResponse { Text = ChatbotResources.Get("Sched_BadDate", culture), Processed = false };
 
-				var dateLabel = targetDate.Value.ToString("ddd M/d", CultureInfo.InvariantCulture);
+				var dateLabel = targetDate.Value.ToString("ddd M/d", cultureInfo);
 				var lines = new List<string>();
 
 				// Shifts: shift days on the target date the user is assigned to (shift personnel) or has
@@ -73,7 +74,7 @@ public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIn
 							continue;
 
 						var shift = shiftDay.Shift ?? await _shiftsService.GetShiftByIdAsync(shiftDay.ShiftId);
-						var times = $"{shiftDay.Start:t} - {shiftDay.End:t}";
+						var times = $"{shiftDay.Start.ToString("t", cultureInfo)} - {shiftDay.End.ToString("t", cultureInfo)}";
 						lines.Add(ChatbotResources.Get("Sched_ShiftLine", culture, shift?.Name ?? $"Shift {shiftDay.ShiftId}", times));
 					}
 				}
@@ -95,7 +96,7 @@ public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIn
 					if (attendee == null || attendee.AttendeeType == (int)CalendarItemAttendeeTypes.NotAttending)
 						continue;
 
-					var timeText = item.IsAllDay ? ChatbotResources.Get("Sched_AllDay", culture) : startLocal.ToString("t");
+					var timeText = item.IsAllDay ? ChatbotResources.Get("Sched_AllDay", culture) : startLocal.ToString("t", cultureInfo);
 					lines.Add(ChatbotResources.Get("Sched_EventLine", culture, timeText, item.Title?.Truncate(50)));
 				}
 
@@ -119,33 +120,41 @@ public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIn
 
 		// Accepts: empty (today), "today", "tomorrow", a weekday name (next occurrence, today included),
 		// or a date ("7/22", "7/22/2026", "2026-07-22"). Returns null when unparseable.
-		private static DateTime? ParseDay(string dayText, DateTime nowLocal)
+		private static DateTime? ParseDay(string dayText, DateTime nowLocal, CultureInfo cultureInfo)
 		{
 			if (string.IsNullOrWhiteSpace(dayText))
 				return nowLocal.Date;
 
-			var text = dayText.Trim().TrimEnd('?', '!', '.', ',').ToLowerInvariant();
+			var text = dayText.Trim().TrimEnd('?', '!', '.', ',');
 
-			if (text == "today")
+			if (string.Equals(text, "today", StringComparison.OrdinalIgnoreCase))
 				return nowLocal.Date;
-			if (text == "tomorrow")
+			if (string.Equals(text, "tomorrow", StringComparison.OrdinalIgnoreCase))
 				return nowLocal.Date.AddDays(1);
 
 			foreach (DayOfWeek dow in Enum.GetValues(typeof(DayOfWeek)))
 			{
-				var name = dow.ToString().ToLowerInvariant();
-				if (text == name || text == name.Substring(0, 3))
+				var englishName = dow.ToString();
+				var localizedName = cultureInfo.DateTimeFormat.GetDayName(dow);
+				var localizedAbbreviation = cultureInfo.DateTimeFormat.GetAbbreviatedDayName(dow).TrimEnd('.');
+				if (string.Equals(text, englishName, StringComparison.OrdinalIgnoreCase)
+					|| string.Equals(text, englishName.Substring(0, 3), StringComparison.OrdinalIgnoreCase)
+					|| cultureInfo.CompareInfo.Compare(text, localizedName, CompareOptions.IgnoreCase) == 0
+					|| cultureInfo.CompareInfo.Compare(text, localizedAbbreviation, CompareOptions.IgnoreCase) == 0)
 				{
 					var daysAhead = ((int)dow - (int)nowLocal.DayOfWeek + 7) % 7;
 					return nowLocal.Date.AddDays(daysAhead);
 				}
 			}
 
-			if (DateTime.TryParse(text, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsed))
+			if (DateTime.TryParse(text, cultureInfo, DateTimeStyles.None, out var parsed))
 			{
 				// "7/22" parses with the current year; a date months in the past most likely means next
 				// year (people ask about upcoming days).
-				if (parsed.Date < nowLocal.Date.AddMonths(-1) && !text.Any(char.IsLetter) && text.Count(c => c == '/') == 1)
+				var dateSeparator = cultureInfo.DateTimeFormat.DateSeparator;
+				var hasSingleDateSeparator = !string.IsNullOrEmpty(dateSeparator)
+					&& text.Split(new[] { dateSeparator }, StringSplitOptions.None).Length == 2;
+				if (parsed.Date < nowLocal.Date.AddMonths(-1) && !text.Any(char.IsLetter) && hasSingleDateSeparator)
 					parsed = parsed.AddYears(1);
 				return parsed.Date;
 			}

Core/Resgrid.Chatbot/Handlers/PollCreateHandler.cs

@@ -7,6 +7,7 @@
 using Resgrid.Chatbot.Models;
 using Resgrid.Framework;
 using Resgrid.Model;
+using Resgrid.Model.Messages;
 using Resgrid.Model.Services;
 
 namespace Resgrid.Chatbot.Handlers
@@ -93,7 +94,10 @@ public async Task<ChatbotResponse> HandleAsync(ChatbotMessage message, ChatbotIn
 				};
 
 				foreach (var userId in recipients)
+				{
 					msg.AddRecipient(userId);
+					msg.MessageRecipients.Last().Note = TextResponsePromptMetadata.ForPoll(session.DepartmentId);
+				}
 
 				var saved = await _messageService.SaveMessageAsync(msg);
 				await _messageService.SendMessageAsync(saved, senderName, session.DepartmentId);

Core/Resgrid.Chatbot/Handlers/RespondToCallHandler.cs

@@ -118,7 +118,7 @@ private async Task<Call> ResolveMostRecentDispatchAsync(string userId, int depar
 					? null
 					: ResolveDispatchTimestamp(dispatch.LastDispatchedOn, dispatch.DispatchedOn, call);
 
-				if (dispatch == null && _departmentGroupsService != null)
+				if (_departmentGroupsService != null)
 				{
 					foreach (var groupDispatch in call?.GroupDispatches ?? new List<CallDispatchGroup>())
 					{
@@ -135,7 +135,7 @@ private async Task<Call> ResolveMostRecentDispatchAsync(string userId, int depar
 					}
 				}
 
-				if (dispatch == null && _personnelRolesService != null && call?.RoleDispatches?.Any() == true)
+				if (_personnelRolesService != null && call?.RoleDispatches?.Any() == true)
 				{
 					if (userRoleIds == null)
 					{

Core/Resgrid.Chatbot/Handlers/StaffingActionHandler.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Resgrid.Chatbot.Interfaces;
 using Resgrid.Chatbot.Localization;
@@ -113,10 +112,6 @@ private async Task<CustomStateDetail> ResolveStaffingIdAsync(int departmentId, i
 			if (match != null)
 				return match;
 
-			var active = levels?.Where(x => x != null && !x.IsDeleted).OrderBy(x => x.Order).ToList();
-			if (active != null && staffingId >= 0 && staffingId < active.Count)
-				return active[staffingId];
-
 			return levels == null || levels.Count == 0 ? fallback : null;
 		}
 

Core/Resgrid.Chatbot/Interfaces/IChatbotSessionManager.cs

@@ -5,7 +5,8 @@ namespace Resgrid.Chatbot.Interfaces
 {
 	public interface IChatbotSessionManager
 	{
-		Task<ChatbotSession> GetOrCreateSessionAsync(string userId, int departmentId, ChatbotPlatform platform, string fromIdentifier);
+		Task<ChatbotSession> GetOrCreateSessionAsync(string userId, int departmentId, ChatbotPlatform platform,
+			string fromIdentifier, int ttlMinutes = 0);
 		Task<ChatbotSession> GetSessionAsync(string sessionId);
 		Task SaveSessionAsync(ChatbotSession session);
 		Task EndSessionAsync(string sessionId);

Core/Resgrid.Chatbot/Interfaces/IChatbotSessionStore.cs

@@ -6,7 +6,8 @@ namespace Resgrid.Chatbot.Interfaces
 {
 	public interface IChatbotSessionStore
 	{
-		Task<ChatbotSession> GetOrCreateAsync(string userId, int departmentId, ChatbotPlatform platform, string identifier);
+		Task<ChatbotSession> GetOrCreateAsync(string userId, int departmentId, ChatbotPlatform platform,
+			string identifier, int ttlMinutes = 0);
 		Task<ChatbotSession> GetAsync(string sessionId);
 		Task SaveAsync(ChatbotSession session);
 		Task DeleteAsync(string sessionId);