comment tweaks

restore solution
transitive for sdk
2026-03-02 11:48:00 +00:00 · 2026-03-02 11:47:14 +00:00 · 2026-03-02 11:12:36 +00:00 · 2026-03-02 11:09:34 +00:00 · 2026-02-27 10:32:16 +00:00 · 2026-02-26 17:10:54 +00:00
22 changed files with 226 additions and 204 deletions
@@ -15,6 +15,7 @@
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[2.2.0,)" />
    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.2.0,)" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.4,)" />
    <PackageVersion Include="Microsoft.Extensions.Logging" Version="[2.2.0,)" />
    <PackageVersion Include="Moq" Version="4.20.72" />
    <PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
@@ -27,7 +28,7 @@
    <PackageVersion Include="Speckle.DoubleNumerics" Version="4.1.0" />
    <PackageVersion Include="SimpleExec" Version="12.0.0" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.Threading.Channels" Version="10.0.1" />
+    <PackageVersion Include="System.Threading.Channels" Version="9.0.4" />
    <PackageVersion Include="Verify.Quibble" Version="2.1.1" />
    <PackageVersion Include="Verify.Xunit" Version="29.4.0" />
    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
@@ -86,14 +86,6 @@
        "resolved": "6.0.0",
        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "10.0.1",
-        "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.6.3"
-        }
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -250,8 +242,8 @@
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.1.2",
-        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
+        "resolved": "6.0.0",
+        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
      },
      "System.Runtime.InteropServices.WindowsRuntime": {
        "type": "Transitive",
@@ -273,10 +265,10 @@
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
-        "resolved": "4.6.3",
-        "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
+        "resolved": "4.5.4",
+        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
        }
      },
      "speckle.objects": {
@@ -295,12 +287,14 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "[9.0.4, )"
+        }
      },
      "GraphQL.Client": {
        "type": "CentralTransitive",
@@ -313,6 +307,15 @@
          "System.Reactive": "5.0.0"
        }
      },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "CentralTransitive",
+        "requested": "[9.0.4, )",
+        "resolved": "9.0.4",
+        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
      "Microsoft.CSharp": {
        "type": "CentralTransitive",
        "requested": "[4.7.0, )",
@@ -358,16 +361,6 @@
        "requested": "[13.0.2, )",
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "10.0.1",
-          "System.Threading.Tasks.Extensions": "4.6.3"
-        }
      }
    },
    "net8.0": {
@@ -565,8 +558,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -622,12 +614,6 @@
        "requested": "[13.0.2, )",
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
      }
    }
  }
@@ -54,14 +54,6 @@
        "resolved": "6.0.0",
        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "10.0.1",
-        "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.6.3"
-        }
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -213,8 +205,8 @@
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.1.2",
-        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
+        "resolved": "4.5.3",
+        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
      },
      "System.Runtime.InteropServices.WindowsRuntime": {
        "type": "Transitive",
@@ -226,10 +218,10 @@
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
-        "resolved": "4.6.3",
-        "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
+        "resolved": "4.5.4",
+        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
        }
      },
      "speckle.sdk": {
@@ -242,12 +234,14 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "[9.0.4, )"
+        }
      },
      "GraphQL.Client": {
        "type": "CentralTransitive",
@@ -260,6 +254,15 @@
          "System.Reactive": "5.0.0"
        }
      },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "CentralTransitive",
+        "requested": "[9.0.4, )",
+        "resolved": "9.0.4",
+        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
      "Microsoft.CSharp": {
        "type": "CentralTransitive",
        "requested": "[4.7.0, )",
@@ -305,16 +308,6 @@
        "requested": "[13.0.2, )",
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "10.0.1",
-          "System.Threading.Tasks.Extensions": "4.6.3"
-        }
      }
    },
    "net8.0": {
@@ -486,8 +479,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -543,12 +535,6 @@
        "requested": "[13.0.2, )",
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
      }
    }
  }
