Chore: Update csharpier version and re-format (#1363 )

* Bump Csharpier * run csharpier format ./
fix(revit): skip out-of-bounds snapping references for far-from-origin DirectShapes (#1362 )
2026-04-13 17:16:40 +00:00 · 2026-04-13 17:52:09 +03:00 · 2026-04-10 15:59:26 +03:00 · 2026-04-09 19:19:32 +00:00 · 2026-04-08 11:42:24 +01:00 · 2026-04-08 11:27:57 +01:00
444 changed files with 4992 additions and 2660 deletions
@@ -3,14 +3,14 @@
  "isRoot": true,
  "tools": {
    "csharpier": {
-      "version": "0.28.2",
+      "version": "1.2.6",
      "commands": [
-        "dotnet-csharpier"
+        "csharpier"
      ],
      "rollForward": false
    },
    "dotnet-affected": {
-      "version": "5.0.0",
+      "version": "6.2.0",
      "commands": [
        "dotnet-affected"
      ],
@@ -0,0 +1,29 @@
+Directory.Build.targets
+Directory.Build.props
+Directory.Packages.props
+
+*.slnx
+
+**/bin/*
+**/obj/*
+_ReSharper.SharpCompress/
+bin/
+*.suo
+*.user
+TestArchives/Scratch/
+TestArchives/Scratch2/
+TestResults/
+*.nupkg
+packages/*/
+project.lock.json
+tests/TestArchives/Scratch
+.vs
+tools
+.vscode
+.idea/
+
+.DS_Store
+*.snupkg
+coverage.xml
+
+*.received.*
@@ -1,7 +1,7 @@
 printWidth: 120
 useTabs: false
-tabWidth: 2
+indentSize: 2
 preprocessorSymbolSets:
-    - ""
-    - "DEBUG"
-    - "DEBUG,CODE_STYLE"
+  - ""
+  - "DEBUG"
+  - "DEBUG,CODE_STYLE"
@@ -22,4 +22,4 @@ coverage.xml
 output/
 Images/Thumbs.db

-.claude
+.claude/
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>net8.0</TargetFramework>
@@ -20,7 +20,7 @@ public static class Consts
        new("Connectors/Revit/Speckle.Connectors.Revit2023", "net48"),
        new("Connectors/Revit/Speckle.Connectors.Revit2024", "net48"),
        new("Connectors/Revit/Speckle.Connectors.Revit2025", "net8.0-windows"),
-        new("Connectors/Revit/Speckle.Connectors.Revit2026", "net8.0-windows")
+        new("Connectors/Revit/Speckle.Connectors.Revit2026", "net8.0-windows"),
      ]
    ),
    new(
@@ -30,7 +30,7 @@ public static class Consts
        new("Connectors/Autocad/Speckle.Connectors.Autocad2023", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Autocad2024", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Autocad2025", "net8.0-windows"),
-        new("Connectors/Autocad/Speckle.Connectors.Autocad2026", "net8.0-windows")
+        new("Connectors/Autocad/Speckle.Connectors.Autocad2026", "net8.0-windows"),
      ]
    ),
    new(
@@ -40,7 +40,7 @@ public static class Consts
        new("Connectors/Autocad/Speckle.Connectors.Civil3d2023", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Civil3d2024", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Civil3d2025", "net8.0-windows"),
-        new("Connectors/Autocad/Speckle.Connectors.Civil3d2026", "net8.0-windows")
+        new("Connectors/Autocad/Speckle.Connectors.Civil3d2026", "net8.0-windows"),
      ]
    ),
    new("plant3d", [new("Connectors/Autocad/Speckle.Connectors.Plant3d2026", "net8.0-windows")]),
@@ -53,7 +53,7 @@ public static class Consts
        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2023", "net48"),
        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2024", "net48"),
        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2025", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2026", "net48")
+        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2026", "net48"),
      ]
    ),
    new(
@@ -61,7 +61,7 @@ public static class Consts
      [
        new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
        new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48"),
-        new("Connectors/Tekla/Speckle.Connector.Tekla2025", "net48")
+        new("Connectors/Tekla/Speckle.Connector.Tekla2025", "net48"),
      ]
    ),
    new(
@@ -23,9 +23,9 @@ public static class Github
      {
        Accept = { new MediaTypeWithQualityHeaderValue("application/vnd.github+json") },
        Authorization = new AuthenticationHeaderValue("Bearer", token),
-        UserAgent = { new ProductInfoHeaderValue("Speckle.build", "3.0.0") }
+        UserAgent = { new ProductInfoHeaderValue("Speckle.build", "3.0.0") },
      },
-      Content = content
+      Content = content,
    };
    request.Headers.Add("X-GitHub-Api-Version", "2022-11-28");
    var response = await client.SendAsync(request);
@@ -145,7 +145,7 @@ Target(
  DependsOn(RESTORE_TOOLS),
  () =>
  {
-    Run("dotnet", "csharpier --check .");
+    Run("dotnet", "csharpier check ./");
  }
 );

@@ -1,4 +1,4 @@
 CA1502: 25
 CA1501: 5
-CA1506(Method): 50
+CA1506(Method): 60
 CA1506(Type): 95
@@ -7,16 +7,16 @@
    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2022;AUTOCAD2022_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>
-  
+
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2022.0.2" ExcludeAssets="runtime" />
+  </ItemGroup>
+
  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2022\Speckle.Converters.Autocad2022.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
 </Project>
@@ -7,16 +7,16 @@
    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2023;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>
-  
+
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" ExcludeAssets="runtime" />
+  </ItemGroup>
+
  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2023\Speckle.Converters.Autocad2023.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
 </Project>
@@ -7,16 +7,16 @@
    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2024;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>
-  
+
+  <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" ExcludeAssets="runtime" />
+  </ItemGroup>
+
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
-  <ItemGroup>   
    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2024\Speckle.Converters.Autocad2024.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
 </Project>
@@ -8,20 +8,23 @@

  <PropertyGroup>
    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
  </PropertyGroup>
-  
+
+  <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" ExcludeAssets="runtime" />
+  </ItemGroup>
+
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
-  <ItemGroup>   
    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2025\Speckle.Converters.Autocad2025.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
 </Project>
@@ -8,20 +8,23 @@

  <PropertyGroup>
    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
  </PropertyGroup>
-  
+
+  <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime" />
+  </ItemGroup>
+
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
-  <ItemGroup>   
    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2026\Speckle.Converters.Autocad2026.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
 </Project>
@@ -18,6 +18,10 @@ public static class AutocadConnectorModule
    // Send
    serviceCollection.LoadSend();
    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, AutocadRootObjectBuilder>();
+    serviceCollection.AddScoped<
+      IRootContinuousTraversalBuilder<AutocadRootObject>,
+      AutocadContinuousTraversalBuilder
+    >();

    // Receive
    serviceCollection.LoadReceive();
@@ -1,9 +1,9 @@
 using Autodesk.AutoCAD.Colors;
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Operations;
 using Speckle.InterfaceGenerator;
 using Speckle.Sdk;
 using Speckle.Sdk.Models.Proxies;
+using Speckle.Sdk.Pipelines.Progress;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;

 namespace Speckle.Connectors.Autocad.HostApp;
@@ -110,22 +110,20 @@ public class AutocadColorUnpacker
    string name = color.ColorNameForDisplay;
    string id = color.GetSpeckleApplicationId();

-    ColorProxy colorProxy =
-      new()
-      {
-        value = argb,
-        applicationId = id,
-        name = name,
-        objects = new()
-      };
+    ColorProxy colorProxy = new()
+    {
+      value = argb,
+      applicationId = id,
+      name = name,
+      objects = new(),
+    };

    // add the color source as well for receiving in other apps
    // POC: in order to support full fidelity color support across autocad and rhino, we need to keep track of the color source property. Not sure if this is the best place to keep track of the source, vs on a ColorSourceProxy or as a property on the atomic object.
-    colorProxy["source"] = color.IsByBlock
-      ? "block"
-      : color.IsByLayer
-        ? "layer"
-        : "object";
+    colorProxy["source"] =
+      color.IsByBlock ? "block"
+      : color.IsByLayer ? "layer"
+      : "object";

    // set additional properties if by aci or by block
    // ByBlock colors for some reason do not have their color value set to the correct color (white): instead it's a near-black
@@ -53,7 +53,7 @@ public class AutocadGroupUnpacker
            {
              applicationId = groupAppId,
              name = group.Name,
-              objects = [applicationId]
+              objects = [applicationId],
            };
          }
        }
@@ -5,7 +5,6 @@ using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Converters.Autocad;
 using Speckle.Converters.Common;
 using Speckle.DoubleNumerics;
@@ -16,6 +15,7 @@ using Speckle.Sdk.Dependencies;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Pipelines.Progress;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;

 namespace Speckle.Connectors.Autocad.HostApp;
@@ -139,7 +139,7 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
            ? matId
            : ObjectId.Null;

-          BlockReference blockRef = new(insertionPoint, definitionId) { BlockTransform = matrix3d, Layer = layerName, };
+          BlockReference blockRef = new(insertionPoint, definitionId) { BlockTransform = matrix3d, Layer = layerName };

          if (objColor is not null)
          {
@@ -252,7 +252,7 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
      matrix.M41,
      matrix.M42,
      matrix.M43,
-      matrix.M44
+      matrix.M44,
    };

    var m3d = new Matrix3d(scaledTransform);
@@ -291,7 +291,7 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
      0.0,
      0.0,
      0.0,
-      matrix[3, 3]
+      matrix[3, 3],
    ];
  }
 }
@@ -68,15 +68,14 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
        : instance.BlockTableRecord;

      // transforms on instances are always stored in WCS
-      InstanceProxy instanceProxy =
-        new()
-        {
-          applicationId = instanceId,
-          definitionId = definitionId.ToString(),
-          maxDepth = depth,
-          transform = TransformHelper.ConvertToInstanceMatrix4x4(instance.BlockTransform),
-          units = _unitsConverter.ConvertOrThrow(Application.DocumentManager.CurrentDocument.Database.Insunits)
-        };
+      InstanceProxy instanceProxy = new()
+      {
+        applicationId = instanceId,
+        definitionId = definitionId.ToString(),
+        maxDepth = depth,
+        transform = TransformHelper.ConvertToInstanceMatrix4x4(instance.BlockTransform),
+        units = _unitsConverter.ConvertOrThrow(Application.DocumentManager.CurrentDocument.Database.Insunits),
+      };

      var properties = _propertiesExtractor.GetProperties(instance);
      if (properties?.Count > 0)
@@ -153,7 +152,7 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
        applicationId = definitionId.ToString(),
        objects = new(),
        maxDepth = depth,
-        name = !instance.AnonymousBlockTableRecord.IsNull ? "Dynamic instance " + definitionId : definition.Name
+        name = !instance.AnonymousBlockTableRecord.IsNull ? "Dynamic instance " + definitionId : definition.Name,
      };

      // Go through each definition object
@@ -3,12 +3,12 @@ using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.GraphicsInterface;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Operations;
 using Speckle.InterfaceGenerator;
 using Speckle.Objects.Other;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
 using Speckle.Sdk.Models;
+using Speckle.Sdk.Pipelines.Progress;
 using Material = Autodesk.AutoCAD.DatabaseServices.Material;
 using RenderMaterial = Speckle.Objects.Other.RenderMaterial;

@@ -170,13 +170,12 @@ public class AutocadMaterialBaker : IAutocadMaterialBaker
      MaterialColor diffuseColor = new(Method.Override, 1, entityDiffuseColor);
      MaterialDiffuseComponent diffuse = new(diffuseColor, map);

-      Material mat =
-        new()
-        {
-          Name = matName,
-          Opacity = opacity,
-          Diffuse = diffuse
-        };
+      Material mat = new()
+      {
+        Name = matName,
+        Opacity = opacity,
+        Diffuse = diffuse,
+      };

      if (renderMaterial["reflectivity"] is double reflectivity)
      {
@@ -122,14 +122,13 @@ public class AutocadMaterialUnpacker
      diffuseColor.Blue
    );

-    RenderMaterial renderMaterial =
-      new()
-      {
-        name = material.Name,
-        opacity = material.Opacity.Percentage,
-        diffuse = diffuse.ToArgb(),
-        applicationId = id
-      };
+    RenderMaterial renderMaterial = new()
+    {
+      name = material.Name,
+      opacity = material.Opacity.Percentage,
+      diffuse = diffuse.ToArgb(),
+      applicationId = id,
+    };

    // Add additional properties
    renderMaterial["ior"] = material.Refraction.Index;
@@ -139,7 +138,7 @@ public class AutocadMaterialUnpacker
    {
      value = renderMaterial,
      objects = new(),
-      applicationId = id
+      applicationId = id,
    };
  }
 }
@@ -12,6 +12,7 @@ using Speckle.Sdk.Dependencies;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Pipelines.Progress;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;

 namespace Speckle.Connectors.Autocad.Operations.Receive;
