feat(api): Add versionId to ModelIngestion (#448 )

* Add version id to ingestion query * and the sub * Add project & user ids * test
pass etag to trigger processing (#447 )
2026-02-26 17:10:54 +00:00 · 2026-02-26 16:09:19 +00:00 · 2026-02-26 10:45:48 +00:00 · 2026-02-24 11:57:16 +00:00 · 2026-02-20 14:20:29 +00:00 · 2026-02-20 13:40:29 +00:00
45 changed files with 1343 additions and 139 deletions
@@ -0,0 +1,61 @@
+name: Integration Test
+
+on:
+  workflow_call:
+    inputs:
+      speckle-sharp-sdk-ref:
+        required: true
+        type: string
+
+jobs:
+  integration-test:
+    env:
+      CLIENT_DIR: "./client"
+      CLIENT_REPO: "specklesystems/speckle-sharp-sdk"
+      SERVER_DIR: "./server"
+      SERVER_REPO: "specklesystems/speckle-server-internal"
+      SOLUTION: "Speckle.Sdk.sln"
+      SPECKLE_SERVER_IMAGE: "speckle-server:local"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout ${{ env.CLIENT_REPO }}
+        uses: actions/checkout@v6
+        with:
+          path: ${{ env.CLIENT_DIR }}
+          repository: ${{ env.CLIENT_REPO }}
+          ref: ${{ inputs.speckle-sharp-sdk-ref }}
+
+      - name: Checkout ${{ env.SERVER_REPO }}
+        uses: actions/checkout@v6
+        with:
+          repository: ${{ env.SERVER_REPO }}
+          path: ${{ env.SERVER_DIR }}
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: 8.x.x
+      #          cache: true
+      #          cache-dependency-path: "**/packages.lock.json"
+
+      - name: 🏗️ Build Server
+        run: docker build --file "./packages/server/Dockerfile" --tag ${{ env.SPECKLE_SERVER_IMAGE }} .
+        working-directory: ${{ env.SERVER_DIR }}
+          
+      - name: ⚙️ Spin up Server
+        run: docker compose --file "../${{ env.CLIENT_DIR }}/docker-compose-internal.yml" up --wait
+        working-directory: ${{ env.SERVER_DIR }}
+        env:
+          SPECKLE_SERVER_IMAGE: ${{ env.SPECKLE_SERVER_IMAGE }}
+
+      - name: 📦 Restore .NET Solution
+        run: dotnet restore ${{ env.SOLUTION }} --locked-mode
+        working-directory: ${{ env.CLIENT_DIR }}
+        
+      - name: 🏗️ Build .NET Solution
+        run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore -warnaserror
+        working-directory: ${{ env.CLIENT_DIR }}
+        
+      - name: 🔨 Run .NET Integration Tests 
+        run: dotnet test ${{ env.SOLUTION }} --filter "(Category=Integration)&(Server!=Public)" --configuration Release --no-build --no-restore --verbosity=normal
+        working-directory: ${{ env.CLIENT_DIR }}
@@ -37,7 +37,7 @@ jobs:
          password: ${{ github.token }}

      - name: ⚙️ Spin up Server
-        run: docker compose -f ${{ inputs.docker-compose-file }} up --wait
+        run: docker compose --file ${{ inputs.docker-compose-file }} up --wait

      - name: 📦 Restore
        run: dotnet restore ${{ env.Solution }} --locked-mode
@@ -16,7 +16,6 @@
    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[2.2.0,)" />
    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.2.0,)" />
    <PackageVersion Include="Microsoft.Extensions.Logging" Version="[2.2.0,)" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="[5.0.0,)" />
    <PackageVersion Include="Moq" Version="4.20.72" />
    <PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
    <PackageVersion Include="Open.ChannelExtensions" Version="9.1.0" />
@@ -28,7 +27,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="9.0.4" />
+    <PackageVersion Include="System.Threading.Channels" Version="10.0.1" />
    <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" />
@@ -18,6 +18,7 @@
    <File Path=".github\git-commit-instructions.md" />
  </Folder>
  <Folder Name="/config/workflows/">
+    <File Path=".github/workflows/integration-test-callable-from-server-repo.yml" />
    <File Path=".github/workflows/integration-test.yml" />
    <File Path=".github/workflows/pr.yml" />
    <File Path=".github/workflows/release.yml" />
@@ -52,7 +52,7 @@ services:
      start_period: 10s

  speckle-server:
-    image: ghcr.io/specklesystems/speckle-server:latest
+    image: ${SPECKLE_SERVER_IMAGE:-ghcr.io/specklesystems/speckle-server:latest}
    restart: always
    healthcheck:
      test:
@@ -86,6 +86,14 @@
        "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",
@@ -242,8 +250,8 @@
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+        "resolved": "6.1.2",
+        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
      },
      "System.Runtime.InteropServices.WindowsRuntime": {
        "type": "Transitive",
@@ -265,10 +273,10 @@
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
+        "resolved": "4.6.3",
+        "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
+          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
        }
      },
      "speckle.objects": {
@@ -281,14 +289,14 @@
        "type": "Project",
        "dependencies": {
          "GraphQL.Client": "[6.0.0, )",
-          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )",
          "Microsoft.CSharp": "[4.7.0, )",
          "Microsoft.Data.Sqlite": "[7.0.5, )",
          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0, )",
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -305,15 +313,6 @@
          "System.Reactive": "5.0.0"
        }
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "CentralTransitive",
-        "requested": "[5.0.0, )",
-        "resolved": "8.0.0",
-        "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
      "Microsoft.CSharp": {
        "type": "CentralTransitive",
        "requested": "[4.7.0, )",
@@ -359,6 +358,16 @@
        "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": {
@@ -556,7 +565,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -612,6 +622,12 @@
        "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,6 +54,14 @@
        "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",
@@ -205,8 +213,8 @@
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "6.1.2",
+        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
      },
      "System.Runtime.InteropServices.WindowsRuntime": {
        "type": "Transitive",
@@ -218,24 +226,24 @@
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
+        "resolved": "4.6.3",
+        "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
+          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
        }
      },
      "speckle.sdk": {
        "type": "Project",
        "dependencies": {
          "GraphQL.Client": "[6.0.0, )",
-          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )",
          "Microsoft.CSharp": "[4.7.0, )",
          "Microsoft.Data.Sqlite": "[7.0.5, )",
          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0, )",
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -252,15 +260,6 @@
          "System.Reactive": "5.0.0"
        }
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "CentralTransitive",
-        "requested": "[5.0.0, )",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
      "Microsoft.CSharp": {
        "type": "CentralTransitive",
        "requested": "[4.7.0, )",
@@ -306,6 +305,16 @@
        "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": {
@@ -477,7 +486,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -533,6 +543,12 @@
        "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=="
      }
    }
  }
