Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"}],"string":"[\n {\n \"comment\": \"**<sub><sub></sub></sub> Query the history window around the target reference**\\n\\nWhen `TargetReferenceId` is not among the latest `MaxReferences` refs for the branch, this call only retrieves the newest refs; after appending the older target, `orderedHistoryWindow` has no older ancestors to walk and the annotation is built from the target alone. This makes `/branch/annotate` silently return incomplete or incorrect provenance for older server-known references, so fetch a window that includes the target's ancestors before truncating.\\n\\nUseful? React with 👍 / 👎.\",\n \"path\": \"src/Grace.Server/Branch.Server.fs\",\n \"hunk\": \"@@ -36,6 +41,198 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let private buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId = if index = 0 then None else Some references[index - 1].ReferenceId\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | Ok (Some document) -> effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\\n+ | Ok None ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ let document = { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = false })\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> ordered |> Array.truncate maxReferences\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ ordered[startIndex..targetIndex]\\n+\\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\\n+ task {\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\\n+\\n+ match parameters.Validate() with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\\n+ | Ok () ->\\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\\n+\\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\\n+ let! targetReference = referenceActorProxy.Get correlationId\\n+\\n+ if targetReference.ReferenceId = ReferenceId.Empty then\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\\n+ elif targetReference.DeletedAt.IsSome then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference has been deleted.\\\")\\n+ elif targetReference.RepositoryId\\n+ <> graceIds.RepositoryId\\n+ || targetReference.BranchId <> graceIds.BranchId then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference must belong to the requested repository and branch.\\\")\\n+ else\\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\\n+\\n+ match tryFindFileVersion normalizedPath targetContents with\\n+ | None -> return Error(annotationError correlationId $\\\"Annotation target path '{normalizedPath}' was not found in the target Reference.\\\")\\n+ | Some _ ->\\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId parameters.MaxReferences correlationId\",\n \"resolving_sha\": \"93f43484515f9122613be123e3b784cc6c479469\",\n \"resolving_diff\": \"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\\nindex 31e4d51a..29001878 100644\\n--- a/src/Grace.Server/Branch.Server.fs\\n+++ b/src/Grace.Server/Branch.Server.fs\\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\\n open Grace.Actors.Extensions.ActorProxy\\n open Grace.Actors.Interfaces\\n open Grace.Actors.Services\\n+open Grace.Server.Security\\n open Grace.Server.Services\\n open Grace.Server.Validations\\n open Grace.Shared\\n+open Grace.Shared.AnnotationLineCore\\n open Grace.Shared.Extensions\\n open Grace.Shared.Parameters.Branch\\n open Grace.Types\\n+open Grace.Types.Annotation\\n+open Grace.Types.Authorization\\n open Grace.Types.Branch\\n open Grace.Types.Diff\\n open Grace.Types.Common\\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\\n open Grace.Shared.Validation.Errors\\n open Grace.Shared.Validation.Utilities\\n open Microsoft.AspNetCore.Http\\n+open Microsoft.Extensions.DependencyInjection\\n open Microsoft.Extensions.Logging\\n open System\\n open System.Collections.Concurrent\\n@@ -36,6 +41,350 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ referenceDto.Links\\n+ |> Seq.tryPick (function\\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\\n+ | _ -> None)\\n+\\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some basedOnReferenceId ->\\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\\n+ | _ -> Some basedOnReferenceId\\n+ | None -> None\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let internal unreadableAncestorBoundaryKind = \\\"UnmaterializableAncestor\\\"\\n+\\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\\n+\\n+ let private emptyAnnotationDocument path referenceDto =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\\n+ match materializationResult with\\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\\n+\\n+ let internal buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (targetReferenceId: ReferenceId)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let basedOnByReferenceId =\\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\\n+\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+ |> Array.iter (fun referenceDto ->\\n+ let basedOnReferenceId =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some referenceId -> Some referenceId\\n+ | None ->\\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\\n+ | true, previousReferenceId -> Some previousReferenceId\\n+ | false, _ -> None\\n+\\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\\n+\\n+ result\\n+\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId =\\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, referenceId -> referenceId\\n+ | false, _ -> None\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | materializationResult ->\\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\\n+ | Ok document -> effectiveHistory.Add document\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some _ -> referenceDto\\n+ | None ->\\n+ { referenceDto with\\n+ Links =\\n+ referenceDto.Links\\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\\n+ |> Array.ofSeq\\n+ }\\n+\\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\\n+\\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ let window = ordered[startIndex..targetIndex]\\n+\\n+ if startIndex > 0 && window.Length > 0 then\\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\\n+\\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\\n+\\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\\n+\\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+\\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\\n+ .References\\n+\\n+ let private includeStoredBasedOnReferences\\n+ repositoryId\\n+ correlationId\\n+ maxReferences\\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\\n+\\n+ let knownReferenceIds =\\n+ HashSet<ReferenceId>(\\n+ references\\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\\n+ )\\n+\\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\\n+ let mutable index = 0\\n+\\n+ while index < effectiveReferences.Count do\\n+ let referenceDto = effectiveReferences[index]\\n+\\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\\n+ | Some basedOnReferenceId when\\n+ not (knownReferenceIds.Contains basedOnReferenceId)\\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\\n+ ->\\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\\n+\\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\\n+ && basedOnReference.DeletedAt.IsNone\\n+ && basedOnReference.RepositoryId = repositoryId then\\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let basedOnHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| basedOnReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\\n+\\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\\n+\\n+ let mutable basedOnHistoryIndex = 0\\n+\\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\\n+\\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\\n+ |> ignore\\n+\\n+ effectiveReferences.Add basedOnHistoryReference\\n+\\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\\n+ | _ -> ()\\n+\\n+ index <- index + 1\\n+\\n+ return effectiveReferences.ToArray()\\n+ }\\n+\\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\\n+ task {\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ match parameters.Validate() with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\\n+ | Ok () ->\\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\\n+\\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\\n+ let! targetReference = referenceActorProxy.Get correlationId\\n+\\n+ if targetReference.ReferenceId = ReferenceId.Empty then\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\\n+ elif targetReference.DeletedAt.IsSome then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference has been deleted.\\\")\\n+ elif targetReference.RepositoryId\\n+ <> graceIds.RepositoryId\\n+ || targetReference.BranchId <> graceIds.BranchId then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference must belong to the requested repository and branch.\\\")\\n+ else\\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\\n+\\n+ match tryFindFileVersion normalizedPath targetContents with\\n+ | None -> return Error(annotationError correlationId $\\\"Annotation target path '{normalizedPath}' was not found in the target Reference.\\\")\\n+ | Some _ ->\\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let localHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| targetReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\\n+\\n+ let! references =\\n+ includeStoredBasedOnReferences\\n+ targetReference.RepositoryId\\n+ correlationId\\n+ parameters.MaxReferences\\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\\n+ localHistoryWindow.References\\n+\\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\\n+ | Error error -> return Error error\\n+ | Ok history ->\\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\\n+\\n+ match\\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\\n+ (\\n+ parameters.LineRange,\\n+ targetReference.ReferenceId,\\n+ normalizedPath,\\n+ parameters.ReferenceTypes,\\n+ parameters.MaxReferences,\\n+ parameters.IncludeLineText,\\n+ traversal\\n+ )\\n+ with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok annotation ->\\n+ match Annotation.validate annotation with\\n+ | Ok () -> return Ok annotation\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ }\\n+\\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\\n task {\\n let startTime = getCurrentInstant ()\\n@@ -1071,6 +1420,77 @@ module Branch =\\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\\n }\\n \\n+ /// Annotates a server-known file from an existing reference in a branch.\\n+ let Annotate: HttpHandler =\\n+ fun (next: HttpFunc) (context: HttpContext) ->\\n+ task {\\n+ let startTime = getCurrentInstant ()\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ try\\n+ let! parameters = context |> parse<AnnotateParameters>\\n+ parameters.OwnerId <- graceIds.OwnerIdString\\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\\n+ parameters.BranchId <- graceIds.BranchIdString\\n+\\n+ match! buildAnnotationForRequest context parameters with\\n+ | Ok annotation ->\\n+ let graceReturnValue =\\n+ (GraceReturnValue.Create annotation correlationId)\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogInformation(\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString,\\n+ parameters.TargetReferenceId\\n+ )\\n+\\n+ return! context |> result200Ok graceReturnValue\\n+ | Error graceError ->\\n+ graceError\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+ |> ignore\\n+\\n+ return! context |> result400BadRequest graceError\\n+ with\\n+ | ex ->\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogError(\\n+ ex,\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString\\n+ )\\n+\\n+ return!\\n+ context\\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\\n+ }\\n+\\n /// Gets a list of references, given a list of reference IDs.\\n let GetLatestReferencesByReferenceTypes: HttpHandler =\\n fun (next: HttpFunc) (context: HttpContext) ->\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":10495,"cells":{"repo":{"kind":"string","value":"ScottArbeit/Grace"},"pr_number":{"kind":"number","value":328,"string":"328"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Add branch annotate API and SDK wrapper"},"pr_body":{"kind":"string","value":"**<sub><sub></sub></sub> Follow stored BasedOn links for rebased references**\n\nFor branch creation and `/branch/rebase`, the reference records carry a `ReferenceLinkType.BasedOn` link to the actual parent reference, but this code replaces that with the previous reference in the same chronological window. In a child branch or after a rebase, `/branch/annotate` will stop at the local Rebase reference (or point to the wrong local predecessor) instead of traversing to the parent promotion, so inherited lines are attributed incorrectly or hidden behind a boundary; derive `BasedOnReferenceId` from `referenceDto.Links` when present.\n\nUseful? React with 👍 / 👎."},"base_sha":{"kind":"string","value":"2c0265092c07919370c9e89f089affd857e7e649"},"head_sha":{"kind":"string","value":"93f43484515f9122613be123e3b784cc6c479469"},"gold_diff":{"kind":"string","value":"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\nindex 31e4d51a..29001878 100644\n--- a/src/Grace.Server/Branch.Server.fs\n+++ b/src/Grace.Server/Branch.Server.fs\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\n open Grace.Actors.Extensions.ActorProxy\n open Grace.Actors.Interfaces\n open Grace.Actors.Services\n+open Grace.Server.Security\n open Grace.Server.Services\n open Grace.Server.Validations\n open Grace.Shared\n+open Grace.Shared.AnnotationLineCore\n open Grace.Shared.Extensions\n open Grace.Shared.Parameters.Branch\n open Grace.Types\n+open Grace.Types.Annotation\n+open Grace.Types.Authorization\n open Grace.Types.Branch\n open Grace.Types.Diff\n open Grace.Types.Common\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\n open Grace.Shared.Validation.Errors\n open Grace.Shared.Validation.Utilities\n open Microsoft.AspNetCore.Http\n+open Microsoft.Extensions.DependencyInjection\n open Microsoft.Extensions.Logging\n open System\n open System.Collections.Concurrent\n@@ -36,6 +41,350 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId ->\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\n+ | _ -> Some basedOnReferenceId\n+ | None -> None\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let internal unreadableAncestorBoundaryKind = \"UnmaterializableAncestor\"\n+\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\n+\n+ let private emptyAnnotationDocument path referenceDto =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\n+ match materializationResult with\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"},"changed_files":{"kind":"list like","value":["src/Grace.Server/Branch.Server.fs"],"string":"[\n \"src/Grace.Server/Branch.Server.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"**<sub><sub></sub></sub> Follow stored BasedOn links for rebased references**\n\nFor branch creation and `/branch/rebase`, the reference records carry a `ReferenceLinkType.BasedOn` link to the actual parent reference, but this code replaces that with the previous reference in the same chronological window. In a child branch or after a rebase, `/branch/annotate` will stop at the local Rebase reference (or point to the wrong local predecessor) instead of traversing to the parent promotion, so inherited lines are attributed incorrectly or hidden behind a boundary; derive `BasedOnReferenceId` from `referenceDto.Links` when present.\n\nUseful? React with 👍 / 👎.","path":"src/Grace.Server/Branch.Server.fs","hunk":"@@ -36,6 +41,198 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let private buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId = if index = 0 then None else Some references[index - 1].ReferenceId","resolving_sha":"93f43484515f9122613be123e3b784cc6c479469","resolving_diff":"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\nindex 31e4d51a..29001878 100644\n--- a/src/Grace.Server/Branch.Server.fs\n+++ b/src/Grace.Server/Branch.Server.fs\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\n open Grace.Actors.Extensions.ActorProxy\n open Grace.Actors.Interfaces\n open Grace.Actors.Services\n+open Grace.Server.Security\n open Grace.Server.Services\n open Grace.Server.Validations\n open Grace.Shared\n+open Grace.Shared.AnnotationLineCore\n open Grace.Shared.Extensions\n open Grace.Shared.Parameters.Branch\n open Grace.Types\n+open Grace.Types.Annotation\n+open Grace.Types.Authorization\n open Grace.Types.Branch\n open Grace.Types.Diff\n open Grace.Types.Common\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\n open Grace.Shared.Validation.Errors\n open Grace.Shared.Validation.Utilities\n open Microsoft.AspNetCore.Http\n+open Microsoft.Extensions.DependencyInjection\n open Microsoft.Extensions.Logging\n open System\n open System.Collections.Concurrent\n@@ -36,6 +41,350 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId ->\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\n+ | _ -> Some basedOnReferenceId\n+ | None -> None\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let internal unreadableAncestorBoundaryKind = \"UnmaterializableAncestor\"\n+\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\n+\n+ let private emptyAnnotationDocument path referenceDto =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\n+ match materializationResult with\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"}],"string":"[\n {\n \"comment\": \"**<sub><sub></sub></sub> Follow stored BasedOn links for rebased references**\\n\\nFor branch creation and `/branch/rebase`, the reference records carry a `ReferenceLinkType.BasedOn` link to the actual parent reference, but this code replaces that with the previous reference in the same chronological window. In a child branch or after a rebase, `/branch/annotate` will stop at the local Rebase reference (or point to the wrong local predecessor) instead of traversing to the parent promotion, so inherited lines are attributed incorrectly or hidden behind a boundary; derive `BasedOnReferenceId` from `referenceDto.Links` when present.\\n\\nUseful? React with 👍 / 👎.\",\n \"path\": \"src/Grace.Server/Branch.Server.fs\",\n \"hunk\": \"@@ -36,6 +41,198 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let private buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId = if index = 0 then None else Some references[index - 1].ReferenceId\",\n \"resolving_sha\": \"93f43484515f9122613be123e3b784cc6c479469\",\n \"resolving_diff\": \"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\\nindex 31e4d51a..29001878 100644\\n--- a/src/Grace.Server/Branch.Server.fs\\n+++ b/src/Grace.Server/Branch.Server.fs\\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\\n open Grace.Actors.Extensions.ActorProxy\\n open Grace.Actors.Interfaces\\n open Grace.Actors.Services\\n+open Grace.Server.Security\\n open Grace.Server.Services\\n open Grace.Server.Validations\\n open Grace.Shared\\n+open Grace.Shared.AnnotationLineCore\\n open Grace.Shared.Extensions\\n open Grace.Shared.Parameters.Branch\\n open Grace.Types\\n+open Grace.Types.Annotation\\n+open Grace.Types.Authorization\\n open Grace.Types.Branch\\n open Grace.Types.Diff\\n open Grace.Types.Common\\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\\n open Grace.Shared.Validation.Errors\\n open Grace.Shared.Validation.Utilities\\n open Microsoft.AspNetCore.Http\\n+open Microsoft.Extensions.DependencyInjection\\n open Microsoft.Extensions.Logging\\n open System\\n open System.Collections.Concurrent\\n@@ -36,6 +41,350 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ referenceDto.Links\\n+ |> Seq.tryPick (function\\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\\n+ | _ -> None)\\n+\\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some basedOnReferenceId ->\\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\\n+ | _ -> Some basedOnReferenceId\\n+ | None -> None\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let internal unreadableAncestorBoundaryKind = \\\"UnmaterializableAncestor\\\"\\n+\\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\\n+\\n+ let private emptyAnnotationDocument path referenceDto =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\\n+ match materializationResult with\\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\\n+\\n+ let internal buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (targetReferenceId: ReferenceId)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let basedOnByReferenceId =\\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\\n+\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+ |> Array.iter (fun referenceDto ->\\n+ let basedOnReferenceId =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some referenceId -> Some referenceId\\n+ | None ->\\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\\n+ | true, previousReferenceId -> Some previousReferenceId\\n+ | false, _ -> None\\n+\\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\\n+\\n+ result\\n+\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId =\\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, referenceId -> referenceId\\n+ | false, _ -> None\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | materializationResult ->\\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\\n+ | Ok document -> effectiveHistory.Add document\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some _ -> referenceDto\\n+ | None ->\\n+ { referenceDto with\\n+ Links =\\n+ referenceDto.Links\\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\\n+ |> Array.ofSeq\\n+ }\\n+\\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\\n+\\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ let window = ordered[startIndex..targetIndex]\\n+\\n+ if startIndex > 0 && window.Length > 0 then\\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\\n+\\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\\n+\\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\\n+\\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+\\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\\n+ .References\\n+\\n+ let private includeStoredBasedOnReferences\\n+ repositoryId\\n+ correlationId\\n+ maxReferences\\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\\n+\\n+ let knownReferenceIds =\\n+ HashSet<ReferenceId>(\\n+ references\\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\\n+ )\\n+\\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\\n+ let mutable index = 0\\n+\\n+ while index < effectiveReferences.Count do\\n+ let referenceDto = effectiveReferences[index]\\n+\\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\\n+ | Some basedOnReferenceId when\\n+ not (knownReferenceIds.Contains basedOnReferenceId)\\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\\n+ ->\\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\\n+\\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\\n+ && basedOnReference.DeletedAt.IsNone\\n+ && basedOnReference.RepositoryId = repositoryId then\\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let basedOnHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| basedOnReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\\n+\\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\\n+\\n+ let mutable basedOnHistoryIndex = 0\\n+\\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\\n+\\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\\n+ |> ignore\\n+\\n+ effectiveReferences.Add basedOnHistoryReference\\n+\\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\\n+ | _ -> ()\\n+\\n+ index <- index + 1\\n+\\n+ return effectiveReferences.ToArray()\\n+ }\\n+\\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\\n+ task {\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ match parameters.Validate() with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\\n+ | Ok () ->\\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\\n+\\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\\n+ let! targetReference = referenceActorProxy.Get correlationId\\n+\\n+ if targetReference.ReferenceId = ReferenceId.Empty then\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\\n+ elif targetReference.DeletedAt.IsSome then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference has been deleted.\\\")\\n+ elif targetReference.RepositoryId\\n+ <> graceIds.RepositoryId\\n+ || targetReference.BranchId <> graceIds.BranchId then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference must belong to the requested repository and branch.\\\")\\n+ else\\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\\n+\\n+ match tryFindFileVersion normalizedPath targetContents with\\n+ | None -> return Error(annotationError correlationId $\\\"Annotation target path '{normalizedPath}' was not found in the target Reference.\\\")\\n+ | Some _ ->\\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let localHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| targetReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\\n+\\n+ let! references =\\n+ includeStoredBasedOnReferences\\n+ targetReference.RepositoryId\\n+ correlationId\\n+ parameters.MaxReferences\\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\\n+ localHistoryWindow.References\\n+\\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\\n+ | Error error -> return Error error\\n+ | Ok history ->\\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\\n+\\n+ match\\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\\n+ (\\n+ parameters.LineRange,\\n+ targetReference.ReferenceId,\\n+ normalizedPath,\\n+ parameters.ReferenceTypes,\\n+ parameters.MaxReferences,\\n+ parameters.IncludeLineText,\\n+ traversal\\n+ )\\n+ with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok annotation ->\\n+ match Annotation.validate annotation with\\n+ | Ok () -> return Ok annotation\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ }\\n+\\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\\n task {\\n let startTime = getCurrentInstant ()\\n@@ -1071,6 +1420,77 @@ module Branch =\\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\\n }\\n \\n+ /// Annotates a server-known file from an existing reference in a branch.\\n+ let Annotate: HttpHandler =\\n+ fun (next: HttpFunc) (context: HttpContext) ->\\n+ task {\\n+ let startTime = getCurrentInstant ()\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ try\\n+ let! parameters = context |> parse<AnnotateParameters>\\n+ parameters.OwnerId <- graceIds.OwnerIdString\\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\\n+ parameters.BranchId <- graceIds.BranchIdString\\n+\\n+ match! buildAnnotationForRequest context parameters with\\n+ | Ok annotation ->\\n+ let graceReturnValue =\\n+ (GraceReturnValue.Create annotation correlationId)\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogInformation(\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString,\\n+ parameters.TargetReferenceId\\n+ )\\n+\\n+ return! context |> result200Ok graceReturnValue\\n+ | Error graceError ->\\n+ graceError\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+ |> ignore\\n+\\n+ return! context |> result400BadRequest graceError\\n+ with\\n+ | ex ->\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogError(\\n+ ex,\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString\\n+ )\\n+\\n+ return!\\n+ context\\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\\n+ }\\n+\\n /// Gets a list of references, given a list of reference IDs.\\n let GetLatestReferencesByReferenceTypes: HttpHandler =\\n fun (next: HttpFunc) (context: HttpContext) ->\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":10496,"cells":{"repo":{"kind":"string","value":"ScottArbeit/Grace"},"pr_number":{"kind":"number","value":328,"string":"328"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Add branch annotate API and SDK wrapper"},"pr_body":{"kind":"string","value":"**<sub><sub></sub></sub> Enforce path read permission before materializing annotations**\n\n`/branch/annotate` can return target line text (`IncludeLineText`) and reads the file bytes from object storage, but the route only checks `requireBranchRead`; path permissions can explicitly deny a file via `DirectoryPermission.NoAccess`, and storage downloads in this same workflow use `requirePathRead` for that reason. A branch reader who is denied access to a sensitive path can still annotate that path if they know its reference/path, bypassing the path-level authorization model.\n\nUseful? React with 👍 / 👎."},"base_sha":{"kind":"string","value":"2c0265092c07919370c9e89f089affd857e7e649"},"head_sha":{"kind":"string","value":"93f43484515f9122613be123e3b784cc6c479469"},"gold_diff":{"kind":"string","value":"diff --git a/src/Grace.Server/Startup.Server.fs b/src/Grace.Server/Startup.Server.fs\nindex 75018886..97e0875d 100644\n--- a/src/Grace.Server/Startup.Server.fs\n+++ b/src/Grace.Server/Startup.Server.fs\n@@ -210,6 +210,26 @@ module Application =\n return StorageAuthorizationResources.downloadUriResource graceIds.OwnerId graceIds.OrganizationId graceIds.RepositoryId parameters\n }\n \n+ let annotatePathResourceFromContext (context: HttpContext) =\n+ task {\n+ context.Request.EnableBuffering()\n+ let! parameters = context.BindJsonAsync<Branch.AnnotateParameters>()\n+\n+ context.Request.Body.Seek(0L, IO.SeekOrigin.Begin)\n+ |> ignore\n+\n+ let correlationId = Services.getCorrelationId context\n+\n+ if Object.ReferenceEquals(parameters, null) then\n+ return Error(GraceError.Create \"Annotate parameters must not be null.\" correlationId)\n+ elif String.IsNullOrWhiteSpace parameters.Path then\n+ return Error(GraceError.Create \"Annotation Path must be a relative file path.\" correlationId)\n+ else\n+ let graceIds = Services.getGraceIds context\n+ let normalizedPath = normalizeFilePath parameters.Path\n+ return Ok(Operation.PathRead, Resource.Path(graceIds.OwnerId, graceIds.OrganizationId, graceIds.RepositoryId, normalizedPath))\n+ }\n+\n let contentBlockUploadPathResourceFromContext (context: HttpContext) =\n task {\n context.Request.EnableBuffering()\n@@ -388,6 +408,8 @@ module Application =\n \n let requirePathRead: HttpHandler = AuthorizationMiddleware.requiresPermission Operation.PathRead downloadPathResourceFromContext\n \n+ let requireAnnotatePathRead: HttpHandler = AuthorizationMiddleware.requiresPermissionResolved annotatePathResourceFromContext\n+\n let requirePathWriteForContentBlockUploadUri: HttpHandler =\n AuthorizationMiddleware.requiresPermission Operation.PathWrite contentBlockUploadPathResourceFromContext\n \n@@ -1008,8 +1030,11 @@ module Application =\n POST [ route \"/assign\" Branch.Assign\n |> addMetadata typeof<Branch.AssignParameters>\n \n- route \"/checkpoint\" Branch.Checkpoint\n- |> addMetadata typeof<Branch.CreateReferenceParameters>\n+ route \"/annotate\" (composeHandlers requireBranchRead (composeHandlers requireAnnotatePathRead Branch.Annotate))\n+ |> addMetadata typeof<Branch.AnnotateParameters>\n+\n+ (route \"/checkpoint\" Branch.Checkpoint\n+ |> addMetadata typeof<Branch.CreateReferenceParameters>)\n \n route \"/commit\" (composeHandlers requireBranchWrite Branch.Commit)\n |> addMetadata typeof<Branch.CreateReferenceParameters>\n"},"changed_files":{"kind":"list like","value":["src/Grace.Server/Startup.Server.fs"],"string":"[\n \"src/Grace.Server/Startup.Server.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"**<sub><sub></sub></sub> Enforce path read permission before materializing annotations**\n\n`/branch/annotate` can return target line text (`IncludeLineText`) and reads the file bytes from object storage, but the route only checks `requireBranchRead`; path permissions can explicitly deny a file via `DirectoryPermission.NoAccess`, and storage downloads in this same workflow use `requirePathRead` for that reason. A branch reader who is denied access to a sensitive path can still annotate that path if they know its reference/path, bypassing the path-level authorization model.\n\nUseful? React with 👍 / 👎.","path":"src/Grace.Server/Startup.Server.fs","hunk":"@@ -1008,8 +1008,11 @@ module Application =\n POST [ route \"/assign\" Branch.Assign\n |> addMetadata typeof<Branch.AssignParameters>\n \n- route \"/checkpoint\" Branch.Checkpoint\n- |> addMetadata typeof<Branch.CreateReferenceParameters>\n+ route \"/annotate\" (composeHandlers requireBranchRead Branch.Annotate)","resolving_sha":"93f43484515f9122613be123e3b784cc6c479469","resolving_diff":"diff --git a/src/Grace.Server/Startup.Server.fs b/src/Grace.Server/Startup.Server.fs\nindex 75018886..97e0875d 100644\n--- a/src/Grace.Server/Startup.Server.fs\n+++ b/src/Grace.Server/Startup.Server.fs\n@@ -210,6 +210,26 @@ module Application =\n return StorageAuthorizationResources.downloadUriResource graceIds.OwnerId graceIds.OrganizationId graceIds.RepositoryId parameters\n }\n \n+ let annotatePathResourceFromContext (context: HttpContext) =\n+ task {\n+ context.Request.EnableBuffering()\n+ let! parameters = context.BindJsonAsync<Branch.AnnotateParameters>()\n+\n+ context.Request.Body.Seek(0L, IO.SeekOrigin.Begin)\n+ |> ignore\n+\n+ let correlationId = Services.getCorrelationId context\n+\n+ if Object.ReferenceEquals(parameters, null) then\n+ return Error(GraceError.Create \"Annotate parameters must not be null.\" correlationId)\n+ elif String.IsNullOrWhiteSpace parameters.Path then\n+ return Error(GraceError.Create \"Annotation Path must be a relative file path.\" correlationId)\n+ else\n+ let graceIds = Services.getGraceIds context\n+ let normalizedPath = normalizeFilePath parameters.Path\n+ return Ok(Operation.PathRead, Resource.Path(graceIds.OwnerId, graceIds.OrganizationId, graceIds.RepositoryId, normalizedPath))\n+ }\n+\n let contentBlockUploadPathResourceFromContext (context: HttpContext) =\n task {\n context.Request.EnableBuffering()\n@@ -388,6 +408,8 @@ module Application =\n \n let requirePathRead: HttpHandler = AuthorizationMiddleware.requiresPermission Operation.PathRead downloadPathResourceFromContext\n \n+ let requireAnnotatePathRead: HttpHandler = AuthorizationMiddleware.requiresPermissionResolved annotatePathResourceFromContext\n+\n let requirePathWriteForContentBlockUploadUri: HttpHandler =\n AuthorizationMiddleware.requiresPermission Operation.PathWrite contentBlockUploadPathResourceFromContext\n \n@@ -1008,8 +1030,11 @@ module Application =\n POST [ route \"/assign\" Branch.Assign\n |> addMetadata typeof<Branch.AssignParameters>\n \n- route \"/checkpoint\" Branch.Checkpoint\n- |> addMetadata typeof<Branch.CreateReferenceParameters>\n+ route \"/annotate\" (composeHandlers requireBranchRead (composeHandlers requireAnnotatePathRead Branch.Annotate))\n+ |> addMetadata typeof<Branch.AnnotateParameters>\n+\n+ (route \"/checkpoint\" Branch.Checkpoint\n+ |> addMetadata typeof<Branch.CreateReferenceParameters>)\n \n route \"/commit\" (composeHandlers requireBranchWrite Branch.Commit)\n |> addMetadata typeof<Branch.CreateReferenceParameters>\n"}],"string":"[\n {\n \"comment\": \"**<sub><sub></sub></sub> Enforce path read permission before materializing annotations**\\n\\n`/branch/annotate` can return target line text (`IncludeLineText`) and reads the file bytes from object storage, but the route only checks `requireBranchRead`; path permissions can explicitly deny a file via `DirectoryPermission.NoAccess`, and storage downloads in this same workflow use `requirePathRead` for that reason. A branch reader who is denied access to a sensitive path can still annotate that path if they know its reference/path, bypassing the path-level authorization model.\\n\\nUseful? React with 👍 / 👎.\",\n \"path\": \"src/Grace.Server/Startup.Server.fs\",\n \"hunk\": \"@@ -1008,8 +1008,11 @@ module Application =\\n POST [ route \\\"/assign\\\" Branch.Assign\\n |> addMetadata typeof<Branch.AssignParameters>\\n \\n- route \\\"/checkpoint\\\" Branch.Checkpoint\\n- |> addMetadata typeof<Branch.CreateReferenceParameters>\\n+ route \\\"/annotate\\\" (composeHandlers requireBranchRead Branch.Annotate)\",\n \"resolving_sha\": \"93f43484515f9122613be123e3b784cc6c479469\",\n \"resolving_diff\": \"diff --git a/src/Grace.Server/Startup.Server.fs b/src/Grace.Server/Startup.Server.fs\\nindex 75018886..97e0875d 100644\\n--- a/src/Grace.Server/Startup.Server.fs\\n+++ b/src/Grace.Server/Startup.Server.fs\\n@@ -210,6 +210,26 @@ module Application =\\n return StorageAuthorizationResources.downloadUriResource graceIds.OwnerId graceIds.OrganizationId graceIds.RepositoryId parameters\\n }\\n \\n+ let annotatePathResourceFromContext (context: HttpContext) =\\n+ task {\\n+ context.Request.EnableBuffering()\\n+ let! parameters = context.BindJsonAsync<Branch.AnnotateParameters>()\\n+\\n+ context.Request.Body.Seek(0L, IO.SeekOrigin.Begin)\\n+ |> ignore\\n+\\n+ let correlationId = Services.getCorrelationId context\\n+\\n+ if Object.ReferenceEquals(parameters, null) then\\n+ return Error(GraceError.Create \\\"Annotate parameters must not be null.\\\" correlationId)\\n+ elif String.IsNullOrWhiteSpace parameters.Path then\\n+ return Error(GraceError.Create \\\"Annotation Path must be a relative file path.\\\" correlationId)\\n+ else\\n+ let graceIds = Services.getGraceIds context\\n+ let normalizedPath = normalizeFilePath parameters.Path\\n+ return Ok(Operation.PathRead, Resource.Path(graceIds.OwnerId, graceIds.OrganizationId, graceIds.RepositoryId, normalizedPath))\\n+ }\\n+\\n let contentBlockUploadPathResourceFromContext (context: HttpContext) =\\n task {\\n context.Request.EnableBuffering()\\n@@ -388,6 +408,8 @@ module Application =\\n \\n let requirePathRead: HttpHandler = AuthorizationMiddleware.requiresPermission Operation.PathRead downloadPathResourceFromContext\\n \\n+ let requireAnnotatePathRead: HttpHandler = AuthorizationMiddleware.requiresPermissionResolved annotatePathResourceFromContext\\n+\\n let requirePathWriteForContentBlockUploadUri: HttpHandler =\\n AuthorizationMiddleware.requiresPermission Operation.PathWrite contentBlockUploadPathResourceFromContext\\n \\n@@ -1008,8 +1030,11 @@ module Application =\\n POST [ route \\\"/assign\\\" Branch.Assign\\n |> addMetadata typeof<Branch.AssignParameters>\\n \\n- route \\\"/checkpoint\\\" Branch.Checkpoint\\n- |> addMetadata typeof<Branch.CreateReferenceParameters>\\n+ route \\\"/annotate\\\" (composeHandlers requireBranchRead (composeHandlers requireAnnotatePathRead Branch.Annotate))\\n+ |> addMetadata typeof<Branch.AnnotateParameters>\\n+\\n+ (route \\\"/checkpoint\\\" Branch.Checkpoint\\n+ |> addMetadata typeof<Branch.CreateReferenceParameters>)\\n \\n route \\\"/commit\\\" (composeHandlers requireBranchWrite Branch.Commit)\\n |> addMetadata typeof<Branch.CreateReferenceParameters>\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":10497,"cells":{"repo":{"kind":"string","value":"ScottArbeit/Grace"},"pr_number":{"kind":"number","value":328,"string":"328"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Add branch annotate API and SDK wrapper"},"pr_body":{"kind":"string","value":"**<sub><sub></sub></sub> Return a validation error for null annotation paths**\n\nIf a client omits `Path` or sends it as JSON `null`, this normalization runs before any null/blank path guard and `normalizeFilePath` dereferences the string, so a malformed request is caught by the outer exception handler and returned as a 500 instead of the intended 400 validation error. Guard `parameters.Path` for null/whitespace before normalizing it.\n\nUseful? React with 👍 / 👎."},"base_sha":{"kind":"string","value":"2c0265092c07919370c9e89f089affd857e7e649"},"head_sha":{"kind":"string","value":"93f43484515f9122613be123e3b784cc6c479469"},"gold_diff":{"kind":"string","value":"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\nindex 31e4d51a..29001878 100644\n--- a/src/Grace.Server/Branch.Server.fs\n+++ b/src/Grace.Server/Branch.Server.fs\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\n open Grace.Actors.Extensions.ActorProxy\n open Grace.Actors.Interfaces\n open Grace.Actors.Services\n+open Grace.Server.Security\n open Grace.Server.Services\n open Grace.Server.Validations\n open Grace.Shared\n+open Grace.Shared.AnnotationLineCore\n open Grace.Shared.Extensions\n open Grace.Shared.Parameters.Branch\n open Grace.Types\n+open Grace.Types.Annotation\n+open Grace.Types.Authorization\n open Grace.Types.Branch\n open Grace.Types.Diff\n open Grace.Types.Common\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\n open Grace.Shared.Validation.Errors\n open Grace.Shared.Validation.Utilities\n open Microsoft.AspNetCore.Http\n+open Microsoft.Extensions.DependencyInjection\n open Microsoft.Extensions.Logging\n open System\n open System.Collections.Concurrent\n@@ -36,6 +41,350 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId ->\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\n+ | _ -> Some basedOnReferenceId\n+ | None -> None\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let internal unreadableAncestorBoundaryKind = \"UnmaterializableAncestor\"\n+\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\n+\n+ let private emptyAnnotationDocument path referenceDto =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\n+ match materializationResult with\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"},"changed_files":{"kind":"list like","value":["src/Grace.Server/Branch.Server.fs"],"string":"[\n \"src/Grace.Server/Branch.Server.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"**<sub><sub></sub></sub> Return a validation error for null annotation paths**\n\nIf a client omits `Path` or sends it as JSON `null`, this normalization runs before any null/blank path guard and `normalizeFilePath` dereferences the string, so a malformed request is caught by the outer exception handler and returned as a 500 instead of the intended 400 validation error. Guard `parameters.Path` for null/whitespace before normalizing it.\n\nUseful? React with 👍 / 👎.","path":"src/Grace.Server/Branch.Server.fs","hunk":"@@ -36,6 +41,198 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let private buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId = if index = 0 then None else Some references[index - 1].ReferenceId\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | Ok (Some document) -> effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\n+ | Ok None ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ let document = { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = false })\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> ordered |> Array.truncate maxReferences\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ ordered[startIndex..targetIndex]\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+ let normalizedPath = normalizeAnnotationPath parameters.Path","resolving_sha":"93f43484515f9122613be123e3b784cc6c479469","resolving_diff":"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\nindex 31e4d51a..29001878 100644\n--- a/src/Grace.Server/Branch.Server.fs\n+++ b/src/Grace.Server/Branch.Server.fs\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\n open Grace.Actors.Extensions.ActorProxy\n open Grace.Actors.Interfaces\n open Grace.Actors.Services\n+open Grace.Server.Security\n open Grace.Server.Services\n open Grace.Server.Validations\n open Grace.Shared\n+open Grace.Shared.AnnotationLineCore\n open Grace.Shared.Extensions\n open Grace.Shared.Parameters.Branch\n open Grace.Types\n+open Grace.Types.Annotation\n+open Grace.Types.Authorization\n open Grace.Types.Branch\n open Grace.Types.Diff\n open Grace.Types.Common\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\n open Grace.Shared.Validation.Errors\n open Grace.Shared.Validation.Utilities\n open Microsoft.AspNetCore.Http\n+open Microsoft.Extensions.DependencyInjection\n open Microsoft.Extensions.Logging\n open System\n open System.Collections.Concurrent\n@@ -36,6 +41,350 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId ->\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\n+ | _ -> Some basedOnReferenceId\n+ | None -> None\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let internal unreadableAncestorBoundaryKind = \"UnmaterializableAncestor\"\n+\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\n+\n+ let private emptyAnnotationDocument path referenceDto =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\n+ match materializationResult with\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"}],"string":"[\n {\n \"comment\": \"**<sub><sub></sub></sub> Return a validation error for null annotation paths**\\n\\nIf a client omits `Path` or sends it as JSON `null`, this normalization runs before any null/blank path guard and `normalizeFilePath` dereferences the string, so a malformed request is caught by the outer exception handler and returned as a 500 instead of the intended 400 validation error. Guard `parameters.Path` for null/whitespace before normalizing it.\\n\\nUseful? React with 👍 / 👎.\",\n \"path\": \"src/Grace.Server/Branch.Server.fs\",\n \"hunk\": \"@@ -36,6 +41,198 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let private buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId = if index = 0 then None else Some references[index - 1].ReferenceId\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | Ok (Some document) -> effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\\n+ | Ok None ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ let document = { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = false })\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> ordered |> Array.truncate maxReferences\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ ordered[startIndex..targetIndex]\\n+\\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\\n+ task {\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\",\n \"resolving_sha\": \"93f43484515f9122613be123e3b784cc6c479469\",\n \"resolving_diff\": \"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\\nindex 31e4d51a..29001878 100644\\n--- a/src/Grace.Server/Branch.Server.fs\\n+++ b/src/Grace.Server/Branch.Server.fs\\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\\n open Grace.Actors.Extensions.ActorProxy\\n open Grace.Actors.Interfaces\\n open Grace.Actors.Services\\n+open Grace.Server.Security\\n open Grace.Server.Services\\n open Grace.Server.Validations\\n open Grace.Shared\\n+open Grace.Shared.AnnotationLineCore\\n open Grace.Shared.Extensions\\n open Grace.Shared.Parameters.Branch\\n open Grace.Types\\n+open Grace.Types.Annotation\\n+open Grace.Types.Authorization\\n open Grace.Types.Branch\\n open Grace.Types.Diff\\n open Grace.Types.Common\\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\\n open Grace.Shared.Validation.Errors\\n open Grace.Shared.Validation.Utilities\\n open Microsoft.AspNetCore.Http\\n+open Microsoft.Extensions.DependencyInjection\\n open Microsoft.Extensions.Logging\\n open System\\n open System.Collections.Concurrent\\n@@ -36,6 +41,350 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ referenceDto.Links\\n+ |> Seq.tryPick (function\\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\\n+ | _ -> None)\\n+\\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some basedOnReferenceId ->\\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\\n+ | _ -> Some basedOnReferenceId\\n+ | None -> None\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let internal unreadableAncestorBoundaryKind = \\\"UnmaterializableAncestor\\\"\\n+\\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\\n+\\n+ let private emptyAnnotationDocument path referenceDto =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\\n+ match materializationResult with\\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\\n+\\n+ let internal buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (targetReferenceId: ReferenceId)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let basedOnByReferenceId =\\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\\n+\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+ |> Array.iter (fun referenceDto ->\\n+ let basedOnReferenceId =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some referenceId -> Some referenceId\\n+ | None ->\\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\\n+ | true, previousReferenceId -> Some previousReferenceId\\n+ | false, _ -> None\\n+\\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\\n+\\n+ result\\n+\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId =\\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, referenceId -> referenceId\\n+ | false, _ -> None\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | materializationResult ->\\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\\n+ | Ok document -> effectiveHistory.Add document\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some _ -> referenceDto\\n+ | None ->\\n+ { referenceDto with\\n+ Links =\\n+ referenceDto.Links\\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\\n+ |> Array.ofSeq\\n+ }\\n+\\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\\n+\\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ let window = ordered[startIndex..targetIndex]\\n+\\n+ if startIndex > 0 && window.Length > 0 then\\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\\n+\\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\\n+\\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\\n+\\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+\\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\\n+ .References\\n+\\n+ let private includeStoredBasedOnReferences\\n+ repositoryId\\n+ correlationId\\n+ maxReferences\\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\\n+\\n+ let knownReferenceIds =\\n+ HashSet<ReferenceId>(\\n+ references\\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\\n+ )\\n+\\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\\n+ let mutable index = 0\\n+\\n+ while index < effectiveReferences.Count do\\n+ let referenceDto = effectiveReferences[index]\\n+\\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\\n+ | Some basedOnReferenceId when\\n+ not (knownReferenceIds.Contains basedOnReferenceId)\\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\\n+ ->\\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\\n+\\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\\n+ && basedOnReference.DeletedAt.IsNone\\n+ && basedOnReference.RepositoryId = repositoryId then\\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let basedOnHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| basedOnReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\\n+\\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\\n+\\n+ let mutable basedOnHistoryIndex = 0\\n+\\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\\n+\\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\\n+ |> ignore\\n+\\n+ effectiveReferences.Add basedOnHistoryReference\\n+\\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\\n+ | _ -> ()\\n+\\n+ index <- index + 1\\n+\\n+ return effectiveReferences.ToArray()\\n+ }\\n+\\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\\n+ task {\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ match parameters.Validate() with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\\n+ | Ok () ->\\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\\n+\\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\\n+ let! targetReference = referenceActorProxy.Get correlationId\\n+\\n+ if targetReference.ReferenceId = ReferenceId.Empty then\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\\n+ elif targetReference.DeletedAt.IsSome then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference has been deleted.\\\")\\n+ elif targetReference.RepositoryId\\n+ <> graceIds.RepositoryId\\n+ || targetReference.BranchId <> graceIds.BranchId then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference must belong to the requested repository and branch.\\\")\\n+ else\\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\\n+\\n+ match tryFindFileVersion normalizedPath targetContents with\\n+ | None -> return Error(annotationError correlationId $\\\"Annotation target path '{normalizedPath}' was not found in the target Reference.\\\")\\n+ | Some _ ->\\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let localHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| targetReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\\n+\\n+ let! references =\\n+ includeStoredBasedOnReferences\\n+ targetReference.RepositoryId\\n+ correlationId\\n+ parameters.MaxReferences\\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\\n+ localHistoryWindow.References\\n+\\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\\n+ | Error error -> return Error error\\n+ | Ok history ->\\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\\n+\\n+ match\\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\\n+ (\\n+ parameters.LineRange,\\n+ targetReference.ReferenceId,\\n+ normalizedPath,\\n+ parameters.ReferenceTypes,\\n+ parameters.MaxReferences,\\n+ parameters.IncludeLineText,\\n+ traversal\\n+ )\\n+ with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok annotation ->\\n+ match Annotation.validate annotation with\\n+ | Ok () -> return Ok annotation\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ }\\n+\\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\\n task {\\n let startTime = getCurrentInstant ()\\n@@ -1071,6 +1420,77 @@ module Branch =\\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\\n }\\n \\n+ /// Annotates a server-known file from an existing reference in a branch.\\n+ let Annotate: HttpHandler =\\n+ fun (next: HttpFunc) (context: HttpContext) ->\\n+ task {\\n+ let startTime = getCurrentInstant ()\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ try\\n+ let! parameters = context |> parse<AnnotateParameters>\\n+ parameters.OwnerId <- graceIds.OwnerIdString\\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\\n+ parameters.BranchId <- graceIds.BranchIdString\\n+\\n+ match! buildAnnotationForRequest context parameters with\\n+ | Ok annotation ->\\n+ let graceReturnValue =\\n+ (GraceReturnValue.Create annotation correlationId)\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogInformation(\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString,\\n+ parameters.TargetReferenceId\\n+ )\\n+\\n+ return! context |> result200Ok graceReturnValue\\n+ | Error graceError ->\\n+ graceError\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+ |> ignore\\n+\\n+ return! context |> result400BadRequest graceError\\n+ with\\n+ | ex ->\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogError(\\n+ ex,\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString\\n+ )\\n+\\n+ return!\\n+ context\\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\\n+ }\\n+\\n /// Gets a list of references, given a list of reference IDs.\\n let GetLatestReferencesByReferenceTypes: HttpHandler =\\n fun (next: HttpFunc) (context: HttpContext) ->\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":10498,"cells":{"repo":{"kind":"string","value":"ScottArbeit/Grace"},"pr_number":{"kind":"number","value":328,"string":"328"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Add branch annotate API and SDK wrapper"},"pr_body":{"kind":"string","value":"**<sub><sub></sub></sub> Fetch ancestors of BasedOn parent references**\n\nWhen a child branch or rebase points at a parent-branch promotion, this only adds that immediate `BasedOn` reference to the annotation history. Because no window of the parent branch's earlier references is fetched, `buildEffectiveHistory` has no predecessor for the parent promotion and traversal stops there, so inherited lines are attributed to the promotion/rebase boundary instead of the commit/save that actually introduced them. Fetch the linked reference's branch history around that reference, recursively, before building the effective traversal.\n\nUseful? React with 👍 / 👎."},"base_sha":{"kind":"string","value":"2c0265092c07919370c9e89f089affd857e7e649"},"head_sha":{"kind":"string","value":"93f43484515f9122613be123e3b784cc6c479469"},"gold_diff":{"kind":"string","value":"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\nindex 31e4d51a..29001878 100644\n--- a/src/Grace.Server/Branch.Server.fs\n+++ b/src/Grace.Server/Branch.Server.fs\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\n open Grace.Actors.Extensions.ActorProxy\n open Grace.Actors.Interfaces\n open Grace.Actors.Services\n+open Grace.Server.Security\n open Grace.Server.Services\n open Grace.Server.Validations\n open Grace.Shared\n+open Grace.Shared.AnnotationLineCore\n open Grace.Shared.Extensions\n open Grace.Shared.Parameters.Branch\n open Grace.Types\n+open Grace.Types.Annotation\n+open Grace.Types.Authorization\n open Grace.Types.Branch\n open Grace.Types.Diff\n open Grace.Types.Common\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\n open Grace.Shared.Validation.Errors\n open Grace.Shared.Validation.Utilities\n open Microsoft.AspNetCore.Http\n+open Microsoft.Extensions.DependencyInjection\n open Microsoft.Extensions.Logging\n open System\n open System.Collections.Concurrent\n@@ -36,6 +41,350 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId ->\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\n+ | _ -> Some basedOnReferenceId\n+ | None -> None\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let internal unreadableAncestorBoundaryKind = \"UnmaterializableAncestor\"\n+\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\n+\n+ let private emptyAnnotationDocument path referenceDto =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\n+ match materializationResult with\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"},"changed_files":{"kind":"list like","value":["src/Grace.Server/Branch.Server.fs"],"string":"[\n \"src/Grace.Server/Branch.Server.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"**<sub><sub></sub></sub> Fetch ancestors of BasedOn parent references**\n\nWhen a child branch or rebase points at a parent-branch promotion, this only adds that immediate `BasedOn` reference to the annotation history. Because no window of the parent branch's earlier references is fetched, `buildEffectiveHistory` has no predecessor for the parent promotion and traversal stops there, so inherited lines are attributed to the promotion/rebase boundary instead of the commit/save that actually introduced them. Fetch the linked reference's branch history around that reference, recursively, before building the effective traversal.\n\nUseful? React with 👍 / 👎.","path":"src/Grace.Server/Branch.Server.fs","hunk":"@@ -36,6 +41,265 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let private buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | Ok (Some document) -> effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\n+ | Ok None ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ let document = { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = false })\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> ordered |> Array.truncate maxReferences\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ ordered[startIndex..targetIndex]\n+\n+ let private includeStoredBasedOnReferences repositoryId correlationId (references: Reference.ReferenceDto array) =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId when not (knownReferenceIds.Contains basedOnReferenceId) ->\n+ knownReferenceIds.Add basedOnReferenceId |> ignore\n+\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ effectiveReferences.Add basedOnReference","resolving_sha":"93f43484515f9122613be123e3b784cc6c479469","resolving_diff":"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\nindex 31e4d51a..29001878 100644\n--- a/src/Grace.Server/Branch.Server.fs\n+++ b/src/Grace.Server/Branch.Server.fs\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\n open Grace.Actors.Extensions.ActorProxy\n open Grace.Actors.Interfaces\n open Grace.Actors.Services\n+open Grace.Server.Security\n open Grace.Server.Services\n open Grace.Server.Validations\n open Grace.Shared\n+open Grace.Shared.AnnotationLineCore\n open Grace.Shared.Extensions\n open Grace.Shared.Parameters.Branch\n open Grace.Types\n+open Grace.Types.Annotation\n+open Grace.Types.Authorization\n open Grace.Types.Branch\n open Grace.Types.Diff\n open Grace.Types.Common\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\n open Grace.Shared.Validation.Errors\n open Grace.Shared.Validation.Utilities\n open Microsoft.AspNetCore.Http\n+open Microsoft.Extensions.DependencyInjection\n open Microsoft.Extensions.Logging\n open System\n open System.Collections.Concurrent\n@@ -36,6 +41,350 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId ->\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\n+ | _ -> Some basedOnReferenceId\n+ | None -> None\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let internal unreadableAncestorBoundaryKind = \"UnmaterializableAncestor\"\n+\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\n+\n+ let private emptyAnnotationDocument path referenceDto =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\n+ match materializationResult with\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"}],"string":"[\n {\n \"comment\": \"**<sub><sub></sub></sub> Fetch ancestors of BasedOn parent references**\\n\\nWhen a child branch or rebase points at a parent-branch promotion, this only adds that immediate `BasedOn` reference to the annotation history. Because no window of the parent branch's earlier references is fetched, `buildEffectiveHistory` has no predecessor for the parent promotion and traversal stops there, so inherited lines are attributed to the promotion/rebase boundary instead of the commit/save that actually introduced them. Fetch the linked reference's branch history around that reference, recursively, before building the effective traversal.\\n\\nUseful? React with 👍 / 👎.\",\n \"path\": \"src/Grace.Server/Branch.Server.fs\",\n \"hunk\": \"@@ -36,6 +41,265 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ referenceDto.Links\\n+ |> Seq.tryPick (function\\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\\n+ | _ -> None)\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let private buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let basedOnByReferenceId =\\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\\n+\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+ |> Array.iter (fun referenceDto ->\\n+ let basedOnReferenceId =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some referenceId -> Some referenceId\\n+ | None ->\\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\\n+ | true, previousReferenceId -> Some previousReferenceId\\n+ | false, _ -> None\\n+\\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\\n+\\n+ result\\n+\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId =\\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, referenceId -> referenceId\\n+ | false, _ -> None\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | Ok (Some document) -> effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\\n+ | Ok None ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ let document = { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = false })\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> ordered |> Array.truncate maxReferences\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ ordered[startIndex..targetIndex]\\n+\\n+ let private includeStoredBasedOnReferences repositoryId correlationId (references: Reference.ReferenceDto array) =\\n+ task {\\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\\n+\\n+ let knownReferenceIds =\\n+ HashSet<ReferenceId>(\\n+ references\\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\\n+ )\\n+\\n+ let mutable index = 0\\n+\\n+ while index < effectiveReferences.Count do\\n+ let referenceDto = effectiveReferences[index]\\n+\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some basedOnReferenceId when not (knownReferenceIds.Contains basedOnReferenceId) ->\\n+ knownReferenceIds.Add basedOnReferenceId |> ignore\\n+\\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\\n+\\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\\n+ && basedOnReference.DeletedAt.IsNone\\n+ && basedOnReference.RepositoryId = repositoryId then\\n+ effectiveReferences.Add basedOnReference\",\n \"resolving_sha\": \"93f43484515f9122613be123e3b784cc6c479469\",\n \"resolving_diff\": \"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\\nindex 31e4d51a..29001878 100644\\n--- a/src/Grace.Server/Branch.Server.fs\\n+++ b/src/Grace.Server/Branch.Server.fs\\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\\n open Grace.Actors.Extensions.ActorProxy\\n open Grace.Actors.Interfaces\\n open Grace.Actors.Services\\n+open Grace.Server.Security\\n open Grace.Server.Services\\n open Grace.Server.Validations\\n open Grace.Shared\\n+open Grace.Shared.AnnotationLineCore\\n open Grace.Shared.Extensions\\n open Grace.Shared.Parameters.Branch\\n open Grace.Types\\n+open Grace.Types.Annotation\\n+open Grace.Types.Authorization\\n open Grace.Types.Branch\\n open Grace.Types.Diff\\n open Grace.Types.Common\\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\\n open Grace.Shared.Validation.Errors\\n open Grace.Shared.Validation.Utilities\\n open Microsoft.AspNetCore.Http\\n+open Microsoft.Extensions.DependencyInjection\\n open Microsoft.Extensions.Logging\\n open System\\n open System.Collections.Concurrent\\n@@ -36,6 +41,350 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ referenceDto.Links\\n+ |> Seq.tryPick (function\\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\\n+ | _ -> None)\\n+\\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some basedOnReferenceId ->\\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\\n+ | _ -> Some basedOnReferenceId\\n+ | None -> None\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let internal unreadableAncestorBoundaryKind = \\\"UnmaterializableAncestor\\\"\\n+\\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\\n+\\n+ let private emptyAnnotationDocument path referenceDto =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\\n+ match materializationResult with\\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\\n+\\n+ let internal buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (targetReferenceId: ReferenceId)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let basedOnByReferenceId =\\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\\n+\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+ |> Array.iter (fun referenceDto ->\\n+ let basedOnReferenceId =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some referenceId -> Some referenceId\\n+ | None ->\\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\\n+ | true, previousReferenceId -> Some previousReferenceId\\n+ | false, _ -> None\\n+\\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\\n+\\n+ result\\n+\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId =\\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, referenceId -> referenceId\\n+ | false, _ -> None\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | materializationResult ->\\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\\n+ | Ok document -> effectiveHistory.Add document\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some _ -> referenceDto\\n+ | None ->\\n+ { referenceDto with\\n+ Links =\\n+ referenceDto.Links\\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\\n+ |> Array.ofSeq\\n+ }\\n+\\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\\n+\\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ let window = ordered[startIndex..targetIndex]\\n+\\n+ if startIndex > 0 && window.Length > 0 then\\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\\n+\\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\\n+\\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\\n+\\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+\\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\\n+ .References\\n+\\n+ let private includeStoredBasedOnReferences\\n+ repositoryId\\n+ correlationId\\n+ maxReferences\\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\\n+\\n+ let knownReferenceIds =\\n+ HashSet<ReferenceId>(\\n+ references\\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\\n+ )\\n+\\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\\n+ let mutable index = 0\\n+\\n+ while index < effectiveReferences.Count do\\n+ let referenceDto = effectiveReferences[index]\\n+\\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\\n+ | Some basedOnReferenceId when\\n+ not (knownReferenceIds.Contains basedOnReferenceId)\\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\\n+ ->\\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\\n+\\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\\n+ && basedOnReference.DeletedAt.IsNone\\n+ && basedOnReference.RepositoryId = repositoryId then\\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let basedOnHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| basedOnReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\\n+\\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\\n+\\n+ let mutable basedOnHistoryIndex = 0\\n+\\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\\n+\\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\\n+ |> ignore\\n+\\n+ effectiveReferences.Add basedOnHistoryReference\\n+\\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\\n+ | _ -> ()\\n+\\n+ index <- index + 1\\n+\\n+ return effectiveReferences.ToArray()\\n+ }\\n+\\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\\n+ task {\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ match parameters.Validate() with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\\n+ | Ok () ->\\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\\n+\\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\\n+ let! targetReference = referenceActorProxy.Get correlationId\\n+\\n+ if targetReference.ReferenceId = ReferenceId.Empty then\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\\n+ elif targetReference.DeletedAt.IsSome then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference has been deleted.\\\")\\n+ elif targetReference.RepositoryId\\n+ <> graceIds.RepositoryId\\n+ || targetReference.BranchId <> graceIds.BranchId then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference must belong to the requested repository and branch.\\\")\\n+ else\\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\\n+\\n+ match tryFindFileVersion normalizedPath targetContents with\\n+ | None -> return Error(annotationError correlationId $\\\"Annotation target path '{normalizedPath}' was not found in the target Reference.\\\")\\n+ | Some _ ->\\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let localHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| targetReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\\n+\\n+ let! references =\\n+ includeStoredBasedOnReferences\\n+ targetReference.RepositoryId\\n+ correlationId\\n+ parameters.MaxReferences\\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\\n+ localHistoryWindow.References\\n+\\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\\n+ | Error error -> return Error error\\n+ | Ok history ->\\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\\n+\\n+ match\\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\\n+ (\\n+ parameters.LineRange,\\n+ targetReference.ReferenceId,\\n+ normalizedPath,\\n+ parameters.ReferenceTypes,\\n+ parameters.MaxReferences,\\n+ parameters.IncludeLineText,\\n+ traversal\\n+ )\\n+ with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok annotation ->\\n+ match Annotation.validate annotation with\\n+ | Ok () -> return Ok annotation\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ }\\n+\\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\\n task {\\n let startTime = getCurrentInstant ()\\n@@ -1071,6 +1420,77 @@ module Branch =\\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\\n }\\n \\n+ /// Annotates a server-known file from an existing reference in a branch.\\n+ let Annotate: HttpHandler =\\n+ fun (next: HttpFunc) (context: HttpContext) ->\\n+ task {\\n+ let startTime = getCurrentInstant ()\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ try\\n+ let! parameters = context |> parse<AnnotateParameters>\\n+ parameters.OwnerId <- graceIds.OwnerIdString\\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\\n+ parameters.BranchId <- graceIds.BranchIdString\\n+\\n+ match! buildAnnotationForRequest context parameters with\\n+ | Ok annotation ->\\n+ let graceReturnValue =\\n+ (GraceReturnValue.Create annotation correlationId)\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogInformation(\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString,\\n+ parameters.TargetReferenceId\\n+ )\\n+\\n+ return! context |> result200Ok graceReturnValue\\n+ | Error graceError ->\\n+ graceError\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+ |> ignore\\n+\\n+ return! context |> result400BadRequest graceError\\n+ with\\n+ | ex ->\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogError(\\n+ ex,\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString\\n+ )\\n+\\n+ return!\\n+ context\\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\\n+ }\\n+\\n /// Gets a list of references, given a list of reference IDs.\\n let GetLatestReferencesByReferenceTypes: HttpHandler =\\n fun (next: HttpFunc) (context: HttpContext) ->\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}},{"rowIdx":10499,"cells":{"repo":{"kind":"string","value":"ScottArbeit/Grace"},"pr_number":{"kind":"number","value":328,"string":"328"},"task_type":{"kind":"string","value":"comment_to_fix"},"issue_text":{"kind":"string","value":""},"pr_title":{"kind":"string","value":"Add branch annotate API and SDK wrapper"},"pr_body":{"kind":"string","value":"**<sub><sub></sub></sub> Handle null ReferenceTypes as a validation error**\n\nIf a client sends `\"ReferenceTypes\": null` instead of omitting the field, this passes a null array into `buildAnnotationFromEffectiveHistoryTraversal`; the core annotation code maps that array with `Array.map`, so the request falls into the exception handler and returns a 500 after doing the storage/history work. Treat a null filter as empty or reject it during parameter validation so malformed annotate requests return a 400.\n\nUseful? React with 👍 / 👎."},"base_sha":{"kind":"string","value":"2c0265092c07919370c9e89f089affd857e7e649"},"head_sha":{"kind":"string","value":"93f43484515f9122613be123e3b784cc6c479469"},"gold_diff":{"kind":"string","value":"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\nindex 31e4d51a..29001878 100644\n--- a/src/Grace.Server/Branch.Server.fs\n+++ b/src/Grace.Server/Branch.Server.fs\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\n open Grace.Actors.Extensions.ActorProxy\n open Grace.Actors.Interfaces\n open Grace.Actors.Services\n+open Grace.Server.Security\n open Grace.Server.Services\n open Grace.Server.Validations\n open Grace.Shared\n+open Grace.Shared.AnnotationLineCore\n open Grace.Shared.Extensions\n open Grace.Shared.Parameters.Branch\n open Grace.Types\n+open Grace.Types.Annotation\n+open Grace.Types.Authorization\n open Grace.Types.Branch\n open Grace.Types.Diff\n open Grace.Types.Common\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\n open Grace.Shared.Validation.Errors\n open Grace.Shared.Validation.Utilities\n open Microsoft.AspNetCore.Http\n+open Microsoft.Extensions.DependencyInjection\n open Microsoft.Extensions.Logging\n open System\n open System.Collections.Concurrent\n@@ -36,6 +41,350 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId ->\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\n+ | _ -> Some basedOnReferenceId\n+ | None -> None\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let internal unreadableAncestorBoundaryKind = \"UnmaterializableAncestor\"\n+\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\n+\n+ let private emptyAnnotationDocument path referenceDto =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\n+ match materializationResult with\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"},"changed_files":{"kind":"list like","value":["src/Grace.Server/Branch.Server.fs"],"string":"[\n \"src/Grace.Server/Branch.Server.fs\"\n]","isConversational":false},"review_threads":{"kind":"list like","value":[{"comment":"**<sub><sub></sub></sub> Handle null ReferenceTypes as a validation error**\n\nIf a client sends `\"ReferenceTypes\": null` instead of omitting the field, this passes a null array into `buildAnnotationFromEffectiveHistoryTraversal`; the core annotation code maps that array with `Array.map`, so the request falls into the exception handler and returns a 500 after doing the storage/history work. Treat a null filter as empty or reject it during parameter validation so malformed annotate requests return a 400.\n\nUseful? React with 👍 / 👎.","path":"src/Grace.Server/Branch.Server.fs","hunk":"@@ -36,6 +41,265 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let private buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | Ok (Some document) -> effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\n+ | Ok None ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ let document = { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = false })\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> ordered |> Array.truncate maxReferences\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ ordered[startIndex..targetIndex]\n+\n+ let private includeStoredBasedOnReferences repositoryId correlationId (references: Reference.ReferenceDto array) =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId when not (knownReferenceIds.Contains basedOnReferenceId) ->\n+ knownReferenceIds.Add basedOnReferenceId |> ignore\n+\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ effectiveReferences.Add basedOnReference\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindow targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references = includeStoredBasedOnReferences targetReference.RepositoryId correlationId localHistoryWindow\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,","resolving_sha":"93f43484515f9122613be123e3b784cc6c479469","resolving_diff":"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\nindex 31e4d51a..29001878 100644\n--- a/src/Grace.Server/Branch.Server.fs\n+++ b/src/Grace.Server/Branch.Server.fs\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\n open Grace.Actors.Extensions.ActorProxy\n open Grace.Actors.Interfaces\n open Grace.Actors.Services\n+open Grace.Server.Security\n open Grace.Server.Services\n open Grace.Server.Validations\n open Grace.Shared\n+open Grace.Shared.AnnotationLineCore\n open Grace.Shared.Extensions\n open Grace.Shared.Parameters.Branch\n open Grace.Types\n+open Grace.Types.Annotation\n+open Grace.Types.Authorization\n open Grace.Types.Branch\n open Grace.Types.Diff\n open Grace.Types.Common\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\n open Grace.Shared.Validation.Errors\n open Grace.Shared.Validation.Utilities\n open Microsoft.AspNetCore.Http\n+open Microsoft.Extensions.DependencyInjection\n open Microsoft.Extensions.Logging\n open System\n open System.Collections.Concurrent\n@@ -36,6 +41,350 @@ module Branch =\n \n let log = ApplicationContext.loggerFactory.CreateLogger(\"Branch.Server\")\n \n+ let private annotationError correlationId message = GraceError.Create message correlationId\n+\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\n+\n+ let private isMalformedAnnotationPath (path: string) =\n+ let normalized = normalizeAnnotationPath path\n+\n+ String.IsNullOrWhiteSpace normalized\n+ || normalized.StartsWith(\"/\", StringComparison.Ordinal)\n+ || System.IO.Path.IsPathRooted(path)\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\n+ |> Array.exists (fun segment -> segment = \".\" || segment = \"..\"))\n+\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\n+ { AnnotationSourceReference.Default with\n+ SourceReferenceId = $\"{referenceDto.ReferenceId}\"\n+ ReferenceId = referenceDto.ReferenceId\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\n+ ReferenceText = referenceDto.ReferenceText\n+ DirectoryVersionId = referenceDto.DirectoryId\n+ CreatedAt = Some referenceDto.CreatedAt\n+ CreatedBy = referenceDto.CreatedBy\n+ }\n+\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\n+ let normalizedPath = normalizeAnnotationPath path\n+\n+ contents\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\n+\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\n+ }\n+\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\n+ task {\n+ let principals = PrincipalMapper.getPrincipals context.User\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\n+\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\n+\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\n+ | Allowed _ -> return true\n+ | Denied _ -> return false\n+ }\n+\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ referenceDto.Links\n+ |> Seq.tryPick (function\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\n+ | _ -> None)\n+\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some basedOnReferenceId ->\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\n+ | _ -> Some basedOnReferenceId\n+ | None -> None\n+\n+ let private materializeAnnotationDocument\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (referenceDto: Reference.ReferenceDto)\n+ =\n+ task {\n+ let correlationId = getCorrelationId context\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\n+\n+ match tryFindFileVersion path contents with\n+ | None -> return Ok None\n+ | Some fileVersion ->\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\n+ | Ok materialized ->\n+ let document =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\n+\n+ return Ok(Some document)\n+ | Error error -> return Error error\n+ }\n+\n+ let internal unreadableAncestorBoundaryKind = \"UnmaterializableAncestor\"\n+\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\n+\n+ let private emptyAnnotationDocument path referenceDto =\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\n+\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\n+ match materializationResult with\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\n+\n+ let internal buildEffectiveHistory\n+ (context: HttpContext)\n+ (repositoryDto: Repository.RepositoryDto)\n+ (path: RelativePath)\n+ (targetReferenceId: ReferenceId)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let basedOnByReferenceId =\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\n+\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+ |> Array.iter (fun referenceDto ->\n+ let basedOnReferenceId =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some referenceId -> Some referenceId\n+ | None ->\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\n+ | true, previousReferenceId -> Some previousReferenceId\n+ | false, _ -> None\n+\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\n+\n+ result\n+\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\n+ let mutable index = 0\n+ let mutable error: GraceError option = None\n+\n+ while index < references.Length && error.IsNone do\n+ let referenceDto = references[index]\n+\n+ let basedOnReferenceId =\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\n+ | true, referenceId -> referenceId\n+ | false, _ -> None\n+\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\n+\n+ if isAuthorized then\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\n+ | materializationResult ->\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\n+ | Ok document -> effectiveHistory.Add document\n+ | Error materializationError -> error <- Some materializationError\n+ else\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\n+\n+ index <- index + 1\n+\n+ match error with\n+ | Some error -> return Error error\n+ | None -> return Ok(effectiveHistory.ToArray())\n+ }\n+\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\n+ match tryGetBasedOnReferenceId referenceDto with\n+ | Some _ -> referenceDto\n+ | None ->\n+ { referenceDto with\n+ Links =\n+ referenceDto.Links\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\n+ |> Array.ofSeq\n+ }\n+\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\n+\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ let ordered =\n+ references\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\n+\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\n+\n+ match ordered\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\n+ with\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+ | Some targetIndex ->\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\n+ let window = ordered[startIndex..targetIndex]\n+\n+ if startIndex > 0 && window.Length > 0 then\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\n+\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\n+\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\n+\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\n+\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\n+ .References\n+\n+ let private includeStoredBasedOnReferences\n+ repositoryId\n+ correlationId\n+ maxReferences\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\n+ (references: Reference.ReferenceDto array)\n+ =\n+ task {\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\n+\n+ let knownReferenceIds =\n+ HashSet<ReferenceId>(\n+ references\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\n+ )\n+\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\n+ let mutable index = 0\n+\n+ while index < effectiveReferences.Count do\n+ let referenceDto = effectiveReferences[index]\n+\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\n+ | Some basedOnReferenceId when\n+ not (knownReferenceIds.Contains basedOnReferenceId)\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\n+ ->\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\n+\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\n+ && basedOnReference.DeletedAt.IsNone\n+ && basedOnReference.RepositoryId = repositoryId then\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\n+\n+ let basedOnHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| basedOnReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\n+\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\n+\n+ let mutable basedOnHistoryIndex = 0\n+\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\n+\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\n+ |> ignore\n+\n+ effectiveReferences.Add basedOnHistoryReference\n+\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\n+ | _ -> ()\n+\n+ index <- index + 1\n+\n+ return effectiveReferences.ToArray()\n+ }\n+\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\n+ task {\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ match parameters.Validate() with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\n+ return Error(annotationError correlationId \"Annotation Path must be a relative file path.\")\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\n+ | Ok () ->\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\n+\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\n+ let! targetReference = referenceActorProxy.Get correlationId\n+\n+ if targetReference.ReferenceId = ReferenceId.Empty then\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\n+ elif targetReference.DeletedAt.IsSome then\n+ return Error(annotationError correlationId \"Annotation target Reference has been deleted.\")\n+ elif targetReference.RepositoryId\n+ <> graceIds.RepositoryId\n+ || targetReference.BranchId <> graceIds.BranchId then\n+ return Error(annotationError correlationId \"Annotation target Reference must belong to the requested repository and branch.\")\n+ else\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\n+\n+ match tryFindFileVersion normalizedPath targetContents with\n+ | None -> return Error(annotationError correlationId $\"Annotation target path '{normalizedPath}' was not found in the target Reference.\")\n+ | Some _ ->\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\n+\n+ let localHistoryWindow =\n+ if branchReferences\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\n+ branchReferences\n+ else\n+ Array.append branchReferences [| targetReference |]\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\n+\n+ let! references =\n+ includeStoredBasedOnReferences\n+ targetReference.RepositoryId\n+ correlationId\n+ parameters.MaxReferences\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\n+ localHistoryWindow.References\n+\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\n+ | Error error -> return Error error\n+ | Ok history ->\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\n+\n+ match\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\n+ (\n+ parameters.LineRange,\n+ targetReference.ReferenceId,\n+ normalizedPath,\n+ parameters.ReferenceTypes,\n+ parameters.MaxReferences,\n+ parameters.IncludeLineText,\n+ traversal\n+ )\n+ with\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ | Ok annotation ->\n+ match Annotation.validate annotation with\n+ | Ok () -> return Ok annotation\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\" \", errors)))\n+ }\n+\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\n task {\n let startTime = getCurrentInstant ()\n@@ -1071,6 +1420,77 @@ module Branch =\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\n }\n \n+ /// Annotates a server-known file from an existing reference in a branch.\n+ let Annotate: HttpHandler =\n+ fun (next: HttpFunc) (context: HttpContext) ->\n+ task {\n+ let startTime = getCurrentInstant ()\n+ let graceIds = getGraceIds context\n+ let correlationId = getCorrelationId context\n+\n+ try\n+ let! parameters = context |> parse<AnnotateParameters>\n+ parameters.OwnerId <- graceIds.OwnerIdString\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\n+ parameters.BranchId <- graceIds.BranchIdString\n+\n+ match! buildAnnotationForRequest context parameters with\n+ | Ok annotation ->\n+ let graceReturnValue =\n+ (GraceReturnValue.Create annotation correlationId)\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogInformation(\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString,\n+ parameters.TargetReferenceId\n+ )\n+\n+ return! context |> result200Ok graceReturnValue\n+ | Error graceError ->\n+ graceError\n+ .enhance(getParametersAsDictionary parameters)\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\n+ .enhance(nameof BranchId, graceIds.BranchId)\n+ .enhance (\"Path\", context.Request.Path.Value)\n+ |> ignore\n+\n+ return! context |> result400BadRequest graceError\n+ with\n+ | ex ->\n+ let duration_ms = getDurationRightAligned_ms startTime\n+\n+ log.LogError(\n+ ex,\n+ \"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\",\n+ getCurrentInstantExtended (),\n+ getMachineName,\n+ duration_ms,\n+ correlationId,\n+ context.Request.Path,\n+ graceIds.BranchIdString\n+ )\n+\n+ return!\n+ context\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\n+ }\n+\n /// Gets a list of references, given a list of reference IDs.\n let GetLatestReferencesByReferenceTypes: HttpHandler =\n fun (next: HttpFunc) (context: HttpContext) ->\n"}],"string":"[\n {\n \"comment\": \"**<sub><sub></sub></sub> Handle null ReferenceTypes as a validation error**\\n\\nIf a client sends `\\\"ReferenceTypes\\\": null` instead of omitting the field, this passes a null array into `buildAnnotationFromEffectiveHistoryTraversal`; the core annotation code maps that array with `Array.map`, so the request falls into the exception handler and returns a 500 after doing the storage/history work. Treat a null filter as empty or reject it during parameter validation so malformed annotate requests return a 400.\\n\\nUseful? React with 👍 / 👎.\",\n \"path\": \"src/Grace.Server/Branch.Server.fs\",\n \"hunk\": \"@@ -36,6 +41,265 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ referenceDto.Links\\n+ |> Seq.tryPick (function\\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\\n+ | _ -> None)\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let private buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let basedOnByReferenceId =\\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\\n+\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+ |> Array.iter (fun referenceDto ->\\n+ let basedOnReferenceId =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some referenceId -> Some referenceId\\n+ | None ->\\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\\n+ | true, previousReferenceId -> Some previousReferenceId\\n+ | false, _ -> None\\n+\\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\\n+\\n+ result\\n+\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId =\\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, referenceId -> referenceId\\n+ | false, _ -> None\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | Ok (Some document) -> effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\\n+ | Ok None ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = true })\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ let document = { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ effectiveHistory.Add({ Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = false })\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> ordered |> Array.truncate maxReferences\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ ordered[startIndex..targetIndex]\\n+\\n+ let private includeStoredBasedOnReferences repositoryId correlationId (references: Reference.ReferenceDto array) =\\n+ task {\\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\\n+\\n+ let knownReferenceIds =\\n+ HashSet<ReferenceId>(\\n+ references\\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\\n+ )\\n+\\n+ let mutable index = 0\\n+\\n+ while index < effectiveReferences.Count do\\n+ let referenceDto = effectiveReferences[index]\\n+\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some basedOnReferenceId when not (knownReferenceIds.Contains basedOnReferenceId) ->\\n+ knownReferenceIds.Add basedOnReferenceId |> ignore\\n+\\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\\n+\\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\\n+ && basedOnReference.DeletedAt.IsNone\\n+ && basedOnReference.RepositoryId = repositoryId then\\n+ effectiveReferences.Add basedOnReference\\n+ | _ -> ()\\n+\\n+ index <- index + 1\\n+\\n+ return effectiveReferences.ToArray()\\n+ }\\n+\\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\\n+ task {\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ match parameters.Validate() with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\\n+ | Ok () ->\\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\\n+\\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\\n+ let! targetReference = referenceActorProxy.Get correlationId\\n+\\n+ if targetReference.ReferenceId = ReferenceId.Empty then\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\\n+ elif targetReference.DeletedAt.IsSome then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference has been deleted.\\\")\\n+ elif targetReference.RepositoryId\\n+ <> graceIds.RepositoryId\\n+ || targetReference.BranchId <> graceIds.BranchId then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference must belong to the requested repository and branch.\\\")\\n+ else\\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\\n+\\n+ match tryFindFileVersion normalizedPath targetContents with\\n+ | None -> return Error(annotationError correlationId $\\\"Annotation target path '{normalizedPath}' was not found in the target Reference.\\\")\\n+ | Some _ ->\\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let localHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| targetReference |]\\n+ |> orderedHistoryWindow targetReference.ReferenceId parameters.MaxReferences\\n+\\n+ let! references = includeStoredBasedOnReferences targetReference.RepositoryId correlationId localHistoryWindow\\n+\\n+ match! buildEffectiveHistory context repositoryDto normalizedPath references with\\n+ | Error error -> return Error error\\n+ | Ok history ->\\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\\n+\\n+ match\\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\\n+ (\\n+ parameters.LineRange,\\n+ targetReference.ReferenceId,\\n+ normalizedPath,\\n+ parameters.ReferenceTypes,\",\n \"resolving_sha\": \"93f43484515f9122613be123e3b784cc6c479469\",\n \"resolving_diff\": \"diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs\\nindex 31e4d51a..29001878 100644\\n--- a/src/Grace.Server/Branch.Server.fs\\n+++ b/src/Grace.Server/Branch.Server.fs\\n@@ -6,12 +6,16 @@ open Grace.Actors.Constants\\n open Grace.Actors.Extensions.ActorProxy\\n open Grace.Actors.Interfaces\\n open Grace.Actors.Services\\n+open Grace.Server.Security\\n open Grace.Server.Services\\n open Grace.Server.Validations\\n open Grace.Shared\\n+open Grace.Shared.AnnotationLineCore\\n open Grace.Shared.Extensions\\n open Grace.Shared.Parameters.Branch\\n open Grace.Types\\n+open Grace.Types.Annotation\\n+open Grace.Types.Authorization\\n open Grace.Types.Branch\\n open Grace.Types.Diff\\n open Grace.Types.Common\\n@@ -20,6 +24,7 @@ open Grace.Shared.Validation.Common\\n open Grace.Shared.Validation.Errors\\n open Grace.Shared.Validation.Utilities\\n open Microsoft.AspNetCore.Http\\n+open Microsoft.Extensions.DependencyInjection\\n open Microsoft.Extensions.Logging\\n open System\\n open System.Collections.Concurrent\\n@@ -36,6 +41,350 @@ module Branch =\\n \\n let log = ApplicationContext.loggerFactory.CreateLogger(\\\"Branch.Server\\\")\\n \\n+ let private annotationError correlationId message = GraceError.Create message correlationId\\n+\\n+ let private normalizeAnnotationPath (path: string) = normalizeFilePath path\\n+\\n+ let private isMalformedAnnotationPath (path: string) =\\n+ let normalized = normalizeAnnotationPath path\\n+\\n+ String.IsNullOrWhiteSpace normalized\\n+ || normalized.StartsWith(\\\"/\\\", StringComparison.Ordinal)\\n+ || System.IO.Path.IsPathRooted(path)\\n+ || (normalized.Split('/', StringSplitOptions.RemoveEmptyEntries)\\n+ |> Array.exists (fun segment -> segment = \\\".\\\" || segment = \\\"..\\\"))\\n+\\n+ let private toAnnotationSourceReference (referenceDto: Reference.ReferenceDto) =\\n+ { AnnotationSourceReference.Default with\\n+ SourceReferenceId = $\\\"{referenceDto.ReferenceId}\\\"\\n+ ReferenceId = referenceDto.ReferenceId\\n+ ReferenceType = getDiscriminatedUnionCaseName referenceDto.ReferenceType\\n+ ReferenceText = referenceDto.ReferenceText\\n+ DirectoryVersionId = referenceDto.DirectoryId\\n+ CreatedAt = Some referenceDto.CreatedAt\\n+ CreatedBy = referenceDto.CreatedBy\\n+ }\\n+\\n+ let private tryFindFileVersion (path: RelativePath) (contents: DirectoryVersion.DirectoryVersionDto array) =\\n+ let normalizedPath = normalizeAnnotationPath path\\n+\\n+ contents\\n+ |> Seq.collect (fun directoryVersionDto -> directoryVersionDto.DirectoryVersion.Files :> seq<FileVersion>)\\n+ |> Seq.tryFind (fun fileVersion -> String.Equals(normalizeAnnotationPath fileVersion.RelativePath, normalizedPath, StringComparison.Ordinal))\\n+\\n+ let private getReferenceContents repositoryId correlationId (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let directoryActorProxy = DirectoryVersion.CreateActorProxy referenceDto.DirectoryId repositoryId correlationId\\n+ return! directoryActorProxy.GetRecursiveDirectoryVersions false correlationId\\n+ }\\n+\\n+ let private canReadReferenceBranch (context: HttpContext) (referenceDto: Reference.ReferenceDto) =\\n+ task {\\n+ let principals = PrincipalMapper.getPrincipals context.User\\n+ let claims = PrincipalMapper.getEffectiveClaims context.User\\n+ let evaluator = context.RequestServices.GetRequiredService<IGracePermissionEvaluator>()\\n+\\n+ let resource = Resource.Branch(referenceDto.OwnerId, referenceDto.OrganizationId, referenceDto.RepositoryId, referenceDto.BranchId)\\n+\\n+ match! evaluator.CheckAsync(principals, claims, Operation.BranchRead, resource) with\\n+ | Allowed _ -> return true\\n+ | Denied _ -> return false\\n+ }\\n+\\n+ let tryGetBasedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ referenceDto.Links\\n+ |> Seq.tryPick (function\\n+ | ReferenceLinkType.BasedOn referenceId when referenceId <> ReferenceId.Empty -> Some referenceId\\n+ | _ -> None)\\n+\\n+ let private tryGetStoredBasedOnReferenceId (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>) (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some basedOnReferenceId ->\\n+ match syntheticBasedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, syntheticBasedOnReferenceId when syntheticBasedOnReferenceId = basedOnReferenceId -> None\\n+ | _ -> Some basedOnReferenceId\\n+ | None -> None\\n+\\n+ let private materializeAnnotationDocument\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (referenceDto: Reference.ReferenceDto)\\n+ =\\n+ task {\\n+ let correlationId = getCorrelationId context\\n+ let! contents = getReferenceContents repositoryDto.RepositoryId correlationId referenceDto\\n+\\n+ match tryFindFileVersion path contents with\\n+ | None -> return Ok None\\n+ | Some fileVersion ->\\n+ match! AnnotationMaterialization.materializeTargetText repositoryDto fileVersion correlationId context.RequestAborted with\\n+ | Ok materialized ->\\n+ let document =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = materialized.Bytes }\\n+\\n+ return Ok(Some document)\\n+ | Error error -> return Error error\\n+ }\\n+\\n+ let internal unreadableAncestorBoundaryKind = \\\"UnmaterializableAncestor\\\"\\n+\\n+ let private effectiveHistoryDocument document basedOnReferenceId isAuthorized boundaryKind =\\n+ { Document = document; BasedOnReferenceId = basedOnReferenceId; IsAuthorized = isAuthorized; BoundaryKind = boundaryKind }\\n+\\n+ let private emptyAnnotationDocument path referenceDto =\\n+ { SourceReference = toAnnotationSourceReference referenceDto; Path = normalizeAnnotationPath path; Content = Array.empty }\\n+\\n+ let internal effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult =\\n+ match materializationResult with\\n+ | Ok (Some document) -> Ok(effectiveHistoryDocument document basedOnReferenceId true None)\\n+ | Ok None -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true None)\\n+ | Error materializationError when referenceDto.ReferenceId = targetReferenceId -> Error materializationError\\n+ | Error _ -> Ok(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId true (Some unreadableAncestorBoundaryKind))\\n+\\n+ let internal buildEffectiveHistory\\n+ (context: HttpContext)\\n+ (repositoryDto: Repository.RepositoryDto)\\n+ (path: RelativePath)\\n+ (targetReferenceId: ReferenceId)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let basedOnByReferenceId =\\n+ let result = Dictionary<ReferenceId, ReferenceId option>()\\n+ let previousByBranchId = Dictionary<BranchId, ReferenceId>()\\n+\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+ |> Array.iter (fun referenceDto ->\\n+ let basedOnReferenceId =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some referenceId -> Some referenceId\\n+ | None ->\\n+ match previousByBranchId.TryGetValue referenceDto.BranchId with\\n+ | true, previousReferenceId -> Some previousReferenceId\\n+ | false, _ -> None\\n+\\n+ result[referenceDto.ReferenceId] <- basedOnReferenceId\\n+ previousByBranchId[referenceDto.BranchId] <- referenceDto.ReferenceId)\\n+\\n+ result\\n+\\n+ let effectiveHistory = ResizeArray<EffectiveHistoryDocument>()\\n+ let mutable index = 0\\n+ let mutable error: GraceError option = None\\n+\\n+ while index < references.Length && error.IsNone do\\n+ let referenceDto = references[index]\\n+\\n+ let basedOnReferenceId =\\n+ match basedOnByReferenceId.TryGetValue referenceDto.ReferenceId with\\n+ | true, referenceId -> referenceId\\n+ | false, _ -> None\\n+\\n+ let! isAuthorized = canReadReferenceBranch context referenceDto\\n+\\n+ if isAuthorized then\\n+ match! materializeAnnotationDocument context repositoryDto path referenceDto with\\n+ | materializationResult ->\\n+ match effectiveHistoryFromMaterializationResult path targetReferenceId referenceDto basedOnReferenceId materializationResult with\\n+ | Ok document -> effectiveHistory.Add document\\n+ | Error materializationError -> error <- Some materializationError\\n+ else\\n+ effectiveHistory.Add(effectiveHistoryDocument (emptyAnnotationDocument path referenceDto) basedOnReferenceId false None)\\n+\\n+ index <- index + 1\\n+\\n+ match error with\\n+ | Some error -> return Error error\\n+ | None -> return Ok(effectiveHistory.ToArray())\\n+ }\\n+\\n+ let private withBasedOnLink basedOnReferenceId (referenceDto: Reference.ReferenceDto) =\\n+ match tryGetBasedOnReferenceId referenceDto with\\n+ | Some _ -> referenceDto\\n+ | None ->\\n+ { referenceDto with\\n+ Links =\\n+ referenceDto.Links\\n+ |> Seq.append [ ReferenceLinkType.BasedOn basedOnReferenceId ]\\n+ |> Array.ofSeq\\n+ }\\n+\\n+ type internal HistoryWindow = { References: Reference.ReferenceDto array; SyntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId> }\\n+\\n+ let internal orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ let ordered =\\n+ references\\n+ |> Array.filter (fun referenceDto -> referenceDto.DeletedAt.IsNone)\\n+ |> Array.sortBy (fun referenceDto -> referenceDto.CreatedAt)\\n+\\n+ let syntheticBasedOnByReferenceId = Dictionary<ReferenceId, ReferenceId>()\\n+\\n+ match ordered\\n+ |> Array.tryFindIndex (fun referenceDto -> referenceDto.ReferenceId = targetReferenceId)\\n+ with\\n+ | None -> { References = ordered |> Array.truncate maxReferences; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+ | Some targetIndex ->\\n+ let startIndex = max 0 (targetIndex - maxReferences + 1)\\n+ let window = ordered[startIndex..targetIndex]\\n+\\n+ if startIndex > 0 && window.Length > 0 then\\n+ let basedOnReferenceId = ordered[startIndex - 1].ReferenceId\\n+\\n+ window[0] <- window[0] |> withBasedOnLink basedOnReferenceId\\n+\\n+ syntheticBasedOnByReferenceId[window[0].ReferenceId] <- basedOnReferenceId\\n+\\n+ { References = window; SyntheticBasedOnByReferenceId = syntheticBasedOnByReferenceId }\\n+\\n+ let internal orderedHistoryWindow targetReferenceId maxReferences (references: Reference.ReferenceDto array) =\\n+ (orderedHistoryWindowWithSyntheticBoundaries targetReferenceId maxReferences references)\\n+ .References\\n+\\n+ let private includeStoredBasedOnReferences\\n+ repositoryId\\n+ correlationId\\n+ maxReferences\\n+ (syntheticBasedOnByReferenceId: Dictionary<ReferenceId, ReferenceId>)\\n+ (references: Reference.ReferenceDto array)\\n+ =\\n+ task {\\n+ let effectiveReferences = ResizeArray<Reference.ReferenceDto>(references)\\n+\\n+ let knownReferenceIds =\\n+ HashSet<ReferenceId>(\\n+ references\\n+ |> Array.map (fun referenceDto -> referenceDto.ReferenceId)\\n+ )\\n+\\n+ let requestedBasedOnReferenceIds = HashSet<ReferenceId>()\\n+ let mutable index = 0\\n+\\n+ while index < effectiveReferences.Count do\\n+ let referenceDto = effectiveReferences[index]\\n+\\n+ match tryGetStoredBasedOnReferenceId syntheticBasedOnByReferenceId referenceDto with\\n+ | Some basedOnReferenceId when\\n+ not (knownReferenceIds.Contains basedOnReferenceId)\\n+ && requestedBasedOnReferenceIds.Add basedOnReferenceId\\n+ ->\\n+ let basedOnReferenceActorProxy = Reference.CreateActorProxy basedOnReferenceId repositoryId correlationId\\n+ let! basedOnReference = basedOnReferenceActorProxy.Get correlationId\\n+\\n+ if basedOnReference.ReferenceId <> ReferenceId.Empty\\n+ && basedOnReference.DeletedAt.IsNone\\n+ && basedOnReference.RepositoryId = repositoryId then\\n+ let! branchReferences = getReferences basedOnReference.RepositoryId basedOnReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let basedOnHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun branchReference -> branchReference.ReferenceId = basedOnReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| basedOnReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries basedOnReference.ReferenceId maxReferences\\n+\\n+ for syntheticBasedOn in basedOnHistoryWindow.SyntheticBasedOnByReferenceId do\\n+ syntheticBasedOnByReferenceId[syntheticBasedOn.Key] <- syntheticBasedOn.Value\\n+\\n+ let mutable basedOnHistoryIndex = 0\\n+\\n+ while basedOnHistoryIndex < basedOnHistoryWindow.References.Length do\\n+ let basedOnHistoryReference = basedOnHistoryWindow.References[basedOnHistoryIndex]\\n+\\n+ if not (knownReferenceIds.Contains basedOnHistoryReference.ReferenceId) then\\n+ knownReferenceIds.Add basedOnHistoryReference.ReferenceId\\n+ |> ignore\\n+\\n+ effectiveReferences.Add basedOnHistoryReference\\n+\\n+ basedOnHistoryIndex <- basedOnHistoryIndex + 1\\n+ | _ -> ()\\n+\\n+ index <- index + 1\\n+\\n+ return effectiveReferences.ToArray()\\n+ }\\n+\\n+ let private buildAnnotationForRequest (context: HttpContext) (parameters: AnnotateParameters) =\\n+ task {\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ match parameters.Validate() with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok () when String.IsNullOrWhiteSpace parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when isMalformedAnnotationPath parameters.Path ->\\n+ return Error(annotationError correlationId \\\"Annotation Path must be a relative file path.\\\")\\n+ | Ok () when parameters.TargetReferenceId = ReferenceId.Empty ->\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.InvalidReferenceId))\\n+ | Ok () ->\\n+ let normalizedPath = normalizeAnnotationPath parameters.Path\\n+ let repositoryActorProxy = Repository.CreateActorProxy graceIds.OrganizationId graceIds.RepositoryId correlationId\\n+ let! repositoryDto = repositoryActorProxy.Get correlationId\\n+\\n+ let referenceActorProxy = Reference.CreateActorProxy parameters.TargetReferenceId graceIds.RepositoryId correlationId\\n+ let! targetReference = referenceActorProxy.Get correlationId\\n+\\n+ if targetReference.ReferenceId = ReferenceId.Empty then\\n+ return Error(annotationError correlationId (BranchError.getErrorMessage BranchError.ReferenceIdDoesNotExist))\\n+ elif targetReference.DeletedAt.IsSome then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference has been deleted.\\\")\\n+ elif targetReference.RepositoryId\\n+ <> graceIds.RepositoryId\\n+ || targetReference.BranchId <> graceIds.BranchId then\\n+ return Error(annotationError correlationId \\\"Annotation target Reference must belong to the requested repository and branch.\\\")\\n+ else\\n+ let! targetContents = getReferenceContents repositoryDto.RepositoryId correlationId targetReference\\n+\\n+ match tryFindFileVersion normalizedPath targetContents with\\n+ | None -> return Error(annotationError correlationId $\\\"Annotation target path '{normalizedPath}' was not found in the target Reference.\\\")\\n+ | Some _ ->\\n+ let! branchReferences = getReferences targetReference.RepositoryId targetReference.BranchId Int32.MaxValue correlationId\\n+\\n+ let localHistoryWindow =\\n+ if branchReferences\\n+ |> Array.exists (fun referenceDto -> referenceDto.ReferenceId = targetReference.ReferenceId) then\\n+ branchReferences\\n+ else\\n+ Array.append branchReferences [| targetReference |]\\n+ |> orderedHistoryWindowWithSyntheticBoundaries targetReference.ReferenceId parameters.MaxReferences\\n+\\n+ let! references =\\n+ includeStoredBasedOnReferences\\n+ targetReference.RepositoryId\\n+ correlationId\\n+ parameters.MaxReferences\\n+ localHistoryWindow.SyntheticBasedOnByReferenceId\\n+ localHistoryWindow.References\\n+\\n+ match! buildEffectiveHistory context repositoryDto normalizedPath targetReference.ReferenceId references with\\n+ | Error error -> return Error error\\n+ | Ok history ->\\n+ let traversal = AnnotationLineCore.traverseEffectiveBranchHistory targetReference.ReferenceId parameters.MaxReferences history\\n+\\n+ match\\n+ AnnotationLineCore.buildAnnotationFromEffectiveHistoryTraversal\\n+ (\\n+ parameters.LineRange,\\n+ targetReference.ReferenceId,\\n+ normalizedPath,\\n+ parameters.ReferenceTypes,\\n+ parameters.MaxReferences,\\n+ parameters.IncludeLineText,\\n+ traversal\\n+ )\\n+ with\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ | Ok annotation ->\\n+ match Annotation.validate annotation with\\n+ | Ok () -> return Ok annotation\\n+ | Error errors -> return Error(annotationError correlationId (String.Join(\\\" \\\", errors)))\\n+ }\\n+\\n let processCommand<'T when 'T :> BranchParameters> (context: HttpContext) (validations: Validations<'T>) (command: 'T -> ValueTask<BranchCommand>) =\\n task {\\n let startTime = getCurrentInstant ()\\n@@ -1071,6 +1420,77 @@ module Branch =\\n |> result500ServerError (GraceError.CreateWithException ex String.Empty (getCorrelationId context))\\n }\\n \\n+ /// Annotates a server-known file from an existing reference in a branch.\\n+ let Annotate: HttpHandler =\\n+ fun (next: HttpFunc) (context: HttpContext) ->\\n+ task {\\n+ let startTime = getCurrentInstant ()\\n+ let graceIds = getGraceIds context\\n+ let correlationId = getCorrelationId context\\n+\\n+ try\\n+ let! parameters = context |> parse<AnnotateParameters>\\n+ parameters.OwnerId <- graceIds.OwnerIdString\\n+ parameters.OrganizationId <- graceIds.OrganizationIdString\\n+ parameters.RepositoryId <- graceIds.RepositoryIdString\\n+ parameters.BranchId <- graceIds.BranchIdString\\n+\\n+ match! buildAnnotationForRequest context parameters with\\n+ | Ok annotation ->\\n+ let graceReturnValue =\\n+ (GraceReturnValue.Create annotation correlationId)\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogInformation(\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Finished {path}; BranchId: {branchId}; TargetReferenceId: {targetReferenceId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString,\\n+ parameters.TargetReferenceId\\n+ )\\n+\\n+ return! context |> result200Ok graceReturnValue\\n+ | Error graceError ->\\n+ graceError\\n+ .enhance(getParametersAsDictionary parameters)\\n+ .enhance(nameof OwnerId, graceIds.OwnerId)\\n+ .enhance(nameof OrganizationId, graceIds.OrganizationId)\\n+ .enhance(nameof RepositoryId, graceIds.RepositoryId)\\n+ .enhance(nameof BranchId, graceIds.BranchId)\\n+ .enhance (\\\"Path\\\", context.Request.Path.Value)\\n+ |> ignore\\n+\\n+ return! context |> result400BadRequest graceError\\n+ with\\n+ | ex ->\\n+ let duration_ms = getDurationRightAligned_ms startTime\\n+\\n+ log.LogError(\\n+ ex,\\n+ \\\"{CurrentInstant}: Node: {HostName}; Duration: {duration_ms}ms; CorrelationId: {correlationId}; Error in {path}; BranchId: {branchId}.\\\",\\n+ getCurrentInstantExtended (),\\n+ getMachineName,\\n+ duration_ms,\\n+ correlationId,\\n+ context.Request.Path,\\n+ graceIds.BranchIdString\\n+ )\\n+\\n+ return!\\n+ context\\n+ |> result500ServerError (GraceError.CreateWithException ex String.Empty correlationId)\\n+ }\\n+\\n /// Gets a list of references, given a list of reference IDs.\\n let GetLatestReferencesByReferenceTypes: HttpHandler =\\n fun (next: HttpFunc) (context: HttpContext) ->\\n\"\n }\n]","isConversational":false},"test_patch":{"kind":"string","value":""},"merged":{"kind":"bool","value":true,"string":"true"}}}],"truncated":false,"partial":false},"paginationData":{"pageIndex":104,"numItemsPerPage":100,"numTotalItems":87912,"offset":10400,"length":100}},"jwt":"eyJhbGciOiJFZERTQSIsImtpZCI6IjVHZDBvd0g5MTM2eDZjc1FvbE1zcktNWUZoRVFoUm5PVVVybEpjOUhaUEEifQ.eyJyZWFkIjp0cnVlLCJwZXJtaXNzaW9ucyI6eyJyZXBvLmNvbnRlbnQucmVhZCI6dHJ1ZX0sImlhdCI6MTc4NzI5MTUxMCwianRpIjoiYjYyOWIwODItNzMwYi00ZjNkLTgwMjMtMzQ5ZWQ3OGRlYTYyIiwic3ViIjoiL2RhdGFzZXRzL1BvdGF0b0hEL2dpdGh1Yi1wci1yZXNvbHZlIiwiZXhwIjoxNzg3Mjk1MTEwLCJpc3MiOiJodHRwczovL2h1Z2dpbmdmYWNlLmNvIn0._OPcSGh6Y-cSq6tvdTZB6vfpSrfMCzH3g5fbS8TlA4XCaBaqSoArVJswSMxXdyV1HgeM6u4XppbiJxse9yFzBw","displayUrls":true,"splitSizeSummaries":[{"config":"default","split":"train","numRows":87912,"numBytesParquet":1412740926}]},"discussionsStats":{"closed":0,"open":0,"total":0},"fullWidth":true,"hasGatedAccess":true,"hasFullAccess":true,"isEmbedded":false,"savedQueries":{"community":[],"user":[]}}">
repo stringlengths 5 53 | pr_number int32 1 321k | task_type stringclasses 2
values | issue_text stringlengths 0 81.2k | pr_title stringlengths 1 319 | pr_body stringlengths 0 105k | base_sha stringlengths 40 40 | head_sha stringlengths 40 40 | gold_diff stringlengths 0 202M | changed_files listlengths 0 100 | review_threads listlengths 0 100 | test_patch stringlengths 0 23.4M | merged bool 1
class |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Keep local status in sync with recomputed directory hashes**
When the legacy overlay path replaces a local manifest-backed file that has an empty BLAKE3 with a saved file that has one, these assignments change only the transient `D... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.CLI/Command/Services.CLI.fs b/src/Grace.CLI/Command/Services.CLI.fs
index 88e32446..203d002f 100644
--- a/src/Grace.CLI/Command/Services.CLI.fs
+++ b/src/Grace.CLI/Command/Services.CLI.fs
@@ -96,6 +96,26 @@ module Services =
let mutable parseResult: ParseResult = null
let mutable privat... | [
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Keep local status in sync with recomputed directory hashes**\n\nWhen the legacy overlay path replaces a local manifest-backed file that has an empty BLAKE3 with a saved file that has one, these assignments chan... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Allow unchanged legacy child directories**
When a new parent directory references an unchanged child `DirectoryVersion` that was persisted before directory BLAKE3 was populated, `getChildDirectoryVersionsForValidation` loads that i... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index c7a9fcee..91daf361 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -150,6 +150,219 @@ module DirectoryVersion =
getFilesToValidate newFiles prev... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Allow unchanged legacy child directories**\n\nWhen a new parent directory references an unchanged child `DirectoryVersion` that was persisted before directory BLAKE3 was populated, `getChildDirectoryVersionsFor... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Propagate recomputed hashes to all save callers**
Although `resolveCliCurrentStateTargetReference` now calls `syncGraceStatusWithUploadedDirectoryVersions`, this helper is also used by `Branch.CLI.fs` and `Watch.CLI.fs`, where the ... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.CLI/Command/Services.CLI.fs b/src/Grace.CLI/Command/Services.CLI.fs
index 88e32446..203d002f 100644
--- a/src/Grace.CLI/Command/Services.CLI.fs
+++ b/src/Grace.CLI/Command/Services.CLI.fs
@@ -96,6 +96,26 @@ module Services =
let mutable parseResult: ParseResult = null
let mutable privat... | [
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Propagate recomputed hashes to all save callers**\n\nAlthough `resolveCliCurrentStateTargetReference` now calls `syncGraceStatusWithUploadedDirectoryVersions`, this helper is also used by `Branch.CLI.fs` and `W... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Compute BLAKE3 for promotion override files**
This new save-boundary check also rejects text conflict override files produced by `PromotionSet.CreateTextOverrideFileVersion`, because that path still builds overrides with `FileVersi... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index c7a9fcee..91daf361 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -150,6 +150,219 @@ module DirectoryVersion =
getFilesToValidate newFiles prev... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Compute BLAKE3 for promotion override files**\n\nThis new save-boundary check also rejects text conflict override files produced by `PromotionSet.CreateTextOverrideFileVersion`, because that path still builds o... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Tolerate legacy whole-file entries during save validation**
For repositories with pre-BLAKE3 whole-file entries, an unchanged sibling file can still have `FileVersion.Blake3Hash = ""`; this new blanket child-file check rejects the ... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index c7a9fcee..91daf361 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -150,6 +150,219 @@ module DirectoryVersion =
getFilesToValidate newFiles prev... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Tolerate legacy whole-file entries during save validation**\n\nFor repositories with pre-BLAKE3 whole-file entries, an unchanged sibling file can still have `FileVersion.Blake3Hash = \"\"`; this new blanket chi... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Skip existing directories before enforcing BLAKE3**
In legacy/pre-BLAKE3 repositories, full local-status upload paths such as `Maintenance.CLI.fs` and `Repository.CLI.fs` still send saved `LocalDirectoryVersion.ToDirectoryVersion` ... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Server/DirectoryVersion.Server.fs b/src/Grace.Server/DirectoryVersion.Server.fs
index 46433dd9..dce2e57c 100644
--- a/src/Grace.Server/DirectoryVersion.Server.fs
+++ b/src/Grace.Server/DirectoryVersion.Server.fs
@@ -35,6 +35,20 @@ module DirectoryVersion =
let activitySource = new Activity... | [
"src/Grace.Server/DirectoryVersion.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Skip existing directories before enforcing BLAKE3**\n\nIn legacy/pre-BLAKE3 repositories, full local-status upload paths such as `Maintenance.CLI.fs` and `Repository.CLI.fs` still send saved `LocalDirectoryVers... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Refresh the captured reference root after sync**
When `applyUploadedFileVersionsToDirectoryVersionsWithSavedDirectoryVersions` recomputes the uploaded root hash (for example, replacing an unchanged legacy manifest-backed sibling wi... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.CLI/Command/Reference.CLI.fs b/src/Grace.CLI/Command/Reference.CLI.fs
index 5f54fd65..163830cb 100644
--- a/src/Grace.CLI/Command/Reference.CLI.fs
+++ b/src/Grace.CLI/Command/Reference.CLI.fs
@@ -739,6 +739,8 @@ module Reference =
| Ok _ -> ()
... | [
"src/Grace.CLI/Command/Reference.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Refresh the captured reference root after sync**\n\nWhen `applyUploadedFileVersionsToDirectoryVersionsWithSavedDirectoryVersions` recomputes the uploaded root hash (for example, replacing an unchanged legacy ma... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Limit whole-file BLAKE3 gaps to existing legacy files**
This treats every whole-file entry with a SHA-256 and empty BLAKE3 as a legacy gap, including a brand-new or changed file supplied by a stale/non-CLI client. In that case the ... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index c7a9fcee..91daf361 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -150,6 +150,219 @@ module DirectoryVersion =
getFilesToValidate newFiles prev... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Limit whole-file BLAKE3 gaps to existing legacy files**\n\nThis treats every whole-file entry with a SHA-256 and empty BLAKE3 as a legacy gap, including a brand-new or changed file supplied by a stale/non-CLI c... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Skip existing directories before enforcing BLAKE3**
In legacy/pre-BLAKE3 repositories, full local-status upload paths such as `Maintenance.CLI.fs` and `Repository.CLI.fs` still send saved `LocalDirectoryVersion.ToDirectoryVersion` ... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Server/DirectoryVersion.Server.fs b/src/Grace.Server/DirectoryVersion.Server.fs
index 46433dd9..dce2e57c 100644
--- a/src/Grace.Server/DirectoryVersion.Server.fs
+++ b/src/Grace.Server/DirectoryVersion.Server.fs
@@ -35,6 +35,20 @@ module DirectoryVersion =
let activitySource = new Activity... | [
"src/Grace.Server/DirectoryVersion.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Skip existing directories before enforcing BLAKE3**\n\nIn legacy/pre-BLAKE3 repositories, full local-status upload paths such as `Maintenance.CLI.fs` and `Repository.CLI.fs` still send saved `LocalDirectoryVers... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Refresh the captured reference root after sync**
When `applyUploadedFileVersionsToDirectoryVersionsWithSavedDirectoryVersions` recomputes the uploaded root hash (for example, replacing an unchanged legacy manifest-backed sibling wi... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.CLI/Command/Reference.CLI.fs b/src/Grace.CLI/Command/Reference.CLI.fs
index 5f54fd65..163830cb 100644
--- a/src/Grace.CLI/Command/Reference.CLI.fs
+++ b/src/Grace.CLI/Command/Reference.CLI.fs
@@ -739,6 +739,8 @@ module Reference =
| Ok _ -> ()
... | [
"src/Grace.CLI/Command/Reference.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Refresh the captured reference root after sync**\n\nWhen `applyUploadedFileVersionsToDirectoryVersionsWithSavedDirectoryVersions` recomputes the uploaded root hash (for example, replacing an unchanged legacy ma... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Limit whole-file BLAKE3 gaps to existing legacy files**
This treats every whole-file entry with a SHA-256 and empty BLAKE3 as a legacy gap, including a brand-new or changed file supplied by a stale/non-CLI client. In that case the ... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index c7a9fcee..91daf361 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -150,6 +150,219 @@ module DirectoryVersion =
getFilesToValidate newFiles prev... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Limit whole-file BLAKE3 gaps to existing legacy files**\n\nThis treats every whole-file entry with a SHA-256 and empty BLAKE3 as a legacy gap, including a brand-new or changed file supplied by a stale/non-CLI c... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Restrict manifest BLAKE3 gaps to existing legacy files**
When a stale or non-CLI client creates or changes a manifest-backed file with `FileVersion.Blake3Hash = ""`, this branch treats it as a legacy gap solely because the incoming... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index c7a9fcee..91daf361 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -150,6 +150,219 @@ module DirectoryVersion =
getFilesToValidate newFiles prev... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Restrict manifest BLAKE3 gaps to existing legacy files**\n\nWhen a stale or non-CLI client creates or changes a manifest-backed file with `FileVersion.Blake3Hash = \"\"`, this branch treats it as a legacy gap s... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Order dot-root batches after direct children**
When a `SaveDirectoryVersions` batch contains the CLI root path `.` and a direct child such as `src`, this depth calculation gives both paths length `1`, so a client-supplied order wit... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Server/DirectoryVersion.Server.fs b/src/Grace.Server/DirectoryVersion.Server.fs
index 46433dd9..dce2e57c 100644
--- a/src/Grace.Server/DirectoryVersion.Server.fs
+++ b/src/Grace.Server/DirectoryVersion.Server.fs
@@ -35,6 +35,20 @@ module DirectoryVersion =
let activitySource = new Activity... | [
"src/Grace.Server/DirectoryVersion.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Order dot-root batches after direct children**\n\nWhen a `SaveDirectoryVersions` batch contains the CLI root path `.` and a direct child such as `src`, this depth calculation gives both paths length `1`, so a c... | true | ||
ScottArbeit/Grace | 379 | comment_to_fix | I07: Propagate DirectoryVersion BLAKE3 hashes | **<sub><sub></sub></sub> Build parent test hashes with normalized child sizes**
In the updated hosted tests, empty child directories are created with `Size = Constants.InitialDirectorySize`, but the actor normalizes that sentinel to `0L` before persisting ... | 9b6f6bfe819afdb9f0b8e48fc13a4cb7ee569223 | 70572c156d6fa428750c990b576f8c21412b614a | diff --git a/src/Grace.Server.Tests/DirectoryVersion.Server.Tests.fs b/src/Grace.Server.Tests/DirectoryVersion.Server.Tests.fs
index c0de9aad..7b9c1652 100644
--- a/src/Grace.Server.Tests/DirectoryVersion.Server.Tests.fs
+++ b/src/Grace.Server.Tests/DirectoryVersion.Server.Tests.fs
@@ -2,6 +2,7 @@ namespace Grace.Serve... | [
"src/Grace.Server.Tests/DirectoryVersion.Server.Tests.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Build parent test hashes with normalized child sizes**\n\nIn the updated hosted tests, empty child directories are created with `Size = Constants.InitialDirectorySize`, but the actor normalizes that sentinel to... | true | ||
ScottArbeit/Grace | 377 | issue_to_patch | I06: Propagate file BLAKE3 through save paths | Related to #349
Part of #343
## Summary
- Propagates complete-file `Blake3Hash` through file scan, upload planning, whole-file fallback, manifest upload, directory-save overlays, materialization checks, and implicit save callers.
- Uses returned enriched `FileVersion`s from manifest and whole-file upload paths ... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.Actors/ContentBlockMetadata.Actor.fs b/src/Grace.Actors/ContentBlockMetadata.Actor.fs
index 08c232cd..aeed812c 100644
--- a/src/Grace.Actors/ContentBlockMetadata.Actor.fs
+++ b/src/Grace.Actors/ContentBlockMetadata.Actor.fs
@@ -475,6 +475,39 @@ module ContentBlockMetadata =
metad... | [
"src/Grace.Actors/ContentBlockMetadata.Actor.fs",
"src/Grace.Actors/DirectoryVersion.Actor.fs",
"src/Grace.Actors/Interfaces.Actor.fs",
"src/Grace.Actors/Reference.Actor.fs",
"src/Grace.Actors/UploadSession.Actor.fs",
"src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs",
"src/Grace.CLI.Tests/Doctor.CL... | [
{
"comment": "**<sub><sub></sub></sub> Avoid downloading each blob twice during validation**\n\nWhen validating whole-file content, each call to `computeHashFromBlob` opens and streams the Azure blob, so adding the BLAKE3 call here makes every save-... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Avoid downloading each blob twice during validation**
When validating whole-file content, each call to `computeHashFromBlob` opens and streams the Azure blob, so adding the BLAKE3 call here makes every save-boundary file validation... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index 34fcc42e..c7a9fcee 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -20,6 +20,7 @@ open Grace.Types.Reminder
open Grace.Types.Repository
open Grace.Type... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Avoid downloading each blob twice during validation**\n\nWhen validating whole-file content, each call to `computeHashFromBlob` opens and streams the Azure blob, so adding the BLAKE3 call here makes every save-... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Read persisted BLAKE3 in doctor snapshots**
When `grace doctor` opens a read-only local-state DB whose `status_files` rows already contain `blake3_hash`, this path now sets every persisted file BLAKE3 to empty; the new read-only sc... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/LocalStateDb.CLI.fs b/src/Grace.CLI/LocalStateDb.CLI.fs
index aad451e5..6330dcd2 100644
--- a/src/Grace.CLI/LocalStateDb.CLI.fs
+++ b/src/Grace.CLI/LocalStateDb.CLI.fs
@@ -1398,8 +1398,21 @@ module LocalStateDb =
match readStatusMetaInternal connection with
... | [
"src/Grace.CLI/LocalStateDb.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Read persisted BLAKE3 in doctor snapshots**\n\nWhen `grace doctor` opens a read-only local-state DB whose `status_files` rows already contain `blake3_hash`, this path now sets every persisted file BLAKE3 to emp... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Preserve manifest refs for unchanged files**
When a directory containing an existing manifest-backed file is changed by adding or modifying a different file, this conversion rebuilds every local file as a plain `WholeFileContent` `... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Services.CLI.fs b/src/Grace.CLI/Command/Services.CLI.fs
index 58a8a1ad..88e32446 100644
--- a/src/Grace.CLI/Command/Services.CLI.fs
+++ b/src/Grace.CLI/Command/Services.CLI.fs
@@ -261,10 +261,15 @@ module Services =
stream.Position <- 0
let! s... | [
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Preserve manifest refs for unchanged files**\n\nWhen a directory containing an existing manifest-backed file is changed by adding or modifying a different file, this conversion rebuilds every local file as a pl... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Keep processing cached-file watch changes**
When `grace watch` sees a file change whose SHA-256 object already exists in the local object cache (for example reverting a file to earlier contents), `copyToObjectDirectory` returns `No... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Watch.CLI.fs b/src/Grace.CLI/Command/Watch.CLI.fs
index 4a069946..487b9901 100644
--- a/src/Grace.CLI/Command/Watch.CLI.fs
+++ b/src/Grace.CLI/Command/Watch.CLI.fs
@@ -44,6 +44,9 @@ open Grace.Types.Automation
module Watch =
exception private WatchCommandExit of int
+ let p... | [
"src/Grace.CLI/Command/Watch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Keep processing cached-file watch changes**\n\nWhen `grace watch` sees a file change whose SHA-256 object already exists in the local object cache (for example reverting a file to earlier contents), `copyToObje... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Treat empty stored BLAKE3 as unknown**
For local status created before file BLAKE3 was populated, `existingBlake3Hash` can legitimately be empty; after a timestamp-only touch, this new `||` marks the file as changed even when the S... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Services.CLI.fs b/src/Grace.CLI/Command/Services.CLI.fs
index 58a8a1ad..88e32446 100644
--- a/src/Grace.CLI/Command/Services.CLI.fs
+++ b/src/Grace.CLI/Command/Services.CLI.fs
@@ -261,10 +261,15 @@ module Services =
stream.Position <- 0
let! s... | [
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Treat empty stored BLAKE3 as unknown**\n\nFor local status created before file BLAKE3 was populated, `existingBlake3Hash` can legitimately be empty; after a timestamp-only touch, this new `||` marks the file as... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Use the cache path that copyToObjectDirectory writes**
When a watched file changes to contents that are already in the local object cache, `copyToObjectDirectory` returns `None` and this fallback is supposed to keep processing the ... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Watch.CLI.fs b/src/Grace.CLI/Command/Watch.CLI.fs
index 4a069946..487b9901 100644
--- a/src/Grace.CLI/Command/Watch.CLI.fs
+++ b/src/Grace.CLI/Command/Watch.CLI.fs
@@ -44,6 +44,9 @@ open Grace.Types.Automation
module Watch =
exception private WatchCommandExit of int
+ let p... | [
"src/Grace.CLI/Command/Watch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Use the cache path that copyToObjectDirectory writes**\n\nWhen a watched file changes to contents that are already in the local object cache, `copyToObjectDirectory` returns `None` and this fallback is supposed... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Preserve saved manifest refs in implicit saves**
Fresh evidence after the prior fix is that this implicit-save caller still uses the two-argument overlay, so it has no saved recursive DirectoryVersions to restore unchanged manifest... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Branch.CLI.fs b/src/Grace.CLI/Command/Branch.CLI.fs
index be6c0d98..4670a767 100644
--- a/src/Grace.CLI/Command/Branch.CLI.fs
+++ b/src/Grace.CLI/Command/Branch.CLI.fs
@@ -1162,6 +1162,7 @@ module Branch =
//let mutable rootDirectoryId = Direct... | [
"src/Grace.CLI/Command/Branch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Preserve saved manifest refs in implicit saves**\n\nFresh evidence after the prior fix is that this implicit-save caller still uses the two-argument overlay, so it has no saved recursive DirectoryVersions to re... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Drop whole-file watch uploads after save**
When `grace watch` uploads a small or otherwise whole-file-fallback file, `copyToObjectDirectory` still creates the uploaded `FileVersion` with an empty `Blake3Hash`, so this stores it und... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Watch.CLI.fs b/src/Grace.CLI/Command/Watch.CLI.fs
index 4a069946..487b9901 100644
--- a/src/Grace.CLI/Command/Watch.CLI.fs
+++ b/src/Grace.CLI/Command/Watch.CLI.fs
@@ -44,6 +44,9 @@ open Grace.Types.Automation
module Watch =
exception private WatchCommandExit of int
+ let p... | [
"src/Grace.CLI/Command/Watch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Drop whole-file watch uploads after save**\n\nWhen `grace watch` uploads a small or otherwise whole-file-fallback file, `copyToObjectDirectory` still creates the uploaded `FileVersion` with an empty `Blake3Hash... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Preserve manifest refs before branch switch**
Fresh evidence beyond the earlier implicit-save finding is that this branch-switch save path still uses the two-argument overlay, so it has no saved DirectoryVersions to restore unchang... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Branch.CLI.fs b/src/Grace.CLI/Command/Branch.CLI.fs
index be6c0d98..4670a767 100644
--- a/src/Grace.CLI/Command/Branch.CLI.fs
+++ b/src/Grace.CLI/Command/Branch.CLI.fs
@@ -1162,6 +1162,7 @@ module Branch =
//let mutable rootDirectoryId = Direct... | [
"src/Grace.CLI/Command/Branch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Preserve manifest refs before branch switch**\n\nFresh evidence beyond the earlier implicit-save finding is that this branch-switch save path still uses the two-argument overlay, so it has no saved DirectoryVer... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Upload cached watch hits before saving manifests**
Fresh evidence after the cached-file fix is that this cache-hit branch still skips `uploadFilesToObjectStorage`, so no manifest-backed `FileVersion` is added to `uploadedFileVersio... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Watch.CLI.fs b/src/Grace.CLI/Command/Watch.CLI.fs
index 4a069946..487b9901 100644
--- a/src/Grace.CLI/Command/Watch.CLI.fs
+++ b/src/Grace.CLI/Command/Watch.CLI.fs
@@ -44,6 +44,9 @@ open Grace.Types.Automation
module Watch =
exception private WatchCommandExit of int
+ let p... | [
"src/Grace.CLI/Command/Watch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Upload cached watch hits before saving manifests**\n\nFresh evidence after the cached-file fix is that this cache-hit branch still skips `uploadFilesToObjectStorage`, so no manifest-backed `FileVersion` is adde... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Keep the local-state schema version at 3**
When an existing local-state DB has `meta.schema_version = '2'` from an older install, `ensureDbInitialized` treats it as current because this constant now matches, so it neither recreates... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/LocalStateDb.CLI.fs b/src/Grace.CLI/LocalStateDb.CLI.fs
index aad451e5..6330dcd2 100644
--- a/src/Grace.CLI/LocalStateDb.CLI.fs
+++ b/src/Grace.CLI/LocalStateDb.CLI.fs
@@ -1398,8 +1398,21 @@ module LocalStateDb =
match readStatusMetaInternal connection with
... | [
"src/Grace.CLI/LocalStateDb.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Keep the local-state schema version at 3**\n\nWhen an existing local-state DB has `meta.schema_version = '2'` from an older install, `ensureDbInitialized` treats it as current because this constant now matches,... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Query the repository content-block storage pool**
When saving a manifest-backed file, this resolver looks up `ContentBlockMetadata` under the hard-coded `default` pool. Manifest upload/finalization uses the repository-derived stora... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index 34fcc42e..c7a9fcee 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -20,6 +20,7 @@ open Grace.Types.Reminder
open Grace.Types.Repository
open Grace.Type... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Query the repository content-block storage pool**\n\nWhen saving a manifest-backed file, this resolver looks up `ContentBlockMetadata` under the hard-coded `default` pool. Manifest upload/finalization uses the ... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Check content-block ranges from ordinal zero**
For manifests with more than one content block, this uses the file manifest block index as the ordinal inside each individual content block. The local planner creates each manifest `Co... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index 34fcc42e..c7a9fcee 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -20,6 +20,7 @@ open Grace.Types.Reminder
open Grace.Types.Repository
open Grace.Type... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Check content-block ranges from ordinal zero**\n\nFor manifests with more than one content block, this uses the file manifest block index as the ordinal inside each individual content block. The local planner c... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Persist content-block metadata before requiring it**
This new save-boundary check rejects any manifest block whose metadata range is `Absent`, but manifest upload/finalization currently never writes authoritative `ContentBlockMetad... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index 34fcc42e..c7a9fcee 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -20,6 +20,7 @@ open Grace.Types.Reminder
open Grace.Types.Repository
open Grace.Type... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Persist content-block metadata before requiring it**\n\nThis new save-boundary check rejects any manifest block whose metadata range is `Absent`, but manifest upload/finalization currently never writes authorit... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Align contribution workflows with the repository storage pool**
When manifest finalization now creates `ContentBlockMetadata` under `DedupeIndex.storagePoolIdForRepositoryId`, the save-reference contribution path still builds workf... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.Actors/UploadSession.Actor.fs b/src/Grace.Actors/UploadSession.Actor.fs
index ee67f7ec..bfe22944 100644
--- a/src/Grace.Actors/UploadSession.Actor.fs
+++ b/src/Grace.Actors/UploadSession.Actor.fs
@@ -2,6 +2,7 @@ namespace Grace.Actors
open Grace.Actors.Constants
open Grace.Actors.Context
+ope... | [
"src/Grace.Actors/UploadSession.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Align contribution workflows with the repository storage pool**\n\nWhen manifest finalization now creates `ContentBlockMetadata` under `DedupeIndex.storagePoolIdForRepositoryId`, the save-reference contribution... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Upload cached branch changes before applying manifests**
When the progress-output `grace branch save/checkpoint/...` path changes a file to bytes that already exist in the local object cache, `copyUpdatedFilesToObjectCache` returns... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.CLI/Command/Branch.CLI.fs b/src/Grace.CLI/Command/Branch.CLI.fs
index be6c0d98..4670a767 100644
--- a/src/Grace.CLI/Command/Branch.CLI.fs
+++ b/src/Grace.CLI/Command/Branch.CLI.fs
@@ -1162,6 +1162,7 @@ module Branch =
//let mutable rootDirectoryId = Direct... | [
"src/Grace.CLI/Command/Branch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Upload cached branch changes before applying manifests**\n\nWhen the progress-output `grace branch save/checkpoint/...` path changes a file to bytes that already exist in the local object cache, `copyUpdatedFil... | true | ||
ScottArbeit/Grace | 377 | comment_to_fix | I06: Propagate file BLAKE3 through save paths | **<sub><sub></sub></sub> Publish merged metadata to the dedupe index**
When finalizing a newly uploaded manifest, this `Ok` branch discards the merged `ContentBlockMetadata` and then calls `RegisterFinalizedManifest`; that method only builds discovery reco... | 1f5e2e18b6da9df1832103f20e2ba5d54d714a3d | 75534cac3ee0a7abc90b8b4e9bbd46bc0545556e | diff --git a/src/Grace.Actors/UploadSession.Actor.fs b/src/Grace.Actors/UploadSession.Actor.fs
index ee67f7ec..bfe22944 100644
--- a/src/Grace.Actors/UploadSession.Actor.fs
+++ b/src/Grace.Actors/UploadSession.Actor.fs
@@ -2,6 +2,7 @@ namespace Grace.Actors
open Grace.Actors.Constants
open Grace.Actors.Context
+ope... | [
"src/Grace.Actors/UploadSession.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Publish merged metadata to the dedupe index**\n\nWhen finalizing a newly uploaded manifest, this `Ok` branch discards the merged `ContentBlockMetadata` and then calls `RegisterFinalizedManifest`; that method on... | true | ||
ScottArbeit/Grace | 378 | issue_to_patch | Preserve manifest refs for unchanged siblings with legacy BLAKE3 | ### Motivation
- Fix a high-priority save-overlay bug where unchanged manifest-backed sibling files could lose their `ContentReference` when a directory change caused local file versions to be rebuilt without BLAKE3, causing save failures or loss of manifest-backed semantics.
- Ensure save overlays prefer exact `(Rela... | 3a0e0fcb477c3d166fabadbfb7ff6b3d3a0c7e5c | 0ee307ad0cf1819c3ccbc643bab580d7bc0eced7 | diff --git a/src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs b/src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs
index 05631eda..d5d36d4e 100644
--- a/src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs
+++ b/src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs
@@ -515,6 +515,127 @@ module CurrentStateCaptureC... | [
"src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs",
"src/Grace.CLI/Command/Services.CLI.fs"
] | [] | true | ||
ScottArbeit/Grace | 376 | issue_to_patch | Epic: Implement grace doctor
# Epic: Implement `grace doctor`
## Objective
Implement root-level `grace doctor` as a read-only diagnostic command that reports Grace environment, configuration, authentication, server reachability, lifecycle headers, local state, working-tree, object-cache, and ignore health with human... | Implement grace doctor | Closes #333
## Summary
- Add root-level `grace doctor` as a read-only diagnostic command with human and JSON output.
- Add diagnostics for configuration, user configuration, ignore rules, authentication, local state, object cache, server health/lifecycle, and full-mode working-tree drift.
- Document `grace doctor`, re... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 6b4a859244949ea9ac1f398f6b0f0d3df5a79ffd | diff --git a/README.md b/README.md
index 570d106a..a680c7ec 100644
--- a/README.md
+++ b/README.md
@@ -177,6 +177,25 @@ Once you have `GRACE_SERVER_URI` and `GRACE_TOKEN` set, run:
grace auth whoami
```
+For a read-only diagnostic report that checks local configuration, authentication environment, local state, and
... | [
"README.md",
"docs/Authentication.md",
"docs/Grace doctor.md",
"docs/Machine-readable CLI output.md",
"src/Grace.CLI.Tests/CommandOutputContract.CLI.Tests.fs",
"src/Grace.CLI.Tests/Doctor.CLI.Parsing.Tests.fs",
"src/Grace.CLI.Tests/Doctor.CLI.Tests.fs",
"src/Grace.CLI.Tests/Grace.CLI.Tests.fsproj",
... | [] | true | |
ScottArbeit/Grace | 375 | issue_to_patch | Document grace doctor final audit | Part of #333
Related to #340
## Summary
- Add `docs/Grace doctor.md` covering `grace doctor` semantics, options, exit codes, check catalog, JSON DTO shape, redaction, working-tree scan behavior, repair deferral, and v1 boundaries.
- Refresh the machine-readable CLI output docs for the current doctor/registry inventory... | d48a665a2c8562a65c817316ba9ad1a8f3a66647 | aae489b2afad514bb923b2965f7653344f98e53b | diff --git a/README.md b/README.md
index 570d106a..a680c7ec 100644
--- a/README.md
+++ b/README.md
@@ -177,6 +177,25 @@ Once you have `GRACE_SERVER_URI` and `GRACE_TOKEN` set, run:
grace auth whoami
```
+For a read-only diagnostic report that checks local configuration, authentication environment, local state, and
... | [
"README.md",
"docs/Authentication.md",
"docs/Grace doctor.md",
"docs/Machine-readable CLI output.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Replace the invalid auth check selector**\n\nWhen readers copy this example, `--check auth` is rejected as an unknown doctor check token instead of selecting authentication diagnostics. I checked the doctor sel... | true | ||
ScottArbeit/Grace | 375 | comment_to_fix | Document grace doctor final audit | **<sub><sub></sub></sub> Replace the invalid auth check selector**
When readers copy this example, `--check auth` is rejected as an unknown doctor check token instead of selecting authentication diagnostics. I checked the doctor selector implementation: it... | d48a665a2c8562a65c817316ba9ad1a8f3a66647 | aae489b2afad514bb923b2965f7653344f98e53b | diff --git a/docs/Grace doctor.md b/docs/Grace doctor.md
new file mode 100644
index 00000000..df279dcb
--- /dev/null
+++ b/docs/Grace doctor.md
@@ -0,0 +1,248 @@
+# Grace Doctor
+
+`grace doctor` inspects the local Grace environment and reports diagnostics for people, scripts, and agents. It is a
+read-only command: it... | [
"docs/Grace doctor.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Replace the invalid auth check selector**\n\nWhen readers copy this example, `--check auth` is rejected as an unknown doctor check token instead of selecting authentication diagnostics. I checked the doctor sel... | true | ||
ScottArbeit/Grace | 375 | comment_to_fix | Document grace doctor final audit | **<sub><sub></sub></sub> Warn that full mode also runs server probes**
For users who run `grace doctor --full` without `--offline`, this description understates the side effects: the implementation's full profile includes every catalog entry, including the... | d48a665a2c8562a65c817316ba9ad1a8f3a66647 | aae489b2afad514bb923b2965f7653344f98e53b | diff --git a/docs/Grace doctor.md b/docs/Grace doctor.md
new file mode 100644
index 00000000..df279dcb
--- /dev/null
+++ b/docs/Grace doctor.md
@@ -0,0 +1,248 @@
+# Grace Doctor
+
+`grace doctor` inspects the local Grace environment and reports diagnostics for people, scripts, and agents. It is a
+read-only command: it... | [
"docs/Grace doctor.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Warn that full mode also runs server probes**\n\nFor users who run `grace doctor --full` without `--offline`, this description understates the side effects: the implementation's full profile includes every cata... | true | ||
ScottArbeit/Grace | 374 | issue_to_patch | S5: Add doctor working-tree drift scan | ## Summary
- Adds the `working-tree.scan` doctor check with fast default skip behavior and full/exact scan execution.
- Exposes read-only local-state snapshot access and a pure working-tree scanner so doctor does not initialize or mutate local state.
- Reports working-tree drift as a warning with add/change/delete cou... | d5c298e437dbc8937b16887fe119a45e0d26f69c | 9500d8006d044ecc28d6340c729038a4d5e35fcd | diff --git a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
index 64b0e18f..545f3587 100644
--- a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
+++ b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
@@ -12,9 +12,11 @@ open Spectre.Console
open System
open System.IO
open System.Net
+open System.Se... | [
"src/Grace.CLI.Tests/Doctor.CLI.Tests.fs",
"src/Grace.CLI/Command/Doctor.CLI.fs",
"src/Grace.CLI/Command/Services.CLI.fs",
"src/Grace.CLI/LocalStateDb.CLI.fs",
"src/Grace.Shared/Client/Configuration.Shared.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Honor directory .graceignore entries in the scan**\n\nWhen the new doctor scan is run with a normal directory ignore such as `bin/` or `obj/`, `.graceignore` parsing trims the trailing separator and the doctor ... | true | ||
ScottArbeit/Grace | 374 | comment_to_fix | S5: Add doctor working-tree drift scan | **<sub><sub></sub></sub> Honor directory .graceignore entries in the scan**
When the new doctor scan is run with a normal directory ignore such as `bin/` or `obj/`, `.graceignore` parsing trims the trailing separator and the doctor input turns it into `*bi... | d5c298e437dbc8937b16887fe119a45e0d26f69c | 9500d8006d044ecc28d6340c729038a4d5e35fcd | diff --git a/src/Grace.CLI/Command/Services.CLI.fs b/src/Grace.CLI/Command/Services.CLI.fs
index 14f92232..80233447 100644
--- a/src/Grace.CLI/Command/Services.CLI.fs
+++ b/src/Grace.CLI/Command/Services.CLI.fs
@@ -167,7 +167,13 @@ module Services =
else
normalizeFilePath (directoryInfoToC... | [
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Honor directory .graceignore entries in the scan**\n\nWhen the new doctor scan is run with a normal directory ignore such as `bin/` or `obj/`, `.graceignore` parsing trims the trailing separator and the doctor ... | true | ||
ScottArbeit/Grace | 374 | comment_to_fix | S5: Add doctor working-tree drift scan | **<sub><sub></sub></sub> Use only directory ignore entries for pruning**
When `.graceignore` contains a slashless file pattern such as `build` or `*.bin`, `inspectGraceIgnore` classifies it as a file entry, but this scan passes all `inspection.Ignore.Entri... | d5c298e437dbc8937b16887fe119a45e0d26f69c | 9500d8006d044ecc28d6340c729038a4d5e35fcd | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
index 1a2f015a..c6b7989f 100644
--- a/src/Grace.CLI/Command/Doctor.CLI.fs
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -88,6 +88,9 @@ module Doctor =
[<Literal>]
let private ObjectCacheIndexReadableCheckId = "object-cache.i... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Use only directory ignore entries for pruning**\n\nWhen `.graceignore` contains a slashless file pattern such as `build` or `*.bin`, `inspectGraceIgnore` classifies it as a file entry, but this scan passes all ... | true | ||
ScottArbeit/Grace | 374 | comment_to_fix | S5: Add doctor working-tree drift scan | **<sub><sub></sub></sub> Fail explicit scan errors instead of skipping them**
When the working-tree scan actually starts but `scanWorkingTreeForDifferencesReadOnly` returns `Error` (for example because a file becomes unreadable or disappears while it is be... | d5c298e437dbc8937b16887fe119a45e0d26f69c | 9500d8006d044ecc28d6340c729038a4d5e35fcd | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
index 1a2f015a..c6b7989f 100644
--- a/src/Grace.CLI/Command/Doctor.CLI.fs
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -88,6 +88,9 @@ module Doctor =
[<Literal>]
let private ObjectCacheIndexReadableCheckId = "object-cache.i... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Fail explicit scan errors instead of skipping them**\n\nWhen the working-tree scan actually starts but `scanWorkingTreeForDifferencesReadOnly` returns `Error` (for example because a file becomes unreadable or d... | true | ||
ScottArbeit/Grace | 372 | issue_to_patch | S4: Add doctor server probes | ## Summary
- Adds explicit/full-catalog `grace doctor` server checks for `/healthz` reachability, lifecycle headers, and safe principal availability.
- Keeps `--offline` as a hard no-network mode while preserving full catalog discovery for `--list-checks`.
- Restricts `/auth/me` probing to a valid non-refreshing `GRAC... | b24c03a2bc8cf0aa034f687722963016a0c6526c | 03b59c864ed43b06fedafda3b4ba2240bad178a5 | diff --git a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
index b632d83e..64b0e18f 100644
--- a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
+++ b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
@@ -11,8 +11,10 @@ open NUnit.Framework
open Spectre.Console
open System
open System.IO
+open Syst... | [
"src/Grace.CLI.Tests/Doctor.CLI.Tests.fs",
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Treat deprecated lifecycle headers as warnings**\n\nWhen `/healthz` returns lifecycle headers with `X-Grace-Client-Support-Status: deprecated` (or `unsupported`) and the date/URL are otherwise well formed, this... | true | ||
ScottArbeit/Grace | 372 | comment_to_fix | S4: Add doctor server probes | **<sub><sub></sub></sub> Treat deprecated lifecycle headers as warnings**
When `/healthz` returns lifecycle headers with `X-Grace-Client-Support-Status: deprecated` (or `unsupported`) and the date/URL are otherwise well formed, this predicate returns false... | b24c03a2bc8cf0aa034f687722963016a0c6526c | 03b59c864ed43b06fedafda3b4ba2240bad178a5 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
index f25b91bf..1a2f015a 100644
--- a/src/Grace.CLI/Command/Doctor.CLI.fs
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -5,6 +5,7 @@ open Grace.CLI.Common
open Grace.CLI.Text
open Grace.Shared
open Grace.Shared.Client
+open Grace.S... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Treat deprecated lifecycle headers as warnings**\n\nWhen `/healthz` returns lifecycle headers with `X-Grace-Client-Support-Status: deprecated` (or `unsupported`) and the date/URL are otherwise well formed, this... | true | ||
ScottArbeit/Grace | 372 | comment_to_fix | S4: Add doctor server probes | **<sub><sub></sub></sub> Redact non-HTTPS lifecycle update URLs**
When a misconfigured or hostile server returns a non-HTTPS lifecycle update URL, this summary adds it verbatim and the warning path below prints it in doctor output; the existing lifecycle r... | b24c03a2bc8cf0aa034f687722963016a0c6526c | 03b59c864ed43b06fedafda3b4ba2240bad178a5 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
index f25b91bf..1a2f015a 100644
--- a/src/Grace.CLI/Command/Doctor.CLI.fs
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -5,6 +5,7 @@ open Grace.CLI.Common
open Grace.CLI.Text
open Grace.Shared
open Grace.Shared.Client
+open Grace.S... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Redact non-HTTPS lifecycle update URLs**\n\nWhen a misconfigured or hostile server returns a non-HTTPS lifecycle update URL, this summary adds it verbatim and the warning path below prints it in doctor output; ... | true | ||
ScottArbeit/Grace | 372 | comment_to_fix | S4: Add doctor server probes | **<sub><sub></sub></sub> Recognize lifecycle rejections in healthz**
Because this probe sends the normal Grace client-identity headers, an otherwise healthy server can return `426 Upgrade Required` from the SDK lifecycle middleware before `/healthz` runs w... | b24c03a2bc8cf0aa034f687722963016a0c6526c | 03b59c864ed43b06fedafda3b4ba2240bad178a5 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
index f25b91bf..1a2f015a 100644
--- a/src/Grace.CLI/Command/Doctor.CLI.fs
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -5,6 +5,7 @@ open Grace.CLI.Common
open Grace.CLI.Text
open Grace.Shared
open Grace.Shared.Client
+open Grace.S... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Recognize lifecycle rejections in healthz**\n\nBecause this probe sends the normal Grace client-identity headers, an otherwise healthy server can return `426 Upgrade Required` from the SDK lifecycle middleware ... | true | ||
ScottArbeit/Grace | 369 | issue_to_patch | I05: Scaffold version BLAKE3 fields | ## Summary
- Adds explicit `Blake3Hash` scaffold fields beside `Sha256Hash` on `FileVersion`, `LocalFileVersion`, `DirectoryVersion`, and `LocalDirectoryVersion`.
- Keeps existing `Create` factories source-compatible with deterministic empty BLAKE3 defaults.
- Adds `CreateWithHashes` factories for follow-on behavior s... | 0c472535599c5eb57a1a0cb14ef25fb29b7336f9 | 87626b276465fb759364e2b7da73f649c2bd71b2 | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index 486d98b5..34fcc42e 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -938,7 +938,20 @@ module DirectoryVersion =
... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs",
"src/Grace.CLI.Tests/LocalStateDb.Tests.fs",
"src/Grace.CLI/Command/Maintenance.CLI.fs",
"src/Grace.CLI/Command/Repository.CLI.fs",
"src/Grace.CLI/Command/Services.CLI.fs",
"src/Grace.CLI/LocalStateDb.CLI.fs",
"src/Grace.Types.Tests/Common.Types.Tests.fs",
... | [
{
"comment": "**<sub><sub></sub></sub> Keep legacy DirectoryVersion payloads readable**\n\nWhen a new server reads a DirectoryVersion JSON payload produced before this field existed (for example through `CreateParameters.DirectoryVersion` or `SaveDi... | true | ||
ScottArbeit/Grace | 369 | comment_to_fix | I05: Scaffold version BLAKE3 fields | **<sub><sub></sub></sub> Keep legacy DirectoryVersion payloads readable**
When a new server reads a DirectoryVersion JSON payload produced before this field existed (for example through `CreateParameters.DirectoryVersion` or `SaveDirectoryVersionsParameter... | 0c472535599c5eb57a1a0cb14ef25fb29b7336f9 | 87626b276465fb759364e2b7da73f649c2bd71b2 | diff --git a/src/Grace.Types/Common.Types.fs b/src/Grace.Types/Common.Types.fs
index 20d5e25f..793d2540 100644
--- a/src/Grace.Types/Common.Types.fs
+++ b/src/Grace.Types/Common.Types.fs
@@ -402,7 +402,8 @@ module Common =
static member FileManifest manifest =
{ Class = "FileContentReference"; Ref... | [
"src/Grace.Types/Common.Types.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Keep legacy DirectoryVersion payloads readable**\n\nWhen a new server reads a DirectoryVersion JSON payload produced before this field existed (for example through `CreateParameters.DirectoryVersion` or `SaveDi... | true | ||
ScottArbeit/Grace | 369 | comment_to_fix | I05: Scaffold version BLAKE3 fields | **<sub><sub></sub></sub> Persist BLAKE3 values in local state**
When a server `FileVersion` has a non-empty `Blake3Hash`, this conversion now copies it into `LocalFileVersion`, but the CLI paths that persist the resulting local status/object cache still st... | 0c472535599c5eb57a1a0cb14ef25fb29b7336f9 | 87626b276465fb759364e2b7da73f649c2bd71b2 | diff --git a/src/Grace.Types/Common.Types.fs b/src/Grace.Types/Common.Types.fs
index 20d5e25f..793d2540 100644
--- a/src/Grace.Types/Common.Types.fs
+++ b/src/Grace.Types/Common.Types.fs
@@ -402,7 +402,8 @@ module Common =
static member FileManifest manifest =
{ Class = "FileContentReference"; Ref... | [
"src/Grace.Types/Common.Types.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Persist BLAKE3 values in local state**\n\nWhen a server `FileVersion` has a non-empty `Blake3Hash`, this conversion now copies it into `LocalFileVersion`, but the CLI paths that persist the resulting local stat... | true | ||
ScottArbeit/Grace | 369 | comment_to_fix | I05: Scaffold version BLAKE3 fields | **<sub><sub></sub></sub> Avoid mutating actor state before the event persists**
When hash validation succeeds but `ApplyEvent` fails while appending or writing the `Created` event, this line has already mutated `directoryVersionDto.DirectoryVersion` becaus... | 0c472535599c5eb57a1a0cb14ef25fb29b7336f9 | 87626b276465fb759364e2b7da73f649c2bd71b2 | diff --git a/src/Grace.Actors/DirectoryVersion.Actor.fs b/src/Grace.Actors/DirectoryVersion.Actor.fs
index 486d98b5..34fcc42e 100644
--- a/src/Grace.Actors/DirectoryVersion.Actor.fs
+++ b/src/Grace.Actors/DirectoryVersion.Actor.fs
@@ -938,7 +938,20 @@ module DirectoryVersion =
... | [
"src/Grace.Actors/DirectoryVersion.Actor.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Avoid mutating actor state before the event persists**\n\nWhen hash validation succeeds but `ApplyEvent` fails while appending or writing the `Created` event, this line has already mutated `directoryVersionDto.... | true | ||
ScottArbeit/Grace | 370 | issue_to_patch | S3: Add grace doctor local state inspection | ## Summary
- Adds read-only `.grace/grace-local.db` inspection checks to `grace doctor`.
- Reports schema version, required tables, required indexes, SQLite integrity checks, SQLite foreign-key checks, and object-cache index readability.
- Keeps doctor from initializing, migrating, repairing, deleting, or otherwise mu... | 2e3e3b628cc0774da28552820cb4c242444c2088 | bc20a7cb1fa6e57a4799914fa6ec1a33dee268ab | diff --git a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
index 0d335cfa..b632d83e 100644
--- a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
+++ b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
@@ -6,10 +6,12 @@ open Grace.CLI.Command
open Grace.Shared
open Grace.Shared.Client
open Grace.Typ... | [
"src/Grace.CLI.Tests/Doctor.CLI.Tests.fs",
"src/Grace.CLI.Tests/LocalStateDb.Tests.fs",
"src/Grace.CLI/Command/Doctor.CLI.fs",
"src/Grace.CLI/LocalStateDb.CLI.fs",
"src/Grace.Shared/Client/Configuration.Shared.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Avoid eager local-state inspection for unrelated checks**\n\nWhen a caller selects only non-local checks (for example `grace doctor --check config.file.parse`), `createInspectionContext` still runs `LocalStateD... | true | ||
ScottArbeit/Grace | 370 | comment_to_fix | S3: Add grace doctor local state inspection | **<sub><sub></sub></sub> Avoid eager local-state inspection for unrelated checks**
When a caller selects only non-local checks (for example `grace doctor --check config.file.parse`), `createInspectionContext` still runs `LocalStateDb.inspectReadOnly`, whic... | 2e3e3b628cc0774da28552820cb4c242444c2088 | bc20a7cb1fa6e57a4799914fa6ec1a33dee268ab | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
index 2afd5d50..f25b91bf 100644
--- a/src/Grace.CLI/Command/Doctor.CLI.fs
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -1,5 +1,6 @@
namespace Grace.CLI.Command
+open Grace.CLI
open Grace.CLI.Common
open Grace.CLI.Text
open Grac... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Avoid eager local-state inspection for unrelated checks**\n\nWhen a caller selects only non-local checks (for example `grace doctor --check config.file.parse`), `createInspectionContext` still runs `LocalStateD... | true | ||
ScottArbeit/Grace | 370 | comment_to_fix | S3: Add grace doctor local state inspection | **<sub><sub></sub></sub> Prevent read-only doctor from creating WAL sidecars**
When this database is already in WAL mode but `grace-local.db-wal`/`-shm` are absent, this read-only open can still create those sidecar files before `PRAGMA query_only` runs; S... | 2e3e3b628cc0774da28552820cb4c242444c2088 | bc20a7cb1fa6e57a4799914fa6ec1a33dee268ab | diff --git a/src/Grace.CLI/LocalStateDb.CLI.fs b/src/Grace.CLI/LocalStateDb.CLI.fs
index 8fbaee4c..c1e063ec 100644
--- a/src/Grace.CLI/LocalStateDb.CLI.fs
+++ b/src/Grace.CLI/LocalStateDb.CLI.fs
@@ -5,6 +5,7 @@ open System.Collections.Concurrent
open System.Collections.Generic
open System.Diagnostics
open System.IO
... | [
"src/Grace.CLI/LocalStateDb.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Prevent read-only doctor from creating WAL sidecars**\n\nWhen this database is already in WAL mode but `grace-local.db-wal`/`-shm` are absent, this read-only open can still create those sidecar files before `PR... | true | ||
ScottArbeit/Grace | 370 | comment_to_fix | S3: Add grace doctor local state inspection | **<sub><sub></sub></sub> Inspect the discovered repo DB when config parsing fails**
When `grace doctor` is run from a nested directory and the upward search finds a malformed `.grace/graceconfig.json`, this fallback points local-state checks at `<cwd>/.gra... | 2e3e3b628cc0774da28552820cb4c242444c2088 | bc20a7cb1fa6e57a4799914fa6ec1a33dee268ab | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
index 2afd5d50..f25b91bf 100644
--- a/src/Grace.CLI/Command/Doctor.CLI.fs
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -1,5 +1,6 @@
namespace Grace.CLI.Command
+open Grace.CLI
open Grace.CLI.Common
open Grace.CLI.Text
open Grac... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Inspect the discovered repo DB when config parsing fails**\n\nWhen `grace doctor` is run from a nested directory and the upward search finds a malformed `.grace/graceconfig.json`, this fallback points local-sta... | true | ||
ScottArbeit/Grace | 370 | comment_to_fix | S3: Add grace doctor local state inspection | **<sub><sub></sub></sub> Do not reject checkpointed WAL databases without sidecars**
When `doctor` runs in a fresh process after a normal Grace command has closed its last SQLite connection, the database header can still be WAL while SQLite has checkpointe... | 2e3e3b628cc0774da28552820cb4c242444c2088 | bc20a7cb1fa6e57a4799914fa6ec1a33dee268ab | diff --git a/src/Grace.CLI/LocalStateDb.CLI.fs b/src/Grace.CLI/LocalStateDb.CLI.fs
index 8fbaee4c..c1e063ec 100644
--- a/src/Grace.CLI/LocalStateDb.CLI.fs
+++ b/src/Grace.CLI/LocalStateDb.CLI.fs
@@ -5,6 +5,7 @@ open System.Collections.Concurrent
open System.Collections.Generic
open System.Diagnostics
open System.IO
... | [
"src/Grace.CLI/LocalStateDb.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Do not reject checkpointed WAL databases without sidecars**\n\nWhen `doctor` runs in a fresh process after a normal Grace command has closed its last SQLite connection, the database header can still be WAL whil... | true | ||
ScottArbeit/Grace | 371 | issue_to_patch | I04: Add formal DirectoryVersion hash preimage helpers | ## Summary
- Adds formal `grace.directory-version.v1` helpers for DirectoryVersion hashing.
- Adds explicit preimage entry types for same-algorithm child hashes.
- Adds BLAKE3 and SHA-256 directory helpers while wrapping the existing SHA-256 directory helper onto the versioned preimage semantics.
- Adds focused golden... | 50eb14cacc26579c52f5a78ac898e88ae28bccf5 | af3c99b87a90dbe72027ddc63d10be61ea412a3d | diff --git a/src/Grace.Actors/PromotionSet.Actor.fs b/src/Grace.Actors/PromotionSet.Actor.fs
index b6fdd4fe..7710bd0d 100644
--- a/src/Grace.Actors/PromotionSet.Actor.fs
+++ b/src/Grace.Actors/PromotionSet.Actor.fs
@@ -44,6 +44,21 @@ module PromotionSet =
type private DirectorySnapshot = { DirectoriesByPath: Dic... | [
"src/Grace.Actors/PromotionSet.Actor.fs",
"src/Grace.Server.Unit.Tests/Grace.Server.Unit.Tests.fsproj",
"src/Grace.Server.Unit.Tests/PromotionSet.DirectoryHash.Tests.fs",
"src/Grace.Shared/Services.Shared.fs",
"src/Grace.Types.Tests/DirectoryVersionPreimage.Shared.Tests.fs",
"src/Grace.Types.Tests/Grace.T... | [
{
"comment": "**<sub><sub></sub></sub> Preserve child directory sizes in promotion hashes**\n\nWhen `computeSha256ForDirectory` is called from `PromotionSet.Actor`, each child directory is reconstructed with the correct child SHA but `Size = 0L` bef... | true | ||
ScottArbeit/Grace | 371 | comment_to_fix | I04: Add formal DirectoryVersion hash preimage helpers | **<sub><sub></sub></sub> Preserve child directory sizes in promotion hashes**
When `computeSha256ForDirectory` is called from `PromotionSet.Actor`, each child directory is reconstructed with the correct child SHA but `Size = 0L` before the parent hash is c... | 50eb14cacc26579c52f5a78ac898e88ae28bccf5 | af3c99b87a90dbe72027ddc63d10be61ea412a3d | diff --git a/src/Grace.Shared/Services.Shared.fs b/src/Grace.Shared/Services.Shared.fs
index c7d33053..8632c6dc 100644
--- a/src/Grace.Shared/Services.Shared.fs
+++ b/src/Grace.Shared/Services.Shared.fs
@@ -24,10 +24,10 @@ module Services =
match result with
| Ok result ->
- r... | [
"src/Grace.Shared/Services.Shared.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Preserve child directory sizes in promotion hashes**\n\nWhen `computeSha256ForDirectory` is called from `PromotionSet.Actor`, each child directory is reconstructed with the correct child SHA but `Size = 0L` bef... | true | ||
ScottArbeit/Grace | 368 | issue_to_patch | I03: Add byte-only BLAKE3 file hashing | ## Summary
- Adds streaming `Services.computeBlake3ForFile` for byte-only file BLAKE3 computation.
- Protects file SHA-256 byte-only behavior with golden vectors.
- Adds BLAKE3 vectors for empty, `abc`, representative binary bytes, small-read streams, and same-bytes/different-path invariance.
- Leaves CAS address algo... | facdd8da5a58ff1d2b11ae95f5292605457949d7 | 1ae9aafe35dd3aa57f88a2b53973752a387f20cd | diff --git a/src/Grace.Shared/Services.Shared.fs b/src/Grace.Shared/Services.Shared.fs
index d265cdd3..c7d33053 100644
--- a/src/Grace.Shared/Services.Shared.fs
+++ b/src/Grace.Shared/Services.Shared.fs
@@ -1,5 +1,6 @@
namespace Grace.Shared
+open Blake3
open Grace.Types.Common
open Grace.Shared.Utilities
open Mi... | [
"src/Grace.Shared/Services.Shared.fs",
"src/Grace.Types.Tests/ContentAddress.Types.Tests.fs"
] | [] | true | ||
ScottArbeit/Grace | 365 | issue_to_patch | I01: Document BLAKE3 and SHA-256 version hashes | ## Summary
- Adds ADR `0006-blake3-and-sha256-version-hashes` for the epic transition model.
- Corrects SHA-256 documentation so file SHA-256 is byte-only.
- Keeps CAS address terminology distinct from version graph hashes.
- Updates a nearby `grace watch` doc reference that pointed at the stale SHA-256 model.
Part o... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | a42c7a03796e7005f869810b4d36c9267a6a31f4 | diff --git a/CONTEXT.md b/CONTEXT.md
index 573f698f..bd26747a 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -14,6 +14,14 @@ The path-independent BLAKE3 identity of the complete bytes named by a FileVersio
hexadecimal string. A FileContentHash identifies the whole logical file, while ChunkAddress identifies one ContentCh... | [
"CONTEXT.md",
"docs/How Grace computes the SHA-256 value.md",
"docs/What grace watch does.md",
"docs/adr/0006-blake3-and-sha256-version-hashes.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Clarify that file SHA-256 values do not identify FileVersions**\n\nFor files with identical bytes at different relative paths, the current SHA-256 value is the same because `computeSha256ForFile` only appends s... | true | ||
ScottArbeit/Grace | 365 | comment_to_fix | I01: Document BLAKE3 and SHA-256 version hashes | **<sub><sub></sub></sub> Clarify that file SHA-256 values do not identify FileVersions**
For files with identical bytes at different relative paths, the current SHA-256 value is the same because `computeSha256ForFile` only appends stream bytes (`src/Grace.... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | a42c7a03796e7005f869810b4d36c9267a6a31f4 | diff --git a/docs/How Grace computes the SHA-256 value.md b/docs/How Grace computes the SHA-256 value.md
index a09874be..938fe85a 100644
--- a/docs/How Grace computes the SHA-256 value.md
+++ b/docs/How Grace computes the SHA-256 value.md
@@ -1,89 +1,103 @@
-# Computing the SHA-256 value for files and directories
+# Co... | [
"docs/How Grace computes the SHA-256 value.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Clarify that file SHA-256 values do not identify FileVersions**\n\nFor files with identical bytes at different relative paths, the current SHA-256 value is the same because `computeSha256ForFile` only appends s... | true | ||
ScottArbeit/Grace | 365 | comment_to_fix | I01: Document BLAKE3 and SHA-256 version hashes | **<sub><sub></sub></sub> Clarify directory hashes do not capture child names**
With the corrected byte-only file hash, this statement is no longer true for current directory hashing: `computeSha256ForDirectory` appends the directory's own path and each chi... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | a42c7a03796e7005f869810b4d36c9267a6a31f4 | diff --git a/docs/How Grace computes the SHA-256 value.md b/docs/How Grace computes the SHA-256 value.md
index a09874be..938fe85a 100644
--- a/docs/How Grace computes the SHA-256 value.md
+++ b/docs/How Grace computes the SHA-256 value.md
@@ -1,89 +1,103 @@
-# Computing the SHA-256 value for files and directories
+# Co... | [
"docs/How Grace computes the SHA-256 value.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Clarify directory hashes do not capture child names**\n\nWith the corrected byte-only file hash, this statement is no longer true for current directory hashing: `computeSha256ForDirectory` appends the directory... | true | ||
ScottArbeit/Grace | 365 | comment_to_fix | I01: Document BLAKE3 and SHA-256 version hashes | **<sub><sub></sub></sub> Clarify references store the root directory hash**
In current code, a reference does not compute its own SHA-256 graph identity: branch commands pass a `directoryId` and `sha256Hash` into `addReference`, and the reference actor sim... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | a42c7a03796e7005f869810b4d36c9267a6a31f4 | diff --git a/docs/How Grace computes the SHA-256 value.md b/docs/How Grace computes the SHA-256 value.md
index a09874be..938fe85a 100644
--- a/docs/How Grace computes the SHA-256 value.md
+++ b/docs/How Grace computes the SHA-256 value.md
@@ -1,89 +1,103 @@
-# Computing the SHA-256 value for files and directories
+# Co... | [
"docs/How Grace computes the SHA-256 value.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Clarify references store the root directory hash**\n\nIn current code, a reference does not compute its own SHA-256 graph identity: branch commands pass a `directoryId` and `sha256Hash` into `addReference`, and... | true | ||
ScottArbeit/Grace | 365 | comment_to_fix | I01: Document BLAKE3 and SHA-256 version hashes | **<sub><sub></sub></sub> Qualify version hashes as future-only here**
This new glossary entry is unqualified, so it describes today's model as having object-identifying hashes for `FileVersion` and `Reference`. I checked the current code paths: `computeSha... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | a42c7a03796e7005f869810b4d36c9267a6a31f4 | diff --git a/CONTEXT.md b/CONTEXT.md
index 573f698f..bd26747a 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -14,6 +14,14 @@ The path-independent BLAKE3 identity of the complete bytes named by a FileVersio
hexadecimal string. A FileContentHash identifies the whole logical file, while ChunkAddress identifies one ContentCh... | [
"CONTEXT.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Qualify version hashes as future-only here**\n\nThis new glossary entry is unqualified, so it describes today's model as having object-identifying hashes for `FileVersion` and `Reference`. I checked the current... | true | ||
ScottArbeit/Grace | 365 | comment_to_fix | I01: Document BLAKE3 and SHA-256 version hashes | **<sub><sub></sub></sub> Qualify version hashes as ADR target behavior**
Fresh evidence: although the glossary entry now scopes Version Hash to ADR 0006, this new Flagged Ambiguities paragraph still says in present tense that Grace uses version hashes for ... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | a42c7a03796e7005f869810b4d36c9267a6a31f4 | diff --git a/CONTEXT.md b/CONTEXT.md
index 573f698f..bd26747a 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -14,6 +14,14 @@ The path-independent BLAKE3 identity of the complete bytes named by a FileVersio
hexadecimal string. A FileContentHash identifies the whole logical file, while ChunkAddress identifies one ContentCh... | [
"CONTEXT.md"
] | [
{
"comment": "**<sub><sub></sub></sub> Qualify version hashes as ADR target behavior**\n\nFresh evidence: although the glossary entry now scopes Version Hash to ADR 0006, this new Flagged Ambiguities paragraph still says in present tense that Grace ... | true | ||
ScottArbeit/Grace | 366 | issue_to_patch | S2: Add read-only doctor auth inspection | ## Summary
Part of #333.
Related to #336.
- Adds read-only `grace doctor` auth checks for `GRACE_TOKEN`, unsupported `GRACE_TOKEN_FILE`, OIDC/M2M environment completeness, and likely auth source detection.
- Uses a pure auth environment inspector from `Auth.CLI.fs` so doctor does not acquire, refresh, store, read sec... | 083d63f5fb5c48f5a70426a01516fc50a8ef0cd8 | 3f7cc15fef23b4db98737ef66a51deced4b303d4 | diff --git a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
index 5652435a..0d335cfa 100644
--- a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
+++ b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
@@ -5,6 +5,7 @@ open Grace.CLI
open Grace.CLI.Command
open Grace.Shared
open Grace.Shared.Client
+... | [
"src/Grace.CLI.Tests/Doctor.CLI.Tests.fs",
"src/Grace.CLI/Command/Auth.CLI.fs",
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Normalize GRACE_TOKEN before doctor PAT parsing**\n\nWhen `GRACE_TOKEN` is set in the same bearer form that the real auth path accepts, e.g. `Bearer grace_pat_v1_...`, doctor now reports `auth.env-token.valid` ... | true | ||
ScottArbeit/Grace | 366 | comment_to_fix | S2: Add read-only doctor auth inspection | **<sub><sub></sub></sub> Normalize GRACE_TOKEN before doctor PAT parsing**
When `GRACE_TOKEN` is set in the same bearer form that the real auth path accepts, e.g. `Bearer grace_pat_v1_...`, doctor now reports `auth.env-token.valid` as failed because this n... | 083d63f5fb5c48f5a70426a01516fc50a8ef0cd8 | 3f7cc15fef23b4db98737ef66a51deced4b303d4 | diff --git a/src/Grace.CLI/Command/Auth.CLI.fs b/src/Grace.CLI/Command/Auth.CLI.fs
index cc66f043..b3b8e852 100644
--- a/src/Grace.CLI/Command/Auth.CLI.fs
+++ b/src/Grace.CLI/Command/Auth.CLI.fs
@@ -68,15 +68,119 @@ module Auth =
type TokenStore = { Helper: MsalCacheHelper; StorageProperties: StorageCreationProp... | [
"src/Grace.CLI/Command/Auth.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Normalize GRACE_TOKEN before doctor PAT parsing**\n\nWhen `GRACE_TOKEN` is set in the same bearer form that the real auth path accepts, e.g. `Bearer grace_pat_v1_...`, doctor now reports `auth.env-token.valid` ... | true | ||
ScottArbeit/Grace | 366 | comment_to_fix | S2: Add read-only doctor auth inspection | **<sub><sub></sub></sub> Ignore blank env values when checking OIDC completeness**
When a shell or CI environment exports any required OIDC variables as empty strings, `isEnvSet` marks them present, so doctor can report M2M/CLI configuration as complete an... | 083d63f5fb5c48f5a70426a01516fc50a8ef0cd8 | 3f7cc15fef23b4db98737ef66a51deced4b303d4 | diff --git a/src/Grace.CLI/Command/Auth.CLI.fs b/src/Grace.CLI/Command/Auth.CLI.fs
index cc66f043..b3b8e852 100644
--- a/src/Grace.CLI/Command/Auth.CLI.fs
+++ b/src/Grace.CLI/Command/Auth.CLI.fs
@@ -68,15 +68,119 @@ module Auth =
type TokenStore = { Helper: MsalCacheHelper; StorageProperties: StorageCreationProp... | [
"src/Grace.CLI/Command/Auth.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Ignore blank env values when checking OIDC completeness**\n\nWhen a shell or CI environment exports any required OIDC variables as empty strings, `isEnvSet` marks them present, so doctor can report M2M/CLI conf... | true | ||
ScottArbeit/Grace | 366 | comment_to_fix | S2: Add read-only doctor auth inspection | **<sub><sub></sub></sub> Treat blank GRACE_TOKEN_FILE as unset**
When `GRACE_TOKEN_FILE` is exported but empty (a common way for CI templates to disable optional secrets), this inspection records it as present, so the default doctor run fails `auth.token-f... | 083d63f5fb5c48f5a70426a01516fc50a8ef0cd8 | 3f7cc15fef23b4db98737ef66a51deced4b303d4 | diff --git a/src/Grace.CLI/Command/Auth.CLI.fs b/src/Grace.CLI/Command/Auth.CLI.fs
index cc66f043..b3b8e852 100644
--- a/src/Grace.CLI/Command/Auth.CLI.fs
+++ b/src/Grace.CLI/Command/Auth.CLI.fs
@@ -68,15 +68,119 @@ module Auth =
type TokenStore = { Helper: MsalCacheHelper; StorageProperties: StorageCreationProp... | [
"src/Grace.CLI/Command/Auth.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Treat blank GRACE_TOKEN_FILE as unset**\n\nWhen `GRACE_TOKEN_FILE` is exported but empty (a common way for CI templates to disable optional secrets), this inspection records it as present, so the default doctor... | true | ||
ScottArbeit/Grace | 366 | comment_to_fix | S2: Add read-only doctor auth inspection | **<sub><sub></sub></sub> Treat blank GRACE_TOKEN as unset**
When `GRACE_TOKEN` is exported as an empty or whitespace value, this inspection treats it as present and reports an invalid token, causing `auth.env-token.valid` to fail and preventing doctor from... | 083d63f5fb5c48f5a70426a01516fc50a8ef0cd8 | 3f7cc15fef23b4db98737ef66a51deced4b303d4 | diff --git a/src/Grace.CLI/Command/Auth.CLI.fs b/src/Grace.CLI/Command/Auth.CLI.fs
index cc66f043..b3b8e852 100644
--- a/src/Grace.CLI/Command/Auth.CLI.fs
+++ b/src/Grace.CLI/Command/Auth.CLI.fs
@@ -68,15 +68,119 @@ module Auth =
type TokenStore = { Helper: MsalCacheHelper; StorageProperties: StorageCreationProp... | [
"src/Grace.CLI/Command/Auth.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Treat blank GRACE_TOKEN as unset**\n\nWhen `GRACE_TOKEN` is exported as an empty or whitespace value, this inspection treats it as present and reports an invalid token, causing `auth.env-token.valid` to fail an... | true | ||
ScottArbeit/Grace | 367 | issue_to_patch | I02: Add BLAKE3 version hash validation | ## Summary
- Adds explicit `Blake3Hash` vocabulary beside existing SHA-256 version hash vocabulary.
- Adds shared validation helpers and error text for BLAKE3 full hashes and lookup prefixes.
- Preserves existing SHA-256 validation compatibility and avoids CAS address validation changes.
- Expands the owned write set ... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 4a79fa146f20c3f93f2a5aee03e5e689eee9fdf2 | diff --git a/src/Grace.Server.Unit.Tests/Validations.Server.Tests.fs b/src/Grace.Server.Unit.Tests/Validations.Server.Tests.fs
index 6e5166b6..00ed4961 100644
--- a/src/Grace.Server.Unit.Tests/Validations.Server.Tests.fs
+++ b/src/Grace.Server.Unit.Tests/Validations.Server.Tests.fs
@@ -122,6 +122,40 @@ type Validations... | [
"src/Grace.Server.Unit.Tests/Validations.Server.Tests.fs",
"src/Grace.Shared/Constants.Shared.fs",
"src/Grace.Shared/Resources/Text/Languages.Resources.fs",
"src/Grace.Shared/Resources/Text/en-US.fs",
"src/Grace.Shared/Validation/Common.Validation.fs",
"src/Grace.Shared/Validation/Errors.Validation.fs",
... | [] | true | ||
ScottArbeit/Grace | 342 | issue_to_patch | S1: Add read-only doctor config inspection | ## Summary
Part of #333.
Related to #335.
- Adds read-only `grace doctor` diagnostics for repository config, user config, server URI consistency, and `.graceignore` inspection.
- Adds read-only shared inspectors so doctor does not call mutating config/user-config helpers.
- Represents missing/malformed/unreadable con... | eadc3509b6211520937ce9690212216024f46b93 | fdd167b34432302c374bba0cdad4a5fe016f954a | diff --git a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
index 942b7540..5652435a 100644
--- a/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
+++ b/src/Grace.CLI.Tests/Doctor.CLI.Tests.fs
@@ -4,6 +4,7 @@ open FsUnit
open Grace.CLI
open Grace.CLI.Command
open Grace.Shared
+open Grace.Sh... | [
"src/Grace.CLI.Tests/Doctor.CLI.Tests.fs",
"src/Grace.CLI/Command/Doctor.CLI.fs",
"src/Grace.Shared/Client/Configuration.Shared.fs",
"src/Grace.Shared/Client/UserConfiguration.Shared.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Classify unreadable configs as parse failures**\n\nWhen `.grace/graceconfig.json` exists but cannot be opened, for example because of file permissions or a sharing violation, `parseConfigurationFile` returns an... | true | ||
ScottArbeit/Grace | 342 | comment_to_fix | S1: Add read-only doctor config inspection | **<sub><sub></sub></sub> Classify unreadable configs as parse failures**
When `.grace/graceconfig.json` exists but cannot be opened, for example because of file permissions or a sharing violation, `parseConfigurationFile` returns an exception message that ... | eadc3509b6211520937ce9690212216024f46b93 | fdd167b34432302c374bba0cdad4a5fe016f954a | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
index b3cadd88..f7843b59 100644
--- a/src/Grace.CLI/Command/Doctor.CLI.fs
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -3,6 +3,7 @@ namespace Grace.CLI.Command
open Grace.CLI.Common
open Grace.CLI.Text
open Grace.Shared
+open Grac... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Classify unreadable configs as parse failures**\n\nWhen `.grace/graceconfig.json` exists but cannot be opened, for example because of file permissions or a sharing violation, `parseConfigurationFile` returns an... | true | ||
ScottArbeit/Grace | 342 | comment_to_fix | S1: Add read-only doctor config inspection | **<sub><sub></sub></sub> Handle unreadable .graceignore files**
When a repository has a `.graceignore` file that exists but cannot be read, such as one with restrictive permissions or a transient sharing violation, `File.ReadAllLines` throws while building... | eadc3509b6211520937ce9690212216024f46b93 | fdd167b34432302c374bba0cdad4a5fe016f954a | diff --git a/src/Grace.Shared/Client/Configuration.Shared.fs b/src/Grace.Shared/Client/Configuration.Shared.fs
index be0e6ff4..c4943148 100644
--- a/src/Grace.Shared/Client/Configuration.Shared.fs
+++ b/src/Grace.Shared/Client/Configuration.Shared.fs
@@ -147,7 +147,10 @@ module Configuration =
// Deseriali... | [
"src/Grace.Shared/Client/Configuration.Shared.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Handle unreadable .graceignore files**\n\nWhen a repository has a `.graceignore` file that exists but cannot be read, such as one with restrictive permissions or a transient sharing violation, `File.ReadAllLine... | true | ||
ScottArbeit/Grace | 341 | issue_to_patch | S0: Add grace doctor scaffold | ## Summary
Part of #333.
Related to #334.
- Adds the inert root-level `grace doctor` command scaffold and grouped root help entry.
- Adds v1 doctor options: `--full`, `--offline`, `--list-checks`, `--check`, and `--strict`.
- Adds stable doctor report DTOs, inert check catalog behavior, diagnostic exit-code mapping, ... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 81e875bde75a1f2380488d7e6aeb9af86d2a1c61 | diff --git a/docs/Machine-readable CLI output.md b/docs/Machine-readable CLI output.md
index c097ea54..8b682469 100644
--- a/docs/Machine-readable CLI output.md
+++ b/docs/Machine-readable CLI output.md
@@ -127,8 +127,8 @@ Rejected selectors return a JSON error envelope. They do not produce partial out
The final reg... | [
"docs/Machine-readable CLI output.md",
"src/Grace.CLI.Tests/CommandOutputContract.CLI.Tests.fs",
"src/Grace.CLI.Tests/Doctor.CLI.Parsing.Tests.fs",
"src/Grace.CLI.Tests/Doctor.CLI.Tests.fs",
"src/Grace.CLI.Tests/Grace.CLI.Tests.fsproj",
"src/Grace.CLI/Command/Common.CLI.fs",
"src/Grace.CLI/Command/Docto... | [
{
"comment": "**<sub><sub></sub></sub> Respect silent and minimal output for doctor**\n\nWhen `grace doctor` is run with `--output Silent` or `--output Minimal`, this branch still calls `renderHumanReport`, so the command prints the full Spectre tab... | true | ||
ScottArbeit/Grace | 341 | comment_to_fix | S0: Add grace doctor scaffold | **<sub><sub></sub></sub> Respect silent and minimal output for doctor**
When `grace doctor` is run with `--output Silent` or `--output Minimal`, this branch still calls `renderHumanReport`, so the command prints the full Spectre table even though the share... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 81e875bde75a1f2380488d7e6aeb9af86d2a1c61 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
new file mode 100644
index 00000000..b3cadd88
--- /dev/null
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -0,0 +1,315 @@
+namespace Grace.CLI.Command
+
+open Grace.CLI.Common
+open Grace.CLI.Text
+open Grace.Shared
+open Grace.Types.C... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Respect silent and minimal output for doctor**\n\nWhen `grace doctor` is run with `--output Silent` or `--output Minimal`, this branch still calls `renderHumanReport`, so the command prints the full Spectre tab... | true | ||
ScottArbeit/Grace | 341 | comment_to_fix | S0: Add grace doctor scaffold | **<sub><sub></sub></sub> Do not silently drop explicitly requested checks**
When a user requests a valid check that is not in the default profile, such as `--check identity.auth-session` without `--full`, `matches` is non-empty so the token is not reported... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 81e875bde75a1f2380488d7e6aeb9af86d2a1c61 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
new file mode 100644
index 00000000..b3cadd88
--- /dev/null
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -0,0 +1,315 @@
+namespace Grace.CLI.Command
+
+open Grace.CLI.Common
+open Grace.CLI.Text
+open Grace.Shared
+open Grace.Types.C... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Do not silently drop explicitly requested checks**\n\nWhen a user requests a valid check that is not in the default profile, such as `--check identity.auth-session` without `--full`, `matches` is non-empty so t... | true | ||
ScottArbeit/Grace | 341 | comment_to_fix | S0: Add grace doctor scaffold | **<sub><sub></sub></sub> Propagate selection rendering failures**
When `--select` names a property that is not present, `renderOutput` writes a `GraceError` and returns `-1`, but this result is ignored here and the method then returns the diagnostic status... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 81e875bde75a1f2380488d7e6aeb9af86d2a1c61 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
new file mode 100644
index 00000000..b3cadd88
--- /dev/null
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -0,0 +1,315 @@
+namespace Grace.CLI.Command
+
+open Grace.CLI.Common
+open Grace.CLI.Text
+open Grace.Shared
+open Grace.Types.C... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Propagate selection rendering failures**\n\nWhen `--select` names a property that is not present, `renderOutput` writes a `GraceError` and returns `-1`, but this result is ignored here and the method then retur... | true | ||
ScottArbeit/Grace | 341 | comment_to_fix | S0: Add grace doctor scaffold | **<sub><sub></sub></sub> List the full doctor catalog**
When `--list-checks` is used without `--full`, this same default-profile filter is still applied, so non-default catalog entries such as `identity.auth-session` and `server.connectivity` are omitted f... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 81e875bde75a1f2380488d7e6aeb9af86d2a1c61 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
new file mode 100644
index 00000000..b3cadd88
--- /dev/null
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -0,0 +1,315 @@
+namespace Grace.CLI.Command
+
+open Grace.CLI.Common
+open Grace.CLI.Text
+open Grace.Shared
+open Grace.Types.C... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> List the full doctor catalog**\n\nWhen `--list-checks` is used without `--full`, this same default-profile filter is still applied, so non-default catalog entries such as `identity.auth-session` and `server.con... | true | ||
ScottArbeit/Grace | 341 | comment_to_fix | S0: Add grace doctor scaffold | **<sub><sub></sub></sub> Keep doctor in CLI inventory docs**
This new filter removes the newly added `doctor` command from the documentation freshness check, so the test still passes while `docs/Machine-readable CLI output.md` reports the old totals (`202`... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 81e875bde75a1f2380488d7e6aeb9af86d2a1c61 | diff --git a/src/Grace.CLI.Tests/CommandOutputContract.CLI.Tests.fs b/src/Grace.CLI.Tests/CommandOutputContract.CLI.Tests.fs
index 2e4f68b7..f846c4fe 100644
--- a/src/Grace.CLI.Tests/CommandOutputContract.CLI.Tests.fs
+++ b/src/Grace.CLI.Tests/CommandOutputContract.CLI.Tests.fs
@@ -212,16 +212,16 @@ module CommandOutpu... | [
"src/Grace.CLI.Tests/CommandOutputContract.CLI.Tests.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Keep doctor in CLI inventory docs**\n\nThis new filter removes the newly added `doctor` command from the documentation freshness check, so the test still passes while `docs/Machine-readable CLI output.md` repor... | true | ||
ScottArbeit/Grace | 341 | comment_to_fix | S0: Add grace doctor scaffold | **<sub><sub></sub></sub> Require a value for --check**
Because `--check` is declared with `ZeroOrMore` arity, `grace doctor --check` (or `--check --strict`) is accepted with no token and then falls through to the default profile, exiting successfully with ... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 81e875bde75a1f2380488d7e6aeb9af86d2a1c61 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
new file mode 100644
index 00000000..b3cadd88
--- /dev/null
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -0,0 +1,315 @@
+namespace Grace.CLI.Command
+
+open Grace.CLI.Common
+open Grace.CLI.Text
+open Grace.Shared
+open Grace.Types.C... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Require a value for --check**\n\nBecause `--check` is declared with `ZeroOrMore` arity, `grace doctor --check` (or `--check --strict`) is accepted with no token and then falls through to the default profile, ex... | true | ||
ScottArbeit/Grace | 341 | comment_to_fix | S0: Add grace doctor scaffold | **<sub><sub></sub></sub> Suppress verbose parse dumps when selecting doctor output**
When `grace --output Verbose doctor --select Status` is used, this line writes the verbose parse dump to stdout before `renderOutput` emits the selected JSON value, so std... | e5ee6dfc58353775b4220367117e2d5a2a71c083 | 81e875bde75a1f2380488d7e6aeb9af86d2a1c61 | diff --git a/src/Grace.CLI/Command/Doctor.CLI.fs b/src/Grace.CLI/Command/Doctor.CLI.fs
new file mode 100644
index 00000000..b3cadd88
--- /dev/null
+++ b/src/Grace.CLI/Command/Doctor.CLI.fs
@@ -0,0 +1,315 @@
+namespace Grace.CLI.Command
+
+open Grace.CLI.Common
+open Grace.CLI.Text
+open Grace.Shared
+open Grace.Types.C... | [
"src/Grace.CLI/Command/Doctor.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Suppress verbose parse dumps when selecting doctor output**\n\nWhen `grace --output Verbose doctor --select Status` is used, this line writes the verbose parse dump to stdout before `renderOutput` emits the sel... | true | ||
ScottArbeit/Grace | 332 | issue_to_patch | [Epic] Implement exact-path Reference-based branch annotation V1
## Objective
Implement exact-path, Reference-based `grace branch annotate` V1 through an epic integration branch and reviewed,
validated sub-issue slices.
## Planned branch and merge strategy
- Epic integration branch: `epic/313-branch-annotate... | Release branch annotation V1 | Closes #313## Summary- Adds exact-path, Reference-based branch annotation V1 across shared DTOs, pure line annotation, server materialization/history traversal, API/SDK/OpenAPI surfaces, and CLI support.- Adds `grace branch annotate` with explicit Target Reference support, CLI current-state resolution, JSON contract co... | 766b97be545fc0c2ae719aee51aa7e53512e0d61 | 730a0273bc2235b1a851463f8b5d15eaa14b04c2 | diff --git a/AGENTS.md b/AGENTS.md
index 537e8c41..e6d23772 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -42,8 +42,10 @@ When implementing an epic, always use an explicit epic integration branch. Creat
sub-issue PRs to the epic branch, keep that branch refreshed from `origin/main`, and use the final epic-to-`main` PR as
... | [
"AGENTS.md",
"docs/Branch annotation final audit.md",
"docs/Branch annotation.md",
"docs/Development process.md",
"docs/Machine-readable CLI output.md",
"docs/adr/0005-use-exact-path-reference-based-branch-annotation.md",
"sdk/dotnet/Grace.Sdk.Harness/Internal/Generated/GraceRawClientMetadata.cs",
"sd... | [
{
"comment": "**<sub><sub></sub></sub> Cap retained annotation materialization bytes**\n\nWhen `/branch/annotate` is run on a long-lived branch where the target path has many text versions, this loop materializes and retains the full file bytes for ... | diff --git a/sdk/generated/matrix/openapi-generator/python/test/test_annotate_parameters.py b/sdk/generated/matrix/openapi-generator/python/test/test_annotate_parameters.py
new file mode 100644
index 00000000..a7101656
--- /dev/null
+++ b/sdk/generated/matrix/openapi-generator/python/test/test_annotate_parameters.py
@@... | true |
ScottArbeit/Grace | 332 | comment_to_fix | Release branch annotation V1 | **<sub><sub></sub></sub> Cap retained annotation materialization bytes**
When `/branch/annotate` is run on a long-lived branch where the target path has many text versions, this loop materializes and retains the full file bytes for every authorized referen... | 766b97be545fc0c2ae719aee51aa7e53512e0d61 | 730a0273bc2235b1a851463f8b5d15eaa14b04c2 | diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs
index 31e4d51a..71e8b975 100644
--- a/src/Grace.Server/Branch.Server.fs
+++ b/src/Grace.Server/Branch.Server.fs
@@ -6,12 +6,16 @@ open Grace.Actors.Constants
open Grace.Actors.Extensions.ActorProxy
open Grace.Actors.Interfaces
open Gr... | [
"src/Grace.Server/Branch.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Cap retained annotation materialization bytes**\n\nWhen `/branch/annotate` is run on a long-lived branch where the target path has many text versions, this loop materializes and retains the full file bytes for ... | true | ||
ScottArbeit/Grace | 332 | comment_to_fix | Release branch annotation V1 | **<sub><sub></sub></sub> Preserve boundary reasons in annotation results**
For any line that hits a boundary (for example a missing target line, an unauthorized ancestor, traversal budget, or filtered reference type), `boundary.BoundaryKind` is the only re... | 766b97be545fc0c2ae719aee51aa7e53512e0d61 | 730a0273bc2235b1a851463f8b5d15eaa14b04c2 | diff --git a/src/Grace.Shared/AnnotationLineCore.Shared.fs b/src/Grace.Shared/AnnotationLineCore.Shared.fs
new file mode 100644
index 00000000..16d40e4a
--- /dev/null
+++ b/src/Grace.Shared/AnnotationLineCore.Shared.fs
@@ -0,0 +1,747 @@
+namespace Grace.Shared
+
+open Grace.Shared.Utilities
+open Grace.Types.Annotation... | [
"src/Grace.Shared/AnnotationLineCore.Shared.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Preserve boundary reasons in annotation results**\n\nFor any line that hits a boundary (for example a missing target line, an unauthorized ancestor, traversal budget, or filtered reference type), `boundary.Boun... | true | ||
ScottArbeit/Grace | 331 | issue_to_patch | Document branch annotation V1 audit | ## Summary
Part of #313
Related to #322
This PR completes the branch annotation V1 docs/ADR/final-audit slice:
- Adds ADR 0005 for the exact-path Reference-based branch annotation decision.
- Adds a user-facing `grace branch annotate` doc covering CLI options, Target Reference behavior, API/SDK boundaries, JSON outp... | c72af76281ab417aa5032132a825281fefaa7161 | c3ec9441bc147bbe51cdebbbd53d384d3b8fd2f6 | diff --git a/docs/Branch annotation final audit.md b/docs/Branch annotation final audit.md
new file mode 100644
index 00000000..b3e908bd
--- /dev/null
+++ b/docs/Branch annotation final audit.md
@@ -0,0 +1,81 @@
+# Branch Annotation Final Audit
+
+Issue #322 closes the docs, ADR, and final-audit slice for branch annota... | [
"docs/Branch annotation final audit.md",
"docs/Branch annotation.md",
"docs/adr/0005-use-exact-path-reference-based-branch-annotation.md"
] | [] | true | ||
ScottArbeit/Grace | 330 | issue_to_patch | Add branch annotate CLI command | Part of #313
Related to #321
## Summary
- Adds `grace branch annotate` with required `--path`, optional `--reference-id`, `-L/--line-range`, `--start-line`, `--end-line`, comma-separated `--reference-types`, `--show last-changed|introduced|both`, and `--max-references`.
- Reuses the S7 current-state target Reference ... | 020692a7358298d21d5cdc44c1503839362479aa | 40fa6808755000dd1868964911ba3f3c862b8501 | diff --git a/docs/Machine-readable CLI output.md b/docs/Machine-readable CLI output.md
index 4bb55abe..c097ea54 100644
--- a/docs/Machine-readable CLI output.md
+++ b/docs/Machine-readable CLI output.md
@@ -127,8 +127,8 @@ Rejected selectors return a JSON error envelope. They do not produce partial out
The final reg... | [
"docs/Machine-readable CLI output.md",
"src/Grace.CLI.Tests/Branch.CLI.Parsing.Tests.fs",
"src/Grace.CLI.Tests/Branch.CLI.Tests.fs",
"src/Grace.CLI.Tests/CommandOutputContract.CLI.Tests.fs",
"src/Grace.CLI.Tests/Grace.CLI.Tests.fsproj",
"src/Grace.CLI/Command/Branch.CLI.fs",
"src/Grace.CLI/CommandOutput... | [
{
"comment": "**<sub><sub></sub></sub> Keep the path test platform-independent**\n\nThis new test case fails on Linux/macOS CI because `Path.IsPathFullyQualified(\"C:\\\\repo\\\\src\\\\App.fs\")` is false off Windows, so `normalizeBranchAnnotatePath... | true | ||
ScottArbeit/Grace | 330 | comment_to_fix | Add branch annotate CLI command | **<sub><sub></sub></sub> Keep the path test platform-independent**
This new test case fails on Linux/macOS CI because `Path.IsPathFullyQualified("C:\\repo\\src\\App.fs")` is false off Windows, so `normalizeBranchAnnotatePath` falls through to the colon che... | 020692a7358298d21d5cdc44c1503839362479aa | 40fa6808755000dd1868964911ba3f3c862b8501 | diff --git a/src/Grace.CLI.Tests/Branch.CLI.Tests.fs b/src/Grace.CLI.Tests/Branch.CLI.Tests.fs
new file mode 100644
index 00000000..5fd3d12c
--- /dev/null
+++ b/src/Grace.CLI.Tests/Branch.CLI.Tests.fs
@@ -0,0 +1,439 @@
+namespace Grace.CLI.Tests
+
+open FsUnit
+open Grace.CLI
+open Grace.CLI.Command
+open Grace.CLI.Ser... | [
"src/Grace.CLI.Tests/Branch.CLI.Tests.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Keep the path test platform-independent**\n\nThis new test case fails on Linux/macOS CI because `Path.IsPathFullyQualified(\"C:\\\\repo\\\\src\\\\App.fs\")` is false off Windows, so `normalizeBranchAnnotatePath... | true | ||
ScottArbeit/Grace | 330 | comment_to_fix | Add branch annotate CLI command | **<sub><sub></sub></sub> Suppress human annotation output for --select**
When `branch annotate` is invoked with `--select` and the default output mode, `renderOutput` emits the selected JSON document because the common renderer treats selectors as machine-... | 020692a7358298d21d5cdc44c1503839362479aa | 40fa6808755000dd1868964911ba3f3c862b8501 | diff --git a/src/Grace.CLI/Command/Branch.CLI.fs b/src/Grace.CLI/Command/Branch.CLI.fs
index 52a3b671..be6c0d98 100644
--- a/src/Grace.CLI/Command/Branch.CLI.fs
+++ b/src/Grace.CLI/Command/Branch.CLI.fs
@@ -17,6 +17,7 @@ open Grace.Shared.Validation
open Grace.Shared.Validation.Errors
open Grace.Types.Branch
open Gr... | [
"src/Grace.CLI/Command/Branch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Suppress human annotation output for --select**\n\nWhen `branch annotate` is invoked with `--select` and the default output mode, `renderOutput` emits the selected JSON document because the common renderer trea... | true | ||
ScottArbeit/Grace | 330 | comment_to_fix | Add branch annotate CLI command | **<sub><sub></sub></sub> Mark annotate as mutating in the contract**
This registry entry advertises `branch annotate` as non-mutating/read-only, but the command wires through `resolveCliCurrentStateTargetReferenceForBranchAnnotate`; when no `--reference-id... | 020692a7358298d21d5cdc44c1503839362479aa | 40fa6808755000dd1868964911ba3f3c862b8501 | diff --git a/src/Grace.CLI/CommandOutputContract.CLI.fs b/src/Grace.CLI/CommandOutputContract.CLI.fs
index 8432ae7e..64e9331e 100644
--- a/src/Grace.CLI/CommandOutputContract.CLI.fs
+++ b/src/Grace.CLI/CommandOutputContract.CLI.fs
@@ -793,6 +793,7 @@ module CommandOutputContract =
row [ "auth"; "token" ] "... | [
"src/Grace.CLI/CommandOutputContract.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Mark annotate as mutating in the contract**\n\nThis registry entry advertises `branch annotate` as non-mutating/read-only, but the command wires through `resolveCliCurrentStateTargetReferenceForBranchAnnotate`;... | true | ||
ScottArbeit/Grace | 330 | comment_to_fix | Add branch annotate CLI command | **<sub><sub></sub></sub> Reject an explicit --end-line 0**
When callers pass `--start-line 5 --end-line 0` without `--line-range`, this sentinel handling treats the explicit zero as if `--end-line` was omitted and sends a valid one-line request for line 5.... | 020692a7358298d21d5cdc44c1503839362479aa | 40fa6808755000dd1868964911ba3f3c862b8501 | diff --git a/src/Grace.CLI/Command/Branch.CLI.fs b/src/Grace.CLI/Command/Branch.CLI.fs
index 52a3b671..be6c0d98 100644
--- a/src/Grace.CLI/Command/Branch.CLI.fs
+++ b/src/Grace.CLI/Command/Branch.CLI.fs
@@ -17,6 +17,7 @@ open Grace.Shared.Validation
open Grace.Shared.Validation.Errors
open Grace.Types.Branch
open Gr... | [
"src/Grace.CLI/Command/Branch.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Reject an explicit --end-line 0**\n\nWhen callers pass `--start-line 5 --end-line 0` without `--line-range`, this sentinel handling treats the explicit zero as if `--end-line` was omitted and sends a valid one-... | true | ||
ScottArbeit/Grace | 329 | issue_to_patch | Extract CLI current-state capture helper | ## Summary
- Extracts a reusable CLI current-state capture helper for branch annotation callers.
- Reuses GraceWatch status, existing matching branch references, or the existing local scan/upload/directory-version/save primitives instead of adding an annotate-specific upload pipeline.
- Adds focused CLI tests for ... | c6a47584aa3dfcbe335cf75b59dca9b432262f0d | 24229dc887f85a071e48d39facc95f3569912de4 | diff --git a/src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs b/src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs
new file mode 100644
index 00000000..7c60151e
--- /dev/null
+++ b/src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs
@@ -0,0 +1,374 @@
+namespace Grace.CLI.Tests
+
+open FsUnit
+open Grace.CLI
+ope... | [
"src/Grace.CLI.Tests/CurrentStateCapture.CLI.Tests.fs",
"src/Grace.CLI.Tests/Grace.CLI.Tests.fsproj",
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Avoid selecting parent BasedOn references**\n\nWhen a fresh child branch has no local references and the working tree still matches its base, this list can return `branchDto.BasedOn`; that DTO may belong to the... | true | ||
ScottArbeit/Grace | 329 | comment_to_fix | Extract CLI current-state capture helper | **<sub><sub></sub></sub> Avoid selecting parent BasedOn references**
When a fresh child branch has no local references and the working tree still matches its base, this list can return `branchDto.BasedOn`; that DTO may belong to the parent branch rather th... | c6a47584aa3dfcbe335cf75b59dca9b432262f0d | 24229dc887f85a071e48d39facc95f3569912de4 | diff --git a/src/Grace.CLI/Command/Services.CLI.fs b/src/Grace.CLI/Command/Services.CLI.fs
index d4f57062..14f92232 100644
--- a/src/Grace.CLI/Command/Services.CLI.fs
+++ b/src/Grace.CLI/Command/Services.CLI.fs
@@ -35,7 +35,10 @@ open System.Threading.Tasks
open System.Reactive.Linq
open System.Threading
open Grace.... | [
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Avoid selecting parent BasedOn references**\n\nWhen a fresh child branch has no local references and the working tree still matches its base, this list can return `branchDto.BasedOn`; that DTO may belong to the... | true | ||
ScottArbeit/Grace | 329 | comment_to_fix | Extract CLI current-state capture helper | **<sub><sub></sub></sub> Read created reference id from properties**
When this helper creates an implicit Save through the real `Branch.Save` path, the response `ReturnValue` is the status text (`"Branch command succeeded."`), while the new reference id is... | c6a47584aa3dfcbe335cf75b59dca9b432262f0d | 24229dc887f85a071e48d39facc95f3569912de4 | diff --git a/src/Grace.CLI/Command/Services.CLI.fs b/src/Grace.CLI/Command/Services.CLI.fs
index d4f57062..14f92232 100644
--- a/src/Grace.CLI/Command/Services.CLI.fs
+++ b/src/Grace.CLI/Command/Services.CLI.fs
@@ -35,7 +35,10 @@ open System.Threading.Tasks
open System.Reactive.Linq
open System.Threading
open Grace.... | [
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Read created reference id from properties**\n\nWhen this helper creates an implicit Save through the real `Branch.Save` path, the response `ReturnValue` is the status text (`\"Branch command succeeded.\"`), whi... | true | ||
ScottArbeit/Grace | 329 | comment_to_fix | Extract CLI current-state capture helper | **<sub><sub></sub></sub> Upload all changed file versions on retry**
If a previous implicit-save attempt copied a changed file into the local object cache but failed before uploading it, a retry hits the `copyToObjectDirectory` path where the object file a... | c6a47584aa3dfcbe335cf75b59dca9b432262f0d | 24229dc887f85a071e48d39facc95f3569912de4 | diff --git a/src/Grace.CLI/Command/Services.CLI.fs b/src/Grace.CLI/Command/Services.CLI.fs
index d4f57062..14f92232 100644
--- a/src/Grace.CLI/Command/Services.CLI.fs
+++ b/src/Grace.CLI/Command/Services.CLI.fs
@@ -35,7 +35,10 @@ open System.Threading.Tasks
open System.Reactive.Linq
open System.Threading
open Grace.... | [
"src/Grace.CLI/Command/Services.CLI.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Upload all changed file versions on retry**\n\nIf a previous implicit-save attempt copied a changed file into the local object cache but failed before uploading it, a retry hits the `copyToObjectDirectory` path... | true | ||
ScottArbeit/Grace | 328 | issue_to_patch | Add branch annotate API and SDK wrapper | ## Summary - Adds `POST /branch/annotate` under the Branch API using the existing Grace envelope/error response pattern. - Enforces `BranchRead` authorization for `/branch/annotate` in both startup routing and the endpoint authorization manifest. - Adds a thin `Grace.SDK.Branch.Annotate` wrapper that posts caller-suppl... | 2c0265092c07919370c9e89f089affd857e7e649 | 93f43484515f9122613be123e3b784cc6c479469 | diff --git a/sdk/dotnet/Grace.Sdk.Harness/Internal/Generated/GraceRawClientMetadata.cs b/sdk/dotnet/Grace.Sdk.Harness/Internal/Generated/GraceRawClientMetadata.cs
index a23a749e..1c2859b0 100644
--- a/sdk/dotnet/Grace.Sdk.Harness/Internal/Generated/GraceRawClientMetadata.cs
+++ b/sdk/dotnet/Grace.Sdk.Harness/Internal/G... | [
"sdk/dotnet/Grace.Sdk.Harness/Internal/Generated/GraceRawClientMetadata.cs",
"sdk/generated/generator-report.json",
"sdk/generated/matrix/generator-matrix-evidence.json",
"sdk/generated/matrix/openapi-generator/python/.openapi-generator/FILES",
"sdk/generated/matrix/openapi-generator/python/README.md",
"s... | [
{
"comment": "**<sub><sub></sub></sub> Query the history window around the target reference**\n\nWhen `TargetReferenceId` is not among the latest `MaxReferences` refs for the branch, this call only retrieves the newest refs; after appending the olde... | diff --git a/sdk/generated/matrix/openapi-generator/python/test/test_annotate_parameters.py b/sdk/generated/matrix/openapi-generator/python/test/test_annotate_parameters.py
new file mode 100644
index 00000000..a7101656
--- /dev/null
+++ b/sdk/generated/matrix/openapi-generator/python/test/test_annotate_parameters.py
@@... | true | |
ScottArbeit/Grace | 328 | comment_to_fix | Add branch annotate API and SDK wrapper | **<sub><sub></sub></sub> Query the history window around the target reference**
When `TargetReferenceId` is not among the latest `MaxReferences` refs for the branch, this call only retrieves the newest refs; after appending the older target, `orderedHistor... | 2c0265092c07919370c9e89f089affd857e7e649 | 93f43484515f9122613be123e3b784cc6c479469 | diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs
index 31e4d51a..29001878 100644
--- a/src/Grace.Server/Branch.Server.fs
+++ b/src/Grace.Server/Branch.Server.fs
@@ -6,12 +6,16 @@ open Grace.Actors.Constants
open Grace.Actors.Extensions.ActorProxy
open Grace.Actors.Interfaces
open Gr... | [
"src/Grace.Server/Branch.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Query the history window around the target reference**\n\nWhen `TargetReferenceId` is not among the latest `MaxReferences` refs for the branch, this call only retrieves the newest refs; after appending the olde... | true | ||
ScottArbeit/Grace | 328 | comment_to_fix | Add branch annotate API and SDK wrapper | **<sub><sub></sub></sub> Follow stored BasedOn links for rebased references**
For branch creation and `/branch/rebase`, the reference records carry a `ReferenceLinkType.BasedOn` link to the actual parent reference, but this code replaces that with the prev... | 2c0265092c07919370c9e89f089affd857e7e649 | 93f43484515f9122613be123e3b784cc6c479469 | diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs
index 31e4d51a..29001878 100644
--- a/src/Grace.Server/Branch.Server.fs
+++ b/src/Grace.Server/Branch.Server.fs
@@ -6,12 +6,16 @@ open Grace.Actors.Constants
open Grace.Actors.Extensions.ActorProxy
open Grace.Actors.Interfaces
open Gr... | [
"src/Grace.Server/Branch.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Follow stored BasedOn links for rebased references**\n\nFor branch creation and `/branch/rebase`, the reference records carry a `ReferenceLinkType.BasedOn` link to the actual parent reference, but this code rep... | true | ||
ScottArbeit/Grace | 328 | comment_to_fix | Add branch annotate API and SDK wrapper | **<sub><sub></sub></sub> Enforce path read permission before materializing annotations**
`/branch/annotate` can return target line text (`IncludeLineText`) and reads the file bytes from object storage, but the route only checks `requireBranchRead`; path pe... | 2c0265092c07919370c9e89f089affd857e7e649 | 93f43484515f9122613be123e3b784cc6c479469 | diff --git a/src/Grace.Server/Startup.Server.fs b/src/Grace.Server/Startup.Server.fs
index 75018886..97e0875d 100644
--- a/src/Grace.Server/Startup.Server.fs
+++ b/src/Grace.Server/Startup.Server.fs
@@ -210,6 +210,26 @@ module Application =
return StorageAuthorizationResources.downloadUriResource grace... | [
"src/Grace.Server/Startup.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Enforce path read permission before materializing annotations**\n\n`/branch/annotate` can return target line text (`IncludeLineText`) and reads the file bytes from object storage, but the route only checks `req... | true | ||
ScottArbeit/Grace | 328 | comment_to_fix | Add branch annotate API and SDK wrapper | **<sub><sub></sub></sub> Return a validation error for null annotation paths**
If a client omits `Path` or sends it as JSON `null`, this normalization runs before any null/blank path guard and `normalizeFilePath` dereferences the string, so a malformed req... | 2c0265092c07919370c9e89f089affd857e7e649 | 93f43484515f9122613be123e3b784cc6c479469 | diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs
index 31e4d51a..29001878 100644
--- a/src/Grace.Server/Branch.Server.fs
+++ b/src/Grace.Server/Branch.Server.fs
@@ -6,12 +6,16 @@ open Grace.Actors.Constants
open Grace.Actors.Extensions.ActorProxy
open Grace.Actors.Interfaces
open Gr... | [
"src/Grace.Server/Branch.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Return a validation error for null annotation paths**\n\nIf a client omits `Path` or sends it as JSON `null`, this normalization runs before any null/blank path guard and `normalizeFilePath` dereferences the st... | true | ||
ScottArbeit/Grace | 328 | comment_to_fix | Add branch annotate API and SDK wrapper | **<sub><sub></sub></sub> Fetch ancestors of BasedOn parent references**
When a child branch or rebase points at a parent-branch promotion, this only adds that immediate `BasedOn` reference to the annotation history. Because no window of the parent branch's... | 2c0265092c07919370c9e89f089affd857e7e649 | 93f43484515f9122613be123e3b784cc6c479469 | diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs
index 31e4d51a..29001878 100644
--- a/src/Grace.Server/Branch.Server.fs
+++ b/src/Grace.Server/Branch.Server.fs
@@ -6,12 +6,16 @@ open Grace.Actors.Constants
open Grace.Actors.Extensions.ActorProxy
open Grace.Actors.Interfaces
open Gr... | [
"src/Grace.Server/Branch.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Fetch ancestors of BasedOn parent references**\n\nWhen a child branch or rebase points at a parent-branch promotion, this only adds that immediate `BasedOn` reference to the annotation history. Because no windo... | true | ||
ScottArbeit/Grace | 328 | comment_to_fix | Add branch annotate API and SDK wrapper | **<sub><sub></sub></sub> Handle null ReferenceTypes as a validation error**
If a client sends `"ReferenceTypes": null` instead of omitting the field, this passes a null array into `buildAnnotationFromEffectiveHistoryTraversal`; the core annotation code map... | 2c0265092c07919370c9e89f089affd857e7e649 | 93f43484515f9122613be123e3b784cc6c479469 | diff --git a/src/Grace.Server/Branch.Server.fs b/src/Grace.Server/Branch.Server.fs
index 31e4d51a..29001878 100644
--- a/src/Grace.Server/Branch.Server.fs
+++ b/src/Grace.Server/Branch.Server.fs
@@ -6,12 +6,16 @@ open Grace.Actors.Constants
open Grace.Actors.Extensions.ActorProxy
open Grace.Actors.Interfaces
open Gr... | [
"src/Grace.Server/Branch.Server.fs"
] | [
{
"comment": "**<sub><sub></sub></sub> Handle null ReferenceTypes as a validation error**\n\nIf a client sends `\"ReferenceTypes\": null` instead of omitting the field, this passes a null array into `buildAnnotationFromEffectiveHistoryTraversal`; th... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.