@@ -0,0 +1,196 @@
+using System.Diagnostics.CodeAnalysis;
+using Autodesk.AutoCAD.DatabaseServices;
+using Microsoft.Extensions.Logging;
+using Speckle.Connectors.Autocad.HostApp;
+using Speckle.Connectors.Common.Builders;
+using Speckle.Connectors.Common.Caching;
+using Speckle.Connectors.Common.Conversion;
+using Speckle.Connectors.Common.Extensions;
+using Speckle.Connectors.Common.Operations;
+using Speckle.Converters.Common;
+using Speckle.Sdk;
+using Speckle.Sdk.Logging;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Pipelines.Progress;
+using Speckle.Sdk.Pipelines.Send;
+
+namespace Speckle.Connectors.Autocad.Operations.Send;
+
+/// <summary>
+/// Abstract base class for AutoCAD continuous traversal builders that stream objects through a
+/// <see cref="SendPipeline"/> for packfile-based uploads. Same conversion logic as
+/// <see cref="AutocadRootObjectBaseBuilder"/>, but processes elements through the pipeline.
+/// </summary>
+public abstract class AutocadContinuousTraversalBaseBuilder : IRootContinuousTraversalBuilder<AutocadRootObject>
+{
+  private readonly IRootToSpeckleConverter _converter;
+  private readonly string[] _documentPathSeparator = ["\\"];
+  private readonly ISendConversionCache _sendConversionCache;
+  private readonly AutocadInstanceUnpacker _instanceUnpacker;
+  private readonly AutocadMaterialUnpacker _materialUnpacker;
+  private readonly AutocadColorUnpacker _colorUnpacker;
+  private readonly AutocadGroupUnpacker _groupUnpacker;
+  private readonly ILogger<AutocadRootObjectBuilder> _logger;
+  private readonly ISdkActivityFactory _activityFactory;
+
+  protected AutocadContinuousTraversalBaseBuilder(
+    IRootToSpeckleConverter converter,
+    ISendConversionCache sendConversionCache,
+    AutocadInstanceUnpacker instanceObjectManager,
+    AutocadMaterialUnpacker materialUnpacker,
+    AutocadColorUnpacker colorUnpacker,
+    AutocadGroupUnpacker groupUnpacker,
+    ILogger<AutocadRootObjectBuilder> logger,
+    ISdkActivityFactory activityFactory
+  )
+  {
+    _converter = converter;
+    _sendConversionCache = sendConversionCache;
+    _instanceUnpacker = instanceObjectManager;
+    _materialUnpacker = materialUnpacker;
+    _colorUnpacker = colorUnpacker;
+    _groupUnpacker = groupUnpacker;
+    _logger = logger;
+    _activityFactory = activityFactory;
+  }
+
+  [SuppressMessage(
+    "Maintainability",
+    "CA1506:Avoid excessive class coupling",
+    Justification = """
+      It is already simplified but has many different references since it is a builder. Do not know can we simplify it now.
+      Later we might consider to refactor proxies from one proxy manager? but we do not know the shape of it all potential
+      proxy classes yet. So I'm supressing this one now!!!
+      """
+  )]
+  public async Task<RootObjectBuilderResult> Build(
+    IReadOnlyList<AutocadRootObject> objects,
+    string projectId,
+    SendPipeline sendPipeline,
+    IProgress<CardProgress> onOperationProgressed,
+    CancellationToken cancellationToken
+  )
+  {
+    // 0 - Init the root
+    Collection root = new()
+    {
+      name = Application
+        .DocumentManager.CurrentDocument.Name.Split(_documentPathSeparator, StringSplitOptions.None)
+        .Reverse()
+        .First(),
+    };
+
+    Document doc = Application.DocumentManager.CurrentDocument;
+    using Transaction tr = doc.Database.TransactionManager.StartTransaction();
+
+    // 1 - Unpack the instances
+    var (atomicObjects, _, instanceProxies, instanceDefinitionProxies) = _instanceUnpacker.UnpackSelection(objects);
+    root[ProxyKeys.INSTANCE_DEFINITION] = instanceDefinitionProxies;
+
+    // 2 - Unpack the groups
+    root[ProxyKeys.GROUP] = _groupUnpacker.UnpackGroups(atomicObjects);
+    using (var _ = _activityFactory.Start("Converting objects"))
+    {
+      // 3 - Convert atomic objects and process through pipeline
+      List<LayerTableRecord> usedAcadLayers = new();
+      List<SendConversionResult> results = new();
+      int count = 0;
+      foreach (var (entity, applicationId) in atomicObjects)
+      {
+        cancellationToken.ThrowIfCancellationRequested();
+        (Collection objectCollection, LayerTableRecord? autocadLayer) = CreateObjectCollection(entity, tr);
+
+        if (autocadLayer is not null)
+        {
+          usedAcadLayers.Add(autocadLayer);
+          root.elements.Add(objectCollection);
+        }
+
+        var result = await ConvertAutocadEntity(
+          entity,
+          applicationId,
+          objectCollection,
+          instanceProxies,
+          projectId,
+          sendPipeline
+        );
+        results.Add(result);
+
+        onOperationProgressed.Report(
+          new($"Converting objects... ({count:N0} / {atomicObjects.Count:N0})", (double)++count / atomicObjects.Count)
+        );
+      }
+
+      if (results.All(x => x.Status == Status.ERROR))
+      {
+        throw new SpeckleException("Failed to convert all objects.");
+      }
+
+      // 4 - Unpack the render material proxies
+      root[ProxyKeys.RENDER_MATERIAL] = _materialUnpacker.UnpackMaterials(atomicObjects, usedAcadLayers);
+
+      // 5 - Unpack the color proxies
+      root[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, usedAcadLayers);
+
+      // add any additional properties (most likely from verticals)
+      AddAdditionalProxiesToRoot(root);
+
+      // Process root collection and wait for all uploads
+      await sendPipeline.Process(root);
+      await sendPipeline.WaitForUpload();
+
+      return new RootObjectBuilderResult(root, results);
+    }
+  }
+
+  public virtual (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
+  {
+    return (new(), null);
+  }
+
+  public virtual void AddAdditionalProxiesToRoot(Collection rootCollection)
+  {
+    return;
+  }
+
+  private async Task<SendConversionResult> ConvertAutocadEntity(
+    Entity entity,
+    string applicationId,
+    Collection collectionHost,
+    IReadOnlyDictionary<string, InstanceProxy> instanceProxies,
+    string projectId,
+    SendPipeline sendPipeline
+  )
+  {
+    string sourceType = entity.GetType().ToString();
+    try
+    {
+      Base converted;
+      if (entity is BlockReference && instanceProxies.TryGetValue(applicationId, out InstanceProxy? instanceProxy))
+      {
+        converted = instanceProxy;
+      }
+      else if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
+      {
+        converted = value;
+      }
+      else
+      {
+        converted = _converter.Convert(entity);
+        converted.applicationId = applicationId;
+      }
+
+      // NOTE: this is the main part that differentiate from the main root object builder
+      var reference = await sendPipeline.Process(converted).ConfigureAwait(false);
+      collectionHost.elements.Add(reference);
+      return new(Status.SUCCESS, applicationId, sourceType, reference);
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      _logger.LogSendConversionError(ex, sourceType);
+      return new(Status.ERROR, applicationId, sourceType, null, ex);
+    }
+  }
+}
@@ -0,0 +1,46 @@
+using Autodesk.AutoCAD.DatabaseServices;
+using Microsoft.Extensions.Logging;
+using Speckle.Connectors.Autocad.HostApp;
+using Speckle.Connectors.Common.Caching;
+using Speckle.Converters.Common;
+using Speckle.Sdk.Logging;
+using Speckle.Sdk.Models.Collections;
+
+namespace Speckle.Connectors.Autocad.Operations.Send;
+
+public sealed class AutocadContinuousTraversalBuilder : AutocadContinuousTraversalBaseBuilder
+{
+  private readonly AutocadLayerUnpacker _layerUnpacker;
+
+  public AutocadContinuousTraversalBuilder(
+    AutocadLayerUnpacker layerUnpacker,
+    IRootToSpeckleConverter converter,
+    ISendConversionCache sendConversionCache,
+    AutocadInstanceUnpacker instanceObjectManager,
+    AutocadMaterialUnpacker materialUnpacker,
+    AutocadColorUnpacker colorUnpacker,
+    AutocadGroupUnpacker groupUnpacker,
+    ILogger<AutocadRootObjectBuilder> logger,
+    ISdkActivityFactory activityFactory
+  )
+    : base(
+      converter,
+      sendConversionCache,
+      instanceObjectManager,
+      materialUnpacker,
+      colorUnpacker,
+      groupUnpacker,
+      logger,
+      activityFactory
+    )
+  {
+    _layerUnpacker = layerUnpacker;
+  }
+
+  public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
+  {
+    Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
+
+    return (layer, autocadLayer);
+  }
+}
@@ -16,6 +16,7 @@ using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Pipelines.Progress;

 namespace Speckle.Connectors.Autocad.Operations.Send;

@@ -72,15 +73,14 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadR
  )
  {
    // 0 - Init the root
-    Collection root =
-      new()
-      {
-        name = Application
-          .DocumentManager.CurrentDocument.Name // POC: https://spockle.atlassian.net/browse/CNX-9319
-          .Split(_documentPathSeparator, StringSplitOptions.None)
-          .Reverse()
-          .First()
-      };
+    Collection root = new()
+    {
+      name = Application
+        .DocumentManager.CurrentDocument.Name // POC: https://spockle.atlassian.net/browse/CNX-9319
+        .Split(_documentPathSeparator, StringSplitOptions.None)
+        .Reverse()
+        .First(),
+    };

    // TODO: better handling for document and transactions!!
    Document doc = Application.DocumentManager.CurrentDocument;
@@ -37,7 +37,7 @@ public class AutocadCommand
    PaletteSet = new PaletteSet($"Speckle", s_id)
    {
      Size = new Size(400, 500),
-      DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right)
+      DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right),
    };

    // init DI
@@ -53,13 +53,12 @@ public class AutocadRibbon
    RibbonPanel panel = new() { Source = source };
    tab.Panels.Add(panel);

-    RibbonToolTip speckleToolTip =
-      new()
-      {
-        Title = "Speckle",
-        Content = $"Next Gen Speckle Connector for {AppUtils.App.Name}",
-        IsHelpEnabled = true // Without this "Press F1 for help" does not appear in the tooltip
-      };
+    RibbonToolTip speckleToolTip = new()
+    {
+      Title = "Speckle",
+      Content = $"Next Gen Speckle Connector for {AppUtils.App.Name}",
+      IsHelpEnabled = true, // Without this "Press F1 for help" does not appear in the tooltip
+    };

    _ = CreateSpeckleButton("Speckle", source, null, speckleToolTip, "logo");
  }
@@ -121,7 +120,7 @@ public class AutocadRibbon
      ShowText = true,
      ToolTip = tooltip,
      HelpSource = new System.Uri("https://speckle.guide/user/autocadcivil.html"),
-      Size = RibbonItemSize.Large
+      Size = RibbonItemSize.Large,
    };

    if (TryLoadPngImgSource(imageName + "16.png", out ImageSource? imageSource))
@@ -1,79 +1,61 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ApplicationPackage 
-        SchemaVersion="1.0"
-        AppVersion="1.0"
-        Author="AEC SYSTEMS LTD"
-        Name="Speckle for AutoCAD"
-        Description="Speckle for AutoCAD"
-        Icon="./Contents/Resources/Logo.ico"
-        ProductCode="{958850b9-3782-4e6f-b9b3-1b570e0fcae1}" 
-        UpgradeCode="{274de351-80aa-4972-9b45-6a93f8ce968f}"> <!-- For now, we're not updating the AppVersion & ProductCodes with each version -->
-    
-    <CompanyDetails
-            Name="Speckle"
-            Url="https://speckle.systems"
-            Email="support@speckle.systems" />
-    <Components>
-    
-        <!-- AutoCAD 2022 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Autocad2022"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2022/Speckle.Connectors.Autocad2022.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="AutoCAD"
-                    SeriesMin="R24.1"
-                    SeriesMax="R24.1" />
-        </ComponentEntry>
+<ApplicationPackage
+  SchemaVersion="1.0"
+  AppVersion="1.0"
+  Author="AEC SYSTEMS LTD"
+  Name="Speckle for AutoCAD"
+  Description="Speckle for AutoCAD"
+  Icon="./Contents/Resources/Logo.ico"
+  ProductCode="{958850b9-3782-4e6f-b9b3-1b570e0fcae1}"
+  UpgradeCode="{274de351-80aa-4972-9b45-6a93f8ce968f}"
+>
+  <!-- For now, we're not updating the AppVersion & ProductCodes with each version -->

-        <!-- AutoCAD 2023 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Autocad2023"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="AutoCAD"
-                    SeriesMin="R24.2"
-                    SeriesMax="R24.2" />
-        </ComponentEntry>
+  <CompanyDetails Name="Speckle" Url="https://speckle.systems" Email="support@speckle.systems" />
+  <Components>
+    <!-- AutoCAD 2022 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Autocad2022"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2022/Speckle.Connectors.Autocad2022.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R24.1" SeriesMax="R24.1" />
+    </ComponentEntry>

-        <!-- AutoCAD 2024 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Autocad2024"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2024/Speckle.Connectors.Autocad2024.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="AutoCAD"
-                    SeriesMin="R24.3"
-                    SeriesMax="R24.3" />
-        </ComponentEntry>
+    <!-- AutoCAD 2023 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Autocad2023"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R24.2" SeriesMax="R24.2" />
+    </ComponentEntry>

-        <!-- AutoCAD 2025 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Autocad2025"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2025/Speckle.Connectors.Autocad2025.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="AutoCAD"
-                    SeriesMin="R25.0"
-                    SeriesMax="R25.0" />
-        </ComponentEntry>
+    <!-- AutoCAD 2024 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Autocad2024"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2024/Speckle.Connectors.Autocad2024.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R24.3" SeriesMax="R24.3" />
+    </ComponentEntry>

-        <!-- AutoCAD 2026 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Autocad2026"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2026/Speckle.Connectors.Autocad2026.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="AutoCAD"
-                    SeriesMin="R25.1"
-                    SeriesMax="R25.1" />
-        </ComponentEntry>
-    </Components>
+    <!-- AutoCAD 2025 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Autocad2025"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2025/Speckle.Connectors.Autocad2025.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R25.0" SeriesMax="R25.0" />
+    </ComponentEntry>

+    <!-- AutoCAD 2026 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Autocad2026"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2026/Speckle.Connectors.Autocad2026.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R25.1" SeriesMax="R25.1" />
+    </ComponentEntry>
+  </Components>
 </ApplicationPackage>
@@ -1,79 +1,61 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ApplicationPackage
-        SchemaVersion="1.0"
-        AppVersion="1.0"
-        Author="AEC SYSTEMS LTD"
-        Name="Speckle for Civil 3D"
-        Description="Speckle for Civil 3D"
-        Icon="./Contents/Resources/Logo.ico"
-        ProductCode="{cecad7b2-daa9-4a9d-941d-737619ffd999}"
-        UpgradeCode="{ccf4134d-0e24-4e91-8bf4-781ec7313bef}"> <!-- For now, we're not updating the AppVersion & ProductCodes with each version -->
+  SchemaVersion="1.0"
+  AppVersion="1.0"
+  Author="AEC SYSTEMS LTD"
+  Name="Speckle for Civil 3D"
+  Description="Speckle for Civil 3D"
+  Icon="./Contents/Resources/Logo.ico"
+  ProductCode="{cecad7b2-daa9-4a9d-941d-737619ffd999}"
+  UpgradeCode="{ccf4134d-0e24-4e91-8bf4-781ec7313bef}"
+>
+  <!-- For now, we're not updating the AppVersion & ProductCodes with each version -->