@@ -82,12 +82,12 @@
      },
      "System.Threading.Channels": {
        "type": "Direct",
-        "requested": "[9.0.4, )",
-        "resolved": "9.0.4",
-        "contentHash": "4qBn2H6/aXBpE/Pm3wY5yusY/pEvQz99NlWHrTUji0qCmOdbhhjaALcpmbfW2ksxlPM6i6S+QFLkpOQdyfeKYQ==",
+        "requested": "[10.0.1, )",
+        "resolved": "10.0.1",
+        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==",
        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "9.0.4",
-          "System.Threading.Tasks.Extensions": "4.5.4"
+          "Microsoft.Bcl.AsyncInterfaces": "10.0.1",
+          "System.Threading.Tasks.Extensions": "4.6.3"
        }
      },
      "ILRepack": {
@@ -95,6 +95,14 @@
        "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",
@@ -141,24 +149,15 @@
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+        "resolved": "6.1.2",
+        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
+        "resolved": "4.6.3",
+        "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
-        }
-      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "CentralTransitive",
-        "requested": "[5.0.0, )",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
+          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
        }
      }
    },
@@ -229,9 +228,9 @@
      },
      "System.Threading.Channels": {
        "type": "Direct",
-        "requested": "[9.0.4, )",
-        "resolved": "9.0.4",
-        "contentHash": "4qBn2H6/aXBpE/Pm3wY5yusY/pEvQz99NlWHrTUji0qCmOdbhhjaALcpmbfW2ksxlPM6i6S+QFLkpOQdyfeKYQ=="
+        "requested": "[10.0.1, )",
+        "resolved": "10.0.1",
+        "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg=="
      },
      "ILRepack": {
        "type": "Transitive",
@@ -193,30 +193,7 @@ public sealed class BlobApi : IBlobApi
    using var response = await _unauthedClient.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
    response.EnsureSuccessStatusCode();

-    return ParseEtagHeader(response.Headers);
-  }
-
-  private static string ParseEtagHeader(HttpResponseHeaders headers)
-  {
-    if (!headers.TryGetValues("ETag", out var etagValues))
-    {
-      throw new ArgumentException(
-        "Response does not have an ETag attached to it, cannot use this as an upload",
-        nameof(headers)
-      );
-    }
-
-    var etagValuesArray = etagValues.ToArray();
-
-    if (etagValuesArray.Length != 1)
-    {
-      throw new ArgumentException(
-        $"Expected Etag header to have a single value but got {etagValuesArray.Length}",
-        nameof(headers)
-      );
-    }
-
-    return etagValuesArray[0];
+    return BlobApiHelpers.ParseEtagHeader(response.Headers);
  }

  /// <summary>
@@ -87,6 +87,26 @@ public sealed class Client : ISpeckleGraphQLClient, IClient
    catch (Exception ex) when (!ex.IsFatal()) { }
  }

+  /// <summary>
+  /// Ensure the <see cref="GQLClient"/>'s websocket is fully initialized.
+  /// <br/>
+  /// You don't <i>need</i> to call this function, if you don't, then it will be setup for you when you call <see cref="SubscribeTo"/> (e.g. when you create a <see cref="Subscription"/>),
+  /// but due to <see cref="GraphQL"/>'s WebSocket implementation, it's not awaited (deferred) thus the subscription make take a while to actually be setup.
+  /// </summary>
+  /// <remarks>
+  /// We only use websockets for GraphQL subscriptions, so if you're not using subscriptions, don't call this
+  ///
+  /// Note. due to other sources (potentially on the GraphQL side) you still need a ~100ms delay between setting up the subscription, and being able to relaibly trigger it
+  /// This should only really negatively affect test projects.
+  /// </remarks>
+  public async Task InitializeWebsocket()
+  {
+    if (GQLClient.WebSocketSubProtocol is null)
+    {
+      await GQLClient.InitializeWebsocketConnection().ConfigureAwait(false);
+    }
+  }
+
  internal async Task<T> ExecuteWithResiliencePolicies<T>(Func<Task<T>> func) =>
    await GraphQLRetry
      .ExecuteAsync<T, SpeckleGraphQLInternalErrorException>(
@@ -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
@@ -0,0 +1,29 @@
+using System.Net.Http.Headers;
+
+namespace Speckle.Sdk.Helpers;
+
+public static class BlobApiHelpers
+{
+  public static string ParseEtagHeader(HttpResponseHeaders headers)
+  {
+    if (!headers.TryGetValues("ETag", out var etagValues))
+    {
+      throw new ArgumentException(
+        "Response does not have an ETag attached to it, cannot use this as an upload",
+        nameof(headers)
+      );
+    }
+
+    var etagValuesArray = etagValues.ToArray();
+
+    if (etagValuesArray.Length != 1)
+    {
+      throw new ArgumentException(
+        $"Expected Etag header to have a single value but got {etagValuesArray.Length}",
+        nameof(headers)
+      );
+    }
+
+    return etagValuesArray[0];
+  }
+}
@@ -0,0 +1,34 @@
+using Microsoft.Extensions.Logging;
+
+namespace Speckle.Sdk.Helpers;
+
+/// <summary>
+/// <see cref="IDisposable"/> wrapper around the downloaded file to try and delete the file on Dispose
+/// </summary>
+/// <remarks>
+/// We're using a similar pattern in the Rhino File Importer codebase (see <c>ImportJobFile</c>)
+/// </remarks>
+/// <param name="logger"></param>
+/// <param name="file"></param>
+public sealed class DisposableFile(FileInfo file, ILogger logger, bool deleteOnDispose = true) : IDisposable
+{
+  public FileInfo FileInfo => file;
+
+  public void Dispose()
+  {
+    if (!deleteOnDispose)
+    {
+      return;
+    }
+
+    try
+    {
+      file.Delete();
+      logger.LogInformation("Cleaned up {File}", file);
+    }
+    catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+    {
+      logger.LogWarning(ex, "Failed to clean up {File}", file);
+    }
+  }
+}
@@ -0,0 +1,21 @@
+using System.Diagnostics;
+
+namespace Speckle.Sdk.Helpers;
+
+public static class StopwatchPolyfills
+{
+#if !NET7_0_OR_GREATER
+  private static readonly double s_tickFrequency = (double)TimeSpan.TicksPerSecond / Stopwatch.Frequency;
+#endif
+
+  public static TimeSpan GetElapsedTime(long startingTimestamp)
+  {
+#if NET7_0_OR_GREATER
+    return Stopwatch.GetElapsedTime(startingTimestamp);
+#else
+
+    long elapsedTicks = Stopwatch.GetTimestamp() - startingTimestamp;
+    return new TimeSpan((long)(elapsedTicks * s_tickFrequency));
+#endif
+  }
+}
@@ -17,7 +17,7 @@ public enum DynamicBaseMemberType
  Dynamic = 2,

  /// <summary>
-  /// The typed members flagged with <see cref="ObsoleteAttribute"/> attribute.
+  /// The typed members flagged with ObsoleteAttribute attribute.
  /// </summary>
  Obsolete = 4,

@@ -27,12 +27,12 @@ public enum DynamicBaseMemberType
  SchemaComputed = 16,

  /// <summary>
-  /// All the typed members, including ones with <see cref="ObsoleteAttribute"/>  attributes.
+  /// All the typed members, including ones with ObsoleteAttribute  attributes.
  /// </summary>
  InstanceAll = Instance + Obsolete,

  /// <summary>
-  /// All the members, including dynamic and instance members flagged with <see cref="ObsoleteAttribute"/> attributes
+  /// All the members, including dynamic and instance members flagged with ObsoleteAttribute attributes
  /// </summary>
  All = InstanceAll + Dynamic,
 }
