Fix slab layer geometry for rotated and angled slabs

Three bugs fixed: 1. EditAssignedMaterial was sweeping all slabs that share a layer set when changing material properties, instead of updating only the selected element's assigned material. 2. slice_layerset_mesh (loader.py): layer bisect positions were scaled incorrectly due to a stale unit_scale and a reversed/missing DirectionSense guard. Now always recalculates unit_scale fresh and correctly applies sense_factor. 3. change_thickness (slab.py): extrusion depth was computed as `thickness / cos(obj.rotation_euler.x)`, which incorrectly scaled ObjectPlacement-rotated slabs (where the extrusion direction is local Z and no scaling is needed). The correct formula is `thickness / extrusion_vec.z`, which handles both ObjectPlacement rotation (extrusion_vec.z ≈ 1.0 → no scale) and ExtrudedDirection tilts (extrusion_vec.z < 1.0 → scale up) uniformly. The resulting slab was 1.414× too thick for 45°-rotated slabs, making both material layers appear fatter than specified. slice_layerset_mesh retains a depth_scale safety factor (extrusion_vec.z × ifc_depth / total_layer_thickness) as a robustness guard for IFC files from other authoring tools where extrusion depth may not match the sum of LayerThicknesses.
Fix slab layer geometry: custom offset isolation, unit scale, and layer ordering
2026-08-06 16:01:36 +00:00 · 2026-03-14 12:21:54 -05:00 · 2026-03-14 12:21:35 -05:00
577 changed files with 5723 additions and 47950 deletions
@@ -1,95 +0,0 @@
-#!/usr/bin/env -S uv run
-# /// script
-# dependencies = [
-#     "PyGithub",
-#     "requests",
-# ]
-# ///
-
-import os
-from pathlib import Path
-
-import requests
-from github import Github
-from github.GitReleaseAsset import GitReleaseAsset
-
-EXTENSION_ID = "bonsai"
-CURRENT_PYTHON_VERSION = "py313"
-CURRENT_PLATFORMS = ["linux-x64", "macos-arm64", "windows-x64"]
-
-
-def publish_asset(asset: GitReleaseAsset, token: str, repo_root: Path) -> None:
-    """
-    Publish an asset to Blender Extensions.
-    Reference: https://extensions.blender.org/api/v1/swagger
-    """
-    temp_path = repo_root / asset.name
-
-    response = requests.get(asset.browser_download_url)
-    response.raise_for_status()
-    temp_path.write_bytes(response.content)
-
-    url = f"https://extensions.blender.org/api/v1/extensions/{EXTENSION_ID}/versions/upload/"
-    headers = {"Authorization": f"Bearer {token}"}
-
-    files = {"version_file": temp_path.read_bytes()}
-    response = requests.post(url, headers=headers, files=files)
-    response.raise_for_status()
-
-    temp_path.unlink()
-
-    print(f"✓ Published {asset.name}")
-
-
-def main() -> None:
-    token = os.getenv("BLENDER_EXTENSIONS_TOKEN")
-    if not token:
-        raise Exception("BLENDER_EXTENSIONS_TOKEN environment variable not set")
-
-    # Get the repository root
-    repo_root = Path(__file__).parent.parent.parent
-
-    # Read VERSION file
-    version_file = repo_root / "VERSION"
-    version = version_file.read_text().strip()
-
-    print(f"Current VERSION: {version}")
-
-    tag_name = f"bonsai-{version}"
-
-    # Get release from GitHub
-    gh = Github()
-    gh_repo = gh.get_repo("IfcOpenShell/IfcOpenShell")
-    release = gh_repo.get_release(tag_name)
-
-    assets = release.get_assets()
-
-    asset_platform_map: dict[str, tuple[GitReleaseAsset, str]] = {}
-    for asset in assets:
-        if CURRENT_PYTHON_VERSION not in asset.name:
-            continue
-        for platform in CURRENT_PLATFORMS:
-            if platform in asset.name:
-                asset_platform_map[asset.name] = (asset, platform)
-                break
-
-    if len(asset_platform_map) != len(CURRENT_PLATFORMS):
-        found_platforms = {platform for _, (_, platform) in asset_platform_map.items()}
-        missing_platforms = set(CURRENT_PLATFORMS) - found_platforms
-        raise Exception(
-            f"Expected {len(CURRENT_PLATFORMS)} assets but found {len(asset_platform_map)}. "
-            f"Missing: {', '.join(sorted(missing_platforms))}"
-        )
-
-    print("\nRelease assets:")
-    for asset_name in sorted(asset_platform_map.keys()):
-        print(f"- {asset_name}")
-
-    # https://extensions.blender.org/api/v1/swagger
-    print("\nPublishing assets to Blender Extensions:")
-    for asset_name, (asset, platform) in asset_platform_map.items():
-        publish_asset(asset, token, repo_root)
-
-
-if __name__ == "__main__":
-    main()
@@ -53,7 +53,7 @@ jobs:
          python ../nix/cache_dependencies.py unpack

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2.20
        with:
          key: mac-${{ matrix.arch }}

@@ -29,7 +29,7 @@ jobs:
          python ../IfcOpenShell/nix/cache_dependencies.py unpack

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2.20
        with:
          key: ubuntu-22.04-${{ runner.arch }}

@@ -9,13 +9,6 @@ jobs:
    container: rockylinux:9

    steps:
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
-
-      - name: Install Python
-        # Installs latest Python version so it's preferred by uv over Rocky's system Python.
-        run: uv python install
-
      - name: Install Dependencies
        run: |
          dnf update -y
@@ -24,6 +17,7 @@ jobs:
                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
                         findutils xz byacc
+          python3 -m pip install typing_extensions
          git config --global --add safe.directory '*'

      - name: Install aws cli
@@ -51,10 +45,10 @@ jobs:
      - name: Unpack Dependencies
        run: |
          cd build
-          uv run ../nix/cache_dependencies.py unpack
+          python3 ../nix/cache_dependencies.py unpack

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2.20
        with:
          key: ubuntu-22.04-${{ runner.arch }}-rockylinux9

@@ -62,7 +56,7 @@ jobs:
        shell: bash
        run: |
          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release uv run ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log

      - name: Upload Build Logs
        if: always()
@@ -77,7 +71,7 @@ jobs:
      - name: Pack Dependencies
        run: |
          cd build
-          uv run ../nix/cache_dependencies.py pack
+          python3 ../nix/cache_dependencies.py pack

      - name: Commit and Push Changes to Build Repository
        run: |
@@ -9,13 +9,6 @@ jobs:
    container: arm64v8/rockylinux:9

    steps:
-      - name: Set up uv
-        uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
-
-      - name: Install Python
-        # Installs latest Python version so it's preferred by uv over Rocky's system Python.
-        run: uv python install
-
      - name: Install Dependencies
        run: |
          dnf update -y
@@ -24,6 +17,7 @@ jobs:
                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
                         findutils xz byacc
+          python3 -m pip install typing_extensions
          git config --global --add safe.directory '*'

      - name: Install aws cli
@@ -51,10 +45,10 @@ jobs:
      - name: Unpack Dependencies
        run: |
          cd build
-          uv run ../nix/cache_dependencies.py unpack
+          python3 ../nix/cache_dependencies.py unpack

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2.20
        with:
          key: ubuntu-22.04-${{ runner.arch }}-rockylinux9

@@ -62,7 +56,7 @@ jobs:
        shell: bash
        run: |
          set -o pipefail
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release uv run ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log

      - name: Upload Build Logs
        if: always()
@@ -77,7 +71,7 @@ jobs:
      - name: Pack Dependencies
        run: |
          cd build
-          uv run ../nix/cache_dependencies.py pack
+          python3 ../nix/cache_dependencies.py pack

      - name: Commit and Push Changes to Build Repository
        run: |
@@ -52,7 +52,7 @@ jobs:
          }

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2.20
        with:
          key: win-${{ matrix.arch }}
          # Windows ccache needs ~1GB
@@ -1,4 +1,4 @@
-name: ci-lint
+name: ci-black-formatting

 on:
  push:
@@ -7,9 +7,6 @@ on:
 jobs:
  lint-formatting:
    runs-on: ubuntu-latest
-    env:
-      MIN_IOS_PY_VERSION: "3.10"
-      MIN_BLENDER_PY_VERSION: "3.11"
    steps:
      - name: Action - checkout repository
        uses: actions/checkout@v6
@@ -17,12 +14,12 @@ jobs:
      - name: Action - install python
        uses: actions/setup-python@v6
        with:
-          python-version: ${{ env.MIN_IOS_PY_VERSION }}
+          python-version: "3.10"

      - name: Action - install python
        uses: actions/setup-python@v6
        with:
-          python-version: ${{ env.MIN_BLENDER_PY_VERSION }}
+          python-version: "3.11"

      - name: Install dependencies
        run: |
@@ -30,7 +27,6 @@ jobs:
          uv tool install ruff
          uv tool install black
          uv tool install poethepoet
-          uv tool install ty==0.0.34

      # black doesn't catch all syntax errors, so we check them explicitly.
      - name: Check syntax errors
@@ -39,8 +35,8 @@ jobs:
          ERROR=0
          # Using 2 Python versions - one minimum required for IfcOpenShell
          # and other that's used by Blender currently.
-          python${{ env.MIN_IOS_PY_VERSION }} -W error -m compileall -q src/ifcopenshell-python || ERROR=1
-          python${{ env.MIN_BLENDER_PY_VERSION }} -W error -m compileall -q src/bonsai || ERROR=1
+          python3.10 -W error -m compileall -q src/ifcopenshell-python || ERROR=1
+          python3.11 -W error -m compileall -q src/bonsai || ERROR=1
          exit $ERROR
        continue-on-error: true

@@ -58,13 +54,6 @@ jobs:
          black --diff --check . | black-codeclimate | python .github/workflows/black_to_github_annotations.py
        continue-on-error: true

-      - name: ty check
-        id: ty
-        run: |
-          poe ty-venv
-          poe ty
-        continue-on-error: true
-
      - name: Ruff check
        id: ruff
        run: |
@@ -95,7 +84,8 @@ jobs:
            echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
          }

-          run_check poe ruff
+          run_check poe ruff-main
+          run_check poe ruff-old

          exit $ERROR
        continue-on-error: true
@@ -112,7 +102,4 @@ jobs:
          if [ "${{ steps.ruff.outcome }}" != "success" ]; then
            echo "::error::Ruff check failed, see Summary or 'ruff' step for the details." && ERROR=1
          fi
-          if [ "${{ steps.ty.outcome }}" != "success" ]; then
-            echo "::error::ty check failed, see 'ty check' step for the details." && ERROR=1
-          fi
          exit $ERROR
@@ -109,7 +109,7 @@ jobs:
          # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.

          # Download Blender.
-          wget -q -O blender.tar.xz https://download.blender.org/release/Blender5.1/blender-5.1.0-linux-x64.tar.xz
+          wget -q -O blender.tar.xz https://download.blender.org/release/Blender5.0/blender-5.0.1-linux-x64.tar.xz
          tar -xf blender.tar.xz

          # Setup Blender.
@@ -122,7 +122,7 @@ jobs:
          pip install -r requirements.txt
          python setup_extensions_repo.py --last-tag
          cd ..
-          bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py313*-linux-x64.zip)"
+          bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py311*-linux-x64.zip)"

          # Install Bonsai.
          blender --command extension install-file -r user_default -e $bonsai_zip
@@ -24,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py311, py312, py313]
+        pyver: [py311, py312]
        config:
          - {
            name: "Windows Build",
@@ -42,11 +42,6 @@ jobs:
            name: "MacOS ARM Build",
            short_name: macosm1,
          }
-        exclude:
-          # Python 3.13 is needed for Blender 5.1+ and Blender dropped Intel Mac support in 5.0.
-          - pyver: py313
-            config:
-              short_name: macos
    steps:
      - uses: actions/checkout@v6
      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
@@ -1,35 +0,0 @@
-name: ci-ifcedit-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcedit &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcedit/dist
@@ -1,36 +0,0 @@
-name: ci-ifcmcp-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcmcp &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcmcp/dist
-          verbose: true
@@ -24,7 +24,7 @@ jobs:
    if: |
      github.repository == 'IfcOpenShell/IfcOpenShell'
    steps:
-      - uses: mamba-org/setup-micromamba@v3 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v2 # https://github.com/mamba-org/setup-micromamba
        with:
          environment-name: test-env
          create-args: >-
@@ -84,7 +84,7 @@ jobs:
        run: |
          curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/

-      - uses: mamba-org/setup-micromamba@v3 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/setup-micromamba@v2 # https://github.com/mamba-org/setup-micromamba
        with:
          environment-name: test-env
          create-args: >-
@@ -35,7 +35,7 @@ jobs:

    -
      name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.23
+      uses: hendrikmuhs/ccache-action@v1.2.20

    - 
      name: Build ifcopenshell
@@ -91,7 +91,7 @@ jobs:
        lfs: true
    
    - name: Download 
-      uses: actions/download-artifact@v8.0.1
+      uses: actions/download-artifact@v8.0.0
      with:
        # Artifact name
        name: ifcos-artifacts