-    <CompanyDetails
-            Name="Speckle"
-            Url="https://speckle.systems"
-            Email="support@speckle.systems" />
-    <Components>
+  <CompanyDetails Name="Speckle" Url="https://speckle.systems" Email="support@speckle.systems" />
+  <Components>
+    <!-- AutoCAD 2022 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Civil3d2022"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2022/Speckle.Connectors.Civil3d2022.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R24.1" SeriesMax="R24.1" />
+    </ComponentEntry>

-        <!-- AutoCAD 2022 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Civil3d2022"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2022/Speckle.Connectors.Civil3d2022.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="Civil3D"
-                    SeriesMin="R24.1"
-                    SeriesMax="R24.1" />
-        </ComponentEntry>
+    <!-- AutoCAD 2023 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Civil3d2023"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R24.2" SeriesMax="R24.2" />
+    </ComponentEntry>

-        <!-- AutoCAD 2023 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Civil3d2023"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="Civil3D"
-                    SeriesMin="R24.2"
-                    SeriesMax="R24.2" />
-        </ComponentEntry>
+    <!-- AutoCAD 2024 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Civil3d2024"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R24.3" SeriesMax="R24.3" />
+    </ComponentEntry>

-        <!-- AutoCAD 2024 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Civil3d2024"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="Civil3D"
-                    SeriesMin="R24.3"
-                    SeriesMax="R24.3" />
-        </ComponentEntry>
-
-        <!-- AutoCAD 2025 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Civil3d2025"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2025/Speckle.Connectors.Civil3d2025.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="Civil3D"
-                    SeriesMin="R25.0"
-                    SeriesMax="R25.0" />
-        </ComponentEntry>
-
-        <!-- AutoCAD 2026 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Civil3d2026"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2026/Speckle.Connectors.Civil3d2026.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="Civil3D"
-                    SeriesMin="R25.1"
-                    SeriesMax="R25.1" />
-        </ComponentEntry>
-    </Components>
+    <!-- AutoCAD 2025 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Civil3d2025"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2025/Speckle.Connectors.Civil3d2025.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R25.0" SeriesMax="R25.0" />
+    </ComponentEntry>

+    <!-- AutoCAD 2026 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Civil3d2026"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2026/Speckle.Connectors.Civil3d2026.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R25.1" SeriesMax="R25.1" />
+    </ComponentEntry>
+  </Components>
 </ApplicationPackage>
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ApplicationPackage
-        SchemaVersion="1.0"
-        AppVersion="1.0"
-        Author="AEC SYSTEMS LTD"
-        Name="Speckle for Plant 3D"
-        Description="Speckle for Plant 3D"
-        Icon="./Contents/Resources/Logo.ico"
-        ProductCode="{b91352b6-01db-4084-93c8-684bb231947e}"
-        UpgradeCode="{91c7e43f-e962-40e9-85bd-d6bd733b6964}">
-
-    <CompanyDetails
-            Name="Speckle"
-            Url="https://speckle.systems"
-            Email="support@speckle.systems" />
-    <Components>
-
-        <!-- Plant 3D 2026 -->
-        <ComponentEntry
-                AppName="Speckle.Connectors.Plant3d2026"
-                ModuleName="./Contents/Windows/Speckle.Connectors.Plant3d2026/Speckle.Connectors.Plant3d2026.dll"
-                LoadOnAutoCADStartup="True">
-            <RuntimeRequirements
-                    OS="Win64"
-                    Platform="Plant3D"
-                    SeriesMin="R25.1"
-                    SeriesMax="R25.1" />
-        </ComponentEntry>
-    </Components>
-
+  SchemaVersion="1.0"
+  AppVersion="1.0"
+  Author="AEC SYSTEMS LTD"
+  Name="Speckle for Plant 3D"
+  Description="Speckle for Plant 3D"
+  Icon="./Contents/Resources/Logo.ico"
+  ProductCode="{b91352b6-01db-4084-93c8-684bb231947e}"
+  UpgradeCode="{91c7e43f-e962-40e9-85bd-d6bd733b6964}"
+>
+  <CompanyDetails Name="Speckle" Url="https://speckle.systems" Email="support@speckle.systems" />
+  <Components>
+    <!-- Plant 3D 2026 -->
+    <ComponentEntry
+      AppName="Speckle.Connectors.Plant3d2026"
+      ModuleName="./Contents/Windows/Speckle.Connectors.Plant3d2026/Speckle.Connectors.Plant3d2026.dll"
+      LoadOnAutoCADStartup="True"
+    >
+      <RuntimeRequirements OS="Win64" Platform="Plant3D" SeriesMin="R25.1" SeriesMax="R25.1" />
+    </ComponentEntry>
+  </Components>
 </ApplicationPackage>
@@ -41,6 +41,8 @@
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\AutocadHostObjectBaseBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\AutocadHostObjectBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObject.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadContinuousTraversalBaseBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadContinuousTraversalBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObjectBaseBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObjectBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\AutocadRibbon.cs" />
@@ -8,16 +8,22 @@
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API"  VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3D.API"  VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2022.0.2" ExcludeAssets="runtime" />
+    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2022.0.2" ExcludeAssets="runtime" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2022\Speckle.Converters.Civil3d2022.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
-  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
+
+  <Import
+    Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems"
+    Label="Shared"
+  />
+  <Import
+    Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems"
+    Label="Shared"
+  />
 </Project>
@@ -9,16 +9,22 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2023.0.0" ExcludeAssets="runtime" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2023\Speckle.Converters.Civil3d2023.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
-  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
+
+  <Import
+    Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems"
+    Label="Shared"
+  />
+  <Import
+    Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems"
+    Label="Shared"
+  />
 </Project>
@@ -9,16 +9,22 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2024.0.0" ExcludeAssets="runtime" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2024\Speckle.Converters.Civil3d2024.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
-  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
+
+  <Import
+    Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems"
+    Label="Shared"
+  />
+  <Import
+    Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems"
+    Label="Shared"
+  />
 </Project>
@@ -8,23 +8,26 @@

  <PropertyGroup>
    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
  </PropertyGroup>
-  
+
+  <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2025.0.0" ExcludeAssets="runtime" />
+  </ItemGroup>
+
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
-  <ItemGroup>   
    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2025\Speckle.Converters.Civil3d2025.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
-  
+
  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
 </Project>
@@ -8,23 +8,26 @@

  <PropertyGroup>
    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
  </PropertyGroup>
-  
+
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
-  <ItemGroup>   
-    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2026\Speckle.Converters.Civil3d2026.csproj" />   
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2026.0.0" ExcludeAssets="runtime" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2026\Speckle.Converters.Civil3d2026.csproj" />
    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
  </ItemGroup>
-  
+
  <Import Project="..\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
-  
+
  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
 </Project>
@@ -22,6 +22,10 @@ public static class Civil3dConnectorModule
    // add send
    serviceCollection.LoadSend();
    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, Civil3dRootObjectBuilder>();
+    serviceCollection.AddScoped<
+      IRootContinuousTraversalBuilder<AutocadRootObject>,
+      Civil3dContinuousTraversalBuilder
+    >();
    serviceCollection.AddSingleton<IBinding, Civil3dSendBinding>();

    // add receive
@@ -281,7 +281,7 @@ public class PropertySetBaker
          {
            AAEC.PropertyData.DataType.Integer => (int)(long)defaultValue,
            AAEC.PropertyData.DataType.AutoIncrement => (int)(long)defaultValue,
-            _ => defaultValue
+            _ => defaultValue,
          };

          propDef.DefaultData = convertedValue;
@@ -0,0 +1,57 @@
+using Autodesk.AutoCAD.DatabaseServices;
+using Microsoft.Extensions.Logging;
+using Speckle.Connectors.Autocad.HostApp;
+using Speckle.Connectors.Autocad.Operations.Send;
+using Speckle.Connectors.Common.Caching;
+using Speckle.Connectors.Common.Operations;
+using Speckle.Converters.Civil3dShared.ToSpeckle;
+using Speckle.Converters.Common;
+using Speckle.Sdk.Logging;
+using Speckle.Sdk.Models.Collections;
+
+namespace Speckle.Connectors.Civil3dShared.Operations.Send;
+
+public sealed class Civil3dContinuousTraversalBuilder : AutocadContinuousTraversalBaseBuilder
+{
+  private readonly AutocadLayerUnpacker _layerUnpacker;
+  private readonly PropertySetDefinitionHandler _propertySetDefinitionHandler;
+
+  public Civil3dContinuousTraversalBuilder(
+    AutocadLayerUnpacker layerUnpacker,
+    PropertySetDefinitionHandler propertySetDefinitionHandler,
+    IRootToSpeckleConverter converter,
+    ISendConversionCache sendConversionCache,
+    AutocadInstanceUnpacker instanceObjectManager,
+    AutocadMaterialUnpacker materialUnpacker,
+    AutocadColorUnpacker colorUnpacker,
+    AutocadGroupUnpacker groupUnpacker,
+    ILogger<AutocadRootObjectBuilder> logger,
+    ISdkActivityFactory activityFactory
+  )
+    : base(
+      converter,
+      sendConversionCache,
+      instanceObjectManager,
+      materialUnpacker,
+      colorUnpacker,
+      groupUnpacker,
+      logger,
+      activityFactory
+    )
+  {
+    _layerUnpacker = layerUnpacker;
+    _propertySetDefinitionHandler = propertySetDefinitionHandler;
+  }
+
+  public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
+  {
+    Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
+
+    return (layer, autocadLayer);
+  }
+
+  public override void AddAdditionalProxiesToRoot(Collection rootObject)
+  {
+    rootObject[ProxyKeys.PROPERTYSET_DEFINITIONS] = _propertySetDefinitionHandler.Definitions;
+  }
+}
@@ -13,6 +13,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\Civil3dConnectorModule.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\PropertySetBaker.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\Civil3dHostObjectBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Civil3dContinuousTraversalBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Civil3dRootObjectBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Bindings\Civil3dSendBinding.cs" />
  </ItemGroup>
@@ -8,14 +8,17 @@

  <PropertyGroup>
    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions-->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <!--This is needed just to keep folder paths the same as the netframework versions-->
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Plant3D.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Speckle.Plant3D.API" VersionOverride="2026.0.0" ExcludeAssets="runtime" />
  </ItemGroup>

  <ItemGroup>
@@ -47,7 +47,7 @@ public sealed class Plant3dSendBinding : AutocadSendBaseBinding
    _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
  }

-  // We need a separate send binding for Plant3D due to using a different unit converter (needed for conversion settings construction)
+  // We need a separate send binding for Plant 3D due to using a different unit converter (needed for conversion settings construction)
  protected override void InitializeSettings(IServiceProvider serviceProvider)
  {
    serviceProvider
@@ -48,11 +48,10 @@ public class CsiSharedSelectionBinding : ISelectionBinding, IDisposable
    {
      _lastSelection = currentIds;
      // ensure UI updates also run on main thread
-      _threadContext.RunOnMain(
-        () =>
-          _topLevelExceptionHandler.CatchUnhandled(
-            () => Parent.Send(SelectionBindingEvents.SET_SELECTION, currentSelection)
-          )
+      _threadContext.RunOnMain(() =>
+        _topLevelExceptionHandler.CatchUnhandled(() =>
+          Parent.Send(SelectionBindingEvents.SET_SELECTION, currentSelection)
+        )
      );
    }
  }
@@ -98,7 +98,7 @@ public class CsiMaterialPropertyExtractor : IMaterialPropertyExtractor
      1 => DirectionalSymmetryType.ORTHOTROPIC,
      2 => DirectionalSymmetryType.ANISOTROPIC,
      3 => DirectionalSymmetryType.UNIAXIAL,
-      _ => throw new ArgumentException($"Unknown symmetry type: {materialDirectionalSymmetryKey}")
+      _ => throw new ArgumentException($"Unknown symmetry type: {materialDirectionalSymmetryKey}"),
    };

    var mechanicalProperties = properties.EnsureNested(SectionPropertyCategory.MECHANICAL_DATA);
@@ -24,6 +24,6 @@ public class CsiResultsExtractorFactory
      ResultsKey.SPANDREL_FORCES => _serviceProvider.GetRequiredService<CsiSpandrelForceResultsExtractor>(),
      ResultsKey.STORY_DRIFTS => _serviceProvider.GetRequiredService<CsiStoryDriftsResultsExtractor>(),
      ResultsKey.STORY_FORCES => _serviceProvider.GetRequiredService<CsiStoryForceResultsExtractor>(),
-      _ => throw new InvalidOperationException($"{resultsKey} not accounted for in CsiResultsExtractorFactory")
+      _ => throw new InvalidOperationException($"{resultsKey} not accounted for in CsiResultsExtractorFactory"),
    };
 }
@@ -47,20 +47,19 @@ public class CsiShellSectionPropertyExtractor : IShellSectionPropertyExtractor
    double[] stiffnessModifiersArray = [];
    _settingsStore.Current.SapModel.PropArea.GetModifiers(sectionName, ref stiffnessModifiersArray);

-    Dictionary<string, object?> modifiers =
-      new()
-      {
-        ["Membrane f11 Direction"] = stiffnessModifiersArray[0],
-        ["Membrane f22 Direction"] = stiffnessModifiersArray[1],
-        ["Membrane f12 Direction"] = stiffnessModifiersArray[2],
-        ["Bending m11 Direction"] = stiffnessModifiersArray[3],
-        ["Bending m22 Direction"] = stiffnessModifiersArray[3],
-        ["Bending m12 Direction"] = stiffnessModifiersArray[4],
-        ["Shear v13 Direction"] = stiffnessModifiersArray[5],
-        ["Shear v23 Direction"] = stiffnessModifiersArray[6],
-        ["Mass"] = stiffnessModifiersArray[7],
-        ["Weight"] = stiffnessModifiersArray[8]
-      };
+    Dictionary<string, object?> modifiers = new()
+    {
+      ["Membrane f11 Direction"] = stiffnessModifiersArray[0],
+      ["Membrane f22 Direction"] = stiffnessModifiersArray[1],
+      ["Membrane f12 Direction"] = stiffnessModifiersArray[2],
+      ["Bending m11 Direction"] = stiffnessModifiersArray[3],
+      ["Bending m22 Direction"] = stiffnessModifiersArray[3],
+      ["Bending m12 Direction"] = stiffnessModifiersArray[4],
+      ["Shear v13 Direction"] = stiffnessModifiersArray[5],
+      ["Shear v23 Direction"] = stiffnessModifiersArray[6],
+      ["Mass"] = stiffnessModifiersArray[7],
+      ["Weight"] = stiffnessModifiersArray[8],
+    };

    var generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
    generalData["Modifiers"] = modifiers;