@@ -0,0 +1,12 @@
+namespace Speckle.Sdk.Pipelines.Progress;
+
+public sealed class AggregateProgress<T>(params IProgress<T>[] progresses) : IProgress<T>
+{
+  public void Report(T value)
+  {
+    foreach (var progress in progresses)
+    {
+      progress.Report(value);
+    }
+  }
+}
@@ -0,0 +1,89 @@
+using System.Diagnostics;
+using Microsoft.Extensions.Logging;
+using Speckle.InterfaceGenerator;
+using Speckle.Sdk.Api;
+using Speckle.Sdk.Api.GraphQL.Inputs;
+using Speckle.Sdk.Api.GraphQL.Models;
+using Speckle.Sdk.Helpers;
+
+namespace Speckle.Sdk.Pipelines.Progress;
+
+public partial interface IIngestionProgressManager : IProgress<CardProgress>;
+
+/// <summary>
+/// An <see langword="IProgress{IngestionProgressEventArgs}"/> implementation for the entire client side Ingestion progress update reporting
+/// Will throttles ingestion progress messages and reports their progress
+/// </summary>
+[GenerateAutoInterface]
+public sealed class IngestionProgressManager(
+  ILogger<IngestionProgressManager> logger,
+  IClient speckleClient,
+  ModelIngestion ingestion,
+  string projectId,
+  TimeSpan updateInterval,
+  CancellationToken cancellationToken
+) : IIngestionProgressManager
+{
+  /// <remarks>
+  /// Normally we would pick quite a coarse throttle window to try and avoid over pressure (1-5s)
+  /// </remarks>
+  private Task? _lastUpdate;
+  private long _lastUpdatedAt;
+  private readonly object _lock = new();
+
+  [AutoInterfaceIgnore]
+  public void Report(CardProgress value)
+  {
+    cancellationToken.ThrowIfCancellationRequested();
+
+    string trimmedMessage;
+    lock (_lock)
+    {
+      if (ShouldIgnoreProgressUpdate())
+      {
+        return;
+      }
+
+      _lastUpdatedAt = Stopwatch.GetTimestamp();
+
+      trimmedMessage = value.Status.TrimEnd('.');
+
+      _lastUpdate = speckleClient
+        .Ingestion.UpdateProgress(
+          new ModelIngestionUpdateInput(ingestion.id, projectId, trimmedMessage, value.Progress),
+          cancellationToken
+        )
+        .ContinueWith(
+          HandleFaultedContinuation,
+          CancellationToken.None,
+          TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
+          TaskScheduler.Default
+        );
+    }
+
+    logger.LogInformation("Progress update {Message} {Progress}", trimmedMessage, value.Progress);
+  }
+
+  /// <returns><see langword="true"/> if the update should be ignored, otherwise <see langword="false"/></returns>
+  private bool ShouldIgnoreProgressUpdate()
+  {
+    if (_lastUpdate is not null && !_lastUpdate.IsCompleted)
+    {
+      return true;
+    }
+
+    TimeSpan msSinceLastUpdate = StopwatchPolyfills.GetElapsedTime(_lastUpdatedAt);
+    return msSinceLastUpdate < updateInterval;
+  }
+
+  private void HandleFaultedContinuation(Task updateTask)
+  {
+    // The progress report failed... could be many reasons.
+    // For now, we're not letting this fail the Ingestion in any way
+    // we'll log but otherwise let it slide while leaving no unobserved task exceptions
+    if (updateTask.IsFaulted)
+    {
+      logger.LogWarning(updateTask.Exception, "A progress update failed unexpectedly");
+    }
+  }
+}
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Logging;
+using Speckle.InterfaceGenerator;
+using Speckle.Sdk.Api;
+using Speckle.Sdk.Api.GraphQL.Models;
+
+namespace Speckle.Sdk.Pipelines.Progress;
+
+[GenerateAutoInterface]
+public sealed class IngestionProgressManagerFactory(ILogger<IngestionProgressManager> logger)
+  : IIngestionProgressManagerFactory
+{
+  public IIngestionProgressManager CreateInstance(
+    IClient speckleClient,
+    ModelIngestion ingestion,
+    string projectId,
+    TimeSpan updateInterval,
+    CancellationToken cancellationToken
+  )
+  {
+    return new IngestionProgressManager(logger, speckleClient, ingestion, projectId, updateInterval, cancellationToken);
+  }
+}
@@ -0,0 +1,6 @@
+namespace Speckle.Sdk.Pipelines.Progress;
+
+//TODO: rename PipelineProgressArgs
+public readonly record struct CardProgress(string Status, double? Progress);
+
+public readonly record struct StreamProgressArgs(long BytesStreamed, long ExpectedTotalBytes);
@@ -0,0 +1,103 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace Speckle.Sdk.Pipelines.Progress;
+
+/// <summary>
+/// Wraps <paramref name="innerStream"/> to report streaming progress as bytes are read/written.
+/// </summary>
+public sealed class ProgressStream(Stream innerStream, IProgress<StreamProgressArgs>? progress = null) : Stream
+{
+  private long _bytesStreamed;
+
+  public override bool CanRead => innerStream.CanRead;
+  public override bool CanSeek => innerStream.CanSeek;
+  public override bool CanWrite => innerStream.CanWrite;
+  public override long Length => innerStream.Length;
+
+  public override long Position
+  {
+    get => innerStream.Position;
+    set => innerStream.Position = value;
+  }
+
+  public override int Read(byte[] buffer, int offset, int count)
+  {
+    int bytesRead = innerStream.Read(buffer, offset, count);
+    ReportProgress(bytesRead);
+    return bytesRead;
+  }
+
+  [SuppressMessage(
+    "Performance",
+    "CA1835:Prefer the \'Memory\'-based overloads for \'ReadAsync\' and \'WriteAsync\'",
+    Justification = "Analyser warning forwarded to caller"
+  )]
+  public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+  {
+    int bytesRead = await innerStream.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
+    ReportProgress(bytesRead);
+    return bytesRead;
+  }
+
+#if NET8_0_OR_GREATER
+  public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
+  {
+    int bytesRead = await innerStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
+    ReportProgress(bytesRead);
+    return bytesRead;
+  }
+#endif
+
+  private void ReportProgress(int newBytesProcessed)
+  {
+    _bytesStreamed += newBytesProcessed;
+    progress?.Report(new(_bytesStreamed, Length));
+  }
+
+  public override void Flush() => innerStream.Flush();
+
+  public override Task FlushAsync(CancellationToken cancellationToken) => innerStream.FlushAsync(cancellationToken);
+
+  public override long Seek(long offset, SeekOrigin origin) => innerStream.Seek(offset, origin);
+
+  public override void SetLength(long value) => throw new NotSupportedException(); //intentionally not supporting, as changing length of stream mid-flight will fuck up progress
+
+  public override void Write(byte[] buffer, int offset, int count)
+  {
+    innerStream.Write(buffer, offset, count);
+    ReportProgress(count);
+  }
+
+  [SuppressMessage(
+    "Performance",
+    "CA1835:Prefer the \'Memory\'-based overloads for \'ReadAsync\' and \'WriteAsync\'",
+    Justification = "Analyser warning forwarded to caller"
+  )]
+  public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+  {
+    await innerStream.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
+    ReportProgress(count);
+  }
+
+#if NET6_0_OR_GREATER
+  public override async ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
+  {
+    await innerStream.WriteAsync(buffer, cancellationToken).ConfigureAwait(false);
+    ReportProgress(buffer.Length);
+  }
+#endif
+
+  protected override void Dispose(bool disposing)
+  {
+    innerStream.Dispose();
+    base.Dispose(disposing);
+  }
+
+#if NET6_0_OR_GREATER
+  public override async ValueTask DisposeAsync()
+  {
+    await innerStream.DisposeAsync().ConfigureAwait(false);
+    await base.DisposeAsync().ConfigureAwait(false);
+  }
+#endif
+}
@@ -0,0 +1,40 @@
+namespace Speckle.Sdk.Pipelines.Progress;
+
+/// <summary>
+/// Renders "low level" data stream updates
+/// into "high level" <see cref="CardProgress"/> that is expected by Ingestion progress and DUI3
+/// </summary>
+/// <param name="progress"></param>
+public sealed class RenderedStreamProgress(IProgress<CardProgress> progress) : IProgress<StreamProgressArgs>
+{
+  public void Report(StreamProgressArgs value)
+  {
+    var (suffix, scaleFactor) = GetFileSizeRendering(value.ExpectedTotalBytes);
+    progress.Report(
+      new(
+        $"Uploading data... ({value.BytesStreamed * scaleFactor:F1}/{value.ExpectedTotalBytes * scaleFactor:F1} {suffix})",
+        (double)value.BytesStreamed / value.ExpectedTotalBytes
+      )
+    );
+  }
+
+  private static readonly string[] s_suffixes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+
+  private static (string suffix, double scaleFactor) GetFileSizeRendering(long value)
+  {
+    if (value <= 0)
+    {
+      return (s_suffixes[0], 1d);
+    }
+
+    for (int i = 0; i < s_suffixes.Length; i++)
+    {
+      if (value <= Math.Pow(1024, i + 1))
+      {
+        return (s_suffixes[i], 1 / Math.Pow(1024, i));
+      }
+    }
+
+    throw new ArgumentOutOfRangeException(nameof(value), "Value is too large to convert to a file size");
+  }
+}
@@ -0,0 +1,77 @@
+using System.IO.Compression;
+using System.Threading.Channels;
+using Microsoft.Extensions.Logging;
+using Speckle.InterfaceGenerator;
+using Speckle.Sdk.Helpers;
+
+namespace Speckle.Sdk.Pipelines.Send;
+
+[GenerateAutoInterface]
+public sealed class DiskStoreFactory(ILogger<DiskStore> logger) : IDiskStoreFactory
+{
+  public DiskStore CreateInstance(CancellationToken cancellationToken) => new(logger, cancellationToken);
+}
+
+public sealed class DiskStore
+{
+  private readonly Channel<UploadItem> _channel;
+  private readonly Task<DisposableFile> _writeToDiskTask;
+  private readonly ILogger<DiskStore> _logger;
+  private readonly CancellationToken _cancellationToken;
+
+  internal DiskStore(ILogger<DiskStore> logger, CancellationToken cancellationToken)
+  {
+    _logger = logger;
+    _cancellationToken = cancellationToken;
+
+    _channel = Channel.CreateBounded<UploadItem>(
+      new BoundedChannelOptions(1000) { FullMode = BoundedChannelFullMode.Wait, SingleReader = true }
+    );
+    _writeToDiskTask = Task.Run(WriteFile, cancellationToken);
+  }
+
+  public ValueTask PushAsync(UploadItem item) => _channel.Writer.WriteAsync(item, _cancellationToken);
+
+  public async Task<DisposableFile> CompleteAsync()
+  {
+    _channel.Writer.Complete();
+    return await _writeToDiskTask.ConfigureAwait(false);
+  }
+
+  /// <summary>
+  /// Reads from the Channel and streams the <see cref="UploadItem"/>s to a temporary file on disk.
+  /// Will keep reading until <see cref="CompleteAsync"/> is called.
+  /// </summary>
+  /// <returns>the file that was written</returns>
+  private async Task<DisposableFile> WriteFile()
+  {
+    string tempFilePath = Path.GetTempFileName();
+    var tempFile = new DisposableFile(new FileInfo(tempFilePath), _logger);
+    _logger.LogInformation("Writing temp file to {TempFilePath}", tempFilePath);
+
+    try
+    {
+      using var fileStream = new FileStream(tempFilePath, FileMode.Create, FileAccess.Write, FileShare.None);
+      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 writer.WriteLineAsync($"{item.Id}\t{item.Json}\t{item.SpeckleType}").ConfigureAwait(false);
+      }
+#if NET8_0_OR_GREATER
+      await writer.FlushAsync(_cancellationToken).ConfigureAwait(false);
+#else
+      await writer.FlushAsync().ConfigureAwait(false);
+#endif
+      tempFile.FileInfo.Refresh();
+
+      return tempFile;
+    }
+    catch
+    {
+      tempFile.Dispose();
+      throw;
+    }
+  }
+}
@@ -0,0 +1,80 @@
+using Speckle.InterfaceGenerator;
+using Speckle.Sdk.Credentials;
+using Speckle.Sdk.Helpers;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Pipelines.Progress;
+
+namespace Speckle.Sdk.Pipelines.Send;
+
+[GenerateAutoInterface]
+public sealed class SendPipelineFactory(IUploaderFactory uploaderFactory, IDiskStoreFactory diskStoreFactory)
+  : ISendPipelineFactory
+{
+  public SendPipeline CreateInstance(
+    string projectId,
+    string ingestionId,
+    Account account,
+    IProgress<StreamProgressArgs> uploadProgress,
+    CancellationToken cancellationToken
+  )
+  {
+    var uploader = uploaderFactory.CreateInstance(projectId, ingestionId, account, uploadProgress, cancellationToken);
+    var diskStore = diskStoreFactory.CreateInstance(cancellationToken);
+    return new SendPipeline(uploader, diskStore);
+  }
+}
+
+public sealed class SendPipeline : IDisposable
+{
+  private readonly Serializer _serializer = new();
+  private readonly Uploader _uploader;
+  private readonly DiskStore _diskStore;
+
+  internal SendPipeline(Uploader uploader, DiskStore diskStore)
+  {
+    _uploader = uploader;
+    _diskStore = diskStore;
+  }
+
+  private UploadItem _lastItem;
+
+  public async Task<ObjectReference> Process(Base @base)
+  {
+    var results = _serializer.Serialize(@base).ToArray();
+    var first = results.First();
+    foreach (var item in results)
+    {
+      // we're not doing fire and forget here so that we get the backpressure from the uploader
+      await _diskStore.PushAsync(item).ConfigureAwait(false);
+    }
+
+    // NOTE: this is important to keep track of. When we serialze an object, we get back a list of objects, with the first one being the original root.
+    // In the case of the commit root object, this means the last object is not necessarily the root; we therefore need to manually track its existance here
+    // and ensure it's the last one through in the uploader's stream. See WaitForUpload down below.
+    _lastItem = first;
+    return first.Reference;
+  }
+
+  public async Task WaitForUpload()
+  {
+    await _diskStore.PushAsync(_lastItem).ConfigureAwait(false);
+    using DisposableFile tempFile = await _diskStore.CompleteAsync().ConfigureAwait(false);
+
+    using Stream fileStreamUpload = new FileStream(
+      tempFile.FileInfo.FullName,
+      FileMode.Open,
+      FileAccess.Read,
+      FileShare.Read
+    );
+
+    await _uploader.Send(fileStreamUpload).ConfigureAwait(false);
+  }
+
+  public async Task<string> WaitForUploadAndServerProcessing()
+  {
+    // TODO: in some way, wait for the server to process the upload and return the actual new version id
+    return await Task.FromResult("todo").ConfigureAwait(false);
+  }
+
+  public void Dispose() => _uploader.Dispose();
+}
@@ -0,0 +1,351 @@
+using System.Collections;
+using System.Drawing;
+using System.Globalization;
+using System.Reflection;
+using Speckle.DoubleNumerics;
+using Speckle.Newtonsoft.Json;
+using Speckle.Sdk.Dependencies;
+using Speckle.Sdk.Helpers;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Serialisation;
+
+namespace Speckle.Sdk.Pipelines.Send;
+
+/// <summary>
+/// Another serializer, cleaner and meaner. Provides methods for serializing Speckle objects into a format suitable for upload or storage.
+/// This class handles the conversion of <see cref="Speckle.Sdk.Models.Base"/> and its derivatives
+/// into serialized JSON structures along with associated metadata, closures, and references.
+/// <para>Any reference objects coming through are being "passed through" serialized - they do not get double encoded.</para>
+/// </summary>
+internal sealed class Serializer
+{
+  private readonly record struct PropertyInfo(string Name, object? Value, bool IsDetachable);
+
+  public IEnumerable<UploadItem> Serialize(Base root)
+  {
+    // Special case: if root is already an ObjectReference, serialize it verbatim
+    if (root is ObjectReference existingRef)
+    {
+      var uploadItem = ReferenceToUploadItem(existingRef);
+      yield return uploadItem;
+      yield break;
+    }
+
+    var detachedObjects = new List<(Id, Json, Dictionary<string, int>, Base, string)>();
+    var rootClosures = new Dictionary<string, int>();
+
+    var (rootId, rootJson) = SerializeBase(root, false, rootClosures, detachedObjects);
+
+    var rootReference = new ObjectReference
+    {
+      referencedId = rootId.Value,
+      applicationId = root.applicationId,
+      closure = rootClosures.Count > 0 ? rootClosures : null,
+    };
+
+    yield return new UploadItem(rootId.Value, rootJson, root.speckle_type, rootReference);
+
+    foreach (var (id, json, closures, baseObj, speckleType) in detachedObjects)
+    {
+      var reference = new ObjectReference
+      {
+        referencedId = id.Value,
+        applicationId = baseObj.applicationId,
+        closure = closures.Count > 0 ? closures : null,
+      };
+
+      yield return new UploadItem(id.Value, json, speckleType, reference);
+    }
+  }
+
+  private IEnumerable<PropertyInfo> ExtractProperties(Base baseObj)
+  {
+    var typedProperties = baseObj.GetInstanceMembers();
+    foreach (var prop in typedProperties)
+    {
+      if (prop.Name == "id" || prop.Name.StartsWith("__"))
+      {
+        continue;
+      }
+
+      if (prop.IsDefined(typeof(JsonIgnoreAttribute), false))
+      {
+        continue;
+      }
+
+      var value = prop.GetValue(baseObj);
+      var isDetachable = prop.GetCustomAttribute<DetachPropertyAttribute>(true)?.Detachable ?? false;
+
+      yield return new PropertyInfo(prop.Name, value, isDetachable);
+    }
+
+    foreach (var propName in baseObj.DynamicPropertyKeys)
+    {
+      if (propName.StartsWith("__"))
+      {
+        continue;
+      }
+
+      var value = baseObj[propName];
+
+#pragma warning disable CA1866
+      var isDetachable = propName.StartsWith("@");
+#pragma warning restore CA1866
+
+      yield return new PropertyInfo(propName, value, isDetachable);
+    }
+  }
+
+  private (Id, Json) SerializeBase(
+    Base baseObj,
+    bool forceDetach,
+    Dictionary<string, int> closures,
+    List<(Id, Json, Dictionary<string, int>, Base, string)> detachedObjects
+  )
+  {
+    var childClosures = new Dictionary<string, int>();
+
+    var sb = Pools.StringBuilders.Get();
+    try
+    {
+      using var stringWriter = new StringWriter(sb);
+      using var jsonWriter = new JsonTextWriter(stringWriter);
+      using var idWriter = new SerializerIdWriter(jsonWriter);
+
+      idWriter.WriteStartObject();
+
+      foreach (var prop in ExtractProperties(baseObj))
+      {
+        idWriter.WritePropertyName(prop.Name);
+        SerializeValue(prop.Value, idWriter, prop.IsDetachable, childClosures, detachedObjects);
+      }
+
+      var (jsonForId, finalWriter) = idWriter.FinishIdWriter();
+      var id = IdGenerator.ComputeId(jsonForId);
+
+      finalWriter.WritePropertyName("id");
+      finalWriter.WriteValue(id.Value);
+
+      baseObj.id = id.Value;
+
+      if ((forceDetach || childClosures.Count > 0) && childClosures.Count > 0)
+      {
+        finalWriter.WritePropertyName("__closure");
+        finalWriter.WriteStartObject();
+        foreach (var kvp in childClosures)
+        {
+          finalWriter.WritePropertyName(kvp.Key);
+          finalWriter.WriteValue(kvp.Value);
+        }
+        finalWriter.WriteEndObject();
+
+        foreach (var kvp in childClosures)
+        {
+          closures[kvp.Key] = closures.TryGetValue(kvp.Key, out var existing) ? existing + kvp.Value : kvp.Value;
+        }
+      }
+
+      finalWriter.WriteEndObject();
+      finalWriter.Flush();
+
+      var json = new Json(stringWriter.ToString());
+      return (id, json);
+    }
+    finally
+    {
+      Pools.StringBuilders.Return(sb);
+    }
+  }
+
+  private void SerializeValue(
+    object? value,
+    JsonWriter writer,
+    bool isDetachable,
+    Dictionary<string, int> closures,
+    List<(Id, Json, Dictionary<string, int>, Base, string)> detachedObjects
+  )
+  {
+    switch (value)
+    {
+      case Enum:
+        writer.WriteValue((int)value);
+        return;
+      case Guid g:
+        writer.WriteValue(g.ToString());
+        return;
+      case Color c:
+        writer.WriteValue(c.ToArgb());
+        return;
+      case DateTime dt:
+        writer.WriteValue(dt.ToString("o", CultureInfo.InvariantCulture));
+        return;
+      case Matrix4x4 md:
+        writer.WriteStartArray();
+        writer.WriteValue(md.M11);
+        writer.WriteValue(md.M12);
+        writer.WriteValue(md.M13);
+        writer.WriteValue(md.M14);
+        writer.WriteValue(md.M21);
+        writer.WriteValue(md.M22);
+        writer.WriteValue(md.M23);
+        writer.WriteValue(md.M24);
+        writer.WriteValue(md.M31);
+        writer.WriteValue(md.M32);
+        writer.WriteValue(md.M33);
+        writer.WriteValue(md.M34);
+        writer.WriteValue(md.M41);
+        writer.WriteValue(md.M42);
+        writer.WriteValue(md.M43);
+        writer.WriteValue(md.M44);
+        writer.WriteEndArray();
+        return;
+      // Handle ObjectReference before Base (since ObjectReference extends Base)
+      // This prevents double-serialization and properly propagates closures
+      case ObjectReference objRef:
+      {
+        writer.WriteStartObject();
+        writer.WritePropertyName("speckle_type");
+        writer.WriteValue("reference");
+        writer.WritePropertyName("referencedId");
+        writer.WriteValue(objRef.referencedId);
+        writer.WriteEndObject();
+
+        // Propagate closure: add the referenced ID
+        closures[objRef.referencedId] = closures.TryGetValue(objRef.referencedId, out var existing) ? existing + 1 : 1;
+
+        // Propagate nested closures from the ObjectReference.closure dictionary
+        if (objRef.closure != null)
+        {
+          foreach (var kvp in objRef.closure)
+          {
+            closures[kvp.Key] = closures.TryGetValue(kvp.Key, out var existingDepth)
+              ? existingDepth + kvp.Value
+              : kvp.Value;
+          }
+        }
+
+        return;
+      }
+      case Base baseObj:
+      {
+        if (isDetachable)
+        {
+          var childClosures = new Dictionary<string, int>();
+          var (childId, childJson) = SerializeBase(baseObj, true, childClosures, detachedObjects);
+
+          detachedObjects.Add((childId, childJson, childClosures, baseObj, baseObj.speckle_type));
+
+          writer.WriteStartObject();
+          writer.WritePropertyName("speckle_type");
+          writer.WriteValue("reference");
+          writer.WritePropertyName("referencedId");
+          writer.WriteValue(childId.Value);
+          writer.WriteEndObject();
+
+          closures[childId.Value] = closures.TryGetValue(childId.Value, out var existing) ? existing + 1 : 1;
+
+          foreach (var kvp in childClosures)
+          {
+            closures[kvp.Key] = closures.TryGetValue(kvp.Key, out var existingDepth)
+              ? existingDepth + kvp.Value
+              : kvp.Value;
+          }
+        }
+        else
+        {
+          var inlineClosures = new Dictionary<string, int>();
+          var (_, inlineJson) = SerializeBase(baseObj, false, inlineClosures, detachedObjects);
+
+          writer.WriteRawValue(inlineJson.Value);
+
+          foreach (var kvp in inlineClosures)
+          {
+            closures[kvp.Key] = closures.TryGetValue(kvp.Key, out var existingDepth)
+              ? existingDepth + kvp.Value
+              : kvp.Value;
+          }
+        }
+        return;
+      }
+      case IDictionary dict:
+      {
+        writer.WriteStartObject();
+        foreach (DictionaryEntry kvp in dict)
+        {
+          if (kvp.Key is not string key)
+          {
+            throw new ArgumentException("Dictionary keys must be strings", nameof(value));
+          }
+
+          writer.WritePropertyName(key);
+          SerializeValue(kvp.Value, writer, false, closures, detachedObjects);
+        }
+        writer.WriteEndObject();
+        return;
+      }
+      case ICollection collection:
+      {
+        writer.WriteStartArray();
+        foreach (var item in collection)
+        {
+          SerializeValue(item, writer, isDetachable, closures, detachedObjects);
+        }
+        writer.WriteEndArray();
+        return;
+      }
+      default:
+        // This case will handle primitives and `null`
+        // Will throw JsonWriterException if not supported
+        writer.WriteValue(value);
+        return;
+    }
+  }
+
+  private UploadItem ReferenceToUploadItem(ObjectReference existingRef)
+  {
+    var sb = Pools.StringBuilders.Get();
+    try
+    {
+      using var stringWriter = new StringWriter(sb);
+      using var jsonWriter = new JsonTextWriter(stringWriter);
+
+      jsonWriter.WriteStartObject();
+      jsonWriter.WritePropertyName("speckle_type");
+      jsonWriter.WriteValue("reference");
+      jsonWriter.WritePropertyName("referencedId");
+      jsonWriter.WriteValue(existingRef.referencedId);
+      jsonWriter.WritePropertyName("__closure");
+
+      if (existingRef.closure != null && existingRef.closure.Count > 0)
+      {
+        jsonWriter.WriteStartObject();
+        foreach (var kvp in existingRef.closure)
+        {
+          jsonWriter.WritePropertyName(kvp.Key);
+          jsonWriter.WriteValue(kvp.Value);
+        }
+        jsonWriter.WriteEndObject();
+      }
+      else
+      {
+        jsonWriter.WriteNull();
+      }
+
+      jsonWriter.WriteEndObject();
+      jsonWriter.Flush();
+
+      var refJson = new Json(stringWriter.ToString());
+
+      return new UploadItem(
+        existingRef.referencedId,
+        refJson,
+        existingRef.speckle_type,
+        existingRef // Pass through the original ObjectReference
+      );
+    }
+    finally
+    {
+      Pools.StringBuilders.Return(sb);
+    }
+  }
+}
@@ -0,0 +1,127 @@
+using System.Net.Http.Headers;
+using System.Text;
+using Microsoft.Extensions.Logging;
+using Speckle.InterfaceGenerator;
+using Speckle.Newtonsoft.Json;
+using Speckle.Sdk.Credentials;
+using Speckle.Sdk.Helpers;
+using Speckle.Sdk.Pipelines.Progress;
+
+namespace Speckle.Sdk.Pipelines.Send;
+
+[GenerateAutoInterface]
+public sealed class UploaderFactory(ISpeckleHttp httpClientFactory, ILogger<Uploader> logger) : IUploaderFactory
+{
+  public Uploader CreateInstance(
+    string projectId,
+    string ingestionId,
+    Account account,
+    IProgress<StreamProgressArgs> progress,
+    CancellationToken cancellationToken
+  ) => new(projectId, ingestionId, logger, httpClientFactory, account, progress, cancellationToken);
+}
+
+public sealed class Uploader : IDisposable
+{
+  private readonly string _projectId;
+  private readonly string _ingestionId;
+  private readonly CancellationToken _cancellationToken;
+  private readonly HttpClient _speckleClient;
+  private readonly HttpClient _s3Client;
+  private readonly ILogger<Uploader> _logger;
+  private readonly IProgress<StreamProgressArgs> _progress;
+
+  internal Uploader(
+    string projectId,
+    string ingestionId,
+    ILogger<Uploader> logger,
+    ISpeckleHttp httpClientFactory,
+    Account speckleAccount,
+    IProgress<StreamProgressArgs> progress,
+    CancellationToken cancellationToken
+  )
+  {
+    _projectId = projectId;
+    _ingestionId = ingestionId;
+    _logger = logger;
+    _cancellationToken = cancellationToken;
+    _progress = progress;
+    _speckleClient = httpClientFactory.CreateHttpClient(authorizationToken: speckleAccount.token);
+    _speckleClient.BaseAddress = new(new(speckleAccount.serverInfo.url), "/api/v1/");
+
+    _s3Client = httpClientFactory.CreateHttpClient();
+  }
+
+  public async Task Send(Stream fileStream)
+  {
+    PresignedUploadResponse presignedUploadResponse = await GetPresignedUrl().ConfigureAwait(false);
+    var etag = await UploadToS3(fileStream, presignedUploadResponse).ConfigureAwait(false);
+
+    await TriggerProcessing(new() { Etag = etag }).ConfigureAwait(false);
+  }
+
+  private async Task<PresignedUploadResponse> GetPresignedUrl()
+  {
+    var signUri = new Uri($"projects/{_projectId}/modelingestion/{_ingestionId}/uploads/sign", UriKind.Relative);
+
+    using var signResponse = await _speckleClient.PostAsync(signUri, null, _cancellationToken).ConfigureAwait(false);
+    signResponse.EnsureSuccessStatusCode();
+
+#if NET5_0_OR_GREATER
+    string signResponseString = await signResponse.Content.ReadAsStringAsync(_cancellationToken).ConfigureAwait(false);
+#else
+    string signResponseString = await signResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+#endif
+    PresignedUploadResponse presignedUpload =
+      JsonConvert.DeserializeObject<PresignedUploadResponse>(signResponseString)
+      ?? throw new InvalidOperationException("Failed to get presigned upload URL");
+    return presignedUpload;
+  }
+
+  private async Task<string> UploadToS3(Stream fileStream, PresignedUploadResponse presignedUploadResponse)
+  {
+    _logger.LogInformation("Uploading file to pre-signed url");
+
+    Stream progressStream = new ProgressStream(fileStream, _progress);
+
+    using var streamContent = new StreamContent(progressStream);
+    streamContent.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
+    streamContent.Headers.ContentLength = fileStream.Length;
+
+    using var uploadRequest = new HttpRequestMessage(HttpMethod.Put, presignedUploadResponse.Url);
+    foreach (var kvp in presignedUploadResponse.AdditionalRequestHeaders)
+    {
+      uploadRequest.Headers.Add(kvp.Key, kvp.Value);
+    }
+
+    uploadRequest.Content = streamContent;
+
+    using var uploadResponse = await _s3Client
+      .SendAsync(uploadRequest, HttpCompletionOption.ResponseHeadersRead, _cancellationToken)
+      .ConfigureAwait(false);
+
+    uploadResponse.EnsureSuccessStatusCode();
+
+    return BlobApiHelpers.ParseEtagHeader(uploadResponse.Headers);
+  }
+
+  private async Task TriggerProcessing(TriggerUploadRequest request)
+  {
+    Uri processUri = new($"projects/{_projectId}/modelingestion/{_ingestionId}/uploads/process", UriKind.Relative);
+    string requestBody = JsonConvert.SerializeObject(request);
+    using var content = new StringContent(requestBody, Encoding.UTF8, "application/json");
+
+    using HttpResponseMessage processResponse = await _speckleClient
+      .PostAsync(processUri, content, _cancellationToken)
+      .ConfigureAwait(false);
+
+    string body = await processResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+    processResponse.EnsureSuccessStatusCode();
+  }
+
+  public void Dispose()
+  {
+    _speckleClient.Dispose();
+    _s3Client.Dispose();
+  }
+}
@@ -0,0 +1,20 @@
+using Speckle.Newtonsoft.Json;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Serialisation;
+
+namespace Speckle.Sdk.Pipelines.Send;
+
+public record UploadItem(string Id, Json Json, string SpeckleType, ObjectReference Reference);
+
+internal record PresignedUploadResponse
+{
+  public required Uri Url { get; init; }
+  public required string Key { get; init; }
+  public Dictionary<string, string> AdditionalRequestHeaders { get; init; } = new();
+}
+
+internal readonly struct TriggerUploadRequest
+{
+  [JsonProperty("etag")]
+  public required string Etag { get; init; }
+}
@@ -2,7 +2,13 @@ using System.Text;

 namespace Speckle.Sdk.Serialisation.V2.Send;

