diff --git a/src/Apollo.Application/ToDos/FuzzyTimeParser.cs b/src/Apollo.Application/ToDos/FuzzyTimeParser.cs index 8d909c9d..04443992 100644 --- a/src/Apollo.Application/ToDos/FuzzyTimeParser.cs +++ b/src/Apollo.Application/ToDos/FuzzyTimeParser.cs @@ -24,19 +24,22 @@ public sealed class FuzzyTimeParser : IFuzzyTimeParser { private static readonly IReadOnlyList Parsers = DiscoverParsers(); - public Result TryParseFuzzyTime(string input, DateTime referenceTimeUtc) + public Result TryParseFuzzyTime(string input, DateTime referenceTimeUtc, string? userTimeZoneId = null) { if (string.IsNullOrWhiteSpace(input)) { return Result.Fail("Input is empty or whitespace"); } - var reference = referenceTimeUtc.Kind == DateTimeKind.Utc + var utcReference = referenceTimeUtc.Kind == DateTimeKind.Utc ? referenceTimeUtc : DateTime.SpecifyKind(referenceTimeUtc, DateTimeKind.Utc); + var localReference = GetLocalReferenceTime(utcReference, userTimeZoneId); + foreach (var parser in Parsers) { + var reference = parser is IUsesUtcReferenceTimeExpressionParser ? utcReference : localReference; var result = parser.TryParse(input, reference); if (result.IsSuccess) { @@ -60,4 +63,27 @@ private static List DiscoverParsers() && t.IsDefined(attributeType, inherit: false)) .Select(t => (ITimeExpressionParser)Activator.CreateInstance(t)!)]; } + + private static DateTime GetLocalReferenceTime(DateTime utcReference, string? userTimeZoneId) + { + if (string.IsNullOrWhiteSpace(userTimeZoneId)) + { + return utcReference; + } + + try + { + var timeZone = TimeZoneInfo.FindSystemTimeZoneById(userTimeZoneId); + var localReference = TimeZoneInfo.ConvertTimeFromUtc(utcReference, timeZone); + return DateTime.SpecifyKind(localReference, DateTimeKind.Unspecified); + } + catch (TimeZoneNotFoundException) + { + return utcReference; + } + catch (InvalidTimeZoneException) + { + return utcReference; + } + } } diff --git a/src/Apollo.Application/ToDos/Parsers/ClockTimeParser.cs b/src/Apollo.Application/ToDos/Parsers/ClockTimeParser.cs index 348a8748..e97a090c 100644 --- a/src/Apollo.Application/ToDos/Parsers/ClockTimeParser.cs +++ b/src/Apollo.Application/ToDos/Parsers/ClockTimeParser.cs @@ -42,11 +42,11 @@ private static Result ResolveTimeAlias(string timeStr, DateTime refere return timeStr switch { - "noon" => Result.Ok(TimeParserHelpers.EnsureUtc(reference.Date.AddHours(12))), - "midnight" => Result.Ok(TimeParserHelpers.EnsureUtc(reference.Date.AddDays(1))), + "noon" => Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(reference.Date.AddHours(12))), + "midnight" => Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(reference.Date.AddDays(1))), _ => TimeParserHelpers.ParseTimeOfDay(timeStr) switch { - { IsSuccess: true } timeResult => Result.Ok(TimeParserHelpers.EnsureUtc(reference.Date.Add(timeResult.Value))), + { IsSuccess: true } timeResult => Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(reference.Date.Add(timeResult.Value))), _ => Result.Fail($"Could not resolve clock time '{timeStr}'") } }; diff --git a/src/Apollo.Application/ToDos/Parsers/DayOfWeekParser.cs b/src/Apollo.Application/ToDos/Parsers/DayOfWeekParser.cs index 8dedb33e..5d5216ad 100644 --- a/src/Apollo.Application/ToDos/Parsers/DayOfWeekParser.cs +++ b/src/Apollo.Application/ToDos/Parsers/DayOfWeekParser.cs @@ -31,7 +31,7 @@ public Result TryParse(string input, DateTime referenceTimeUtc) { if (NextWeekPattern().IsMatch(input)) { - return Result.Ok(TimeParserHelpers.EnsureUtc(referenceTimeUtc.AddDays(7))); + return Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(referenceTimeUtc.AddDays(7))); } var dayMatch = DayPattern().Match(input); @@ -56,6 +56,6 @@ private static Result ResolveDayMatch(Match match, DateTime reference) } } - return Result.Ok(TimeParserHelpers.EnsureUtc(date)); + return Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(date)); } } diff --git a/src/Apollo.Application/ToDos/Parsers/DurationParser.cs b/src/Apollo.Application/ToDos/Parsers/DurationParser.cs index 01a8fd00..e9236805 100644 --- a/src/Apollo.Application/ToDos/Parsers/DurationParser.cs +++ b/src/Apollo.Application/ToDos/Parsers/DurationParser.cs @@ -13,7 +13,7 @@ namespace Apollo.Application.ToDos.Parsers; /// "5 minutes", "2 hours". /// [TimeExpressionParser] -public sealed partial class DurationParser : ITimeExpressionParser +public sealed partial class DurationParser : ITimeExpressionParser, IUsesUtcReferenceTimeExpressionParser { // "in N unit" — minutes, hours, days, weeks with common abbreviations [GeneratedRegex( diff --git a/src/Apollo.Application/ToDos/Parsers/EndOfPeriodParser.cs b/src/Apollo.Application/ToDos/Parsers/EndOfPeriodParser.cs index 3c34223b..ebf67785 100644 --- a/src/Apollo.Application/ToDos/Parsers/EndOfPeriodParser.cs +++ b/src/Apollo.Application/ToDos/Parsers/EndOfPeriodParser.cs @@ -23,7 +23,7 @@ public Result TryParse(string input, DateTime referenceTimeUtc) { if (EndOfDayPattern().IsMatch(input)) { - return Result.Ok(TimeParserHelpers.EnsureUtc(referenceTimeUtc.Date.AddHours(17))); + return Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(referenceTimeUtc.Date.AddHours(17))); } if (EndOfWeekPattern().IsMatch(input)) @@ -34,7 +34,7 @@ public Result TryParse(string input, DateTime referenceTimeUtc) daysUntilFriday = 7; } var endOfWeek = referenceTimeUtc.Date.AddDays(daysUntilFriday).AddHours(17); - return Result.Ok(TimeParserHelpers.EnsureUtc(endOfWeek)); + return Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(endOfWeek)); } return Result.Fail($"'{input}' is not an end-of-period expression"); diff --git a/src/Apollo.Application/ToDos/Parsers/TimeOfDayAliasParser.cs b/src/Apollo.Application/ToDos/Parsers/TimeOfDayAliasParser.cs index 7c6b654d..a5a1a03a 100644 --- a/src/Apollo.Application/ToDos/Parsers/TimeOfDayAliasParser.cs +++ b/src/Apollo.Application/ToDos/Parsers/TimeOfDayAliasParser.cs @@ -27,7 +27,7 @@ public Result TryParse(string input, DateTime referenceTimeUtc) if (match.Groups["tonight"].Success) { - return Result.Ok(TimeParserHelpers.EnsureUtc(referenceTimeUtc.Date.AddHours(20))); + return Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(referenceTimeUtc.Date.AddHours(20))); } var hours = match.Groups["period"].Value.ToLowerInvariant() switch @@ -38,6 +38,6 @@ public Result TryParse(string input, DateTime referenceTimeUtc) _ => 12 }; - return Result.Ok(TimeParserHelpers.EnsureUtc(referenceTimeUtc.Date.AddHours(hours))); + return Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(referenceTimeUtc.Date.AddHours(hours))); } } diff --git a/src/Apollo.Application/ToDos/Parsers/TimeParserHelpers.cs b/src/Apollo.Application/ToDos/Parsers/TimeParserHelpers.cs index f947c00a..f3998007 100644 --- a/src/Apollo.Application/ToDos/Parsers/TimeParserHelpers.cs +++ b/src/Apollo.Application/ToDos/Parsers/TimeParserHelpers.cs @@ -69,4 +69,11 @@ internal static DateTime EnsureUtc(DateTime dt) _ => dt }; } + + internal static DateTime KeepUtcElseUseUnspecified(DateTime dt) + { + return dt.Kind == DateTimeKind.Utc + ? dt + : DateTime.SpecifyKind(dt, DateTimeKind.Unspecified); + } } diff --git a/src/Apollo.Application/ToDos/Parsers/TomorrowParser.cs b/src/Apollo.Application/ToDos/Parsers/TomorrowParser.cs index 661ecb36..17ed9bfb 100644 --- a/src/Apollo.Application/ToDos/Parsers/TomorrowParser.cs +++ b/src/Apollo.Application/ToDos/Parsers/TomorrowParser.cs @@ -35,7 +35,7 @@ public Result TryParse(string input, DateTime referenceTimeUtc) if (timeResult.IsSuccess) { var dt = referenceTimeUtc.Date.AddDays(1).Add(timeResult.Value); - return Result.Ok(TimeParserHelpers.EnsureUtc(dt)); + return Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(dt)); } } @@ -50,11 +50,11 @@ public Result TryParse(string input, DateTime referenceTimeUtc) _ => 9 }; var dt = referenceTimeUtc.Date.AddDays(1).AddHours(hours); - return Result.Ok(TimeParserHelpers.EnsureUtc(dt)); + return Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(dt)); } return TomorrowPattern().IsMatch(input) - ? Result.Ok(TimeParserHelpers.EnsureUtc(referenceTimeUtc.AddDays(1))) + ? Result.Ok(TimeParserHelpers.KeepUtcElseUseUnspecified(referenceTimeUtc.AddDays(1))) : Result.Fail($"'{input}' is not a tomorrow expression"); } } diff --git a/src/Apollo.Application/ToDos/TimeParsingService.cs b/src/Apollo.Application/ToDos/TimeParsingService.cs index 7c2d0a2e..f00155fd 100644 --- a/src/Apollo.Application/ToDos/TimeParsingService.cs +++ b/src/Apollo.Application/ToDos/TimeParsingService.cs @@ -51,7 +51,7 @@ public async Task> ParseTimeAsync( var now = timeProvider.GetUtcNow().UtcDateTime; // Step 1: Try FuzzyTimeParser (natural language patterns) - var fuzzyResult = fuzzyTimeParser.TryParseFuzzyTime(input, now); + var fuzzyResult = fuzzyTimeParser.TryParseFuzzyTime(input, now, userTimeZoneId); if (fuzzyResult.IsSuccess) { var utcFuzzy = ConvertToUtc(fuzzyResult.Value, userTimeZoneId); @@ -174,5 +174,9 @@ private static DateTime ConvertUnspecifiedToUtc(DateTime parsedDate, string? use { return DateTime.SpecifyKind(parsedDate, DateTimeKind.Utc); } + catch (ArgumentException) + { + return DateTime.SpecifyKind(parsedDate, DateTimeKind.Utc); + } } } diff --git a/src/Apollo.Core/ToDos/IFuzzyTimeParser.cs b/src/Apollo.Core/ToDos/IFuzzyTimeParser.cs index a05dfa8b..cc918222 100644 --- a/src/Apollo.Core/ToDos/IFuzzyTimeParser.cs +++ b/src/Apollo.Core/ToDos/IFuzzyTimeParser.cs @@ -11,7 +11,8 @@ public interface IFuzzyTimeParser /// Attempts to parse a fuzzy time expression. /// /// The input string to parse (e.g., "in 10 minutes", "tomorrow") - /// The reference time to calculate relative times from (should be UTC) - /// A Result containing the parsed UTC DateTime if successful, or failure if the input is not a recognized fuzzy time format - Result TryParseFuzzyTime(string input, DateTime referenceTimeUtc); + /// The UTC reference time used for relative duration expressions. + /// The user's timezone used to interpret wall-clock expressions like "tomorrow at 3pm". + /// A Result containing the parsed DateTime if successful, or failure if the input is not a recognized fuzzy time format. + Result TryParseFuzzyTime(string input, DateTime referenceTimeUtc, string? userTimeZoneId = null); } diff --git a/src/Apollo.Core/ToDos/IUsesUtcReferenceTimeExpressionParser.cs b/src/Apollo.Core/ToDos/IUsesUtcReferenceTimeExpressionParser.cs new file mode 100644 index 00000000..5858856d --- /dev/null +++ b/src/Apollo.Core/ToDos/IUsesUtcReferenceTimeExpressionParser.cs @@ -0,0 +1,6 @@ +namespace Apollo.Core.ToDos; + +/// +/// Marks fuzzy time parsers that should evaluate relative expressions against a UTC reference. +/// +public interface IUsesUtcReferenceTimeExpressionParser; diff --git a/tests/Apollo.Application.Tests/ToDos/FuzzyTimeParserTests.cs b/tests/Apollo.Application.Tests/ToDos/FuzzyTimeParserTests.cs index 6f86a374..ac6e82dc 100644 --- a/tests/Apollo.Application.Tests/ToDos/FuzzyTimeParserTests.cs +++ b/tests/Apollo.Application.Tests/ToDos/FuzzyTimeParserTests.cs @@ -63,13 +63,35 @@ public void TryParseFuzzyTimePreservesUtcKindFromReference() } [Fact] - public void TryParseFuzzyTimeConvertsUnspecifiedKindToUtc() + public void TryParseFuzzyTimeWithTimezoneUsesLocalReferenceForWallClockExpressions() { - var unspecifiedReference = new DateTime(2025, 12, 30, 12, 0, 0, DateTimeKind.Unspecified); + var utcReference = new DateTime(2025, 12, 30, 1, 30, 0, DateTimeKind.Utc); - var result = _parser.TryParseFuzzyTime("in 10 minutes", unspecifiedReference); + var result = _parser.TryParseFuzzyTime("tomorrow at 3pm", utcReference, "America/Chicago"); Assert.True(result.IsSuccess); - Assert.Equal(DateTimeKind.Utc, result.Value.Kind); + Assert.Equal(new DateTime(2025, 12, 30, 15, 0, 0, DateTimeKind.Unspecified), result.Value); + } + + [Fact] + public void TryParseFuzzyTimeWithTimezoneKeepsUtcReferenceForDurations() + { + var utcReference = new DateTime(2025, 12, 30, 1, 30, 0, DateTimeKind.Utc); + + var result = _parser.TryParseFuzzyTime("in 10 minutes", utcReference, "America/Chicago"); + + Assert.True(result.IsSuccess); + Assert.Equal(new DateTime(2025, 12, 30, 1, 40, 0, DateTimeKind.Utc), result.Value); + } + + [Fact] + public void TryParseFuzzyTimeWithTimezoneKeepsLocalReferenceForNextWeek() + { + var utcReference = new DateTime(2025, 12, 30, 1, 30, 0, DateTimeKind.Utc); + + var result = _parser.TryParseFuzzyTime("next week", utcReference, "America/Chicago"); + + Assert.True(result.IsSuccess); + Assert.Equal(new DateTime(2026, 1, 5, 19, 30, 0, DateTimeKind.Unspecified), result.Value); } } diff --git a/tests/Apollo.Application.Tests/ToDos/TimeParsingServiceTests.cs b/tests/Apollo.Application.Tests/ToDos/TimeParsingServiceTests.cs index 058b062e..5160be36 100644 --- a/tests/Apollo.Application.Tests/ToDos/TimeParsingServiceTests.cs +++ b/tests/Apollo.Application.Tests/ToDos/TimeParsingServiceTests.cs @@ -30,7 +30,7 @@ public async Task ParseTimeAsyncWithFuzzyTimeReturnsParsedUtcDateTimeAsync() // Arrange var expected = ReferenceTime.AddMinutes(10); _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime("in 10 minutes", ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime("in 10 minutes", ReferenceTime, null)) .Returns(Result.Ok(expected)); // Act @@ -39,7 +39,7 @@ public async Task ParseTimeAsyncWithFuzzyTimeReturnsParsedUtcDateTimeAsync() // Assert Assert.True(result.IsSuccess); Assert.Equal(expected, result.Value); - _fuzzyTimeParser.Verify(p => p.TryParseFuzzyTime("in 10 minutes", ReferenceTime), Times.Once); + _fuzzyTimeParser.Verify(p => p.TryParseFuzzyTime("in 10 minutes", ReferenceTime, null), Times.Once); } [Theory] @@ -50,7 +50,7 @@ public async Task ParseTimeAsyncWithIso8601ReturnsUtcDateTimeAsync(string input) { // Arrange - fuzzy parser fails _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); // Act @@ -69,7 +69,7 @@ public async Task ParseTimeAsyncWithCommonTimeFormatReturnsUtcDateTimeAsync( { // Arrange - fuzzy parser fails _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); // Act @@ -93,7 +93,7 @@ public async Task ParseTimeAsyncWithTimeOnlyInputAndTimezoneAnchorsToTodayInUser { // Arrange - fuzzy parser fails _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, timezone)) .Returns(Result.Fail("Not fuzzy")); // Act @@ -116,7 +116,7 @@ public async Task ParseTimeAsyncWithDateTimeReturnsParsedDateTimeAsync(string in { // Arrange - fuzzy parser fails _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); // Act @@ -135,7 +135,7 @@ public async Task ParseTimeAsyncWithInvalidInputCallsLlmFallbackAsync() // Arrange - fuzzy parser fails, C# parsing fails, LLM returns UNPARSEABLE const string input = "not a time at all"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); var mockBuilder = new Mock(); @@ -158,7 +158,7 @@ public async Task ParseTimeAsyncWithUserTimeZoneConvertsToUtcAsync() // Arrange - fuzzy parser fails, falls through to C# parsing const string input = "2025-12-31T10:00:00"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, "America/Chicago")) .Returns(Result.Fail("Not fuzzy")); // Act - America/Chicago is UTC-6 @@ -176,7 +176,7 @@ public async Task ParseTimeAsyncWithoutUserTimeZoneAssumesUtcAsync() // Arrange - fuzzy parser fails const string input = "2025-12-31T10:00:00"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); // Act - no timezone specified @@ -194,7 +194,7 @@ public async Task ParseTimeAsyncWithUnspecifiedKindTreatsAsUserLocalAsync() // Arrange - fuzzy parser fails, a date without explicit kind const string input = "Dec 31, 2025"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, "America/New_York")) .Returns(Result.Fail("Not fuzzy")); // Act - with timezone @@ -217,7 +217,7 @@ public async Task ParseTimeAsyncWithEmptyInputReturnsFailureAsync(string? input) // Assert Assert.True(result.IsFailed); - _fuzzyTimeParser.Verify(p => p.TryParseFuzzyTime(It.IsAny(), It.IsAny()), Times.Never); + _fuzzyTimeParser.Verify(p => p.TryParseFuzzyTime(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); } [Fact] @@ -226,7 +226,7 @@ public async Task ParseTimeAsyncDoesNotCallLlmWhenFuzzyParserSucceedsAsync() // Arrange var expected = ReferenceTime.AddHours(1); _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime("in an hour", ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime("in an hour", ReferenceTime, null)) .Returns(Result.Ok(expected)); // Act @@ -235,7 +235,7 @@ public async Task ParseTimeAsyncDoesNotCallLlmWhenFuzzyParserSucceedsAsync() // Assert Assert.True(result.IsSuccess); Assert.Equal(expected, result.Value); - _fuzzyTimeParser.Verify(p => p.TryParseFuzzyTime("in an hour", ReferenceTime), Times.Once); + _fuzzyTimeParser.Verify(p => p.TryParseFuzzyTime("in an hour", ReferenceTime, null), Times.Once); _aiAgent.Verify(a => a.CreateTimeParsingRequestAsync(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); } @@ -246,7 +246,7 @@ public async Task ParseTimeAsyncDoesNotCallLlmWhenCSharpParseSucceedsAsync() // Arrange - fuzzy parser fails, but C# parsing succeeds const string input = "2025-12-31T10:00:00"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); // Act @@ -264,7 +264,7 @@ public async Task ParseTimeAsyncWhenAllParsersFallsBackToLlmReturnsUtcDateTimeAs // Arrange - fuzzy and C# parsers fail, LLM succeeds const string input = "day after tomorrow at 5pm"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); var mockBuilder = new Mock(); @@ -287,7 +287,7 @@ public async Task ParseTimeAsyncWhenLlmReturnsUnparseableReturnsFailureAsync() // Arrange const string input = "buy groceries"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); var mockBuilder = new Mock(); @@ -310,7 +310,7 @@ public async Task ParseTimeAsyncWhenLlmReturnsInvalidFormatReturnsFailureAsync() // Arrange const string input = "some weird expression"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); var mockBuilder = new Mock(); @@ -333,7 +333,7 @@ public async Task ParseTimeAsyncWhenLlmFailsReturnsFailureAsync() // Arrange const string input = "something complex"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); var mockBuilder = new Mock(); @@ -357,7 +357,7 @@ public async Task ParseTimeAsyncWithFuzzyTimeAndUserTimezoneConvertsToUtcAsync() // "tomorrow at 3pm" → fuzzy returns 2025-12-31T15:00:00 with Unspecified kind var fuzzyParsed = new DateTime(2025, 12, 31, 15, 0, 0, DateTimeKind.Unspecified); _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime("tomorrow at 3pm", ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime("tomorrow at 3pm", ReferenceTime, "America/Chicago")) .Returns(Result.Ok(fuzzyParsed)); // Act — America/Chicago is UTC-6 in winter @@ -368,13 +368,29 @@ public async Task ParseTimeAsyncWithFuzzyTimeAndUserTimezoneConvertsToUtcAsync() Assert.Equal(new DateTime(2025, 12, 31, 21, 0, 0, DateTimeKind.Utc), result.Value); } + [Fact] + public async Task ParseTimeAsyncWithFuzzyTomorrowUsesUserTimezoneForDayBoundaryAsync() + { + var boundaryReference = new DateTime(2025, 12, 30, 1, 30, 0, DateTimeKind.Utc); + var boundaryTimeProvider = new Mock(); + _ = boundaryTimeProvider.Setup(tp => tp.GetUtcNow()).Returns(new DateTimeOffset(boundaryReference)); + + var parser = new FuzzyTimeParser(); + var service = new TimeParsingService(parser, _aiAgent.Object, boundaryTimeProvider.Object); + + var result = await service.ParseTimeAsync("tomorrow at 3pm", "America/Chicago"); + + Assert.True(result.IsSuccess); + Assert.Equal(new DateTime(2025, 12, 30, 21, 0, 0, DateTimeKind.Utc), result.Value); + } + [Fact] public async Task ParseTimeAsyncWithFuzzyTimeAndNoTimezoneReturnsUtcDirectlyAsync() { // Arrange — fuzzy parser returns UTC time (relative durations) var expected = new DateTime(2025, 12, 30, 14, 40, 0, DateTimeKind.Utc); _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime("in 10 minutes", ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime("in 10 minutes", ReferenceTime, null)) .Returns(Result.Ok(expected)); // Act — no timezone provided @@ -391,7 +407,7 @@ public async Task ParseTimeAsyncWithIso8601ZSuffixReturnsUtcKindAsync() // Arrange — fuzzy parser fails const string input = "2025-12-31T10:00:00Z"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); // Act @@ -408,7 +424,7 @@ public async Task ParseTimeAsyncWithIso8601OffsetConvertsToUtcAsync() // Arrange — fuzzy parser fails const string input = "2025-12-31T10:00:00-05:00"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, null)) .Returns(Result.Fail("Not fuzzy")); // Act @@ -425,7 +441,7 @@ public async Task ParseTimeAsyncWithInvalidTimezoneIdFallsBackToUtcAsync() // Arrange — fuzzy parser fails, C# parsing succeeds with Unspecified kind const string input = "2025-12-31T10:00:00"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, "Invalid/Timezone")) .Returns(Result.Fail("Not fuzzy")); // Act — invalid timezone should not throw, should fallback to UTC @@ -442,7 +458,7 @@ public async Task ParseTimeAsyncWithEmptyTimezoneIdTreatsAsUtcAsync() // Arrange — fuzzy parser fails, C# parsing succeeds const string input = "2025-12-31T10:00:00"; _ = _fuzzyTimeParser - .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime)) + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, " ")) .Returns(Result.Fail("Not fuzzy")); // Act — empty string timezone should behave like null @@ -452,4 +468,18 @@ public async Task ParseTimeAsyncWithEmptyTimezoneIdTreatsAsUtcAsync() Assert.True(result.IsSuccess); Assert.Equal(new DateTime(2025, 12, 31, 10, 0, 0, DateTimeKind.Utc), result.Value); } + + [Fact] + public async Task ParseTimeAsyncWithInvalidLocalTimeFallsBackToUtcAsync() + { + const string input = "2025-03-09T02:30:00"; + _ = _fuzzyTimeParser + .Setup(p => p.TryParseFuzzyTime(input, ReferenceTime, "America/Chicago")) + .Returns(Result.Fail("Not fuzzy")); + + var result = await _service.ParseTimeAsync(input, "America/Chicago"); + + Assert.True(result.IsSuccess); + Assert.Equal(new DateTime(2025, 3, 9, 2, 30, 0, DateTimeKind.Utc), result.Value); + } }