WIP

.circleci/config.yml

@@ -0,0 +1,276 @@
+version: 2.1
+
+orbs:
+  # Using windows for builds
+  win: circleci/windows@2.4.0
+  # Upload artifacts to s3
+  aws-s3: circleci/aws-s3@2.0.0
+
+jobs:
+  build-ui:
+    docker:
+      - image: "circleci/node:16"
+    steps:
+      - checkout
+      - run:
+          command: "npm install"
+          working_directory: "ui"
+      - run:
+          command: "npm run build"
+          working_directory: "ui"
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle_connector/vue_ui
+
+  build-connector: # Reusable job for basic connectors
+    executor:
+      name: win/default # comes with python 3.7.3
+      shell: cmd.exe
+    parameters:
+      slug:
+        type: string
+        default: ""
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Create Innosetup signing cert
+          shell: powershell.exe
+          command: |
+            echo $env:PFX_B64 > "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.txt"
+            certutil -decode "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.txt" "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.pfx"
+      - run:
+          name: Set Environment Variable
+          shell: powershell.exe
+          command: |
+            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "2.0.999" } else { $env:CIRCLE_TAG }
+            $semver = if($tag.Contains('/')) {$tag.Split("/")[0] } else { $tag }
+            $ver = if($semver.Contains('-')) {$semver.Split("-")[0] } else { $semver }
+            $version = "$($ver).$($env:WORKFLOW_NUM)"
+            python patch_version.py $semver
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - run:
+          name: Build Installer
+          command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\sketchup.iss /Sbyparam=$p
+          shell: cmd.exe #does not work in powershell
+
+      #- run:
+      #    name: Patch
+      #    shell: powershell.exe
+      #    command:
+      #      | # If no tag, use 0.0.0.1 and don't make any YML (for testing only!)
+      #      $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.0" } else { $env:CIRCLE_TAG }
+      #      $semver = if($tag.Contains('/')) {$tag.Split("/")[1] } else { $tag }
+      #      $ver = if($semver.Contains('-')) {$semver.Split("-")[0] } else { $semver }
+      #      $channel = if($semver.Contains('-')) {$semver.Split("-")[1] } else { "latest" }
+      #      $version = "$($ver).$($env:CIRCLE_BUILD_NUM)"
+      #      New-Item -Force "speckle-sharp-ci-tools/Installers/sketchup/$channel.yml" -ItemType File -Value "version: $semver"
+      #      echo $version
+      #      python patch_version.py $semver
+      #      speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\sketchup.iss
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle-sharp-ci-tools/Installers
+
+  build-connector-mac:
+    macos:
+      xcode: 12.5.1
+    parameters:
+      projname:
+        type: string
+        default: ""
+      slug:
+        type: string
+        default: ""
+      installer:
+        type: boolean
+        default: false
+      converter-files:
+        type: string
+        default: ""
+      installername:
+        type: string
+        default: ""
+      build-config:
+        type: string
+        default: Release
+      bundlename:
+        type: string
+        default: ""
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Install dotnet
+          command: |
+            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel Current
+
+            $HOME/.dotnet/dotnet --version
+            $HOME/.dotnet/dotnet --list-runtimes
+            $HOME/.dotnet/dotnet --list-sdks
+      - run:
+          name: Create installer target dir
+          command: |
+            mkdir -p speckle-sharp-ci-tools/Installers/<< parameters.slug >>
+      - run:
+          name: Set Environment Variable
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            VER=$(echo "$SEMVER" | sed -e 's/-.*//')
+            VERSION=$(echo $VER.$WORKFLOW_NUM)
+            python3 patch_version.py $SEMVER
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - run:
+          name: Zip Connector files
+          command: |
+            zip -r << parameters.slug >>-mac.zip "./speckle_connector" "./speckle_connector.rb"
+            # Copy installer files
+      - run:
+          name: Copy files to installer
+          command: |
+                  mkdir -p speckle-sharp-ci-tools/Mac/<< parameters.installername >>/.installationFiles/
+                  cp << parameters.slug >>-mac.zip speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles
+      # Create installer
+      - run:
+          name: Exit if External PR
+          command: if [ "$CIRCLE_PR_REPONAME" ]; then circleci-agent step halt; fi
+      - run:
+          name: Build Mac installer
+          command: ~/.dotnet/dotnet publish speckle-sharp-ci-tools/Mac/<<parameters.installername>>/<<parameters.installername>>.sln -r osx-x64 -c Release
+      - run:
+          name: Zip installer
+          command: |
+            cd speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/
+            zip -r <<parameters.slug>>.zip ./
+      - store_artifacts:
+          path: speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/<<parameters.slug>>.zip
+      - run:
+          name: Copy to installer location
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            VER=$(echo "$SEMVER" | sed -e 's/-.*//')
+            VERSION=$(echo $VER.$WORKFLOW_NUM)
+            cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/publish/<<parameters.slug>>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<<parameters.slug>>-$SEMVER.zip
+          environment:
+            WORKFLOW_NUM: << pipeline.number >>
+      - when:
+          condition: << pipeline.git.tag >>
+          steps:
+            - persist_to_workspace:
+                root: ./
+                paths:
+                  - speckle-sharp-ci-tools/Installers
+  
+  get-ci-tools: # Clones our ci tools and persists them to the workspace
+    docker:
+      - image: cimg/base:2021.01
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "03:2e:ee:4f:14:67:2b:88:32:e8:cc:f0:cb:df:92:29"
+      - run:
+          name: I know Github as a host
+          command: |
+            mkdir ~/.ssh
+            ssh-keyscan github.com >> ~/.ssh/known_hosts
+      - run:
+          name: Clone
+          command: git clone git@github.com:specklesystems/speckle-sharp-ci-tools.git speckle-sharp-ci-tools
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle-sharp-ci-tools
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle-sharp-ci-tools
+
+  deploy-manager2:
+    docker:
+      - image: mcr.microsoft.com/dotnet/sdk:6.0
+    parameters:
+      slug:
+        type: string
+      os:
+        type: string
+      extension:
+        type: string
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Install Manager Feed CLI
+          command: dotnet tool install --global Speckle.Manager.Feed
+      - run:
+          name: Upload new version
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            /root/.dotnet/tools/Speckle.Manager.Feed deploy -s << parameters.slug >> -v ${SEMVER} -u https://releases.speckle.dev/installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >> -o << parameters.os >> -f speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >>
+
+workflows:
+  build-and-deploy:
+    jobs:
+      - get-ci-tools:
+          filters:
+            tags:
+              only: /.*/
+
+      - build-ui:
+          filters:
+            tags:
+              only: /.*/
+
+      - build-connector:
+          slug: sketchup
+          requires:
+            - get-ci-tools
+            - build-ui
+          filters:
+            tags:
+              only: /.*/
+          context: innosetup
+
+      - build-connector-mac:
+          slug: sketchup
+          requires:
+            - get-ci-tools
+            - build-ui
+          filters:
+            tags:
+              only: /.*/
+          installername: SpeckleSketchUpInstall
+
+      - deploy-manager2:
+          context: do-spaces-speckle-releases
+          slug: sketchup
+          os: Win
+          extension: exe
+          requires:
+            - build-connector
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/ # For testing only! /ci\/.*/
+      - deploy-manager2:
+          context: do-spaces-speckle-releases
+          slug: sketchup
+          os: OSX
+          extension: zip
+          requires:
+            - build-connector-mac
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/ # For testing only! /ci\/.*/

.github/workflows/build.yml