@@ -0,0 +1,210 @@
+using Microsoft.Extensions.Logging;
+using Speckle.Connectors.Common.Builders;
+using Speckle.Connectors.Common.Conversion;
+using Speckle.Connectors.Common.Operations;
+using Speckle.Connectors.CSiShared.HostApp;
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
+using Speckle.Connectors.CSiShared.Utils;
+using Speckle.Converters.Common;
+using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Extensions;
+using Speckle.Converters.CSiShared.Utils;
+using Speckle.Sdk;
+using Speckle.Sdk.Logging;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Pipelines.Progress;
+using Speckle.Sdk.Pipelines.Send;
+
+namespace Speckle.Connectors.CSiShared.Builders;
+
+/// <summary>
+/// Continuous traversal builder for CSi that streams objects through a <see cref="SendPipeline"/>
+/// for packfile-based uploads. Same conversion logic as <see cref="CsiRootObjectBuilder"/>.
+/// </summary>
+public class CsiContinuousTraversalBuilder : IRootContinuousTraversalBuilder<ICsiWrapper>
+{
+  private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
+  private readonly IConverterSettingsStore<CsiConversionSettings> _converterSettings;
+  private readonly CsiSendCollectionManager _sendCollectionManager;
+  private readonly IMaterialUnpacker _materialUnpacker;
+  private readonly ISectionUnpacker _sectionUnpacker;
+  private readonly ILogger<CsiRootObjectBuilder> _logger;
+  private readonly ISdkActivityFactory _activityFactory;
+  private readonly ICsiApplicationService _csiApplicationService;
+  private readonly AnalysisResultsExtractor _analysisResultsExtractor;
+
+  public CsiContinuousTraversalBuilder(
+    IRootToSpeckleConverter rootToSpeckleConverter,
+    IConverterSettingsStore<CsiConversionSettings> converterSettings,
+    CsiSendCollectionManager sendCollectionManager,
+    IMaterialUnpacker materialUnpacker,
+    ISectionUnpacker sectionUnpacker,
+    ILogger<CsiRootObjectBuilder> logger,
+    ISdkActivityFactory activityFactory,
+    ICsiApplicationService csiApplicationService,
+    AnalysisResultsExtractor analysisResultsExtractor
+  )
+  {
+    _converterSettings = converterSettings;
+    _sendCollectionManager = sendCollectionManager;
+    _materialUnpacker = materialUnpacker;
+    _sectionUnpacker = sectionUnpacker;
+    _rootToSpeckleConverter = rootToSpeckleConverter;
+    _logger = logger;
+    _activityFactory = activityFactory;
+    _csiApplicationService = csiApplicationService;
+    _analysisResultsExtractor = analysisResultsExtractor;
+  }
+
+  public async Task<RootObjectBuilderResult> Build(
+    IReadOnlyList<ICsiWrapper> csiObjects,
+    string projectId,
+    SendPipeline sendPipeline,
+    IProgress<CardProgress> onOperationProgressed,
+    CancellationToken cancellationToken
+  )
+  {
+    using var activity = _activityFactory.Start("Build");
+
+    string modelFileName = _csiApplicationService.SapModel.GetModelFilename(false) ?? "Unnamed model";
+    (string forceUnit, string tempUnit) = GetForceAndTemperatureUnits();
+
+    Collection rootObjectCollection = new()
+    {
+      name = modelFileName,
+      ["units"] = _converterSettings.Current.SpeckleUnits,
+      ["forceUnits"] = forceUnit,
+      ["temperatureUnits"] = tempUnit,
+    };
+
+    List<SendConversionResult> results = new(csiObjects.Count);
+    int count = 0;
+
+    using (var _ = _activityFactory.Start("Convert all"))
+    {
+      foreach (ICsiWrapper csiObject in csiObjects)
+      {
+        cancellationToken.ThrowIfCancellationRequested();
+        var result = await ConvertCsiObject(csiObject, rootObjectCollection, sendPipeline);
+        results.Add(result);
+
+        count++;
+        onOperationProgressed.Report(
+          new($"Converting objects... ({count:N0} / {csiObjects.Count:N0})", (double)count / csiObjects.Count)
+        );
+        await Task.Yield();
+      }
+    }
+
+    if (results.All(x => x.Status == Status.ERROR))
+    {
+      throw new SpeckleException("Failed to convert all objects");
+    }
+
+    using (var _ = _activityFactory.Start("Process Proxies"))
+    {
+      rootObjectCollection[ProxyKeys.MATERIAL] = _materialUnpacker.UnpackMaterials().ToList();
+      rootObjectCollection[ProxyKeys.SECTION] = _sectionUnpacker.UnpackSections().ToList();
+    }
+
+    // Extract analysis results (if applicable)
+    var objectSelectionSummary = GetObjectSummary(csiObjects);
+    var selectedCasesAndCombinations = _converterSettings.Current.SelectedLoadCasesAndCombinations;
+    var requestedResultTypes = _converterSettings.Current.SelectedResultTypes;
+
+    if (selectedCasesAndCombinations?.Count > 0)
+    {
+      if (requestedResultTypes == null || requestedResultTypes.Count == 0)
+      {
+        throw new SpeckleException(
+          "Adjust publish settings - no result type input for the requested load cases and combinations"
+        );
+      }
+
+      if (!_csiApplicationService.SapModel.GetModelIsLocked())
+      {
+        throw new SpeckleException("Model unlocked, no access to analysis results");
+      }
+
+      try
+      {
+        var analysisResults = _analysisResultsExtractor.ExtractAnalysisResults(
+          selectedCasesAndCombinations,
+          requestedResultTypes,
+          objectSelectionSummary
+        );
+        rootObjectCollection[RootKeys.ANALYSIS_RESULTS] = analysisResults;
+      }
+      catch (Exception ex)
+      {
+        throw new SpeckleException("Analysis result extraction failed", ex);
+      }
+    }
+
+    // Process root collection and wait for all uploads
+    await sendPipeline.Process(rootObjectCollection);
+    await sendPipeline.WaitForUpload();
+
+    return new RootObjectBuilderResult(rootObjectCollection, results);
+  }
+
+  private async Task<SendConversionResult> ConvertCsiObject(
+    ICsiWrapper csiObject,
+    Collection typeCollection,
+    SendPipeline sendPipeline
+  )
+  {
+    string sourceType = csiObject.ObjectName;
+    string applicationId = csiObject switch
+    {
+      CsiJointWrapper jointWrapper => jointWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiFrameWrapper frameWrapper => frameWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiCableWrapper cableWrapper => cableWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiTendonWrapper tendonWrapper => tendonWrapper.ObjectName,
+      CsiShellWrapper shellWrapper => shellWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiSolidWrapper solidWrapper => solidWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiLinkWrapper linkWrapper => linkWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      _ => throw new ArgumentException($"Unsupported wrapper type: {csiObject.GetType()}", nameof(csiObject)),
+    };
+
+    try
+    {
+      Base converted = _rootToSpeckleConverter.Convert(csiObject);
+
+      var collection = _sendCollectionManager.AddObjectCollectionToRoot(converted, typeCollection);
+
+      // NOTE: this is the main part that differentiate from the main root object builder
+      var reference = await sendPipeline.Process(converted).ConfigureAwait(false);
+      collection.elements.Add(reference);
+
+      return new(Status.SUCCESS, applicationId, sourceType, reference);
+    }
+    catch (NotImplementedException ex)
+    {
+      _logger.LogError(ex, "Failed to convert object {sourceType}", sourceType);
+      return new(Status.WARNING, applicationId, sourceType, null, ex);
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      _logger.LogError(ex, "Failed to convert object {sourceType}", sourceType);
+      return new(Status.ERROR, applicationId, sourceType, null, ex);
+    }
+  }
+
+  private Dictionary<ModelObjectType, List<string>> GetObjectSummary(IReadOnlyList<ICsiWrapper> csiObjects) =>
+    csiObjects
+      .GroupBy(csiObject => csiObject.ObjectType)
+      .ToDictionary(group => group.Key, group => group.Select(obj => obj.Name).ToList());
+
+  private (string, string) GetForceAndTemperatureUnits()
+  {
+    var forceUnit = eForce.NotApplicable;
+    var lengthUnit = eLength.NotApplicable;
+    var temperatureUnit = eTemperature.NotApplicable;
+
+    _converterSettings.Current.SapModel.GetDatabaseUnits_2(ref forceUnit, ref lengthUnit, ref temperatureUnit);
+
+    return (forceUnit.ToString(), temperatureUnit.ToString());
+  }
+}
@@ -13,6 +13,7 @@ using Speckle.Sdk;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Pipelines.Progress;

 namespace Speckle.Connectors.CSiShared.Builders;

@@ -85,14 +86,13 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
    string modelFileName = _csiApplicationService.SapModel.GetModelFilename(false) ?? "Unnamed model";
    (string forceUnit, string tempUnit) = GetForceAndTemperatureUnits();

-    Collection rootObjectCollection =
-      new()
-      {
-        name = modelFileName,
-        ["units"] = _converterSettings.Current.SpeckleUnits,
-        ["forceUnits"] = forceUnit,
-        ["temperatureUnits"] = tempUnit
-      };
+    Collection rootObjectCollection = new()
+    {
+      name = modelFileName,
+      ["units"] = _converterSettings.Current.SpeckleUnits,
+      ["forceUnits"] = forceUnit,
+      ["temperatureUnits"] = tempUnit,
+    };

    List<SendConversionResult> results = new(csiObjects.Count);
    int count = 0;
@@ -179,7 +179,7 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
      CsiShellWrapper shellWrapper => shellWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
      CsiSolidWrapper solidWrapper => solidWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
      CsiLinkWrapper linkWrapper => linkWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
-      _ => throw new ArgumentException($"Unsupported wrapper type: {csiObject.GetType()}", nameof(csiObject))
+      _ => throw new ArgumentException($"Unsupported wrapper type: {csiObject.GetType()}", nameof(csiObject)),
    };

    try
@@ -43,6 +43,7 @@ public static class ServiceRegistration
    services.AddScoped<ISendFilter, CsiSharedSelectionFilter>();
    services.AddScoped<CsiSendCollectionManager>();
    services.AddScoped<IRootObjectBuilder<ICsiWrapper>, CsiRootObjectBuilder>();
+    services.AddScoped<IRootContinuousTraversalBuilder<ICsiWrapper>, CsiContinuousTraversalBuilder>();
    services.AddScoped<SendOperation<ICsiWrapper>>();

    services.AddScoped<CsiMaterialPropertyExtractor>();
@@ -29,6 +29,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\IApplicationSectionPropertyExtractor.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\ISectionPropertyExtractor.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\ISectionUnpacker.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\CsiContinuousTraversalBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\CsiRootObjectBuilder.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ToSpeckleSettingsManager.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\CsiPluginBase.cs" />
@@ -1,33 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <Platforms>AnyCPU</Platforms>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+    <ETABSVersion>21</ETABSVersion>
+    <DefineConstants>$(DefineConstants);ETABS21</DefineConstants>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <Configurations>Debug;Release;Local</Configurations>
+  </PropertyGroup>

-    <PropertyGroup>
-      <TargetFramework>net48</TargetFramework>
-      <Platforms>AnyCPU</Platforms>
-      <UseWindowsForms>true</UseWindowsForms>
-      <UseWPF>true</UseWPF>
-      <ETABSVersion>21</ETABSVersion>
-      <DefineConstants>$(DefineConstants);ETABS21</DefineConstants>
-      <EnableDynamicLoading>true</EnableDynamicLoading>
-      <Configurations>Debug;Release;Local</Configurations>
-    </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS21\Speckle.Converters.ETABS21.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+  </ItemGroup>

-    <ItemGroup>
-      <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS21\Speckle.Converters.ETABS21.csproj" />
-      <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-      <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+  <ItemGroup>
+    <PackageReference
+      Include="Speckle.CSI.API"
+      PrivateAssets="all"
+      IncludeAssets="compile; build"
+      VersionOverride="1.30.0"
+    />
+  </ItemGroup>

-    </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Plugin\SpeckleForm.cs" />
+  </ItemGroup>

-    <ItemGroup>
-      <PackageReference Include="Speckle.CSI.API" PrivateAssets="all" IncludeAssets="compile; build" VersionOverride="1.30.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Update="Plugin\SpeckleForm.cs" />
-    </ItemGroup>
-
-    <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />
-
-    <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
+  <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />

+  <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
 </Project>
@@ -1,32 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Platforms>AnyCPU</Platforms>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+    <ETABSVersion>22</ETABSVersion>
+    <DefineConstants>$(DefineConstants);ETABS22;ETABS22_OR_GREATER</DefineConstants>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <Configurations>Debug;Release;Local</Configurations>
+  </PropertyGroup>

-    <PropertyGroup>
-      <TargetFramework>net8.0-windows</TargetFramework>
-      <Platforms>AnyCPU</Platforms>
-      <UseWindowsForms>true</UseWindowsForms>
-      <UseWPF>true</UseWPF>
-      <ETABSVersion>22</ETABSVersion>
-      <DefineConstants>$(DefineConstants);ETABS22;ETABS22_OR_GREATER</DefineConstants>
-      <EnableDynamicLoading>true</EnableDynamicLoading>
-      <Configurations>Debug;Release;Local</Configurations>
-    </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS22\Speckle.Converters.ETABS22.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+  </ItemGroup>

-    <ItemGroup>
-      <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS22\Speckle.Converters.ETABS22.csproj" />
-      <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-      <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Speckle.CSI.API" PrivateAssets="all" IncludeAssets="compile; build" />
+  </ItemGroup>

-    <ItemGroup>
-      <PackageReference Include="Speckle.CSI.API" PrivateAssets="all" IncludeAssets="compile; build" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Plugin\SpeckleForm.cs" />
+  </ItemGroup>

-    <ItemGroup>
-      <Compile Update="Plugin\SpeckleForm.cs" />
-    </ItemGroup>
-
-    <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />
-
-    <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
+  <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />

+  <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
 </Project>
@@ -34,15 +34,14 @@ public class EtabsMaterialUnpacker : IMaterialUnpacker
      _etabsMaterialPropertyExtractor.ExtractProperties(name, properties);

      // create the material proxy
