Merge branch 'main' of https://github.com/ScottArbeit/Grace

Author: Scott Arbeit

src/AGENTS.md

@@ -61,6 +61,68 @@ Optional: `pwsh ./scripts/install-githooks.ps1` to add a pre-commit
 - Format code with `dotnet tool run fantomas --recurse .` (from `./src`) and
   include comprehensive, copy/paste-ready snippets when sharing examples.
 
+### Avoid FS3511 in resumable computation expressions
+
+These rules apply to `task { }` and `backgroundTask { }`.
+
+1. **Do not define `let rec` inside `task { }`.**
+
+   Bad:
+
+   ```fsharp
+   task {
+       let rec poll () = task { return! poll () }
+       return! poll ()
+   }
+   ```
+
+   Good:
+
+   ```fsharp
+   task {
+       let mutable done_ = false
+       while not done_ do
+           done_ <- true
+   }
+   ```
+
+2. **Avoid `for ... in ... do` loops inside `task { }`.**
+
+   Bad:
+
+   ```fsharp
+   task {
+       for item in items do
+           useItem item
+   }
+   ```
+
+   Good:
+
+   ```fsharp
+   task {
+       items |> Seq.iter useItem
+   }
+   ```
+
+3. **Policy: treat FS3511 warnings as regressions (do not suppress).**
+
+   Bad:
+
+   ```xml
+   <PropertyGroup>
+     <NoWarn>FS3511</NoWarn>
+   </PropertyGroup>
+   ```
+
+   Good:
+
+   ```xml
+   <PropertyGroup>
+     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+   </PropertyGroup>
+   ```
+
 ## Agent-Friendly Context Practices
 
 - Start with the relevant `AGENTS.md` file(s) to load key patterns,

src/Directory.Build.props

@@ -5,6 +5,7 @@
         <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
         <AnalysisLevel>latest</AnalysisLevel>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>$(NoWarn);NETSDK1057</NoWarn>
         <PublishProfile>DefaultContainer</PublishProfile>
         <OtherFlags>$(OtherFlags) --test:GraphBasedChecking</OtherFlags>

src/Grace.Actors/AccessControl.Actor.fs

@@ -27,12 +27,11 @@ module AccessControl =
         match scope with
         | Scope.System -> "system"
         | Scope.Owner ownerId -> $"owner:{ownerId}"
-        | Scope.Organization(ownerId, organizationId) -> $"org:{ownerId}:{organizationId}"
-        | Scope.Repository(ownerId, organizationId, repositoryId) -> $"repo:{ownerId}:{organizationId}:{repositoryId}"
-        | Scope.Branch(ownerId, organizationId, repositoryId, branchId) -> $"branch:{ownerId}:{organizationId}:{repositoryId}:{branchId}"
+        | Scope.Organization (ownerId, organizationId) -> $"org:{ownerId}:{organizationId}"
+        | Scope.Repository (ownerId, organizationId, repositoryId) -> $"repo:{ownerId}:{organizationId}:{repositoryId}"
+        | Scope.Branch (ownerId, organizationId, repositoryId, branchId) -> $"branch:{ownerId}:{organizationId}:{repositoryId}:{branchId}"
 
-    type AccessControlActor([<PersistentState(StateName.AccessControl, Grace.Shared.Constants.GraceActorStorage)>] state: IPersistentState<AccessControlState>)
-        =
+    type AccessControlActor([<PersistentState(StateName.AccessControl, Grace.Shared.Constants.GraceActorStorage)>] state: IPersistentState<AccessControlState>) =
         inherit Grain()
 
         let log = loggerFactory.CreateLogger("AccessControl.Actor")
@@ -124,7 +123,7 @@ module AccessControl =
             member this.Handle command metadata =
                 match command with
                 | AccessControlCommand.GrantRole assignment -> this.GrantRole assignment metadata
-                | AccessControlCommand.RevokeRole(principal, roleId) -> this.RevokeRole principal roleId metadata
+                | AccessControlCommand.RevokeRole (principal, roleId) -> this.RevokeRole principal roleId metadata
                 | AccessControlCommand.ListAssignments principal -> this.ListAssignments principal metadata
 
             member this.GetAssignments principal correlationId =