-public sealed record BaseItem(Id Id, Json Json, bool NeedsStorage, Dictionary<Id, int>? Closures) : IHasByteSize
+public sealed record BaseItem(
+  Id Id,
+  Json Json,
+  bool NeedsStorage,
+  Dictionary<Id, int>? Closures,
+  bool? IsReference = false
+) : IHasByteSize
 {
  public int ByteSize { get; } = Encoding.UTF8.GetByteCount(Json.Value);

@@ -113,16 +113,6 @@ public sealed class SerializeProcess(
        _processSource.Token
      );
      var findTotalObjectsTask = Task.CompletedTask;
-      if (!options.SkipFindTotalObjects)
-      {
-        ThrowIfFailed();
-        findTotalObjectsTask = Task.Factory.StartNew(
-          () => TraverseTotal(root),
-          _processSource.Token,
-          TaskCreationOptions.AttachedToParent | TaskCreationOptions.PreferFairness,
-          _highest
-        );
-      }

      await Traverse(root).ConfigureAwait(false);
      ThrowIfFailed();
@@ -133,6 +123,7 @@ public sealed class SerializeProcess(
      ThrowIfFailed();
      await WaitForSchedulerCompletion().ConfigureAwait(false);
      ThrowIfFailed();
+
      return new(root.id.NotNull(), baseSerializer.ObjectReferences.Freeze());
    }
    catch (OperationCanceledException)
@@ -8,6 +8,7 @@ using Speckle.Sdk.Dependencies;
 using Speckle.Sdk.Host;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models.GraphTraversal;
+using Speckle.Sdk.Pipelines.Progress;
 using Speckle.Sdk.Serialisation.V2;
 using Speckle.Sdk.Serialisation.V2.Receive;
 using Speckle.Sdk.Serialisation.V2.Send;
@@ -96,7 +97,8 @@ public static class ServiceRegistration
      typeof(DeserializeProcess),
      typeof(ObjectLoader),
      typeof(TraversalRule),
-      typeof(Client)
+      typeof(Client),
+      typeof(IngestionProgressManager)
    );
    serviceCollection.AddMatchingInterfacesAsTransient(typeof(GraphQLRetry).Assembly);
    return serviceCollection;