-      GroupProxy materialProxy =
-        new()
-        {
-          id = name,
-          name = name,
-          applicationId = name,
-          objects = sectionIds,
-          ["properties"] = properties
-        };
+      GroupProxy materialProxy = new()
+      {
+        id = name,
+        name = name,
+        applicationId = name,
+        objects = sectionIds,
+        ["properties"] = properties,
+      };

      yield return materialProxy;
    }
@@ -58,16 +58,15 @@ public class EtabsSectionUnpacker : ISectionUnpacker
      }

      // create section proxy
-      GroupProxy sectionProxy =
-        new()
-        {
-          id = sectionName,
-          name = sectionName,
-          applicationId = sectionName,
-          objects = frameIds,
-          ["type"] = "Frame Section",
-          ["properties"] = properties
-        };
+      GroupProxy sectionProxy = new()
+      {
+        id = sectionName,
+        name = sectionName,
+        applicationId = sectionName,
+        objects = frameIds,
+        ["type"] = "Frame Section",
+        ["properties"] = properties,
+      };

      yield return sectionProxy;
    }
@@ -92,16 +91,15 @@ public class EtabsSectionUnpacker : ISectionUnpacker
      }

      // create section proxy
-      GroupProxy sectionProxy =
-        new()
-        {
-          id = sectionName,
-          name = sectionName,
-          applicationId = sectionName,
-          objects = frameIds,
-          ["type"] = "Shell Section", // since sectionProxies are a flat list, need some way to distinguish from frame
-          ["properties"] = properties // openings will just have an empty dict here
-        };
+      GroupProxy sectionProxy = new()
+      {
+        id = sectionName,
+        name = sectionName,
+        applicationId = sectionName,
+        objects = frameIds,
+        ["type"] = "Shell Section", // since sectionProxies are a flat list, need some way to distinguish from frame
+        ["properties"] = properties, // openings will just have an empty dict here
+      };

      yield return sectionProxy;
    }
@@ -15,18 +15,17 @@ public class EtabsSendCollectionManager : CsiSendCollectionManager
 {
  private const string DEFAULT_LEVEL = "Unassigned";

-  private readonly Dictionary<ElementCategory, string> _categoryNames =
-    new()
-    {
-      { ElementCategory.COLUMN, "Columns" },
-      { ElementCategory.BEAM, "Beams" },
-      { ElementCategory.BRACE, "Braces" },
-      { ElementCategory.WALL, "Walls" },
-      { ElementCategory.FLOOR, "Floors" },
-      { ElementCategory.RAMP, "Ramps" },
-      { ElementCategory.JOINT, "Joints" },
-      { ElementCategory.OTHER, "Other" }
-    };
+  private readonly Dictionary<ElementCategory, string> _categoryNames = new()
+  {
+    { ElementCategory.COLUMN, "Columns" },
+    { ElementCategory.BEAM, "Beams" },
+    { ElementCategory.BRACE, "Braces" },
+    { ElementCategory.WALL, "Walls" },
+    { ElementCategory.FLOOR, "Floors" },
+    { ElementCategory.RAMP, "Ramps" },
+    { ElementCategory.JOINT, "Joints" },
+    { ElementCategory.OTHER, "Other" },
+  };

  public EtabsSendCollectionManager(IConverterSettingsStore<CsiConversionSettings> converterSettings)
    : base(converterSettings) { }
@@ -108,7 +107,7 @@ public class EtabsSendCollectionManager : CsiSendCollectionManager
      ("Wall", nameof(ModelObjectType.SHELL)) => ElementCategory.WALL,
      ("Floor", nameof(ModelObjectType.SHELL)) => ElementCategory.FLOOR,
      ("Ramp", nameof(ModelObjectType.SHELL)) => ElementCategory.RAMP,
-      _ => ElementCategory.OTHER
+      _ => ElementCategory.OTHER,
    };
  }

@@ -53,7 +53,7 @@ public class EtabsFrameSectionPropertyExtractor : IApplicationFrameSectionProper
      "FileName",
      "FromFile",
      "SectInFile",
-      "NotAutoFact"
+      "NotAutoFact",
    };

    // get the section type / shape using the dedicated api query (exception to the database approach)
@@ -9,26 +9,24 @@ public class EtabsMaterialPropertyExtractor : IApplicationMaterialPropertyExtrac
 {
  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;

-  private readonly Dictionary<int, string?> _ssTypeDict =
-    new()
-    {
-      { 0, "User defined" },
-      { 1, "Parametric - Simple" },
-      { 2, "Parametric - Mander" }
-    };
+  private readonly Dictionary<int, string?> _ssTypeDict = new()
+  {
+    { 0, "User defined" },
+    { 1, "Parametric - Simple" },
+    { 2, "Parametric - Mander" },
+  };

-  private readonly Dictionary<int, string?> _ssHysTypeDict =
-    new()
-    {
-      { 0, "Elastic" },
-      { 1, "Kinematic" },
-      { 2, "Takeda" },
-      { 3, "Pivot" },
-      { 4, "Concrete" },
-      { 5, "BRB Hardening" },
-      { 6, "Degrading" },
-      { 7, "Isotropic" }
-    };
+  private readonly Dictionary<int, string?> _ssHysTypeDict = new()
+  {
+    { 0, "Elastic" },
+    { 1, "Kinematic" },
+    { 2, "Takeda" },
+    { 3, "Pivot" },
+    { 4, "Concrete" },
+    { 5, "BRB Hardening" },
+    { 6, "Degrading" },
+    { 7, "Isotropic" },
+  };

  private const int TEMP = 0;

@@ -69,7 +69,7 @@ public class EtabsSectionPropertyDefinitionService
    {
      "Frame Section Property Definitions - Summary",
      "Frame Section Property Definitions - Concrete Beam Reinforcing",
-      "Frame Section Property Definitions - Concrete Column Reinforcing"
+      "Frame Section Property Definitions - Concrete Column Reinforcing",
    };

    return availableTableKeys.Where(key =>
@@ -12,16 +12,19 @@
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>

-  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+  <Import
+    Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems"
+    Label="Shared"
+  />

  <ItemGroup>
-    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2020.0.0" ExcludeAssets="runtime"/>
+    <Reference Include="WindowsFormsIntegration" />
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2020.0.0" ExcludeAssets="runtime" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2020\Speckle.Converters.Navisworks2020.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
  </ItemGroup>
 </Project>
@@ -12,16 +12,19 @@
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>

-  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+  <Import
+    Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems"
+    Label="Shared"
+  />

  <ItemGroup>
-    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2021.0.0" ExcludeAssets="runtime"/>
+    <Reference Include="WindowsFormsIntegration" />
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2021.0.0" ExcludeAssets="runtime" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2021\Speckle.Converters.Navisworks2021.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
  </ItemGroup>
 </Project>
@@ -12,16 +12,19 @@
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>

-  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+  <Import
+    Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems"
+    Label="Shared"
+  />

  <ItemGroup>
-    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2022.0.0" ExcludeAssets="runtime"/>
+    <Reference Include="WindowsFormsIntegration" />
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2022.0.0" ExcludeAssets="runtime" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2022\Speckle.Converters.Navisworks2022.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
  </ItemGroup>
 </Project>
@@ -12,16 +12,19 @@
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>

-  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+  <Import
+    Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems"
+    Label="Shared"
+  />

  <ItemGroup>
-    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
+    <Reference Include="WindowsFormsIntegration" />
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2023.0.0" ExcludeAssets="runtime" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2023\Speckle.Converters.Navisworks2023.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
  </ItemGroup>
 </Project>
@@ -11,17 +11,20 @@
    <DefineConstants>$(DefineConstants);TRACE;NAVIS2024;NAVIS</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>
-  
-  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+
+  <Import
+    Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems"
+    Label="Shared"
+  />

  <ItemGroup>
-    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
+    <Reference Include="WindowsFormsIntegration" />
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2024.0.0" ExcludeAssets="runtime" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2024\Speckle.Converters.Navisworks2024.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
  </ItemGroup>
 </Project>
@@ -12,17 +12,20 @@
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>

-  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+  <Import
+    Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems"
+    Label="Shared"
+  />

  <ItemGroup>
-    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+    <Reference Include="WindowsFormsIntegration" />
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2025.0.0" ExcludeAssets="runtime" />
    <PackageReference Include="Microsoft.Web.WebView2" VersionOverride="1.0.2045.28" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2025\Speckle.Converters.Navisworks2025.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
  </ItemGroup>
 </Project>
@@ -12,18 +12,21 @@
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>

-  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+  <Import
+    Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems"
+    Label="Shared"
+  />

  <ItemGroup>
-    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2026.0.1" ExcludeAssets="runtime"/>
+    <Reference Include="WindowsFormsIntegration" />
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2026.0.1" ExcludeAssets="runtime" />
    <PackageReference Include="Microsoft.Web.WebView2" VersionOverride="1.0.2365.46" />
    <PackageReference Include="System.Reactive" VersionOverride="6.0.0" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2026\Speckle.Converters.Navisworks2026.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
  </ItemGroup>
 </Project>
@@ -5,7 +5,6 @@ using Speckle.Connector.Navisworks.Operations.Send.Filters;
 using Speckle.Connector.Navisworks.Operations.Send.Settings;
 using Speckle.Connector.Navisworks.Services;
 using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
@@ -18,6 +17,7 @@ using Speckle.Converter.Navisworks.Services;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.Converters.Common;
 using Speckle.Sdk.Common;
+using Speckle.Sdk.Pipelines.Progress;

 namespace Speckle.Connector.Navisworks.Bindings;

@@ -66,7 +66,7 @@ public class NavisworksSendBinding : ISendBinding
    [
      new NavisworksSelectionFilter() { IsDefault = true },
      new NavisworksSavedSetsFilter(new ConnectorElementSelectionService()),
-      new NavisworksSavedViewsFilter(new ConnectorElementSelectionService())
+      new NavisworksSavedViewsFilter(new ConnectorElementSelectionService()),
    ];

  public List<ICardSetting> GetSendSettings() =>
@@ -76,7 +76,7 @@ public class NavisworksSendBinding : ISendBinding
      new IncludeInternalPropertiesSetting(false),
      new ConvertHiddenElementsSetting(false),
      new PreserveModelHierarchySetting(false),
-      new RevitCategoryMappingSetting(false)
+      new RevitCategoryMappingSetting(false),
    ];

  public async Task Send(string modelCardId) =>
@@ -57,6 +57,7 @@ public static class NavisworksConnectorServiceRegistration

    // Sending operations
    serviceCollection.AddScoped<IRootObjectBuilder<NAV.ModelItem>, NavisworksRootObjectBuilder>();
+    serviceCollection.AddScoped<IRootContinuousTraversalBuilder<NAV.ModelItem>, NavisworksContinuousTraversalBuilder>();
    serviceCollection.AddScoped<SendOperation<NAV.ModelItem>>();
    serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
    serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
@@ -105,7 +105,7 @@ public class NavisworksColorUnpacker(
            value = ColorConverter.NavisworksColorToColor(representationColor).ToArgb(),
            name = colorName,
            applicationId = colorId.ToString(),
-            objects = [finalId]
+            objects = [finalId],
          };
        }
      }
@@ -75,12 +75,11 @@ public sealed class NavisworksDocumentEvents
  {
    _finalModelCount = ((NAV.Document)sender).Models.Count;

-    _topLevelExceptionHandler.CatchUnhandled(
-      () =>
-        _idleManager.SubscribeToIdle(
-          nameof(ProcessModelStateChangeAsync),
-          async () => await ProcessModelStateChangeAsync()
-        )
+    _topLevelExceptionHandler.CatchUnhandled(() =>
+      _idleManager.SubscribeToIdle(
+        nameof(ProcessModelStateChangeAsync),
+        async () => await ProcessModelStateChangeAsync()
+      )
    );
  }

@@ -50,8 +50,8 @@ public sealed class NavisworksDocumentModelStore : DocumentModelStore
    }
    catch (NAV.Data.DatabaseException ex)
    {
-      _topLevelExceptionHandler.CatchUnhandled(
-        () => throw new InvalidOperationException("Failed to write Speckle state to database", ex)
+      _topLevelExceptionHandler.CatchUnhandled(() =>
+        throw new InvalidOperationException("Failed to write Speckle state to database", ex)
      );
    }
  }
@@ -78,8 +78,8 @@ public sealed class NavisworksDocumentModelStore : DocumentModelStore
    catch (NAV.Data.DatabaseException ex)
    {
      ClearAndSaveThisState(); // Clear models on failure to avoid stale data
-      _topLevelExceptionHandler.CatchUnhandled(
-        () => throw new InvalidOperationException("Failed to read Speckle state from database", ex)
+      _topLevelExceptionHandler.CatchUnhandled(() =>
+        throw new InvalidOperationException("Failed to read Speckle state from database", ex)
      );
    }
  }
@@ -131,7 +131,7 @@ public class NavisworksMaterialUnpacker(
          renderMaterialProxies[renderMaterialId.ToString()] = new RenderMaterialProxy()
          {
            value = CreateRenderMaterial(materialName, renderTransparency, renderColor, renderMaterialId),
-            objects = [finalId]
+            objects = [finalId],
          };
        }
      }
@@ -161,7 +161,7 @@ public class NavisworksMaterialUnpacker(
      roughness = 1,
      diffuse = color.ToArgb(),
      emissive = 0,
-      applicationId = applicationId.ToString()
+      applicationId = applicationId.ToString(),
    };

    return speckleRenderMaterial;