@@ -0,0 +1,49 @@
+using System.Threading.Channels;
+
+namespace Speckle.Sdk.Dependencies;
+
+/// <summary>
+/// For various reasons related to our use of ILRepack.FullAuto,
+/// we cannot use Channels from the SDK project.
+/// We have to keep usage of it inside the Sdk.Dependencies project.
+///
+/// For the sake of quick development, I've wrapped the <see cref="Channel"/> class here in a type
+/// that is safe to use from the SDK project.
+///
+/// As and when we need more functions, we can add them here.
+///
+/// And yes... I'm not very happy about the way we've set this up
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public sealed class RepackedChannel<T>
+{
+  private readonly Channel<T> _channel;
+
+  public RepackedChannel(int capacity, bool singleReader, bool singleWriter)
+  {
+    _channel = Channel.CreateBounded<T>(
+      new BoundedChannelOptions(capacity)
+      {
+        FullMode = BoundedChannelFullMode.Wait,
+        SingleReader = singleReader,
+        SingleWriter = singleWriter,
+      }
+    );
+  }
+
+  public void CompleteWriter() => _channel.Writer.Complete();
+
+  public ValueTask WriteAsync(T item, CancellationToken cancellationToken) =>
+    _channel.Writer.WriteAsync(item, cancellationToken);
+
+  public IAsyncEnumerable<T> ReadAllAsync(CancellationToken cancellationToken) =>
+    _channel.Reader.ReadAllAsync(cancellationToken);
+
+  // public async Task ReadAllAsync(Func<T, Task> callback, CancellationToken cancellationToken)
+  // {
+  //   await foreach (T item in _channel.Reader.ReadAllAsync(cancellationToken))
+  //   {
+  //     await callback.Invoke(item).ConfigureAwait(false);
+  //   }
+  // }
+}
@@ -28,4 +28,36 @@
    <PackageReference Include="Open.ChannelExtensions" PrivateAssets="all" />
    <PackageReference Include="System.Threading.Channels" PrivateAssets="all" />
  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+  </ItemGroup>
+  <Target Name="BeforeILRepackPrepareBuild" BeforeTargets="ILRepackPrepareBuild">
+    <ItemGroup>
+      <!--
+      We're Being selective about which assemblies we're il-repacking
+      Avoiding repacling `Microsoft.Bcl.AsyncInterfaces.dll` because we need types like `ValueTask` and `IAsyncEnumerable` to be external
+      
+      Yes, this does beg the question, why are we using `IlRepack.FullAuto` instead of raw ILRepack. Well the truth is, I'd like to move away from FullAuto
+      since it's unmaintaned and is lagging behind ILRepack version.
+      -->
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Numerics.Vectors.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Runtime.CompilerServices.Unsafe.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Memory.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Open.ChannelExtensions.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Threading.Channels.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Collections.Immutable.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Polly.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Polly.Contrib.WaitAndRetry.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Polly.Extensions.Http.dll" />
+      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Microsoft.Extensions.ObjectPool.dll" />
+      <_ILRepackExcludeAssemblies_Items Include="$(OutputPath)*.dll" Exclude="@(_ILRepackIncludeAssemblies_Items)" />
+    </ItemGroup>
+    <Message
+      Text="These are the packages we are NOT ilrepacking '$(_ILRepackExcludeAssemblies_Items)'"
+      Importance="high"
+    />
+    <PropertyGroup>
+      <ILRepackExcludeAssemblies>@(_ILRepackExcludeAssemblies_Items)</ILRepackExcludeAssemblies>
+    </PropertyGroup>
+  </Target>
 </Project>
@@ -11,6 +11,15 @@
          "ILRepack": "2.0.33"
        }
      },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Direct",
+        "requested": "[9.0.4, )",
+        "resolved": "9.0.4",
+        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
      "Microsoft.Extensions.ObjectPool": {
        "type": "Direct",
        "requested": "[9.0.4, )",
@@ -82,12 +91,12 @@
      },
      "System.Threading.Channels": {
        "type": "Direct",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==",
+        "requested": "[9.0.4, )",
+        "resolved": "9.0.4",
+        "contentHash": "4qBn2H6/aXBpE/Pm3wY5yusY/pEvQz99NlWHrTUji0qCmOdbhhjaALcpmbfW2ksxlPM6i6S+QFLkpOQdyfeKYQ==",
        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "10.0.1",
-          "System.Threading.Tasks.Extensions": "4.6.3"
+          "Microsoft.Bcl.AsyncInterfaces": "9.0.4",
+          "System.Threading.Tasks.Extensions": "4.5.4"
        }
      },
      "ILRepack": {
@@ -95,14 +104,6 @@
        "resolved": "2.0.33",
        "contentHash": "xb2h1CsOepoYwdXEPui9VcQglwABQwNf9cccZbf+acarEzF5PUp8Xx71nFXIhOgEdm6wrxAoF6xAxK4m/XFRUQ=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "10.0.1",
-        "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.6.3"
-        }
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -149,15 +150,15 @@
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.1.2",
-        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
+        "resolved": "6.0.0",
+        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
-        "resolved": "4.6.3",
-        "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
+        "resolved": "4.5.4",
+        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
        }
      }
    },