@@ -26,6 +26,7 @@
    <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" />
@@ -35,7 +36,6 @@
    <PackageReference Include="Microsoft.CSharp" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
    <PackageReference Include="Microsoft.Extensions.Logging" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Speckle.Sdk.Dependencies\Speckle.Sdk.Dependencies.csproj" />
@@ -13,15 +13,6 @@
          "System.Reactive": "5.0.0"
        }
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Direct",
-        "requested": "[5.0.0, )",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
      "Microsoft.CSharp": {
        "type": "Direct",
        "requested": "[4.7.0, )",
@@ -99,6 +90,16 @@
        "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",
@@ -120,6 +121,14 @@
        "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",
@@ -271,8 +280,8 @@
      },
      "System.Runtime.CompilerServices.Unsafe": {
        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "6.1.2",
+        "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
      },
      "System.Runtime.InteropServices.WindowsRuntime": {
        "type": "Transitive",
@@ -284,10 +293,10 @@
      },
      "System.Threading.Tasks.Extensions": {
        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
+        "resolved": "4.6.3",
+        "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
+          "System.Runtime.CompilerServices.Unsafe": "6.1.2"
        }
      },
      "speckle.sdk.dependencies": {
@@ -368,6 +377,12 @@
        "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,7 +370,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -491,6 +492,12 @@
          "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,7 +348,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -432,6 +433,12 @@
          "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,6 +74,11 @@
        "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",
@@ -337,7 +342,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -380,12 +386,6 @@
          "System.Reactive": "5.0.0"
        }
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "CentralTransitive",
-        "requested": "[5.0.0, )",
-        "resolved": "1.1.0",
-        "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg=="
-      },
      "Microsoft.Data.Sqlite": {
        "type": "CentralTransitive",
        "requested": "[7.0.5, )",
@@ -425,6 +425,12 @@
        "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,7 +393,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -474,6 +475,12 @@
          "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,7 +311,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -376,6 +377,12 @@
        "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]
@@ -106,7 +106,7 @@ public class ProjectResourceExceptionalTests : IAsyncLifetime
    ProjectUpdateRoleInput input = new(_secondUser.Account.id.NotNull(), "NonExistentProject", newRole);

    var ex = await Assert.ThrowsAsync<AggregateException>(async () => _ = await Sut.UpdateRole(input));
-    ex.InnerExceptions.Single().Should().BeOfType<SpeckleGraphQLForbiddenException>();
+    ex.InnerExceptions.Single().Should().BeAssignableTo<SpeckleGraphQLException>(); //v3 server responds with SpeckleGraphQLStreamNotFoundException exception, v2 reponds with SpeckleGraphQLForbiddenException
  }

  [Theory]