@@ -0,0 +1,400 @@
+using Microsoft.Extensions.Logging;
+using Speckle.Connector.Navisworks.HostApp;
+using Speckle.Connectors.Common.Builders;
+using Speckle.Connectors.Common.Conversion;
+using Speckle.Converter.Navisworks.Helpers;
+using Speckle.Converter.Navisworks.Services;
+using Speckle.Converter.Navisworks.Settings;
+using Speckle.Converters.Common;
+using Speckle.Objects.Data;
+using Speckle.Sdk;
+using Speckle.Sdk.Logging;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Pipelines.Progress;
+using Speckle.Sdk.Pipelines.Send;
+using static Speckle.Connector.Navisworks.Operations.Send.GeometryNodeMerger;
+using static Speckle.Connectors.Common.Operations.ProxyKeys;
+using static Speckle.Converter.Navisworks.Constants.InstanceConstants;
+
+namespace Speckle.Connector.Navisworks.Operations.Send;
+
+/// <summary>
+/// Continuous traversal builder for Navisworks that streams objects through a <see cref="SendPipeline"/>
+/// for packfile-based uploads. Same conversion/grouping logic as <see cref="NavisworksRootObjectBuilder"/>,
+/// but processes final elements through the pipeline after all post-processing is complete.
+/// </summary>
+public class NavisworksContinuousTraversalBuilder(
+  IRootToSpeckleConverter rootToSpeckleConverter,
+  IConverterSettingsStore<NavisworksConversionSettings> converterSettings,
+  ILogger<NavisworksContinuousTraversalBuilder> logger,
+  ISdkActivityFactory activityFactory,
+  NavisworksMaterialUnpacker materialUnpacker,
+  NavisworksColorUnpacker colorUnpacker,
+  Speckle.Converter.Navisworks.Constants.Registers.IInstanceFragmentRegistry instanceRegistry,
+  IElementSelectionService elementSelectionService,
+  IUiUnitsCache uiUnitsCache
+) : IRootContinuousTraversalBuilder<NAV.ModelItem>
+{
+  private bool SkipNodeMerging { get; set; }
+  private bool DisableGroupingForInstanceTesting { get; set; }
+
+  public async Task<RootObjectBuilderResult> Build(
+    IReadOnlyList<NAV.ModelItem> navisworksModelItems,
+    string projectId,
+    SendPipeline sendPipeline,
+    IProgress<CardProgress> onOperationProgressed,
+    CancellationToken cancellationToken
+  )
+  {
+#if DEBUG
+    SkipNodeMerging = false;
+    DisableGroupingForInstanceTesting = false;
+#endif
+    using var activity = activityFactory.Start("Build");
+
+    ValidateInputs(navisworksModelItems, projectId, onOperationProgressed);
+
+    var rootCollection = InitializeRootCollection();
+    (Dictionary<string, Base?> convertedElements, List<SendConversionResult> conversionResults) =
+      await ConvertModelItemsAsync(navisworksModelItems, onOperationProgressed, cancellationToken);
+
+    ValidateConversionResults(conversionResults);
+
+    var groupedNodes = SkipNodeMerging ? [] : GroupSiblingGeometryNodes(navisworksModelItems);
+    var finalElements = BuildFinalElements(convertedElements, groupedNodes);
+
+    await AddProxiesToCollection(rootCollection, navisworksModelItems, groupedNodes);
+
+    AddInstanceDefinitionsToCollection(rootCollection, ref finalElements);
+
+    // Process each final element through the send pipeline
+    var processedElements = new List<Base>(finalElements.Count);
+    foreach (var element in finalElements)
+    {
+      cancellationToken.ThrowIfCancellationRequested();
+      // NOTE: this is the main part that differentiate from the main root object builder
+      var reference = await sendPipeline.Process(element).ConfigureAwait(false);
+      processedElements.Add(reference);
+    }
+
+    rootCollection.elements = processedElements;
+
+    // Process the root collection and wait for all uploads to complete
+    await sendPipeline.Process(rootCollection);
+    await sendPipeline.WaitForUpload();
+
+    return new RootObjectBuilderResult(rootCollection, conversionResults);
+  }
+
+  private static void ValidateInputs(
+    IReadOnlyList<NAV.ModelItem> navisworksModelItems,
+    string projectId,
+    IProgress<CardProgress> onOperationProgressed
+  )
+  {
+    if (!navisworksModelItems.Any())
+    {
+      throw new SpeckleException("No objects to convert");
+    }
+
+    if (navisworksModelItems == null)
+    {
+      throw new ArgumentNullException(nameof(navisworksModelItems));
+    }
+
+    if (onOperationProgressed == null || projectId == null)
+    {
+      throw new ArgumentNullException(
+        onOperationProgressed == null ? nameof(onOperationProgressed) : nameof(projectId)
+      );
+    }
+  }
+
+  private Collection InitializeRootCollection() =>
+    new()
+    {
+      name = NavisworksApp.ActiveDocument.Title ?? "Unnamed model",
+      ["units"] = converterSettings.Current.Derived.SpeckleUnits,
+    };
+
+  private Task<(Dictionary<string, Base?> converted, List<SendConversionResult> results)> ConvertModelItemsAsync(
+    IReadOnlyList<NAV.ModelItem> navisworksModelItems,
+    IProgress<CardProgress> onOperationProgressed,
+    CancellationToken cancellationToken
+  )
+  {
+    var results = new List<SendConversionResult>(navisworksModelItems.Count);
+    var convertedBases = new Dictionary<string, Base?>();
+    int processedCount = 0;
+    int totalCount = navisworksModelItems.Count;
+
+    foreach (var item in navisworksModelItems)
+    {
+      cancellationToken.ThrowIfCancellationRequested();
+      var converted = ConvertNavisworksItem(item, convertedBases);
+      results.Add(converted);
+
+      processedCount++;
+      onOperationProgressed.Report(new CardProgress("Converting", (double)processedCount / totalCount));
+    }
+
+    return Task.FromResult((convertedBases, results));
+  }
+
+  private static void ValidateConversionResults(List<SendConversionResult> results)
+  {
+    if (results.All(x => x.Status == Status.ERROR))
+    {
+      throw new SpeckleException("Failed to convert all objects.");
+    }
+  }
+
+  private List<Base> BuildFinalElements(
+    Dictionary<string, Base?> convertedBases,
+    Dictionary<string, List<NAV.ModelItem>> groupedNodes
+  )
+  {
+    var finalElements = new List<Base>();
+    var processedPaths = new HashSet<string>();
+
+    if (!DisableGroupingForInstanceTesting)
+    {
+      AddGroupedElements(finalElements, convertedBases, groupedNodes, processedPaths);
+      logger.LogInformation(
+        "After grouping: {grouped} paths processed, {elements} elements in collection",
+        processedPaths.Count,
+        finalElements.Count
+      );
+    }
+    else
+    {
+      logger.LogInformation("Grouping disabled for instance testing");
+    }
+
+    if (converterSettings.Current.User.PreserveModelHierarchy)
+    {
+      logger.LogInformation("Building hierarchy (PreserveModelHierarchy=true)");
+      var hierarchyBuilder = new NavisworksHierarchyBuilder(
+        convertedBases,
+        rootToSpeckleConverter,
+        elementSelectionService
+      );
+
+      return hierarchyBuilder.BuildHierarchy();
+    }
+
+    logger.LogInformation("Adding remaining elements (flat mode)");
+    AddRemainingElements(finalElements, convertedBases, processedPaths);
+
+    logger.LogInformation("Final elements count: {count}", finalElements.Count);
+    return finalElements;
+  }
+
+  private void AddGroupedElements(
+    List<Base> finalElements,
+    Dictionary<string, Base?> convertedBases,
+    Dictionary<string, List<NAV.ModelItem>> groupedNodes,
+    HashSet<string> processedPaths
+  )
+  {
+    foreach (var group in groupedNodes)
+    {
+      var siblingBases = new List<Base>(group.Value.Count);
+      foreach (var itemPath in group.Value.Select(elementSelectionService.GetModelItemPath))
+      {
+        processedPaths.Add(itemPath);
+        if (convertedBases.TryGetValue(itemPath, out var convertedBase) && convertedBase != null)
+        {
+          siblingBases.Add(convertedBase);
+        }
+      }
+
+      if (siblingBases.Count > 0)
+      {
+        finalElements.Add(CreateNavisworksObject(group.Key, siblingBases));
+      }
+    }
+  }
+
+  private void AddRemainingElements(
+    List<Base> finalElements,
+    Dictionary<string, Base?> convertedBases,
+    HashSet<string> processedPaths
+  )
+  {
+    foreach (var kvp in convertedBases.Where(kvp => !processedPaths.Contains(kvp.Key)))
+    {
+      switch (kvp.Value)
+      {
+        case null:
+          continue;
+        case Collection collection:
+          finalElements.Add(collection);
+          break;
+        default:
+          if (CreateNavisworksObject(kvp.Value) is { } navisworksObject)
+          {
+            finalElements.Add(navisworksObject);
+          }
+
+          break;
+      }
+    }
+  }
+
+  private (string name, string path) GetElementNameAndPath(string applicationId)
+  {
+    var modelItem = elementSelectionService.GetModelItemFromPath(applicationId);
+    var context = HierarchyHelper.ExtractContext(modelItem);
+    return (context.Name, context.Path);
+  }
+
+  private NavisworksObject CreateNavisworksObject(string groupKey, List<Base> siblingBases)
+  {
+    string cleanParentPath = ElementSelectionHelper.GetCleanPath(groupKey);
+    (string name, string path) = GetElementNameAndPath(cleanParentPath);
+
+    int estimatedCapacity = siblingBases.Sum(b => (b["displayValue"] as List<Base>)?.Count ?? 0);
+    var displayValues = new List<Base>(estimatedCapacity);
+    displayValues.AddRange(
+      siblingBases
+        .Where(sibling => sibling["displayValue"] is List<Base>)
+        .SelectMany(sibling => (List<Base>)sibling["displayValue"]!)
+    );
+
+    return new NavisworksObject
+    {
+      name = name,
+      displayValue = displayValues,
+      properties = siblingBases.First()["properties"] as Dictionary<string, object?> ?? [],
+      units = converterSettings.Current.Derived.SpeckleUnits,
+      applicationId = groupKey,
+      ["path"] = path,
+    };
+  }
+
+  private NavisworksObject? CreateNavisworksObject(Base convertedBase)
+  {
+    if (convertedBase.applicationId == null)
+    {
+      return null;
+    }
+
+    (string name, string path) = GetElementNameAndPath(convertedBase.applicationId);
+
+    var units = uiUnitsCache.Ensure();
+
+    return new NavisworksObject
+    {
+      name = name,
+      displayValue = convertedBase["displayValue"] as List<Base> ?? [],
+      properties = convertedBase["properties"] as Dictionary<string, object?> ?? [],
+      units = units.ToString(),
+      applicationId = convertedBase.applicationId,
+      ["path"] = path,
+    };
+  }
+
+  private Task AddProxiesToCollection(
+    Collection rootCollection,
+    IReadOnlyList<NAV.ModelItem> navisworksModelItems,
+    Dictionary<string, List<NAV.ModelItem>> groupedNodes
+  )
+  {
+    using var _ = activityFactory.Start("UnpackProxies");
+
+    var renderMaterials = materialUnpacker.UnpackRenderMaterial(navisworksModelItems, groupedNodes);
+    if (renderMaterials.Count > 0)
+    {
+      rootCollection[RENDER_MATERIAL] = renderMaterials;
+    }
+
+    var colors = colorUnpacker.UnpackColor(navisworksModelItems, groupedNodes);
+    if (colors.Count > 0)
+    {
+      rootCollection[COLOR] = colors;
+    }
+
+    return Task.CompletedTask;
+  }
+
+  private void AddInstanceDefinitionsToCollection(Collection rootCollection, ref List<Base> finalElements)
+  {
+    using var _ = activityFactory.Start("BuildInstanceDefinitions");
+
+    var allDefinitions = instanceRegistry.GetAllDefinitionGeometries();
+
+    if (allDefinitions.Count == 0)
+    {
+      logger.LogInformation("No instance definitions found - instancing may be disabled");
+      return;
+    }
+
+    logger.LogInformation("Building instance structure for {count} definition groups", allDefinitions.Count);
+
+    var instanceDefinitionProxies = new List<InstanceDefinitionProxy>(allDefinitions.Count);
+
+    int estimatedGeometryCount = allDefinitions.Sum(kvp => kvp.Value.Count);
+    var allDefinitionGeometries = new List<Base>(estimatedGeometryCount);
+
+    foreach (var kvp in allDefinitions)
+    {
+      var groupKey = kvp.Key;
+      var geometries = kvp.Value;
+      var groupKeyPath = groupKey.ToPathString();
+
+      var defProxy = new InstanceDefinitionProxy
+      {
+        name = $"Shared Geometry {groupKeyPath}",
+        objects = geometries.Select(g => g.applicationId ?? "").Where(id => !string.IsNullOrEmpty(id)).ToList(),
+        applicationId = $"{DEFINITION_ID_PREFIX}{groupKeyPath}",
+        maxDepth = 0,
+      };
+
+      instanceDefinitionProxies.Add(defProxy);
+      allDefinitionGeometries.AddRange(geometries);
+    }
+
+    rootCollection[INSTANCE_DEFINITION] = instanceDefinitionProxies;
+    var geometryDefinitionsCollection = new Collection
+    {
+      name = "Geometry Definitions",
+      elements = allDefinitionGeometries,
+    };
+
+    var objectCollection = new Collection { name = "", elements = finalElements };
+
+    finalElements = [geometryDefinitionsCollection, objectCollection];
+
+    logger.LogInformation(
+      "Added {proxyCount} instance definition proxies and {geomCount} definition geometries",
+      instanceDefinitionProxies.Count,
+      allDefinitionGeometries.Count
+    );
+  }
+
+  private SendConversionResult ConvertNavisworksItem(
+    NAV.ModelItem navisworksItem,
+    Dictionary<string, Base?> convertedBases
+  )
+  {
+    string applicationId = elementSelectionService.GetModelItemPath(navisworksItem);
+    string sourceType = navisworksItem.GetType().Name;
+
+    try
+    {
+      Base converted = rootToSpeckleConverter.Convert(navisworksItem);
+
+      convertedBases[applicationId] = converted;
+
+      return new SendConversionResult(Status.SUCCESS, applicationId, sourceType, converted);
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      logger.LogError(ex, "Failed to convert model item {id}", applicationId);
+      return new SendConversionResult(Status.ERROR, applicationId, "ModelItem", null, ex);
+    }
+  }
+}
@@ -3,7 +3,6 @@ using Speckle.Connector.Navisworks.HostApp;
 using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Converter.Navisworks.Helpers;
 using Speckle.Converter.Navisworks.Services;
 using Speckle.Converter.Navisworks.Settings;
@@ -14,6 +13,7 @@ using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Pipelines.Progress;
 using static Speckle.Connector.Navisworks.Operations.Send.GeometryNodeMerger;
 using static Speckle.Connectors.Common.Operations.ProxyKeys;
 using static Speckle.Converter.Navisworks.Constants.InstanceConstants;