@@ -1,57 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-
-name: Build
-
-on:
-  pull_request:
-  workflow_call:
-    outputs:
-      semver:
-        description: "The computed version number for this run"
-        value: ${{ jobs.build.outputs.semver }}
-      file_version:
-        description: "The assembly info version for this run"
-        value: ${{ jobs.build.outputs.file_version }}
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    outputs:
-      semver: ${{ steps.set-version.outputs.semver }}
-      file_version: ${{ steps.set-info-version.outputs.file-version }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10"
-
-      - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v3.0.0
-
-      - name: Determine Version
-        id: gitversion
-        uses: gittools/actions/gitversion/execute@v3.0.0
-
-      - name: Set connector version
-        run: |
-          python patch_version.py ${{steps.gitversion.outputs.semVer}}
-
-      - uses: montudor/action-zip@v1
-        with:
-          args: zip -q -r sketchup.zip vendor speckle_connector_3/ speckle_connector_3.rb
-      - name: ⬆️ Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: output-${{steps.gitversion.outputs.semVer}}
-          path: sketchup.zip
-          compression-level: 0 # no compression
-      - id: set-version
-        name: Set version to output
-        run: echo "semver=${{steps.gitversion.outputs.semVer}}" >> "$GITHUB_OUTPUT" # version will be retrieved from tag?
-      - id: set-info-version
-        name: Set version to output
-        run: echo "file-version=${{steps.gitversion.outputs.AssemblySemVer}}" >> "$GITHUB_OUTPUT" # version will be retrieved from tag?

.github/workflows/deploy.yml

@@ -1,33 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-
-name: Build and deploy
-
-on:
-  push:
-    branches: ["dui3/alpha", "deploy/*"] # Continuous delivery on every long-lived branch
-    tags: ["v3.*"] # Manual delivery on every 3.x tag
-
-jobs:
-  build:
-    uses: ./.github/workflows/build.yml
-
-  deploy-installers:
-    runs-on: ubuntu-latest
-    needs: build
-    env:
-      IS_TAG_BUILD: ${{ github.ref_type == 'tag' }}
-    steps:
-      - name: 🔫 Trigger Build Installers
-        uses: ALEEF02/workflow-dispatch@v3.0.0
-        with:
-          workflow: Build Sketchup
-          repo: specklesystems/connector-installers
-          token: ${{ secrets.CONNECTORS_GH_TOKEN }}
-          inputs: '{ "run_id": "${{ github.run_id }}", "semver": "${{ needs.build.outputs.semver }}", "file_version": "${{ needs.build.outputs.file_version }}", "public_release": ${{ env.IS_TAG_BUILD }} }'
-          ref: main
-          wait-for-completion: true
-          wait-for-completion-interval: 10s
-          wait-for-completion-timeout: 10m
-          display-workflow-run-url: true
-          display-workflow-run-url-interval: 10s

.gitignore

@@ -10,8 +10,8 @@
 settings.json
 
 # vue app build dist folder
-speckle_connector_3/vue_ui
-speckle_connector_3/html
+speckle_connector/vue_ui
+speckle_connector/html
 
 # speckle-sharp-ci-tools
 /speckle-sharp-ci-tools

.rubocop.yml

@@ -18,7 +18,7 @@ AllCops:
     - '_tools/su_attributes/**/*.rb'
     - '_sqlite3/**/*.rb'
     - 'ui/**/*'
-    - 'speckle_connector_3/src/ext/**/*.rb'
+    - 'speckle_connector/src/ext/**/*.rb'
     - 'vendor/bundle/**/*'
     - 'tests/**/*.rb'
   SketchUp:

.solargraph.yml

@@ -1,6 +1,6 @@
 require_paths:
 - "C:/Program Files/SketchUp/SketchUp 2021/Tools"
-- speckle_connector_3
+- speckle_connector
 
 require:
 - sketchup-api-stubs

Gemfile

@@ -24,8 +24,6 @@ group :development do
   gem 'rubycritic', '~> 4.3', '>= 4.3.3', require: false
   # Auto completions for SketchUp API.
   gem 'sketchup-api-stubs'
-  # Runtime dependency of skippy for Ruby 3.2. Have it!
-  gem 'sorted_set', '~> 1.0'
   # Aid with common SketchUp extension tasks.
-  gem 'skippy', '~> 0.5.2.a'
+  gem 'skippy', '~> 0.4.1.a'
 end

Gemfile.lock

@@ -26,7 +26,7 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    git (1.19.1)
+    git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     ice_nine (0.11.2)
@@ -51,7 +51,6 @@ GEM
     public_suffix (5.0.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    rbtree (0.4.6)
     rchardet (1.8.0)
     reek (6.1.1)
       kwalify (~> 0.7.0)
@@ -90,7 +89,6 @@ GEM
       simplecov (>= 0.17.0)
       tty-which (~> 0.4.0)
       virtus (~> 1.0)
-    set (1.1.0)
     sexp_processor (4.16.1)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -99,15 +97,11 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sketchup-api-stubs (0.7.8)
-    skippy (0.5.2.a)
+    skippy (0.4.3.a)
       git (~> 1.3)
       naturally (~> 2.1)
-      sorted_set (~> 1.0)
-      thor (>= 0.19, < 2.0)
-    sorted_set (1.0.3)
-      rbtree
-      set (~> 1.0)
-    thor (1.3.1)
+      thor (~> 0.19)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tty-which (0.4.2)
     unicode-display_width (1.8.0)
@@ -118,7 +112,6 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
-  x64-mingw-ucrt
   x64-mingw32
   x64-unknown
   x86_64-linux
@@ -134,8 +127,7 @@ DEPENDENCIES
   rubocop-sketchup
   rubycritic (~> 4.3, >= 4.3.3)
   sketchup-api-stubs
-  skippy (~> 0.5.2.a)
-  sorted_set (~> 1.0)
+  skippy (~> 0.4.1.a)
 
 BUNDLED WITH
    2.3.25

GitVersion.yml

@@ -1,11 +0,0 @@
-workflow: GitFlow/v1
-next-version: 3.0.0
-mode: ManualDeployment
-branches:
-  main:
-    label: rc
-  develop:
-    regex: ^dui3/alpha$
-    label: beta
-  unknown:
-    increment: None

README.md

@@ -49,9 +49,9 @@ This repo is split into three parts:
 ### 1. **Speckle Connector extension** 
    
    Includes the `ruby` source files to run extension on SketchUp environment. SketchUp Extensions are composed of
-   a **.rb** file as entry and **folder** that .rb file refers to. In our case entry file is `speckle_connector_3.rb`
+   a **.rb** file as entry and **folder** that .rb file refers to. In our case entry file is `speckle_connector.rb`
    that responsible to register Speckle Connector extension to SketchUp and also it shows address to where extension
-   will start to read extension. Source folder is `speckle_connector_3`.
+   will start to read extension. Source folder is `speckle_connector`.
 
 ### 2. **User Interface**
 
@@ -64,7 +64,7 @@ This repo is split into three parts:
    we use extensions as native part of the source `ruby` code. 
 
    After building `sqlite3.sln` file, compiled `sqlite3.so` (for Windows) and `sqlite3.bundle` (for OSX) dynamic library files are created
-   by solution to place them into source code into `speckle_connector_3/src/ext`. Building this project should be only
+   by solution to place them into source code into `speckle_connector/src/ext`. Building this project should be only
    happen when SketchUp starts to support newer Ruby versions (currently it is `2.7`).
 
 ## Contribution Guide
@@ -117,7 +117,7 @@ If you will use VS Code, make sure you've installed the Ruby extension for VS Co
 
 ### Loading the Speckle Connector Plugin
 
-1. Find already prepared `speckle_connector_3_loader.rb` file on the `_tools`
+1. Find already prepared `speckle_connector_loader.rb` file on the `_tools`
 folder.
 2. Copy this Ruby file into your SketchUp Plugins directory. You will likely find this at:
     `C:\Users\{YOU}\AppData\Roaming\SketchUp\SketchUp 20XX\SketchUp\Plugins`

Rakefile

@@ -32,12 +32,12 @@ end
 
 # Glob pattern to match source files. Defaults to FileList['.'].
 ruby_critic_paths = FileList[
-  'speckle_connector_3/**/*.rb',
-  'speckle_connector_3.rb',
+  'speckle_connector/**/*.rb',
+  'speckle_connector.rb',
   'tests/**/*.rb'] -
                     FileList[
                     '_tools/**/*.rb',
-                    'speckle_connector_3/src/ext/**/*.rb',
+                    'speckle_connector/src/ext/**/*.rb',
                     ]
 
 # for local

_tools/debugger/skippy_exec_2024.rb

@@ -1,15 +0,0 @@
-# This is for automated pre-debugger configuration.
-# We run skippy first, then activate debugger.
-# The purpose of this file to wait till skp is live
-
-# To establish a configuration
-#  1. Create 'Run External Tool' before lunch step
-#  2. Program -> C:\Ruby32-x64\bin\ruby.exe or whatever
-#  3. Arguments -> C:\Users\KORAL\Documents\Git\Speckle\speckle-sketchup\_tools\debugger\bundle_exec_2024.rb or whatever
-#  4. Working directory -> C:\Users\KORAL\Documents\Git\Speckle\speckle-sketchup or whatever
-
-# Add a delay of 10 seconds, it is arbitrary, do not hesitate to change for what works best for you
-sleep(10)
-
-# Execute the original command
-exec('bundle exec skippy sketchup:debug 2024')

_tools/jf_RubyPanel/rubytoolbar.rb

@@ -24,7 +24,7 @@ module JF_RubyToolbar
   def self.load_toolbar
     @last_dir = "#{$LOAD_PATH[0]}/"
     @last_dir = @last_dir.gsub('/', '\\\\\\\\')
-    @last_dir = File.join($JF_RUBYTOOLBAR, 'speckle_connector_3')
+    @last_dir = File.join($JF_RUBYTOOLBAR, 'speckle_connector')
     curdir = File.dirname __FILE__
 
     # create toolbar

_tools/speckle_connector_loader.rb

@@ -10,7 +10,7 @@
 # Create a link to Plugins folder with this command
 
 # rubocop:disable Layout/LineLength
-# New-Item -ItemType SymbolicLink -Path '~\AppData\Roaming\SketchUp\SketchUp 2022\SketchUp\Plugins\speckle_connector_3_loader.rb' -Target ~\Git\Speckle\speckle-sketchup\_tools\speckle_connector_3_loader.rb
+# New-Item -ItemType SymbolicLink -Path '~\AppData\Roaming\SketchUp\SketchUp 2022\SketchUp\Plugins\speckle_connector_loader.rb' -Target ~\Git\Speckle\speckle-sketchup\_tools\speckle_connector_loader.rb
 # rubocop:enable Layout/LineLength
 
 SKETCHUP_CONSOLE.show # if you want to show Ruby console on startup
@@ -32,7 +32,7 @@ $LOAD_PATH << File.join(speckle_path, '_tools')
 $JF_RUBYTOOLBAR = speckle_path
 # rubocop:enable Style/GlobalVars
 
-files = %w[speckle_connector_3 jf_RubyPanel su_attributes]
+files = %w[speckle_connector jf_RubyPanel su_attributes]
 
 files.each do |ruby_file|
   puts "Loading #{ruby_file}"

patch_version.py

@@ -4,7 +4,7 @@ import sys
 
 def patch_connector(tag):
     """Patches the connector version within the connector file"""
-    rb_file = "speckle_connector_3.rb"
+    rb_file = "speckle_connector.rb"
 
     with open(rb_file, "r") as file:
         lines = file.readlines()
@@ -15,12 +15,6 @@ def patch_connector(tag):
                 print(f"Patched connector version number in {rb_file}")
                 break
 
-        for (index, line) in enumerate(lines):
-            if 'DEV_MODE = ' in line:
-                lines[index] = f'    DEV_MODE = false\n'
-                print(f"Patched dev mode to false in {rb_file}")
-                break
-
         with open(rb_file, "w") as file:
             file.writelines(lines)
 
@@ -51,7 +45,7 @@ def main():
 
     print(f"Patching version: {tag}")
     patch_connector(tag)
-    # patch_installer(tag)
+    patch_installer(tag)
 
 
 if __name__ == "__main__":

speckle_connector.rb

@@ -4,7 +4,7 @@ require 'sketchup'
 require 'extensions'
 
 # Speckle connector module to enable multiplayer mode ON!
-module SpeckleConnector3
+module SpeckleConnector
   # Version - patched by CI
   CONNECTOR_VERSION = '0.0.0'
 
@@ -23,11 +23,11 @@ module SpeckleConnector3
   PATH = File.join(PATH_ROOT, folder_name).freeze
 
   # Run from localhost or from build files
-  DEV_MODE = true
+  DEV_MODE = false
   puts("Loading Speckle Connector v#{CONNECTOR_VERSION} from #{DEV_MODE ? 'dev' : 'build'}")
 
   unless file_loaded?(__FILE__)
-    ex = SketchupExtension.new('Speckle SketchUp v3', File.join(PATH, 'bootstrap'))
+    ex = SketchupExtension.new('Speckle SketchUp', File.join(PATH, 'bootstrap'))
     ex.description = 'Speckle Connector for SketchUp'
     ex.version     = CONNECTOR_VERSION
     ex.copyright   = 'AEC Systems Ltd.'

speckle_connector/bootstrap.rb

@@ -2,7 +2,7 @@
 
 require 'sketchup'
 require 'pathname'
-require 'speckle_connector_3/debug'
+require 'speckle_connector/debug'
 require_relative 'src/log/log'
 require_relative 'src/ui/sketchup_ui'
 require_relative 'src/ui/ui_controller'
@@ -13,7 +13,7 @@ require_relative 'src/states/initial_state'
 require_relative 'src/commands/speckle_menu_commands'
 
 # Speckle Connector on SketchUp to enable Multiplayer mode ON!
-module SpeckleConnector3
+module SpeckleConnector
   SKETCHUP_VERSION = Sketchup.version.to_i
 
   dir = __dir__.dup
@@ -24,9 +24,9 @@ module SpeckleConnector3
     sketchup_ui = Ui::SketchupUi.new
     ui_controller = Ui::UiController.new(sketchup_ui)
     menu_commands = Commands::MenuCommandHandler.new
-    user_state = SpeckleConnector3::States::UserState.new({})
-    initial_state = SpeckleConnector3::States::InitialState.new(user_state)
-    app = SpeckleConnector3::App::SpeckleConnectorApp.new(menu_commands, initial_state, ui_controller)
+    user_state = SpeckleConnector::States::UserState.new({})
+    initial_state = SpeckleConnector::States::InitialState.new(user_state)
+    app = SpeckleConnector::App::SpeckleConnectorApp.new(menu_commands, initial_state, ui_controller)
     # Add menu commands to SketchUp and Speckle application
     Commands::SpeckleMenuCommands.add_initial_commands!(app)
     app

speckle_connector/debug.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Speckle connector module to enable multiplayer mode ON!
-module SpeckleConnector3
+module SpeckleConnector
   # from thomthom
   # https://github.com/thomthom/true-bend/blob/master/src/tt_truebend/debug.rb
 

speckle_connector/src/accounts/accounts.rb

@@ -4,10 +4,9 @@ require 'JSON'
 require_relative '../ext/sqlite3'
 require_relative '../constants/path_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   # Accounts to communicate with models on user's account.
   module Accounts
-    # Load accounts from user's app data.
     def self.load_accounts
       db_path = SPECKLE_ACCOUNTS_DB_PATH
       unless File.exist?(db_path)
@@ -24,21 +23,9 @@ module SpeckleConnector3
       rows.map { |row| JSON.parse(row[1]) }
     end
 
-    def self.get_account_by_id(id)
-      accounts = load_accounts
-      accounts.select { |acc| acc['id'] == id }[0]
-    end
-
-    # Default account on the user computer.
     def self.default_account
       accounts = load_accounts
       accounts.select { |acc| acc['isDefault'] }[0] || accounts[0]
     end
-
-    # Try to get local server account for debug/test purposes.
-    def self.try_get_local_server_account
-      accounts = load_accounts
-      accounts.select { |acc| acc['serverInfo']['url'].include?('localhost') }[0] || nil
-    end
   end
 end

speckle_connector/src/actions/action.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # State changer object.
     class Action

speckle_connector/src/actions/activate_diffing.rb

@@ -3,7 +3,7 @@
 require_relative 'action'
 require_relative 'deactivate_diffing'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Deactivate diffing for stream.
     class ActivateDiffing < Action
@@ -15,7 +15,7 @@ module SpeckleConnector3
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
       def update_state(state)
-        state = DeactivateDiffing.update_state(state, nil, {})
+        state = DeactivateDiffing.update_state(state, {})
         puts "Diffing activated for #{@stream_id}"
         speckle_entities = state.speckle_state.speckle_entities
         invalid_speckle_entities = speckle_entities.select do |_id, entity|

speckle_connector/src/actions/add_material.rb

@@ -2,7 +2,7 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Adds material to speckle state and Sketchup.
     class AddMaterial < Action

speckle_connector/src/actions/apply_mappings.rb

@@ -5,7 +5,7 @@ require_relative 'mapped_entities_updated'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Apply mappings for selected entities.
     class ApplyMappings < Action
@@ -37,7 +37,7 @@ module SpeckleConnector3
                    end
 
         # Collect entities from entity ids that comes from UI as list
-        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id.to_s) }
+        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id) }
 
         # Switch to definitions if all entities are component instance and UI flag shows that
         if entities_to_map.all? { |e| e.is_a?(Sketchup::ComponentInstance) } && @is_definition