@@ -11,11 +11,11 @@ namespace Speckle.Sdk.Tests.Integration.API.GraphQL.Resources;
 public class SubscriptionResourceTests : IAsyncLifetime
 {
 #if DEBUG
-  private const int WAIT_PERIOD = 4000; // WSL is slow AF, so for local runs, we're being extra generous
+  private const int WAIT_PERIOD = 3000; // WSL is slow AF, so for local runs, we're being extra generous
 #else
-  private const int WAIT_PERIOD = 500; // For CI runs, a much smaller wait time is acceptable
+  private const int WAIT_PERIOD = 400; // For CI runs, a much smaller wait time is acceptable
 #endif
-  private const int TIMEOUT = WAIT_PERIOD + WAIT_PERIOD + 500;
+  private const int TIMEOUT = WAIT_PERIOD + WAIT_PERIOD + 600;
  private IClient _testUser;
  private Project _testProject;
  private Model _testModel;
@@ -32,6 +32,7 @@ public class SubscriptionResourceTests : IAsyncLifetime
  public async Task InitializeAsync()
  {
    _testUser = await Fixtures.SeedUserWithClient();
+    await _testUser.InitializeWebsocket();
    _testProject = await _testUser.Project.Create(new("test project123", "desc", null));
    _testModel = await _testUser.Model.Create(new("test model", "desc", _testProject.id));
    _testVersion = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.id);
@@ -370,7 +370,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -454,6 +455,12 @@
          "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,6 +92,11 @@
        "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",
@@ -355,7 +360,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -372,12 +378,6 @@
          "System.Reactive": "5.0.0"
        }
      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "CentralTransitive",