src/Grace.Actors/Branch.Actor.fs

@@ -56,7 +56,9 @@ module ConflictReceipt =
                     state.State.Add(receiptEvent)
                     do! state.WriteStateAsync()
 
-                    receipt <- receipt |> ConflictReceiptDto.UpdateDto receiptEvent
+                    receipt <-
+                        receipt
+                        |> ConflictReceiptDto.UpdateDto receiptEvent
 
                     let graceEvent = GraceEvent.ConflictReceiptEvent receiptEvent
                     do! publishGraceEvent graceEvent receiptEvent.Metadata
@@ -68,7 +70,8 @@ module ConflictReceipt =
                             .enhance (nameof ConflictReceiptEventType, getDiscriminatedUnionFullName receiptEvent.Event)
 
                     return Ok returnValue
-                with ex ->
+                with
+                | ex ->
                     log.LogError(
                         ex,
                         "{CurrentInstant}: Node: {hostName}; CorrelationId: {correlationId}; Failed to apply event {eventType} for conflict receipt {receiptId}.",
@@ -92,7 +95,10 @@ module ConflictReceipt =
         interface IConflictReceiptActor with
             member this.Exists correlationId =
                 this.correlationId <- correlationId
-                (receipt.ConflictReceiptId <> ConflictReceiptId.Empty) |> returnTask
+
+                (receipt.ConflictReceiptId
+                 <> ConflictReceiptId.Empty)
+                |> returnTask
 
             member this.Get correlationId =
                 this.correlationId <- correlationId
@@ -104,7 +110,9 @@ module ConflictReceipt =
 
             member this.GetEvents correlationId =
                 this.correlationId <- correlationId
-                state.State :> IReadOnlyList<ConflictReceiptEvent> |> returnTask
+
+                state.State :> IReadOnlyList<ConflictReceiptEvent>
+                |> returnTask
 
             member this.Handle command metadata =
                 let isValid (command: ConflictReceiptCommand) (metadata: EventMetadata) =
@@ -117,7 +125,8 @@ module ConflictReceipt =
                         else
                             match command with
                             | ConflictReceiptCommand.Create _ ->
-                                if receipt.ConflictReceiptId <> ConflictReceiptId.Empty then
+                                if receipt.ConflictReceiptId
+                                   <> ConflictReceiptId.Empty then
                                     return
                                         Error(
                                             GraceError.Create

src/Grace.Actors/ConflictReceipt.Actor.fs

@@ -76,19 +76,26 @@ module Diff =
                     // Find the entries that changed
                     if
                         newerLookupCache.ContainsKey((fileSystemEntryType, relativePath))
-                        && sha256Hash <> newerLookupCache.Item((fileSystemEntryType, relativePath))
+                        && sha256Hash
+                           <> newerLookupCache.Item((fileSystemEntryType, relativePath))
                     then
                         differences.Add(FileSystemDifference.Create Change fileSystemEntryType relativePath)
 
                     // Find the entries that were deleted
-                    elif not <| newerLookupCache.ContainsKey((fileSystemEntryType, relativePath)) then
+                    elif
+                        not
+                        <| newerLookupCache.ContainsKey((fileSystemEntryType, relativePath))
+                    then
                         differences.Add(FileSystemDifference.Create Delete fileSystemEntryType relativePath)
 
                 // Find the entries that were added
                 for kvp in newerLookupCache do
                     let ((fileSystemEntryType, relativePath), sha256Hash) = kvp.Deconstruct()
 
-                    if not <| olderLookupCache.ContainsKey((fileSystemEntryType, relativePath)) then
+                    if
+                        not
+                        <| olderLookupCache.ContainsKey((fileSystemEntryType, relativePath))
+                    then
                         differences.Add(FileSystemDifference.Create Add fileSystemEntryType relativePath)
 
                 return differences
@@ -114,7 +121,9 @@ module Diff =
 
                 for directoryVersionDto in directoryVersionDtos do
                     let directoryVersion = directoryVersionDto.DirectoryVersion
-                    graceIndex.TryAdd(directoryVersion.RelativePath, directoryVersion) |> ignore
+
+                    graceIndex.TryAdd(directoryVersion.RelativePath, directoryVersion)
+                    |> ignore
 
                 return (graceIndex, directoryCreatedAt)
             }
@@ -211,7 +220,8 @@ module Diff =
                     try
 
                         // If it's already populated, skip this.
-                        if diffDto.DirectoryVersionId1 <> DiffDto.Default.DirectoryVersionId1 then
+                        if diffDto.DirectoryVersionId1
+                           <> DiffDto.Default.DirectoryVersionId1 then
                             return
                                 Ok(
                                     (GraceReturnValue.Create<string> "DiffActor.Compute: already populated." correlationId)
@@ -289,7 +299,7 @@ module Diff =
                                                         let! result2 = getFileStream graceIndex2 difference.RelativePath repositoryDto
 
                                                         match (result1, result2) with
-                                                        | (Ok(fileStream1, fileVersion1), Ok(fileStream2, fileVersion2)) ->
+                                                        | (Ok (fileStream1, fileVersion1), Ok (fileStream2, fileVersion2)) ->
                                                             try
                                                                 // Compare the streams using DiffPlex, and get the Inline and Side-by-Side diffs.
                                                                 let! diffResults =
@@ -347,7 +357,8 @@ module Diff =
                                     Directory1CreatedAt = createdAt1
                                     DirectoryVersionId2 = directoryVersionId2
                                     Directory2CreatedAt = createdAt2
-                                    Differences = differences }
+                                    Differences = differences
+                                }
 
                             state.State <- diffDto
                             do! state.WriteStateAsync()