@@ -228,9 +229,9 @@
      },
      "System.Threading.Channels": {
        "type": "Direct",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
+        "requested": "[9.0.4, )",
+        "resolved": "9.0.4",
+        "contentHash": "4qBn2H6/aXBpE/Pm3wY5yusY/pEvQz99NlWHrTUji0qCmOdbhhjaALcpmbfW2ksxlPM6i6S+QFLkpOQdyfeKYQ=="
      },
      "ILRepack": {
        "type": "Transitive",
@@ -6,7 +6,8 @@ public sealed class ModelIngestion
  public required DateTime createdAt { get; init; }
  public required DateTime updatedAt { get; init; }
  public required string modelId { get; init; }
+  public required string projectId { get; init; }
+  public required string userId { get; init; }
  public required bool cancellationRequested { get; init; }
  public required ModelIngestionStatusData statusData { get; init; }
-  // public required LimitedUser user { get; init; }
 }
@@ -6,4 +6,5 @@ public sealed class ModelIngestionStatusData
 {
  public required ModelIngestionStatus status { get; init; }
  public required string? progressMessage { get; init; }
+  public required string? versionId { get; init; }
 }
@@ -44,6 +44,8 @@ public sealed class ModelIngestionResource
              createdAt
              updatedAt
              modelId