-        "requested": "[5.0.0, )",
-        "resolved": "1.1.0",
-        "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg=="
-      },
      "Microsoft.Data.Sqlite": {
        "type": "CentralTransitive",
        "requested": "[7.0.5, )",
@@ -417,6 +417,12 @@
        "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,7 +363,8 @@
          "Microsoft.Extensions.Logging": "[2.2.0, )",
          "Speckle.DoubleNumerics": "[4.1.0, )",
          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "Speckle.Sdk.Dependencies": "[1.0.0, )"
+          "Speckle.Sdk.Dependencies": "[1.0.0, )",
+          "System.Threading.Channels": "[10.0.1, )"
        }
      },
      "speckle.sdk.dependencies": {
@@ -441,6 +442,12 @@
          "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	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
Jedd Morgan	0ca9162e7b	pass etag to trigger processing (#447 ) .NET Build and Publish / build (push) Has been cancelled Details	2026-02-26 16:09:19 +00:00
Jedd Morgan	070f21b075	feat(progress): Add progress reporting to uploader (#446 ) .NET Build and Publish / build (push) Has been cancelled Details * refactor uploader for progress * progress * not so many decimal places * small tweak to RenderStreamProgress * fix unit tests * uploading data	2026-02-26 10:45:48 +00:00
Dimitrie Stefanescu	9bf6995b15	Add headers for Azure S3 compat	2026-02-24 11:57:16 +00:00
Jedd Morgan	43ebc84881	feat(api): DI Refactor for Duck DB + Gergo's API endpoint changes (#444 ) * di * di2 * Gergo's api changes	2026-02-20 14:20:29 +00:00
Jedd Morgan	7652cd385d	Merge remote-tracking branch 'origin/main' into duckdev	2026-02-20 13:40:29 +00:00
Jedd Morgan	a81aaca8fe	Updated tests for recent server changes (#445 )	2026-02-20 12:02:34 +00:00
Jedd Morgan	57843cc454	Test(integration): Add reusable workflow for running integration tests from the server repo (#443 ) * experiment * rename * we'll give this a go * fix path * correct path * the correct path this time * build docker image first * correct docker build * try this * ensure editor config is observed * typo	2026-02-12 18:20:55 +00:00
Jedd Morgan	bf6ae0f6af	Duck: Cleanup dependencies (#441 ) * Remove unused dependencies * remove unused package references * how's this * missed a bit	2026-02-10 16:29:27 +00:00
Jedd Morgan	309cead189	changes to serializer value handilng (#440 )	2026-02-10 12:25:05 +00:00
Dimitrie Stefanescu	4980796cd6	Dim/flopper experiments (#438 ) * Adds object flopper for experimental object uploads Implements a new mechanism for uploading objects to the server. * wip * pipe works * WIP * wip - refactors send pipeline	2026-02-10 10:17:38 +00:00
Jedd Morgan	12df19e431	fix(test): Ensure `InitializeWebsocket` runs async (#437 ) * Force InitializeWebsocket * experiment with lower values * let's play it safe	2026-02-10 09:52:19 +00:00