@@ -103,7 +103,7 @@ public class NavisworksRootObjectBuilder(
    new()
    {
      name = NavisworksApp.ActiveDocument.Title ?? "Unnamed model",
-      ["units"] = converterSettings.Current.Derived.SpeckleUnits
+      ["units"] = converterSettings.Current.Derived.SpeckleUnits,
    };

  private Task<(Dictionary<string, Base?> converted, List<SendConversionResult> results)> ConvertModelItemsAsync(
@@ -285,7 +285,7 @@ public class NavisworksRootObjectBuilder(
      properties = siblingBases.First()["properties"] as Dictionary<string, object?> ?? [],
      units = converterSettings.Current.Derived.SpeckleUnits,
      applicationId = groupKey,
-      ["path"] = path
+      ["path"] = path,
    };
  }

@@ -307,7 +307,7 @@ public class NavisworksRootObjectBuilder(
      properties = convertedBase["properties"] as Dictionary<string, object?> ?? [],
      units = units.ToString(),
      applicationId = convertedBase.applicationId,
-      ["path"] = path
+      ["path"] = path,
    };
  }

@@ -373,7 +373,7 @@ public class NavisworksRootObjectBuilder(
        name = $"Shared Geometry {groupKeyPath}",
        objects = geometries.Select(g => g.applicationId ?? "").Where(id => !string.IsNullOrEmpty(id)).ToList(),
        applicationId = $"{DEFINITION_ID_PREFIX}{groupKeyPath}",
-        maxDepth = 0
+        maxDepth = 0,
      };

      instanceDefinitionProxies.Add(defProxy);
@@ -384,7 +384,7 @@ public class NavisworksRootObjectBuilder(
    var geometryDefinitionsCollection = new Collection
    {
      name = "Geometry Definitions",
-      elements = allDefinitionGeometries
+      elements = allDefinitionGeometries,
    };

    var objectCollection = new Collection { name = "", elements = finalElements };
@@ -1,17 +1,17 @@
-<Page x:Class="Speckle.Connectors.Navisworks.BrowserPane"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:cefSharp="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
-      xmlns:local="clr-namespace:Speckle.Connectors.DUI;assembly=Speckle.Connectors.DUI"
-
-      mc:Ignorable="d"
-      Title="Panel" Height="450" Width="800">
+<Page
+  x:Class="Speckle.Connectors.Navisworks.BrowserPane"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:cefSharp="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
+  xmlns:local="clr-namespace:Speckle.Connectors.DUI;assembly=Speckle.Connectors.DUI"
+  mc:Ignorable="d"
+  Title="Panel"
+  Height="450"
+  Width="800"
+>
  <Grid>
-    <cefSharp:ChromiumWebBrowser
-      Name="Browser"
-      Grid.Row="0"
-      Address="{x:Static local:Url.NetlifyString}" />
+    <cefSharp:ChromiumWebBrowser Name="Browser" Grid.Row="0" Address="{x:Static local:Url.NetlifyString}" />
  </Grid>
 </Page>
@@ -5,7 +5,8 @@
  xmlns="clr-namespace:Autodesk.Windows;assembly=AdWindows"
  xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:gui="clr-namespace:Autodesk.Navisworks.Gui.Roamer.AIRLook;assembly=navisworks.gui.roamer">
+  xmlns:gui="clr-namespace:Autodesk.Navisworks.Gui.Roamer.AIRLook;assembly=navisworks.gui.roamer"
+>
  <RibbonTab Id="Speckle" KeyTip="SP">
    <RibbonPanel x:Uid="Panel_Speckle">
      <RibbonPanelSource Id="SpeckleV3Source" x:Uid="PanelSource_Speckle_V3" Title="Speckle">
@@ -15,14 +16,16 @@
          Size="Large"
          KeyTip="3"
          ShowText="True"
-          Orientation="Vertical" />
+          Orientation="Vertical"
+        />
        <gui:NWRibbonButton
          x:Uid="Button_Speckle_V2"
          Id="Speckle_Launch_V2"
          Size="Large"
          KeyTip="2"
          ShowText="True"
-          Orientation="Vertical" />
+          Orientation="Vertical"
+        />
      </RibbonPanelSource>
    </RibbonPanel>
  </RibbonTab>
@@ -1,49 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>

-<ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Navisworks" Name="Speckle for Navisworks"
-                    Description="Welcome to Multiplayer BIM." AppVersion="0.1.0" FriendlyVersion="0.1.0">
-    <CompanyDetails Name="Speckle"/>
-    <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw23" SeriesMax="Nw23"/>
-        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2026/Speckle.Connectors.Navisworks2026.dll"
-                        AppDescription="Speckle.Connector.Navisworks2026"/>
-    </Components>
-    <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw22" SeriesMax="Nw22"/>
-        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2025/Speckle.Connectors.Navisworks2025.dll"
-                        AppDescription="Speckle.Connector.Navisworks2025"/>
-    </Components>
-    <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw21" SeriesMax="Nw21"/>
-        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2024/Speckle.Connectors.Navisworks2024.dll"
-                        AppDescription="Speckle.Connector.Navisworks2024"/>
-    </Components>
-    <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw20" SeriesMax="Nw20"/>
-        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2023/Speckle.Connectors.Navisworks2023.dll"
-                        AppDescription="Speckle.Connector.Navisworks2023"/>
-    </Components>
-    <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw19" SeriesMax="Nw19"/>
-        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2022/Speckle.Connectors.Navisworks2022.dll"
-                        AppDescription="Speckle.Connector.Navisworks2022"/>
-    </Components>
-    <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw18" SeriesMax="Nw18"/>
-        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2021/Speckle.Connectors.Navisworks2021.dll"
-                        AppDescription="Speckle.Connector.Navisworks2021"/>
-    </Components>
-    <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw17" SeriesMax="Nw17"/>
-        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2020/Speckle.Connectors.Navisworks2020.dll"
-                        AppDescription="Speckle.Connector.Navisworks2020"/>
-    </Components>
-
+<ApplicationPackage
+  SchemaVersion="1.0"
+  AutodeskProduct="Navisworks"
+  Name="Speckle for Navisworks"
+  Description="Welcome to Multiplayer BIM."
+  AppVersion="0.1.0"
+  FriendlyVersion="0.1.0"
+>
+  <CompanyDetails Name="Speckle" />
+  <Components>
+    <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw23" SeriesMax="Nw23" />
+    <ComponentEntry
+      AppName="SpeckleNavisworks"
+      AppType="ManagedPlugin"
+      Version="0.1.0"
+      ModuleName="./Contents/2026/Speckle.Connectors.Navisworks2026.dll"
+      AppDescription="Speckle.Connector.Navisworks2026"
+    />
+  </Components>
+  <Components>
+    <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw22" SeriesMax="Nw22" />
+    <ComponentEntry
+      AppName="SpeckleNavisworks"
+      AppType="ManagedPlugin"
+      Version="0.1.0"
+      ModuleName="./Contents/2025/Speckle.Connectors.Navisworks2025.dll"
+      AppDescription="Speckle.Connector.Navisworks2025"
+    />
+  </Components>
+  <Components>
+    <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw21" SeriesMax="Nw21" />
+    <ComponentEntry
+      AppName="SpeckleNavisworks"
+      AppType="ManagedPlugin"
+      Version="0.1.0"
+      ModuleName="./Contents/2024/Speckle.Connectors.Navisworks2024.dll"
+      AppDescription="Speckle.Connector.Navisworks2024"
+    />
+  </Components>
+  <Components>
+    <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw20" SeriesMax="Nw20" />
+    <ComponentEntry
+      AppName="SpeckleNavisworks"
+      AppType="ManagedPlugin"
+      Version="0.1.0"
+      ModuleName="./Contents/2023/Speckle.Connectors.Navisworks2023.dll"
+      AppDescription="Speckle.Connector.Navisworks2023"
+    />
+  </Components>
+  <Components>
+    <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw19" SeriesMax="Nw19" />
+    <ComponentEntry
+      AppName="SpeckleNavisworks"
+      AppType="ManagedPlugin"
+      Version="0.1.0"
+      ModuleName="./Contents/2022/Speckle.Connectors.Navisworks2022.dll"
+      AppDescription="Speckle.Connector.Navisworks2022"
+    />
+  </Components>
+  <Components>
+    <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw18" SeriesMax="Nw18" />
+    <ComponentEntry
+      AppName="SpeckleNavisworks"
+      AppType="ManagedPlugin"
+      Version="0.1.0"
+      ModuleName="./Contents/2021/Speckle.Connectors.Navisworks2021.dll"
+      AppDescription="Speckle.Connector.Navisworks2021"
+    />
+  </Components>
+  <Components>
+    <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw17" SeriesMax="Nw17" />
+    <ComponentEntry
+      AppName="SpeckleNavisworks"
+      AppType="ManagedPlugin"
+      Version="0.1.0"
+      ModuleName="./Contents/2020/Speckle.Connectors.Navisworks2020.dll"
+      AppDescription="Speckle.Connector.Navisworks2020"
+    />
+  </Components>
 </ApplicationPackage>
@@ -24,6 +24,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Filters\SavedItemHelpers.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\GeometryNodeMerger.cs"/>
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\NavisworksHierarchyBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\NavisworksContinuousTraversalBuilder.cs"/>
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\NavisworksRootObjectBuilder.cs"/>
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ConvertHiddenElementsSetting.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\IncludeInternalPropertiesSetting.cs"/>
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <TargetFrameworks>net48;net8.0</TargetFrameworks>
    <Configurations>Debug;Release;Local</Configurations>
@@ -15,16 +14,16 @@
  The revit projects will resolve their correct ones
  -->
  <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
-    <PackageReference Include="Speckle.Revit.API" VersionOverride="2022.0.2.1" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Revit.API" VersionOverride="2022.0.2.1" ExcludeAssets="runtime" />
  </ItemGroup>
  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Speckle.Revit.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Revit.API" VersionOverride="2025.0.0" ExcludeAssets="runtime" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="ILRepack.FullAuto">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Revit.Async" PrivateAssets="all"/>
+    <PackageReference Include="Revit.Async" PrivateAssets="all" />
  </ItemGroup>
 </Project>
@@ -15,7 +15,6 @@
    <Prefer32bit>false</Prefer32bit>
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
  </PropertyGroup>
-  

  <Import Project="..\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems" Label="Shared" />

@@ -2,7 +2,7 @@
  <PropertyGroup>
    <TargetFramework>net48</TargetFramework>
    <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>    
+    <UseWpf>true</UseWpf>
    <RevitVersion>2023</RevitVersion>
    <DefineConstants>$(DefineConstants);REVIT2023;REVIT2022_OR_GREATER;REVIT2023_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
@@ -11,7 +11,7 @@
  <Import Project="..\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems" Label="Shared" />

  <Import Project="..\Speckle.Connectors.RevitShared.Cef\Speckle.Connectors.RevitShared.Cef.projitems" Label="Shared" />
-  
+
  <ItemGroup>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
@@ -11,7 +11,7 @@
  <Import Project="..\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems" Label="Shared" />

  <Import Project="..\Speckle.Connectors.RevitShared.Cef\Speckle.Connectors.RevitShared.Cef.projitems" Label="Shared" />
-  
+
  <ItemGroup>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net8.0-windows</TargetFramework>
-    <PlatformTarget>x64</PlatformTarget>    
+    <PlatformTarget>x64</PlatformTarget>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <UseWpf>true</UseWpf>
    <RevitVersion>2025</RevitVersion>
@@ -23,7 +23,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="CefSharp.Wpf.NETCore" NoWarn="NU1903" IncludeAssets="compile" VersionOverride="119.4.30.0" />
+    <PackageReference
+      Include="CefSharp.Wpf.NETCore"
+      NoWarn="NU1903"
+      IncludeAssets="compile"
+      VersionOverride="119.4.30.0"
+    />
  </ItemGroup>

  <ItemGroup>
@@ -1,17 +1,22 @@
-<UserControl x:Class="Speckle.Connectors.Revit2026.Plugin.RevitControlWebView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+  x:Class="Speckle.Connectors.Revit2026.Plugin.RevitControlWebView"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  mc:Ignorable="d"
+  d:DesignHeight="450"
+  d:DesignWidth="800"
+>
  <!-- WebView2 is created lazily -->
  <Border Name="BrowserContainer" Background="White">
-    <TextBlock Name="LoadingText"
-               Text="Loading Speckle..."
-               HorizontalAlignment="Center"
-               VerticalAlignment="Center"
-               FontSize="14"
-               Foreground="Gray" />
+    <TextBlock
+      Name="LoadingText"
+      Text="Loading Speckle..."
+      HorizontalAlignment="Center"
+      VerticalAlignment="Center"
+      FontSize="14"
+      Foreground="Gray"
+    />
  </Border>
 </UserControl>
@@ -46,7 +46,7 @@ public sealed partial class RevitControlWebView : UserControl, IBrowserScriptExe
      CreationProperties = new CoreWebView2CreationProperties { UserDataFolder = "C:\\temp" },
      HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
      VerticalAlignment = System.Windows.VerticalAlignment.Stretch,
-      Source = Url.Netlify
+      Source = Url.Netlify,
    };

    _browser.CoreWebView2InitializationCompleted += (sender, args) =>
@@ -16,7 +16,7 @@ public sealed class RevitControlWebViewDockable : UserControl, Autodesk.Revit.UI
    data.InitialState = new Autodesk.Revit.UI.DockablePaneState
    {
      DockPosition = DockPosition.Tabbed,
-      TabBehind = DockablePanes.BuiltInDockablePanes.ProjectBrowser
+      TabBehind = DockablePanes.BuiltInDockablePanes.ProjectBrowser,
    };
  }
 }
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net8.0-windows</TargetFramework>
-    <PlatformTarget>x64</PlatformTarget>    
+    <PlatformTarget>x64</PlatformTarget>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <UseWpf>true</UseWpf>
    <RevitVersion>2026</RevitVersion>
-    <DefineConstants>$(DefineConstants);REVIT2026;REVIT2022_OR_GREATER;REVIT2023_OR_GREATER;REVIT2024_OR_GREATER;REVIT2025_OR_GREATER;REVIT2026_OR_GREATER</DefineConstants><CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <DefineConstants>$(DefineConstants);REVIT2026;REVIT2022_OR_GREATER;REVIT2023_OR_GREATER;REVIT2024_OR_GREATER;REVIT2025_OR_GREATER;REVIT2026_OR_GREATER</DefineConstants>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>
@@ -1,18 +1,17 @@
-<Page x:Class="Speckle.Connectors.Revit.CefSharpPanel"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:cefSharp="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
-      xmlns:local="clr-namespace:Speckle.Connectors.DUI;assembly=Speckle.Connectors.DUI"
-
-      mc:Ignorable="d"
-      Title="Panel" Height="450" Width="800">
+<Page
+  x:Class="Speckle.Connectors.Revit.CefSharpPanel"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:cefSharp="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
+  xmlns:local="clr-namespace:Speckle.Connectors.DUI;assembly=Speckle.Connectors.DUI"
+  mc:Ignorable="d"
+  Title="Panel"
+  Height="450"
+  Width="800"
+>
  <Grid>