speckle_connector/src/actions/clear_mapper_source.rb

@@ -3,13 +3,13 @@
 require_relative 'action'
 require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear mapper source.
     class ClearMapperSource < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, _data)
+      def self.update_state(state, _data)
         new_speckle_state = state.speckle_state.with_removed_mapper_source
         erase_levels(state)
         state.with_speckle_state(new_speckle_state)

speckle_connector/src/actions/clear_mappings.rb

@@ -5,7 +5,7 @@ require_relative 'mapped_entities_updated'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear mappings for selected entities.
     class ClearMappings < Action
@@ -28,7 +28,7 @@ module SpeckleConnector3
                    end
 
         # Collect entities from entity ids that comes from UI as list
-        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id.to_s) }
+        entities_to_map = entities.select { |e| @entities_to_map.include?(e.persistent_id) }
 
         # Switch to definitions if all entities are component instance and UI flag shows that
         if entities_to_map.all? { |e| e.is_a?(Sketchup::ComponentInstance) } && @is_definition

speckle_connector/src/actions/clear_mappings_from_table.rb

@@ -5,13 +5,13 @@ require_relative 'mapped_entities_updated'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear mappings for selected entities from mapped elements table.
     class ClearMappingsFromTable < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, data)
+      def self.update_state(state, data)
         # Flat entities to clear mappings
         flat_entities = SketchupModel::Query::Entity.flat_entities(state.sketchup_state.sketchup_model.entities)
 
@@ -20,7 +20,7 @@ module SpeckleConnector3
         # Store speckle state to update with mapped entities.
         speckle_state = state.speckle_state
         flat_entities.each do |entity|
-          next unless entity_ids.include?(entity.persistent_id.to_s)
+          next unless entity_ids.include?(entity.persistent_id)
 
           SketchupModel::Dictionary::SpeckleSchemaDictionaryHandler.remove_dictionary(entity)
           speckle_state = speckle_state.with_removed_mapped_entity(entity)

speckle_connector/src/actions/clear_queue.rb

@@ -2,7 +2,7 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Clear queue from state.
     class ClearQueue < Action

speckle_connector/src/actions/collect_preferences.rb

@@ -4,13 +4,13 @@ require_relative 'action'
 require_relative '../ext/sqlite3'
 require_relative '../constants/path_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to collect preferences from database to UI.
     class CollectPreferences < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, _data)
+      def self.update_state(state, _data)
         state.with_add_queue('collectPreferences', state.user_state.preferences.to_json, [])
       end
     end

speckle_connector/src/actions/collect_versions.rb

@@ -2,16 +2,16 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to collect versions from sketchup and connector to track user's version by mixpanel.
     class CollectVersions < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, _data)
+      def self.update_state(state, _data)
         versions = {
           sketchup: Sketchup.version.to_i,
-          speckle: SpeckleConnector3::CONNECTOR_VERSION
+          speckle: SpeckleConnector::CONNECTOR_VERSION
         }
         state.with_add_queue('collectVersions', versions.to_json, [])
       end

speckle_connector/src/actions/connected.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to update connected state of application.
     class Connected < Action

speckle_connector/src/actions/create_stream.rb

@@ -6,7 +6,7 @@ require_relative '../actions/save_stream'
 require_relative '../actions/queue_send'
 require_relative '../convertors/converter'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Create stream.
     class CreateStream < Action

speckle_connector/src/actions/deactivate_diffing.rb

@@ -2,13 +2,13 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Deactivate diffing.
     class DeactivateDiffing < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, _data)
+      def self.update_state(state, _data)
         puts 'Diffing deactivated!'
         speckle_entities = state.speckle_state.speckle_entities
         diffing_activated_speckle_entities = speckle_entities.reject do |_id, entity|

speckle_connector/src/actions/events/app_event_action.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require_relative 'event_action'
-require_relative 'on_document_changed'
 require_relative '../load_sketchup_model'
 require_relative '../collect_preferences'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     module Events
       # Handle events that are triggered by the {AppObserver}.
@@ -26,8 +25,7 @@ module SpeckleConnector3
             # Action to let UI to render itself with new preferences state
             # TODO: Later UI should be updated if any stream is invalid after
             #  we collected speckle_entities appropriately
-            new_state = CollectPreferences.update_state(new_state, nil, {})
-            OnDocumentChanged.update_state(new_state)
+            CollectPreferences.update_state(new_state, {})
           end
         end
 

speckle_connector/src/actions/events/entities_event_action.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_relative 'event_action'
+require_relative '../../sketchup_model/utils/face_utils'
+require_relative '../../constants/dict_constants'
+
+module SpeckleConnector
+  module Actions
+    module Events
+      # Event actions related to entities.
+      class EntitiesEventAction < EventAction
+        # Event action when element added.
+        class OnElementAdded
+          # @param state [States::State] the current state of the SpeckleConnector Application
+          def self.update_state(state, event_data)
+            modified_entities = event_data.to_a.collect { |e| e[1] }
+            # do not copy speckle base object specific attributes, because they are entity specific
+            modified_entities.each { |entity| entity.delete_attribute(SPECKLE_BASE_OBJECT) }
+            state
+          end
+        end
+
+        # Event action when element modified.
+        class OnElementModified
+          # @param state [States::State] the current state of the SpeckleConnector Application
+          def self.update_state(state, event_data)
+            speckle_state = state.speckle_state
+            modified_entity = event_data[0][1]
+            if modified_entity.is_a?(Sketchup::Face)
+              path = state.sketchup_state.sketchup_model.active_path
+              modified_faces = SketchupModel::Utils::FaceUtils.near_faces(modified_entity.edges)
+              path_objects = path.nil? ? [] : path + path.collect(&:definition)
+              parent_ids = path_objects.collect(&:persistent_id)
+              ids_to_invalidate = modified_faces.collect(&:persistent_id) + parent_ids
+              entities_to_invalidate = speckle_entities_to_invalidate(speckle_state, ids_to_invalidate)
+              new_speckle_state = invalidate_speckle_entities(speckle_state, entities_to_invalidate)
+              # This is the place we can send information to UI for diffing check
+              diffing = state.user_state.preferences[:user][:diffing]
+              new_speckle_state = new_speckle_state.with_invalid_streams_queue if diffing
+              return state.with_speckle_state(new_speckle_state)
+            end
+
+            state
+          end
+
+          # @param speckle_state [States::SpeckleState] the current state of the Speckle
+          def self.speckle_entities_to_invalidate(speckle_state, ids)
+            speckle_state.speckle_entities.to_h.select { |id, _| ids.include?(id) }
+          end
+
+          # @param speckle_state [States::SpeckleState] the current state of the Speckle
+          def self.invalidate_speckle_entities(speckle_state, entities_to_invalidate)
+            speckle_entities = speckle_state.speckle_entities
+            entities_to_invalidate.each do |id, speckle_entity|
+              edited_speckle_entity = speckle_entity.with_invalid
+              speckle_entities = speckle_entities.put(id, edited_speckle_entity)
+            end
+            speckle_state.with_speckle_entities(speckle_entities)
+          end
+        end
+
+        # Event action when element removed.
+        class OnElementRemoved
+          # @param state [States::State] the current state of the SpeckleConnector Application
+          def self.update_state(state, _event_data)
+            # TODO: Do state updates when element removed
+            state
+          end
+        end
+
+        # Handlers that are used to handle specific events
+        ACTIONS = {
+          onElementRemoved: OnElementRemoved,
+          onElementAdded: OnElementAdded,
+          onElementModified: OnElementModified
+        }.freeze
+
+        def self.actions
+          ACTIONS
+        end
+      end
+    end
+  end
+end

speckle_connector/src/actions/events/event_action.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # This module contains actions that are performed to handle events triggered by observers in Sketchup.
     module Events

speckle_connector/src/actions/events/model_event_action.rb