+              projectId
+              userId
              cancellationRequested
              statusData {
                ... on HasModelIngestionStatus {
@@ -94,6 +96,8 @@ public sealed class ModelIngestionResource
            createdAt
            updatedAt
            modelId
+            projectId
+            userId
            cancellationRequested
            statusData {
              ... on HasModelIngestionStatus {
@@ -102,6 +106,10 @@ public sealed class ModelIngestionResource
              ... on HasProgressMessage {
                progressMessage
              }
+              ... on ModelIngestionSuccessStatus
+              {
+                versionId
+              }
            }
          }
        }
@@ -142,6 +150,8 @@ public sealed class ModelIngestionResource
              createdAt
              updatedAt
              modelId
+              projectId
+              userId
              cancellationRequested
              statusData {
                ... on HasModelIngestionStatus {
@@ -194,6 +204,8 @@ public sealed class ModelIngestionResource
              createdAt
              updatedAt
              modelId
+              projectId
+              userId
              cancellationRequested
              statusData {
                ... on HasModelIngestionStatus {
@@ -245,6 +257,8 @@ public sealed class ModelIngestionResource
              createdAt
              updatedAt
              modelId
+              projectId
+              userId
              cancellationRequested
              statusData {
                ... on HasModelIngestionStatus {
@@ -343,6 +357,8 @@ public sealed class ModelIngestionResource
              createdAt
              updatedAt
              modelId
+              projectId
+              userId
              cancellationRequested
              statusData {
                ... on HasModelIngestionStatus {
@@ -398,6 +414,8 @@ public sealed class ModelIngestionResource
              createdAt
              updatedAt
              modelId
+              projectId
+              userId
              cancellationRequested
              statusData {
                ... on HasModelIngestionStatus {
@@ -457,6 +475,8 @@ public sealed class ModelIngestionResource
              createdAt
              updatedAt
              modelId
+              projectId
+              userId
              cancellationRequested
              statusData {
                ... on HasModelIngestionStatus {
@@ -229,6 +229,8 @@ public sealed class SubscriptionResource : IDisposable
            createdAt
            updatedAt
            modelId
+            projectId
+            userId
            cancellationRequested
            statusData {
              ... on HasModelIngestionStatus {
@@ -237,6 +239,10 @@ public sealed class SubscriptionResource : IDisposable
              ... on HasProgressMessage {
                progressMessage
              }
+              ... on ModelIngestionSuccessStatus
+              {
+                versionId
+              }
            }
          }
          type
@@ -1,7 +1,7 @@
 using System.IO.Compression;
-using System.Threading.Channels;
 using Microsoft.Extensions.Logging;
 using Speckle.InterfaceGenerator;
+using Speckle.Sdk.Dependencies;
 using Speckle.Sdk.Helpers;

 namespace Speckle.Sdk.Pipelines.Send;
@@ -14,7 +14,7 @@ public sealed class DiskStoreFactory(ILogger<DiskStore> logger) : IDiskStoreFact

 public sealed class DiskStore
 {
-  private readonly Channel<UploadItem> _channel;
+  private readonly RepackedChannel<UploadItem> _channel;
  private readonly Task<DisposableFile> _writeToDiskTask;
  private readonly ILogger<DiskStore> _logger;
  private readonly CancellationToken _cancellationToken;
@@ -24,17 +24,16 @@ public sealed class DiskStore
    _logger = logger;
    _cancellationToken = cancellationToken;

-    _channel = Channel.CreateBounded<UploadItem>(
-      new BoundedChannelOptions(1000) { FullMode = BoundedChannelFullMode.Wait, SingleReader = true }
-    );
+    _channel = new RepackedChannel<UploadItem>(1000, true, false);
    _writeToDiskTask = Task.Run(WriteFile, cancellationToken);
  }

-  public ValueTask PushAsync(UploadItem item) => _channel.Writer.WriteAsync(item, _cancellationToken);
+  public async Task PushAsync(UploadItem item) =>
+    await _channel.WriteAsync(item, _cancellationToken).ConfigureAwait(false);

  public async Task<DisposableFile> CompleteAsync()
  {
-    _channel.Writer.Complete();
+    _channel.CompleteWriter();
    return await _writeToDiskTask.ConfigureAwait(false);
  }

@@ -55,7 +54,7 @@ public sealed class DiskStore
      using var gzip = new GZipStream(fileStream, CompressionLevel.Optimal);
      using var writer = new StreamWriter(gzip);

-      await foreach (var item in _channel.Reader.ReadAllAsync(_cancellationToken).ConfigureAwait(false))
+      await foreach (var item in _channel.ReadAllAsync(_cancellationToken).ConfigureAwait(false))
      {
        await writer.WriteLineAsync($"{item.Id}\t{item.Json}\t{item.SpeckleType}").ConfigureAwait(false);
      }
@@ -26,7 +26,6 @@
    <PackageReference Include="Microsoft.Data.Sqlite" />
    <PackageReference Include="Speckle.DoubleNumerics" />
    <PackageReference Include="Speckle.Newtonsoft.Json" />
-    <PackageReference Include="System.Threading.Channels" />
  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" OverrideVersion="8.0.0" />
@@ -90,16 +90,6 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
-      "System.Threading.Channels": {
-        "type": "Direct",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "10.0.1",
-          "System.Threading.Tasks.Extensions": "4.6.3"
-        }
-      },
      "GraphQL.Client.Abstractions": {
        "type": "Transitive",
        "resolved": "6.0.0",
@@ -121,14 +111,6 @@
        "resolved": "6.0.0",
        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "10.0.1",
-        "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.6.3"
-        }
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -280,8 +262,8 @@
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.1.2",
-        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
+        "resolved": "4.5.3",
+        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
      },
      "System.Runtime.InteropServices.WindowsRuntime": {
        "type": "Transitive",
@@ -293,14 +275,26 @@
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
-        "resolved": "4.6.3",
-        "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
+        "resolved": "4.5.4",
+        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
        }
      },
      "speckle.sdk.dependencies": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "[9.0.4, )"
+        }
+      },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "CentralTransitive",
+        "requested": "[9.0.4, )",
+        "resolved": "9.0.4",
+        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
      }
    },
    "net8.0": {
@@ -377,12 +371,6 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
-      "System.Threading.Channels": {
-        "type": "Direct",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
-      },
      "GraphQL.Client.Abstractions": {
        "type": "Transitive",
        "resolved": "6.0.0",
@@ -370,8 +370,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -492,12 +491,6 @@
          "System.Text.Encodings.Web": "8.0.0"
        }
      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
-      },
      "Verify.Quibble": {
        "type": "CentralTransitive",
        "requested": "[2.1.1, )",
@@ -348,8 +348,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -433,12 +432,6 @@
          "System.Text.Encodings.Web": "8.0.0"
        }
      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
-      },
      "Verify.Quibble": {
        "type": "CentralTransitive",
        "requested": "[2.1.1, )",
@@ -74,11 +74,6 @@
        "resolved": "1.17.0",
        "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "1.1.0",
-        "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg=="
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -342,8 +337,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -386,6 +380,12 @@
          "System.Reactive": "5.0.0"
        }
      },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "CentralTransitive",
+        "requested": "[9.0.4, )",
+        "resolved": "1.1.0",
+        "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg=="
+      },
      "Microsoft.Data.Sqlite": {
        "type": "CentralTransitive",
        "requested": "[7.0.5, )",
@@ -425,12 +425,6 @@
        "requested": "[13.0.2, )",
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
      }
    }
  }
@@ -393,8 +393,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -475,12 +474,6 @@
          "System.Text.Encodings.Web": "8.0.0"
        }
      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