@@ -372,17 +383,22 @@ module Diff =
                                         .enhance("RepositoryId", $"{diffDto.RepositoryId}")
                                         .enhance ("HasDifferences", $"{diffDto.HasDifferences}")
                                 )
-                    with ex ->
+                    with
+                    | ex ->
                         logToConsole $"Exception in DiffActor.Compute(): {ExceptionResponse.Create ex}"
                         logToConsole $"directoryVersionId1: {diffDto.DirectoryVersionId1}; directoryVersionId2: {diffDto.DirectoryVersionId2}"
 
                         if not <| isNull Activity.Current then
-                            Activity.Current
+                            Activity
+                                .Current
                                 .SetStatus(ActivityStatusCode.Error, "Exception while creating diff.")
                                 .AddTag("ex.Message", ex.Message)
                                 .AddTag("ex.StackTrace", ex.StackTrace)
 
-                                .AddTag("directoryVersionId1", $"{diffDto.DirectoryVersionId1}")
+                                .AddTag(
+                                    "directoryVersionId1",
+                                    $"{diffDto.DirectoryVersionId1}"
+                                )
                                 .AddTag("directoryVersionId2", $"{diffDto.DirectoryVersionId2}")
                             |> ignore
 

src/Grace.Actors/Diff.Actor.fs

@@ -24,7 +24,9 @@ module DirectoryAppearance =
         member val public RepositoryId: RepositoryId = RepositoryId.Empty with get, set
 
     type DirectoryAppearanceActor
-        ([<PersistentState(StateName.DirectoryAppearance, Constants.GraceActorStorage)>] state: IPersistentState<SortedSet<Appearance>>) =
+        (
+            [<PersistentState(StateName.DirectoryAppearance, Constants.GraceActorStorage)>] state: IPersistentState<SortedSet<Appearance>>
+        ) =
         inherit Grain()
 
         let actorName = ActorName.DirectoryAppearance
@@ -74,6 +76,8 @@ module DirectoryAppearance =
                 }
                 :> Task
 
-            member this.Contains appearance correlationId = directoryAppearanceDto.Appearances.Contains(appearance) |> returnTask
+            member this.Contains appearance correlationId =
+                directoryAppearanceDto.Appearances.Contains(appearance)
+                |> returnTask
 
             member this.Appearances correlationId = directoryAppearanceDto.Appearances |> returnTask