@@ -3,7 +3,7 @@
 require_relative 'event_action'
 require_relative '../load_sketchup_model'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     module Events
       # Handle events that are triggered by the {ModelObserver}.
@@ -18,21 +18,12 @@ module SpeckleConnector3
             sketchup_state = state.sketchup_state
             active_path = sketchup_state.sketchup_model.active_path
             observers = state.speckle_state.observers
-            update_entity_observers(active_path, observers)
+            update_object_observers(active_path, observers)
             return state
           end
 
-          def self.update_entity_observers(path, observers)
-            unless path.nil?
-              new_path_entities = path[-1].definition.entities
-              new_path_entities.add_observer(observers[ENTITIES_OBSERVER])
-              edges = new_path_entities.grep(Sketchup::Edge)
-              edges.each do |edge|
-                edge.add_observer(observers[ENTITY_OBSERVER])
-                edge.start.add_observer(observers[ENTITY_OBSERVER])
-                edge.end.add_observer(observers[ENTITY_OBSERVER])
-              end
-            end
+          def self.update_object_observers(path, observers)
+            path[-1].definition.entities.add_observer(observers[ENTITIES_OBSERVER]) unless path.nil?
           end
         end
 

speckle_connector/src/actions/events/selection_event_action.rb

@@ -2,13 +2,12 @@
 
 require_relative 'event_action'
 require_relative '../mapper_selection_changed'
-require_relative '../selection_actions/get_selection'
 require_relative '../../mapper/category/revit_category'
 require_relative '../../sketchup_model/reader/speckle_entities_reader'
 require_relative '../../sketchup_model/reader/mapper_reader'
 require_relative '../../sketchup_model/query/entity'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     module Events
       # Update selected speckle objects when the selection changes for mapper tool.
@@ -18,18 +17,12 @@ module SpeckleConnector3
         def self.update_state(state, event_data)
           return state unless event_data&.any?
 
-          # POC: Not happy with it. We log also entity.entityID property since
-          # onElementRemoved observer only return them! :/ Reconsider this in BETA!
-          selected_object_ids = state.sketchup_state.sketchup_model.selection.collect(&:persistent_id).collect(&:to_s) +
-                                state.sketchup_state.sketchup_model.selection.collect(&:entityID).collect(&:to_s)
-          summary = "Selected #{selected_object_ids.length / 2} objects." # POC: OFFF. I'll fix it
-          selection_info = UiData::Sketchup::SelectionInfo.new(selected_object_ids, summary)
-          js_script = "selectionBinding.emit('setSelection', #{selection_info.to_json})"
-          state.with_add_queue_js_command('setSelection', js_script)
+          # Get sketchup selection
+          sketchup_selection = state.sketchup_state.sketchup_model.selection
 
           # Collect and return mapper selection info.
           # Later we can add more selection info for different scopes.
-          # MapperSelectionChanged.new(sketchup_selection).update_state(state)
+          MapperSelectionChanged.new(sketchup_selection).update_state(state)
         end
       end
     end

speckle_connector/src/actions/hide_mappings_from_table.rb

@@ -4,13 +4,13 @@ require_relative 'action'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Hide entities that selected from mapped elements table.
     class HideMappingsFromTable < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, data)
+      def self.update_state(state, data)
         # Flat entities to clear mappings
         flat_entities = SketchupModel::Query::Entity.flat_entities(state.sketchup_state.sketchup_model.entities)
 
@@ -19,7 +19,7 @@ module SpeckleConnector3
 
         # Store speckle state to update with mapped entities.
         flat_entities.each do |entity|
-          next unless entity_ids.include?(entity.persistent_id.to_s)
+          next unless entity_ids.include?(entity.persistent_id)
 
           if entity.is_a?(Sketchup::ComponentDefinition)
             entity.instances.each do |instance|

speckle_connector/src/actions/init_local_accounts.rb

@@ -4,13 +4,13 @@ require_relative 'action'
 require_relative '../accounts/accounts'
 require_relative 'load_saved_streams'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to initialize local accounts from database.
     class InitLocalAccounts < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _request_id, _data)
+      def self.update_state(state, _data)
         puts 'Initialisation of Speckle accounts requested by plugin'
         accounts_data = state.speckle_state.accounts
         state.with_add_queue('loadAccounts', accounts_data.to_json, [])

speckle_connector/src/actions/initialize_materials.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative 'add_material'
 require_relative '../constants/mat_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to initialize materials
     class InitializeMaterials < Action

speckle_connector/src/actions/initialize_speckle.rb

@@ -7,25 +7,22 @@ require_relative '../states/sketchup_state'
 require_relative '../accounts/accounts'
 require_relative '../preferences/preferences'
 require_relative '../constants/observer_constants'
-require_relative '../ext/worker'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Initialization of the real state of the speckle.
     class InitializeSpeckle < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, observers, instant_message_sender)
-        worker = SpeckleConnector3::Worker.new([])
+      def self.update_state(state, observers)
         attach_app_observer!(observers[APP_OBSERVER])
-        accounts = SpeckleConnector3::Accounts.load_accounts
+        accounts = SpeckleConnector::Accounts.load_accounts
         speckle_state = States::SpeckleState.new(accounts, observers, {}, {})
         # This should be the only point that `Sketchup_active_model` passed to application state.
         sketchup_state = States::SketchupState.new(Sketchup.active_model)
         preferences = Preferences.read_preferences(sketchup_state.sketchup_model)
         user_state_with_preferences = state.user_state.with_preferences(preferences)
-        state = States::State.new(user_state_with_preferences, speckle_state, sketchup_state, false,
-                                  worker, &instant_message_sender)
+        state = States::State.new(user_state_with_preferences, speckle_state, sketchup_state, false)
         # This is where we attach observers to related model objects like selection, entities..
         Actions::LoadSketchupModel.update_state(state, sketchup_state.sketchup_model)
       end

speckle_connector/src/actions/isolate_mappings_from_table.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Isolate entities that selected from mapped elements table.
     class IsolateMappingsFromTable < Action
@@ -14,7 +14,7 @@ module SpeckleConnector3
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/PerceivedComplexity
       # rubocop:disable Metrics/CyclomaticComplexity
-      def self.update_state(state, _resolve_id, data)
+      def self.update_state(state, data)
         sketchup_model = state.sketchup_state.sketchup_model
 
         # Hide all entities first
@@ -38,13 +38,13 @@ module SpeckleConnector3
 
         faces_or_edges_ids = faces_or_edges.collect { |e| e['entityId'] }
 
-        face_edge_flat_entities.select { |e| faces_or_edges_ids.include?(e.persistent_id.to_s) }.each do |entity|
+        face_edge_flat_entities.select { |e| faces_or_edges_ids.include?(e.persistent_id) }.each do |entity|
           entity.hidden = false
         end
 
         comps_or_groups_ids = comps_or_groups.collect { |e| e['entityId'] }
 
-        comp_flat_entities.select { |e| comps_or_groups_ids.include?(e.persistent_id.to_s) }.each do |entity|
+        comp_flat_entities.select { |e| comps_or_groups_ids.include?(e.persistent_id) }.each do |entity|
           if entity.is_a?(Sketchup::ComponentDefinition)
             entity.instances.each do |instance|
               instance.hidden = false

speckle_connector/src/actions/load_saved_streams.rb

@@ -2,13 +2,13 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to load saved streams.
     class LoadSavedStreams < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _request_id, _data)
+      def self.update_state(state, _data)
         (saved_streams = state.sketchup_state.sketchup_model
                               .attribute_dictionary('Speckle', true)['saved_streams']) or []
         state.with_add_queue('setSavedStreams', saved_streams, [])

speckle_connector/src/actions/load_sketchup_model.rb

@@ -9,7 +9,7 @@ require_relative '../states/state'
 require_relative '../states/sketchup_state'
 require_relative '../constants/observer_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Switch sketchup model wit a new one
     class LoadSketchupModel < Action
@@ -29,8 +29,6 @@ module SpeckleConnector3
         # Read speckle entities
         new_speckle_entities = SketchupModel::Reader::SpeckleEntitiesReader.read(sketchup_model.entities)
         new_speckle_state = new_state.speckle_state.with_speckle_entities(Immutable::Hash.new(new_speckle_entities))
-        # POC: Reconsider it when we will do caching between sessions!
-        new_speckle_state = new_speckle_state.with_empty_object_references
         # Read mapped entities
         new_mapped_entities = SketchupModel::Reader::MapperReader.read_mapped_entities(sketchup_model.entities)
         new_speckle_state = new_speckle_state.with_mapped_entities(Immutable::Hash.new(new_mapped_entities))
@@ -53,8 +51,6 @@ module SpeckleConnector3
         # layers = sketchup_model.layers
         # layers.add_observer(observers[LAYERS_OBSERVER_NAME])
         entities = sketchup_model.entities
-        edges = entities.grep(Sketchup::Edge)
-        edges.each { |edge| edge.add_observer(observers[ENTITY_OBSERVER]) }
         entities.add_observer(observers[ENTITIES_OBSERVER])
         sketchup_model.add_observer(observers[MODEL_OBSERVER])
         # materials = sketchup_model.materials

speckle_connector/src/actions/mapped_entities_updated.rb

@@ -3,13 +3,13 @@
 require_relative 'action'
 require_relative '../sketchup_model/reader/mapper_reader'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Triggers when mapped entities updated.
     class MappedEntitiesUpdated < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id = nil, _data = nil)
+      def self.update_state(state, _data = nil)
         mapped_entities = SketchupModel::Reader::MapperReader
                           .mapped_entity_details(state.speckle_state.speckle_mapper_state.mapped_entities.values.to_a)
 

speckle_connector/src/actions/mapper_initialized.rb

@@ -4,7 +4,7 @@ require_relative 'action'
 require_relative '../mapper/category/revit_category'
 require_relative '../mapper/category/revit_family_category'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Collects mapper selection info.
     class MapperInitialized < Action

speckle_connector/src/actions/mapper_selection_changed.rb

@@ -7,7 +7,7 @@ require_relative '../sketchup_model/reader/mapper_reader'
 require_relative '../sketchup_model/reader/speckle_entities_reader'
 require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Collects mapper selection info.
     class MapperSelectionChanged < Action

speckle_connector/src/actions/mapper_source_updated.rb

@@ -5,7 +5,7 @@ require_relative '../constants/type_constants'
 require_relative '../mapper/mapper_source'
 require_relative '../speckle_objects/built_elements/revit/revit_element_type'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to update mapper source.
     class MapperSourceUpdated < Action

speckle_connector/src/actions/model_preference_updated.rb

@@ -6,7 +6,7 @@ require_relative '../accounts/accounts'
 require_relative '../constants/path_constants'
 require_relative '../sketchup_model/dictionary/speckle_model_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # When preference updated by UI.
     class ModelPreferencesUpdated < Action

speckle_connector/src/actions/on_events_action.rb

@@ -3,18 +3,16 @@
 require_relative 'action'
 require_relative 'events/app_event_action'
 require_relative 'events/entities_event_action'