-      },
      "Verify.Quibble": {
        "type": "CentralTransitive",
        "requested": "[2.1.1, )",
@@ -311,8 +311,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -377,12 +376,6 @@
        "dependencies": {
          "System.Text.Encodings.Web": "8.0.0"
        }
-      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
      }
    }
  }
@@ -129,8 +129,10 @@ public sealed class ModelIngestionResourceTests : IAsyncLifetime
    ModelIngestionSuccessInput finish = new(ingest.id, _project.id, sendResult.RootId, "yay!");
    string versionId = await Sut.Complete(finish);
    Version version = await _testUser.Version.Get(versionId, _project.id);
+    ModelIngestion finalIngestion = await _testUser.Ingestion.Get(ingest.id, _project.id);
    Assert.Equal(version.id, versionId);
    Assert.Equal(sendResult.RootId, version.referencedObject);
+    Assert.Equal(finalIngestion.statusData.versionId, versionId);
  }

  [Fact]
@@ -147,6 +149,11 @@ public sealed class ModelIngestionResourceTests : IAsyncLifetime
    ModelIngestion res = await Sut.Get(ingest.id, _project.id);
    Assert.Equal(ingest.id, res.id);
    Assert.Equal(ingest.statusData.status, res.statusData.status);
+    Assert.Equal(ingest.statusData.versionId, res.statusData.versionId);
+    Assert.Null(res.statusData.versionId);
+    Assert.Equal(_model.id, res.modelId);
+    Assert.Equal(_project.id, res.projectId);
+    Assert.Equal(_testUser.Account.userInfo.id, res.userId);
  }

  [Fact]
@@ -370,8 +370,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -455,12 +454,6 @@
          "System.Text.Encodings.Web": "8.0.0"
        }
      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
-      },
      "Verify.Quibble": {
        "type": "CentralTransitive",
        "requested": "[2.1.1, )",
@@ -92,11 +92,6 @@
        "resolved": "1.17.0",
        "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw=="
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "1.1.0",
-        "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg=="
-      },
      "Microsoft.Build.Tasks.Git": {
        "type": "Transitive",
        "resolved": "8.0.0",
@@ -360,8 +355,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -378,6 +372,12 @@
          "System.Reactive": "5.0.0"
        }
      },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "CentralTransitive",
+        "requested": "[9.0.4, )",
+        "resolved": "1.1.0",
+        "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg=="
+      },
      "Microsoft.Data.Sqlite": {
        "type": "CentralTransitive",
        "requested": "[7.0.5, )",
@@ -417,12 +417,6 @@
        "requested": "[13.0.2, )",
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
      }
    }
  }
@@ -363,8 +363,7 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )",
-          "System.Threading.Channels": "[10.0.1, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -442,12 +441,6 @@
          "System.Text.Encodings.Web": "8.0.0"
        }
      },
-      "System.Threading.Channels": {
-        "type": "CentralTransitive",
-        "requested": "[10.0.1, )",
-        "resolved": "10.0.1",
-        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
-      },
      "Verify.Quibble": {
        "type": "CentralTransitive",
        "requested": "[2.1.1, )",
Author	SHA1	Message	Date
Jedd Morgan	81ef81eef1	comment tweaks .NET Build and Publish / build (push) Has been cancelled Details	2026-03-02 11:48:00 +00:00
Jedd Morgan	fa03714c11	restore solution	2026-03-02 11:47:14 +00:00
Jedd Morgan	ca04c9836d	transitive for sdk	2026-03-02 11:12:36 +00:00
Jedd Morgan	ecf90336ee	Repacked channel	2026-03-02 11:09:34 +00:00
Oğuzhan Koral	a662fb54c2	fix: channels reference only for net standard (#450 ) .NET Build and Publish / build (push) Has been cancelled Details	2026-02-27 10:32:16 +00:00
Jedd Morgan	9a74195b24	feat(api): Add versionId to ModelIngestion (#448 ) .NET Build and Publish / build (push) Has been cancelled Details * Add version id to ingestion query * and the sub * Add project & user ids * test	2026-02-26 17:10:54 +00:00