afterQuery inside global scope

[akyrey]

Hello,
I have created a global scope to retrieve models only for the current tenant, something like this

final class TenantScope implements Scope
{
    public function apply(Builder $builder, Model $model): void
    {
        $tenant = Tenant::current();
        if ($tenant) {
            $builder->where($model->qualifyColumn('tenant_id'), $tenant->id);
        }
    }
}

Now I'd like to add an afterQuery to set the inverse of the relationship and avoid having to eager load the tenant for all models

->afterQuery(fn (Collection $results): Collection => $results
    ->map(fn (Model $model): Model => $model->getOriginal('tenant_id') === $tenant->id
        ? $model->setRelation('tenant', $tenant)
        : $model,
    ),
)

but I've noticed this doesn't get applied consistently, I think because inside the applyScope function there's a $builder = clone $this. Is there a workaround for this? May this be a bug? I've tried removing the clone but I'm getting some other errors.

Thank you in advance

[akyrey]

Just to let you know, I found the solution thanks to Lary https://laracasts.com/discuss/channels/eloquent/afterquery-inside-global-scope?page=1&replyId=970833