-require_relative 'events/entity_event_action'
 require_relative 'events/model_event_action'
 require_relative 'events/selection_event_action'
 require_relative '../constants/observer_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Handle events that were collected by observers
     class OnEventsAction < Action
       RUN_ORDER = {
         APP_OBSERVER => Events::AppEventAction,
-        ENTITY_OBSERVER => Events::EntityEventAction,
         ENTITIES_OBSERVER => Events::EntitiesEventAction,
         MODEL_OBSERVER => Events::ModelEventAction,
         # MATERIALS_OBSERVER => Events::MaterialsEventAction,

speckle_connector/src/actions/one_click_send.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+require_relative '../accounts/accounts'
+require_relative '../actions/create_stream'
+require_relative '../actions/queue_send'
+require_relative '../convertors/to_speckle'
+
+module SpeckleConnector
+  module Actions
+    # Sends to speckle.
+    class OneClickSend < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state)
+        puts 'send to speckle'
+        default_account = Accounts.default_account
+        if default_account.nil?
+          puts 'No local account found. Please refer to speckle.guide for more information.'
+          return state
+        end
+        sketchup_model = state.sketchup_state.sketchup_model
+        to_convert = sketchup_model.selection.count > 0 ? sketchup_model.selection : sketchup_model.entities
+        first_saved_stream = first_saved_stream(sketchup_model)
+        action = if first_saved_stream.nil?
+                   Actions::CreateStream.new
+                 else
+                   Actions::QueueSend.new(first_saved_stream, convert_to_speckle(sketchup_model, to_convert))
+                 end
+
+        action.update_state(state)
+      end
+
+      def self.first_saved_stream(model)
+        (saved_streams = model.attribute_dictionary('speckle', true)['streams']) or []
+        saved_streams.nil? || saved_streams.empty? ? nil : saved_streams[0]
+      end
+
+      def self.convert_to_speckle(sketchup_model, to_convert)
+        converter = Converters::ToSpeckle.new(sketchup_model)
+        to_convert.map { |entity| converter.convert(entity) }
+      end
+    end
+  end
+end

speckle_connector/src/actions/queue_send.rb

@@ -5,7 +5,7 @@ require_relative '../states/state'
 require_relative '../states/speckle_state'
 require_relative '../actions/send_from_queue'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Send queue from state.
     class QueueSend < Action

speckle_connector/src/actions/receive_objects.rb

@@ -3,15 +3,14 @@
 require_relative 'action'
 require_relative '../convertors/units'
 require_relative '../convertors/to_native'
-require_relative '../operations/receive'
 require_relative '../convertors/clean_up'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to receive objects from Speckle Server.
     class ReceiveObjects < Action
       # rubocop:disable Metrics/ParameterLists
-      def initialize(stream_id, base, stream_name, branch_name, branch_id, source_app, object_id)
+      def initialize(stream_id, base, stream_name, branch_name, branch_id, source_app)
         super()
         @stream_id = stream_id
         @base = base
@@ -19,15 +18,12 @@ module SpeckleConnector3
         @branch_name = branch_name
         @branch_id = branch_id
         @source_app = source_app
-        @object_id = object_id
       end
       # rubocop:enable Metrics/ParameterLists
 
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
       def update_state(state)
-        # content = Operations.receive(@stream_id, @object_id)
-
         converter = Converters::ToNative.new(state, @stream_id, @stream_name, @branch_name, @source_app)
         # Have side effects on the sketchup model. It effects directly on the entities by adding new objects.
         start_time = Time.now.to_f

speckle_connector/src/actions/reload_accounts.rb

@@ -4,13 +4,13 @@ require_relative 'action'
 require_relative '../accounts/accounts'
 require_relative 'load_saved_streams'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to reload accounts from database.
     class ReloadAccounts < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, _data)
+      def self.update_state(state, _data)
         puts 'Reload of Speckle accounts requested by plugin'
         new_speckle_state = state.speckle_state.with_accounts(Accounts.load_accounts)
         state = state.with_speckle_state(new_speckle_state)

speckle_connector/src/actions/remove_stream.rb

@@ -5,7 +5,7 @@ require_relative '../accounts/accounts'
 require_relative '../convertors/units'
 require_relative '../convertors/converter'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Action to remove stream.
     # Currently it is not a state changer.

speckle_connector/src/actions/save_stream.rb

@@ -3,7 +3,7 @@
 require_relative 'action'
 require_relative '../accounts/accounts'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Save stream.
     # Currently it is not a state changer.

speckle_connector/src/actions/select_mappings_from_table.rb

@@ -4,17 +4,17 @@ require_relative 'action'
 require_relative 'events/selection_event_action'
 require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Select entities that selected from mapped elements table.
     class SelectMappingsFromTable < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, data)
+      def self.update_state(state, data)
         # Clear first selection
         state.sketchup_state.sketchup_model.selection.clear
 
-        # Flat entities to select mapped elements
+        # Flat entities to clear mappings
         flat_entities = SketchupModel::Query::Entity.flat_entities(state.sketchup_state.sketchup_model.entities)
 
         # Collect entity ids to clear mappings
@@ -22,7 +22,7 @@ module SpeckleConnector3
 
         # Store speckle state to update with mapped entities.
         flat_entities.each do |entity|
-          next unless entity_ids.include?(entity.persistent_id.to_s)
+          next unless entity_ids.include?(entity.persistent_id)
 
           if entity.is_a?(Sketchup::ComponentDefinition)
             state.sketchup_state.sketchup_model.selection.add(entity.instances)

speckle_connector/src/actions/send_from_queue.rb

@@ -3,7 +3,7 @@
 require_relative 'action'
 require_relative '../accounts/accounts'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Send already converted objects from queue if exist on stream.
     class SendFromQueue < Action

speckle_connector/src/actions/send_selection.rb

@@ -4,9 +4,8 @@ require_relative 'action'
 require_relative 'deactivate_diffing'
 require_relative '../convertors/units'
 require_relative '../convertors/to_speckle'
-require_relative '../operations/send'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Send selection to server.
     class SendSelection < Action
@@ -18,13 +17,11 @@ module SpeckleConnector3
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
       def update_state(state)
-        state = DeactivateDiffing.update_state(state, nil, {})
-        converter = Converters::ToSpeckle.new(state, @stream_id, {})
-        new_speckle_state, base = converter.convert_selection_to_base
-        id, batches = converter.serialize(base, state.user_state.preferences)
-        # TODO: Later active send operation.
-        # Operations.send(@stream_id, batches)
-
+        state = DeactivateDiffing.update_state(state, {})
+        converter = Converters::ToSpeckle.new(state, @stream_id)
+        new_speckle_state, base = converter.convert_selection_to_base(state.user_state.preferences)
+        id, total_children_count, batches, new_speckle_state = converter.serialize(base, new_speckle_state,
+                                                                                   state.user_state.preferences)
         puts("converted #{base.count} objects for stream #{@stream_id}")
 
         # This is the place we can send information to UI for diffing check
@@ -35,7 +32,7 @@ module SpeckleConnector3
         new_state.with_add_queue('convertedFromSketchup', @stream_id, [
                                    { is_string: false, val: batches },
                                    { is_string: true, val: id },
-                                   { is_string: false, val: 0 }
+                                   { is_string: false, val: total_children_count }
                                  ])
       end
     end

speckle_connector/src/actions/show_all_entities.rb

@@ -2,13 +2,13 @@
 
 require_relative 'action'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # Show all entities on the model.
     class ShowAllEntities < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object
-      def self.update_state(state, _resolve_id, _data)
+      def self.update_state(state, _data)
         # Show all entities first
         state.sketchup_state.sketchup_model.entities.each do |ent|
           ent.hidden = false

speckle_connector/src/actions/user_preferences_updated.rb

@@ -5,7 +5,7 @@ require_relative '../ext/sqlite3'
 require_relative '../accounts/accounts'
 require_relative '../constants/path_constants'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Actions
     # When preference updated by UI.
     class UserPreferencesUpdated < Action

speckle_connector/src/app/speckle_connector_app.rb

@@ -2,7 +2,7 @@
 
 require_relative '../actions/clear_queue'
 
-module SpeckleConnector3
+module SpeckleConnector
   module App
     # Application for the Speckle Connector.
     class SpeckleConnectorApp
@@ -28,6 +28,10 @@ module SpeckleConnector3
         state.speckle_state?
       end
 
+      def update_ui!
+        ui_controller.update_ui(state)
+      end
+
       # Attach observers to application when speckle initialized via menu commands.
       def add_observer_handler!(observer_handler)
         @observer_handler = observer_handler
@@ -36,24 +40,17 @@ module SpeckleConnector3
       # Send messages to HtmlDialog if any.
       def send_messages!
         queue = @state.speckle_state.message_queue
-        queue.each_value do |value|
-          instant_message_sender(value)
-        end
+        queue.each_value { |value| ui_controller.user_interfaces[Ui::SPECKLE_UI_ID].dialog.execute_script(value) }
         update_state!(Actions::ClearQueue)
       end
 
-      def instant_message_sender(message)
-        ui_controller.user_interfaces.each_value do |dialog|
-          dialog.execute_script(message)
-        end
-      end
-
       # This is the only function application state will be switched by calling upcoming action with it's parameters
       #  if any.
       def update_state!(action, *parameters)
         old_state = @state
         @state = action.update_state(old_state, *parameters)
         send_messages! if @state.speckle_state.message_queue.any?
+        update_ui! unless @state.equal?(old_state)
       end
     end
   end

speckle_connector/src/callbacks/callback_message.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Callbacks
     # Helper class to serialize messages to send dialog.
     class CallbackMessage

speckle_connector/src/commands/action_command.rb

@@ -2,15 +2,15 @@
 
 require_relative 'command'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to update state of the application.
     class ActionCommand < Command
       # @param app [App::SpeckleConnectorApp] the app object to run command on
-      # @param binding [Ui::Binding] binding object holds commands to call
       # @param action [#update_state] the action that knows how to change the state of the speckle app
-      def initialize(app, binding, action)
-        super(app, binding)
+      def initialize(app, action)
+        super(app)
+        @app = app
         @action = action
       end
 

speckle_connector/src/commands/activate_diffing.rb

@@ -3,11 +3,11 @@
 require_relative 'command'
 require_relative '../actions/activate_diffing'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to activate diffing for stream.
     class ActivateDiffing < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         stream_id = data['stream_id']
         action = Actions::ActivateDiffing.new(stream_id)
         app.update_state!(action)

speckle_connector/src/commands/apply_mappings.rb

@@ -3,11 +3,11 @@
 require_relative 'command'
 require_relative '../actions/apply_mappings'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to apply mapping for selected entities.
     class ApplyMappings < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         entities_to_map = data['entitiesToMap']
         method = data['method']
         category = data['category']

speckle_connector/src/commands/clear_mappings.rb

@@ -3,11 +3,11 @@
 require_relative 'command'
 require_relative '../actions/clear_mappings'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to clear mapping for selected entities.
     class ClearMappings < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         entities_to_map = data['entitiesToClearMap']
         is_definition = data['isDefinition']
         action = Actions::ClearMappings.new(entities_to_map, is_definition)