-    <cefSharp:ChromiumWebBrowser
-      Name="Browser"
-      Grid.Row="0"
-      Address="{x:Static local:Url.NetlifyString}" />
+    <cefSharp:ChromiumWebBrowser Name="Browser" Grid.Row="0" Address="{x:Static local:Url.NetlifyString}" />
  </Grid>
 </Page>
-
@@ -68,7 +68,7 @@ public partial class CefSharpPanel : Page, Autodesk.Revit.UI.IDockablePaneProvid
    data.InitialState = new Autodesk.Revit.UI.DockablePaneState
    {
      DockPosition = DockPosition.Tabbed,
-      TabBehind = DockablePanes.BuiltInDockablePanes.ProjectBrowser
+      TabBehind = DockablePanes.BuiltInDockablePanes.ProjectBrowser,
    };
  }
 }
@@ -163,8 +163,8 @@ internal sealed class RevitParametersBinding : IParametersBinding
    }
    catch (Exception ex)
    {
-      _topLevelExceptionHandler.CatchUnhandled(
-        () => throw new SpeckleException("Failed to apply parameter updates", ex)
+      _topLevelExceptionHandler.CatchUnhandled(() =>
+        throw new SpeckleException("Failed to apply parameter updates", ex)
      );
    }
  }
@@ -151,7 +151,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
    [
      new RevitSelectionFilter { IsDefault = true },
      new RevitViewsFilter(_revitContext),
-      new RevitCategoriesFilter(_revitContext)
+      new RevitCategoriesFilter(_revitContext),
    ];

  public List<ICardSetting> GetSendSettings() =>
@@ -161,7 +161,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
      new SendParameterNullOrEmptyStringsSetting(),
      new LinkedModelsSetting(),
      new SendRebarsAsVolumetricSetting(),
-      new SendAreasAsMeshSetting()
+      new SendAreasAsMeshSetting(),
    ];

  public void CancelSend(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
@@ -260,8 +260,8 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
      viewFilter.SetContext(_revitContext);
    }

-    var selectedObjects = await _threadContext.RunOnMainAsync(
-      () => Task.FromResult(modelCard.SendFilter.NotNull().RefreshObjectIds())
+    var selectedObjects = await _threadContext.RunOnMainAsync(() =>
+      Task.FromResult(modelCard.SendFilter.NotNull().RefreshObjectIds())
    );

    var allElements = selectedObjects.Select(uid => document.GetElement(uid)).Where(el => el is not null).ToList();
@@ -424,7 +424,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
      SpecTypeId.Area,
      SpecTypeId.Distance,
      SpecTypeId.Length,
-      SpecTypeId.Volume
+      SpecTypeId.Volume,
    };
    var units = "";
    foreach (var typeId in unitSpecTypeIds)
@@ -37,10 +37,9 @@ internal sealed class SelectionBinding : RevitBaseBinding, ISelectionBinding, ID
      _selectionTimer.Elapsed += (_, _) => topLevelExceptionHandler.CatchUnhandled(OnSelectionChanged);
      _selectionTimer.Start();
 #else
-      revitTask.Run(
-        () =>
-          _revitContext.UIApplication.NotNull().SelectionChanged += (_, _) =>
-            idleManager.SubscribeToIdle(nameof(OnSelectionChanged), OnSelectionChanged)
+      revitTask.Run(() =>
+        _revitContext.UIApplication.NotNull().SelectionChanged += (_, _) =>
+          idleManager.SubscribeToIdle(nameof(OnSelectionChanged), OnSelectionChanged)
      );
 #endif
    }
@@ -65,6 +65,7 @@ public static class ServiceRegistration
    serviceCollection.AddScoped<ViewUnpacker>();
    serviceCollection.AddScoped<SendCollectionManager>();
    serviceCollection.AddScoped<IRootObjectBuilder<DocumentToConvert>, RevitRootObjectBuilder>();
+    serviceCollection.AddScoped<IRootContinuousTraversalBuilder<DocumentToConvert>, RevitContinuousTraversalBuilder>();
    serviceCollection.AddSingleton<ISendConversionCache, SendConversionCache>();
    serviceCollection.AddSingleton<ToSpeckleSettingsManager>();
    serviceCollection.AddSingleton<ToHostSettingsManager>();
@@ -17,7 +17,7 @@ public class ElementUnpacker
    BuiltInCategory.OST_StairsSketchLandingCenterLines,
    BuiltInCategory.OST_StairsSketchRiserLines,
    BuiltInCategory.OST_RebarSketchLines,
-    BuiltInCategory.OST_StairsSketchRunLines
+    BuiltInCategory.OST_StairsSketchRunLines,
  ];

  /// <summary>
@@ -30,7 +30,7 @@ public class FamilyMaterialManager
    '>',
    '?',
    '`',
-    '~'
+    '~',
  ];

  public Dictionary<string, FamilyParameter> FamilyParameters { get; } = [];
@@ -161,7 +161,7 @@ public class FamilyTransformUtils
    {
      ("YZ", mirrorState.X, Autodesk.Revit.DB.Plane.CreateByOriginAndBasis(plane.Origin, plane.YVec, plane.Normal)),
      ("XZ", mirrorState.Y, Autodesk.Revit.DB.Plane.CreateByOriginAndBasis(plane.Origin, plane.XVec, plane.Normal)),
-      ("XY", mirrorState.Z, Autodesk.Revit.DB.Plane.CreateByOriginAndBasis(plane.Origin, plane.XVec, plane.YVec))
+      ("XY", mirrorState.Z, Autodesk.Revit.DB.Plane.CreateByOriginAndBasis(plane.Origin, plane.XVec, plane.YVec)),
    };

    foreach (var (name, _, mirrorPlane) in mirrorOperations.Where(op => op.shouldMirror))
@@ -54,7 +54,7 @@ public class LevelUnpacker
        {
          name = level.Name,
          displayValue = [],
-          properties = _propertiesExtractor.GetProperties(level)
+          properties = _propertiesExtractor.GetProperties(level),
        };
        var unitSettings = _converterSettings.Current.Document.GetUnits();
        var lengthUnitType = unitSettings.GetFormatOptions(SpecTypeId.Length).GetUnitTypeId();
@@ -65,7 +65,7 @@ public class LevelUnpacker
        {
          applicationId = level.UniqueId,
          objects = [element.UniqueId],
-          value = levelDataObject
+          value = levelDataObject,
        };
      }
    }
@@ -69,7 +69,7 @@ public class ParameterUpdater
      "Instance Parameters" => element,
      "Type Parameters" => GetTypeElement(element),
      "System Type Parameters" => GetSystemTypeElement(element),
-      _ => null
+      _ => null,
    };

  private DB.Element? GetTypeElement(DB.Element element)
@@ -222,7 +222,7 @@ public class ParameterUpdater
        DB.StorageType.Integer => SetIntegerValue(parameter, newValue),
        DB.StorageType.Double => SetDoubleValue(parameter, newValue),
        DB.StorageType.ElementId => SetElementIdValue(parameter, newValue),
-        _ => false
+        _ => false,
      };

      return success ? UpdateResult.Success() : UpdateResult.Fail($"Failed to set parameter value to: {newValue}");
@@ -4,7 +4,6 @@ using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Structure;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
 using Speckle.Converters.RevitShared.Helpers;
@@ -18,6 +17,7 @@ using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.GraphTraversal;
 using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Pipelines.Progress;
 using DB = Autodesk.Revit.DB;
 using Document = Autodesk.Revit.DB.Document;

@@ -155,7 +155,7 @@ public sealed class RevitFamilyBaker : IDisposable
        {
          InstanceDefinitionProxy d => d.applicationId ?? d.id.NotNull(),
          InstanceProxy i => i.applicationId ?? i.id.NotNull(),
-          _ => "unknown"
+          _ => "unknown",
        };
        _logger.LogError(ex, "Failed to process instance component {ComponentId}", componentId);

@@ -8,7 +8,6 @@ namespace Speckle.Connectors.Revit.HostApp;
 /// <summary>
 /// Unpacks Revit Views for sending
 /// </summary>
-
 public class ViewUnpacker
 {
  private readonly ILogger<ViewUnpacker> _logger;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jedd Morgan	b591e82804	Chore: Update csharpier version and re-format (#1363 ) * Bump Csharpier * run csharpier format ./	2026-04-13 17:16:40 +00:00
Björn Steinhagen	0585b531d5	fix(revit): skip out-of-bounds snapping references for far-from-origin DirectShapes (#1362 )	2026-04-13 17:52:09 +03:00
Mucahit Bilal GOKER	b49884e211	fix(revit): Lighting source material is included in the material quantities (#1361 ) * exclude default light source material * move the check inside TryAddMaterialPropertiesToQuantitiesDict as an early return * go simple	2026-04-10 15:59:26 +03:00
Björn Steinhagen	1b9640954e	fix(revit): apply accumulated transform to curves in linked DirectShapes (#1359 ) * fix(revit): apply accumulated transform to curves in linked DirectShape elements * refactor(revit): pre combine transforms for polylines	2026-04-09 19:19:32 +00:00
Jedd Morgan	3d24a7b16b	feat(connectors): disable cache config (#1349 ) (#1358 ) * feat(all): adds disable cache functionality * feat(connectors): prevents StoreSendResult if cache disabled * fix(connectors): restores IsBypassed state * Explicit flag instead implicit * Delete unused flag * Add packfile support --------- Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com> Co-authored-by: Björn Steinhagen <88777268+bjoernsteinhagen@users.noreply.github.com> Co-authored-by: oguzhankoral <oguzhankoral@gmail.com>	2026-04-08 11:42:24 +01:00
Jedd Morgan	9f3a333beb	Merge remote-tracking branch 'origin/dev' into jrm/main-dev-10	2026-04-08 11:27:57 +01:00
Björn Steinhagen	3bb0860d14	feat(connectors): disable cache config (#1349 ) .NET Test / test (push) Has been cancelled Details .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details * feat(all): adds disable cache functionality * feat(connectors): prevents StoreSendResult if cache disabled * fix(connectors): restores IsBypassed state * Explicit flag instead implicit * Delete unused flag * Add packfile support --------- Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com> Co-authored-by: oguzhankoral <oguzhankoral@gmail.com> Co-authored-by: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com>	2026-04-08 11:27:22 +01:00
Jedd Morgan	6c2a98c1d4	Update dev from main (#1357 )	2026-04-08 10:17:43 +01:00
Jedd Morgan	4cbf5628b1	Merge remote-tracking branch 'origin' into jrm/main-dev-9	2026-04-08 10:11:09 +01:00
Oğuzhan Koral	0441cf7e3c	Merge pull request #1356 from specklesystems/dev UPDATE DEV INTO MAIN	2026-04-08 12:10:25 +03:00
Jedd Morgan	7860c44f4e	feat(api)!: Implement new packfile based sends via `SendPipline` (aka DuckDB changes) (#1277 ) * Dim/quack lets go (#1275) * Add model ingestion to sharp connectors * correct ingestion message * Progress * grasshopper * GH exception messages * fix GH * file names * revit file name * grasshopper file names * etabs file names * delete tests * tekla maybe * ingestion scope * bad boolean logic * Longer TimeSpan * wip upload pipe * 10s * passthrough ingestion id * happy hack time: prevent ingestion completion this is handled server-side in the processing logic. * add packfile send endpoint detection and routing Route to SendViaPackfile when the server supports the upload-signing endpoint (POST probe, 404 = unsupported) and a continuous traversal builder is registered. * Adds Continuous Traversal Builder Introduces a Continuous Traversal Builder to manage the conversion and processing of Revit elements within a Send Pipeline. --------- Co-authored-by: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> * feat(api): DI Refactor for Duck DB + Gergo's API endpoint changes (#1282) * Di * undo accidental change * Feat (duck): dui ingestion updates post upload (#1295) * Pass optional ingestion id to DUI * Make ingestion id null for the SendViaIngestion, see the note :) * feat!: Duckdev progress reporitng (#1296) * Di * throwaway from laptop * Progress reporting * Use matching logger * Revit and revert rhino unpacker progress * more revertion * make pr even cleaner * and this one * fix build issues with other connectors * SDK nuget (#1299) * Bump to 3.14.0-alpha.2 * Feat(duck): grasshopper (#1297) * Duck x Grasshopper - who would win? * Fix registration for new builder * missing imports * return version id grasshopper * Align sync resource to sync --------- Co-authored-by: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> * Bump SDK * feat(importer): rhino file importer changes for packfile (#1301) * rhino importer changes * correct deps * Bump SDK * Fix build issues * ditto * Fix build issue * Lower standards * Fix build * feat: duck for acad, civil, navis, tekla, etabs (#1300) * duck: acad, civil, etabs, tekla, navis and bump channels to 10.0.0 * notes * fix conflicts * more conflicts * Ready for testing * fix(duck): Fix send caching (#1302) * potential fix * undo-rhino chnages * fix xml comment * amended comment * revit * Fix build * Aligned converting message * fix: reoccurring object references * Bump sdk and resolve merge conflict issues * Merge pull request #1317 from specklesystems/jrm/importer-tracing feat(otel): Tracing and OTEL changes for Rhino importer * Fix revit linked model progress (#1312) * Revert otel packages * bump SDK * Trace unpacking groups * Align trace context nullability with app * Disable send caching in Navisworks * comments * Update FileimportPayload.cs * fix using directive --------- Co-authored-by: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> * Fix merge conflicts --------- Co-authored-by: Dimitrie Stefanescu <didimitrie@gmail.com> Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com> Co-authored-by: Björn Steinhagen <88777268+bjoernsteinhagen@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sebastian Witt <sebastian.witt@rwth-aachen.de>	2026-04-08 10:07:56 +01:00
Jedd Morgan	38b9415e81	Update Plant3dSendBinding.cs (#1355 ) .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details	2026-04-02 17:44:57 +01:00
Jedd Morgan	85b2b21294	Merge pull request #1343 from specklesystems/dev Dev -> Main	2026-03-27 10:56:43 +00:00