@@ -24,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313, py314]
        config:
          - {
            name: "Windows 64bit",
@@ -19,7 +19,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py310, py311, py312, py313, py314]
+        pyver: [py39, py310, py311, py312, py313, py314]
        config:
          - {
            name: "Windows 64bit",
@@ -1,35 +0,0 @@
-name: ci-ifcquery-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: '3.11'
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcquery &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcquery/dist
@@ -1,46 +0,0 @@
-name: Release Pyodide WASM Wheel
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout IfcOpenShell
-        uses: actions/checkout@v6
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-
-      - name: Build wheel
-        working-directory: pyodide
-        run: uv run pack_wheel.py --build
-
-      - name: Find wheel
-        id: wheel
-        run: |
-          WHEEL=$(ls pyodide/dist/ifcopenshell-*.whl)
-          echo "path=$WHEEL" >> $GITHUB_OUTPUT
-          echo "name=$(basename $WHEEL)" >> $GITHUB_OUTPUT
-
-      - name: Checkout wasm-wheels
-        uses: actions/checkout@v6
-        with:
-          repository: IfcOpenShell/wasm-wheels
-          path: wasm-wheels
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-
-      - name: Commit and push wheel to wasm-wheels
-        run: |
-          WHEEL_NAME="${{ steps.wheel.outputs.name }}"
-          cp "${{ steps.wheel.outputs.path }}" "wasm-wheels/$WHEEL_NAME"
-          cd wasm-wheels
-          git config user.name "IfcOpenBot"
-          git config user.email "ifcopenbot@ifcopenshell.org"
-          git add "$WHEEL_NAME"
-          git commit -m "Add $WHEEL_NAME"
-          VERSION=$(cat ../VERSION)
-          git tag "v${VERSION}"
-          git push origin main
-          git push origin "v${VERSION}"
@@ -51,7 +51,7 @@ jobs:
      - name: Install dependencies
        run: |
          python -m pip install --upgrade pip
-          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely pyparsing
+          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
          pip install src/bcf --no-deps
          pip install pytest-xdist==3.8.0

@@ -79,7 +79,7 @@ jobs:
          libhdf5-dev libcgal-dev libeigen3-dev
          
      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.23
+        uses: hendrikmuhs/ccache-action@v1.2.20
        with:
          key: ubuntu-22.04-${{ runner.arch }}

@@ -254,7 +254,6 @@ jobs:
          cd ../ifcpatch && make test || ERROR=1
          pip install -e ../ifctester --no-deps
          cd ../ifctester && make test || ERROR=1
-          make build-ids-docs || ERROR=1
          # Run mathutils related tests at the end to ensure no other code is relying on mathutils.
          cd ../ifcopenshell-python
          pip install mathutils
@@ -0,0 +1,36 @@
+name: Build and Deploy Stable Documentation
+
+on:
+  workflow_dispatch:  # Manual trigger
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          cd src/bonsai/docs
+          pip install -r requirements.txt  # Run pip install from the docs directory
+
+      - name: Build documentation
+        run: |
+          cd src/bonsai/docs
+          make html
+
+      - name: Deploy to GitHub Pages (Stable)
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          external_repository: IfcOpenShell/bonsaibim_org_docs
+          publish_branch: main
+          cname: docs.bonsaibim.org
+          publish_dir: src/bonsai/docs/_build/html
@@ -1,65 +0,0 @@
-name: Deploy AI chat App to static page repo
-
-permissions:
-  id-token: write
-  pages: write
-
-on:
-  push:
-    paths:
-      - 'src/ifcchat/**'
-      - '.github/workflows/publish-aichat-app.yaml'
-    branches:
-      - v0.8.0
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-      
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout (recursive)
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Checkout intermediate Pages repo
-        uses: actions/checkout@v6
-        with:
-          repository: IfcOpenShell/aichat_ifcopenshell_org_static_html
-          ref: gh-pages
-          path: output
-          token: ${{ secrets.WEBSITE_PUBLISH }}
-      - name: Sync demo app into target subfolder
-        run: |
-          rsync -av --delete --exclude='.git/' src/ifcchat/ output/
-      - name: Setup Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.x"
-      - name: Download wheels
-        working-directory: output/
-        run: |
-          pip download ifcquery==0.8.5 ifcopenshell-mcp==0.8.5 ifcedit==0.8.5 lark==1.3.1 isodate==0.7.2 --no-deps -d ./dist
-      - name: Commit and push if changed
-        working-directory: output
-        run: |
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-
-          git add .
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-            exit 0
-          fi
-
-          git commit  -m "$(git log --oneline -1)"
-          git push origin gh-pages
@@ -1,16 +0,0 @@
-name: Publish Bonsai Releases
-
-on:
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: astral-sh/setup-uv@v7
-
-      - run: uv run .github/scripts/publish-bonsai-releases.py
-        env:
-          BLENDER_EXTENSIONS_TOKEN: ${{ secrets.BLENDER_EXTENSIONS_TOKEN }}
@@ -1,4 +1,4 @@
-name: Deploy Pyodide Demo App to static page repo
+name: Deploy Pyodide Demo App to GitHub Pages

 permissions:
  id-token: write
@@ -11,7 +11,6 @@ on:
      - '.github/workflows/publish-pyodide-demo-app.yml'
    branches:
      - v0.8.0
-  workflow_dispatch:

 jobs:
  activate:
@@ -31,27 +30,21 @@ jobs:
        with:
          submodules: recursive
          fetch-depth: 0
-      - name: Checkout intermediate Pages repo
-        uses: actions/checkout@v6
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v4
        with:
-          repository: IfcOpenShell/wasm_ifcopenshell_org_static_html
-          ref: gh-pages
-          path: output
-          token: ${{ secrets.WEBSITE_PUBLISH }}
-      - name: Sync demo app into target subfolder
-        run: |
-          rsync -av --delete --exclude='.git/' src/pyodide/demo-app/ output/
-      - name: Commit and push if changed
-        working-directory: output
-        run: |
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
+          path: src/pyodide/demo-app/

-          git add .
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-            exit 0
-          fi
-
-          git commit -m "$(git log --oneline -1)"
-          git push origin gh-pages
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
@@ -5,8 +5,6 @@
 /_installed-vs*-x*/
 /build/
 /src/examples/build/
-# ifctester docs output
-/src/ifctester/test/build/

 # output directories
 /cmake/out/
@@ -14,7 +12,6 @@
 /src/ifcmax/out/
 /src/ifcwrap/out/
 /src/qtviewer/out/
-/src/ifctester/webapp/public/pyodide/

 /win/BuildDepsCache*.txt

@@ -83,14 +80,10 @@ src/ifcopenshell-python/test/build
 # bonsai i18n
 src/bonsai/bonsai/translations.py

-# bonsai external dependencies (cloned for just ty checks)
-src/bonsai/external_dependencies/
-
-# bonsai test temp/cache files
+# bonsai test temp files
 src/bonsai/test/files/temp
-src/bonsai/test/files/*.cache.blend
-src/bonsai/test/files/*.cache.json
-src/bonsai/test/files/*.cache.sqlite
+src/bonsai/test/files/basic.ifc.cache.blend
+src/bonsai/test/files/basic.ifc.cache.sqlite

 # bonsai data
 src/bonsai/bonsai/bim/data/build/
@@ -122,9 +115,3 @@ dev_environment.bat

 src/ifcopenshell-python/ifcopenshell/express/*.exp
 src/ifcopenshell-python/ifcopenshell/express/*.exp.cache.dat
-
-
-# temp files from AI coding tools
-*.claude
-*.py.tmp*
-*.json.tmp*
@@ -50,14 +50,11 @@ Contents
 | [ifcconvert](https://docs.ifcopenshell.org/ifcconvert.html)                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
 | [ifccsv](https://docs.ifcopenshell.org/ifccsv.html)                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
 | [ifcdiff](https://docs.ifcopenshell.org/ifcdiff.html)                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
-| [ifcedit](https://docs.ifcopenshell.org/ifcedit.html)                   | CLI wrapper for ifcopenshell.api IFC model mutation functions         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcedit?label=PyPI&color=006dad)](https://pypi.org/project/ifcedit/) |
 | [ifcfm](https://docs.ifcopenshell.org/ifcfm.html)                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
 | [ifcmax](https://docs.ifcopenshell.org/ifcmax.html)                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
-| [ifcmcp](https://docs.ifcopenshell.org/ifcmcp.html)                    | MCP server for querying and editing IFC building models               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcopenshell-mcp?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell-mcp/) |
-| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) [![Pyodide WASM Wheels tag](https://img.shields.io/github/v/tag/ifcopenshell/wasm-wheels?sort=semver&label=pyodide-wasm-wheels)](https://github.com/IfcOpenShell/wasm-wheels) |
+| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) [Pyodide WASM Wheels](https://github.com/IfcOpenShell/wasm-wheels#pyodide-test-wheels) |
 | [ifcpatch](https://docs.ifcopenshell.org/ifcpatch.html)                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
-| [ifcquery](https://docs.ifcopenshell.org/ifcquery.html)                  | CLI tool for querying and inspecting IFC building models              | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcquery?label=PyPI&color=006dad)](https://pypi.org/project/ifcquery/) |
-| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
+| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
 | [ifctester](https://docs.ifcopenshell.org/ifctester.html)                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |

 The IfcOpenShell C++ codebase is split into multiple interal libraries:
@@ -1 +1 @@
-0.8.6
+0.8.5
@@ -13,7 +13,6 @@ import hashlib
 import os
 import pathlib
 import re
-import subprocess
 from typing import NoReturn
 from urllib import request

@@ -21,7 +20,7 @@ from github import Github


 def get_repo_tag_names() -> list[str]:
-    git_return = subprocess.check_output("git tag -l", text=True)
+    git_return = os.popen("git tag -l").read()
    tag_names = [tag_name for tag_name in git_return.split("\n") if tag_name]
    print(f"{len(tag_names)} tag_names found in repo")
    return tag_names
@@ -79,10 +78,6 @@ def get_release_zip(tag: str) -> tuple[str, str]:
    raise Exception(f"Couldn't find the release matching '{python_version}' and '{TARGET_OS}' in tag '{tag}'.")


-def run(command: str) -> None:
-    subprocess.check_output(command)
-
-
 start = datetime.datetime.now()

 URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
@@ -102,7 +97,7 @@ should_release = False
 target_release_tag = ""
 TARGET_OS = "windows-x64"

-git_status = subprocess.check_output("git status", text=True)
+git_status = os.popen("git status").read()
 print(git_status)

 for tag_name in get_repo_tag_names():
@@ -152,7 +147,7 @@ blenderbim_build_version = target_release_tag.replace("blenderbim-", "")

 # url_blenderbim_py3x_win_zip
 release_zip_file_name, url_blenderbim_py3x_win_zip = get_release_zip(target_release_tag)
-subprocess.check_call(f"wget {url_blenderbim_py3x_win_zip} --no-verbose")
+os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()

 # sha256sum_blenderbim_py310_win_zip
 sha256sum_blenderbim_py3x_win_zip = get_file_sha256_hash(release_zip_file_name)
@@ -206,13 +201,13 @@ print("[INFO] inserting dynamic chocolatey package parameters successful")
 print("\n_____ build choco.exe with mono")

 choco_version = "1.1.0"
-run(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet")
-run(f"tar -xzf {choco_version}.tar.gz")
+os.popen(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet").read()
+os.popen(f"tar -xzf {choco_version}.tar.gz").read()
 print("choco tar unpack successful")
 os.chdir("choco-1.1.0")
-run("./build.sh")
+os.popen("./build.sh").read()

-run("cp -r build_output/chocolatey /opt/chocolatey")
+os.popen("cp -r build_output/chocolatey /opt/chocolatey").read()
 os.chdir(BLENDERBIM_DIR)

 if pathlib.Path("/opt/chocolatey/choco.exe").exists():
@@ -220,15 +215,11 @@ if pathlib.Path("/opt/chocolatey/choco.exe").exists():

 print("\n_____ build choco pack")

-run("mono /opt/chocolatey/choco.exe pack --allow-unofficial")
-run(
-    'mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial'
-)
+os.popen("mono /opt/chocolatey/choco.exe pack --allow-unofficial").read()
+os.popen('mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial').read()

 print("\n_____ build choco push")
-run(
-    'mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose'
-)
+os.popen('mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose').read()

 print(f"choco push of version: {target_release_tag} successful!")
 print(f"it took: {datetime.datetime.now() - start}")
@@ -258,14 +258,10 @@ if(WITH_ROCKSDB)
    set(ROCKSDB_LIBRARIES "IFCOPENSHELL_RocksDB")
    target_compile_definitions(IFCOPENSHELL_RocksDB INTERFACE IFOPSH_WITH_ROCKSDB)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB)
+    # Shared binaries for `rocksdb` only support limited API (only `c.h`), but we use `db.h` API.
+    # So rocksdb supported only as a static library.
    # See https://github.com/facebook/rocksdb/issues/981.
-    if(TARGET RocksDB::rocksdb)
-        target_link_libraries(IFCOPENSHELL_RocksDB INTERFACE RocksDB::rocksdb)
-    elseif(TARGET RocksDB::rocksdb-shared)
-        target_link_libraries(IFCOPENSHELL_RocksDB INTERFACE RocksDB::rocksdb-shared)
-    else()
-        message(FATAL_ERROR "RocksDB found but neither RocksDB::rocksdb nor RocksDB::rocksdb-shared target exists")
-    endif()
+    target_link_libraries(IFCOPENSHELL_RocksDB INTERFACE RocksDB::rocksdb)

    if(WITH_ZSTD)
        # @todo do we actually need the zstd include dir or rather just pass
@@ -88,15 +88,7 @@ if(NOT HDF5_INCLUDE_DIR OR NOT HDF5_LIBRARY_DIR)
    mark_as_advanced(HDF5_DIR)
    if(HDF5_DIR)
        message(STATUS "HDF5: found config at '${HDF5_DIR}'.")
-        if(TARGET hdf5_cpp-static)
-            set(HDF5_LIBRARIES hdf5_cpp-static)
-        elseif(TARGET hdf5_cpp-shared)
-            set(HDF5_LIBRARIES hdf5_cpp-shared)
-        elseif(TARGET hdf5::hdf5_cpp-shared)
-            set(HDF5_LIBRARIES hdf5::hdf5_cpp-shared)
-        else()
-            find_package(HDF5 REQUIRED COMPONENTS CXX)
-        endif()
+        set(HDF5_LIBRARIES hdf5_cpp-static)
    else()
        # If it failed, still try to find as a module.
        # E.g. on Ubuntu `libhdf5-dev` doesn't provie hdf5-config.cmake.
@@ -1,6 +1,4 @@
 #!/usr/bin/python
-# /// script
-# ///
 ###############################################################################
 #                                                                             #
 # This file is part of IfcOpenShell.                                          #
@@ -126,9 +124,16 @@ ssl._create_default_https_context = ssl._create_unverified_context
 import time
 from collections.abc import Generator, Sequence
 from pathlib import Path
-from typing import Literal, Union
 from urllib.request import urlretrieve

+try:
+    from typing import Literal, Union
+except:
+    # python 3.6 compatibility for rocky 8
+    from typing import Union
+
+    from typing_extensions import Literal
+
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 ch = logging.StreamHandler()
@@ -1089,19 +1094,10 @@ if "python" in targets and not USE_CURRENT_PYTHON_VERSION and "wasm" not in flag
            f"http://www.python.org/ftp/python/{PYTHON_VERSION}/",
            f"Python-{PYTHON_VERSION}.tgz",
        )
-        python_install = INSTALL_DIR / f"python-{PYTHON_VERSION}"
-        python_bin = python_install / "bin" / "python3"
+        python_bin = INSTALL_DIR / f"python-{PYTHON_VERSION}" / "bin" / "python3"
        # `_ssl` module is present -> we will be able to install `numpy` later
        # to verify IfcOpenShell installation
-        try:
-            run([str(python_bin), "-c", "import _ssl"])
-        except RuntimeError:
-            print(
-                "ERROR: Python was built without SSL support (_ssl module is missing). "
-                f"To fix this: remove the installed Python at {python_install}; "
-                "install OpenSSL development libraries and re-run."
-            )
-            raise
+        run([str(python_bin), "-c", "import _ssl"])

    if MAC_CROSS_COMPILE_INTEL:
        assert original_path
@@ -1519,7 +1515,7 @@ if "IfcOpenShell-Python" in targets:
        )
        # Copy setup.py where pyodide build system expects it.
        shutil.copy(REPO_PATH / "pyodide" / "setup.py", REPO_PATH)
-        # Empty pyproject so it's contents won't affect the resulting wheel
+        # Empty pyproject so it's contents won't affect the resulting wheelthe the
        # otherwise the wheel will use version and dependencies from toml, not setup.py.
        (REPO_PATH / "pyproject.toml").write_text("")

@@ -1,5 +1,3 @@
-# /// script
-# ///
 """
 Cache built dependencies for builds.

@@ -43,9 +41,6 @@ def pack_dependencies(install_dir: Path) -> None:
        if not dependency_path.is_dir():
            continue
        dependency_name = dependency_path.name
-        # Skip ifcopenshell - it's a build output, not a dependency to reuse across builds.
-        if dependency_name == "ifcopenshell":
-            continue
        tar_path = install_dir / f"{CACHE_PREFIX}{dependency_name}.tar.gz"
        if tar_path.exists():
            print(f"Skipping existing cache: '{tar_path}'")
@@ -1,11 +1,6 @@
 #!/usr/bin/bash
 set -ex

-PYODIDE_VERSION=0.29.3
-PYODIDE_BUILD_VERSION=0.33.0
-PYODIDE_XBUILDENV_ROOT="${HOME}/.cache/.pyodide-xbuildenv-${PYODIDE_BUILD_VERSION}"
-PYODIDE_XBUILDENV="${PYODIDE_XBUILDENV_ROOT}/${PYODIDE_VERSION}"
-
 # Script is assuming that it will be possible to execute it multiple times
 # therefore we're clearing venv each time and ignoring existing 'emsdk' folder.

@@ -16,15 +11,21 @@ source .venv/bin/activate

 # Install pyodide cross build environment.
 # Instructions: https://pyodide.org/en/stable/development/building-packages.html
-uv pip install "pyodide-build==${PYODIDE_BUILD_VERSION}"
+uv pip install pyodide-build
 # `uv run` is required, so xbuildenv would skip using `pip`.
-uv run pyodide xbuildenv install "${PYODIDE_VERSION}"
-uv run pyodide xbuildenv install-emscripten
+uv run pyodide xbuildenv install

-EMSDK_ROOT="${PYODIDE_XBUILDENV}/emsdk"
-source "${EMSDK_ROOT}/emsdk_env.sh"
+# Emscripten doesn't come with xbuildenv.
+if [ ! -d emsdk ]; then
+  git clone https://github.com/emscripten-core/emsdk
+fi
+pushd emsdk
+PYODIDE_EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)
+./emsdk install ${PYODIDE_EMSCRIPTEN_VERSION}
+./emsdk activate ${PYODIDE_EMSCRIPTEN_VERSION}
+source emsdk_env.sh
 which emcc
-emcc --version
+popd

 mkdir -p packages/ifcopenshell
 VERSION=`cat IfcOpenShell/VERSION`
@@ -1,232 +0,0 @@
-#
-# /// script
-# # Latest Pyodide build env versions are listed here:
-# # https://pyodide.github.io/pyodide/api/pyodide-cross-build-environments.json
-# # https://github.com/pyodide/pyodide-build/blob/main/pyodide_build/xbuildenv_releases.py
-# requires-python = "==3.13.2"
-# dependencies = [
-#   "requests",
-#   "setuptools",
-# ]
-# ///
-"""
-Pack an IfcOpenShell WASM wheel using Pyodide build system.
-
-Usage:
-    uv run make_wheel.py           # Show this help
-    uv run make_wheel.py --build   # Build wheel
-    uv run make_wheel.py --clean   # Clean build artifacts and exit
-"""
-
-import argparse
-import os
-import re
-import shutil
-import subprocess
-import time
-import zipfile
-from pathlib import Path
-from urllib.parse import quote
-
-import requests
-
-# Get repo root (parent of this script's parent directory)
-REPO_ROOT = Path(__file__).parent.parent
-PYODIDE_DIR = REPO_ROOT / "pyodide"
-BUILD_DIR = PYODIDE_DIR / "build"
-
-# Hardcoded path (Windows packing workaround with --dev flag)
-PYODIDE_BUILD = Path(r"L:\Projects\Github\pyodide-build")
-
-# Wheel platform tag (from PYODIDE_EMSCRIPTEN_VERSION in pyodide-build/Makefile.envs)
-WHEEL_PLATFORM_TAG = "emscripten_4_0_9_wasm32"
-
-# Location where ifcopenshell will be extracted
-IFCOPENSHELL_DIR = PYODIDE_DIR / "ifcopenshell"
-
-
-class WheelBuilder:
-    @staticmethod
-    def extract_ifcopenshell_from_git(dst: Path) -> None:
-        """Extract ifcopenshell directory from git repo into destination."""
-        Tools.rmrf(dst)
-
-        print(f"Extracting ifcopenshell from git to {dst}...")
-        # Use git ls-files piped to git checkout-index to avoid copying
-        # untracked or ignored files from the actual repo.
-        ls_proc = subprocess.Popen(
-            ["git", "ls-files", "-z", "src/ifcopenshell-python/ifcopenshell"],
-            cwd=REPO_ROOT,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-        checkout_proc = subprocess.Popen(
-            ["git", "checkout-index", "-z", "--prefix", "pyodide/", "--stdin"],
-            cwd=REPO_ROOT,
-            stdin=ls_proc.stdout,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-        assert ls_proc.stdout is not None
-        ls_proc.stdout.close()
-        checkout_proc.communicate()
-
-        if checkout_proc.returncode != 0:
-            assert checkout_proc.stderr is not None
-            raise RuntimeError(f"Failed to extract: {checkout_proc.stderr.decode()}")
-
-        # Move src/ifcopenshell-python/ifcopenshell to ifcopenshell.
-        temp_src = PYODIDE_DIR / "src" / "ifcopenshell-python" / "ifcopenshell"
-        shutil.move(temp_src, dst)
-
-        # Clean up temporary src directory.
-        Tools.rmrf(PYODIDE_DIR / "src")
-
-        print("✓ Extracted ifcopenshell from git")
-
-    @staticmethod
-    def get_wheel_url(makefile_path: Path) -> str:
-        """Get S3 wheel URL based on BINARY_VERSION and BUILD_COMMIT from Makefile."""
-
-        def parse_makefile_vars() -> dict[str, str]:
-            content = makefile_path.read_text()
-            vars: dict[str, str] = {}
-            for match in re.finditer(r"^(BINARY_VERSION|BUILD_COMMIT):=(.+)$", content, re.MULTILINE):
-                vars[match.group(1)] = match.group(2).strip()
-            return vars
-
-        vars: dict[str, str] = parse_makefile_vars()
-        binary_version = vars["BINARY_VERSION"]
-        build_commit = vars["BUILD_COMMIT"]
-        filename = f"ifcopenshell-{binary_version}+{build_commit}-cp313-cp313-pyodide_2025_0_wasm32.whl"
-        encoded_filename = quote(filename, safe="")
-        return f"https://s3.amazonaws.com/ifcopenshell-builds/{encoded_filename}"
-
-    @staticmethod
-    def download_and_extract_so(url: str, build_dir: Path) -> tuple[Path, Path]:
-        """Download wheel from URL and extract .so and .py files."""
-        py_wrapper_filename = "ifcopenshell_wrapper.py"
-        build_dir.mkdir(parents=True, exist_ok=True)
-
-        wheel_path = build_dir / url.rsplit("/", 1)[-1]
-
-        if wheel_path.exists():
-            print(f"Using cached wheel: {wheel_path}")
-        else:
-            print(f"Downloading {url}...")
-            response = requests.get(url)
-            response.raise_for_status()
-            wheel_path.write_bytes(response.content)
-
-        print("Extracting _ifcopenshell_wrapper files...")
-        with zipfile.ZipFile(wheel_path) as zf:
-            so_files = [f for f in zf.namelist() if f.endswith(".so")]
-            py_files = [f for f in zf.namelist() if f.endswith(py_wrapper_filename)]
-
-            assert so_files, "No .so file found in wheel"
-            assert py_files, f"No {py_wrapper_filename} file found in wheel"
-
-            so_file = so_files[0]
-            so_dst = build_dir / Path(so_file).name
-            so_dst.write_bytes(zf.read(so_file))
-
-            py_file = py_files[0]
-            py_dst = build_dir / Path(py_file).name
-            py_dst.write_bytes(zf.read(py_file))
-
-        return so_dst, py_dst
-
-
-class Tools:
-    @staticmethod
-    def run(
-        cmd: list[str],
-        cwd: Path | None = None,
-    ) -> None:
-        print(f"$ {' '.join(cmd)}")
-        subprocess.check_call(cmd, cwd=cwd)
-
-    @staticmethod
-    def create_symlink(dst: Path, src: Path) -> None:
-        Tools.rmrf(dst)
-        dst.symlink_to(src)
-
-    @staticmethod
-    def rmrf(path: Path) -> None:
-        if path.exists() or path.is_symlink():
-            if path.is_dir() and not path.is_symlink():
-                shutil.rmtree(path)
-            else:
-                path.unlink()
-
-
-def clean() -> None:
-    """Remove build artifacts."""
-    paths_to_remove = (
-        BUILD_DIR,
-        PYODIDE_DIR / ".pyodide_build",
-        PYODIDE_DIR / "dist",
-        PYODIDE_DIR / "ifcopenshell.egg-info",
-        PYODIDE_DIR / "src",
-        IFCOPENSHELL_DIR,
-    )
-    for path in paths_to_remove:
-        if path.exists() or path.is_symlink():
-            print(f"Removing {path}...")
-            Tools.rmrf(path)
-    print("✓ Clean complete")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description=__doc__, add_help=False)
-    parser.add_argument("--build", action="store_true", help="Build the wheel")
-    parser.add_argument("--clean", action="store_true", help="Clean build folder")
-    parser.add_argument(
-        "--dev",
-        action="store_true",
-        help="Use editable pyodide-build from hardcoded path (Windows packing workaround)",
-    )
-    args = parser.parse_args()
-
-    if not args.build and not args.clean:
-        print(__doc__)
-        return
-
-    if args.clean:
-        clean()
-        return
-
-    start_time = time.time()
-
-    WheelBuilder.extract_ifcopenshell_from_git(IFCOPENSHELL_DIR)
-
-    print("Downloading and extracting _ifcopenshell_wrapper files...")
-    makefile = REPO_ROOT / "src" / "ifcopenshell-python" / "Makefile"
-    wheel_url = WheelBuilder.get_wheel_url(makefile)
-    so_file, py_file = WheelBuilder.download_and_extract_so(wheel_url, BUILD_DIR)
-
-    Tools.create_symlink(IFCOPENSHELL_DIR / Path(so_file).name, so_file)
-    Tools.create_symlink(IFCOPENSHELL_DIR / Path(py_file).name, py_file)
-
-    print("Installing pyodide-build...")
-    if args.dev:
-        Tools.run(["uv", "pip", "install", "-e", str(PYODIDE_BUILD)])
-    else:
-        Tools.run(["uv", "pip", "install", "pyodide-build"])
-
-    print("Building with pyodide...")
-    # Use --no-isolation due to pyodide-build Windows support issues:
-    # symlink_unisolated_packages fails with missing `_sysconfigdata_$(CPYTHON_ABI_FLAGS)_emscripten_wasm32-emscripten.py`.
-    # Hardcode platform name since pyodide doesn't yet support overriding wheel tags on Windows.
-    #
-    # Use `LEGACY_PLATFORM` since pyodide 0.34.1 introduced new tag for wheels `pyemscripten`,
-    # which doesn't work with pyodide itself yet - https://github.com/pyodide/pyodide/issues/6177.
-    os.environ["USE_LEGACY_PLATFORM"] = "1"
-    Tools.run(["pyodide", "build", f"-C--build-option=--plat-name={WHEEL_PLATFORM_TAG}"])
-
-    elapsed = time.time() - start_time
-    print(f"\n✓ Done! ({elapsed:.1f}s)")
-
-
-if __name__ == "__main__":
-    main()
@@ -2,16 +2,12 @@
 # because `tool.setuptools.ext-modules` is still experimental in pyproject.toml
 # and we need it to get the wheel suffix right.
 import os
-import sys
 from pathlib import Path

 import tomllib
 from setuptools import Extension, find_packages, setup
-from setuptools.command.build_ext import build_ext

-# Detect repo folder: if setup.py is in pyodide folder, go to parent
-SETUP_DIR = Path(__file__).parent
-REPO_FOLDER = SETUP_DIR.parent if SETUP_DIR.name == "pyodide" else SETUP_DIR
+REPO_FOLDER = Path(__file__).parent


 def get_version() -> str:
@@ -29,39 +25,6 @@ def get_dependencies() -> list[str]:
    return dependencies


-class UnixBuildExt(build_ext):
-    """Customize ``build_ext`` to support packing on Windows."""
-
-    def finalize_options(self):
-        from distutils import sysconfig
-
-        super().finalize_options()
-        if sys.platform == "win32":
-            self.compiler = "unix"
-
-            # Configure sysconfig for Windows builds
-            # CCSHARED is the only variable that's not customizable with env vars.
-            # Basically avoiding this:
-            # File ".venv\Lib\site-packages\setuptools\_distutils\sysconfig.py", line 366, in customize_compiler
-            #     compiler_so=cc_cmd + ' ' + ccshared,
-            #                 ~~~~~~~~~~~~~^~~~~~~~~~
-            # TypeError: can only concatenate str (not "NoneType") to str
-            sysconfig.get_config_vars()  # Initialize config cache
-            if sysconfig._config_vars.get("CCSHARED") is None:
-                sysconfig._config_vars["CCSHARED"] = "-fPIC"
-            # Override compiler type before it's instantiated
-
-        # Set Emscripten compiler environment variables
-        os.environ["CC"] = "emcc"
-        os.environ["CXX"] = "em++"
-        os.environ["CFLAGS"] = ""
-        os.environ["CXXFLAGS"] = ""
-        os.environ["LDSHARED"] = "emcc -shared"
-        os.environ["AR"] = "emar"
-        os.environ["ARFLAGS"] = "rcs"
-        os.environ["SETUPTOOLS_EXT_SUFFIX"] = ".cpython-313-wasm32-emscripten.so"
-
-
 setup(
    name="ifcopenshell",
    version=get_version(),
@@ -81,5 +44,4 @@ setup(
    },
    # Has to provide extension to get the correct wheel suffix.
    ext_modules=[Extension("ifcopenshell._ifcopenshell_wrapper", sources=[])],
-    cmdclass={"build_ext": UnixBuildExt},
 )
@@ -3,10 +3,9 @@ name = "IfcOpenShell"
 version = "0.0.0"
 dependencies = [
    "black==26.3.1",
-    "ruff==0.15.12",
+    "ruff==0.15.5",
    "poethepoet",
-    "ty==0.0.32",
-    "gersemi==0.26.1",
+    "gersemi==0.26.0",
 ]

 [tool.black]
@@ -29,9 +28,6 @@ extend-exclude = '''
 reportInvalidTypeForm = false
 disableBytesTypePromotions = true
 reportUnnecessaryTypeIgnoreComment = true
-reportRedeclaration = false
-# Ignore warnings from bpy stubs missing actual source files.
-reportMissingModuleSource = false
 # Pylance doesn't respect gitignore, so we have to exclude files manually here
 # to avoid VS Code slowing down.
 # https://github.com/microsoft/pylance-release/issues/5169
@@ -82,184 +78,15 @@ ignore = [
    "UP032", # Replace .format with f-string
 ]

-[tool.ty.rules]
-all = "ignore"
-
-# Structural rules (no deep type inference needed, easier to adapt).
-abstract-method-in-final-class = "error"
-ambiguous-protocol-member = "error"
-conflicting-declarations = "error"
-conflicting-metaclass = "error"
-cyclic-class-definition = "error"
-cyclic-type-alias-definition = "error"
-dataclass-field-order = "error"
-duplicate-base = "error"
-duplicate-kw-only = "error"
-empty-body = "error"
-escape-character-in-forward-annotation = "error"
-final-on-non-method = "error"
-final-without-value = "error"
-ignore-comment-unknown-rule = "error"
-implicit-concatenated-string-type-annotation = "error"
-inconsistent-mro = "error"
-ineffective-final = "error"
-instance-layout-conflict = "error"
-invalid-dataclass = "error"
-invalid-dataclass-override = "error"
-invalid-enum-member-annotation = "error"
-invalid-explicit-override = "error"
-invalid-frozen-dataclass-subclass = "error"
-invalid-generic-class = "error"
-invalid-generic-enum = "error"
-invalid-ignore-comment = "error"
-invalid-legacy-positional-parameter = "error"
-invalid-legacy-type-variable = "error"
-invalid-named-tuple = "error"
-invalid-newtype = "error"
-invalid-overload = "error"
-invalid-paramspec = "error"
-invalid-protocol = "error"
-invalid-syntax-in-forward-annotation = "error"
-invalid-total-ordering = "error"
-invalid-type-alias-type = "error"
-invalid-type-checking-constant = "error"
-invalid-type-guard-definition = "error"
-invalid-type-variable-bound = "error"
-invalid-type-variable-constraints = "error"
-invalid-typed-dict-header = "error"
-invalid-typed-dict-statement = "error"
-override-of-final-method = "error"
-override-of-final-variable = "error"
-possibly-missing-import = "error"
-possibly-missing-submodule = "error"
-# Has false positives due to ty walrus operator bug.
-# possibly-unresolved-reference = "error"
-raw-string-type-annotation = "error"
-redundant-final-classvar = "error"
-shadowed-type-variable = "error"
-subclass-of-final-class = "error"
-super-call-in-named-tuple-method = "error"
-unavailable-implicit-super-arguments = "error"
-unbound-type-variable = "error"
-undefined-reveal = "error"
-unresolved-global = "error"
-unresolved-import = "error"
-unresolved-reference = "error"
-unused-ignore-comment = "error"
-unused-type-ignore-comment = "error"
-useless-overload-body = "error"
-
-# Non-structural rules:
-deprecated = "error"
-zero-stepsize-in-slice = "error"
-possibly-missing-implicit-call = "error"
-unused-awaitable = "error"
-
-# Function argument rules:
-# Conflicts with `ifcopenshell.api.geometry.add_representation` type of callables we have, confusing them with a module.
-# call-non-callable = "error"
-conflicting-argument-forms = "error"
-# Too many false positives.
-# invalid-argument-type = "error"
-missing-argument = "error"
-parameter-already-assigned = "error"
-positional-only-parameter-as-kwarg = "error"
-too-many-positional-arguments = "error"
-unknown-argument = "error"
-# Has a lot of warnings due to current ty walrus operator issues.
-# index-out-of-bounds = "error"
-# unresolved-attribute = "error"
-
-[tool.ty.environment]
-extra-paths = [
-    "src/bonsai/external_dependencies",
-    "src/bcf",
-    "src/bsdd",
-    "src/bonsai",
-    "src/ifc4d",
-    "src/ifc5d",
-    "src/ifccityjson",
-    "src/ifcclash",
-    "src/ifccsv",
-    "src/ifcdiff",
-    "src/ifcfm",
-    "src/ifcopenshell-python",
-    "src/ifcpatch",
-    "src/ifctester",
-]
-
-[tool.ty.src]
-exclude = [
-    # External dependencies cloned for type checking only.
-    "src/bonsai/external_dependencies",
-    # Submodules.
-    "src/ifcopenshell-python/ifcopenshell/express",
-    "src/ifcopenshell-python/ifcopenshell/mvd",
-    "src/ifcopenshell-python/ifcopenshell/simple_spf",
-    "src/svgfill/3rdparty",
-    # Has special dependencies.
-    "src/ifcopenshell-python/ifcopenshell/geom/app.py",
-    "src/ifcopenshell-python/ifcopenshell/geom/code_editor_pane.py",
-    "src/ifcopenshell-python/ifcopenshell/util/doc.py",
-    "src/ifcopenshell-python/ifcopenshell/util/generate_pset_templates.py",
-    "src/ifcopenshell-python/ifcopenshell/util/ifc4x3dev_scrape_data_for_docs.py",
-    # Too esoteric.
-    "src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py",
-    "src/ifc2ca/templates",
-    # Too dev.
-    "src/bcf/setup.py",
-    "src/bsdd/yml_to_classes.py",
-    # Deprecated.
-    "src/ifc2ca/_deprecated",
-]
-
 [tool.poe.tasks]

-ruff = "ruff check"
+ruff-main = "ruff check --extend-exclude nix/build-all.py"
+# It's actually Python 3.6, but ruff only supports 3.7+, but it should do.
+ruff-old = "ruff check nix/build-all.py --target-version py37"
+ruff.sequence = ["ruff-main", "ruff-old"]

 black = "black ."

-ty.sequence = ["ty-bonsai", "ty-ios"]
-ty.help = "Run ty type checker. Requires ty-venv to be set up first."
-ty-bonsai = "ty check src/bonsai --python=src/bonsai/.venv"
-
-ty-venv.sequence = ["bonsai-deps", "ty-venv-bonsai", "ty-venv-ios"]
-
-ty-venv-bonsai.sequence = [
-    {cmd = "uv venv src/bonsai/.venv --python=3.11 --allow-existing"},
-    {cmd = "uv pip install -r src/bonsai/type-check-requirements.txt --python=src/bonsai/.venv"},
-]
-
-ty-venv-ios.sequence = [
-    {cmd = "uv venv src/ifcopenshell-python/.venv --python=3.10 --allow-existing"},
-    {cmd = "uv pip install -r src/ifcopenshell-python/type-check-requirements.txt --python=src/ifcopenshell-python/.venv"},
-]
-
-format.sequence = ["black", "ruff"]
+format.sequence = ["black", "ruff-main", "ruff-old"]

 cmake-format = "gersemi . --in-place"
-
-[tool.poe.tasks.ty-ios]
-# --ignore unresolved-reference: walrus operator false positives in ty.
-cmd = """
-    ty check
-    src/bcf
-    src/bsdd
-    src/ifc2ca
-    src/ifc4d
-    src/ifc5d
-    src/ifccityjson
-    src/ifcclash
-    src/ifccsv
-    src/ifcdiff
-    src/ifcfm
-    src/ifcopenshell-python
-    src/ifcpatch
-    src/ifctester
-    --python=src/ifcopenshell-python/.venv
-    --ignore unresolved-reference
-"""
-
-[tool.poe.tasks.bonsai-deps]
-help = "Clone or update Bonsai external dependencies."
-cmd = "python src/bonsai/scripts/bonsai_deps.py"
@@ -34,8 +34,8 @@ client_id, client_secret = "", ""
 class OAuthReceiver(http.server.BaseHTTPRequestHandler):
    def do_GET(self) -> None:
        query = urllib.parse.parse_qs(urllib.parse.urlparse(self.path).query)
-        self.server.auth_code = query.get("code", [""])[0]
-        self.server.auth_state = query.get("state", [""])[0]
+        self.server.auth_code = query.get("code", [""])[0]  # type: ignore
+        self.server.auth_state = query.get("state", [""])[0]  # type: ignore
        self.send_response(200)
        self.send_header("Content-type", "text/plain")
        self.end_headers()
@@ -255,7 +255,7 @@ class BcfClient:
        project_id: str = "",
        topics: str = "",
        query_string: Optional[str] = None,
-    ) -> None:
+    ) -> list[Any]:
        # return self.get(
        #     f"/projects/{project_id}/topics",
        #     {
@@ -173,17 +173,16 @@ def assert_viewpoints(viewpoints):
    assert viewpoint.snapshot is not None


-# TODO: dead code - ported from v2 but buildingSMART/BCF-XML has no v3 MaximumInformation.bcf equivalent
 def assert_second_viewpoint(viewpoint, expected_selection, expected_exception, expected_coloring) -> None:
    expected_vp = mdl.VisualizationInfo(
        components=mdl.Components(
+            view_setup_hints=mdl.ViewSetupHints(
+                spaces_visible=False,
+                space_boundaries_visible=False,
+                openings_visible=False,
+            ),
            selection=expected_selection,
            visibility=mdl.ComponentVisibility(
-                view_setup_hints=mdl.ViewSetupHints(
-                    spaces_visible=False,
-                    space_boundaries_visible=False,
-                    openings_visible=False,
-                ),
                exceptions=expected_exception,
                default_visibility=False,
            ),
@@ -194,7 +193,6 @@ def assert_second_viewpoint(viewpoint, expected_selection, expected_exception, e
            camera_direction=mdl.Direction(x=0.6745243072509766, y=-0.6599355936050415, z=-0.33091068267822266),
            camera_up_vector=mdl.Direction(x=0.2271970510482788, y=-0.24091780185699463, z=0.9435783624649048),
            field_of_view=60,
-            aspect_ratio=1.0,
        ),
        guid="21dd4807-e9af-439e-a980-04d913a6b1ce",
    )
@@ -202,17 +200,16 @@ def assert_second_viewpoint(viewpoint, expected_selection, expected_exception, e
    assert viewpoint.snapshot is not None


-# TODO: dead code - ported from v2 but buildingSMART/BCF-XML has no v3 MaximumInformation.bcf equivalent
 def assert_third_viewpoint(viewpoint, expected_selection, expected_exception, expected_coloring) -> None:
    expected_vp = mdl.VisualizationInfo(
        components=mdl.Components(
+            view_setup_hints=mdl.ViewSetupHints(
+                spaces_visible=False,
+                space_boundaries_visible=False,
+                openings_visible=True,
+            ),
            selection=expected_selection,
            visibility=mdl.ComponentVisibility(
-                view_setup_hints=mdl.ViewSetupHints(
-                    spaces_visible=False,
-                    space_boundaries_visible=False,
-                    openings_visible=True,
-                ),
                exceptions=expected_exception,
                default_visibility=True,
            ),
@@ -223,7 +220,6 @@ def assert_third_viewpoint(viewpoint, expected_selection, expected_exception, ex
            camera_direction=mdl.Direction(x=0.7232745289802551, y=0.5967116951942444, z=-0.3475759029388428),
            camera_up_vector=mdl.Direction(x=0.27662187814712524, y=0.21082592010498047, z=0.937567412853241),
            field_of_view=60,
-            aspect_ratio=1.0,
        ),
        guid="81daa431-bf01-4a49-80a2-1ab07c177717",
    )
@@ -17,8 +17,8 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

 SHELL := sh
-PYTHON:=python3
-PIP:=pip3
+PYTHON:=python3.11
+PIP:=pip3.11
 PATCH:=patch
 SED:=sed -i
 VENV_ACTIVATE:=bin/activate
@@ -48,7 +48,6 @@ VERSION_PATCH:=$(shell cat '../../VERSION' | cut -d '.' -f 3)
 VERSION_DATE:=$(shell date '+%y%m%d')
 LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
 LAST_COMMIT_DATE:=$(shell git show -s --format=%cI)
-LAST_GIT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
 PYPI_IMP:=cp

 ifdef PYVERSION
@@ -64,7 +63,6 @@ PYNUMBER:=3$(PYMINOR)
 PYPI_VERSION:=3.$(PYMINOR)
 endif # def PYVERSION

-IFCMERGE_VERSION:=2026-04-07

 ifdef PLATFORM
 SUPPORTED_PLATFORMS := linux macos macosm1 win
@@ -192,11 +190,7 @@ endif
 	# Provides networkx graph analysis for project dependency calculations
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download networkx --dest=./wheels
 	# Required by IFCDiff
-	# Pinned <9.1: deepdiff 9.1.0 adds cachebox<6,>=5.2 which only ships macOS x86_64
-	# wheels for macosx_10_12+ and is incompatible with our macos py311 --platform
-	# macosx_10_10_x86_64 target. Revisit once the macos py311 platform tag is bumped
-	# to 10_13 (matching py312/py313).
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download "deepdiff<9.1" --dest=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download deepdiff --dest=./wheels
 	# Required by IFCCSV and ifcopenshell.util.selector
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download lark --dest=./wheels
 	# Required by IFC4D
@@ -238,16 +232,18 @@ endif
 	cd build/bonsai/bim/data/brick/ && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl

 	# Required for hipped roof generation
-	cd build && . env/$(VENV_ACTIVATE) && $(PYTHON) -m pip wheel "git+https://github.com/prochitecture/bpypolyskel" --no-deps -w wheels/
+	# TODO: Use official repo once https://github.com/prochitecture/bpypolyskel/pull/22 is merged.
+	cd build && . env/$(VENV_ACTIVATE) && $(PYTHON) -m pip wheel "git+https://github.com/Andrej730/bpypolyskel.git@pyproject_toml" --no-deps -w wheels/

 	# folder for executable files
 	mkdir -p build/bonsai/libs/bin

 	# required for three-way git merging
 ifeq ($(PLATFORM), win)
-	cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/$(IFCMERGE_VERSION)/ifcmerge.exe
+	cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/2025-01-26/ifcmerge.zip
+	cd build/bonsai/libs/bin && unzip ifcmerge.zip && rm ifcmerge.zip
 else
-	cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/$(IFCMERGE_VERSION)/ifcmerge && chmod +x ifcmerge
+	cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/main/ifcmerge && chmod +x ifcmerge
 endif

 	# Generate translations module for Bonsai build
@@ -266,7 +262,6 @@ else
 	$(SED) "s/0.0.0/$(VERSION)-alpha$(VERSION_DATE)/" build/bonsai/blender_manifest.toml
 	$(SED) "s/8888888/$(LAST_COMMIT_HASH)/" build/bonsai/__init__.py
 	$(SED) "s/9999999/$(LAST_COMMIT_DATE)/" build/bonsai/__init__.py
-	$(SED) "s/7777777/$(LAST_GIT_BRANCH)/" build/bonsai/__init__.py
 	$(SED) 's/version = "0.0.0"/version = "$(VERSION)-alpha$(VERSION_DATE)"/' build/pyproject.toml
 endif

@@ -360,10 +355,6 @@ else
 	pytest test/tool/test_$(MODULE).py --maxfail=1
 endif

-.PHONY: test-modal
-test-modal:
-	blender --enable-event-simulate --python test/modal/test_modal.py --window-maximized
-
 # Reregistering test is not added to the standard test suite because during unregister
 # Blender removes all Bonsai dependencies breaking dev-environment symlinks.
 .PHONY: test-reregister
@@ -43,7 +43,6 @@ from typing import TYPE_CHECKING, Any, Union

 last_commit_hash = "8888888"
 last_commit_date = "9999999"
-last_git_branch = "7777777"


 def get_last_commit_hash() -> Union[str, None]:
@@ -61,15 +60,6 @@ def get_last_commit_date() -> Union[str, None]:
    return last_commit_date


-def get_git_branch() -> Union[str, None]:
-    # Using this weird way to write 7777777,
-    # so makefile won't accidentally replace it here
-    # we'll be able to distinguish branch from placeholder value.
-    if last_git_branch == str(7_777777):
-        return None
-    return last_git_branch
-
-
 # Accessed from bonsai extension:
 bbim_semver: dict[str, Any] = {}

@@ -135,7 +125,6 @@ def get_debug_info(*, bonsai_failed_to_load: bool = False) -> dict[str, Any]:
        "bonsai_version": bbim_version,
        "bonsai_commit_hash": get_last_commit_hash(),
        "bonsai_commit_date": get_last_commit_date(),
-        "bonsai_git_branch": get_git_branch(),
        "last_actions": last_actions,
        "last_error": last_error,
    }
@@ -262,12 +251,10 @@ if IN_BLENDER:

            global last_commit_hash
            global last_commit_date
-            global last_git_branch
            path = Path(__file__).resolve().parent
            repo = git.Repo(str(path), search_parent_directories=True)
            last_commit_hash = repo.head.object.hexsha
            last_commit_date = repo.head.object.committed_datetime.isoformat()
-            last_git_branch = repo.active_branch.name
        except:
            pass

@@ -15,8 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was modified with the assistance of an AI coding tool.

 import importlib
 import os
@@ -27,7 +25,7 @@ import bpy
 import bpy.utils.previews
 from bpy_extras.io_utils import ExportHelper, ImportHelper

-from . import handler, operator, parametric_lifecycle, prop, ui
+from . import handler, operator, prop, ui

 try:
    from bonsai.translations import translations_dict
@@ -159,6 +157,9 @@ classes = [
    ui.BIM_UL_tab_visibilities,
    ui.BIM_UL_panel_visibilities,
    ui.DocPreferences,
+    ui.GizmoPreferencesDoor,  # Register before GizmoPreferences
+    ui.GizmoPreferencesWindow,  # Register before GizmoPreferences
+    ui.GizmoPreferencesStair,  # Register before GizmoPreferences
    ui.GizmoPreferences,
    # ui.DefaultParameters and ui.BIM_ADDON_preferences are registered separately after modules (see late_classes below)
    # Tabs panel
@@ -267,11 +268,8 @@ def register():
    bpy.app.handlers.depsgraph_update_post.append(on_register)
    bpy.app.handlers.undo_post.append(handler.undo_post)
    bpy.app.handlers.redo_post.append(handler.redo_post)
-    # Must follow the two appends above so regenerators see restored IFC state.
-    parametric_lifecycle.install_parametric_lifecycle_handlers()
    bpy.app.handlers.load_post.append(handler.load_post)
    bpy.app.handlers.load_post.append(handler.loadIfcStore)
-    bpy.app.handlers.save_post.append(handler.save_post)
    bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
    bpy.types.Scene.BIMSnapProperties = bpy.props.PointerProperty(type=prop.BIMSnapProperties)
    bpy.types.Scene.BIMSnapGroups = bpy.props.PointerProperty(type=prop.BIMSnapGroups)
@@ -327,10 +325,8 @@ def unregister():

    unregister_classes(classes)

-    parametric_lifecycle.uninstall_parametric_lifecycle_handlers()
    bpy.app.handlers.load_post.remove(handler.load_post)
    bpy.app.handlers.load_post.remove(handler.loadIfcStore)
-    bpy.app.handlers.save_post.remove(handler.save_post)
    del bpy.types.Scene.BIMProperties
    del bpy.types.Collection.BIMCollectionProperties
    del bpy.types.Object.BIMObjectProperties
@@ -1,96 +0,0 @@
-Copyright (c) 2011-2012, Nikita Volchenkov (<nikitavolchenkov@gmail.com>),
-with Reserved Font Name OpenGost Type B.
-
-Copyright (c) 2012, Valek Filippov (<frob@gnome.org>).
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -1,119 +0,0 @@
-# Bonsai - OpenBIM Blender Add-on
-# Copyright (C) 2026
-#
-# This file is part of Bonsai.
-#
-# Bonsai is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Bonsai is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was generated with the assistance of an AI coding tool.
-
-"""Shared structural-change cache token for POST_VIEW decorators.
-
-Decorators include the token in their cache key and rebuild on bump."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from typing import Any, Generic, TypeVar
-
-import bpy
-
-T = TypeVar("T")
-
-_DECORATOR_CACHE_TOKEN = 0
-
-
-def get_decorator_cache_token() -> int:
-    return _DECORATOR_CACHE_TOKEN
-
-
-def reset_for_test() -> None:
-    """Test-only: reset the cache token to 0 so bump-count assertions are stable."""
-    global _DECORATOR_CACHE_TOKEN
-    _DECORATOR_CACHE_TOKEN = 0
-
-
-@bpy.app.handlers.persistent
-def _bump_decorator_cache_token(*args: Any) -> None:
-    """depsgraph_update_post fires every animation frame and every driver
-    evaluation, even when no IFC-relevant ID block changed. Unconditional
-    bumping defeats the cache: an animated scene rebuilds every decorator
-    every viewport tick. Gate the depsgraph path on Object geometry or
-    transform updates; undo / redo / load have no depsgraph and always
-    invalidate.
-
-    Coverage assumption: ``TokenCache`` consumers key on Object identity
-    (depsgraph updates whose ``id`` is a ``bpy.types.Object``). Mesh /
-    Material / NodeTree updates that don't surface as an Object change
-    do NOT invalidate the token — a decorator that caches material- or
-    mesh-data-derived state must gate on a separate signal."""
-    global _DECORATOR_CACHE_TOKEN
-    if len(args) >= 2:
-        depsgraph = args[1]
-        if depsgraph is not None and hasattr(depsgraph, "updates"):
-            if not any(
-                (getattr(u, "is_updated_geometry", False) or getattr(u, "is_updated_transform", False))
-                and hasattr(u, "id")
-                and isinstance(u.id, bpy.types.Object)
-                for u in depsgraph.updates
-            ):
-                return
-    _DECORATOR_CACHE_TOKEN += 1
-
-
-def _hooks() -> tuple[Any, ...]:
-    return (
-        bpy.app.handlers.depsgraph_update_post,
-        bpy.app.handlers.undo_post,
-        bpy.app.handlers.redo_post,
-        bpy.app.handlers.load_post,
-    )
-
-
-def install_decorator_cache_handlers() -> None:
-    """Append the bump handler to each hook; idempotent."""
-    for hook in _hooks():
-        if _bump_decorator_cache_token not in hook:
-            hook.append(_bump_decorator_cache_token)
-
-
-def uninstall_decorator_cache_handlers() -> None:
-    for hook in _hooks():
-        try:
-            hook.remove(_bump_decorator_cache_token)
-        except ValueError:
-            pass
-
-
-class TokenCache(Generic[T]):
-    """Memoise a single value keyed on ``(caller_key, get_decorator_cache_token())``.
-
-    The token component invalidates the cache on depsgraph / undo / redo / load,
-    so cached ``bpy.types.Object`` references can't outlive the underlying ID
-    blocks. Holds exactly one entry — last key wins."""
-
-    __slots__ = ("_key", "_value")
-
-    def __init__(self) -> None:
-        self._key: tuple[Any, int] | None = None
-        self._value: T | None = None
-
-    def get_or_compute(self, key: Any, compute: Callable[[], T]) -> T:
-        token_key = (key, _DECORATOR_CACHE_TOKEN)
-        if token_key == self._key:
-            return self._value  # type: ignore[return-value]
-        value = compute()
-        self._key = token_key
-        self._value = value
-        return value
@@ -72,7 +72,9 @@ class IfcExporter:

    def set_header(self):
        self.file.header.file_name.name = os.path.basename(self.ifc_export_settings.output_file)
-        self.file.header.file_name.time_stamp = datetime.datetime.now().astimezone().replace(microsecond=0).isoformat()
+        self.file.header.file_name.time_stamp = (
+            datetime.datetime.utcnow().replace(tzinfo=datetime.UTC).astimezone().replace(microsecond=0).isoformat()
+        )
        self.file.header.file_name.preprocessor_version = "IfcOpenShell {}".format(ifcopenshell.version)
        self.file.header.file_name.originating_system = "{} {}".format(
            self.get_application_name(), tool.Blender.get_bonsai_version()
@@ -15,12 +15,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was modified with the assistance of an AI coding tool.

 import os
 import weakref
 from collections.abc import Callable
+from math import cos
 from typing import Union

 import bpy
@@ -32,44 +31,30 @@ from bpy.app.handlers import persistent
 from mathutils import Vector

 import bonsai.bim
-import bonsai.core.model as core_model
 import bonsai.tool as tool
-from bonsai.bim.decorator_cache import (
-    install_decorator_cache_handlers,
-    uninstall_decorator_cache_handlers,
-)
-from bonsai.bim.ifc import IfcStore, get_cache_or_detect_lock
+from bonsai.bim.ifc import IfcStore
 from bonsai.bim.module.aggregate.decorator import AggregateDecorator
 from bonsai.bim.module.georeference.decorator import GeoreferenceDecorator
-from bonsai.bim.module.model.array import (
-    ArrayPreviewDecorator,
-    ArraySelectionHighlightDecorator,
-)
 from bonsai.bim.module.model.data import AuthoringData
 from bonsai.bim.module.model.decorator import (
    BoundingBoxDecorator,
    SlabDirectionDecorator,
    WallAxisDecorator,
-    WallFilletPreviewDecorator,
 )
-from bonsai.bim.module.model.wall import WallGizmoPreviewDecorator
 from bonsai.bim.module.nest.decorator import NestDecorator

 cwd = os.path.dirname(os.path.realpath(__file__))
 global_subscription_owner = object()
-# Separate owner for per-object msgbus subscriptions (name, active_material_index).
-# Using a dedicated owner allows clearing all per-object subscriptions at once
-# during undo/redo without affecting other global subscriptions.
-object_subscription_owner = object()


 def name_callback(obj: Union[bpy.types.Object, bpy.types.Material], data: str) -> None:
    try:
        obj.name
    except:
-        # The object is invalid but somehow still has a callback.
-        # This can occur during undo/redo when the Python wrapper is stale.
-        return
+        # The object is invalid but somehow still has a callback. Clear all
+        # msgbus subscriptions to prevent useless further triggers.
+        bpy.msgbus.clear_by_owner(obj)
+        return  # In case the object RNA is gone during an undo / redo operation
    # Blender names are up to 63 UTF-8 bytes
    if len(bytes(obj.name, "utf-8")) >= 63:
        return
@@ -120,13 +105,19 @@ def active_object_callback():


 def update_bim_tool_props():
-    """Selection-driven BIM Tool sync: re-target user-intent enums
-    (ifc_class, relating_type_id) AND refresh header values
-    (extrusion_depth, length, x_angle) for the new active object."""
-    ctx = _resolve_bim_tool_context()
-    if ctx is None:
+    """update BIM Tools props (such as extrusion_depth, length and x_angle) when active object changes"""
+    obj = bpy.context.active_object
+
+    # bunch of checks to see if we're in a valid state
+    if not obj:
+        return
+    mode = bpy.context.mode
+    current_tool = bpy.context.workspace.tools.from_space_view3d_mode(mode)
+    if not current_tool or current_tool.idname not in tool.Blender.get_list_of_tools():
+        return
+    element = tool.Ifc.get_entity(obj)
+    if not element:
        return
-    obj, current_tool, element = ctx

    props = tool.Model.get_model_props()
    aprops = tool.Drawing.get_annotation_props()
@@ -139,85 +130,18 @@ def update_bim_tool_props():

            if is_annotation_tool and (object_type := tool.Drawing.get_annotation_type_object_type(element_type)):
                aprops.object_type = object_type
-                try:
-                    aprops.relating_type_id = str(element_type.id())
-                except TypeError:
-                    # EnumProperty items are rebuilt asynchronously when ifc_class changes;
-                    # this assignment can race a stale item list. Skipping is harmless —
-                    # the UI will resync on the next active_object_callback.
-                    pass
+                aprops.relating_type_id = str(element_type.id())
                return

            if is_bim_tool:
-                try:
-                    props.ifc_class = element_type.is_a()
-                except TypeError:
-                    # ifc_class only lists element/space types present in the model, so an
-                    # unsupported type (e.g. a raw IfcTypeProduct) or a stale item list mid-
-                    # rebuild raises `enum "<class>" not found`. Skip rather than crash the
-                    # handler — it re-fires on the next selection and the panel resyncs.
-                    pass
+                props.ifc_class = element_type.is_a()

-            # Only assign when the target enum is the one that lists this type — otherwise
-            # we hit `enum "<id>" not found in (...)` if the user selects an element of a
-            # different class than the workspace tool was built for (e.g. selecting a wall
-            # while the door tool is active).
-            tool_class_match = TOOLS_TO_CLASSES_MAP.get(current_tool.idname) == element_type.is_a()
-            bim_tool_class_match = is_bim_tool and props.ifc_class == element_type.is_a()
-            if bim_tool_class_match or tool_class_match:
-                try:
-                    props.relating_type_id = str(element_type.id())
-                except TypeError:
-                    # Defensive: the enum item list can lag behind ifc_class assignment
-                    # above. Skipping leaves the panel briefly out of sync rather than
-                    # crashing the handler (which Blender re-fires on every selection).
-                    pass
+            if is_bim_tool or TOOLS_TO_CLASSES_MAP.get(current_tool.idname) == element_type.is_a():
+                props.relating_type_id = str(element_type.id())

    if is_annotation_tool:
        return

-    _read_headers_into_props(obj, element)
-
-
-def refresh_bim_tool_headers():
-    """Push the active IFC entity's current header float values
-    (extrusion_depth, length, x_angle) into ``BIMModelProperties``.
-    Enum-safe: never writes user-intent enum slots, which are owned by
-    the selection callback."""
-    ctx = _resolve_bim_tool_context()
-    if ctx is None:
-        return
-    obj, current_tool, element = ctx
-    if current_tool.idname not in tool.Blender.get_property_header_tools():
-        return
-    _read_headers_into_props(obj, element)
-
-
-def _resolve_bim_tool_context():
-    """Return ``(obj, current_tool, element)`` when an active BIM workspace
-    tool sees a resolvable IFC element; ``None`` otherwise. Defensive
-    against stripped operator contexts — a missing ``active_object`` /
-    ``mode`` / ``workspace`` short-circuits to ``None`` instead of raising."""
-    obj = tool.Blender.get_active_object()
-    if not obj:
-        return None
-    mode = getattr(bpy.context, "mode", None)
-    workspace = getattr(bpy.context, "workspace", None)
-    if mode is None or workspace is None:
-        return None
-    current_tool = workspace.tools.from_space_view3d_mode(mode)
-    if not current_tool or current_tool.idname not in tool.Blender.get_list_of_tools():
-        return None
-    element = tool.Ifc.get_entity(obj)
-    if not element:
-        return None
-    return obj, current_tool, element
-
-
-def _read_headers_into_props(obj, element):
-    """Populate ``BIMModelProperties`` header values from the active
-    object's IFC extrusion. Enum-safe: writes only header floats, never
-    user-intent enum slots, so it is safe to call on the post-commit hook."""
    representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
    if not representation:
        return
@@ -235,13 +159,10 @@ def _read_headers_into_props(obj, element):
    if not AuthoringData.is_loaded:
        AuthoringData.load()

-    props = tool.Model.get_model_props()
    if AuthoringData.data["active_material_usage"] == "LAYER2":
        x_angle = get_x_angle(extrusion)
        axis = tool.Model.get_wall_axis(obj)["reference"]
-        props.extrusion_depth = core_model.vertical_height_from_extrusion_depth(
-            extrusion.Depth * si_conversion, x_angle
-        )
+        props.extrusion_depth = abs(extrusion.Depth * si_conversion * cos(x_angle))
        props.length = (axis[1] - axis[0]).length
        props.x_angle = x_angle

@@ -268,7 +189,7 @@ def subscribe_to(obj: bpy.types.ID, data_path: str, callback: Callable[[bpy.type
        return
    bpy.msgbus.subscribe_rna(
        key=subscribe_to,
-        owner=object_subscription_owner,
+        owner=obj,
        args=(
            obj,
            data_path,
@@ -433,32 +354,7 @@ def subscribe_to_viewport_shading_changes():


@persistent
-def save_post(scene) -> None:
-    """After saving the .blend file, convert the stored IFC path to relative if enabled."""
-    pprops = tool.Project.get_project_props()
-    if not pprops.use_relative_project_path:
-        return
-    bim_props = tool.Blender.get_bim_props()
-    ifc_path = bim_props.ifc_file
-    if not ifc_path or not os.path.isabs(ifc_path):
-        return
-    blend_dir = bpy.path.abspath("//")
-    if not blend_dir:
-        return
-    from pathlib import Path
-    from bonsai.bim.ifc import IfcStore
-    try:
-        rel_path = str(Path(ifc_path).relative_to(blend_dir))
-    except ValueError:
-        return  # IFC file is not under the blend directory; keep absolute path
-    bim_props.ifc_file = rel_path
-    IfcStore.set_path(ifc_path)  # keep IfcStore.path absolute for loading
-
-
-def _apply_save_file_invariants(scene: bpy.types.Scene) -> None:
-    """Invariants enforced on every load_post: msgbus subscription, IFC owner
-    settings, scene-bound caches, load-transient parametric state, and the
-    multi-instance lock probe."""
+def load_post(scene):
    global global_subscription_owner
    active_object_key = bpy.types.LayerObjects, "active"
    bpy.msgbus.subscribe_rna(
@@ -469,23 +365,6 @@ def _apply_save_file_invariants(scene: bpy.types.Scene) -> None:
    ifcopenshell.api.owner.settings.get_application = get_application
    AuthoringData.type_thumbnails = {}

-    tool.Parametric.on_load_post(scene)
-
-    if tool.Ifc.get() and bpy.data.is_saved:
-        props = tool.Blender.get_bim_props()
-        props.has_blend_warning = True
-
-    # Probe the H5 cooked-geometry cache so the multi-instance warning surfaces
-    # right after .blend load. Without this, the lock is only detected when a
-    # mutation triggers ``clear_cache`` — by which time the user has already
-    # made changes that may now conflict with the other Blender instance.
-    if tool.Ifc.get():
-        get_cache_or_detect_lock()
-
-
-def _apply_user_preferences() -> None:
-    """User-preference-driven UI setup: toolbar, BIM workspace, viewport shading
-    subscription, scene-panel hijack, tab layout, snap defaults."""
    preferences = tool.Blender.get_addon_preferences()
    if not preferences.should_setup_toolbar:
        tool.Blender.unregister_toolbar()
@@ -509,21 +388,11 @@ def _apply_user_preferences() -> None:
        tool.Blender.override_scene_panel(panel)
    tool.Blender.setup_tabs()

-    if preferences.should_use_snap and (scene := bpy.context.scene):
-        # Snapping is off by default in Blender, but in BIM, it's more useful to be on
-        scene.tool_settings.use_snap = True
-        # Match default Bonsai snaps
-        scene.tool_settings.snap_elements_base = {"EDGE", "EDGE_PERPENDICULAR", "VERTEX", "EDGE_MIDPOINT", "FACE"}
+    if tool.Ifc.get() and bpy.data.is_saved:
+        props = tool.Blender.get_bim_props()
+        props.has_blend_warning = True

-    tool.Blender.sync_old_preferences()
-
-
-def _install_viewport_overlays() -> None:
-    """Sync every Bonsai viewport decorator to its enabled state.
-
-    Wrapped in uninstall/install of the decorator-cache bump handlers so a
-    decorator's own install path doesn't double-bind to depsgraph_update_post
-    via ``TokenCache`` instances created during their own ``install()``."""
+    # Bonsai overlays
    georeference_props = tool.Georeference.get_georeference_props()
    aggregate_props = tool.Aggregate.get_aggregate_props()
    nest_props = tool.Nest.get_nest_props()
@@ -533,45 +402,23 @@ def _install_viewport_overlays() -> None:
    NestDecorator.uninstall()
    WallAxisDecorator.uninstall()
    SlabDirectionDecorator.uninstall()
-    WallFilletPreviewDecorator.uninstall()
-    WallGizmoPreviewDecorator.uninstall()
-    ArrayPreviewDecorator.uninstall()
-    ArraySelectionHighlightDecorator.uninstall()
-    uninstall_decorator_cache_handlers()
-    try:
-        if georeference_props.should_visualise:
-            GeoreferenceDecorator.install(bpy.context)
-        if aggregate_props.aggregate_decorator:
-            AggregateDecorator.install(bpy.context)
-        if nest_props.nest_decorator:
-            NestDecorator.install(bpy.context)
-        if model_props.show_wall_axis:
-            WallAxisDecorator.install(bpy.context)
-        if model_props.show_slab_direction:
-            SlabDirectionDecorator.install(bpy.context)
-        if model_props.show_bounding_box:
-            BoundingBoxDecorator.install(bpy.context)
-        # Always-installed: draw() self-polls on Scene.BIMPreviewProperties.
-        # wall_fillet.is_active, so installation has no cost when no preview
-        # is open. No corresponding addon-preference toggle.
-        WallFilletPreviewDecorator.install(bpy.context)
-        # Always-installed: draw_lines() self-polls on selection + hover state
-        # for join / extend-to-wall / cursor-extend / cursor-split previews.
-        # Free when no preview-eligible state is active.
-        WallGizmoPreviewDecorator.install(bpy.context)
-        # Always-installed: draw() self-polls on the active object's array
-        # family membership, so installation has no cost when no array
-        # element is selected.
-        ArraySelectionHighlightDecorator.install(bpy.context)
-        # Always-installed: draw() self-polls on props.is_editing — only
-        # paints during an active array edit lifecycle.
-        ArrayPreviewDecorator.install(bpy.context)
-    finally:
-        install_decorator_cache_handlers()
+    if georeference_props.should_visualise:
+        GeoreferenceDecorator.install(bpy.context)
+    if aggregate_props.aggregate_decorator:
+        AggregateDecorator.install(bpy.context)
+    if nest_props.nest_decorator:
+        NestDecorator.install(bpy.context)
+    if model_props.show_wall_axis:
+        WallAxisDecorator.install(bpy.context)
+    if model_props.show_slab_direction:
+        SlabDirectionDecorator.install(bpy.context)
+    if model_props.show_bounding_box:
+        BoundingBoxDecorator.install(bpy.context)

+    if preferences.should_use_snap and (scene := bpy.context.scene):
+        # Snapping is off by default in Blender, but in BIM, it's more useful to be on
+        scene.tool_settings.use_snap = True
+        # Match default Bonsai snaps
+        scene.tool_settings.snap_elements_base = {"EDGE", "EDGE_PERPENDICULAR", "VERTEX", "EDGE_MIDPOINT", "FACE"}

-@persistent
-def load_post(scene):
-    _apply_save_file_invariants(scene)
-    _apply_user_preferences()
-    _install_viewport_overlays()
+    tool.Blender.sync_old_preferences()
@@ -64,44 +64,6 @@ class TransactionStep(TypedDict):
    operations: list[Operation]


-# Set when ``IfcStore.get_cache`` observes an external lock on the HDF5 cache —
-# signal that another Blender process has the same IFC file open. Project panel
-# polls ``is_cache_locked_by_other_process`` to warn the user. The dismissed
-# flag is sticky per-session so the warning doesn't re-nag once the user has
-# acknowledged it.
-_cache_locked_by_other_process: bool = False
-_multi_instance_warning_dismissed: bool = False
-
-
-def is_cache_locked_by_other_process() -> bool:
-    return _cache_locked_by_other_process and not _multi_instance_warning_dismissed
-
-
-def dismiss_multi_instance_warning() -> None:
-    global _multi_instance_warning_dismissed
-    _multi_instance_warning_dismissed = True
-
-
-def get_cache_or_detect_lock() -> ifcopenshell.geom.serializers.hdf5 | None:
-    """Like ``IfcStore.get_cache`` but tracks the multi-instance lock flag — sets
-    it on ``PermissionError``, clears it (along with the dismiss flag) when a
-    subsequent call succeeds. Returns ``None`` on lock; other exceptions
-    propagate. Callers that don't need the warning side effect can use
-    ``IfcStore.get_cache`` directly."""
-    global _cache_locked_by_other_process, _multi_instance_warning_dismissed
-    try:
-        cache = IfcStore.get_cache()
-    except PermissionError:
-        _cache_locked_by_other_process = True
-        return None
-    if _cache_locked_by_other_process:
-        # Lock released — clear both flags so a future re-locking re-surfaces
-        # the warning rather than staying suppressed by the previous dismiss.
-        _cache_locked_by_other_process = False
-        _multi_instance_warning_dismissed = False
-    return cache
-
-
 class IfcStore:
    path: str = ""
    """Should be set only using ``tool.Ifc.set_path``."""
@@ -234,7 +196,7 @@ class IfcStore:
                shutil.copy2(IfcStore.cache_path, new_cache_path)
            except PermissionError:
                pass  # Well we tried. No cache for you!
-        get_cache_or_detect_lock()
+        IfcStore.get_cache()

    @staticmethod
    def load_file(path: str) -> None:
@@ -354,8 +316,11 @@ class IfcStore:
        del IfcStore.id_map[data["id"]]
        if "guid" in data:
            del IfcStore.guid_map[data["guid"]]
-        # Note: msgbus subscriptions are cleared globally during
-        # rebuild_element_maps which runs after every undo/redo.
+        obj = IfcStore.get_object_by_name(data["obj"])
+        if obj is None:
+            # obj was just created during this step and didn't existed before.
+            return
+        bpy.msgbus.clear_by_owner(obj)

    @staticmethod
    def commit_link_element(data: OperationData) -> None:
@@ -402,8 +367,10 @@ class IfcStore:
        del IfcStore.id_map[data["id"]]
        if "guid" in data:
            del IfcStore.guid_map[data["guid"]]
-        # Note: msgbus subscriptions are cleared globally during
-        # rebuild_element_maps which runs after every undo/redo.
+        obj = IfcStore.get_object_by_name(data["obj"])
+        # obj might be removed after unlink.
+        if not obj:
+            bpy.msgbus.clear_by_owner(obj)

    @staticmethod
    def unlink_element(
@@ -552,7 +519,6 @@ class IfcStore:
                    BrickStore.end_transaction()
                IfcStore.end_transaction(operator)
                bonsai.bim.handler.refresh_ui_data()
-                tool.Parametric.refresh_post_commit(operator)

                if method == "MODAL":
                    cls.modal_in_progress = False
@@ -64,8 +64,8 @@ class MaterialCreator:
        mesh: Union[OBJECT_DATA_TYPE, None],
        shape_has_openings: bool,
    ) -> None:
-        if ((rep := getattr(element, "Representation", ...)) is not ... and not rep) or (
-            (rep := getattr(element, "RepresentationMaps", ...)) is not ... and not rep
+        if ((rep := getattr(element, "Representation", ...) is not ...) and not rep) or (
+            (rep := getattr(element, "RepresentationMaps", ...) is not ...) and not rep
        ):
            return

@@ -1219,8 +1219,8 @@ class IfcImporter:
                        if element not in elements_to_import:
                            continue
                    for i in range(len(data)):
-                        tool.Array.set_children_lock_state(element, i, True)
-                        tool.Array.constrain_children_to_parent(element)
+                        tool.Blender.Modifier.Array.set_children_lock_state(element, i, True)
+                        tool.Blender.Modifier.Array.constrain_children_to_parent(element)

    def update_linked_aggregates(self):
        # TODO Remove this after a while. See commit 17d6b8a
@@ -73,22 +73,6 @@ def poll_related_object(self: "BIMObjectAggregateProperties", related_obj: bpy.t
    return True


-def update_relating_object(self, context):
-    if self.relating_object:
-        ifc_id = tool.Blender.get_object_bim_props(self.relating_object).ifc_definition_id
-        if ifc_id:
-            bpy.ops.bim.aggregate_assign_object(relating_object=ifc_id)
-            bpy.ops.bim.disable_editing_aggregate()
-
-
-def update_related_object(self, context):
-    if self.related_object:
-        ifc_id = tool.Blender.get_object_bim_props(self.related_object).ifc_definition_id
-        if ifc_id:
-            bpy.ops.bim.aggregate_assign_object(related_object=ifc_id)
-            bpy.ops.bim.disable_editing_aggregate()
-
-
 def update_aggregate_decorator(self, context):
    if self.aggregate_decorator:
        AggregateDecorator.install(bpy.context)
@@ -105,15 +89,12 @@ def update_aggregate_mode_decorator(self, context):

 class BIMObjectAggregateProperties(PropertyGroup):
    is_editing: BoolProperty(name="Is Editing")
-    relating_object: PointerProperty(
-        name="Relating Whole", type=bpy.types.Object, poll=poll_relating_object, update=update_relating_object
-    )
+    relating_object: PointerProperty(name="Relating Whole", type=bpy.types.Object, poll=poll_relating_object)
    related_object: PointerProperty(
        name="Related Part",
        description="Related Part, will be used to derive the Relating Object",
        type=bpy.types.Object,
        poll=poll_related_object,
-        update=update_related_object,
    )

    if TYPE_CHECKING:
@@ -139,7 +120,6 @@ class BIMAggregateProperties(PropertyGroup):
    previous_editing_aggregate: PointerProperty(name="Editing Aggregate", type=bpy.types.Object)
    editing_objects: CollectionProperty(type=Objects)
    not_editing_objects: CollectionProperty(type=Objects)
-    previously_selected_objects: CollectionProperty(type=Objects)
    aggregate_decorator: BoolProperty(
        name="Display Aggregate",
        default=False,
@@ -156,6 +136,5 @@ class BIMAggregateProperties(PropertyGroup):
        previous_editing_aggregate: Union[bpy.types.Object, None]
        editing_objects: bpy.types.bpy_prop_collection_idprop[Objects]
        not_editing_objects: bpy.types.bpy_prop_collection_idprop[Objects]
-        previously_selected_objects: bpy.types.bpy_prop_collection_idprop[Objects]
        aggregate_decorator: bool
        previous_state: bool
@@ -295,13 +295,13 @@ class ExplorerShowUIPopup(bpy.types.Operator):
    bl_description = "Show Explorer UI to select element as attribute value or edit it."
    bl_options = {"REGISTER", "UNDO"}

-    ifc_class: bpy.props.StringProperty()
+    ifc_class: bpy.props.StringProperty()  # pyright: ignore[reportRedeclaration]
    """Element IFC class."""
-    attribute_name: bpy.props.StringProperty()
+    attribute_name: bpy.props.StringProperty()  # pyright: ignore[reportRedeclaration]
    """IFC class attribute name."""
-    data_path: bpy.props.StringProperty()
+    data_path: bpy.props.StringProperty()  # pyright: ignore[reportRedeclaration]
    """Full data path"""
-    preselect_ifc_id: bpy.props.IntProperty(options={"SKIP_SAVE"})
+    preselect_ifc_id: bpy.props.IntProperty(options={"SKIP_SAVE"})  # pyright: ignore[reportRedeclaration]
    """IFC id to preselect in the popup."""

    if TYPE_CHECKING:
@@ -41,7 +41,7 @@ class BIMAttributeProperties(PropertyGroup):


 class ExplorerEntity(PropertyGroup):
-    ifc_definition_id: bpy.props.IntProperty()
+    ifc_definition_id: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        ifc_definition_id: int
@@ -60,7 +60,7 @@ class BIMExplorerProperties(PropertyGroup):
            self.property_unset("editing_entity_id")
            self.entity_attributes.clear()

-    is_loaded: BoolProperty(
+    is_loaded: BoolProperty(  # pyright: ignore[reportRedeclaration]
        name="Toggle Explorer UI",
        update=update_is_loaded,
    )
@@ -76,15 +76,15 @@ class BIMExplorerProperties(PropertyGroup):
    def update_ifc_class(self, context: object) -> None:
        tool.Attribute.refresh_uilist_entities()

-    ifc_class: EnumProperty(
+    ifc_class: EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="IFC Class To Search",
        items=get_ifc_class,
        update=update_ifc_class,
    )
-    entities: CollectionProperty(type=ExplorerEntity)
-    active_entity_index: IntProperty()
-    editing_entity_id: IntProperty()
-    entity_attributes: CollectionProperty(type=Attribute)
+    entities: CollectionProperty(type=ExplorerEntity)  # pyright: ignore[reportRedeclaration]
+    active_entity_index: IntProperty()  # pyright: ignore[reportRedeclaration]
+    editing_entity_id: IntProperty()  # pyright: ignore[reportRedeclaration]
+    entity_attributes: CollectionProperty(type=Attribute)  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        is_loaded: bool
@@ -48,14 +48,12 @@ def draw_ui(context: bpy.types.Context, layout: bpy.types.UILayout, attributes)
        row = layout.row()
        op = row.operator("bim.enable_editing_attributes", icon="GREASEPENCIL", text="Edit")

-        element = tool.Ifc.get_entity(obj)
-        key_prefix = "type." if (element and element.is_a("IfcTypeObject")) else ""
        for attribute in attributes:
            row = layout.row(align=True)
            row.label(text=attribute["name"])
            value = bonsai.bim.helper.get_display_value(attribute["value"])
            op = row.operator("bim.select_similar", text=value, icon="NONE", emboss=False)
-            op.key = key_prefix + attribute["name"]
+            op.key = attribute["name"]

    # TODO: reimplement, see #1222
    # if "IfcSite/" in context.active_object.name or "IfcBuilding/" in context.active_object.name:
@@ -230,7 +230,7 @@ class BcfTopic(PropertyGroup):


 def get_related_topics(self: "BCFProperties", context: bpy.types.Context) -> list[tuple[str, str, str]]:
-    global RELATED_TOPICS_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global RELATED_TOPICS_ENUM_ITEMS
    props = self
    active_topic = props.active_topic
    active_related_topics = active_topic.related_topics.keys()
@@ -377,8 +377,6 @@ class EnableEditingBoundary(bpy.types.Operator):
            obj = tool.Ifc.get_object(entity)
            if entity and obj:
                setattr(bprops, blender_property, obj)
-        bprops.physical_or_virtual = boundary.PhysicalOrVirtualBoundary or "NOTDEFINED"
-        bprops.internal_or_external = boundary.InternalOrExternalBoundary or "NOTDEFINED"
        return {"FINISHED"}


@@ -394,8 +392,6 @@ class DisableEditingBoundary(bpy.types.Operator):
        bprops.is_editing = False
        for ifc_attribute, blender_property in EDITABLE_ATTRIBUTES.items():
            setattr(bprops, blender_property, None)
-        bprops.physical_or_virtual = "NOTDEFINED"
-        bprops.internal_or_external = "NOTDEFINED"
        return {"FINISHED"}


@@ -415,8 +411,6 @@ class EditBoundaryAttributes(bpy.types.Operator, tool.Ifc.Operator):
            obj = getattr(bprops, blender_property, None)
            entity = tool.Ifc.get_entity(obj)
            attributes[blender_property] = entity
-        attributes["physical_or_virtual"] = bprops.physical_or_virtual
-        attributes["internal_or_external"] = bprops.internal_or_external
        ifcopenshell.api.boundary.edit_attributes(tool.Ifc.get(), entity=boundary, **attributes)
        bpy.ops.bim.disable_editing_boundary()
        return {"FINISHED"}
@@ -21,7 +21,6 @@ from typing import TYPE_CHECKING, Union
 import bpy
 from bpy.props import (
    BoolProperty,
-    EnumProperty,
    PointerProperty,
 )
 from bpy.types import PropertyGroup
@@ -51,43 +50,12 @@ def element_filter(self: "BIMObjectBoundaryProperties", object: bpy.types.Object
    return False


-def get_internal_or_external_items(
-    self: "BIMObjectBoundaryProperties", context: bpy.types.Context | None
-) -> list[tuple[str, str, str]]:
-    items = [
-        ("INTERNAL", "Internal", ""),
-        ("EXTERNAL", "External", ""),
-    ]
-    ifc = tool.Ifc.get()
-    if not ifc or ifc.schema != "IFC2X3":
-        items += [
-            ("EXTERNAL_EARTH", "External Earth", ""),
-            ("EXTERNAL_WATER", "External Water", ""),
-            ("EXTERNAL_FIRE", "External Fire", ""),
-        ]
-    items.append(("NOTDEFINED", "Not Defined", ""))
-    return items
-
-
 class BIMObjectBoundaryProperties(PropertyGroup):
    is_editing: BoolProperty(name="Is Editing")
    relating_space: PointerProperty(name="RelatingSpace", type=bpy.types.Object, poll=space_filter)
    related_building_element: PointerProperty(name="RelatedBuildingElement", type=bpy.types.Object, poll=element_filter)
    parent_boundary: PointerProperty(name="ParentBoundary", type=bpy.types.Object, poll=boundary_filter)
    corresponding_boundary: PointerProperty(name="CorrespondingBoundary", type=bpy.types.Object, poll=boundary_filter)
-    physical_or_virtual: EnumProperty(
-        name="PhysicalOrVirtualBoundary",
-        items=[
-            ("PHYSICAL", "Physical", ""),
-            ("VIRTUAL", "Virtual", ""),
-            ("NOTDEFINED", "Not Defined", ""),
-        ],
-        default="NOTDEFINED",
-    )
-    internal_or_external: EnumProperty(
-        name="InternalOrExternalBoundary",
-        items=get_internal_or_external_items,
-    )

    if TYPE_CHECKING:
        is_editing: bool
@@ -95,8 +63,6 @@ class BIMObjectBoundaryProperties(PropertyGroup):
        related_building_element: Union[bpy.types.Object, None]
        parent_boundary: Union[bpy.types.Object, None]
        corresponding_boundary: Union[bpy.types.Object, None]
-        physical_or_virtual: str
-        internal_or_external: str  # values depend on schema: IFC2X3 omits EXTERNAL_EARTH/WATER/FIRE


 class BIMBoundaryProperties(PropertyGroup):
@@ -77,10 +77,6 @@ class BIM_PT_Boundary(Panel):
            self.draw_relation_editor(boundary, "RelatedBuildingElement", "related_building_element")
            self.draw_relation_editor(boundary, "ParentBoundary", "parent_boundary")
            self.draw_relation_editor(boundary, "CorrespondingBoundary", "corresponding_boundary")
-            row = self.layout.row()
-            row.prop(self.bprops, "physical_or_virtual")
-            row = self.layout.row()
-            row.prop(self.bprops, "internal_or_external")
        else:
            row = self.layout.row()
            row.operator("bim.enable_editing_boundary", icon="GREASEPENCIL", text="Edit")
@@ -88,8 +84,6 @@ class BIM_PT_Boundary(Panel):
            self.draw_relation_data(boundary, "RelatedBuildingElement")
            self.draw_relation_data(boundary, "ParentBoundary")
            self.draw_relation_data(boundary, "CorrespondingBoundary")
-            self.draw_enum_data(boundary, "PhysicalOrVirtualBoundary")
-            self.draw_enum_data(boundary, "InternalOrExternalBoundary")
            if hasattr(boundary, "InnerBoundaries"):
                for i, inner_boundary in enumerate(getattr(boundary, "InnerBoundaries", ())):
                    row = self.layout.row(align=True)
@@ -116,11 +110,6 @@ class BIM_PT_Boundary(Panel):
            else:
                row.label(text="")

-    def draw_enum_data(self, boundary, ifc_attribute: str):
-        row = self.layout.row(align=True)
-        row.label(text=ifc_attribute)
-        row.label(text=getattr(boundary, ifc_attribute, "") or "")
-
    def draw_relation_editor(self, boundary, ifc_attribute: str, blender_property: str):
        if hasattr(boundary, ifc_attribute):
            row = self.layout.row(align=True)
@@ -46,26 +46,26 @@ def get_libraries(self, context):


 def get_namespaces(self, context):
-    global NAMESPACES_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global NAMESPACES_ENUM_ITEMS
    NAMESPACES_ENUM_ITEMS = [(uri, f"{alias}: {uri}", "") for alias, uri in BrickStore.namespaces]
    return NAMESPACES_ENUM_ITEMS


 def get_brick_entity_classes(self, context):
-    global ENTITY_CLASSES_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global ENTITY_CLASSES_ENUM_ITEMS
    entity = self.brick_entity_create_type
    ENTITY_CLASSES_ENUM_ITEMS = [(uri, uri.split("#")[-1], "") for uri in BrickStore.entity_classes[entity]]
    return ENTITY_CLASSES_ENUM_ITEMS


 def get_brick_roots(self, context):
-    global BRICK_ROOTS_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global BRICK_ROOTS_ENUM_ITEMS
    BRICK_ROOTS_ENUM_ITEMS = [(root, root, "") for root in BrickStore.root_classes]
    return BRICK_ROOTS_ENUM_ITEMS


 def get_brick_relations(self, context):
-    global BRICK_RELATIONS_ENUM_ITEMS  # ty: ignore[unresolved-global]
+    global BRICK_RELATIONS_ENUM_ITEMS
    BRICK_RELATIONS_ENUM_ITEMS = [(uri, uri.split("#")[-1], "") for uri in BrickStore.relationships]
    for relation in BrickschemaData.data["active_relations"]:
        if relation["predicate_name"] == "label":
@@ -37,7 +37,6 @@ messages = {
 class CadTrimExtend(bpy.types.Operator):
    bl_idname = "bim.cad_trim_extend"
    bl_label = "CAD Trim / Extend"
-    bl_description = "Extends/reduces element to 3D cursor"

    @classmethod
    def poll(cls, context):
@@ -83,7 +82,6 @@ class CadTrimExtend(bpy.types.Operator):
 class CadMitre(bpy.types.Operator):
    bl_idname = "bim.cad_mitre"
    bl_label = "CAD Mitre"
-    bl_description = "Joins two non-parallel paths at their intersection"

    @classmethod
    def poll(cls, context):
@@ -106,37 +106,23 @@ class CadTool(WorkSpaceTool):
                    )

            row = layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Extend", "S_E", bpy.ops.bim.cad_trim_extend.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Extend", "S_E", "Extends/reduces element to 3D cursor", ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
            add_layout_hotkey_operator(
-                row, "Join", "S_T", bpy.ops.bim.cad_mitre.__doc__.split("\n", 1)[1].strip(), ui_context
+                row, "Join", "S_T", "Joins two non-parallel paths at their intersection", ui_context
            )
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Fillet", "S_F", bpy.ops.bim.add_ifcarcindex_fillet.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Fillet", "S_F", bpy.ops.bim.add_ifcarcindex_fillet.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Offset", "S_O", bpy.ops.bim.cad_offset.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Offset", "S_O", bpy.ops.bim.cad_offset.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Rectangle", "S_R", bpy.ops.bim.add_rectangle.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Rectangle", "S_R", bpy.ops.bim.add_rectangle.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Circle", "S_C", bpy.ops.bim.add_ifccircle.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Circle", "S_C", bpy.ops.bim.add_ifccircle.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "3-Point Arc", "S_V", bpy.ops.bim.set_arc_index.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "3-Point Arc", "S_V", bpy.ops.bim.set_arc_index.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Reset Vertex", "S_X", bpy.ops.bim.reset_vertex.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Reset Vertex", "S_X", bpy.ops.bim.reset_vertex.__doc__, ui_context)

        elif (
            isinstance(data, tool.Geometry.TYPES_WITH_MESH_PROPERTIES)
@@ -146,21 +132,15 @@ class CadTool(WorkSpaceTool):
                layout, "Edit Axis", "bim.edit_extrusion_axis", "bim.disable_editing_extrusion_axis", ui_context
            )
            row = layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Extend", "S_E", bpy.ops.bim.cad_trim_extend.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Extend", "S_E", "Extends/reduces element to 3D cursor", ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
            add_layout_hotkey_operator(
-                row, "Join", "S_T", bpy.ops.bim.cad_mitre.__doc__.split("\n", 1)[1].strip(), ui_context
+                row, "Join", "S_T", "Joins two non-parallel paths at their intersection", ui_context
            )
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Fillet", "S_F", bpy.ops.bim.cad_fillet.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Fillet", "S_F", bpy.ops.bim.cad_fillet.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Offset", "S_O", bpy.ops.bim.cad_offset.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Offset", "S_O", bpy.ops.bim.cad_offset.__doc__, ui_context)

        else:
            if (
@@ -188,37 +168,19 @@ class CadTool(WorkSpaceTool):
                add_layout_hotkey_operator(row, "Set Gable Roof Angle", "S_R", "Set Gable Roof Angle", ui_context)

            row = layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Extend", "S_E", bpy.ops.bim.cad_trim_extend.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Extend", "S_E", "Extends/reduces element to 3D cursor", ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
            add_layout_hotkey_operator(
-                row, "Join", "S_T", bpy.ops.bim.cad_mitre.__doc__.split("\n", 1)[1].strip(), ui_context
+                row, "Join", "S_T", "Joins two non-parallel paths at their intersection", ui_context
            )
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Fillet", "S_F", bpy.ops.bim.add_ifcarcindex_fillet.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Fillet", "S_F", bpy.ops.bim.add_ifcarcindex_fillet.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row, "Offset", "S_O", bpy.ops.bim.cad_offset.__doc__.split("\n", 1)[1].strip(), ui_context
-            )
+            add_layout_hotkey_operator(row, "Offset", "S_O", bpy.ops.bim.cad_offset.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row,
-                "2-Point Arc",
-                "S_C",
-                bpy.ops.bim.cad_arc_from_2_points.__doc__.split("\n", 1)[1].strip(),
-                ui_context,
-            )
+            add_layout_hotkey_operator(row, "2-Point Arc", "S_C", bpy.ops.bim.cad_arc_from_2_points.__doc__, ui_context)
            row = row if ui_context == "TOOL_HEADER" else layout.row(align=True)
-            add_layout_hotkey_operator(
-                row,
-                "3-Point Arc",
-                "S_V",
-                bpy.ops.bim.cad_arc_from_3_points.__doc__.split("\n", 1)[1].strip(),
-                ui_context,
-            )
+            add_layout_hotkey_operator(row, "3-Point Arc", "S_V", bpy.ops.bim.cad_arc_from_3_points.__doc__, ui_context)


 class CadHotkey(bpy.types.Operator):
@@ -201,10 +201,16 @@ class ExecuteIfcClash(bpy.types.Operator, ExportHelper):
        "ALT+click to run a quick clash without selecting a file to save."
    )

-    filter_glob: bpy.props.StringProperty(default="*.bcf;*.json", options={"HIDDEN"})
-    format: bpy.props.EnumProperty(name="Format", items=[(i, i, "") for i in ("bcf", "json")])
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH", options={"SKIP_SAVE"})
-    quick_clash: bpy.props.BoolProperty(
+    filter_glob: bpy.props.StringProperty(  # pyright: ignore[reportRedeclaration]
+        default="*.bcf;*.json", options={"HIDDEN"}
+    )
+    format: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
+        name="Format", items=[(i, i, "") for i in ("bcf", "json")]
+    )
+    filepath: bpy.props.StringProperty(  # pyright: ignore[reportRedeclaration]
+        subtype="FILE_PATH", options={"SKIP_SAVE"}
+    )
+    quick_clash: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
        options={"SKIP_SAVE"},
    )

@@ -37,12 +37,12 @@ from bonsai.bim.prop import BIMFilterGroup, StrProperty


 class ClashSource(PropertyGroup):
-    name: StringProperty(
+    name: StringProperty(  # pyright: ignore[reportRedeclaration]
        name="File",
        description="Absolute filepath to existing .ifc file to use as a clash source.",
    )
-    filter_groups: CollectionProperty(type=BIMFilterGroup, name="Filter Groups")
-    mode: EnumProperty(
+    filter_groups: CollectionProperty(type=BIMFilterGroup, name="Filter Groups")  # pyright: ignore[reportRedeclaration]
+    mode: EnumProperty(  # pyright: ignore[reportRedeclaration]
        items=[
            ("a", "All Elements", "All elements will be used for clashing"),
            ("i", "Include", "Only the selected elements are included for clashing"),
@@ -62,7 +62,7 @@ class Clash(PropertyGroup):
    b_global_id: StringProperty(name="B")
    a_name: StringProperty(name="A Name")
    b_name: StringProperty(name="B Name")
-    clash_type: EnumProperty(
+    clash_type: EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Clash Type",
        items=tuple((i, i, "") for i in CLASH_TYPE_ITEMS),
    )
@@ -87,7 +87,7 @@ class CopyCostSchedule(bpy.types.Operator, tool.Ifc.Operator):
    bl_label = "Copy Cost Schedule"
    bl_description = "Create a duplicate of the provided cost schedule."
    bl_options = {"REGISTER", "UNDO"}
-    cost_schedule: bpy.props.IntProperty()
+    cost_schedule: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        cost_schedule: int
@@ -260,14 +260,14 @@ class CreateAllShapes(bpy.types.Operator):
    )
    bl_options = {"REGISTER"}

-    geometry_library: bpy.props.EnumProperty(
+    geometry_library: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Geometry Library",
        description="Geometry library to use for testing shape creation.",
        items=[(i, i, "") for i in get_args(ifcopenshell.geom.GEOMETRY_LIBRARY)],
        # By default use the same library as used for importing ifc project.
        default="hybrid-cgal-simple-opencascade",
    )
-    custom_geometry_library: bpy.props.StringProperty(
+    custom_geometry_library: bpy.props.StringProperty(  # pyright: ignore[reportRedeclaration]
        name="Custom Geometry Library",
        description="Provide a custom geometry library name, will override the 'geometry library' property.",
    )
@@ -781,7 +781,7 @@ class PurgeUnusedObjects(bpy.types.Operator, tool.Ifc.Operator):
    bl_label = "Purge Unused Objects"
    bl_options = {"REGISTER", "UNDO"}

-    object_type: bpy.props.EnumProperty(
+    object_type: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Object Type",
        items=((s, s.capitalize(), "") for s in get_args(tool.Debug.PurgeMergeObjectType)),
    )
@@ -827,7 +827,7 @@ class MergeIdenticalObjects(bpy.types.Operator, tool.Ifc.Operator):
    )
    bl_options = {"REGISTER", "UNDO"}

-    object_type: bpy.props.EnumProperty(
+    object_type: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Object Type",
        items=((s, s.capitalize(), "") for s in get_args(tool.Debug.PurgeMergeObjectType)),
    )
@@ -1073,7 +1073,7 @@ class ChangeLogLevel(bpy.types.Operator):
    bl_options = {"REGISTER"}
    bl_description = "Change general log level across all Python code in Blender"

-    log_level: bpy.props.EnumProperty(
+    log_level: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Log Level",
        items=[(i, i, "") for i in get_args(LogLevelType)],
        default="WARNING",
@@ -15,8 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was modified with the assistance of an AI coding tool.

 import bpy

@@ -138,34 +136,14 @@ classes = (
    gizmos.GizmoArrow2D,
    gizmos.GizmoCone,
    gizmos.GizmoDimension,
-    gizmos.GizmoLockOpen,
-    gizmos.GizmoLockClosed,
+    gizmos.GizmoLock,
    gizmos.GizmoArc,
-    gizmos.GizmoLinkToggle,
-    gizmos.GizmoFillet,
-    gizmos.GizmoWallCornerIcon,
-    gizmos.GizmoWallTeeIcon,
    gizmos.GizmoPen,
    gizmos.GizmoValidate,
    gizmos.GizmoCancel,
    gizmos.GizmoPlus,
    gizmos.GizmoMinus,
-    gizmos.GizmoTrash,
-    gizmos.GizmoArrayParent,
-    gizmos.GizmoArrayAll,
-    gizmos.GizmoArrayLayerIndicator,
-    gizmos.GizmoCountLabel,
-    gizmos.GizmoMerge,
-    gizmos.GizmoSplit,
-    gizmos.GizmoUnjoin,
-    gizmos.GizmoExtend,
-    gizmos.GizmoExtendVertical,
-    gizmos.GizmoOffsetExterior,
-    gizmos.GizmoOffsetCenter,
-    gizmos.GizmoOffsetInterior,
-    gizmos.GizmoAddOpening,
    gizmos.GizmoCycle,
-    gizmos.GizmoMenu,
    # Drawing-specific gizmos
    gizmos.UglyDotGizmo,
    gizmos.ExtrusionGuidesGizmo,
@@ -1787,7 +1787,7 @@ class CutDecorator:

        # Handle both old float64 and new float32 checksums for version compatibility
        rot_checksum_bytes: bytes = eval(DecoratorData.camera_rotation_checksum)
-        rot_check = tool.Blender.np_frombuffer_legacy(rot_checksum_bytes, 9).reshape(3, 3)
+        rot_check = tool.Blender.np_frombuffer_legacy(rot_checksum_bytes, 9)
        rot_real = tool.Blender.np_array_legacy(obj.matrix_world.to_3x3())
        rot_dot = np.dot(rot_check, rot_real.T)
        angle_rad = np.arccos(np.clip((np.trace(rot_dot) - 1) / 2, -1, 1))
@@ -313,7 +313,7 @@ def format_distance(
            if not feet and not add_inches:
                tx_dist += str(feet) + "'"

-            if not feet and add_inches and unit_length != "INCHES":
+            if not feet and add_inches:
                if value < 0:
                    tx_dist += "-0' - "
                else:
@@ -456,8 +456,7 @@ def format_distance(
                tx_dist = fmt % d_cm

    else:
-        assert f"Unexpected unit_system - '{unit_system}'."
-        # tx_dist = fmt % value
+        tx_dist = fmt % value

    return tx_dist

@@ -246,17 +246,17 @@ class CreateDrawing(bpy.types.Operator):
        + "Add the CTRL modifier to optionally open drawings to view them as\n"
        + "they are created"
    )
-    print_all: bpy.props.BoolProperty(
+    print_all: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
        name="Print All",
        default=False,
        options={"SKIP_SAVE"},
    )
-    open_viewer: bpy.props.BoolProperty(
+    open_viewer: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
        name="Open in Viewer",
        default=False,
        options={"SKIP_SAVE"},
    )
-    sync: bpy.props.BoolProperty(
+    sync: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
        name="Sync Before Creating Drawing",
        description="Could save some time if you're sure IFC and current Blender session are already in sync",
        default=True,
@@ -1426,7 +1426,6 @@ class CreateDrawing(bpy.types.Operator):
                "/Pset_.*Common/.Status",
                "EPset_Status.Status",
                "EPset_Status.UserDefinedStatus",
-                "Material.Name",
            ]

        group = root.find("{http://www.w3.org/2000/svg}g")
@@ -2322,14 +2321,14 @@ class ActivateDrawingBase(tool.Ifc.Operator):
        + "SHIFT+CLICK to load a quick preview of the drawing view"
    )

-    drawing: bpy.props.IntProperty()
-    should_view_from_camera: bpy.props.BoolProperty(
+    drawing: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]
+    should_view_from_camera: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
        name="Should View From Camera",
        description="Move view to the activated drawing's camera position.",
        default=True,
        options={"SKIP_SAVE"},
    )
-    use_quick_preview: bpy.props.BoolProperty(
+    use_quick_preview: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
        name="Use Quick Preview",
        description="Just move the camera to the drawing view, without loading anything else.",
        default=False,
@@ -3306,8 +3305,9 @@ class AddTextLiteral(bpy.types.Operator):
                attr.data_type = "string"
                attr.string_value = literal_attr_values[attr_name]

-        literal_props.align_vertical = "bottom"
-        literal_props.align_horizontal = "left"
+        box_alignment_mask = [False] * 9
+        box_alignment_mask[6] = True  # bottom_left box_alignment
+        literal_props.box_alignment = box_alignment_mask
        return {"FINISHED"}


@@ -3365,55 +3365,57 @@ class OrderTextLiteralDown(bpy.types.Operator):
        return {"FINISHED"}


-class AssignSelectedObjectAsProduct(bpy.types.Operator, tool.Ifc.Operator):
+# Ifc Operator is unnecessary, because suboperator is handling IFC changes.
+class AssignSelectedObjectAsProduct(bpy.types.Operator):
    bl_idname = "bim.assign_selected_as_product"
    bl_label = "Assign Selected Object As Product"
    bl_options = {"REGISTER", "UNDO"}

    @classmethod
    def poll(cls, context):
-        if len(context.selected_objects) < 2:
-            cls.poll_message_set("At least 2 objects need to be selected")
+        if len(context.selected_objects) != 2:
+            cls.poll_message_set("2 objects need to be selected")
            return False
        return True

-    def _execute(self, context):
+    def execute(self, context):
+        assert bpy.context.view_layer
        objs = context.selected_objects[:]
-        ifc_objs = [(o, tool.Ifc.get_entity(o)) for o in objs if tool.Ifc.get_entity(o)]
+        obj1, obj2 = objs
+        element1 = tool.Ifc.get_entity(obj1)
+        element2 = tool.Ifc.get_entity(obj2)
+        assert element1 and element2

-        annotations = [(o, e) for o, e in ifc_objs if e.is_a("IfcAnnotation")]
-        non_annotations = [(o, e) for o, e in ifc_objs if not e.is_a("IfcAnnotation")]
+        # Check if at least one object is an IfcAnnotation
+        is_annotation1 = element1.is_a("IfcAnnotation")
+        is_annotation2 = element2.is_a("IfcAnnotation")

-        if not annotations:
-            self.report({"ERROR"}, "At least one selected object must be an IfcAnnotation.")
+        if not (is_annotation1 or is_annotation2):
+            self.report({"ERROR"}, "At least one of the selected objects must be IfcAnnotation.")
            return {"CANCELLED"}

-        if len(non_annotations) == 1:
-            # One product, one or more annotations — assign all annotations to the product.
-            product = non_annotations[0][1]
-        elif len(non_annotations) == 0 and len(annotations) == 2:
-            # Both objects are annotations — use the non-active one as the relating product.
+        # If both are annotations, use the currently active object as relating product
+        if is_annotation1 and is_annotation2:
            active_obj = context.active_object
-            if annotations[0][0] == active_obj:
-                annotation_obj, annotation = annotations[0]
-                product = annotations[1][1]
+            if active_obj == obj1:
+                other_selected_object = obj1
+                bpy.context.view_layer.objects.active = obj2
            else:
-                annotation_obj, annotation = annotations[1]
-                product = annotations[0][1]
-            core.edit_assigned_product(tool.Ifc, tool.Drawing, obj=annotation_obj, product=product)
-            tool.Blender.update_viewport()
-            return
+                other_selected_object = obj2
+                bpy.context.view_layer.objects.active = obj1
+        # If only one is an annotation, make it the active object
+        elif is_annotation1:
+            other_selected_object = obj2
+            bpy.context.view_layer.objects.active = obj1
        else:
-            self.report(
-                {"ERROR"},
-                "Select exactly one product object and one or more IfcAnnotation objects.",
-            )
-            return {"CANCELLED"}
+            other_selected_object = obj1
+            bpy.context.view_layer.objects.active = obj2

-        for annotation_obj, _ in annotations:
-            core.edit_assigned_product(tool.Ifc, tool.Drawing, obj=annotation_obj, product=product)
-
-        tool.Blender.update_viewport()
+        assert (active_obj := context.active_object)
+        props = tool.Drawing.get_object_assigned_product_props(active_obj)
+        props.relating_product = other_selected_object
+        bpy.ops.bim.edit_assigned_product()
+        return {"FINISHED"}


 class EditAssignedProduct(bpy.types.Operator, tool.Ifc.Operator):
@@ -3635,12 +3637,14 @@ class ToggleTargetView(bpy.types.Operator):
    bl_label = "Toggle Target View"
    bl_options = {"REGISTER", "UNDO"}

-    target_view: bpy.props.StringProperty()
-    toggle_all: bpy.props.BoolProperty(
+    target_view: bpy.props.StringProperty()  # pyright: ignore[reportRedeclaration]
+    toggle_all: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
        default=False,
        options={"SKIP_SAVE"},
    )
-    option: bpy.props.EnumProperty(items=[(i, i, "") for i in get_args(ToggleOption)])
+    option: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
+        items=[(i, i, "") for i in get_args(ToggleOption)]
+    )

    if TYPE_CHECKING:
        target_view: str
@@ -3883,7 +3887,8 @@ class AddReferenceImage(bpy.types.Operator, tool.Ifc.Operator, ImportHelper):
        image_filepath = Path(tool.Ifc.get_uri(self.filepath, use_relative_path=self.use_relative_path))
        ifc_file = tool.Ifc.get()

-        image = load_image(abs_path.name, str(abs_path.parent), check_existing=False)
+        params = {"check_existing": False}
+        image = load_image(abs_path.name, str(abs_path.parent), **params)

        mesh = bpy.data.meshes.new(image_filepath.stem)
        obj = bpy.data.objects.new(image_filepath.stem, mesh)
@@ -4173,7 +4178,10 @@ class SelectSimilarTextLiteralValue(bpy.types.Operator):
                                    should_select = True
                                    break
                        elif self.attribute_type == "box_alignment":
-                            if literal.get_box_alignment() == self.literal_value:
+                            box_alignment_attr = next(
+                                (attr for attr in literal.attributes if attr.name == "BoxAlignment"), None
+                            )
+                            if box_alignment_attr and box_alignment_attr.string_value == self.literal_value:
                                should_select = True
                                break

@@ -27,6 +27,7 @@ import ifcopenshell.api.pset
 import ifcopenshell.util.element
 from bpy.props import (
    BoolProperty,
+    BoolVectorProperty,
    CollectionProperty,
    EnumProperty,
    FloatProperty,
@@ -672,6 +673,20 @@ class BIMCameraProperties(PropertyGroup):
        return ortho_scale, aspect_ratio


+DEFAULT_BOX_ALIGNMENT = [False] * 6 + [True] + [False] * 2
+BOX_ALIGNMENT_POSITIONS = [
+    "top-left",
+    "top-middle",
+    "top-right",
+    "middle-left",
+    "center",
+    "middle-right",
+    "bottom-left",
+    "bottom-middle",
+    "bottom-right",
+]
+
+
 class ElementValueRow(PropertyGroup):
    """Represents a single element value row with category, key, and formatted value"""

@@ -774,38 +789,40 @@ def get_category_items_with_counts(self, context):


 class LiteralProps(PropertyGroup):
-    attributes: CollectionProperty(name="Attributes", type=Attribute)
-    ifc_definition_id: IntProperty(name="IFC definition ID", default=0)
-    align_horizontal: EnumProperty(
-        items=[
-            ("left", "Left", "", "ALIGN_LEFT", 0),
-            ("middle", "Middle", "", "ALIGN_CENTER", 1),
-            ("right", "Right", "", "ALIGN_RIGHT", 2),
-        ],
-        default="left",
-        name="Horizontal Alignment",
-    )
-    align_vertical: EnumProperty(
-        items=[
-            ("top", "Top", "", "ALIGN_TOP", 0),
-            ("middle", "Middle", "", "ALIGN_MIDDLE", 1),
-            ("bottom", "Bottom", "", "ALIGN_BOTTOM", 2),
-        ],
-        default="middle",
-        name="Vertical Alignment",
-    )
+    def set_box_alignment(self, new_value):
+        markers = new_value.count(True)
+        if not markers:
+            return

-    def get_box_alignment(self) -> str:
-        alignment = self.align_vertical + "-" + self.align_horizontal
-        if alignment == "middle-middle":
-            alignment = "center"
-        return alignment
+        if markers > 1:
+            prev_value = self.get("box_alignment", DEFAULT_BOX_ALIGNMENT)
+            # looking for the first value changed to positive
+            first_changed_value = next((i for i in range(9) if new_value[i] and new_value[i] != prev_value[i]), None)
+
+            # if nothing have changed we just keep the previous value
+            if first_changed_value is None:
+                return
+            new_value = [False] * 9
+            new_value[first_changed_value] = True
+
+        self["box_alignment"] = new_value
+        position_string = BOX_ALIGNMENT_POSITIONS[next(i for i in range(9) if new_value[i])]
+        self.attributes["BoxAlignment"].set_value(position_string)
+
+    def get_box_alignment(self):
+        return self.get("box_alignment", DEFAULT_BOX_ALIGNMENT)
+
+    attributes: CollectionProperty(name="Attributes", type=Attribute)
+    box_alignment: BoolVectorProperty(
+        name="Box alignment", size=9, set=set_box_alignment, get=get_box_alignment, default=DEFAULT_BOX_ALIGNMENT
+    )
+    ifc_definition_id: IntProperty(name="IFC definition ID", default=0)

    def get_literal_edited_data(self) -> dict[str, str]:
        text_data = {
            "CurrentValue": self.attributes["Literal"].string_value,
            "Literal": self.attributes["Literal"].string_value,
-            "BoxAlignment": self.get_box_alignment(),
+            "BoxAlignment": self.attributes["BoxAlignment"].string_value,
        }
        return text_data

@@ -843,30 +860,23 @@ class LiteralProps(PropertyGroup):
    if TYPE_CHECKING:
        attributes: bpy.types.bpy_prop_collection_idprop[Attribute]
        value: str
+        box_alignment: tuple[bool, bool, bool, bool, bool, bool, bool, bool, bool]
        ifc_definition_id: int
-        align_horizontal: str
-        align_vertical: str
        element_value_rows: bpy.types.bpy_prop_collection_idprop[ElementValueRow]
        category_for_adding: str


-def update_text_alignment(self, context):
-    for literal_props in self.literals:
-        literal_props.align_horizontal = self.align_horizontal
-        literal_props.align_vertical = self.align_vertical
-
-
 class BIMTextProperties(PropertyGroup):
    is_editing: BoolProperty(name="Is Editing", default=False)
    literals: CollectionProperty(name="Literals", type=LiteralProps)
    newline_at: IntProperty(name="Newline At")
-    symbol: EnumProperty(
+    symbol: EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Symbol",
        description="Symbol from symbols.svg to use for this text.",
        items=[(s, s, "") for s in ["NO SYMBOL", "CUSTOM SYMBOL"] + tool.Drawing.DEFAULT_SYMBOLS],
        default="NO SYMBOL",
    )
-    custom_symbol: StringProperty(
+    custom_symbol: StringProperty(  # pyright: ignore[reportRedeclaration]
        name="Custom Symbol",
        description="Non-default symbol to use for this text.",
    )
@@ -889,7 +899,6 @@ class BIMTextProperties(PropertyGroup):
        ],
        default="left",
        name="Horizontal Alignment",
-        update=update_text_alignment,
    )
    align_vertical: EnumProperty(
        items=[
@@ -899,7 +908,6 @@ class BIMTextProperties(PropertyGroup):
        ],
        default="middle",
        name="Vertical Alignment",
-        update=update_text_alignment,
    )

    if TYPE_CHECKING:
@@ -366,6 +366,9 @@ class BaseLinesShader(BaseShader):
    }
    """

+    def __init__(self, gap_size=16):
+        super().__init__(gap_size=gap_size)
+
    def glenable(self):
        super().glenable()

@@ -781,10 +781,33 @@ class BIM_PT_text(Panel):
            if other_attributes:
                bonsai.bim.helper.draw_attributes(other_attributes, box)

-            row = box.row()
-            row.label(text="Alignment")
-            row.prop(literal_props, "align_horizontal", text="", expand=True)
-            row.prop(literal_props, "align_vertical", text="", expand=True)
+            row = box.row(align=True)
+            cols = [row.column(align=True) for j in range(3)]
+            for j in range(9):
+                cols[j % 3].prop(
+                    literal_props,
+                    "box_alignment",
+                    text="",
+                    index=j,
+                    icon="RADIOBUT_ON" if literal_props.box_alignment[j] else "RADIOBUT_OFF",
+                )
+
+            col = row.column(align=True)
+            alignment_label_row = col.row(align=True)
+            alignment_label_row.label(text="    Text box alignment:")
+
+            box_alignment_value = (
+                literal_props.attributes[
+                    next(
+                        (idx for idx, attr in enumerate(literal_props.attributes) if attr.name == "BoxAlignment"),
+                        -1,
+                    )
+                ].string_value
+                if any(attr.name == "BoxAlignment" for attr in literal_props.attributes)
+                else "N/A"
+            )
+
+            col.label(text=f"    {box_alignment_value}")

    def draw(self, context):
        obj = context.active_object
@@ -816,6 +839,7 @@ class BIM_PT_text(Panel):

        for i, literal_data in enumerate(text_data["Literals"]):
            box = self.layout.box()
+            box.label(text=f"Literal[{i}]:")

            # Combine both approaches: clickable attributes from PR #7292 and display from PR #7106
            for attribute in literal_data:
@@ -44,12 +44,8 @@ class ViewportData:

    @classmethod
    def load(cls):
-        # Populate data BEFORE flipping is_loaded so a raising ``mode()``
-        # call doesn't leave the class half-loaded (flag set, dict empty).
-        # Subsequent items-callback invocations skip load() on a True flag
-        # and would hit ``cls.data["mode"]`` → KeyError.
-        cls.data = {"mode": cls.mode()}
        cls.is_loaded = True
+        cls.data = {"mode": cls.mode()}

    @classmethod
    def mode(cls) -> tool.Blender.BLENDER_ENUM_ITEMS:
@@ -80,9 +76,9 @@ class ViewportData:
                modes.append(edit_mode)
            elif element.is_a("IfcGridAxis"):
                modes.append(edit_mode)
-            elif tool.Parametric.is_roof(element):
+            elif tool.Blender.Modifier.is_roof(element):
                modes.append(edit_mode)
-            elif tool.Parametric.is_railing(element):
+            elif tool.Blender.Modifier.is_railing(element):
                modes.append(edit_mode)
            elif item_mode not in modes:
                modes.append(item_mode)
@@ -60,7 +60,6 @@ import bonsai.core.root
 import bonsai.core.spatial
 import bonsai.tool as tool
 from bonsai.bim.ifc import IfcStore
-from bonsai.bim.module.model import preview_base
 from bonsai.bim.module.model.decorator import ProfileDecorator

 if TYPE_CHECKING:
@@ -86,7 +85,7 @@ class EditObjectPlacement(bpy.types.Operator, tool.Ifc.Operator):
 class OverrideMeshSeparate(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.override_mesh_separate"
    bl_label = "IFC Mesh Separate"
-    blender_op = bpy.ops.mesh.separate.get_rna_type()  # ty: ignore[missing-argument]
+    blender_op = bpy.ops.mesh.separate.get_rna_type()
    bl_description = blender_op.description + ".\nAlso makes sure changes are in sync with IFC."
    bl_options = {"REGISTER", "UNDO"}
    blender_type_prop = blender_op.properties["type"]
@@ -247,7 +246,7 @@ class OverrideMeshSeparate(bpy.types.Operator, tool.Ifc.Operator):

 class OverrideOriginSet(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.override_origin_set"
-    blender_op = bpy.ops.object.origin_set.get_rna_type()  # ty: ignore[missing-argument]
+    blender_op = bpy.ops.object.origin_set.get_rna_type()
    bl_label = "IFC Origin Set"
    bl_description = (
        blender_op.description + ".\nAlso makes sure changes are in sync with IFC (operator works only on IFC objects)"
@@ -802,7 +801,7 @@ def calc_delete_is_batch(ifc_file: ifcopenshell.file, context: bpy.types.Context
 class OverrideDelete(bpy.types.Operator):
    bl_idname = "bim.override_object_delete"
    bl_label = "IFC Delete"
-    blender_op = bpy.ops.object.delete.get_rna_type()  # ty: ignore[missing-argument]
+    blender_op = bpy.ops.object.delete.get_rna_type()
    bl_description = (
        blender_op.description
        + ".\nAlso makes sure changes in sync with IFC."
@@ -822,7 +821,7 @@ class OverrideDelete(bpy.types.Operator):
    def poll(cls, context):
        # Match `object.delete` poll for consistency.
        # `object.delete` poll just checks for OBJECT mode.
-        poll = bpy.ops.object.delete.poll()  # ty: ignore[missing-argument]
+        poll = bpy.ops.object.delete.poll()
        if poll:
            return True
        cls.poll_message_set("Only available in OBJECT mode")
@@ -1027,10 +1026,10 @@ class OverrideDelete(bpy.types.Operator):

        for array_parent in array_parents:
            array_parent_obj = tool.Ifc.get_object(array_parent)
-            data = [(i, data) for i, data in enumerate(tool.Array.get_modifiers_data(array_parent))]
+            data = [(i, data) for i, data in enumerate(tool.Blender.Modifier.Array.get_modifiers_data(array_parent))]
            # NOTE: there is a way to remove arrays more precisely but it's more complex
            for i, modifier_data in reversed(data):
-                children = set(tool.Array.get_children_objects(modifier_data))
+                children = set(tool.Blender.Modifier.Array.get_children_objects(modifier_data))
                if children.issubset(selected_objects):
                    with context.temp_override(active_object=array_parent_obj):
                        bpy.ops.bim.remove_array(item=i)
@@ -1046,7 +1045,7 @@ class SelectedIdsData(NamedTuple):
 class OverrideOutlinerDelete(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.override_outliner_delete"
    bl_label = "IFC Delete"
-    blender_op = bpy.ops.outliner.delete.get_rna_type()  # ty: ignore[missing-argument]
+    blender_op = bpy.ops.outliner.delete.get_rna_type()
    bl_description = (
        blender_op.description
        + ".\nAlso makes sure changes in sync with IFC."
@@ -1061,13 +1060,13 @@ class OverrideOutlinerDelete(bpy.types.Operator, tool.Ifc.Operator):
    def poll(cls, context) -> bool:
        # Match `outliner.delete` poll for consistency.
        # `outliner.delete` just checks `area.type` == `OUTLINER`.
-        poll = bpy.ops.outliner.delete.poll()  # ty: ignore[missing-argument]
+        poll = bpy.ops.outliner.delete.poll()
        if poll:
            return True
        cls.poll_message_set("Only available from Outliner.")
        return False

-    def execute(self, context):  # ty:ignore[override-of-final-method]
+    def execute(self, context):
        if len(getattr(context, "selected_ids", [])) == 0:
            return {"FINISHED"}

@@ -1165,7 +1164,7 @@ class OverrideDuplicateMove(bpy.types.Operator):
    def poll(cls, context) -> bool:
        # Match `object.duplicate_move` poll for consistency.
        # `object.duplicate_move` poll checks for OBJECT mode.
-        poll = bpy.ops.object.duplicate_move.poll()  # ty: ignore[missing-argument]
+        poll = bpy.ops.object.duplicate_move.poll()
        if poll:
            return True
        cls.poll_message_set("Only available in OBJECT mode")
@@ -1184,7 +1183,7 @@ class OverrideDuplicateMove(bpy.types.Operator):
        operator: bpy.types.Operator, context: bpy.types.Context, linked: bool = False
    ) -> set["rna_enums.OperatorReturnItems"]:
        # Deep magick from the dawn of time
-        if tool.Ifc.get() and tool.Model.has_selected_ifc_objects(include_active=False):
+        if tool.Ifc.get():
            IfcStore.execute_ifc_operator(operator, context)
            return {"FINISHED"}

@@ -1288,9 +1287,6 @@ class OverrideDuplicateMove(bpy.types.Operator):
                            if part_obj:
                                all_objects_to_select.add(part_obj)

-        # Non-IFC duplicates aren't tracked in old_to_new but are left selected by duplicate_ifc_objects
-        all_objects_to_select.update(obj for obj in context.selected_objects if not tool.Ifc.get_entity(obj))
-
        # Deselect everything first
        bpy.ops.object.select_all(action="DESELECT")

@@ -1912,7 +1908,7 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):
 class OverrideJoin(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.override_object_join"
    bl_label = "IFC Join"
-    blender_op = bpy.ops.mesh.separate.get_rna_type()  # ty: ignore[missing-argument]
+    blender_op = bpy.ops.mesh.separate.get_rna_type()
    bl_description = (
        blender_op.description
        + ".\nAlso makes sure changes are in sync with IFC."
@@ -1930,7 +1926,7 @@ class OverrideJoin(bpy.types.Operator, tool.Ifc.Operator):

    @classmethod
    def poll(cls, context):
-        if not bpy.ops.object.join.poll():  # ty: ignore[missing-argument]
+        if not bpy.ops.object.join.poll():
            cls.poll_message_set("Active object is not EDITable.")
            return False
        if not context.selected_editable_objects:
@@ -2227,8 +2223,6 @@ class OverrideEscape(bpy.types.Operator):
            bpy.ops.bim.hide_all_openings()
        elif tool.Aggregate.get_aggregate_props().in_aggregate_mode:
            bpy.ops.bim.disable_aggregate_mode()
-        elif preview_base.try_cancel_active_preview(context):
-            pass
        elif active_object := context.active_object:
            if tool.Blender.Modifier.try_canceling_editing_modifier_parameters_or_path(active_object):
                pass
@@ -2270,8 +2264,6 @@ class OverrideModeSetEdit(bpy.types.Operator, tool.Ifc.Operator):
                gprops = tool.Geometry.get_geometry_props()
                if gprops.representation_obj:
                    tool.Geometry.disable_item_mode()
-                    if active_obj := bpy.context.active_object:
-                        active_obj.select_set(False)
                else:
                    bonsai.core.aggregate.exit_aggregate_mode(tool.Aggregate)
                return {"FINISHED"}
@@ -2297,7 +2289,7 @@ class OverrideModeSetEdit(bpy.types.Operator, tool.Ifc.Operator):
        elif obj in pprops.clipping_planes_objs:
            self.report({"ERROR"}, "Clipping planes cannot be edited")
        elif element:
-            if not obj.data or obj.type not in ("MESH", "CURVE"):
+            if not obj.data:
                self.report({"INFO"}, "No geometry to edit")
            elif tool.Geometry.is_locked(element):
                self.report({"ERROR"}, lock_error_message(obj.name))
@@ -2358,7 +2350,6 @@ class OverrideModeSetEdit(bpy.types.Operator, tool.Ifc.Operator):
            and usage in ("LAYER1", "LAYER2")
        ):
            self.report({"INFO"}, f"Parametric {usage} elements cannot be edited directly")
-            obj.select_set(False)
        elif item.is_a("IfcSweptAreaSolid"):
            tool.Geometry.sync_item_positions()
            res = tool.Model.import_profile((profile := item.SweptArea), obj=obj)
@@ -2367,7 +2358,6 @@ class OverrideModeSetEdit(bpy.types.Operator, tool.Ifc.Operator):
                    {"INFO"},
                    f"Couldn't import profile, editing it directly is not yet supported. Failing profile: {profile}.",
                )
-                obj.select_set(False)
                return
            tool.Ifc.link(item, obj.data)
            self.enable_edit_mode(context)
@@ -2495,9 +2485,9 @@ class OverrideModeSetObject(bpy.types.Operator, tool.Ifc.Operator):
                    profile = tool.Ifc.get().by_id(profile_id)
                    if tool.Ifc.get_object(profile):  # We are editing an arbitrary profile
                        bpy.ops.bim.edit_arbitrary_profile()
-                elif tool.Parametric.is_railing(element):
+                elif tool.Blender.Modifier.is_railing(element):
                    bpy.ops.bim.finish_editing_railing_path()
-                elif tool.Parametric.is_roof(element):
+                elif tool.Blender.Modifier.is_roof(element):
                    bpy.ops.bim.finish_editing_roof_path()
                elif tool.Model.get_usage_type(element) == "PROFILE":
                    bpy.ops.bim.edit_extrusion_axis()
@@ -19,7 +19,6 @@
 import bpy
 from bpy.types import Menu, Panel, UIList

-import ifcopenshell.util.unit
 import bonsai.bim
 import bonsai.tool as tool
 from bonsai.bim.helper import prop_with_search
@@ -484,32 +483,10 @@ class BIM_PT_placement(Panel):
            row.label(text="No Object Placement Found")
            return

-        is_imperial = False
-        if tool.Ifc.get():
-            length_unit = ifcopenshell.util.unit.get_project_unit(tool.Ifc.get(), "LENGTHUNIT")
-            if length_unit and length_unit.Name != "METRE":
-                is_imperial = True
-
        row = self.layout.row()
-        row.label(text="Location:")
-
-        if is_imperial:
-            loc = context.active_object.location
-            for i, (axis, comp) in enumerate(zip("XYZ", (loc.x, loc.y, loc.z))):
-                split = self.layout.split(factor=0.6)
-                split.prop(context.active_object, "location", index=i, text=axis)
-                sub = split.row()
-                sub.enabled = False
-                sub.alignment = "LEFT"
-                sub.label(text=tool.Unit.format_distance(comp))
-        else:
-            for i, axis in enumerate("XYZ"):
-                self.layout.prop(context.active_object, "location", index=i, text=axis)
-
+        row.prop(context.active_object, "location", text="Location")
        row = self.layout.row()
-        row.label(text="Rotation:")
-        for i, axis in enumerate("XYZ"):
-            self.layout.prop(context.active_object, "rotation_euler", index=i, text=axis)
+        row.prop(context.active_object, "rotation_euler", text="Rotation")

        if props.blender_offset_type != "NONE":
            row = self.layout.row(align=True)
@@ -139,9 +139,7 @@ def update_local_coordinates(self: "BIMGeoreferenceProperties", context: bpy.typ
        tool.Georeference.set_coordinates(
            "blender",
            ifcopenshell.util.geolocation.enh2xyz(
-                local_coordinates[0],
-                local_coordinates[1],
-                local_coordinates[2],
+                *local_coordinates,
                float(props.blender_offset_x),
                float(props.blender_offset_y),
                float(props.blender_offset_z),
@@ -164,9 +162,7 @@ def update_map_coordinates(self: "BIMGeoreferenceProperties", context: bpy.types
        tool.Georeference.set_coordinates(
            "blender",
            ifcopenshell.util.geolocation.enh2xyz(
-                local_coordinates[0],
-                local_coordinates[1],
-                local_coordinates[2],
+                *local_coordinates,
                float(props.blender_offset_x),
                float(props.blender_offset_y),
                float(props.blender_offset_z),
@@ -271,8 +267,6 @@ class BIMGeoreferenceProperties(PropertyGroup):
        x_axis_ordinate: str
        x_axis_is_null: bool

-        model_is_georeferenced: bool
-        model_crs: str
        model_origin: str
        model_origin_si: str
        model_project_north: str
@@ -27,7 +27,7 @@ from bonsai.bim.prop import StrProperty

 class BIMCityJsonProperties(PropertyGroup):
    def get_lods(self, context):
-        global LODS_ENUM_ITEMS  # ty: ignore[unresolved-global]
+        global LODS_ENUM_ITEMS
        LODS_ENUM_ITEMS = [(item.name, "LOD" + item.name, "Level of Detail " + item.name) for item in self.lods]
        return LODS_ENUM_ITEMS

@@ -43,11 +43,11 @@ class ToggleGroup(bpy.types.Operator, tool.Ifc.Operator):
    bl_label = "Toggle Group"
    bl_options = {"REGISTER", "UNDO"}

-    ifc_definition_id: bpy.props.IntProperty()
-    group_type: bpy.props.EnumProperty(
+    ifc_definition_id: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]
+    group_type: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        items=[(i, i, "") for i in get_args(tool.Group.GroupType)],
    )
-    option: bpy.props.EnumProperty(
+    option: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        items=[(i, i, "") for i in get_args(tool.Group.ToggleOption)],
    )

@@ -34,10 +34,8 @@ classes = (
    operator.Fetch,
    operator.Merge,
    operator.ObjectLog,
-    operator.SelectConflictEntity,
    operator.Push,
    operator.RefreshGit,
-    operator.RenameBranch,
    operator.SwitchRevision,
    operator.InstallGit,
    operator.RunGitDiff,
@@ -21,71 +21,65 @@ class IfcGitData:

    @classmethod
    def load(cls):
-        repo = None
-        if bool(tool.Ifc.get()):
-            path_ifc = tool.Ifc.get_path()
-            if os.path.isfile(path_ifc):
-                repo = tool.IfcGit.repo_from_path(path_ifc)
-
        cls.data = {
-            "repo": repo,
-            "remotes": repo.remotes if repo else None,
-            "branch_names": cls.branch_names(repo),
-            "tag_names": cls.tag_names(repo),
-            "remote_names": cls.remote_names(repo),
-            "remote_urls": {r.name: r.url for r in repo.remotes} if repo else {},
+            "repo": cls.repo(),
+            "remotes": cls.remotes(),
+            "branch_names": cls.branch_names(),
+            "remote_names": cls.remote_names(),
+            "remote_urls": cls.remote_urls(),
            "path_ifc": cls.path_ifc(),
            "branches_by_hexsha": cls.branches_by_hexsha(),
            "tags_by_hexsha": cls.tags_by_hexsha(),
-            "name_ifc": cls.name_ifc(repo),
+            "name_ifc": cls.name_ifc(),
            "dir_name": cls.dir_name(),
            "base_name": cls.base_name(),
-            "working_dir": repo.working_dir if repo else None,
-            "ifc_is_untracked": cls.ifc_is_untracked(repo),
-            "is_detached": repo.head.is_detached if repo else None,
-            "active_branch_name": repo.active_branch.name if repo and not repo.head.is_detached else None,
-            "is_dirty": cls.is_dirty(repo),
-            "current_revision": cls.current_revision(repo),
+            "working_dir": cls.working_dir(),
+            "untracked_files": cls.untracked_files(),
+            "is_detached": cls.is_detached(),
+            "active_branch_name": cls.active_branch_name(),
+            "is_dirty": cls.is_dirty(),
+            "commit": cls.commit(),
+            "current_revision": cls.current_revision(),
            "git_exe": cls.git_exe(),
            "ifcmerge_exe": cls.ifcmerge_exe(),
        }
        cls.is_loaded = True

    @classmethod
-    def branch_names(cls, repo):
-        if not repo or not repo.heads:
-            return []
-        names = sorted([b.name for b in repo.branches])
-        if "main" in names:
-            names.remove("main")
-            names = ["main"] + names
-        if repo.remotes:
-            for remote in repo.remotes:
-                for ref in remote.refs:
-                    names.append(ref.name)
-        return names
+    def repo(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return tool.IfcGit.repo_from_path(path_ifc)
+        return None

    @classmethod
-    def tag_names(cls, repo):
-        if not repo:
-            return []
-        return [t.name for t in repo.tags]
+    def remotes(cls):
+        if cls.repo():
+            return cls.repo().remotes
+        return None

    @classmethod
-    def remote_names(cls, repo):
-        if not repo:
-            return []
-        names = sorted([r.name for r in repo.remotes])
-        if "origin" in names:
-            names.remove("origin")
-            names = ["origin"] + names
-        return names
+    def branch_names(cls):
+        return []
+
+    @classmethod
+    def remote_names(cls):
+        return []
+
+    @classmethod
+    def remote_urls(cls):
+        result = {}
+        if cls.repo():
+            for remote in cls.repo().remotes:
+                result[remote.name] = remote.url
+        return result

    @classmethod
    def path_ifc(cls):
        path_ifc = tool.Ifc.get_path()
        if os.path.isfile(path_ifc):
-            return path_ifc
+            return tool.Ifc.get_path()
        return None

    @classmethod
@@ -94,8 +88,7 @@ class IfcGitData:
            if tool.IfcGitRepo.repo.branches:
                return tool.IfcGit.branches_by_hexsha(tool.IfcGitRepo.repo)
        except AttributeError:
-            pass
-        return {}
+            return {}

    @classmethod
    def tags_by_hexsha(cls):
@@ -104,11 +97,12 @@ class IfcGitData:
        return {}

    @classmethod
-    def name_ifc(cls, repo):
-        if bool(tool.Ifc.get()) and repo:
+    def name_ifc(cls):
+        if bool(tool.Ifc.get()):
            path_ifc = tool.Ifc.get_path()
-            if os.path.isfile(path_ifc):
-                return os.path.relpath(path_ifc, repo.working_dir)
+            if tool.IfcGitRepo.repo and os.path.isfile(path_ifc):
+                working_dir = tool.IfcGitRepo.repo.working_dir
+                return os.path.relpath(path_ifc, working_dir)
        return None

    @classmethod
@@ -128,28 +122,49 @@ class IfcGitData:
        return None

    @classmethod
-    def ifc_is_untracked(cls, repo):
-        """Return True if the IFC file exists in the repo but has not been added to git."""
-        if not repo:
-            return False
-        path_ifc = tool.Ifc.get_path()
-        if not os.path.isfile(path_ifc):
-            return False
-        return not bool(repo.git.ls_files(path_ifc))
+    def working_dir(cls):
+        if cls.repo():
+            return cls.repo().working_dir

    @classmethod
-    def is_dirty(cls, repo):
-        if repo and cls.git_exe():
+    def untracked_files(cls):
+        if cls.repo():
+            return cls.repo().untracked_files
+        return []
+
+    @classmethod
+    def is_detached(cls):
+        if cls.repo():
+            return cls.repo().head.is_detached
+
+    @classmethod
+    def active_branch_name(cls):
+        if cls.repo() and not cls.is_detached():
+            return cls.repo().active_branch.name
+
+    @classmethod
+    def is_dirty(cls):
+        if cls.repo() and cls.git_exe():
            path_ifc = tool.Ifc.get_path()
            if os.path.isfile(path_ifc):
-                return repo.is_dirty(path=path_ifc)
+                return cls.repo().is_dirty(path=path_ifc)
        return False

    @classmethod
-    def current_revision(cls, repo):
+    def commit(cls):
        props = tool.IfcGit.get_ifcgit_props()
-        if repo and repo.head.is_valid() and len(props.ifcgit_commits) > 0:
-            return repo.commit()
+        if cls.repo() and len(props.ifcgit_commits) > 0:
+            item = props.ifcgit_commits[props.commit_index]
+            try:
+                return cls.repo().commit(rev=item.hexsha)
+            except ValueError:
+                return
+
+    @classmethod
+    def current_revision(cls):
+        props = tool.IfcGit.get_ifcgit_props()
+        if cls.repo() and cls.repo().head.is_valid() and len(props.ifcgit_commits) > 0:
+            return tool.IfcGitRepo.repo.commit()

    @classmethod
    def git_exe(cls):
@@ -120,11 +120,11 @@ class CommitChanges(bpy.types.Operator):
        if props.commit_message == "":
            return False
        if repo:
-            if props.new_branch_name in IfcGitData.data["branch_names"]:
+            if props.new_branch_name in [branch.name for branch in repo.branches]:
                cls.poll_message_set("Branch already exists!")
                return False
            elif not tool.IfcGit.is_valid_ref_format(props.new_branch_name):
-                if IfcGitData.data["is_detached"]:
+                if repo.head.is_detached:
                    cls.poll_message_set("Branch name is invalid or empty!")
                    return False
                elif props.new_branch_name != "":
@@ -134,17 +134,10 @@ class CommitChanges(bpy.types.Operator):

    def execute(self, context):

-        props = tool.IfcGit.get_ifcgit_props()
-        commit_message = props.commit_message
-        new_branch_name = props.new_branch_name
-        core.commit_changes(tool.IfcGit, tool.Ifc, commit_message, new_branch_name)
-        props.new_branch_name = ""
-        props.commit_message = ""
-        core.refresh_revision_list(tool.IfcGit, tool.Ifc)
+        repo = IfcGitData.data["repo"]
+        core.commit_changes(tool.IfcGit, tool.Ifc, repo)
+        core.refresh_revision_list(tool.IfcGit, repo, tool.Ifc)
        refresh()
-        IfcGitData.load()
-        if new_branch_name:
-            props.display_branch = new_branch_name
        return {"FINISHED"}


@@ -164,7 +157,7 @@ class AddTag(bpy.types.Operator):
        repo = IfcGitData.data["repo"]
        if repo and (
            not tool.IfcGit.is_valid_ref_format(props.new_tag_name)
-            or props.new_tag_name in IfcGitData.data["tag_names"]
+            or props.new_tag_name in [tag.name for tag in repo.tags]
        ):
            return False
        return True
@@ -172,12 +165,8 @@ class AddTag(bpy.types.Operator):
    def execute(self, context):

        repo = IfcGitData.data["repo"]
-        props = tool.IfcGit.get_ifcgit_props()
-        item = props.ifcgit_commits[props.commit_index]
-        core.add_tag(tool.IfcGit, repo, item.hexsha, props.new_tag_name, props.new_tag_message)
-        props.new_tag_name = ""
-        props.new_tag_message = ""
-        core.refresh_revision_list(tool.IfcGit, tool.Ifc)
+        core.add_tag(tool.IfcGit, repo)
+        core.refresh_revision_list(tool.IfcGit, repo, tool.Ifc)
        refresh()
        return {"FINISHED"}

@@ -194,7 +183,7 @@ class DeleteTag(bpy.types.Operator):

        repo = IfcGitData.data["repo"]
        core.delete_tag(tool.IfcGit, repo, self.tag_name)
-        core.refresh_revision_list(tool.IfcGit, tool.Ifc)
+        core.refresh_revision_list(tool.IfcGit, repo, tool.Ifc)
        refresh()
        return {"FINISHED"}

@@ -202,7 +191,7 @@ class DeleteTag(bpy.types.Operator):
 class RefreshGit(bpy.types.Operator):
    """Refresh revision list"""

-    bl_label = "Refresh"
+    bl_label = ""
    bl_idname = "ifcgit.refresh"
    bl_options = {"REGISTER"}

@@ -216,7 +205,8 @@ class RefreshGit(bpy.types.Operator):

    def execute(self, context):

-        core.refresh_revision_list(tool.IfcGit, tool.Ifc)
+        repo = IfcGitData.data["repo"]
+        core.refresh_revision_list(tool.IfcGit, repo, tool.Ifc)
        refresh()
        tool.IfcGit.decolourise()
        return {"FINISHED"}
@@ -225,7 +215,7 @@ class RefreshGit(bpy.types.Operator):
 class DisplayRevision(bpy.types.Operator):
    """Colourise objects by selected revision"""

-    bl_label = "Colourise Revision"
+    bl_label = ""
    bl_idname = "ifcgit.display_revision"
    bl_options = {"REGISTER"}

@@ -260,7 +250,7 @@ class DisplayUncommitted(bpy.types.Operator):
 class SwitchRevision(bpy.types.Operator):
    """Switches the repository to the selected revision and reloads the IFC file"""

-    bl_label = "Switch Revision"
+    bl_label = ""
    bl_idname = "ifcgit.switch_revision"
    bl_options = {"REGISTER"}

@@ -278,7 +268,7 @@ class SwitchRevision(bpy.types.Operator):


 class Merge(bpy.types.Operator):
-    """Merges the selected branch into working branch.\nCtrl+click to preview without merging"""
+    """Merges the selected branch into working branch"""

    bl_label = "Merge this branch"
    bl_idname = "ifcgit.merge"
@@ -292,84 +282,15 @@ class Merge(bpy.types.Operator):
            return True
        return False

-    def invoke(self, context, event):
-        if event.ctrl:
-            core.dry_run_merge(tool.IfcGit, tool.Ifc, self)
-            refresh()
-            return {"FINISHED"}
-        return self.execute(context)
-
    def execute(self, context):
-        if core.merge_branch(tool.IfcGit, tool.Ifc, self) is not False:
+
+        if core.merge_branch(tool.IfcGit, tool.Ifc, self):
            refresh()
            return {"FINISHED"}
        else:
            return {"CANCELLED"}


-class SelectConflictEntity(bpy.types.Operator):
-    """Select the conflicting entity in the viewport"""
-
-    bl_label = "Select Conflict Entity"
-    bl_idname = "ifcgit.select_conflict_entity"
-    bl_options = {"REGISTER"}
-
-    step_id: bpy.props.IntProperty()
-
-    if TYPE_CHECKING:
-        step_id: int
-
-    def execute(self, context):
-        model = tool.Ifc.get()
-        if not model:
-            return {"CANCELLED"}
-
-        try:
-            entity = model.by_id(self.step_id)
-        except Exception:
-            self.report({"WARNING"}, f"Entity #{self.step_id} not found (may have been deleted locally)")
-            return {"CANCELLED"}
-
-        obj = tool.Ifc.get_object(entity)
-        if obj is None:
-            # Walk inverse references up to 5 hops to find nearest entity with a Blender object
-            visited = {entity.id()}
-            queue = [entity]
-            for _ in range(5):
-                next_queue = []
-                for ent in queue:
-                    for inv in model.get_inverse(ent):
-                        if inv.id() in visited:
-                            continue
-                        visited.add(inv.id())
-                        obj = tool.Ifc.get_object(inv)
-                        if obj is not None:
-                            break
-                        next_queue.append(inv)
-                    if obj is not None:
-                        break
-                if obj is not None:
-                    break
-                queue = next_queue
-
-        if obj is None:
-            self.report({"INFO"}, f"No viewport representation found for #{self.step_id} ({entity.is_a()})")
-            return {"CANCELLED"}
-
-        bpy.ops.object.select_all(action="DESELECT")
-        obj.select_set(True)
-        context.view_layer.objects.active = obj
-        for area in context.screen.areas:
-            if area.type == "VIEW_3D":
-                region = next((r for r in area.regions if r.type == "WINDOW"), None)
-                if region:
-                    with context.temp_override(area=area, region=region):
-                        bpy.ops.view3d.view_selected()
-                break
-
-        return {"FINISHED"}
-
-
 class Push(bpy.types.Operator):
    """Pushes the working branch to selected remote"""

@@ -393,9 +314,9 @@ class Fetch(bpy.types.Operator):

    def execute(self, context):
        props = tool.IfcGit.get_ifcgit_props()
-        core.fetch(tool.IfcGit, props.select_remote)
-        core.refresh_revision_list(tool.IfcGit, tool.Ifc)
-        refresh()
+        repo = IfcGitData.data["repo"]
+        remote = repo.remotes[props.select_remote]
+        remote.fetch()
        return {"FINISHED"}


@@ -415,7 +336,7 @@ class AddRemote(bpy.types.Operator):
            not repo
            or not tool.IfcGit.is_valid_ref_format(props.remote_name)
            or not props.remote_url
-            or props.remote_name in IfcGitData.data["remote_names"]
+            or props.remote_name in [remote.name for remote in repo.remotes]
        ):
            return False
        return True
@@ -423,11 +344,8 @@ class AddRemote(bpy.types.Operator):
    def execute(self, context):

        repo = IfcGitData.data["repo"]
-        props = tool.IfcGit.get_ifcgit_props()
-        core.add_remote(tool.IfcGit, repo, props.remote_name, props.remote_url)
-        props.remote_name = ""
-        props.remote_url = ""
-        core.refresh_revision_list(tool.IfcGit, tool.Ifc)
+        core.add_remote(tool.IfcGit, repo)
+        core.refresh_revision_list(tool.IfcGit, repo, tool.Ifc)
        refresh()
        return {"FINISHED"}

@@ -442,19 +360,8 @@ class DeleteRemote(bpy.types.Operator):
    def execute(self, context):

        repo = IfcGitData.data["repo"]
-        props = tool.IfcGit.get_ifcgit_props()
-        remote_name = props.select_remote
-        if props.display_branch.startswith(remote_name + "/"):
-            active = IfcGitData.data["active_branch_name"]
-            if active:
-                props.display_branch = active
-            else:
-                local_branches = [b for b in IfcGitData.data["branch_names"] if "/" not in b]
-                if local_branches:
-                    props.display_branch = local_branches[0]
-        core.delete_remote(tool.IfcGit, repo, remote_name)
-        tool.IfcGit.select_first_remote()
-        core.refresh_revision_list(tool.IfcGit, tool.Ifc)
+        core.delete_remote(tool.IfcGit, repo)
+        core.refresh_revision_list(tool.IfcGit, repo, tool.Ifc)
        refresh()
        return {"FINISHED"}

@@ -468,8 +375,8 @@ class ObjectLog(bpy.types.Operator):

    @classmethod
    def poll(cls, context):
-        if not (obj := context.active_object) or not obj.select_get():
-            cls.poll_message_set("No selected object")
+        if not (obj := context.active_object):
+            cls.poll_message_set("No Active Object")
        elif not tool.Blender.get_ifc_definition_id(obj):
            cls.poll_message_set("Active Object doesn't have an IFC definition")
        else:
@@ -515,7 +422,7 @@ class RunGitDiff(bpy.types.Operator):
    )
    bl_options = set()

-    save_to_temp: bpy.props.BoolProperty(options={"SKIP_SAVE"})
+    save_to_temp: bpy.props.BoolProperty(options={"SKIP_SAVE"})  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        save_to_temp: bool
@@ -538,37 +445,3 @@ class RunGitDiff(bpy.types.Operator):
    def execute(self, context):
        core.run_git_diff(tool.IfcGit, self, self.save_to_temp)
        return {"FINISHED"}
-
-
-class RenameBranch(bpy.types.Operator):
-    """Rename the current branch"""
-
-    bl_label = "Rename Branch"
-    bl_idname = "ifcgit.rename_branch"
-    bl_options = {"REGISTER"}
-
-    new_name: bpy.props.StringProperty(name="New name")
-
-    if TYPE_CHECKING:
-        new_name: str
-
-    @classmethod
-    def poll(cls, context):
-        IfcGitData.make_sure_is_loaded()
-        if not IfcGitData.data["repo"]:
-            return False
-        if IfcGitData.data["is_detached"]:
-            return False
-        if IfcGitData.data["is_dirty"]:
-            return False
-        return True
-
-    def invoke(self, context, event):
-        self.new_name = IfcGitData.data["active_branch_name"]
-        return context.window_manager.invoke_props_dialog(self)
-
-    def execute(self, context):
-        repo = IfcGitData.data["repo"]
-        core.rename_branch(tool.IfcGit, repo, self.new_name)
-        refresh()
-        return {"FINISHED"}
@@ -17,14 +17,28 @@ from bonsai.bim.module.ifcgit.data import IfcGitData
 def git_branches(self: "IfcGitProperties", context: bpy.types.Context) -> tool.Blender.BLENDER_ENUM_ITEMS:
    # NOTE "Python must keep a reference to the strings returned by
    # the callback or Blender will misbehave or even crash"
-    # Branch list (local + remote, main first) is computed once in IfcGitData.load()
-    IfcGitData.make_sure_is_loaded()
-    return [(name, name, name) for name in IfcGitData.data["branch_names"]]
+    IfcGitData.data["branch_names"] = sorted([branch.name for branch in IfcGitData.data["repo"].heads])
+
+    if "main" in IfcGitData.data["branch_names"]:
+        IfcGitData.data["branch_names"].remove("main")
+        IfcGitData.data["branch_names"] = ["main"] + IfcGitData.data["branch_names"]
+
+    if IfcGitData.data["remotes"]:
+        for remote in IfcGitData.data["remotes"]:
+            for remote_branch in remote.refs:
+                IfcGitData.data["branch_names"].append(remote_branch.name)
+
+    return [(myname, myname, myname) for myname in IfcGitData.data["branch_names"]]


 def git_remotes(self: "IfcGitProperties", context: bpy.types.Context) -> tool.Blender.BLENDER_ENUM_ITEMS:
-    IfcGitData.make_sure_is_loaded()
-    return [(name, name, name) for name in IfcGitData.data["remote_names"]]
+    IfcGitData.data["remote_names"] = sorted([remote.name for remote in IfcGitData.data["remotes"]])
+
+    if "origin" in IfcGitData.data["remote_names"]:
+        IfcGitData.data["remote_names"].remove("origin")
+        IfcGitData.data["remote_names"] = ["origin"] + IfcGitData.data["remote_names"]
+
+    return [(myname, myname, myname) for myname in IfcGitData.data["remote_names"]]


 def update_revlist(self: "IfcGitProperties", context: bpy.types.Context) -> None:
@@ -76,7 +90,6 @@ class IfcGitListItem(PropertyGroup):
        name="Commit Message",
        default="",
    )
-    committed_date: IntProperty(name="Committed Date", default=0)
    tags: CollectionProperty(type=IfcGitTag, name="List of revision tags")

    if TYPE_CHECKING:
@@ -85,7 +98,6 @@ class IfcGitListItem(PropertyGroup):
        author_name: str
        author_email: str
        message: str
-        committed_date: int
        tags: bpy.types.bpy_prop_collection_idprop[IfcGitTag]


@@ -139,11 +151,6 @@ class IfcGitProperties(PropertyGroup):
        ],
        update=update_revlist,
    )
-    merge_conflicts: StringProperty(
-        name="Merge Conflicts",
-        description="JSON report from last failed merge attempt",
-        default="",
-    )

    if TYPE_CHECKING:
        ifcgit_commits: bpy.types.bpy_prop_collection_idprop[IfcGitListItem]
@@ -158,4 +165,3 @@ class IfcGitProperties(PropertyGroup):
        display_branch: str
        select_remote: str
        ifcgit_filter: Literal["all", "tagged", "relevant"]
-        merge_conflicts: str
@@ -52,7 +52,7 @@ class IFCGIT_PT_panel(bpy.types.Panel):
            if IfcGitData.data["repo"] and os.path.exists(IfcGitData.data["repo"].git_dir):
                name_ifc = IfcGitData.data["name_ifc"]
                row.label(text=IfcGitData.data["working_dir"], icon="SYSTEM")
-                if IfcGitData.data["ifc_is_untracked"]:
+                if name_ifc in IfcGitData.data["untracked_files"]:
                    row.operator(
                        "ifcgit.addfile",
                        text="Add '" + name_ifc + "' to repository",
@@ -112,13 +112,15 @@ class IFCGIT_PT_panel(bpy.types.Panel):
            row.label(text="Working branch: Detached HEAD")
        else:
            row.label(text="Working branch: " + IfcGitData.data["active_branch_name"])
-            row.operator("ifcgit.rename_branch", icon="GREASEPENCIL", text="")

-        row = layout.row()
+        grouped = layout.row()
+        column = grouped.column()
+        row = column.row()
        row.prop(props, "display_branch", text="Browse branch")
        row.prop(props, "ifcgit_filter", text="Filter revisions")

-        layout.template_list(
+        row = column.row()
+        row.template_list(
            "COMMIT_UL_List",
            "The_List",
            props,
@@ -126,64 +128,20 @@ class IFCGIT_PT_panel(bpy.types.Panel):
            props,
            "commit_index",
        )
-
-        row = layout.row(align=True)
+        column = grouped.column()
+        row = column.row()
        row.operator("ifcgit.refresh", icon="FILE_REFRESH")
+
        if not is_dirty:
+
+            row = column.row()
            row.operator("ifcgit.display_revision", icon="SELECT_DIFFERENCE")
+
+            row = column.row()
            row.operator("ifcgit.switch_revision", icon="CURRENT_FILE")
-            row.operator("ifcgit.merge", icon="SYSTEM")

-        conflicts = tool.IfcGit.get_merge_conflicts()
-        if conflicts is not None:
-            box = layout.box()
-            box.alert = True
-            row = box.row()
-            row.label(
-                text=f"Merge failed \u2014 {len(conflicts)} conflict(s)",
-                icon="ERROR",
-            )
-            for conflict in conflicts:
-                col = box.column(align=True)
-                conflict_type = conflict.get("type", "")
-                entity_id = conflict.get("entity_id", "?")
-                local_id = conflict.get("original_local_id")
-
-                if conflict_type == "attribute_conflict":
-                    entity_class = conflict.get("entity_class", "Entity")
-                    attr_idx = conflict.get("attribute_index", "?")
-                    desc = f"#{entity_id} {entity_class}: attribute {attr_idx} conflict"
-                elif conflict_type == "entity_deleted_and_modified":
-                    entity_class = conflict.get("entity_class", "Entity")
-                    desc = f"#{entity_id} {entity_class}: " + conflict.get("message", "deleted/modified conflict")
-                elif conflict_type == "class_changed":
-                    desc = (
-                        f"#{entity_id}: class changed "
-                        + conflict.get("base_class", "?")
-                        + " \u2192 "
-                        + conflict.get("modified_class", "?")
-                    )
-                elif conflict_type == "required_entity_deleted":
-                    desc = f"#{entity_id}: " + conflict.get("message", "required entity deleted")
-                else:
-                    desc = f"#{entity_id}: {conflict_type}"
-
-                row = col.row(align=True)
-                row.label(text=desc)
-                if local_id:
-                    op = row.operator(
-                        "ifcgit.select_conflict_entity",
-                        text="",
-                        icon="RESTRICT_SELECT_OFF",
-                    )
-                    op.step_id = local_id
-
-                if conflict_type == "attribute_conflict":
-                    sub = col.column(align=True)
-                    sub.scale_y = 0.75
-                    sub.label(text=f"  Base:   {conflict.get('base_value', '')}")
-                    sub.label(text=f"  Local:  {conflict.get('local_value', '')}")
-                    sub.label(text=f"  Remote: {conflict.get('remote_value', '')}")
+            row = column.row()
+            row.operator("ifcgit.merge", icon="EXPERIMENTAL", text="")

        if not props.ifcgit_commits:
            return
@@ -258,7 +216,13 @@ class COMMIT_UL_List(bpy.types.UIList):
    ):

        current_revision = IfcGitData.data["current_revision"]
-        current_hexsha = current_revision.hexsha if current_revision else None
+
+        # TODO Figure how this "item" can be acesse in "data.py"
+        # so it's possible to move the ".commit"
+        try:
+            commit = IfcGitData.data["repo"].commit(rev=item.hexsha)
+        except ValueError:
+            return

        lookup = IfcGitData.data["branches_by_hexsha"]
        refs = ""
@@ -272,11 +236,11 @@ class COMMIT_UL_List(bpy.types.UIList):
            for tag in lookup[item.hexsha]:
                refs += "{" + tag.name + "} "

-        if item.hexsha == current_hexsha:
-            layout.label(text="[HEAD] " + refs + item.message.split("\n")[0], icon="DECORATE_KEYFRAME")
+        if commit == current_revision:
+            layout.label(text="[HEAD] " + refs + commit.message.split("\n")[0], icon="DECORATE_KEYFRAME")
        else:
-            layout.label(text=refs + item.message.split("\n")[0], icon="DECORATE_ANIMATE")
-        layout.label(text=time.strftime("%c", time.localtime(item.committed_date)))
+            layout.label(text=refs + commit.message.split("\n")[0], icon="DECORATE_ANIMATE")
+        layout.label(text=time.strftime("%c", time.localtime(commit.committed_date)))

    def draw_filter(self, context, layout):

@@ -272,21 +272,21 @@ class RadianceRender(bpy.types.Operator):
                    + '''" map_u map_v
 0
 1 0.5
-
+ 
 # This is a multiplier to colour balance the env map
 # In this case, it provides a rough ground luminance from 3k-5k
 env_map colorfunc env_colour
 4 100 100 100 .
 0
 0
-
+ 
 # .37 .57 1.5 is measured from a HDRI image
 # It is multiplied by a factor such that grey(r,g,b) = 1
 skyfunc colorfunc sky_colour
 4 .64 .99 2.6 .
 0
 0
-
+ 
 void mixpict composite
 7 env_colour sky_colour grey "'''
                    + hdr_mask_path
@@ -295,22 +295,22 @@ void mixpict composite
                    + """" map_u map_v
 0
 2 0.5 1
-
+ 
 composite glow env_map_glow
 0
 0
 4 1 1 1 0
-
+ 
 env_map_glow source sky
 0
 0
 4 0 0 1 180
-
+ 
 env_colour glow ground_glow
 0
 0
 4 1 1 1 0
-
+ 
 ground_glow source ground
 0
 0
@@ -566,7 +566,7 @@ class LightPickCoordinates(bpy.types.Operator):
    )
    bl_options = {"REGISTER", "UNDO"}

-    use_current_location: bpy.props.BoolProperty(options={"SKIP_SAVE"})
+    use_current_location: bpy.props.BoolProperty(options={"SKIP_SAVE"})  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        use_current_location: bool
@@ -320,7 +320,7 @@ class RadianceExporterProperties(PropertyGroup):
    )

    def get_subcategories(self, context: bpy.types.Context) -> tool.Blender.BLENDER_ENUM_ITEMS:
-        global SUBCATEGORIES_ENUM_ITEMS  # ty: ignore[unresolved-global]
+        global SUBCATEGORIES_ENUM_ITEMS
        if self.category in spectraldb:
            SUBCATEGORIES_ENUM_ITEMS = [(k, k, "") for k in spectraldb[self.category].keys()]
        else:
@@ -102,6 +102,7 @@ class MaterialsData:
            if (style_name := s.Name) is not None
        ]
        results = natsorted(results, key=lambda i: i[1])
+        results.insert(0, ("-", "No Surface Style", ""))
        return results

    @classmethod
@@ -210,15 +210,14 @@ class AssignMaterialToSelected(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.assign_material_to_selected"
    bl_label = "Assign Material To Selected"
    bl_description = (
-        "Assign currently selected material in Materials UI to the selected objects.\n"
-        "Occurrences automatically get usages for layer/profile sets.\n\n"
-        "ALT+CLICK to assign without a usage."
+        "Assign currently selected material in Materials UI to the selected objects.\n\n"
+        "ALT+CLICK to assign material as a usage."
    )
    bl_options = {"REGISTER", "UNDO"}
    material: bpy.props.IntProperty(name="Material IFC ID")
-    should_auto_assign_usage: bpy.props.BoolProperty(
-        name="Auto Assign Usage",
-        default=True,
+    assign_as_usage: bpy.props.BoolProperty(
+        name="Assign Material As A Usage",
+        default=False,
        options={"SKIP_SAVE"},
    )

@@ -231,19 +230,25 @@ class AssignMaterialToSelected(bpy.types.Operator, tool.Ifc.Operator):

    def invoke(self, context, event):
        if event.type == "LEFTMOUSE" and event.alt:
-            self.should_auto_assign_usage = False
+            material_class = tool.Ifc.get().by_id(self.material).is_a()
+            if material_class not in ("IfcMaterialProfileSet", "IfcMaterialLayerSet"):
+                self.report({"ERROR"}, f"{material_class} cannot be assigned as a usage.")
+                return {"CANCELLED"}
+            self.assign_as_usage = True
        return self.execute(context)

    def _execute(self, context):
        material = tool.Ifc.get().by_id(self.material)
        objects = tool.Blender.get_selected_objects()
+        material_type = material.is_a()
+        if self.assign_as_usage:
+            material_type += "Usage"
        core.assign_material(
            tool.Ifc,
            tool.Material,
-            material_type=material.is_a(),
+            material_type=material_type,
            objects=objects,
            material=material,
-            should_auto_assign_usage=self.should_auto_assign_usage,
        )


@@ -609,44 +614,38 @@ class EditAssignedMaterial(bpy.types.Operator, tool.Ifc.Operator):
                    attributes=attributes,
                )

-                layer_sets_to_regenerate = set()
+                slab_planer = slab.DumbSlabPlaner()
+                wall_objs = []

                for obj in objects:
                    obj_element = tool.Ifc.get_entity(obj)
                    obj_material_usage = ifcopenshell.util.element.get_material(obj_element)
-
                    if obj_material_usage and obj_material_usage.is_a("IfcMaterialLayerSetUsage"):
                        obj_material_usage.OffsetFromReferenceLine = material.OffsetFromReferenceLine
                        obj_material_usage.DirectionSense = material.DirectionSense
                        obj_material_usage.ReferenceExtent = material.ReferenceExtent

-                        layer_sets_to_regenerate.add(obj_material_usage.ForLayerSet)
-
                        # Save custom offset to BBIM_MaterialLayer pset
                        tool.Model.save_custom_offset_to_pset(obj_element, obj)

-                for layer_set in layer_sets_to_regenerate:
-                    wall.DumbWallPlaner().regenerate_from_layer_set(layer_set)
-                    slab.DumbSlabPlaner().regenerate_from_layer_set(layer_set)
+                        # Targeted regeneration: only update this element's geometry, not
+                        # all elements sharing the layer set (which would corrupt unrelated instances).
+                        if obj_material_usage.LayerSetDirection == "AXIS3":
+                            slab_planer.regenerate_from_occurence(obj_element, obj_material_usage)
+                        elif obj_material_usage.LayerSetDirection == "AXIS2":
+                            wall_objs.append(obj)
+
+                if wall_objs:
+                    tool.Model.recalculate_walls(wall_objs)

            if material_set_usage.is_a("IfcMaterialProfileSetUsage"):
-                if "CardinalPoint" in attributes and attributes["CardinalPoint"] is not None:
+                if "CardinalPoint" in attributes:
                    attributes["CardinalPoint"] = int(attributes["CardinalPoint"])
                ifcopenshell.api.material.edit_profile_usage(
                    self.file,
                    usage=material_set_usage,
                    attributes=attributes,
                )
-
-                for obj in objects:
-                    obj_element = tool.Ifc.get_entity(obj)
-                    if not obj_element:
-                        continue
-                    obj_material_usage = ifcopenshell.util.element.get_material(obj_element)
-                    if obj_material_usage and obj_material_usage.is_a("IfcMaterialProfileSetUsage"):
-                        obj_material_usage.CardinalPoint = material_set_usage.CardinalPoint
-                        obj_material_usage.ReferenceExtent = material_set_usage.ReferenceExtent
-
                model_profile.DumbProfileRecalculator().recalculate(objects)

        bpy.ops.bim.disable_editing_assigned_material(obj=active_obj.name)
@@ -727,11 +726,7 @@ class EnableEditingMaterialSetItem(bpy.types.Operator):
        self.props.material_set_item_material = str(material_set_item.Material.id())

        self.props.material_set_item_attributes.clear()
-        bonsai.bim.helper.import_attributes(
-            material_set_item,
-            self.props.material_set_item_attributes,
-            callback=self.import_attributes_callback,
-        )
+        bonsai.bim.helper.import_attributes(material_set_item, self.props.material_set_item_attributes)

        if material_set_item.is_a("IfcMaterialProfile"):
            if material_set_item.Profile and material_set_item.Profile.ProfileName:
@@ -739,29 +734,6 @@ class EnableEditingMaterialSetItem(bpy.types.Operator):

        return {"FINISHED"}

-    def import_attributes_callback(
-        self, name: str, prop: Union["Attribute", None], data: dict[str, Any]
-    ) -> None | Literal[True]:
-        if data["type"] != "IfcMaterialLayer" or name != "IsVentilated" or not prop:
-            return None
-
-        # Keep null semantics unchanged on export, but avoid an empty UI selection.
-        prop.data_type = "enum"
-        prop.special_type = "LOGICAL"
-        prop.enum_items = json.dumps(("TRUE", "FALSE", "UNKNOWN"))
-
-        value = data[name]
-        if value == "UNKNOWN":
-            prop.enum_value = "UNKNOWN"
-        elif value is None:
-            # Keep visible default as FALSE, but preserve null semantics on save.
-            prop.enum_value = "FALSE"
-            prop.is_null = True
-        else:
-            prop.enum_value = "TRUE" if value else "FALSE"
-
-        return True
-

 class DisableEditingMaterialSetItem(bpy.types.Operator):
    bl_idname = "bim.disable_editing_material_set_item"
@@ -118,17 +118,12 @@ class BIM_PT_materials(Panel):
            row.operator("bim.edit_material", text="Save Material", icon="CHECKMARK").material = ifc_definition_id
            row.operator("bim.disable_editing_material", text="", icon="CANCEL")
        elif self.props.editing_material_type == "STYLE":
-            if MaterialsData.data["styles"]:
-                row = self.layout.row(align=True)
-                row.prop(self.props, "contexts", text="")
-                prop_with_search(row, self.props, "styles", text="")
-                row = self.layout.row(align=True)
-                row.operator("bim.edit_material_style", text="Assign Style", icon="CHECKMARK")
-                row.operator("bim.disable_editing_material", text="", icon="CANCEL")
-            else:
-                row = self.layout.row(align=True)
-                row.label(text="No Styles Found")
-                row.operator("bim.disable_editing_material", text="", icon="CANCEL")
+            row = self.layout.row(align=True)
+            row.prop(self.props, "contexts", text="")
+            prop_with_search(row, self.props, "styles", text="")
+            row = self.layout.row(align=True)
+            row.operator("bim.edit_material_style", text="Assign Style", icon="CHECKMARK")
+            row.operator("bim.disable_editing_material", text="", icon="CANCEL")


 class BIM_PT_object_material(Panel):
@@ -136,7 +136,7 @@ class SplitAlongEdge(bpy.types.Operator, tool.Ifc.Operator):
        "Will unassign element from a type if type has a representation."
    )
    bl_options = {"REGISTER", "UNDO"}
-    mode: bpy.props.EnumProperty(
+    mode: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        default="BOOLEAN",
        items=tuple((i, i, "") for i in get_args(SplitAlongEdgeMode)),
    )
@@ -359,7 +359,7 @@ class ConfirmQuickFavoriteOperator(bpy.types.Operator):
    bl_idname = "bim.confirm_quick_favorite_operator"
    bl_label = "Confirm Operator"
    bl_options = {"REGISTER", "UNDO"}
-    index: bpy.props.IntProperty()
+    index: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        index: int
@@ -452,8 +452,10 @@ class MoveQuickFavoritesItem(bpy.types.Operator):
    bl_idname = "bim.move_quick_favorites_item"
    bl_label = "Move Quick Favorites Item"
    bl_options = {"REGISTER", "UNDO"}
-    index: bpy.props.IntProperty()
-    direction: bpy.props.EnumProperty(items=[("UP", "Up", ""), ("DOWN", "Down", "")])
+    index: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]
+    direction: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
+        items=[("UP", "Up", ""), ("DOWN", "Down", "")]
+    )

    if TYPE_CHECKING:
        index: int
@@ -472,7 +474,7 @@ class RemoveQuickFavoritesItem(bpy.types.Operator):
    bl_idname = "bim.remove_quick_favorites_item"
    bl_label = "Remove Quick Favorites Item"
    bl_options = {"REGISTER", "UNDO"}
-    index: bpy.props.IntProperty()
+    index: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        index: int
@@ -36,9 +36,9 @@ QuickFavoriteValueType = Literal["float_value", "bool_value", "int_value", "stri


 class QuickFavoriteEnumItem(PropertyGroup):
-    name: StringProperty(name="Name", default="")
-    display_name: StringProperty(name="Display Name", default="")
-    description: StringProperty(name="Description", default="")
+    name: StringProperty(name="Name", default="")  # pyright: ignore[reportRedeclaration]
+    display_name: StringProperty(name="Display Name", default="")  # pyright: ignore[reportRedeclaration]
+    description: StringProperty(name="Description", default="")  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        name: str
@@ -51,19 +51,19 @@ def get_enum_items(self: "QuickFavoriteProperty", context: bpy.types.Context | N


 class QuickFavoriteProperty(PropertyGroup):
-    name: StringProperty(name="Name", default="")
-    display_name: StringProperty(name="Display Name", default="")
-    value_prop: EnumProperty(
+    name: StringProperty(name="Name", default="")  # pyright: ignore[reportRedeclaration]
+    display_name: StringProperty(name="Display Name", default="")  # pyright: ignore[reportRedeclaration]
+    value_prop: EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Value Prop",
        items=tuple((v, v, "") for v in get_args(QuickFavoriteValueType)),
    )
-    string_value: StringProperty(name="String Value", default="")
-    float_value: FloatProperty(name="Float Value", default=0.0)
-    int_value: IntProperty(name="Int Value", default=0)
-    bool_value: BoolProperty(name="Bool Value", default=False)
-    enum_value: EnumProperty(name="Enum Value", items=get_enum_items)
-    enum_items: CollectionProperty(type=QuickFavoriteEnumItem)
-    is_active: BoolProperty(
+    string_value: StringProperty(name="String Value", default="")  # pyright: ignore[reportRedeclaration]
+    float_value: FloatProperty(name="Float Value", default=0.0)  # pyright: ignore[reportRedeclaration]
+    int_value: IntProperty(name="Int Value", default=0)  # pyright: ignore[reportRedeclaration]
+    bool_value: BoolProperty(name="Bool Value", default=False)  # pyright: ignore[reportRedeclaration]
+    enum_value: EnumProperty(name="Enum Value", items=get_enum_items)  # pyright: ignore[reportRedeclaration]
+    enum_items: CollectionProperty(type=QuickFavoriteEnumItem)  # pyright: ignore[reportRedeclaration]
+    is_active: BoolProperty(  # pyright: ignore[reportRedeclaration]
        name="Is Active",
        description="Only active properties will be added to the operator when invoked from Quick Favorites",
        default=False,
@@ -100,20 +100,20 @@ def get_operator_suggestions(self: "QuickFavoritesItem", context: bpy.types.Cont


 class QuickFavoritesItem(PropertyGroup):
-    is_expanded: BoolProperty(name="Is Expanded", default=False)
-    search: StringProperty(
+    is_expanded: BoolProperty(name="Is Expanded", default=False)  # pyright: ignore[reportRedeclaration]
+    search: StringProperty(  # pyright: ignore[reportRedeclaration]
        name="Search",
        default="",
        search=get_operator_suggestions,
        # Resetting `search_options`, allowing users only to use suggestions.
        search_options=set(),
    )
-    properties: CollectionProperty(type=QuickFavoriteProperty)
-    operator_id: StringProperty(
+    properties: CollectionProperty(type=QuickFavoriteProperty)  # pyright: ignore[reportRedeclaration]
+    operator_id: StringProperty(  # pyright: ignore[reportRedeclaration]
        name="Operator ID",
        default="",
    )
-    label: StringProperty(
+    label: StringProperty(  # pyright: ignore[reportRedeclaration]
        name="Label",
        description="Label that will be used in Quick Favorites for this operator",
        default="",
@@ -139,15 +139,15 @@ class QuickFavoritesItem(PropertyGroup):


 class BIMMiscProperties(PropertyGroup):
-    total_storeys: IntProperty(
+    total_storeys: IntProperty(  # pyright: ignore[reportRedeclaration]
        name="Total Storeys",
        description="Number of storeys above object's storey to take into account for resizing",
        default=1,
    )
-    override_colour: FloatVectorProperty(
+    override_colour: FloatVectorProperty(  # pyright: ignore[reportRedeclaration]
        name="Override Colour", subtype="COLOR", default=(1, 0, 0, 1), min=0.0, max=1.0, size=4
    )
-    quick_favorites: CollectionProperty(type=QuickFavoritesItem)
+    quick_favorites: CollectionProperty(type=QuickFavoritesItem)  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        total_storeys: int
@@ -15,15 +15,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was modified with the assistance of an AI coding tool.

 from typing import NamedTuple

 import bpy

-import bonsai.tool as tool
-
 from . import (
    array,
    covering,
@@ -31,7 +27,6 @@ from . import (
    external,
    grid,
    handler,
-    host_add_opening_gizmo,
    mep,
    opening,
    product,
@@ -51,28 +46,17 @@ from . import (

 classes = (
    array.AddArray,
-    array.CancelEditingArray,
+    array.DisableEditingArray,
+    array.EditArray,
    array.EnableEditingArray,
-    array.FinishEditingArray,
    array.ApplyArray,
    array.RegenerateArray,
    array.RemoveArray,
    array.SelectAllArrayObjects,
    array.SelectArrayParent,
-    array.ArrayParentGizmoClick,
-    array.EditArrayFromChild,
    array.Input3DCursorXArray,
    array.Input3DCursorYArray,
    array.Input3DCursorZArray,
-    array.EnableEditingParametric,
-    array.AddArrayFromFeatureEdit,
-    array.ArrayGizmoClick,
-    array.ToggleArrayMethod,
-    array.RemoveArrayLayerFromEdit,
-    array.InputArrayCount,
-    array.AdjustArrayCount,
-    array.GizmoArrayEdition,
-    array.GizmoArrayChild,
    product.AddDefaultType,
    product.AddEmptyType,
    product.AddOccurrence,
@@ -86,45 +70,19 @@ classes = (
    workspace.BIM_MT_add_representation_item,
    wall.AddWallsFromSlab,
    wall.AlignWall,
-    wall.CancelEditingWall,
    wall.ChangeExtrusionDepth,
    wall.ChangeExtrusionXAngle,
    wall.ChangeLayerLength,
-    wall.CycleWallOffset,
    wall.DrawPolylineWall,
-    wall.EnableEditingWall,
-    wall.ExtendWallHeightToCursor,
    wall.ExtendWallsToUnderside,
-    wall.RegenerateWallToUnderside,
    wall.ExtendWallsToWall,
    wall.ExtendWallsToPolylinePoint,
-    wall.ExtendWallToCursor,
-    wall.FinishEditingWall,
    wall.FlipWall,
-    host_add_opening_gizmo.GizmoHostAddOpening,
-    host_add_opening_gizmo.GizmoHostToggleOpenings,
-    wall.GizmoWallEdition,
-    wall.GizmoWallExtendVertically,
-    wall.GizmoWallFilletPreview,
-    wall.GizmoWallFilletReedit,
-    wall.GizmoWallFilletToggleOpenings,
-    wall.GizmoWallJoinIntersection,
-    wall.GizmoWallLinkToggle,
-    wall.GizmoWallUnjoinSingle,
-    wall.JoinWallsIntersection,
    wall.MergeWall,
    wall.OffsetWalls,
    wall.RecalculateWall,
-    wall.RotateWall90,
    wall.SplitWall,
-    wall.SplitWallAtCursor,
-    wall.UnjoinWallPathConnection,
    wall.UnjoinWalls,
-    wall.EnableWallFilletPreview,
-    wall.FinishWallFilletPreview,
-    wall.CancelWallFilletPreview,
-    wall.EnableWallFilletPreviewFromCorner,
-    wall.CreateWallFillet,
    opening.AddBoolean,
    opening.CloneOpening,
    opening.EditOpenings,
@@ -136,7 +94,6 @@ classes = (
    opening.RemoveBoolean,
    opening.SelectBoolean,
    opening.ShowOpenings,
-    opening.ToggleHostOpenings,
    opening.UpdateOpeningsFocus,
    profile.ChangeCardinalPoint,
    profile.ChangeProfileDepth,
@@ -183,14 +140,10 @@ classes = (
    prop.BIMDoorProperties,
    prop.BIMRailingProperties,
    prop.BIMRoofProperties,
-    prop.BIMWallProperties,
    prop.BIMPolylineProperties,
    prop.BIMExternalParametricGeometryProperties,
-    prop.BIMWallFilletPreviewProperties,
-    prop.BIMPreviewProperties,
    ui.BIM_PT_array,
    ui.BIM_PT_stair,
-    ui.BIM_PT_wall,
    ui.BIM_PT_sverchok,
    ui.BIM_PT_window,
    ui.BIM_PT_door,
@@ -211,8 +164,7 @@ classes = (
    stair.ToggleStairProperty,
    stair.AdjustStairTreads,
    stair.SetStairTreads,
-    stair.InputStairTreads,
-    stair.PickStairType,
+    stair.CycleStairType,
    stair.GizmoStairEdition,
    sverchok_modifier.CreateNewSverchokGraph,
    sverchok_modifier.UpdateDataFromSverchok,
@@ -225,7 +177,7 @@ classes = (
    window.FinishEditingWindow,
    window.EnableEditingWindow,
    window.RemoveWindow,
-    window.PickWindowType,
+    window.CycleWindowType,
    window.GizmoWindowEdition,
    door.BIM_OT_add_door,
    door.AddDoor,
@@ -234,7 +186,7 @@ classes = (
    door.EnableEditingDoor,
    door.RemoveDoor,
    door.ToggleDoorSwing,
-    door.PickDoorType,
+    door.CycleDoorType,
    door.GizmoDoorEdition,
    railing.BIM_OT_add_railing,
    railing.CopyRailingParameters,
@@ -251,13 +203,11 @@ classes = (
    roof.AddRoof,
    roof.CancelEditingRoof,
    roof.CopyRoofParameters,
-    roof.CycleRoofGenerationMethod,
    roof.FinishEditingRoof,
    roof.EnableEditingRoof,
    roof.CancelEditingRoofPath,
    roof.FinishEditingRoofPath,
    roof.EnableEditingRoofPath,
-    roof.GizmoRoofEdition,
    roof.RemoveRoof,
    roof.SetGableRoofEdgeAngle,
    mep.MEPAddObstruction,
@@ -314,14 +264,15 @@ def register():
    bpy.types.Scene.BIMModelProperties = bpy.props.PointerProperty(type=prop.BIMModelProperties)
    bpy.types.Scene.BIMPolylineProperties = bpy.props.PointerProperty(type=prop.BIMPolylineProperties)
    bpy.types.Object.BIMArrayProperties = bpy.props.PointerProperty(type=prop.BIMArrayProperties)
+    bpy.types.Object.BIMStairProperties = bpy.props.PointerProperty(type=prop.BIMStairProperties)
    bpy.types.Object.BIMSverchokProperties = bpy.props.PointerProperty(type=prop.BIMSverchokProperties)
-    # Per-parametric-type ``BIM<Name>Properties`` PointerProperties — driven by
-    # ``tool.Parametric.EDIT_TYPES``; adding a registry entry is the single touchpoint.
-    tool.Parametric.register_object_properties(prop)
+    bpy.types.Object.BIMWindowProperties = bpy.props.PointerProperty(type=prop.BIMWindowProperties)
+    bpy.types.Object.BIMDoorProperties = bpy.props.PointerProperty(type=prop.BIMDoorProperties)
+    bpy.types.Object.BIMRailingProperties = bpy.props.PointerProperty(type=prop.BIMRailingProperties)
+    bpy.types.Object.BIMRoofProperties = bpy.props.PointerProperty(type=prop.BIMRoofProperties)
    bpy.types.Object.BIMExternalParametricGeometryProperties = bpy.props.PointerProperty(
        type=prop.BIMExternalParametricGeometryProperties
    )
-    bpy.types.Scene.BIMPreviewProperties = bpy.props.PointerProperty(type=prop.BIMPreviewProperties)

    bpy.types.VIEW3D_MT_add.prepend(ui.add_menu)
    bpy.app.handlers.load_post.append(handler.load_post)
@@ -330,12 +281,6 @@ def register():


 def unregister():
-    # DecorationsHandler is installed lazily by bim.show_openings; tear it down
-    # (along with its persistent depsgraph / undo / redo / load cache handlers)
-    # before the rest of unregister so those handlers can't fire against
-    # half-unloaded module state.
-    opening.DecorationsHandler.uninstall()
-
    if not bpy.app.background:
        for tool_data in reversed(tools):
            bpy.utils.unregister_tool(tool_data.tool)
@@ -343,10 +288,13 @@ def unregister():
    del bpy.types.Scene.BIMModelProperties
    del bpy.types.Scene.BIMPolylineProperties
    del bpy.types.Object.BIMArrayProperties
+    del bpy.types.Object.BIMStairProperties
    del bpy.types.Object.BIMSverchokProperties
-    tool.Parametric.unregister_object_properties()
+    del bpy.types.Object.BIMWindowProperties
+    del bpy.types.Object.BIMDoorProperties
+    del bpy.types.Object.BIMRailingProperties
+    del bpy.types.Object.BIMRoofProperties
    del bpy.types.Object.BIMExternalParametricGeometryProperties
-    del bpy.types.Scene.BIMPreviewProperties

    bpy.app.handlers.load_post.remove(handler.load_post)
    bpy.types.VIEW3D_MT_add.remove(ui.add_menu)
@@ -108,7 +108,7 @@ class ProfileDecorator:

        obj = context.active_object

-        if obj is None or obj.mode != "EDIT":
+        if obj.mode != "EDIT":
            if exit_edit_mode_callback:
                ProfileDecorator.uninstall()
                exit_edit_mode_callback()
@@ -2029,248 +2029,3 @@ class BoundingBoxDecorator:
                        else:
                            co1.y += y_overlap / 2 + min_spacing
                            co2.y -= y_overlap / 2 + min_spacing
-
-
-def _stroke_lines_alpha(
-    context: bpy.types.Context,
-    segments: list[tuple[tuple[float, float, float], tuple[float, float, float]]],
-    color_rgb: tuple[float, float, float],
-    line_width: float,
-    line_alpha: float,
-) -> None:
-    """Render ``segments`` (a list of ``(start, end)`` tuples) as one
-    anti-aliased LINES batch in world space. Early-returns when
-    ``context.region`` is unavailable (e.g. when called from a
-    ``_RestrictContext``)."""
-    if not segments:
-        return
-    verts: list[tuple[float, float, float]] = []
-    indices: list[tuple[int, int]] = []
-    for start, end in segments:
-        base = len(verts)
-        verts.append(tuple(start))
-        verts.append(tuple(end))
-        indices.append((base, base + 1))
-    if not tool.Blender.validate_shader_batch_data(verts, indices):
-        return
-    region = getattr(context, "region", None)
-    if region is None:
-        return
-    shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
-    shader.bind()
-    shader.uniform_float("viewportSize", (region.width, region.height))
-    shader.uniform_float("lineWidth", line_width)
-    shader.uniform_float("color", (*color_rgb, line_alpha))
-    batch = batch_for_shader(shader, "LINES", {"pos": verts}, indices=indices)
-    gpu.state.blend_set("ALPHA")
-    batch.draw(shader)
-    gpu.state.blend_set("NONE")
-
-
-def _fill_quads_alpha(
-    context: bpy.types.Context,
-    quads: list[
-        tuple[
-            tuple[float, float, float],
-            tuple[float, float, float],
-            tuple[float, float, float],
-            tuple[float, float, float],
-        ]
-    ],
-    color_rgb: tuple[float, float, float],
-    alpha: float,
-) -> None:
-    """Render ``quads`` (each a 4-tuple of world-space corner verts in CCW
-    order) as one TRIS batch with two triangles per quad. Companion to
-    ``_stroke_lines_alpha`` for filled previews."""
-    if not quads:
-        return
-    verts: list[tuple[float, float, float]] = []
-    indices: list[tuple[int, int, int]] = []
-    for quad in quads:
-        if len(quad) != 4:
-            continue
-        base = len(verts)
-        verts.extend(tuple(v) for v in quad)
-        indices.append((base, base + 1, base + 2))
-        indices.append((base, base + 2, base + 3))
-    if not tool.Blender.validate_shader_batch_data(verts, indices):
-        return
-    region = getattr(context, "region", None)
-    if region is None:
-        return
-    shader = gpu.shader.from_builtin("UNIFORM_COLOR")
-    shader.bind()
-    shader.uniform_float("color", (*color_rgb, alpha))
-    batch = batch_for_shader(shader, "TRIS", {"pos": verts}, indices=indices)
-    gpu.state.blend_set("ALPHA")
-    batch.draw(shader)
-    gpu.state.blend_set("NONE")
-
-
-class WallFilletPreviewDecorator(tool.Blender.ViewportDecorator):
-    """GPU preview lines for the wall-fillet flow.
-
-    Polls on ``scene.BIMPreviewProperties.wall_fillet.is_active`` and renders
-    the leg projections + arc + radial construction lines returned by
-    ``tool.Wall.compute_wall_fillet_geometry``. The two leg lines show how
-    each wall will be shortened to its tangent point; the arc approximates
-    the rounded corner; the two construction lines (arc center to each
-    tangent point) visually pin the radius.
-
-    Installed once per Blender session from ``bim/handler.py:load_post``
-    and uninstalled in ``bim/module/model/__init__.py:unregister``."""
-
-    LINE_WIDTH_LEG = 1.5
-    LINE_WIDTH_ARC = 2.5
-    LINE_WIDTH_CONSTRUCTION = 1.0
-    LINE_ALPHA = 0.7
-    CONSTRUCTION_ALPHA = 0.4
-
-    def draw(self, context: bpy.types.Context) -> None:
-        scene = context.scene
-        preview_props = getattr(scene, "BIMPreviewProperties", None)
-        props = preview_props.wall_fillet if preview_props is not None else None
-        if props is None or not props.is_active:
-            return
-        ifc_file = tool.Ifc.get()
-        if ifc_file is None:
-            return
-        try:
-            wall_a = ifc_file.by_id(props.wall_a_id)
-            wall_b = ifc_file.by_id(props.wall_b_id)
-        except Exception:
-            return
-        wall_a_obj = tool.Ifc.get_object(wall_a) if wall_a else None
-        wall_b_obj = tool.Ifc.get_object(wall_b) if wall_b else None
-        if wall_a_obj is None or wall_b_obj is None:
-            return
-
-        geom = tool.Wall.compute_wall_fillet_geometry(wall_a_obj, wall_b_obj, props.radius)
-        if geom is None:
-            return
-
-        prefs = tool.Blender.get_addon_preferences()
-        warning_color = tuple(prefs.decorator_color_error[:3])
-
-        if not geom["valid"]:
-            # Degenerate geometry paints red: invalid_radius shows legs+arc
-            # past the wall ends; invalid_axes shows the parallel/collinear
-            # axes.
-            if geom.get("invalid_radius"):
-                tangent_a = geom.get("tangent_a")
-                tangent_b = geom.get("tangent_b")
-                ref_a = tool.Wall.get_world_reference_line(wall_a_obj)
-                ref_b = tool.Wall.get_world_reference_line(wall_b_obj)
-                if tangent_a is not None and tangent_b is not None and ref_a is not None and ref_b is not None:
-                    far_a = self._far_endpoint(ref_a, geom["intersection"])
-                    far_b = self._far_endpoint(ref_b, geom["intersection"])
-                    legs = [
-                        (tuple(far_a), tuple(tangent_a)),
-                        (tuple(far_b), tuple(tangent_b)),
-                    ]
-                    _stroke_lines_alpha(context, legs, warning_color, self.LINE_WIDTH_LEG, self.LINE_ALPHA)
-                arc = geom.get("arc") or []
-                if len(arc) >= 2:
-                    arc_segments = [(tuple(arc[i]), tuple(arc[i + 1])) for i in range(len(arc) - 1)]
-                    _stroke_lines_alpha(context, arc_segments, warning_color, self.LINE_WIDTH_ARC, self.LINE_ALPHA)
-            elif geom.get("invalid_axes"):
-                axes = geom["invalid_axes"]
-                segments = [(tuple(a), tuple(b)) for a, b in axes]
-                _stroke_lines_alpha(context, segments, warning_color, self.LINE_WIDTH_ARC, self.LINE_ALPHA)
-            return
-
-        leg_color = tuple(prefs.decorations_colour[:3])
-        arc_color = tuple(prefs.decorator_color_selected[:3])
-
-        # Resolved against the IFC reference line, not mesh bounds, so trimmed
-        # walls and openings don't shift the leg endpoints.
-        ref_a = tool.Wall.get_world_reference_line(wall_a_obj)
-        ref_b = tool.Wall.get_world_reference_line(wall_b_obj)
-        if ref_a is not None and ref_b is not None and geom["intersection"] is not None:
-            far_a = self._far_endpoint(ref_a, geom["intersection"])
-            far_b = self._far_endpoint(ref_b, geom["intersection"])
-            legs = [
-                (tuple(far_a), tuple(geom["tangent_a"])),
-                (tuple(far_b), tuple(geom["tangent_b"])),
-            ]
-            _stroke_lines_alpha(context, legs, leg_color, self.LINE_WIDTH_LEG, self.LINE_ALPHA)
-
-        arc = geom["arc"]
-        if len(arc) >= 2:
-            arc_segments = [(tuple(arc[i]), tuple(arc[i + 1])) for i in range(len(arc) - 1)]
-            _stroke_lines_alpha(context, arc_segments, arc_color, self.LINE_WIDTH_ARC, self.LINE_ALPHA)
-
-        # Dim construction lines from arc_center to each tangent point so
-        # the radius reads as concrete during drag.
-        arc_center = geom.get("arc_center")
-        if arc_center is not None:
-            construction = [
-                (tuple(arc_center), tuple(geom["tangent_a"])),
-                (tuple(arc_center), tuple(geom["tangent_b"])),
-            ]
-            _stroke_lines_alpha(context, construction, arc_color, self.LINE_WIDTH_CONSTRUCTION, self.CONSTRUCTION_ALPHA)
-
-    @staticmethod
-    def _far_endpoint(reference_line, intersection):
-        """Endpoint of ``reference_line`` furthest from ``intersection``."""
-        p1, p2 = reference_line
-        d1 = (p1.x - intersection[0]) ** 2 + (p1.y - intersection[1]) ** 2 + (p1.z - intersection[2]) ** 2
-        d2 = (p2.x - intersection[0]) ** 2 + (p2.y - intersection[1]) ** 2 + (p2.z - intersection[2]) ** 2
-        return p2 if d2 >= d1 else p1
-
-
-_BBOX_EDGES = (
-    (0, 1), (1, 2), (2, 3), (3, 0),
-    (4, 5), (5, 6), (6, 7), (7, 4),
-    (0, 4), (1, 5), (2, 6), (3, 7),
-)  # fmt: skip
-
-
-def bbox_world_edges(
-    obj: bpy.types.Object,
-) -> list[tuple[tuple[float, float, float], tuple[float, float, float]]]:
-    """Return world-space (start, end) tuples for the 12 edges of ``obj``'s
-    bounding box. Empty list if the object has no bound_box (e.g. Empties)."""
-    if not obj.bound_box:
-        return []
-    mw = obj.matrix_world
-    corners = [mw @ Vector(c) for c in obj.bound_box]
-    return [(tuple(corners[a]), tuple(corners[b])) for a, b in _BBOX_EDGES]
-
-
-def draw_polyline_segments(
-    context: bpy.types.Context,
-    segments: list[tuple[tuple[float, float, float], tuple[float, float, float]]],
-    color_rgb: tuple[float, float, float],
-    alpha: float,
-    line_width: float,
-) -> None:
-    """Render ``segments`` as one anti-aliased LINES batch in world space."""
-    if not segments:
-        return
-    verts: list[tuple[float, float, float]] = []
-    indices: list[tuple[int, int]] = []
-    for start, end in segments:
-        base = len(verts)
-        verts.append(start)
-        verts.append(end)
-        indices.append((base, base + 1))
-    if not tool.Blender.validate_shader_batch_data(verts, indices):
-        return
-    region = getattr(context, "region", None)
-    if region is None:
-        return
-    shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
-    shader.bind()
-    shader.uniform_float("viewportSize", (region.width, region.height))
-    shader.uniform_float("lineWidth", line_width)
-    shader.uniform_float("color", (*color_rgb, alpha))
-    batch = batch_for_shader(shader, "LINES", {"pos": verts}, indices=indices)
-    gpu.state.blend_set("ALPHA")
-    batch.draw(shader)
-    gpu.state.blend_set("NONE")
-
-
-_BBOX_HIGHLIGHT_LINE_WIDTH = 1.8
-_BBOX_HIGHLIGHT_LINE_ALPHA = 0.8
@@ -37,9 +37,7 @@ import bonsai.core.root
 import bonsai.tool as tool
 from bonsai.bim.module.drawing import gizmos as gizmo
 from bonsai.bim.module.drawing.gizmos import DimensionGizmoConfig
-from bonsai.bim.module.model.wall_offset_gizmos import WALL_OFFSET_GIZMO_CONFIGS
 from bonsai.bim.module.model.window import create_bm_box, create_bm_window
-from bonsai.bim.parametric_lifecycle import FeatureModifierEditMixin, PickTypeMixin

 if TYPE_CHECKING:
    from bonsai.bim.module.model.prop import BIMDoorProperties
@@ -568,58 +566,103 @@ class AddDoor(bpy.types.Operator, tool.Ifc.Operator):
        return {"FINISHED"}


-class _DoorEditMixin(FeatureModifierEditMixin):
-    """Type-specific hooks for door parametric-edit operators. Multi-object —
-    iterates ``tool.Blender.get_selected_objects()`` so a finish/cancel applies
-    to every selected door at once."""
-
-    pset_name = "BBIM_Door"
-
-    @classmethod
-    def _iter_targets(cls, context: bpy.types.Context) -> list[bpy.types.Object]:
-        return tool.Blender.get_selected_objects()
-
-    @classmethod
-    def _is_element_type(cls, element):
-        return tool.Parametric.is_door(element)
-
-    @classmethod
-    def _get_props(cls, obj: bpy.types.Object):
-        return tool.Model.get_door_props(obj)
-
-    @classmethod
-    def _update_modifier_representation(cls, obj: bpy.types.Object, context: bpy.types.Context) -> None:
-        update_door_modifier_representation(obj)
-
-
-class CancelEditingDoor(_DoorEditMixin, bpy.types.Operator, tool.Ifc.Operator):
+class CancelEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.cancel_editing_door"
    bl_label = "Cancel Editing Door on Selected Objects"
    bl_description = "Cancel editing and revert door parameters to their previous values"
    bl_options = {"REGISTER", "UNDO"}

-    def _execute(self, context: bpy.types.Context) -> set[str]:
-        return self._cancel_targets(context)
+    def cancel_editing_door_on_object(self, obj: bpy.types.Object) -> None:
+        element = tool.Ifc.get_entity(obj)
+        assert element
+        if not tool.Blender.Modifier.is_door(element):
+            return
+        props = tool.Model.get_door_props(obj)
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Door", "Data"))
+        data.update(data.pop("lining_properties"))
+        data.update(data.pop("panel_properties"))
+
+        # restore previous settings since editing was canceled
+        props.set_props_kwargs_from_ifc_data(data)
+
+        body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+        core.switch_representation(
+            tool.Ifc,
+            tool.Geometry,
+            obj=obj,
+            representation=body,
+        )
+
+        props.is_editing = False
+
+    def _execute(self, context: bpy.types.Context) -> set[str]:  # noqa: ARG002
+        for obj in tool.Blender.get_selected_objects():
+            self.cancel_editing_door_on_object(obj)
+        return {"FINISHED"}


-class FinishEditingDoor(_DoorEditMixin, bpy.types.Operator, tool.Ifc.Operator):
+class FinishEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.finish_editing_door"
    bl_label = "Finish Editing Door on Selected Objects"
    bl_description = "Apply changes and finish editing door parameters"
    bl_options = {"REGISTER", "UNDO"}

-    def _execute(self, context: bpy.types.Context) -> set[str]:
-        return self._finish_targets(context)
+    def finish_editing_door_on_object(self, obj: bpy.types.Object) -> None:
+        element = tool.Ifc.get_entity(obj)
+        assert element
+        if not tool.Blender.Modifier.is_door(element):
+            return
+        props = tool.Model.get_door_props(obj)
+
+        door_data = props.get_general_kwargs(convert_to_project_units=True)
+        lining_props = props.get_lining_kwargs(convert_to_project_units=True)
+        panel_props = props.get_panel_kwargs(convert_to_project_units=True)
+
+        door_data["lining_properties"] = lining_props
+        door_data["panel_properties"] = panel_props
+
+        props.is_editing = False
+
+        update_door_modifier_representation(obj)
+        element_type = ifcopenshell.util.element.get_type(element)
+        if element_type:
+            tool.Model.mark_thumbnail_for_update(element_type)
+
+        pset = tool.Pset.get_element_pset(element, "BBIM_Door")
+        door_data = tool.Ifc.get().createIfcText(json.dumps(door_data, default=list))
+        ifcopenshell.api.pset.edit_pset(tool.Ifc.get(), pset=pset, properties={"Data": door_data})
+
+    def _execute(self, context: bpy.types.Context) -> set[str]:  # noqa: ARG002
+        for obj in tool.Blender.get_selected_objects():
+            self.finish_editing_door_on_object(obj)
+        return {"FINISHED"}


-class EnableEditingDoor(_DoorEditMixin, bpy.types.Operator, tool.Ifc.Operator):
+class EnableEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.enable_editing_door"
    bl_label = "Enable Editing Door on Selected Objects"
    bl_description = "Enter edit mode to modify door parameters interactively"
    bl_options = {"REGISTER", "UNDO"}

-    def _execute(self, context: bpy.types.Context) -> set[str]:
-        return self._enable_targets(context)
+    def edit_door_on_obj(self, obj: bpy.types.Object) -> None:
+        element = tool.Ifc.get_entity(obj)
+        assert element
+        if not tool.Blender.Modifier.is_door(element):
+            return
+        props = tool.Model.get_door_props(obj)
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Door", "Data"))
+        data.update(data.pop("lining_properties"))
+        data.update(data.pop("panel_properties"))
+        data.update(tool.Model.get_constituents_props_data(element))
+
+        # required since we could load pset from .ifc and BIMDoorProperties won't be set
+        props.set_props_kwargs_from_ifc_data(data)
+        props.is_editing = True
+
+    def _execute(self, context: bpy.types.Context) -> set[str]:  # noqa: ARG002
+        for obj in tool.Blender.get_selected_objects():
+            self.edit_door_on_obj(obj)
+        return {"FINISHED"}


 class RemoveDoor(bpy.types.Operator, tool.Ifc.Operator):
@@ -630,7 +673,7 @@ class RemoveDoor(bpy.types.Operator, tool.Ifc.Operator):
    def remove_door_on_object(self, obj: bpy.types.Object) -> None:
        element = tool.Ifc.get_entity(obj)
        assert element
-        if not tool.Parametric.is_door(element):
+        if not tool.Blender.Modifier.is_door(element):
            return
        props = tool.Model.get_door_props(obj)
        props.is_editing = False
@@ -645,8 +688,12 @@ class RemoveDoor(bpy.types.Operator, tool.Ifc.Operator):


 class ToggleDoorSwing(bpy.types.Operator, tool.Ifc.Operator):
+    """Toggle door swing direction and optionally flip door geometry.
+
+    Shift+Click (when flip_geometry=True): Flip geometry only without changing door direction"""
+
    bl_idname = "bim.toggle_door_swing"
-    bl_label = "Change Door Swing"
+    bl_label = "Toggle Door Swing"
    bl_options = {"REGISTER", "UNDO"}

    flip_geometry: bpy.props.BoolProperty(name="Flip Geometry", default=False)
@@ -657,15 +704,6 @@ class ToggleDoorSwing(bpy.types.Operator, tool.Ifc.Operator):
        name="Skip Direction Change", default=False, options={"HIDDEN", "SKIP_SAVE"}
    )

-    @classmethod
-    def description(cls, context: bpy.types.Context, properties: bpy.types.OperatorProperties) -> str:
-        if properties.flip_geometry:
-            return (
-                "Swing the door from the opposite side of the wall. "
-                "Shift+click: mirror the door without changing which side it opens to"
-            )
-        return "Move the door hinge to the opposite side"
-
    def invoke(self, context: bpy.types.Context, event: bpy.types.Event) -> set[str]:
        self.skip_direction_change = event.shift
        return self.execute(context)
@@ -692,7 +730,7 @@ class ToggleDoorSwing(bpy.types.Operator, tool.Ifc.Operator):
        if not element:
            return {"CANCELLED"}

-        is_door = tool.Parametric.is_door(element)
+        is_door = tool.Blender.Modifier.is_door(element)

        if self.flip_geometry:
            tool.Geometry.flip_object(obj, self.flip_local_axes)
@@ -706,20 +744,20 @@ class ToggleDoorSwing(bpy.types.Operator, tool.Ifc.Operator):
        return {"FINISHED"}


-class PickDoorType(bpy.types.Operator, tool.Ifc.Operator, PickTypeMixin):
-    """Pick a door type from a popup menu."""
+class CycleDoorType(bpy.types.Operator, tool.Ifc.Operator, gizmo.CycleTypeMixin):
+    """Cycle through available door types. Shift+click to cycle in reverse."""

-    bl_idname = "bim.pick_door_type"
-    bl_label = "Pick Door Type"
+    bl_idname = "bim.cycle_door_type"
+    bl_label = "Cycle Door Type"
    bl_options = {"REGISTER", "UNDO"}

-    element_checker = tool.Parametric.is_door
-    props_getter = tool.Model.get_door_props
+    element_checker = "is_door"
+    props_getter = "get_door_props"
    type_literal = tool.Model.DoorType
    type_attr = "door_type"

    def _execute(self, context: bpy.types.Context) -> set[str]:
-        return self._pick_type(context)
+        return self._cycle_type(context)


 class GizmoDoorEdition(bpy.types.GizmoGroup, gizmo.BaseParametricGizmoGroup):
@@ -732,7 +770,7 @@ class GizmoDoorEdition(bpy.types.GizmoGroup, gizmo.BaseParametricGizmoGroup):
    enable_editing_operator = "bim.enable_editing_door"
    finish_editing_operator = "bim.finish_editing_door"
    cancel_editing_operator = "bim.cancel_editing_door"
-    pick_type_operator = "bim.pick_door_type"
+    cycle_type_operator = "bim.cycle_door_type"

    # Declarative dimension gizmo configuration with visibility and position
    # matrix_position lambdas replace the get_dimension_matrix_* methods
@@ -839,44 +877,14 @@ class GizmoDoorEdition(bpy.types.GizmoGroup, gizmo.BaseParametricGizmoGroup):
                p.get_transom_window_center_z(),
            ),
        ),
-        *WALL_OFFSET_GIZMO_CONFIGS,
    ]

-    # Big quarter-arc hit shapes cover much of the door face — without a
-    # negative select_bias they would steal clicks from the small dimension
-    # and edit gizmos drawn on top of them.
-    SWING_ARC_SELECT_BIAS = -1000.0
-    swing_arc_operator = "bim.toggle_door_swing"
-
-    swing_arc_props = [
-        gizmo.SwingArcConfig(
-            name="primary",
-            visibility_condition=lambda p: p.is_editing and "SLIDING" not in p.door_type,
-            hinge_x=lambda p: (
-                p.overall_width if p.door_type.endswith("RIGHT") and "DOUBLE_DOOR" not in p.door_type else 0.0
-            ),
-            hinge_y=lambda p: p.lining_offset,
-            panel_width=lambda p: p.overall_width / 2 if "DOUBLE_DOOR" in p.door_type else p.overall_width,
-            x_mirror=lambda p: p.door_type.endswith("RIGHT") and "DOUBLE_DOOR" not in p.door_type,
-        ),
-        gizmo.SwingArcConfig(
-            name="secondary",
-            visibility_condition=lambda p: p.is_editing
-            and "DOUBLE_DOOR" in p.door_type
-            and "SLIDING" not in p.door_type,
-            hinge_x=lambda p: p.overall_width,
-            hinge_y=lambda p: p.lining_offset,
-            panel_width=lambda p: p.overall_width / 2,
-            x_mirror=lambda _p: True,
-        ),
-    ]
-
-    props_getter = tool.Model.get_door_props
+    props_getter = "get_door_props"
    gizmo_pref_name = "door"

    @classmethod
    def is_element_type(cls, element: ifcopenshell.entity_instance) -> bool:
-        return tool.Parametric.is_door(element)
+        return tool.Blender.Modifier.is_door(element)

    def get_icon_y_extent(self, props: "BIMDoorProperties") -> tuple[float, float]:
        """Get Y extents for door icon positioning.
@@ -894,20 +902,24 @@ class GizmoDoorEdition(bpy.types.GizmoGroup, gizmo.BaseParametricGizmoGroup):
        return (furthest_y, furthest_y)

    def setup_element_specific_gizmos(self, context: bpy.types.Context) -> None:
-        """Create one (main, flip) swing-arc pair per ``swing_arc_props`` entry.
-
-        Stored as ``self.gizmo_swing_arc_<name>`` and ``self.gizmo_swing_arc_<name>_flip``
-        and pinned to ``SWING_ARC_SELECT_BIAS`` so other door gizmos win selection."""
+        """Create door-specific swing arc gizmos."""
        prefs = tool.Blender.get_addon_preferences()
-        main_color = prefs.decorator_color_special[:3]
-        flip_color = prefs.decorator_color_background[:3]
-        for cfg in self.swing_arc_props:
-            main = self.create_arc_gizmo(main_color, self.swing_arc_operator, flip_geometry=False)
-            flip = self.create_arc_gizmo(flip_color, self.swing_arc_operator, flip_geometry=True)
-            for gz in (main, flip):
-                gz.select_bias = self.SWING_ARC_SELECT_BIAS
-            setattr(self, f"gizmo_swing_arc_{cfg.name}", main)
-            setattr(self, f"gizmo_swing_arc_{cfg.name}_flip", flip)
+        inactive_color = prefs.decorator_color_background[:3]
+        special_color = prefs.decorator_color_special[:3]
+
+        self.gizmo_door_type = self.create_arc_gizmo(
+            special_color,
+            "bim.toggle_door_swing",
+            prop_path="BIMDoorProperties.door_type",
+            flip_geometry=False,
+        )
+        self.gizmo_flip_arc = self.create_arc_gizmo(
+            inactive_color,
+            "bim.toggle_door_swing",
+            prop_path="BIMDoorProperties.door_type",
+            flip_geometry=True,
+            flip_local_axes="XY",
+        )

    def _refresh_element_specific(
        self, context: bpy.types.Context, mw: Matrix, props: "BIMDoorProperties"  # noqa: ARG002
@@ -926,23 +938,29 @@ class GizmoDoorEdition(bpy.types.GizmoGroup, gizmo.BaseParametricGizmoGroup):
        self._update_view_dependent_dimensions(context, mw, props)

    def update_swing_gizmos(self, mw: Matrix, props: "BIMDoorProperties") -> None:
-        """Position each declared swing-arc pair per its config + props state."""
-        mirror_y = Matrix.Scale(-1, 4, (0, 1, 0))
-        for cfg in self.swing_arc_props:
-            main = getattr(self, f"gizmo_swing_arc_{cfg.name}")
-            flip = getattr(self, f"gizmo_swing_arc_{cfg.name}_flip")
-            show = cfg.visibility_condition(props)
-            main_visible = self.update_gizmo_visibility(main, show)
-            flip_visible = self.update_gizmo_visibility(flip, show)
-            if not (main_visible or flip_visible):
-                continue
-            x_flip = Matrix.Scale(-1, 4, (1, 0, 0)) if cfg.x_mirror(props) else Matrix.Identity(4)
-            transform = (
-                Matrix.Translation(V_(cfg.hinge_x(props), cfg.hinge_y(props), 0))
-                @ Matrix.Scale(cfg.panel_width(props), 4)
-                @ x_flip
-            )
-            if main_visible:
-                main.matrix_basis = mw @ transform
-            if flip_visible:
-                flip.matrix_basis = mw @ transform @ mirror_y
+        """Update swing gizmo position and color based on editing state."""
+        prefs = tool.Blender.get_addon_preferences()
+        door_gizmo_prefs = prefs.gizmos.door
+
+        door_type_visible = self.update_gizmo_visibility(
+            self.gizmo_door_type, props.is_editing, door_gizmo_prefs.swing_arc
+        )
+        flip_arc_visible = self.update_gizmo_visibility(
+            self.gizmo_flip_arc, props.is_editing, door_gizmo_prefs.flip_arc
+        )
+
+        if not door_type_visible and not flip_arc_visible:
+            return
+
+        swing_x_offset = props.overall_width if "RIGHT" in props.door_type else 0.0
+        base_swing_transform = Matrix.Translation(V_(swing_x_offset, props.lining_offset, 0)) @ Matrix.Scale(
+            props.overall_width, 4
+        )
+
+        if door_type_visible:
+            self.gizmo_door_type.matrix_basis = mw @ base_swing_transform
+            self.gizmo_door_type.color = prefs.decorations_colour[:3]
+
+        if flip_arc_visible:
+            mirror_y = Matrix.Scale(-1, 4, (0, 1, 0))
+            self.gizmo_flip_arc.matrix_basis = mw @ base_swing_transform @ mirror_y
@@ -82,7 +82,7 @@ def add_object(self: "BIM_OT_add_object", context: bpy.types.Context) -> None:


 class BIM_OT_add_object(Operator, tool.Ifc.Operator):
-    bl_idname = "bim.add_grid"
+    bl_idname = "mesh.add_grid"
    bl_label = "Grid"
    bl_description = "Add IfcGrid."
    bl_options = {"REGISTER", "UNDO"}
@@ -1,221 +0,0 @@
-# Bonsai - OpenBIM Blender Add-on
-# Copyright (C) 2026
-#
-# This file is part of Bonsai.
-#
-# Bonsai is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Bonsai is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was generated with the assistance of an AI coding tool.
-
-"""Generic single-click "Add Opening" gizmo for hosts (walls, slabs, roofs).
-
-One GizmoGroup serves every IFC host type that exposes ``HasOpenings``:
-parametric LAYER2 walls, any ``IfcSlab``, and any ``IfcRoof``. The poll
-guards host-host pairings so this gizmo never overlaps with the existing
-wall-join / extend-vertically gizmos. The positioner dispatches on element
-type — walls use axis-projection + camera-facing-Y math (which requires the
-parametric layer-set); slabs and roofs use a world-Z face bias driven by
-the void object's elevation against the host's bounding box."""
-
-import bpy
-from mathutils import Vector
-
-import bonsai.tool as tool
-from bonsai.bim.module.drawing import gizmos as gizmo
-from bonsai.bim.module.model.wall import (
-    _get_wall_geom_cached,
-    _wall_camera_facing_icon_y,
-    _wall_gizmo_poll_gate,
-    _WallGeomCachedBillboardingMixin,
-)
-
-
-def is_supported_host(element) -> bool:
-    """Total predicate (None → False). Walls accept either a parametric
-    LAYER2 wall OR a fillet-corner wall (both expose a usable axis +
-    layer-set for the anchor math); slabs and roofs only need the bound
-    box so any IfcSlab / IfcRoof qualifies regardless of parametric
-    modifier state."""
-    if element is None:
-        return False
-    return tool.Parametric.is_path_connectable_wall(element) or element.is_a("IfcSlab") or element.is_a("IfcRoof")
-
-
-def _resolve_active_host(context: bpy.types.Context, n_selected: int):
-    """Shared poll prologue: gizmo gate + selection cardinality + active-in-
-    selected + IFC entity lookup + supported-host predicate. Returns the
-    active element on success, ``None`` on any failure — callers chain their
-    feature-specific checks past the early-return."""
-    if not _wall_gizmo_poll_gate(context):
-        return None
-    selected = tool.Blender.get_selected_objects()
-    if len(selected) != n_selected:
-        return None
-    active = context.active_object
-    if active is None or active not in selected:
-        return None
-    element = tool.Ifc.get_entity(active)
-    if not element or not is_supported_host(element):
-        return None
-    return element
-
-
-class GizmoHostAddOpening(bpy.types.GizmoGroup, _WallGeomCachedBillboardingMixin):
-    """Activates when a host element (wall / slab / roof) is the active object
-    and exactly one other selected object is *not* itself a host.
-
-    Renders a single ``VIEW3D_GT_add_opening`` icon at the void object's
-    projected location on the host. A click dispatches ``bim.add_opening``,
-    which handles any element exposing the ``HasOpenings`` inverse.
-
-    Per-frame positioning keeps the icon facing the camera as the viewport
-    orbits."""
-
-    bl_idname = "OBJECT_GGT_bim_host_add_opening"
-    bl_label = "Host Add Opening Gizmo"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "WINDOW"
-    bl_options = {"3D", "PERSISTENT"}
-
-    @classmethod
-    def poll(cls, context: bpy.types.Context) -> bool:
-        element = _resolve_active_host(context, n_selected=2)
-        if element is None:
-            return False
-        # The operator itself filters on HasOpenings, but checking here keeps
-        # the icon from appearing on host classes that can't accept openings
-        # in the active IFC schema.
-        if not hasattr(element, "HasOpenings"):
-            return False
-        active = context.active_object
-        other = next(o for o in tool.Blender.get_selected_objects() if o is not active)
-        # Host + host pairings are claimed by host-specific gizmos (wall-join,
-        # extend-vertical, …) — suppress here so the add-opening icon never
-        # stacks on top of them.
-        if is_supported_host(tool.Ifc.get_entity(other)):
-            return False
-        return True
-
-    def setup(self, context: bpy.types.Context) -> None:
-        default_color, highlight_color = self.get_decoration_colors()
-        self.add_opening_icon = self.setup_icon_gizmo(
-            "VIEW3D_GT_add_opening", default_color, highlight_color, "bim.add_opening"
-        )
-
-    def position_gizmos(self, context: bpy.types.Context) -> None:
-        host_obj = context.active_object
-        if not host_obj:
-            return
-        selected = tool.Blender.get_selected_objects()
-        other = next((o for o in selected if o is not host_obj), None)
-        if not other:
-            return
-        element = tool.Ifc.get_entity(host_obj)
-        if not element:
-            return
-
-        if tool.Parametric.is_path_connectable_wall(element):
-            world_pos = wall_anchor(context, self, host_obj, other)
-        else:
-            world_pos = layer3_anchor(host_obj, other)
-        if world_pos is None:
-            return
-        self.add_opening_icon.matrix_basis = gizmo.billboarded_at(world_pos, gizmo.get_billboard_rotation(context))
-
-
-def wall_anchor(
-    context: bpy.types.Context, group: bpy.types.GizmoGroup, wall_obj: bpy.types.Object, other: bpy.types.Object
-) -> Vector | None:
-    """World-space anchor for the add-opening icon on a wall host: void origin
-    projected onto the wall reference-line X (clamped to wall extents), lifted to
-    the camera-facing wall-local Y."""
-    geom = _get_wall_geom_cached(group, wall_obj)
-    if not geom:
-        return None
-    mw = wall_obj.matrix_world
-    wall_local = mw.inverted() @ other.matrix_world.translation
-    local_x = max(geom["anchor_x"], min(wall_local.x, geom["anchor_x"] + geom["length"]))
-    icon_y = _wall_camera_facing_icon_y(context, mw, geom)
-    base_world = mw @ Vector((local_x, icon_y, 0.0))
-    top_world = mw @ Vector((local_x, icon_y, geom["height"] + gizmo.BaseParametricGizmoGroup.ICON_Z_OFFSET))
-    return gizmo.BaseParametricGizmoGroup.pick_visible_anchor(context, base_world, top_world)
-
-
-def layer3_anchor(host_obj: bpy.types.Object, other: bpy.types.Object) -> Vector:
-    """World-space anchor for the add-opening icon on a LAYER3 host (slab / roof):
-    void's world XY, lifted just above the host's top face. Predictable height
-    regardless of where the void sits vertically — clicking the icon places the
-    opening at the void's XY, and the operator handles the actual cut depth."""
-    bbox = tool.Blender.get_object_world_bounding_box(host_obj)
-    anchor_xy = other.matrix_world.translation.xy
-    top_z = bbox["max_z"] + gizmo.BaseParametricGizmoGroup.ICON_Z_OFFSET
-    return Vector((anchor_xy.x, anchor_xy.y, top_z))
-
-
-def host_toggle_anchor(host_obj: bpy.types.Object) -> Vector:
-    """Object origin XY, lifted just above the topmost mesh vertex. Tracks
-    the parametric origin (useful reference even when the mesh extends
-    asymmetrically) and the visible top face (stays clear of sloped or
-    stepped bodies)."""
-    origin = host_obj.matrix_world.translation
-    top_z = tool.Blender.get_object_world_bounding_box(host_obj)["max_z"] + gizmo.BaseParametricGizmoGroup.ICON_Z_OFFSET
-    return Vector((origin.x, origin.y, top_z))
-
-
-class GizmoHostToggleOpenings(bpy.types.GizmoGroup, _WallGeomCachedBillboardingMixin):
-    """Fallback toggle-openings icon for hosts that lack their own
-    parametric-edit toolbar — slabs today, plus any foreign-authored
-    IfcRoof that carries no BBIM_Roof pset (so ``GizmoRoofEdition`` doesn't
-    poll for it). Walls and parametric roofs already render an idle-row
-    toggle next to the pen and are excluded from this poll.
-
-    When slab parametric-edit lands the slab branch will pen-row-handle
-    its own toggle; updating the exclusion predicate here is the only
-    migration step needed."""
-
-    bl_idname = "OBJECT_GGT_bim_host_toggle_openings"
-    bl_label = "Host Toggle Openings Gizmo"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "WINDOW"
-    bl_options = {"3D", "PERSISTENT"}
-
-    @classmethod
-    def poll(cls, context: bpy.types.Context) -> bool:
-        element = _resolve_active_host(context, n_selected=1)
-        if element is None:
-            return False
-        if not tool.Geometry.has_openings(element):
-            return False
-        # Skip when a per-feature parametric-edit gizmo already surfaces
-        # an idle-row toggle for this element — walls and parametric roofs
-        # both render their own toggle in the pen row.
-        if tool.Parametric.is_path_connectable_wall(element):
-            return False
-        if tool.Parametric.is_roof(element):
-            return False
-        return True
-
-    def setup(self, context: bpy.types.Context) -> None:
-        default_color, highlight_color = self.get_decoration_colors()
-        self.toggle_openings_icon = self.setup_icon_gizmo(
-            "VIEW3D_GT_add_opening", default_color, highlight_color, "bim.toggle_host_openings"
-        )
-
-    def position_gizmos(self, context: bpy.types.Context) -> None:
-        host_obj = context.active_object
-        if not host_obj:
-            return
-        self.toggle_openings_icon.matrix_basis = gizmo.billboarded_at(
-            host_toggle_anchor(host_obj), gizmo.get_billboard_rotation(context)
-        )
@@ -227,7 +227,7 @@ class FitFlowSegments(bpy.types.Operator, tool.Ifc.Operator):
            is_parallel21 = tool.Cad.is_x(angle21, (0, 180), tolerance=0.001)
            is_parallel23 = tool.Cad.is_x(angle23, (0, 180), tolerance=0.001)

-            if not all([is_parallel12, is_parallel13, is_parallel21, is_parallel23]):
+            if not all(is_parallel12, is_parallel13, is_parallel21, is_parallel23):
                fitting_type = "WYE"

        if not fitting_type:
@@ -903,7 +903,7 @@ class MEPAddBend(bpy.types.Operator, tool.Ifc.Operator):
    start_segment_id: bpy.props.IntProperty(name="Start Segment Element ID", default=0)
    end_segment_id: bpy.props.IntProperty(name="End Segment Element ID", default=0)
    radius: bpy.props.FloatProperty(
-        name="Bend Inner Radius", description="Bend inner radius in SI units", default=0.2, subtype="DISTANCE", min=0
+        "Bend Inner Radius", description="Bend inner radius in SI units", default=0.2, subtype="DISTANCE", min=0
    )

    def _execute(self, context):
@@ -41,187 +41,8 @@ from mathutils import Matrix, Vector

 import bonsai.core.geometry
 import bonsai.tool as tool
-from bonsai.bim import decorator_cache
 from bonsai.bim.module.drawing.decoration import DecoratorData

-# Multi-entry cache for the opening preview's dissolved-edges fallback.
-# Single-entry wouldn't fit: the draw handler iterates every active opening
-# per frame, each with its own mesh. Bumped wholesale on the shared
-# decorator-cache token (depsgraph / undo / redo / load), one slot per
-# (mesh.session_uid, angle_limit). Outlier vs. the per-object caches below —
-# consulted only on world-draw-data miss, so the global wipe rarely fires in
-# steady state and the simpler invalidation is enough.
-_dissolved_edges_cache: dict[
-    tuple[int, float],
-    tuple[list[Vector], list[tuple[int, int]]],
-] = {}
-_dissolved_edges_cache_token: int = -1
-
-
-def _get_cached_dissolved_edges(
-    mesh: bpy.types.Mesh,
-    angle_limit: float = radians(1.0),
-) -> tuple[list[Vector], list[tuple[int, int]]]:
-    global _dissolved_edges_cache_token
-    token = decorator_cache.get_decorator_cache_token()
-    if token != _dissolved_edges_cache_token:
-        _dissolved_edges_cache.clear()
-        _dissolved_edges_cache_token = token
-    key = (mesh.session_uid, angle_limit)
-    cached = _dissolved_edges_cache.get(key)
-    if cached is not None:
-        return cached
-    result = tool.Geometry.get_dissolved_edges(mesh, angle_limit=angle_limit)
-    _dissolved_edges_cache[key] = result
-    return result
-
-
-# Per-object epoch: bumped only when this specific object's transform or geometry
-# updates land in the depsgraph delta. Invalidation work scales with the number
-# of changed objects, not total scene size — moving one object leaves every
-# other entry valid. Bumped by the depsgraph handler below; cleared on
-# undo/redo/load alongside the cache dicts.
-_object_epochs: dict[int, int] = {}
-
-
-@bpy.app.handlers.persistent
-def _bump_object_epochs_for_decoration(*args) -> None:
-    # depsgraph_update_post is called as (scene, depsgraph) in 4.x but the
-    # *args signature follows decorator_cache's defensive idiom.
-    depsgraph = args[1] if len(args) >= 2 else None
-    if depsgraph is None or not hasattr(depsgraph, "updates"):
-        return
-    for u in depsgraph.updates:
-        if not isinstance(u.id, bpy.types.Object):
-            continue
-        if not (u.is_updated_geometry or u.is_updated_transform):
-            continue
-        # u.id is the evaluated COW copy; the cache keys are written from the
-        # original Object (read by the draw handler), and session_uid can
-        # differ across the COW boundary. Resolve to the original before keying.
-        original = getattr(u.id, "original", u.id)
-        if original is None:
-            continue
-        uid = original.session_uid
-        _object_epochs[uid] = _object_epochs.get(uid, 0) + 1
-
-
-@bpy.app.handlers.persistent
-def _clear_decoration_caches_globally(*args) -> None:
-    # Undo/redo/load: depsgraph deltas can't be trusted to describe the
-    # transition, so wipe every per-object cache state.
-    _object_epochs.clear()
-    _world_draw_data_cache.clear()
-    _batch_cache.clear()
-
-
-def _decoration_invalidation_hooks() -> tuple:
-    return (
-        bpy.app.handlers.undo_post,
-        bpy.app.handlers.redo_post,
-        bpy.app.handlers.load_post,
-    )
-
-
-def install_decoration_cache_handlers() -> None:
-    if _bump_object_epochs_for_decoration not in bpy.app.handlers.depsgraph_update_post:
-        bpy.app.handlers.depsgraph_update_post.append(_bump_object_epochs_for_decoration)
-    for hook in _decoration_invalidation_hooks():
-        if _clear_decoration_caches_globally not in hook:
-            hook.append(_clear_decoration_caches_globally)
-
-
-def uninstall_decoration_cache_handlers() -> None:
-    try:
-        bpy.app.handlers.depsgraph_update_post.remove(_bump_object_epochs_for_decoration)
-    except ValueError:
-        pass
-    for hook in _decoration_invalidation_hooks():
-        try:
-            hook.remove(_clear_decoration_caches_globally)
-        except ValueError:
-            pass
-
-
-# Per-object world-space draw payload: line_verts (dissolved or ios_edges-filtered),
-# verts (full mesh, indexed by loop_triangles), edges_indices, tris. Entries are
-# (epoch, payload) tuples; lookup compares epoch to _object_epochs[uid], so a
-# stale entry for an object that didn't change since the last build still hits.
-_world_draw_data_cache: dict[
-    int,
-    tuple[
-        int,
-        tuple[
-            list[tuple[float, float, float]],
-            list[tuple[float, float, float]],
-            list[tuple[int, int]],
-            list[tuple[int, ...]],
-        ],
-    ],
-] = {}
-
-
-def _get_cached_world_draw_data(
-    obj: bpy.types.Object,
-) -> tuple[
-    list[tuple[float, float, float]],
-    list[tuple[float, float, float]],
-    list[tuple[int, int]],
-    list[tuple[int, ...]],
-]:
-    uid = obj.session_uid
-    epoch = _object_epochs.get(uid, 0)
-    entry = _world_draw_data_cache.get(uid)
-    if entry is not None and entry[0] == epoch:
-        return entry[1]
-
-    mw = obj.matrix_world
-    verts = [tuple(mw @ v.co) for v in obj.data.vertices]
-    obj.data.calc_loop_triangles()
-    tris = [tuple(t.vertices) for t in obj.data.loop_triangles]
-
-    ios_edges_attribute = obj.data.attributes.get("ios_edges")
-    if ios_edges_attribute:
-        # Loader-curated edges: read the attribute aligned with bm.edges order.
-        bm = bmesh.new()
-        bm.from_mesh(obj.data)
-        edges_indices = [
-            tuple(v.index for v in e.verts) for i, e in enumerate(bm.edges) if ios_edges_attribute.data[i].value
-        ]
-        bm.free()
-        line_verts = verts
-    else:
-        dissolved, edges_indices = _get_cached_dissolved_edges(obj.data)
-        line_verts = [tuple(mw @ v) for v in dissolved]
-
-    result = (line_verts, verts, edges_indices, tris)
-    _world_draw_data_cache[uid] = (epoch, result)
-    return result
-
-
-# GPUBatch cache: skip per-frame batch_for_shader. Entries are (epoch, batch);
-# lookup compares epoch to _object_epochs[uid] so other objects' batches stay
-# alive when one object's depsgraph delta bumps only its own epoch. The cached
-# batches reference GPU-side buffers tied to Blender's built-in shaders, which
-# are themselves cached by name (gpu.shader.from_builtin returns the same
-# handle each call), so they stay drawable across frames.
-_batch_cache: dict[tuple[int, str], tuple[int, "gpu.types.GPUBatch"]] = {}
-
-
-def _get_cached_batch_or_none(cache_key: tuple[int, str]) -> "gpu.types.GPUBatch | None":
-    uid = cache_key[0]
-    epoch = _object_epochs.get(uid, 0)
-    entry = _batch_cache.get(cache_key)
-    if entry is not None and entry[0] == epoch:
-        return entry[1]
-    return None
-
-
-def _store_batch_in_cache(cache_key: tuple[int, str], batch: "gpu.types.GPUBatch") -> None:
-    uid = cache_key[0]
-    epoch = _object_epochs.get(uid, 0)
-    _batch_cache[cache_key] = (epoch, batch)
-

 class FilledOpeningGenerator:
    def generate(
@@ -229,15 +50,9 @@ class FilledOpeningGenerator:
        filling_obj: bpy.types.Object,
        voided_obj: bpy.types.Object,
        target: Optional[Vector] = None,
-        preserve_placement: bool = False,
    ) -> Union[None, str]:
        """
        :param target: Target opening position. If ommited, cursor position is used.
-        :param preserve_placement: If True, keep ``filling_obj.matrix_world`` as-is
-            and skip the snap-to-wall-axis / rl1-rl2 Z-default logic. The opening
-            is still created at the filling's current world position. Useful
-            when the caller (e.g. the SHIFT-add-opening gizmo flow) has
-            already positioned the filling intentionally.
        :return: None if there was no errors, otherwise returns a string with error message.
        """
        props = tool.Model.get_model_props()
@@ -259,7 +74,7 @@ class FilledOpeningGenerator:
            should_set_z_level = False

        # Sometimes, the voided_obj may be an aggregate, which won't have any representation.
-        if not preserve_placement and voided_obj.data:
+        if voided_obj.data:
            raycast = voided_obj.closest_point_on_mesh(voided_obj.matrix_world.inverted() @ target, distance=0.01)
            if not raycast[0]:
                target = filling_obj.matrix_world.translation.copy()
@@ -336,11 +151,29 @@ class FilledOpeningGenerator:
                existing_opening_occurrence, "Model", "Body", "MODEL_VIEW"
            )
            assert representation
-            representation = ifcopenshell.util.representation.resolve_representation(representation)
-        else:
-            representation = self.generate_opening_from_filling(
-                filling, filling_obj, opening_thickness_si=opening_thickness_si
-            )
+
+            # Check if mapped representation - PRESERVE the mapping structure
+            if (
+                representation.RepresentationType == "MappedRepresentation"
+                and len(representation.Items) == 1
+                and representation.Items[0].is_a("IfcMappedItem")
+            ):
+                # Store the existing RepresentationMap to reuse it
+                existing_mapping_source = representation.Items[0].MappingSource
+                reuse_mapped_representation = True
+            else:
+                representation = ifcopenshell.util.representation.resolve_representation(representation)
+
+        if not reuse_mapped_representation:
+            # Check for library template before generating from filling
+            template_rep = self.get_opening_template_from_type(filling)
+
+            if template_rep:
+                representation = template_rep
+            else:
+                representation = self.generate_opening_from_filling(
+                    filling, filling_obj, opening_thickness_si=opening_thickness_si
+                )

        # Create mapped representation
        if reuse_mapped_representation:
@@ -414,38 +247,109 @@ class FilledOpeningGenerator:
        voided_element = opening.VoidsElements[0].RelatingBuildingElement

        opening_rep = ifcopenshell.util.representation.get_representation(opening, "Model", "Body", "MODEL_VIEW")
+
+        # ALWAYS preserve the existing opening representation (Tessellation, SweptSolid, etc.)
+        preserved_representation = None
+        if opening_rep:
+            if (
+                opening_rep.RepresentationType == "MappedRepresentation"
+                and len(opening_rep.Items) == 1
+                and opening_rep.Items[0].is_a("IfcMappedItem")
+            ):
+                # For mapped representations, copy the underlying representation
+                preserved_representation = ifcopenshell.util.element.copy_deep(
+                    tool.Ifc.get(),
+                    opening_rep.Items[0].MappingSource.MappedRepresentation,
+                    exclude=["IfcGeometricRepresentationContext"],
+                )
+            else:
+                # For direct representations (non-mapped), copy them too
+                preserved_representation = ifcopenshell.util.element.copy_deep(
+                    tool.Ifc.get(), opening_rep, exclude=["IfcGeometricRepresentationContext"]
+                )
+
        ifcopenshell.api.geometry.unassign_representation(tool.Ifc.get(), product=opening, representation=opening_rep)
        ifcopenshell.api.geometry.remove_representation(tool.Ifc.get(), representation=opening_rep)

        existing_opening_occurrence = self.get_existing_opening_occurrence_if_any(filling)

+        # Priority order for choosing representation:
+        # 1. Existing occurrence with MappedRepresentation (preserve mapping!)
+        # 2. Library template with Tessellation
+        # 3. Preserved representation from old opening (maintain user's work)
+        # 4. Generate from filling (last resort)
+
+        representation_to_use = None
+        reuse_mapped_representation = False
+        existing_mapping_source = None
+
        if existing_opening_occurrence:
            representation = ifcopenshell.util.representation.get_representation(
                existing_opening_occurrence, "Model", "Body", "MODEL_VIEW"
            )
-            representation = ifcopenshell.util.representation.resolve_representation(representation)
-            mapped_representation = ifcopenshell.api.geometry.map_representation(
-                tool.Ifc.get(), representation=representation
-            )
-            ifcopenshell.api.geometry.assign_representation(
-                tool.Ifc.get(), product=opening, representation=mapped_representation
-            )
-        else:
+
+            if (
+                representation
+                and representation.RepresentationType == "MappedRepresentation"
+                and len(representation.Items) == 1
+                and representation.Items[0].is_a("IfcMappedItem")
+            ):
+                # PRESERVE the mapped structure - reuse the same RepresentationMap
+                existing_mapping_source = representation.Items[0].MappingSource
+                reuse_mapped_representation = True
+            else:
+                representation_to_use = ifcopenshell.util.representation.resolve_representation(representation)
+
+        if not representation_to_use and not reuse_mapped_representation:
+            template_rep = self.get_opening_template_from_type(filling)
+            if template_rep and template_rep.RepresentationType == "Tessellation":
+                representation_to_use = template_rep
+
+        if not representation_to_use and not reuse_mapped_representation and preserved_representation:
+            representation_to_use = preserved_representation
+
+        if not representation_to_use and not reuse_mapped_representation:
            opening_obj = tool.Ifc.get_object(opening)
            if opening_obj:
                tool.Ifc.unlink(element=opening)
                tool.Blender.remove_data_blocks([opening_obj], remove_unused_data=True)

            filling_obj = tool.Ifc.get_object(filling)
-            representation = self.generate_opening_from_filling(filling, filling_obj)
-            mapped_representation = ifcopenshell.api.geometry.map_representation(
-                tool.Ifc.get(), representation=representation
+            representation_to_use = self.generate_opening_from_filling(filling, filling_obj)
+
+        # Create the mapped representation
+        if reuse_mapped_representation:
+            # Reuse existing RepresentationMap - don't create a new one!
+            context = ifcopenshell.util.representation.get_context(tool.Ifc.get(), "Model", "Body", "MODEL_VIEW")
+            new_mapped_item = tool.Ifc.get().create_entity(
+                "IfcMappedItem",
+                MappingSource=existing_mapping_source,
+                MappingTarget=tool.Ifc.get().create_entity(
+                    "IfcCartesianTransformationOperator3D",
+                    Axis1=tool.Ifc.get().create_entity("IfcDirection", DirectionRatios=(1.0, 0.0, 0.0)),
+                    Axis2=tool.Ifc.get().create_entity("IfcDirection", DirectionRatios=(0.0, 1.0, 0.0)),
+                    LocalOrigin=tool.Ifc.get().create_entity("IfcCartesianPoint", Coordinates=(0.0, 0.0, 0.0)),
+                    Scale=1.0,
+                    Axis3=tool.Ifc.get().create_entity("IfcDirection", DirectionRatios=(0.0, 0.0, 1.0)),
+                ),
            )
-            ifcopenshell.api.geometry.assign_representation(
-                tool.Ifc.get(), product=opening, representation=mapped_representation
+            mapped_representation = tool.Ifc.get().create_entity(
+                "IfcShapeRepresentation",
+                ContextOfItems=context,
+                RepresentationIdentifier="Body",
+                RepresentationType="MappedRepresentation",
+                Items=[new_mapped_item],
+            )
+        else:
+            mapped_representation = ifcopenshell.api.geometry.map_representation(
+                tool.Ifc.get(), representation=representation_to_use
            )

-        # update voided object representation or all it's parts if it's an aggregate
+        ifcopenshell.api.geometry.assign_representation(
+            tool.Ifc.get(), product=opening, representation=mapped_representation
+        )
+
+        # update voided object representation...
        voided_elements = ifcopenshell.util.element.get_parts(voided_element) or [voided_element]
        for voided_element in voided_elements:
            voided_obj = tool.Ifc.get_object(voided_element)
@@ -459,6 +363,36 @@ class FilledOpeningGenerator:
                representation=representation,
            )

+    def get_opening_template_from_type(
+        self, filling: ifcopenshell.entity_instance
+    ) -> Union[ifcopenshell.entity_instance, None]:
+        """
+        Check if the filling's type has a stored opening template from library import.
+        """
+        element_type = ifcopenshell.util.element.get_type(filling)
+
+        if not element_type:
+            return None
+
+        desc = element_type.Description
+
+        if not desc or "||BonsaiOpeningTemplate:" not in desc:
+            return None
+
+        # Extract template ID
+        marker = desc.split("||BonsaiOpeningTemplate:")[-1]
+        template_id = int(marker.split("||")[0])
+
+        try:
+            template_rep = tool.Ifc.get().by_id(template_id)
+            # Make a copy so we don't reuse the same representation instance
+            copied = ifcopenshell.util.element.copy_deep(
+                tool.Ifc.get(), template_rep, exclude=["IfcGeometricRepresentationContext"]
+            )
+            return copied
+        except:
+            return None
+
    def generate_opening_from_filling(
        self,
        filling: ifcopenshell.entity_instance,
@@ -725,16 +659,6 @@ class AddBoolean(Operator, tool.Ifc.Operator):
        booleans = ifcopenshell.api.geometry.add_boolean(tool.Ifc.get(), first_item, second_items, props.operator)

        rep_obj = tool.Geometry.get_geometry_props().representation_obj
-        if booleans:
-            # Users typically select two top-level items and expect the
-            # operand to be absorbed into the boolean, not remain as a
-            # standalone item alongside it.
-            representation = tool.Geometry.get_active_representation(rep_obj)
-            representation = ifcopenshell.util.representation.resolve_representation(representation)
-            second_items_set = set(second_items)
-            new_items = [i for i in representation.Items if i not in second_items_set]
-            if new_items:
-                representation.Items = new_items
        rep_element = tool.Ifc.get_entity(rep_obj)
        tool.Model.mark_manual_booleans(rep_element, booleans)
        tool.Geometry.reload_representation(rep_obj)
@@ -743,29 +667,6 @@ class AddBoolean(Operator, tool.Ifc.Operator):
        tool.Root.reload_item_decorator()


-class ToggleHostOpenings(Operator, tool.Ifc.Operator):
-    bl_idname = "bim.toggle_host_openings"
-    bl_label = "Toggle Openings"
-    bl_description = "Show or hide opening fills (doors and windows) in the viewport\n\nHotkey: Alt+O"
-    bl_options = {"REGISTER", "UNDO"}
-
-    @classmethod
-    def poll(cls, context):
-        if not tool.Model.has_selected_ifc_objects():
-            cls.poll_message_set("No IFC objects selected.")
-            return False
-        return True
-
-    def _execute(self, context: bpy.types.Context) -> set[str]:
-        # Opening visibility is independent of host geometry — don't commit any
-        # active parametric edit; the user can keep editing the host.
-        if tool.Model.get_model_props().openings:
-            bpy.ops.bim.edit_openings(apply_all=True)
-        else:
-            bpy.ops.bim.show_openings()
-        return {"FINISHED"}
-
-
 class ShowOpenings(Operator, tool.Ifc.Operator):
    bl_idname = "bim.show_openings"
    bl_label = "Show Openings"
@@ -1149,6 +1050,7 @@ class SelectBoolean(Operator):
        return {"FINISHED"}


+# TODO: merge with ProfileDecorator?
 class DecorationsHandler:
    installed = None

@@ -1158,7 +1060,6 @@ class DecorationsHandler:
            cls.uninstall()
        handler = cls()
        cls.installed = SpaceView3D.draw_handler_add(handler, (context,), "WINDOW", "POST_VIEW")
-        install_decoration_cache_handlers()

    @classmethod
    def uninstall(cls):
@@ -1167,46 +1068,15 @@ class DecorationsHandler:
        except ValueError:
            pass
        cls.installed = None
-        uninstall_decoration_cache_handlers()

-    def _get_or_build_batch(self, shader, shader_type, content_pos, indices=None, cache_key=None):
-        if cache_key is not None:
-            cached = _get_cached_batch_or_none(cache_key)
-            if cached is not None:
-                return cached
+    def draw_batch(self, shader_type, content_pos, color, indices=None):
        if not tool.Blender.validate_shader_batch_data(content_pos, indices):
-            return None
-        batch = batch_for_shader(shader, shader_type, {"pos": content_pos}, indices=indices)
-        if cache_key is not None:
-            _store_batch_in_cache(cache_key, batch)
-        return batch
-
-    def draw_batch(self, shader_type, content_pos, color, indices=None, cache_key=None):
-        shader = self.line_shader if shader_type == "LINES" else self.shader
-        batch = self._get_or_build_batch(shader, shader_type, content_pos, indices, cache_key=cache_key)
-        if batch is None:
            return
+        shader = self.line_shader if shader_type == "LINES" else self.shader
+        batch = batch_for_shader(shader, shader_type, {"pos": content_pos}, indices=indices)
        shader.uniform_float("color", color)
        batch.draw(shader)

-    def _draw_lines_with_occlusion(self, verts, color, edges_indices, occluded_alpha: float = 0.25, cache_key=None):
-        # One batch, two draws: front pass at full color, occluded pass at
-        # `occluded_alpha`. Save/restore depth_test matches the pattern in
-        # bim/module/structural/decorator.py so callers' state survives.
-        batch = self._get_or_build_batch(self.line_shader, "LINES", verts, edges_indices, cache_key=cache_key)
-        if batch is None:
-            return
-        original_depth_test = gpu.state.depth_test_get()
-        gpu.state.depth_test_set("LESS_EQUAL")
-        self.line_shader.uniform_float("color", color)
-        batch.draw(self.line_shader)
-        gpu.state.depth_test_set("GREATER")
-        dimmed = list(color)
-        dimmed[3] = occluded_alpha
-        self.line_shader.uniform_float("color", dimmed)
-        batch.draw(self.line_shader)
-        gpu.state.depth_test_set(original_depth_test)
-
    def __call__(self, context):
        props = tool.Model.get_model_props()
        if not props.openings:
@@ -1278,20 +1148,23 @@ class DecorationsHandler:
                self.draw_batch("LINES", verts, selected_elements_color, selected_edges)
                self.draw_batch("POINTS", unselected_vertices, unselected_elements_color)
                self.draw_batch("POINTS", selected_vertices, selected_elements_color)
-                obj.data.calc_loop_triangles()
-                tris = [tuple(t.vertices) for t in obj.data.loop_triangles]
-                self.draw_batch("TRIS", verts, transparent_color(special_elements_color), tris)
            else:
-                line_verts, verts, edges_indices, tris = _get_cached_world_draw_data(obj)
+                bm = bmesh.new()
+                bm.from_mesh(obj.data)
+
+                verts = [tuple(obj.matrix_world @ v.co) for v in bm.verts]
+                if ios_edges_attribute := obj.data.attributes.get("ios_edges"):
+                    edges = [e for i, e in enumerate(bm.edges) if ios_edges_attribute.data[i].value]
+                else:
+                    edges = bm.edges
+                edges_indices = [tuple([v.index for v in e.verts]) for e in edges]
+
                color = selected_elements_color if obj in context.selected_objects else special_elements_color
-                self._draw_lines_with_occlusion(line_verts, color, edges_indices, cache_key=(obj.session_uid, "lines"))
-                self.draw_batch(
-                    "TRIS",
-                    verts,
-                    transparent_color(special_elements_color),
-                    tris,
-                    cache_key=(obj.session_uid, "tris"),
-                )
+                self.draw_batch("LINES", verts, color, edges_indices)
+
+            obj.data.calc_loop_triangles()
+            tris = [tuple(t.vertices) for t in obj.data.loop_triangles]
+            self.draw_batch("TRIS", verts, transparent_color(special_elements_color), tris)

            if "HalfSpaceSolid" in obj.name:
                # Arrow shape
@@ -1305,4 +1178,7 @@ class DecorationsHandler:
                ]
                edges = [(0, 1), (1, 2), (1, 3), (1, 4), (1, 5)]
                color = selected_elements_color if obj in context.selected_objects else special_elements_color
-                self._draw_lines_with_occlusion(verts, color, edges, cache_key=(obj.session_uid, "arrow"))
+                self.draw_batch("LINES", verts, color, edges)
+
+            if obj.mode != "EDIT":
+                bm.free()
@@ -75,7 +75,6 @@ class PolylineOperator:
        self.is_typing = False
        self.snap_angle = None
        self.snapping_points = []
-        self.unit_scale = 1.0
        self.instructions = {
            "Cycle Input": {"icons": True, "keys": ["EVENT_TAB"]},
            "Distance Input": {"icons": True, "keys": ["EVENT_D"]},
@@ -422,7 +421,7 @@ class PolylineOperator:
                    tool.Polyline.calculate_x_y_and_z(context, self.input_ui, self.tool_state)

                tool.Blender.update_viewport()
-            return {"RUNNING_MODAL"}
+                return {"RUNNING_MODAL"}

    def set_offset(self, context: bpy.types.Context, relating_type: ifcopenshell.entity_instance) -> None:
        props = tool.Model.get_model_props()
@@ -462,7 +461,6 @@ class PolylineOperator:
        self.tool_state.axis_method = None
        self.tool_state.plane_method = None
        self.tool_state.mode = "Mouse"
-        tool.Raycast.clear_snap_objs()
        self.visible_objs = tool.Raycast.get_visible_objects(context)
        for obj in self.visible_objs:
            if bbox_2d := tool.Raycast.get_on_screen_2d_bounding_boxes(context, obj):
@@ -1,221 +0,0 @@
-# Bonsai - OpenBIM Blender Add-on
-# Copyright (C) 2026
-#
-# This file is part of Bonsai.
-#
-# Bonsai is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Bonsai is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was generated with the assistance of an AI coding tool.
-
-"""Shared helpers for Bonsai's parametric preview flows.
-
-Multiple Bonsai features follow the same Scene-level preview pattern:
-
-    Enable<X>Preview   — validates a selection, populates draft state on
-                         ``Scene.BIMPreviewProperties.<x>``, flips ``is_active``.
-    Gizmo<X>Preview    — polls on ``is_active``, surfaces tunable widgets +
-                         validate/cancel icons.
-    <X>PreviewDecorator — GPU lines drawn while ``is_active`` is True.
-    Finish<X>Preview   — direct ``bpy.ops.bim.<verb>(...)`` call with kwargs
-                         read off the draft state, then clears it.
-    Cancel<X>Preview   — pure state reset.
-
-The MEP bend and wall fillet flows are the two current callers. They write
-their Finish / Cancel operators directly, matching the convention used
-throughout the rest of ``bim/module/model/`` for operator-to-operator
-dispatch (explicit ``bpy.ops.bim.X(kwarg=value)`` at the call site, no
-string indirection). This module hosts the cross-cutting accessors only;
-no base class layer.
-
-The GPU draw-handler lifecycle for ``<X>PreviewDecorator`` lives on the
-feature-neutral ``tool.Blender.ViewportDecorator`` base, which every
-viewport decorator (preview or otherwise) inherits from."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from typing import Any
-
-import bpy
-
-import bonsai.tool as tool
-
-# --- Props accessors ---------------------------------------------------------
-
-
-def get_preview_props(context: bpy.types.Context, attr: str):
-    """Resolve a child preview PropertyGroup under ``Scene.BIMPreviewProperties``.
-
-    Returns ``None`` if the umbrella isn't attached yet — true briefly
-    during addon register and during plug-out, so polls / draw callbacks
-    must defend against ``None`` rather than assuming the prop is always
-    available. Also tolerates contexts without a ``scene`` attribute
-    (test mocks built from ``SimpleNamespace``)."""
-    scene = getattr(context, "scene", None)
-    if scene is None:
-        return None
-    preview = getattr(scene, "BIMPreviewProperties", None)
-    return getattr(preview, attr, None) if preview is not None else None
-
-
-def is_preview_active(context: bpy.types.Context, attr: str) -> bool:
-    """``True`` while a specific preview is open. Used by sibling gizmo
-    polls to hide themselves so the preview is the only interactive
-    surface in the viewport (the bend / fillet preview groups take over
-    the same selection's icon stack)."""
-    props = get_preview_props(context, attr)
-    return bool(props is not None and props.is_active)
-
-
-def any_preview_active(context: bpy.types.Context) -> bool:
-    """``True`` if any registered preview is currently open. Sister gizmo
-    polls call this to hide themselves uniformly during ANY preview, so a
-    new preview registered in ``PREVIEW_CANCEL_OPS`` automatically gates
-    every parametric gizmo without each one growing a specific check."""
-    for attr, _op_name in PREVIEW_CANCEL_OPS:
-        if is_preview_active(context, attr):
-            return True
-    return False
-
-
-# --- Lazy closure factories --------------------------------------------------
-#
-# Used by preview gizmo groups when wiring ``BIM_GT_gizmo_dimension``'s
-# ``move_get_cb`` / ``move_set_cb`` callbacks. The closures re-resolve
-# ``bpy.context.scene`` per CALL rather than capturing it at setup() time
-# — the captured Scene's RNA struct can be freed on file open / undo, and
-# referencing a freed struct crashes Blender. Lazy lookup survives the
-# whole undo / reload lifecycle.
-
-
-def make_props_callback(attr: str) -> Callable[[], Any]:
-    """Return a zero-arg callable that lazily fetches the preview props.
-
-    Equivalent to ``getattr(bpy.context.scene.BIMPreviewProperties, attr)``
-    with full defensiveness against missing scene / missing umbrella."""
-
-    def _props():
-        scene = bpy.context.scene
-        preview = getattr(scene, "BIMPreviewProperties", None) if scene else None
-        return getattr(preview, attr, None) if preview is not None else None
-
-    return _props
-
-
-def make_dim_getter(props_callback: Callable[[], Any], field: str) -> Callable[[], float]:
-    """Factory for ``BIM_GT_gizmo_dimension.move_get_cb`` reading a single
-    FloatProperty off the live preview state. Returns ``0.0`` defensively
-    when the props are temporarily unavailable so the widget doesn't crash
-    Blender during plug-out / reload."""
-
-    def _get() -> float:
-        props = props_callback()
-        return getattr(props, field) if props is not None else 0.0
-
-    return _get
-
-
-def make_dim_setter(
-    props_callback: Callable[[], Any],
-    field: str,
-    min_value: float = 0.001,
-) -> Callable[[float], None]:
-    """Factory for ``BIM_GT_gizmo_dimension.move_set_cb`` writing a single
-    FloatProperty + tagging viewport areas for redraw so the GPU preview
-    decorator tracks the value live during drag. Clamps at ``min_value``
-    to match the FloatProperty's declared lower bound."""
-
-    def _set(value: float) -> None:
-        props = props_callback()
-        if props is None:
-            return
-        setattr(props, field, max(min_value, float(value)))
-        tool.Blender.update_all_viewports()
-
-    return _set
-
-
-# --- Shared Enable lifecycle helpers -----------------------------------------
-
-
-def sync_uncommitted_moves(objects: list) -> None:
-    """Push any Blender-side translation / rotation of ``objects`` back to
-    their IFC ``ObjectPlacement`` before a preview decorator starts reading
-    ``obj.matrix_world`` per frame.
-
-    Without this sync, a user who grabbed-moved an object but didn't commit
-    the move sees the live preview at the dragged position while the final
-    commit lands at the stale IFC position — a confusing "where did my
-    preview go?" experience. Both bend and fillet enable paths call this
-    on the relevant pair just before activating the preview."""
-    for obj in objects:
-        tool.Geometry.commit_placement_if_moved(obj, apply_scale=False)
-
-
-# --- Esc dispatch ------------------------------------------------------------
-
-PREVIEW_CANCEL_OPS: tuple[tuple[str, str], ...] = (
-    ("bend", "cancel_bend_preview"),
-    ("wall_fillet", "cancel_wall_fillet_preview"),
-)
-"""Registry of ``(child PointerProperty on Scene.BIMPreviewProperties, bim
-operator name)`` consulted by the Esc handler. Adding a new preview means
-appending one tuple; the forward-compat test pins that every preview
-PropertyGroup with ``is_active`` has an entry here."""
-
-
-def try_cancel_active_preview(context: bpy.types.Context) -> bool:
-    """Cancel every registered preview that is currently active.
-
-    Returns ``True`` iff at least one preview was cancelled. Multiple
-    previews can be simultaneously active (e.g. a stale bend preview opened
-    just before the user starts a wall fillet) — one Esc must clear them
-    all rather than forcing the user to tap Esc once per preview.
-
-    Tags 3D viewports for redraw on success — the Esc keymap entry runs
-    outside a viewport mouse event so the gizmo poll wouldn't re-evaluate
-    until the next interaction without an explicit redraw."""
-    cancelled = False
-    for attr, op_name in PREVIEW_CANCEL_OPS:
-        if is_preview_active(context, attr):
-            getattr(bpy.ops.bim, op_name)()
-            cancelled = True
-    if cancelled:
-        tool.Blender.update_all_viewports(context)
-    return cancelled
-
-
-def discard_pending_previews(scene: bpy.types.Scene) -> None:
-    """Clear every active preview under ``Scene.BIMPreviewProperties`` so
-    saved preview state never resurfaces on file load.
-
-    Mirrors ``tool.Parametric.heal_stale_edit_flags`` for the object-level
-    parametric-edit lifecycle — except previews are *discarded* rather than
-    validated. A preview's only UI cue is its in-viewport widget; reloading
-    a ``.blend`` saved mid-preview restores the flag but not the surrounding
-    user attention, and a stuck ``is_active`` silently hides every sibling
-    gizmo poll gated on it.
-
-    Iterates ``PREVIEW_CANCEL_OPS`` so any preview registered for Esc
-    cancellation is automatically covered here too. Sets ``is_active``
-    directly rather than dispatching the cancel operator: load_post may
-    fire before ``bpy.context.screen`` is reattached, and the cancel
-    operators bail on ``context.screen is None``."""
-    preview = getattr(scene, "BIMPreviewProperties", None)
-    if preview is None:
-        return
-    for attr, _op_name in PREVIEW_CANCEL_OPS:
-        child = getattr(preview, attr, None)
-        if child is not None and getattr(child, "is_active", False):
-            child.is_active = False
@@ -545,7 +545,7 @@ class ChangeTypePage(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.change_type_page"
    bl_label = "Change Type Page"
    bl_options = {"REGISTER"}
-    page: bpy.props.IntProperty()
+    page: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]

    if TYPE_CHECKING:
        page: int
@@ -694,14 +694,10 @@ def generate_box(usecase_path: str, ifc_file: ifcopenshell.file, settings: dict[

        new_settings = settings.copy()
        new_settings["context"] = box_context
-        new_box = ifcopenshell.api.geometry.add_representation(
-            ifc_file,
-            should_run_listeners=False,  # ty:ignore[unknown-argument]
-            **new_settings,
-        )
+        new_box = ifcopenshell.api.geometry.add_representation(ifc_file, should_run_listeners=False, **new_settings)
        ifcopenshell.api.geometry.assign_representation(
            ifc_file,
-            should_run_listeners=False,  # ty:ignore[unknown-argument]
+            should_run_listeners=False,
            product=product,
            representation=new_box,
        )
@@ -18,7 +18,7 @@

 import copy
 from math import atan2, degrees, pi, radians
-from typing import TYPE_CHECKING, Any, Literal, Optional, Union
+from typing import Any, Literal, Optional, Union

 import bpy
 import ifcopenshell
@@ -49,7 +49,7 @@ ProfileFrom2PointsReturn = Union[dict[str, Any], None]


 class DumbProfileGenerator:
-    def __init__(self, relating_type: ifcopenshell.entity_instance):
+    def __init__(self, relating_type):
        self.relating_type = relating_type
        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())

@@ -201,7 +201,7 @@ class DumbProfileGenerator:


 class DumbProfileRegenerator:
-    def regenerate_from_profile_def(self, profile: ifcopenshell.entity_instance) -> None:
+    def regenerate_from_profile_def(self, profile):
        self.file = tool.Ifc.get()
        objs = []
        if not profile:
@@ -221,7 +221,7 @@ class DumbProfileRegenerator:
        for element in self.get_element_types_using_profile(profile):
            tool.Model.mark_thumbnail_for_update(element)

-    def regenerate_from_profile(self, usecase_path: str, ifc_file: ifcopenshell.file, settings: dict[str, Any]) -> None:
+    def regenerate_from_profile(self, usecase_path, ifc_file, settings):
        self.file = ifc_file
        objs = []
        profile = settings["profile"].Profile
@@ -233,7 +233,7 @@ class DumbProfileRegenerator:
                objs.append(obj)
        DumbProfileRecalculator().recalculate(objs)

-    def get_elements_using_profile(self, profile: ifcopenshell.entity_instance) -> list[ifcopenshell.entity_instance]:
+    def get_elements_using_profile(self, profile):
        results = []
        profile_sets = [
            mp.ToMaterialProfileSet[0] for mp in self.file.get_inverse(profile) if mp.is_a("IfcMaterialProfile")
@@ -252,9 +252,7 @@ class DumbProfileRegenerator:
                        results.extend(rel.RelatedObjects)
        return results

-    def get_element_types_using_profile(
-        self, profile: ifcopenshell.entity_instance
-    ) -> list[ifcopenshell.entity_instance]:
+    def get_element_types_using_profile(self, profile):
        results = []
        profile_sets = [
            mp.ToMaterialProfileSet[0] for mp in self.file.get_inverse(profile) if mp.is_a("IfcMaterialProfile")
@@ -271,18 +269,12 @@ class ExtendProfile(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.extend_profile"
    bl_label = "Extend Profile"
    bl_options = {"REGISTER", "UNDO"}
-    join_type: bpy.props.EnumProperty(
-        items=[("-", "Unjoin", ""), ("L", "L", ""), ("V", "V", ""), ("T", "T", "")],
-        default="-",
-    )
-
-    if TYPE_CHECKING:
-        join_type: Literal["-", "L", "V", "T"]
+    join_type: bpy.props.StringProperty()

    def _execute(self, context):
        selected_objs = context.selected_objects
        joiner = DumbProfileJoiner()
-        if self.join_type == "-":
+        if not self.join_type:
            for obj in selected_objs:
                joiner.unjoin(obj)
            return {"FINISHED"}
@@ -634,15 +626,11 @@ class DumbProfileJoiner:
            if connection1 == "ATEND":
                if tool.Cad.is_x(abs(xy_angle), (0, 90, 180), tolerance=0.001) and is_orthogonal:
                    plane = self.get_profile_plane(profile2, furthest_plane)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                    self.body[1] = intersect
                else:
                    plane = self.get_profile_plane(profile2, furthest_plane, z_inwards=False)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                    max_dim = self.get_max_bound_box_dimension(profile1)
                    self.body[1] = intersect + profile1.matrix_world.to_quaternion() @ Vector((0, 0, max_dim))

@@ -685,15 +673,11 @@ class DumbProfileJoiner:
            elif connection1 == "ATSTART":
                if tool.Cad.is_x(abs(xy_angle), (0, 90, 180), tolerance=0.001) and is_orthogonal:
                    plane = self.get_profile_plane(profile2, furthest_plane)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                    self.body[0] = intersect
                else:
                    plane = self.get_profile_plane(profile2, furthest_plane, z_inwards=False)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                    max_dim = self.get_max_bound_box_dimension(profile1)
                    self.body[0] = intersect - profile1.matrix_world.to_quaternion() @ Vector((0, 0, max_dim))

@@ -737,9 +721,7 @@ class DumbProfileJoiner:
            if connection1 == "ATEND":
                if tool.Cad.is_x(abs(xy_angle), (0, 90, 180), tolerance=0.001) and is_orthogonal:
                    plane = self.get_profile_plane(profile2, furthest_plane if is_relating else closest_plane)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                    self.body[1] = intersect
                else:
                    plane = self.get_profile_plane(
@@ -747,9 +729,7 @@ class DumbProfileJoiner:
                        furthest_plane if is_relating else closest_plane,
                        z_inwards=False if is_relating else True,
                    )
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                    max_dim = self.get_max_bound_box_dimension(profile1)
                    self.body[1] = intersect + profile1.matrix_world.to_quaternion() @ Vector((0, 0, max_dim))
                    self.clippings.append(
@@ -762,9 +742,7 @@ class DumbProfileJoiner:
            elif connection1 == "ATSTART":
                if tool.Cad.is_x(abs(xy_angle), (0, 90, 180), tolerance=0.001) and is_orthogonal:
                    plane = self.get_profile_plane(profile2, furthest_plane if is_relating else closest_plane)
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                    self.body[0] = intersect
                else:
                    plane = self.get_profile_plane(
@@ -772,9 +750,7 @@ class DumbProfileJoiner:
                        furthest_plane if is_relating else closest_plane,
                        z_inwards=False if is_relating else True,
                    )
-                    intersect = mathutils.geometry.intersect_line_plane(
-                        axis1[0], axis1[1], plane.translation, plane.col[2].to_3d()
-                    )
+                    intersect = mathutils.geometry.intersect_line_plane(*axis1, plane.translation, plane.col[2].to_3d())
                    max_dim = self.get_max_bound_box_dimension(profile1)
                    self.body[0] = intersect - profile1.matrix_world.to_quaternion() @ Vector((0, 0, max_dim))
                    self.clippings.append(
@@ -15,8 +15,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was modified with the assistance of an AI coding tool.

 import math
 from collections.abc import Callable
@@ -103,12 +101,8 @@ def update_type_page(self: "BIMModelProperties", context: bpy.types.Context) ->


 def update_relating_array_from_object(self: "BIMArrayProperties", context: bpy.types.Context) -> None:
-    # Skip the cleanup-time clear: Finish/Cancel sets relating_array_object back to None,
-    # which has no source to hydrate from. Only the user-driven pick (None → some array)
-    # should auto-enter edit on the picked source's layer 0.
-    if self.relating_array_object is None:
-        return
-    bpy.ops.bim.enable_editing_array(item=0)
+    bpy.ops.bim.enable_editing_array(item=self.is_editing)
+    return


 def is_object_array_applicable(self: "BIMArrayProperties", obj: bpy.types.Object) -> bool:
@@ -199,32 +193,6 @@ def update_stair(self: "BIMStairProperties", context: bpy.types.Context) -> None
        _get_updater("stair", "regenerate_stair_mesh")(obj)


-def update_wall(self: "BIMWallProperties", context: bpy.types.Context) -> None:
-    """Regenerate wall mesh preview when property changes. Does NOT touch IFC."""
-    obj = context.active_object
-    if obj and self.is_editing:
-        _get_updater("wall", "regenerate_wall_mesh_from_props")(obj)
-
-
-def update_wall_offset_baseline(self: "BIMWallProperties", context: bpy.types.Context) -> None:
-    """Recompute the preview-only ``offset`` when the draft baseline cycles. Does not touch IFC.
-
-    ``offset`` itself has no ``update`` callback on purpose — adding one would make
-    every baseline cycle rebuild the bmesh twice (once via offset's callback, once
-    explicitly below)."""
-    obj = context.active_object
-    if not (obj and self.is_editing):
-        return
-    t = self.thickness
-    if self.desired_offset_baseline == "CENTER":
-        self.offset = -t / 2
-    elif self.desired_offset_baseline == "INTERIOR":
-        self.offset = -t
-    else:  # EXTERIOR
-        self.offset = 0.0
-    _get_updater("wall", "regenerate_wall_mesh_from_props")(obj)
-
-
 def update_railing(self: "BIMRailingProperties", context: bpy.types.Context) -> None:
    """Regenerate railing mesh when property changes."""
    if self.is_editing:
@@ -401,13 +369,8 @@ class BIMModelProperties(PropertyGroup):


 class BIMArrayProperties(PropertyGroup):
-    is_editing: bpy.props.BoolProperty(
-        default=False,
-        description="True while an array layer is in parametric edit mode. The specific layer is in editing_item_index.",
-    )
-    editing_item_index: bpy.props.IntProperty(
-        default=-1,
-        description="Index of the array layer currently being edited; -1 when not in edit mode.",
+    is_editing: bpy.props.IntProperty(
+        default=-1, description="Currently edited array index. -1 if not in array editing mode."
    )
    count: bpy.props.IntProperty(name="Count", default=0, min=0)
    x: bpy.props.FloatProperty(name="X", default=0, subtype="DISTANCE")
@@ -423,15 +386,6 @@ class BIMArrayProperties(PropertyGroup):
        name="Method",
        default="OFFSET",
    )
-    per_child_opening: bpy.props.BoolProperty(
-        name="Per-Child Opening",
-        description=(
-            "When the array parent fills a wall (or any voidable host), give each array child its own opening + "
-            "filling pair so the host is cut once per child. Disable to leave the host uncut by the children — "
-            "only the parent's original opening remains"
-        ),
-        default=True,
-    )
    relating_array_object: bpy.props.PointerProperty(
        type=bpy.types.Object,
        name="Copy Array Properties",
@@ -440,15 +394,13 @@ class BIMArrayProperties(PropertyGroup):
    )

    if TYPE_CHECKING:
-        is_editing: bool
-        editing_item_index: int
+        is_editing: int
        count: int
        x: float
        y: float
        z: float
        use_local_space: bool
        method: Literal["OFFSET", "DISTRIBUTE"]
-        per_child_opening: bool
        sync_children: bool
        relating_array_object: Union[bpy.types.Object, None]

@@ -1679,118 +1631,6 @@ class BIMRoofProperties(PropertyGroup):
            setattr(target_props, prop_name, prop_value)


-class BIMWallProperties(PropertyGroup):
-    """Transient draft state for parametric wall gizmo editing.
-
-    Populated from IFC on `bim.enable_editing_wall`, mutated by gizmo drags during edit
-    (preview only — no IFC writes), and either committed by `bim.finish_editing_wall`
-    or discarded by `bim.cancel_editing_wall`.
-
-    The `snap_*` fields are the values captured on enable; `finish_editing_wall` compares
-    current vs snap to skip unchanged params and guarantee a no-op session leaves the
-    IFC file byte-identical.
-    """
-
-    is_editing: bpy.props.BoolProperty(
-        default=False,
-        description="True while wall parametric edit mode is active.",
-    )
-    mesh_dirty: bpy.props.BoolProperty(
-        default=False,
-        options={"HIDDEN", "SKIP_SAVE"},
-        description=(
-            "True while the visible mesh is the preview box; cleared once the real "
-            "IFC-derived geometry is restored (on commit or cancel)."
-        ),
-    )
-    length: bpy.props.FloatProperty(
-        name="Length",
-        default=1.0,
-        min=0.01,
-        subtype="DISTANCE",
-        update=update_wall,
-        description="Wall length along its reference axis (preview value; committed on finish).",
-    )
-    height: bpy.props.FloatProperty(
-        name="Height",
-        default=3.0,
-        min=0.01,
-        subtype="DISTANCE",
-        update=update_wall,
-        description="Wall vertical height (preview value; committed on finish).",
-    )
-    x_angle: bpy.props.FloatProperty(
-        name="Slope (X Angle)",
-        default=0.0,
-        soft_min=-math.pi / 3,
-        soft_max=math.pi / 3,
-        subtype="ANGLE",
-        update=update_wall,
-        description="Slope angle: tilt of the wall's top face along +Y (preview value; committed on finish).",
-    )
-    thickness: bpy.props.FloatProperty(
-        name="Thickness",
-        default=0.2,
-        min=0.001,
-        subtype="DISTANCE",
-        description="Wall thickness captured from IFC at edit-enable; not gizmo-bound.",
-    )
-    offset: bpy.props.FloatProperty(
-        name="Offset",
-        default=0.0,
-        subtype="DISTANCE",
-        description="Layer-set offset captured from IFC at edit-enable; driven by desired_offset_baseline.",
-    )
-    desired_offset_baseline: bpy.props.EnumProperty(
-        items=[
-            ("EXTERIOR", "Exterior", "Reference axis at the exterior face"),
-            ("CENTER", "Center", "Reference axis at the wall centreline"),
-            ("INTERIOR", "Interior", "Reference axis at the interior face"),
-        ],
-        name="Desired Offset Baseline",
-        default="CENTER",
-        update=update_wall_offset_baseline,
-        description="Which face of the wall the reference axis aligns to (preview value; committed on finish).",
-    )
-    anchor_x: bpy.props.FloatProperty(
-        default=0.0,
-        subtype="DISTANCE",
-        description="Local-X of the wall's axis polyline start, so the preview box lands where the IFC mesh does.",
-    )
-
-    snap_length: bpy.props.FloatProperty(description="Snapshot of length at edit-enable; commit skips no-op writes.")
-    snap_height: bpy.props.FloatProperty(description="Snapshot of height at edit-enable; commit skips no-op writes.")
-    snap_thickness: bpy.props.FloatProperty(
-        description="Snapshot of thickness at edit-enable; commit skips no-op writes."
-    )
-    snap_offset: bpy.props.FloatProperty(description="Snapshot of offset at edit-enable; commit skips no-op writes.")
-    snap_x_angle: bpy.props.FloatProperty(
-        subtype="ANGLE",
-        description="Snapshot of x_angle at edit-enable; commit skips no-op writes.",
-    )
-    snap_offset_baseline: bpy.props.StringProperty(
-        default="",
-        description="Snapshot of desired_offset_baseline at edit-enable; commit skips no-op writes.",
-    )
-
-    if TYPE_CHECKING:
-        is_editing: bool
-        mesh_dirty: bool
-        length: float
-        height: float
-        x_angle: float
-        thickness: float
-        offset: float
-        desired_offset_baseline: Literal["EXTERIOR", "CENTER", "INTERIOR"]
-        anchor_x: float
-        snap_length: float
-        snap_height: float
-        snap_thickness: float
-        snap_offset: float
-        snap_x_angle: float
-        snap_offset_baseline: str
-
-
 class SnapMousePoint(PropertyGroup):
    x: bpy.props.FloatProperty(name="X")
    y: bpy.props.FloatProperty(name="Y")
@@ -1889,20 +1729,20 @@ def poll_sverchok_nodes(self: "BIMExternalParametricGeometryProperties", node_tr


 class BIMExternalParametricGeometryProperties(bpy.types.PropertyGroup):
-    is_editing: bpy.props.BoolProperty(
+    is_editing: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
        name="Is Editing Paramteric Geometry",
        description="Toggle editing parametric geometry.",
        default=False,
        update=update_is_editing,
    )
-    geometry_source: bpy.props.EnumProperty(
+    geometry_source: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Geometry Source",
        items=[
            ("GEONODES", "Geometry Nodes", ""),
            ("IFCSVERCHOK", "IFC Sverchok", ""),
        ],
    )
-    geo_nodes: bpy.props.PointerProperty(
+    geo_nodes: bpy.props.PointerProperty(  # pyright: ignore[reportRedeclaration]
        name="Geometry Nodes",
        description="Geometry nodes tree to use as a source for representation.",
        type=bpy.types.GeometryNodeTree,
@@ -1910,7 +1750,7 @@ class BIMExternalParametricGeometryProperties(bpy.types.PropertyGroup):
        poll=lambda self, node_tree: not node_tree.name.startswith("BBIM_EPG"),
    )

-    sverchok_nodes: bpy.props.PointerProperty(
+    sverchok_nodes: bpy.props.PointerProperty(  # pyright: ignore[reportRedeclaration]
        name="Sverchok Nodes",
        description="Sverchok node tree to use as a source for representation.",
        type=bpy.types.NodeTree,
@@ -1922,65 +1762,3 @@ class BIMExternalParametricGeometryProperties(bpy.types.PropertyGroup):
        geometry_source: Literal["GEONODES", "IFCSVERCHOK"]
        geo_nodes: Union[bpy.types.GeometryNodeTree, None]
        sverchok_nodes: Union[sverchok.node_tree.SverchCustomTree, None]
-
-
-class BIMWallFilletPreviewProperties(PropertyGroup):
-    """Scene-level pending state for the wall-fillet preview flow.
-
-    Scene-level because the fillet spans two walls and commits a third
-    (corner) wall between them. ``SKIP_SAVE`` fields throughout."""
-
-    is_active: bpy.props.BoolProperty(
-        default=False,
-        options={"SKIP_SAVE"},
-        description="True while the wall-fillet preview flow is active.",
-    )
-    wall_a_id: bpy.props.IntProperty(
-        default=0,
-        options={"SKIP_SAVE"},
-        description=(
-            "IFC element id of the active wall — the corner wall inherits its "
-            "material layer set, height, x_angle, and type."
-        ),
-    )
-    wall_b_id: bpy.props.IntProperty(
-        default=0,
-        options={"SKIP_SAVE"},
-        description="IFC element id of the other selected wall.",
-    )
-    radius: bpy.props.FloatProperty(
-        name="Radius",
-        default=0.5,
-        soft_min=-10.0,
-        soft_max=10.0,
-        subtype="DISTANCE",
-        unit="LENGTH",
-        options={"SKIP_SAVE"},
-        description="Radius of the circular arc connecting the two walls.",
-    )
-    editing_corner_id: bpy.props.IntProperty(
-        default=0,
-        options={"SKIP_SAVE"},
-        description=(
-            "IFC element id of an existing fillet corner being re-edited "
-            "(non-zero only on the pen-icon re-edit flow). The create "
-            "operator deletes this corner + its connections before recreating "
-            "with the new radius."
-        ),
-    )
-
-    if TYPE_CHECKING:
-        is_active: bool
-        wall_a_id: int
-        wall_b_id: int
-        radius: float
-        editing_corner_id: int
-
-
-class BIMPreviewProperties(PropertyGroup):
-    """Umbrella for parametric-edit preview drafts attached to ``Scene``."""
-
-    wall_fillet: bpy.props.PointerProperty(type=BIMWallFilletPreviewProperties)
-
-    if TYPE_CHECKING:
-        wall_fillet: BIMWallFilletPreviewProperties
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .8.6
 .8.5