speckle_connector/src/commands/command.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module SpeckleConnector
+  module Commands
+    # Base command schema to wrap common operations for all commands.
+    class Command
+      # @return [App::SpeckleConnectorApp] the main app object
+      attr_reader :app
+
+      # @return [Ui::View] view object holds dialog and it's state
+      attr_reader :view
+
+      # @@param app [App::SpeckleConnectorApp] the main app object
+      def initialize(app)
+        @app = app
+        @view = app.ui_controller.user_interfaces[Ui::SPECKLE_UI_ID]
+      end
+
+      def run(*parameters)
+        # Run here common operations that same for each command.
+        with_observers_disabled do
+          _run(*parameters)
+        end
+      end
+
+      private
+
+      def with_observers_disabled(&block)
+        observer_handler = @app.observer_handler
+        if observer_handler
+          observer_handler.with_observers_disabled(&block)
+        else
+          block.call
+        end
+      end
+
+      def _run(*_parameters)
+        raise NotImplementedError, 'Implement in subclass'
+      end
+    end
+  end
+end

speckle_connector/src/commands/dialog_ready.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'command'
+
+module SpeckleConnector
+  module Commands
+    # Run this command when the UI is ready to get data
+    class DialogReady < Command
+      # Update the selected user interface
+      def _run(_data)
+        view.update_view(app.state)
+      end
+    end
+  end
+end

speckle_connector/src/commands/initialize_speckle.rb

@@ -2,17 +2,15 @@
 
 require_relative 'command'
 require_relative '../states/initial_state'
-require_relative '../ui/legacy_binding'
+require_relative '../ui/vue_view'
 require_relative '../actions/initialize_speckle'
 require_relative '../observers/factory'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
-    # Command to initialize old Speckle UI and register it to ui_controller.
+    # Command to initialize Speckle UI and register it to ui_controller.
     # This is the command where we show UI to user.
     class InitializeSpeckle < Command
-      SPECKLE_LEGACY_UI = 'speckle_legacy_ui'
-
       def dialog_title
         "Speckle #{CONNECTOR_VERSION}"
       end
@@ -21,34 +19,32 @@ module SpeckleConnector3
 
       def _run
         app = self.app
-        if !app.state.instance_of?(States::InitialState) && app.ui_controller.user_interfaces[SPECKLE_LEGACY_UI]
-          vue_view = app.ui_controller.user_interfaces[SPECKLE_LEGACY_UI]
+        unless app.state.instance_of?(States::InitialState)
+          vue_view = app.ui_controller.user_interfaces[Ui::SPECKLE_UI_ID]
           vue_view.show
           return
         end
 
-        initialize_speckle_legacy_view(app)
+        initialize_speckle(app)
       end
 
       # Do the actual Speckle initialization.
-      def initialize_speckle_legacy_view(app)
+      def initialize_speckle(app)
         # TODO: Initialize here speckle states and observers.
         observer_handler = Observers::Factory.create_handler(app)
         app.add_observer_handler!(observer_handler)
         observers = Observers::Factory.create_observers(observer_handler)
         app.update_state!(Actions::InitializeSpeckle, observers)
         dialog_specs = {
-          dialog_id: SPECKLE_LEGACY_UI,
+          dialog_id: Ui::SPECKLE_UI_ID,
           htm_file: Ui::VUE_UI_HTML,
           dialog_title: dialog_title,
           height: 950,
           width: 300
         }
-        legacy_ui_dialog = SpeckleConnector3::Ui::Dialog.new(**dialog_specs)
-        legacy_binding = Ui::LegacyBinding.new(app, 'legacy_ui')
-        legacy_ui_dialog.bindings[Ui::SPECKLE_LEGACY_BINDING_NAME] = legacy_binding
-        app.ui_controller.register_ui(SPECKLE_LEGACY_UI, legacy_ui_dialog)
-        legacy_ui_dialog.show
+        vue_view = Ui::VueView.new(dialog_specs, app)
+        app.ui_controller.register_ui(Ui::SPECKLE_UI_ID, vue_view)
+        vue_view.show
       end
     end
   end

speckle_connector/src/commands/mapper_source_updated.rb

@@ -3,11 +3,11 @@
 require_relative 'command'
 require_relative '../actions/mapper_source_updated'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to update mapper source.
     class MapperSourceUpdated < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         base = data['base']
         stream_id = data['stream_id']
         commit_id = data['commit_id']

speckle_connector/src/commands/menu_command_handler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Helper class to register, handle menu and toolbar commands.
     class MenuCommandHandler

speckle_connector/src/commands/model_preferences_updated.rb

@@ -4,11 +4,11 @@ require_relative 'command'
 require_relative '../accounts/accounts'
 require_relative '../actions/model_preference_updated'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to update theme.
     class ModelPreferencesUpdated < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         preference = data['preference']
         new_value = data['value']
         app.update_state!(Actions::ModelPreferencesUpdated.new(preference, new_value))

speckle_connector/src/commands/notify_connected.rb

@@ -4,11 +4,11 @@ require_relative 'command'
 require_relative '../actions/connected'
 require_relative '../actions/send_from_queue'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to notify connected.
     class NotifyConnected < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         stream_id = data['stream_id']
         app.update_state!(Actions::Connected)
         app.update_state!(Actions::SendFromQueue.new(stream_id))

speckle_connector/src/commands/receive_objects.rb

@@ -3,19 +3,18 @@
 require_relative 'command'
 require_relative '../actions/receive_objects'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to receive objects from Speckle Server.
     class ReceiveObjects < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         stream_id = data['stream_id']
         base = data['base']
         branch_name = data['branch_name']
         branch_id = data['branch_id']
         stream_name = data['stream_name']
         source_app = data['source_app']
-        object_id = data['object_id']
-        action = Actions::ReceiveObjects.new(stream_id, base, stream_name, branch_name, branch_id, source_app, object_id)
+        action = Actions::ReceiveObjects.new(stream_id, base, stream_name, branch_name, branch_id, source_app)
         app.update_state!(action)
       end
     end

speckle_connector/src/commands/remove_stream.rb

@@ -4,11 +4,11 @@ require_relative 'command'
 require_relative '../actions/remove_stream'
 require_relative '../actions/load_saved_streams'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to remove stream.
     class RemoveStream < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         stream_id = data['stream_id']
         action = Actions::RemoveStream.new(stream_id)
         app.update_state!(action)

speckle_connector/src/commands/reset_window_location.rb

@@ -2,10 +2,11 @@
 
 require_relative 'command'
 require_relative '../states/initial_state'
+require_relative '../ui/vue_view'
 require_relative '../actions/initialize_speckle'
 require_relative '../observers/factory'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to reset Speckle UI window location onto center of SketchUp window.
     class ResetWindowLocation < Command
@@ -14,8 +15,11 @@ module SpeckleConnector3
 
       def _run
         app = self.app
-        app.ui_controller.user_interfaces.values.each do |interface|
-          interface.reset_dialog_location
+        vue_view = app.ui_controller.user_interfaces[Ui::SPECKLE_UI_ID]
+        if vue_view
+          vue_view.dialog.reset_dialog_location
+        else
+          puts "Speckle UI didn't initialized!"
         end
       end
     end

speckle_connector/src/commands/save_stream.rb

@@ -5,11 +5,11 @@ require_relative '../accounts/accounts'
 require_relative '../actions/save_stream'
 require_relative '../actions/load_saved_streams'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to saved stream.
     class SaveStream < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         stream_id = data['stream_id']
         app.update_state!(Actions::SaveStream.new(stream_id))
       end

speckle_connector/src/commands/send_selection.rb

@@ -3,11 +3,11 @@
 require_relative 'command'
 require_relative '../actions/send_selection'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to send selection to Speckle Server.
     class SendSelection < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         stream_id = data['stream_id']
         action = Actions::SendSelection.new(stream_id)
         app.update_state!(action)

speckle_connector/src/commands/speckle_menu_commands.rb

@@ -4,15 +4,14 @@ require_relative 'menu_command_handler'
 require_relative 'action_command'
 require_relative 'initialize_speckle'
 require_relative 'reset_window_location'
-require_relative 'initialize_dui3_speckle'
+require_relative '../actions/one_click_send'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Speckle menu commands that adds them to Sketchup menu and toolbar.
     class SpeckleMenuCommands
       CMD_INITIALIZE_SPECKLE = :initialize_speckle
       CMD_RESET_WINDOW_LOCATION_SPECKLE = :reset_window_location_speckle
-      CMD_INITIALIZE_DUI3_SPECKLE = :initialize_dui3_speckle
       CMD_SEND_TO_SPECKLE = :send_to_speckle
       CMD_RECEIVE_FROM_SPECKLE = :receive_from_speckle
 
@@ -25,17 +24,13 @@ module SpeckleConnector3
         speckle_menu = sketchup_ui.speckle_menu
         speckle_toolbar = sketchup_ui.speckle_toolbar
 
-        # commands[CMD_INITIALIZE_SPECKLE] = initialize_speckle_command(app)
-        # commands.add_to_menu!(CMD_INITIALIZE_SPECKLE, speckle_menu)
-        # commands.add_to_toolbar!(CMD_INITIALIZE_SPECKLE, speckle_toolbar)
+        commands[CMD_INITIALIZE_SPECKLE] = initialize_speckle_command(app)
+        commands.add_to_menu!(CMD_INITIALIZE_SPECKLE, speckle_menu)
+        commands.add_to_toolbar!(CMD_INITIALIZE_SPECKLE, speckle_toolbar)
 
         commands[CMD_RESET_WINDOW_LOCATION_SPECKLE] = reset_window_location_command(app)
         commands.add_to_menu!(CMD_RESET_WINDOW_LOCATION_SPECKLE, speckle_menu)
 
-        commands[CMD_INITIALIZE_DUI3_SPECKLE] = initialize_dui3_speckle_command(app)
-        commands.add_to_menu!(CMD_INITIALIZE_DUI3_SPECKLE, speckle_menu)
-        commands.add_to_toolbar!(CMD_INITIALIZE_DUI3_SPECKLE, speckle_toolbar)
-
         # commands[CMD_SEND_TO_SPECKLE] = send_command(app)
         # commands.add_to_menu!(CMD_SEND_TO_SPECKLE, speckle_menu)
         # commands.add_to_toolbar!(CMD_SEND_TO_SPECKLE, speckle_toolbar)
@@ -43,7 +38,7 @@ module SpeckleConnector3
 
       def self.initialize_speckle_command(app)
         cmd = MenuCommandHandler.sketchup_command(
-          InitializeSpeckle.new(app, nil), 'Initialize Speckle'
+          InitializeSpeckle.new(app), 'Initialize Speckle'
         )
         cmd.tooltip = 'Launch Connector'
         cmd.status_bar_text = 'Opens the Speckle Connector window'
@@ -54,7 +49,7 @@ module SpeckleConnector3
 
       def self.reset_window_location_command(app)
         cmd = MenuCommandHandler.sketchup_command(
-          ResetWindowLocation.new(app, nil), 'Reset Window Location'
+          ResetWindowLocation.new(app), 'Reset Window Location'
         )
         cmd.tooltip = 'Bring Speckle window onto center of SketchUp window'
         cmd.status_bar_text = 'Bring Speckle window onto center of SketchUp window'
@@ -63,20 +58,9 @@ module SpeckleConnector3
         cmd
       end
 
-      def self.initialize_dui3_speckle_command(app)
-        cmd = MenuCommandHandler.sketchup_command(
-          InitializeDUI3Speckle.new(app, nil), 'Initialize Speckle (Beta)'
-        )
-        cmd.tooltip = 'Speckle (Beta) for SketchUp'
-        cmd.status_bar_text = 'Opens the Speckle Connector (Beta)'
-        cmd.small_icon  = '../../img/s2logo_dui3.png'
-        cmd.large_icon  = '../../img/s2logo_dui3.png'
-        cmd
-      end
-
       def self.send_command(app)
         cmd = MenuCommandHandler.sketchup_command(
-          ActionCommand.new(app, nil, Actions::OneClickSend), 'Send to Speckle'
+          ActionCommand.new(app, Actions::OneClickSend), 'Send to Speckle'
         )
         cmd.tooltip = 'Send to Speckle'
         cmd.status_bar_text = 'Send to Speckle'

speckle_connector/src/commands/user_preferences_updated.rb

@@ -4,11 +4,11 @@ require_relative 'command'
 require_relative '../accounts/accounts'
 require_relative '../actions/user_preferences_updated'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Commands
     # Command to update preferences.
     class UserPreferencesUpdated < Command
-      def _run(_resolve_id, data)
+      def _run(data)
         preference_hash = data['preference_hash']
         preference = data['preference']
         new_value = data['value']

speckle_connector/src/constants/dict_constants.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   SPECKLE_BASE_OBJECT = 'Speckle_Base_Object'
   SPECKLE_MAPPING_TOOL_SCHEMA = 'Speckle_Mapping_Tool_Schema'
   SPECKLE_SCHEMA = 'Speckle_Schema'
 
-  SPECKLE_SEND_CARDS = 'Speckle_Send_Cards'
-  SPECKLE_RECEIVE_CARDS = 'Speckle_Receive_Cards'
-
   SPECKLE_ID = 'speckle_id'
   SPECKLE_TYPE = 'speckle_type'
   APPLICATION_ID = 'application_id'
+  TOTAL_CHILDREN_COUNT = 'total_children_count'
   CHILDREN = 'children'
   PARENT = 'parent'
   VALID_STREAM_IDS = 'valid_stream_ids'

speckle_connector/src/constants/geo_constants.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   VECTOR_Z = Geom::Vector3d.new(0, 0, 1)
 end

speckle_connector/src/constants/mat_constants.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   MAT_DICTIONARY = 'Speckle_Connector_Materials'
   MAT_ID = 'Speckle_Connector_Material_Id'
 

speckle_connector/src/constants/observer_constants.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module SpeckleConnector
+  APP_OBSERVER = 'SpeckleConnector::Observers::AppObserver'
+  ENTITIES_OBSERVER = 'SpeckleConnector::Observers::EntitiesObserver'
+  MODEL_OBSERVER = 'SpeckleConnector::Observers::ModelObserver'
+  SELECTION_OBSERVER = 'SpeckleConnector::Observers::SelectionObserver'
+end

speckle_connector/src/constants/path_constants.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative 'platform_constants'
 
 # Speckle connector module to enable multiplayer mode ON!
-module SpeckleConnector3
+module SpeckleConnector
   dir = __dir__.dup
   dir.force_encoding('UTF-8') if dir.respond_to?(:force_encoding)
   HOME_PATH = (ENV['HOME']).to_s
@@ -19,6 +19,6 @@ module SpeckleConnector3
                            raise 'Speckle could not determine your Appdata path'
                          end
   SPECKLE_ACCOUNTS_DB_PATH = File.join(SPECKLE_APPDATA_PATH, 'Accounts.db')
-  SPECKLE_CONFIG_DB_PATH = File.join(SPECKLE_APPDATA_PATH, 'DUI3Config.db')
+  SPECKLE_CONFIG_DB_PATH = File.join(SPECKLE_APPDATA_PATH, 'Config.db')
   SPECKLE_TEST_DB_PATH = File.join(SPECKLE_APPDATA_PATH, 'sketchup_test.db')
 end

speckle_connector/src/constants/platform_constants.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # rubocop:disable Style/Documentation
-module SpeckleConnector3
+module SpeckleConnector
   host_os = RbConfig::CONFIG['host_os']
   OS_WIN = :windows
   OS_MAC = :macos

speckle_connector/src/constants/pref_constants.rb

@@ -2,7 +2,7 @@
 
 require_relative '../speckle_objects/geometry/length'
 
-module SpeckleConnector3
+module SpeckleConnector
   COMBINE_FACES_BY_MATERIAL = :combine_faces_by_material
   INCLUDE_ENTITY_ATTRIBUTES = :include_entity_attributes
   INCLUDE_FACE_ENTITY_ATTRIBUTES = :include_face_entity_attributes
@@ -15,7 +15,7 @@ module SpeckleConnector3
     Sketchup::ComponentInstance => INCLUDE_COMPONENT_ENTITY_ATTRIBUTES,
     Sketchup::Group => INCLUDE_GROUP_ENTITY_ATTRIBUTES,
     Sketchup::Face => INCLUDE_FACE_ENTITY_ATTRIBUTES,
-    Sketchup::Edge => INCLUDE_EDGE_ENTITY_ATTRIBUTES
+    Sketchup::Face => INCLUDE_EDGE_ENTITY_ATTRIBUTES
   }.freeze
 
   LEVEL_SHIFT_VALUE = SpeckleObjects::Geometry.length_to_native(1.5, 'm')

speckle_connector/src/constants/type_constants.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module SpeckleConnector3
+module SpeckleConnector
   BASE_OBJECT = 'Base'
 
   OBJECTS_GIS_POLYGONELEMENT = 'Objects.GIS.PolygonElement'
@@ -13,14 +13,6 @@ module SpeckleConnector3
   OBJECTS_BUILTELEMENTS_REVIT_FLOOR = 'Objects.BuiltElements.Floor:Objects.BuiltElements.Revit.RevitFloor'
   OBJECTS_BUILTELEMENTS_DEFAULT_WALL = 'Objects.BuiltElements.Wall'
   OBJECTS_BUILTELEMENTS_REVIT_WALL = 'Objects.BuiltElements.Wall:Objects.BuiltElements.Revit.RevitWall'
-  OBJECTS_BUILTELEMENTS_DEFAULT_COLUMN = 'Objects.BuiltElements.Column'
-  OBJECTS_BUILTELEMENTS_REVIT_COLUMN = 'Objects.BuiltElements.Column:Objects.BuiltElements.Revit.RevitColumn'
-  OBJECTS_BUILTELEMENTS_DEFAULT_BEAM = 'Objects.BuiltElements.Beam'
-  OBJECTS_BUILTELEMENTS_REVIT_BEAM = 'Objects.BuiltElements.Beam:Objects.BuiltElements.Revit.RevitBeam'
-  OBJECTS_BUILTELEMENTS_DEFAULT_PIPE = 'Objects.BuiltElements.Pipe'
-  OBJECTS_BUILTELEMENTS_REVIT_PIPE = 'Objects.BuiltElements.Pipe:Objects.BuiltElements.Revit.RevitPipe'
-  OBJECTS_BUILTELEMENTS_DEFAULT_DUCT = 'Objects.BuiltElements.Duct'
-  OBJECTS_BUILTELEMENTS_REVIT_DUCT = 'Objects.BuiltElements.Duct:Objects.BuiltElements.Revit.RevitDuct'
   OBJECTS_BUILTELEMENTS_REVIT_DIRECTSHAPE = 'Objects.BuiltElements.Revit.DirectShape'
   OBJECTS_BUILTELEMENTS_REVIT_FAMILY_INSTANCE = 'Objects.BuiltElements.Revit.FamilyInstance'
   OBJECTS_BUILTELEMENTS_REVIT_PARAMETER = 'Objects.BuiltElements.Revit.Parameter'
@@ -30,7 +22,6 @@ module SpeckleConnector3
   OBJECTS_GEOMETRY_LINE = 'Objects.Geometry.Line'
   OBJECTS_GEOMETRY_POLYLINE = 'Objects.Geometry.Polyline'
   OBJECTS_GEOMETRY_POLYCURVE = 'Objects.Geometry.Polycurve'
-  OBJECTS_GEOMETRY_AUTOCAD_POLYCURVE = 'Objects.Geometry.Polycurve:Objects.Geometry.Autocad.AutocadPolycurve'
   OBJECTS_GEOMETRY_ARC = 'Objects.Geometry.Arc'
   OBJECTS_GEOMETRY_CIRCLE = 'Objects.Geometry.Circle'
   OBJECTS_GEOMETRY_MESH = 'Objects.Geometry.Mesh'
@@ -44,14 +35,7 @@ module SpeckleConnector3
   OBJECTS_OTHER_RENDERMATERIAL = 'Objects.Other.RenderMaterial'
   OBJECTS_OTHER_DISPLAYSTYLE = 'Objects.Other.DisplayStyle'
 
-  SPECKLE_CORE_MODELS_COLLECTION = 'Speckle.Core.Models.Collections.Collection'
-  SPECKLE_CORE_MODELS_LAYER_COLLECTION = 'Speckle.Core.Models.Collections.Collection:Speckle.Core.Models.Layer'
-  SPECKLE_CORE_MODELS_COLLECTION_RASTER_LAYER = 'Speckle.Core.Models.Collections.Collection:Objects.GIS.RasterLayer'
-  SPECKLE_CORE_MODELS_COLLECTION_VECTOR_LAYER = 'Speckle.Core.Models.Collections.Collection:Objects.GIS.VectorLayer'
-
-  # PROXIES
-  SPECKLE_CORE_MODELS_INSTANCES_INSTANCE_PROXY = 'Speckle.Core.Models.Instances.InstanceProxy'
-  SPECKLE_CORE_MODELS_INSTANCES_INSTANCE_DEFINITION_PROXY = 'Speckle.Core.Models.Instances.InstanceDefinitionProxy'
-  SPECKLE_CORE_OTHER_RENDER_MATERIAL_PROXY = 'Objects.Other.RenderMaterialProxy'
-  SPECKLE_CORE_OTHER_COLOR_PROXY = 'Speckle.Core.Models.Proxies.ColorProxy'
+  SPECKLE_CORE_MODELS_COLLECTION = 'Speckle.Core.Models.Collection'
+  SPECKLE_CORE_MODELS_COLLECTION_RASTER_LAYER = 'Speckle.Core.Models.Collection:Objects.GIS.RasterLayer'
+  SPECKLE_CORE_MODELS_COLLECTION_VECTOR_LAYER = 'Speckle.Core.Models.Collection:Objects.GIS.VectorLayer'
 end

speckle_connector/src/convertors/base_object_serializer.rb

@@ -5,12 +5,10 @@ require 'securerandom'
 # rubocop:enable SketchupPerformance/OpenSSL
 require 'digest'
 require_relative 'converter'
-require_relative '../speckle_objects/base'
-require_relative '../speckle_objects/object_reference'
 require_relative '../speckle_entities/speckle_entity'
 require_relative '../relations/many_to_one_relation'
 
-module SpeckleConnector3
+module SpeckleConnector
   module Converters
     # Serializer of the base object.
     # Responsible to create id (hash) of the objects by holding their lineage and detaching relationships.
@@ -18,17 +16,23 @@ module SpeckleConnector3
       # @return [Integer] default chunk size the determine splitting base prop into chucks
       attr_reader :default_chunk_size
 
-      attr_reader :object_references
+      # @return [String] stream id to send conversion
+      attr_reader :stream_id
 
-      def initialize(preferences, default_chunk_size = 1000)
+      attr_accessor :speckle_state
+
+      # @param stream_id [String] stream id to send conversion
+      def initialize(speckle_state, stream_id, preferences, default_chunk_size = 1000)
+        @speckle_state = speckle_state
+        @stream_id = stream_id
         @preferences = preferences
         @default_chunk_size = default_chunk_size
         @detach_lineage = []
         @lineage = []
         @family_tree = {}
+        @family_tree_relation = Relations::ManyToOneRelation.new
         @closure_table = {}
         @objects = {}
-        @object_references = {}
       end
 
       # @param base [Object] top base object to populate all children and their relationship
@@ -39,15 +43,40 @@ module SpeckleConnector3
         id
       end
 
-      # @param base [Object] base object to populate all children and their relationship
+      def total_children_count(id)
+        @objects[id][:totalChildrenCount]
+      end
+
+      # @param base_and_entities [Object] base object to populate all children and their relationship
       # rubocop:disable Metrics/MethodLength
-      def traverse_base(base)
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/AbcSize
+      def traverse_base(base_and_entities)
+        base, entities = base_and_entities
+
         # 1. Create random string for lineage tracking.
         @lineage.append(SecureRandom.hex)
 
         # 2. Get last item from detach_lineage array
         is_detached = @detach_lineage.pop
 
+        # unless entities.nil?
+        #   is_sent_before = entities.all? do |entity|
+        #     check_base_available_on_state(entity, speckle_state)
+        #   end
+        #   if is_sent_before
+        #     speckle_entity = speckle_state.speckle_entities[entities.first.persistent_id]
+        #     ref_object = detach_helper(speckle_entity.id)
+        #     parent = @lineage[-1]
+        #     unless @family_tree[parent].nil?
+        #       @family_tree[parent] = @family_tree[parent].merge(speckle_entity.speckle_object[:__closure])
+        #     end
+        #     @objects[speckle_entity.id] = ref_object if is_detached
+        #     return speckle_entity.id, ref_object
+        #   end
+        # end
+
         # 3. Initialize traversed base object that will be filled with traversed values or
         # traversed base objects as props.
         traversed_base = SpeckleObjects::Base.new(speckle_type: base[:speckle_type], id: '')
@@ -56,6 +85,7 @@ module SpeckleConnector3
         traversed_base.delete(:applicationId)
 
         # 4. Iterate all entries (key, value) of the base {Base > Hash} object
+        # speckle_state = traverse_base_props(base, traversed_base)
         traverse_base_props(base, traversed_base)
         # this is where all props are done for current `traversed_base`
 
@@ -68,6 +98,9 @@ module SpeckleConnector3
           end
         end
 
+        # 6. Add total children count
+        traversed_base[:totalChildrenCount] = closure.keys.length
+
         # 7. Finally create id
         id = get_id(traversed_base)
 
@@ -75,7 +108,7 @@ module SpeckleConnector3
         traversed_base[:id] = id
 
         # 9. Update __closure table on the traversed base
-        unless closure.empty?
+        unless traversed_base[:totalChildrenCount].nil?
           @closure_table[id] = closure
           traversed_base[:__closure] = closure unless closure.empty?
         end
@@ -83,15 +116,19 @@ module SpeckleConnector3
         # 10. Save object string if detached
         @objects[id] = traversed_base if is_detached
 
-        if traversed_base[:applicationId]
-          @object_references[traversed_base[:applicationId].to_s] = SpeckleObjects::ObjectReference.new(
-            id, traversed_base[:applicationId].to_s, traversed_base[:__closure]
-          )
+        if @preferences[:user][:register_speckle_entity] && !entities.nil?
+          entities.uniq.each do |entity|
+            speckle_entity = create_or_update_speckle_entity(entity, id, traversed_base)
+            @speckle_state = speckle_state.with_speckle_entity(speckle_entity)
+          end
         end
 
         return id, traversed_base
       end
       # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/AbcSize
 
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
@@ -118,7 +155,7 @@ module SpeckleConnector3
           chunked_detach_match = prop.match(/^@\((\d*)\)/)
 
           # 3.5. If split chunk is needed and prop value is array, then run chunking process
-          if value.is_a?(Array) && chunked_detach_match
+          if value.is_a?(Array) && !base_and_entities?(value) && chunked_detach_match
             # 3.5.1. Determine chunk size, get it from prop if defined. ex: '@(31250)faces' -> 31250 = chunk size
             chunk_size = chunked_detach_match[1] == '' ? default_chunk_size : chunked_detach_match[1].to_i
 
@@ -167,15 +204,12 @@ module SpeckleConnector3
 
           child = traverse_value(value, is_detach_prop)
 
-          is_base = value.is_a?(Hash) && !value[:speckle_type].nil?
+          is_base = (value.is_a?(Hash) && !value[:speckle_type].nil?) ||
+                    (base_and_entities?(value) && value[0].is_a?(Hash) && !value[0][:speckle_type].nil?)
 
           # 3.6. traverse value according to value is a speckle object or not
           traversed_base[prop] = if is_base
-                                   if child[:referencedId] && child[:speckle_type] == 'reference'
-                                     is_detach_prop ? detach_helper(child[:referencedId]) : child
-                                   else
-                                     is_detach_prop ? detach_helper(child[:id]) : child
-                                   end
+                                   is_detach_prop ? detach_helper(child[:id]) : child
                                  else
                                    child
                                  end
@@ -187,6 +221,18 @@ module SpeckleConnector3
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
 
+      # Whether value has a pattern [<converted>, [<entity>, <entity>, ... <entity>]] or not.
+      def base_and_entities?(value)
+        is_array = value.is_a?(Array)
+        return false unless is_array
+
+        return false unless is_array && value.length == 2
+
+        return false if value[1].nil?
+
+        value[1].all? { |v| v.is_a?(Sketchup::Entity) }
+      end
+
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
@@ -196,8 +242,8 @@ module SpeckleConnector3
         # 1. Return same value if value is primitive type (string, numeric, boolean)
         return value unless value.is_a?(Hash) || value.is_a?(Array)
 
-        # 2. For pure arrays
-        if value.is_a?(Array)
+        # 2. For pure arrays (Without referencing any Sketchup Entity)
+        if value.is_a?(Array) && !base_and_entities?(value)
 
           # 2.1. If it is not detached then iterate array by traversing with their value
           unless is_detach
@@ -211,17 +257,7 @@ module SpeckleConnector3
           # 2.2. If it is detached than collect them into detached_list
           detached_list = []
           value.each do |el|
-            if el.is_a?(SpeckleObjects::ObjectReference)
-              if el.closure
-                el.closure.each_key do |k|
-                  detach_helper(k)
-                end
-              end
-              detached_list.append(detach_helper(el.referenced_id))
-              next
-            end
-
-            if el.is_a?(Hash) && !el[:speckle_type].nil?
+            if (el.is_a?(Hash) && !el[:speckle_type].nil?) || base_and_entities?(el)
               @detach_lineage.append(is_detach)
               id, _traversed_base = traverse_base(el)
               detached_list.append(detach_helper(id))
@@ -233,21 +269,11 @@ module SpeckleConnector3
           return detached_list
         end
 
-        # 3. ObjectReference
-        if value.is_a?(SpeckleObjects::ObjectReference)
-          if value.closure
-            value.closure.each_key do |k|
-              detach_helper(k)
-            end
-          end
-          return detach_helper(value.referenced_id)
-        end
-
-        # 4. Hash
+        # 3. Hash
         return value if value.is_a?(Hash) && value[:speckle_type].nil?
 
-        # 5. Base objects
-        if value.is_a?(Hash) && !value[:speckle_type].nil?
+        # 4. Base objects
+        if (value.is_a?(Hash) && !value[:speckle_type].nil?) || base_and_entities?(value)
           @detach_lineage.append(is_detach)
           _id, traversed_base = traverse_base(value)
           return traversed_base
@@ -279,17 +305,13 @@ module SpeckleConnector3
         }
       end
 
-      # @param traversed_base [SpeckleConnector3::SpeckleObjects::Base] traversed base object.
+      # @param traversed_base [SpeckleConnector::SpeckleObjects::Base] traversed base object.
       def get_id(traversed_base)
         Digest::MD5.hexdigest(traversed_base.to_json)
       end
 
-      def batch_objects
-        @objects
-      end
-
       # rubocop:disable Metrics/MethodLength
-      def batch_json_objects(max_batch_size_mb = 1)
+      def batch_objects(max_batch_size_mb = 1)
         max_size = 1000 * 1000 * max_batch_size_mb
         batches = []
         batch = '['
@@ -313,6 +335,32 @@ module SpeckleConnector3
         batches
       end
       # rubocop:enable Metrics/MethodLength
+
+      # @param entity [Sketchup::Entity] source entity object
+      # @param speckle_state [States::SpeckleState] the current speckle state of the {States::State}
+      def check_base_available_on_state(entity, speckle_state)
+        is_exist = speckle_state.speckle_entities.keys.include?(entity.persistent_id)
+        return is_exist unless is_exist
+
+        speckle_state.speckle_entities[entity.persistent_id].valid_stream_ids.include?(stream_id)
+      end
+
+      # Creates or updates speckle entity.
+      # If speckle entity exist in state, creates new one by updating old one.
+      # Else creates new one
+      # @return [SpeckleEntity] speckle entity that collects both speckle and sketchup information.
+      def create_or_update_speckle_entity(entity, id, traversed_base)
+        if speckle_state.speckle_entities.keys.include?(entity.persistent_id)
+          speckle_state.speckle_entities[entity.persistent_id].with_valid_stream_id(stream_id)
+        else
+          children = traversed_base[:__closure].nil? ? {} : traversed_base[:__closure]
+          speckle_entity = SpeckleEntities::SpeckleEntity.new(entity, id, entity.persistent_id,
+                                                              traversed_base[:speckle_type],
+                                                              children.keys, [stream_id])
+          speckle_entity.write_initial_base_data
+          speckle_entity
+        end
+      end
     end
   end
 end