Sync version numbers across all package files

Update Cargo.toml and tauri.conf.json to version 0.1.2 to match package.json

.claude-session.json

@@ -1,9 +0,0 @@
-{
-  "lastUpdated": "2025-10-16T00:00:00.000Z",
-  "todos": [],
-  "context": {
-    "description": "Session context file for Claude Code. This file is automatically updated to persist state across sessions.",
-    "currentFocus": null,
-    "notes": []
-  }
-}

.github/workflows/build.yml

@@ -0,0 +1,228 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+    tags-ignore:
+      - '**'
+  pull_request:
+    branches:
+      - main
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build-desktop:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: 'macos-latest'
+            args: '--target aarch64-apple-darwin'
+          - platform: 'macos-latest'
+            args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-22.04'
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: Install dependencies (Ubuntu)
+        if: matrix.platform == 'ubuntu-22.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Setup Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - name: Install frontend dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build Tauri app
+        uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: ${{ matrix.args }}
+
+      - name: Upload artifacts (macOS)
+        if: matrix.platform == 'macos-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-${{ contains(matrix.args, 'aarch64') && 'aarch64' || 'x86_64' }}
+          path: |
+            src-tauri/target/*/release/bundle/dmg/*.dmg
+            src-tauri/target/*/release/bundle/macos/*.app
+
+      - name: Upload artifacts (Ubuntu)
+        if: matrix.platform == 'ubuntu-22.04'
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux
+          path: |
+            src-tauri/target/release/bundle/deb/*.deb
+            src-tauri/target/release/bundle/appimage/*.AppImage
+            src-tauri/target/release/bundle/rpm/*.rpm
+
+      - name: Upload artifacts (Windows)
+        if: matrix.platform == 'windows-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows
+          path: |
+            src-tauri/target/release/bundle/msi/*.msi
+            src-tauri/target/release/bundle/nsis/*.exe
+
+  build-android:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Rust Android targets
+        run: |
+          rustup target add aarch64-linux-android
+          rustup target add armv7-linux-androideabi
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
+
+      - name: Setup NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r26d
+        id: setup-ndk
+
+      - name: Setup Android NDK environment for OpenSSL
+        run: |
+          echo "ANDROID_NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
+          echo "NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
+
+          # Add all Android toolchains to PATH for OpenSSL cross-compilation
+          echo "${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin" >> $GITHUB_PATH
+
+          # Set CC, AR, RANLIB for each target
+          echo "CC_aarch64_linux_android=aarch64-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_aarch64_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_aarch64_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_armv7_linux_androideabi=armv7a-linux-androideabi24-clang" >> $GITHUB_ENV
+          echo "AR_armv7_linux_androideabi=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_armv7_linux_androideabi=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_i686_linux_android=i686-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_i686_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_i686_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_x86_64_linux_android=x86_64-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_x86_64_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_x86_64_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+      - name: Install build dependencies for OpenSSL
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y perl make
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Setup Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - name: Install frontend dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Setup Keystore (if secrets available)
+        env:
+          ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }}
+          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
+        run: |
+          if [ -n "$ANDROID_KEYSTORE" ]; then
+            echo "$ANDROID_KEYSTORE" | base64 -d > $HOME/keystore.jks
+            echo "ANDROID_KEYSTORE_PATH=$HOME/keystore.jks" >> $GITHUB_ENV
+            echo "ANDROID_KEYSTORE_PASSWORD=$ANDROID_KEYSTORE_PASSWORD" >> $GITHUB_ENV
+            echo "ANDROID_KEY_ALIAS=$ANDROID_KEY_ALIAS" >> $GITHUB_ENV
+            echo "ANDROID_KEY_PASSWORD=$ANDROID_KEY_PASSWORD" >> $GITHUB_ENV
+            echo "Keystore configured for signing"
+          else
+            echo "No keystore configured, building unsigned APK"
+          fi
+
+      - name: Build Android APK and AAB (unsigned if no keystore)
+        run: pnpm tauri android build
+
+      - name: Upload Android artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: android
+          path: |
+            src-tauri/gen/android/app/build/outputs/apk/**/*.apk
+            src-tauri/gen/android/app/build/outputs/bundle/**/*.aab

.github/workflows/release.yml

@@ -0,0 +1,251 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+jobs:
+  create-release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-22.04
+    outputs:
+      release_id: ${{ steps.create-release.outputs.release_id }}
+      upload_url: ${{ steps.create-release.outputs.upload_url }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Get version
+        run: echo "PACKAGE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+
+      - name: Create release
+        id: create-release
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { data } = await github.rest.repos.createRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              tag_name: `v${process.env.PACKAGE_VERSION}`,
+              name: `haex-hub v${process.env.PACKAGE_VERSION}`,
+              body: 'Take a look at the assets to download and install this app.',
+              draft: true,
+              prerelease: false
+            })
+            core.setOutput('release_id', data.id)
+            core.setOutput('upload_url', data.upload_url)
+            return data.id
+
+  build-desktop:
+    needs: create-release
+    permissions:
+      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: 'macos-latest'
+            args: '--target aarch64-apple-darwin'
+          - platform: 'macos-latest'
+            args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-22.04'
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: Install dependencies (Ubuntu)
+        if: matrix.platform == 'ubuntu-22.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Setup Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - name: Install frontend dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build and release Tauri app
+        uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          releaseId: ${{ needs.create-release.outputs.release_id }}
+          args: ${{ matrix.args }}
+
+  build-android:
+    needs: create-release
+    permissions:
+      contents: write
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Rust Android targets
+        run: |
+          rustup target add aarch64-linux-android
+          rustup target add armv7-linux-androideabi
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
+
+      - name: Setup NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r26d
+        id: setup-ndk
+
+      - name: Setup Android NDK environment for OpenSSL
+        run: |
+          echo "ANDROID_NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
+          echo "NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
+
+          # Add all Android toolchains to PATH for OpenSSL cross-compilation
+          echo "${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin" >> $GITHUB_PATH
+
+          # Set CC, AR, RANLIB for each target
+          echo "CC_aarch64_linux_android=aarch64-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_aarch64_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_aarch64_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_armv7_linux_androideabi=armv7a-linux-androideabi24-clang" >> $GITHUB_ENV
+          echo "AR_armv7_linux_androideabi=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_armv7_linux_androideabi=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_i686_linux_android=i686-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_i686_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_i686_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_x86_64_linux_android=x86_64-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_x86_64_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_x86_64_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+      - name: Install build dependencies for OpenSSL
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y perl make
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Setup Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - name: Install frontend dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Setup Keystore (required for release)
+        run: |
+          echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 -d > $HOME/keystore.jks
+          echo "ANDROID_KEYSTORE_PATH=$HOME/keystore.jks" >> $GITHUB_ENV
+          echo "ANDROID_KEYSTORE_PASSWORD=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" >> $GITHUB_ENV
+          echo "ANDROID_KEY_ALIAS=${{ secrets.ANDROID_KEY_ALIAS }}" >> $GITHUB_ENV
+          echo "ANDROID_KEY_PASSWORD=${{ secrets.ANDROID_KEY_PASSWORD }}" >> $GITHUB_ENV
+
+      - name: Build Android APK and AAB (signed)
+        run: pnpm tauri android build
+
+      - name: Upload Android artifacts to Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload ${{ github.ref_name }} \
+            src-tauri/gen/android/app/build/outputs/apk/universal/release/app-universal-release.apk \
+            src-tauri/gen/android/app/build/outputs/bundle/universalRelease/app-universal-release.aab \
+            --clobber
+
+  publish-release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-22.04
+    needs: [create-release, build-desktop, build-android]
+
+    steps:
+      - name: Publish release
+        id: publish-release
+        uses: actions/github-script@v7
+        env:
+          release_id: ${{ needs.create-release.outputs.release_id }}
+        with:
+          script: |
+            github.rest.repos.updateRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: process.env.release_id,
+              draft: false,
+              prerelease: false
+            })

.gitignore

@@ -27,3 +27,5 @@ src-tauri/target
 nogit*
 .claude
 .output
+target
+CLAUDE.md

nuxt.config.ts

@@ -1,5 +1,3 @@
-//import tailwindcss from '@tailwindcss/vite'
-
 import { fileURLToPath } from 'node:url'
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
@@ -16,6 +14,9 @@ export default defineNuxtConfig({
   },
 
   app: {
+    head: {
+      viewport: 'width=device-width, initial-scale=1.0, viewport-fit=cover',
+    },
     pageTransition: {
       name: 'fade',
     },
@@ -28,7 +29,6 @@ export default defineNuxtConfig({
     '@vueuse/nuxt',
     '@nuxt/icon',
     '@nuxt/eslint',
-    //"@nuxt/image",
     '@nuxt/fonts',
     '@nuxt/ui',
   ],
@@ -41,6 +41,20 @@ export default defineNuxtConfig({
       'pages/**',
       'types/**',
     ],
+    presets: [
+      {
+        from: '@vueuse/gesture',
+        imports: [
+          'useDrag',
+          'useGesture',
+          'useHover',
+          'useMove',
+          'usePinch',
+          'useScroll',
+          'useWheel',
+        ],
+      },
+    ],
   },
 
   css: ['./assets/css/main.css'],
@@ -94,8 +108,7 @@ export default defineNuxtConfig({
   runtimeConfig: {
     public: {
       haexVault: {
-        lastVaultFileName: 'lastVaults.json',
+        deviceFileName: 'device.json',
-        instanceFileName: 'instance.json',
         defaultVaultName: 'HaexHub',
       },
     },
@@ -109,7 +122,6 @@ export default defineNuxtConfig({
   },
 
   vite: {
-    //plugins: [tailwindcss()],
     // Better support for Tauri CLI output
     clearScreen: false,
     // Enable environment variables

package.json

@@ -1,7 +1,7 @@
 {
   "name": "haex-hub",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "scripts": {
     "build": "nuxt build",
@@ -21,46 +21,47 @@
     "@nuxt/eslint": "1.9.0",
     "@nuxt/fonts": "0.11.4",
     "@nuxt/icon": "2.0.0",
-    "@nuxt/ui": "4.0.0",
+    "@nuxt/ui": "4.1.0",
     "@nuxtjs/i18n": "10.0.6",
-    "@pinia/nuxt": "^0.11.1",
+    "@pinia/nuxt": "^0.11.2",
-    "@tailwindcss/vite": "^4.1.10",
+    "@tailwindcss/vite": "^4.1.16",
-    "@tauri-apps/api": "^2.5.0",
+    "@tauri-apps/api": "^2.9.0",
-    "@tauri-apps/plugin-dialog": "^2.2.2",
+    "@tauri-apps/plugin-dialog": "^2.4.2",
-    "@tauri-apps/plugin-fs": "^2.3.0",
+    "@tauri-apps/plugin-fs": "^2.4.4",
-    "@tauri-apps/plugin-http": "2.5.2",
     "@tauri-apps/plugin-notification": "2.3.1",
-    "@tauri-apps/plugin-opener": "^2.3.0",
+    "@tauri-apps/plugin-opener": "^2.5.2",
-    "@tauri-apps/plugin-os": "^2.2.2",
+    "@tauri-apps/plugin-os": "^2.3.2",
-    "@tauri-apps/plugin-sql": "2.3.0",
+    "@tauri-apps/plugin-store": "^2.4.1",
-    "@tauri-apps/plugin-store": "^2.2.1",
     "@vueuse/components": "^13.9.0",
-    "@vueuse/core": "^13.4.0",
+    "@vueuse/core": "^13.9.0",
-    "@vueuse/nuxt": "^13.4.0",
+    "@vueuse/gesture": "^2.0.0",
-    "drizzle-orm": "^0.44.2",
+    "@vueuse/nuxt": "^13.9.0",
-    "eslint": "^9.34.0",
+    "drizzle-orm": "^0.44.7",
-    "fuse.js": "^7.1.0",
+    "eslint": "^9.38.0",
-    "nuxt": "^4.0.3",
+    "nuxt-zod-i18n": "^1.12.1",
-    "nuxt-zod-i18n": "^1.12.0",
+    "swiper": "^12.0.3",
-    "tailwindcss": "^4.1.10",
+    "tailwindcss": "^4.1.16",
-    "vue": "^3.5.20",
+    "vue": "^3.5.22",
-    "vue-router": "^4.5.1",
+    "vue-router": "^4.6.3",
-    "zod": "4.1.5"
+    "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@iconify/json": "^2.2.351",
+    "@iconify-json/hugeicons": "^1.2.17",
+    "@iconify-json/lucide": "^1.2.71",
+    "@iconify/json": "^2.2.401",
     "@iconify/tailwind4": "^1.0.6",
     "@libsql/client": "^0.15.15",
-    "@tauri-apps/cli": "^2.5.0",
+    "@tauri-apps/cli": "^2.9.1",
-    "@types/node": "^24.6.2",
+    "@types/node": "^24.9.1",
     "@vitejs/plugin-vue": "6.0.1",
-    "@vue/compiler-sfc": "^3.5.17",
+    "@vue/compiler-sfc": "^3.5.22",
-    "drizzle-kit": "^0.31.2",
+    "drizzle-kit": "^0.31.5",
-    "globals": "^16.2.0",
+    "globals": "^16.4.0",
+    "nuxt": "^4.2.0",
     "prettier": "3.6.2",
     "tsx": "^4.20.6",
-    "tw-animate-css": "^1.3.8",
+    "tw-animate-css": "^1.4.0",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.3",
     "vite": "7.1.3",
     "vue-tsc": "3.0.6"
   },

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "haex-hub"
-version = "0.1.0"
+version = "0.1.2"
 description = "A Tauri App"
 authors = ["you"]
 edition = "2021"
@@ -20,14 +20,7 @@ tauri-build = { version = "2.2", features = [] }
 serde = { version = "1.0.228", features = ["derive"] }
 
 [dependencies]
-rusqlite = { version = "0.37.0", features = [
+tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] }
-    "load_extension",
-    "bundled-sqlcipher-vendored-openssl",
-    "functions",
-] }
-
-#tauri-plugin-sql = { version = "2", features = ["sqlite"] }tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] }#libsqlite3-sys = { version = "0.31", features = ["bundled-sqlcipher"] }
-#sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "sqlite"] }
 base64 = "0.22"
 ed25519-dalek = "2.1"
 fs_extra = "1.3.0"
@@ -39,18 +32,25 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1.0.143"
 sha2 = "0.10.9"
 sqlparser = { version = "0.59.0", features = ["visitor"] }
-tauri = { version = "2.8.5", features = ["protocol-asset", "devtools"] }
+tauri = { version = "2.9.1", features = ["protocol-asset", "devtools"] }
-tauri-plugin-dialog = "2.4.0"
+tauri-plugin-dialog = "2.4.2"
 tauri-plugin-fs = "2.4.0"
-tauri-plugin-http = "2.5.2"
+tauri-plugin-http = "2.5.4"
-tauri-plugin-notification = "2.3.1"
+tauri-plugin-notification = "2.3.3"
-tauri-plugin-opener = "2.5.0"
+tauri-plugin-opener = "2.5.2"
-tauri-plugin-os = "2.3"
+tauri-plugin-os = "2.3.2"
-tauri-plugin-persisted-scope = "2.3.2"
+tauri-plugin-persisted-scope = "2.3.4"
-tauri-plugin-store = "2.4.0"
+tauri-plugin-store = "2.4.1"
 thiserror = "2.0.17"
 ts-rs = { version = "11.1.0", features = ["serde-compat"] }
 uhlc = "0.8.2"
+url = "2.5.7"
 uuid = { version = "1.18.1", features = ["v4"] }
 zip = "6.0.0"
-url = "2.5.7"
+
+[target.'cfg(not(target_os = "android"))'.dependencies]
+trash = "5.2.0"
+rusqlite = { version = "0.37.0", features = ["load_extension", "bundled-sqlcipher-vendored-openssl", "functions"] }
+
+[target.'cfg(target_os = "android")'.dependencies]
+rusqlite = { version = "0.37.0", features = ["load_extension", "bundled-sqlcipher-vendored-openssl", "functions"] }

src-tauri/bindings/ExtensionInfoResponse.ts

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ExtensionInfoResponse = { id: string, publicKey: string, name: string, version: string, author: string | null, enabled: boolean, description: string | null, homepage: string | null, icon: string | null, devServerUrl: string | null, };
+export type ExtensionInfoResponse = { id: string, publicKey: string, name: string, version: string, author: string | null, enabled: boolean, description: string | null, homepage: string | null, icon: string | null, entry: string | null, singleInstance: boolean | null, devServerUrl: string | null, };

src-tauri/bindings/ExtensionManifest.ts

@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ExtensionPermissions } from "./ExtensionPermissions";
 
-export type ExtensionManifest = { name: string, version: string, author: string | null, entry: string, icon: string | null, public_key: string, signature: string, permissions: ExtensionPermissions, homepage: string | null, description: string | null, };
+export type ExtensionManifest = { name: string, version: string, author: string | null, entry: string | null, icon: string | null, public_key: string, signature: string, permissions: ExtensionPermissions, homepage: string | null, description: string | null, single_instance: boolean | null, };

src-tauri/database/generate-rust-types.ts

@@ -170,6 +170,14 @@ use serde::{Deserialize, Serialize};
       table: schema.haexCrdtSnapshots,
     },
     { name: tablesNames.haex.crdt.configs.name, table: schema.haexCrdtConfigs },
+    {
+      name: tablesNames.haex.desktop_items.name,
+      table: schema.haexDesktopItems,
+    },
+    {
+      name: tablesNames.haex.workspaces.name,
+      table: schema.haexWorkspaces,
+    },
   ]
 
   for (const { name, table } of schemas) {

src-tauri/database/index.ts

@@ -19,5 +19,3 @@ const dummyExecutor = async (
 // Erstelle die Drizzle-Instanz für den SQLite-Dialekt
 // Übergib den dummyExecutor und das importierte Schema
 export const db = drizzle(dummyExecutor, { schema })
-
-// Exportiere auch alle Schema-Definitionen weiter, damit man alles aus einer Datei importieren kann

src-tauri/database/migrations/0000_dashing_night_nurse.sql

@@ -24,9 +24,23 @@ CREATE TABLE `haex_crdt_snapshots` (
 	`file_size_bytes` integer
 );
 --> statement-breakpoint
+CREATE TABLE `haex_desktop_items` (
+	`id` text PRIMARY KEY NOT NULL,
+	`workspace_id` text NOT NULL,
+	`item_type` text NOT NULL,
+	`extension_id` text,
+	`system_window_id` text,
+	`position_x` integer DEFAULT 0 NOT NULL,
+	`position_y` integer DEFAULT 0 NOT NULL,
+	`haex_timestamp` text,
+	FOREIGN KEY (`workspace_id`) REFERENCES `haex_workspaces`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`extension_id`) REFERENCES `haex_extensions`(`id`) ON UPDATE no action ON DELETE cascade,
+	CONSTRAINT "item_reference" CHECK(("haex_desktop_items"."item_type" = 'extension' AND "haex_desktop_items"."extension_id" IS NOT NULL AND "haex_desktop_items"."system_window_id" IS NULL) OR ("haex_desktop_items"."item_type" = 'system' AND "haex_desktop_items"."system_window_id" IS NOT NULL AND "haex_desktop_items"."extension_id" IS NULL) OR ("haex_desktop_items"."item_type" = 'file' AND "haex_desktop_items"."system_window_id" IS NOT NULL AND "haex_desktop_items"."extension_id" IS NULL) OR ("haex_desktop_items"."item_type" = 'folder' AND "haex_desktop_items"."system_window_id" IS NOT NULL AND "haex_desktop_items"."extension_id" IS NULL))
+);
+--> statement-breakpoint
 CREATE TABLE `haex_extension_permissions` (
 	`id` text PRIMARY KEY NOT NULL,
-	`extension_id` text,
+	`extension_id` text NOT NULL,
 	`resource_type` text,
 	`action` text,
 	`target` text,
@@ -34,38 +48,28 @@ CREATE TABLE `haex_extension_permissions` (
 	`status` text DEFAULT 'denied' NOT NULL,
 	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
 	`updated_at` integer,
-	`haex_tombstone` integer,
 	`haex_timestamp` text,
-	FOREIGN KEY (`extension_id`) REFERENCES `haex_extensions`(`id`) ON UPDATE no action ON DELETE no action
+	FOREIGN KEY (`extension_id`) REFERENCES `haex_extensions`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE UNIQUE INDEX `haex_extension_permissions_extension_id_resource_type_action_target_unique` ON `haex_extension_permissions` (`extension_id`,`resource_type`,`action`,`target`);--> statement-breakpoint
 CREATE TABLE `haex_extensions` (
 	`id` text PRIMARY KEY NOT NULL,
+	`public_key` text NOT NULL,
+	`name` text NOT NULL,
+	`version` text NOT NULL,
 	`author` text,
 	`description` text,
-	`entry` text,
+	`entry` text DEFAULT 'index.html',
 	`homepage` text,
-	`enabled` integer,
+	`enabled` integer DEFAULT true,
 	`icon` text,
-	`name` text,
+	`signature` text NOT NULL,
-	`public_key` text,
+	`single_instance` integer DEFAULT false,
-	`signature` text,
-	`url` text,
-	`version` text,
-	`haex_tombstone` integer,
-	`haex_timestamp` text
-);
---> statement-breakpoint
-CREATE TABLE `haex_settings` (
-	`id` text PRIMARY KEY NOT NULL,
-	`key` text,
-	`type` text,
-	`value` text,
-	`haex_tombstone` integer,
 	`haex_timestamp` text
 );
 --> statement-breakpoint
+CREATE UNIQUE INDEX `haex_extensions_public_key_name_unique` ON `haex_extensions` (`public_key`,`name`);--> statement-breakpoint
 CREATE TABLE `haex_notifications` (
 	`id` text PRIMARY KEY NOT NULL,
 	`alt` text,
@@ -77,63 +81,24 @@ CREATE TABLE `haex_notifications` (
 	`text` text,
 	`title` text,
 	`type` text NOT NULL,
-	`haex_tombstone` integer
+	`haex_timestamp` text
 );
 --> statement-breakpoint
-CREATE TABLE `haex_passwords_group_items` (
+CREATE TABLE `haex_settings` (
-	`group_id` text,
-	`item_id` text,
-	`haex_tombstone` integer,
-	PRIMARY KEY(`item_id`, `group_id`),
-	FOREIGN KEY (`group_id`) REFERENCES `haex_passwords_groups`(`id`) ON UPDATE no action ON DELETE no action,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE no action
-);
---> statement-breakpoint
-CREATE TABLE `haex_passwords_groups` (
 	`id` text PRIMARY KEY NOT NULL,
-	`name` text,
-	`description` text,
-	`icon` text,
-	`order` integer,
-	`color` text,
-	`parent_id` text,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`updated_at` integer,
-	`haex_tombstone` integer,
-	FOREIGN KEY (`parent_id`) REFERENCES `haex_passwords_groups`(`id`) ON UPDATE no action ON DELETE no action
-);
---> statement-breakpoint
-CREATE TABLE `haex_passwords_item_details` (
-	`id` text PRIMARY KEY NOT NULL,
-	`title` text,
-	`username` text,
-	`password` text,
-	`note` text,
-	`icon` text,
-	`tags` text,
-	`url` text,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`updated_at` integer,
-	`haex_tombstone` integer
-);
---> statement-breakpoint
-CREATE TABLE `haex_passwords_item_history` (
-	`id` text PRIMARY KEY NOT NULL,
-	`item_id` text,
-	`changed_property` text,
-	`old_value` text,
-	`new_value` text,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`haex_tombstone` integer,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE no action
-);
---> statement-breakpoint
-CREATE TABLE `haex_passwords_item_key_values` (
-	`id` text PRIMARY KEY NOT NULL,
-	`item_id` text,
 	`key` text,
+	`type` text,
 	`value` text,
-	`updated_at` integer,
+	`haex_timestamp` text
-	`haex_tombstone` integer,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE no action
 );
+--> statement-breakpoint
+CREATE UNIQUE INDEX `haex_settings_key_type_value_unique` ON `haex_settings` (`key`,`type`,`value`);--> statement-breakpoint
+CREATE TABLE `haex_workspaces` (
+	`id` text PRIMARY KEY NOT NULL,
+	`device_id` text NOT NULL,
+	`name` text NOT NULL,
+	`position` integer DEFAULT 0 NOT NULL,
+	`haex_timestamp` text
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `haex_workspaces_position_unique` ON `haex_workspaces` (`position`);

src-tauri/database/migrations/0001_green_stark_industries.sql

@@ -1 +0,0 @@
-ALTER TABLE `haex_notifications` ADD `haex_timestamp` text;

src-tauri/database/migrations/0002_amazing_iron_fist.sql

@@ -1,22 +0,0 @@
-PRAGMA foreign_keys=OFF;--> statement-breakpoint
-CREATE TABLE `__new_haex_extensions` (
-	`id` text PRIMARY KEY NOT NULL,
-	`public_key` text NOT NULL,
-	`name` text NOT NULL,
-	`version` text NOT NULL,
-	`author` text,
-	`description` text,
-	`entry` text DEFAULT 'index.html' NOT NULL,
-	`homepage` text,
-	`enabled` integer DEFAULT true,
-	`icon` text,
-	`signature` text NOT NULL,
-	`haex_tombstone` integer,
-	`haex_timestamp` text
-);
---> statement-breakpoint
-INSERT INTO `__new_haex_extensions`("id", "public_key", "name", "version", "author", "description", "entry", "homepage", "enabled", "icon", "signature", "haex_tombstone", "haex_timestamp") SELECT "id", "public_key", "name", "version", "author", "description", "entry", "homepage", "enabled", "icon", "signature", "haex_tombstone", "haex_timestamp" FROM `haex_extensions`;--> statement-breakpoint
-DROP TABLE `haex_extensions`;--> statement-breakpoint
-ALTER TABLE `__new_haex_extensions` RENAME TO `haex_extensions`;--> statement-breakpoint
-PRAGMA foreign_keys=ON;--> statement-breakpoint
-CREATE UNIQUE INDEX `haex_extensions_public_key_name_unique` ON `haex_extensions` (`public_key`,`name`);

src-tauri/database/migrations/0003_daily_polaris.sql

@@ -1,9 +0,0 @@
-CREATE TABLE `haex_desktop_items` (
-	`id` text PRIMARY KEY NOT NULL,
-	`item_type` text NOT NULL,
-	`reference_id` text NOT NULL,
-	`position_x` integer DEFAULT 0 NOT NULL,
-	`position_y` integer DEFAULT 0 NOT NULL,
-	`haex_tombstone` integer,
-	`haex_timestamp` text
-);

src-tauri/database/migrations/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "3bbe52b8-5933-4b21-8b24-de3927a2f9b0",
+  "id": "8dc25226-70f9-4d2e-89d4-f3a6b2bdf58d",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "haex_crdt_configs": {
@@ -155,6 +155,106 @@
       "uniqueConstraints": {},
       "checkConstraints": {}
     },
+    "haex_desktop_items": {
+      "name": "haex_desktop_items",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "item_type": {
+          "name": "item_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "extension_id": {
+          "name": "extension_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "system_window_id": {
+          "name": "system_window_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "position_x": {
+          "name": "position_x",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "position_y": {
+          "name": "position_y",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "haex_timestamp": {
+          "name": "haex_timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "haex_desktop_items_workspace_id_haex_workspaces_id_fk": {
+          "name": "haex_desktop_items_workspace_id_haex_workspaces_id_fk",
+          "tableFrom": "haex_desktop_items",
+          "tableTo": "haex_workspaces",
+          "columnsFrom": [
+            "workspace_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "haex_desktop_items_extension_id_haex_extensions_id_fk": {
+          "name": "haex_desktop_items_extension_id_haex_extensions_id_fk",
+          "tableFrom": "haex_desktop_items",
+          "tableTo": "haex_extensions",
+          "columnsFrom": [
+            "extension_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "item_reference": {
+          "name": "item_reference",
+          "value": "(\"haex_desktop_items\".\"item_type\" = 'extension' AND \"haex_desktop_items\".\"extension_id\" IS NOT NULL AND \"haex_desktop_items\".\"system_window_id\" IS NULL) OR (\"haex_desktop_items\".\"item_type\" = 'system' AND \"haex_desktop_items\".\"system_window_id\" IS NOT NULL AND \"haex_desktop_items\".\"extension_id\" IS NULL) OR (\"haex_desktop_items\".\"item_type\" = 'file' AND \"haex_desktop_items\".\"system_window_id\" IS NOT NULL AND \"haex_desktop_items\".\"extension_id\" IS NULL) OR (\"haex_desktop_items\".\"item_type\" = 'folder' AND \"haex_desktop_items\".\"system_window_id\" IS NOT NULL AND \"haex_desktop_items\".\"extension_id\" IS NULL)"
+        }
+      }
+    },
     "haex_extension_permissions": {
       "name": "haex_extension_permissions",
       "columns": {
@@ -169,7 +269,7 @@
           "name": "extension_id",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "resource_type": {
@@ -223,13 +323,6 @@
           "notNull": false,
           "autoincrement": false
         },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
         "haex_timestamp": {
           "name": "haex_timestamp",
           "type": "text",
@@ -261,7 +354,7 @@
           "columnsTo": [
             "id"
           ],
-          "onDelete": "no action",
+          "onDelete": "cascade",
           "onUpdate": "no action"
         }
       },
@@ -279,6 +372,27 @@
           "notNull": true,
           "autoincrement": false
         },
+        "public_key": {
+          "name": "public_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "author": {
           "name": "author",
           "type": "text",
@@ -298,7 +412,8 @@
           "type": "text",
           "primaryKey": false,
           "notNull": false,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": "'index.html'"
         },
         "homepage": {
           "name": "homepage",
@@ -312,7 +427,8 @@
           "type": "integer",
           "primaryKey": false,
           "notNull": false,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": true
         },
         "icon": {
           "name": "icon",
@@ -321,99 +437,20 @@
           "notNull": false,
           "autoincrement": false
         },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
         "signature": {
           "name": "signature",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_settings": {
-      "name": "haex_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
           "notNull": true,
           "autoincrement": false
         },
-        "key": {
+        "single_instance": {
-          "name": "key",
+          "name": "single_instance",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
           "type": "integer",
           "primaryKey": false,
           "notNull": false,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": false
         },
         "haex_timestamp": {
           "name": "haex_timestamp",
@@ -423,7 +460,16 @@
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "haex_extensions_public_key_name_unique": {
+          "name": "haex_extensions_public_key_name_unique",
+          "columns": [
+            "public_key",
+            "name"
+          ],
+          "isUnique": true
+        }
+      },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
       "uniqueConstraints": {},
@@ -502,9 +548,9 @@
           "notNull": true,
           "autoincrement": false
         },
-        "haex_tombstone": {
+        "haex_timestamp": {
-          "name": "haex_tombstone",
+          "name": "haex_timestamp",
-          "type": "integer",
+          "type": "text",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
@@ -516,74 +562,8 @@
       "uniqueConstraints": {},
       "checkConstraints": {}
     },
-    "haex_passwords_group_items": {
+    "haex_settings": {
-      "name": "haex_passwords_group_items",
+      "name": "haex_settings",
-      "columns": {
-        "group_id": {
-          "name": "group_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "group_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "haex_passwords_group_items_item_id_group_id_pk": {
-          "columns": [
-            "item_id",
-            "group_id"
-          ],
-          "name": "haex_passwords_group_items_item_id_group_id_pk"
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_groups": {
-      "name": "haex_passwords_groups",
       "columns": {
         "id": {
           "name": "id",
@@ -592,270 +572,6 @@
           "notNull": true,
           "autoincrement": false
         },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_groups",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "parent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_details": {
-      "name": "haex_passwords_item_details",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "note": {
-          "name": "note",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tags": {
-          "name": "tags",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_history": {
-      "name": "haex_passwords_item_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "changed_property": {
-          "name": "changed_property",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_history",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_key_values": {
-      "name": "haex_passwords_item_key_values",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
         "key": {
           "name": "key",
           "type": "text",
@@ -863,6 +579,13 @@
           "notNull": false,
           "autoincrement": false
         },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
         "value": {
           "name": "value",
           "type": "text",
@@ -870,37 +593,80 @@
           "notNull": false,
           "autoincrement": false
         },
-        "updated_at": {
+        "haex_timestamp": {
-          "name": "updated_at",
+          "name": "haex_timestamp",
-          "type": "integer",
+          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
-      "foreignKeys": {
+        "haex_settings_key_type_value_unique": {
-        "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk": {
+          "name": "haex_settings_key_type_value_unique",
-          "name": "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk",
+          "columns": [
-          "tableFrom": "haex_passwords_item_key_values",
+            "key",
-          "tableTo": "haex_passwords_item_details",
+            "type",
-          "columnsFrom": [
+            "value"
-            "item_id"
           ],
-          "columnsTo": [
+          "isUnique": true
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
         }
       },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "haex_workspaces": {
+      "name": "haex_workspaces",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "device_id": {
+          "name": "device_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "position": {
+          "name": "position",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "haex_timestamp": {
+          "name": "haex_timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "haex_workspaces_position_unique": {
+          "name": "haex_workspaces_position_unique",
+          "columns": [
+            "position"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {},
       "uniqueConstraints": {},
       "checkConstraints": {}

src-tauri/database/migrations/meta/0001_snapshot.json

@@ -1,926 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "862ac1d5-3065-4244-8652-2b6782254862",
-  "prevId": "3bbe52b8-5933-4b21-8b24-de3927a2f9b0",
-  "tables": {
-    "haex_crdt_configs": {
-      "name": "haex_crdt_configs",
-      "columns": {
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_logs": {
-      "name": "haex_crdt_logs",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "table_name": {
-          "name": "table_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "row_pks": {
-          "name": "row_pks",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "op_type": {
-          "name": "op_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "column_name": {
-          "name": "column_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_haex_timestamp": {
-          "name": "idx_haex_timestamp",
-          "columns": [
-            "haex_timestamp"
-          ],
-          "isUnique": false
-        },
-        "idx_table_row": {
-          "name": "idx_table_row",
-          "columns": [
-            "table_name",
-            "row_pks"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_snapshots": {
-      "name": "haex_crdt_snapshots",
-      "columns": {
-        "snapshot_id": {
-          "name": "snapshot_id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created": {
-          "name": "created",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "epoch_hlc": {
-          "name": "epoch_hlc",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "location_url": {
-          "name": "location_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "file_size_bytes": {
-          "name": "file_size_bytes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extension_permissions": {
-      "name": "haex_extension_permissions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "extension_id": {
-          "name": "extension_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "resource_type": {
-          "name": "resource_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "action": {
-          "name": "action",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "target": {
-          "name": "target",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "constraints": {
-          "name": "constraints",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'denied'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extension_permissions_extension_id_resource_type_action_target_unique": {
-          "name": "haex_extension_permissions_extension_id_resource_type_action_target_unique",
-          "columns": [
-            "extension_id",
-            "resource_type",
-            "action",
-            "target"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "haex_extension_permissions_extension_id_haex_extensions_id_fk": {
-          "name": "haex_extension_permissions_extension_id_haex_extensions_id_fk",
-          "tableFrom": "haex_extension_permissions",
-          "tableTo": "haex_extensions",
-          "columnsFrom": [
-            "extension_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extensions": {
-      "name": "haex_extensions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author": {
-          "name": "author",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "entry": {
-          "name": "entry",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "homepage": {
-          "name": "homepage",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "signature": {
-          "name": "signature",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_notifications": {
-      "name": "haex_notifications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "alt": {
-          "name": "alt",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "date": {
-          "name": "date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "image": {
-          "name": "image",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "read": {
-          "name": "read",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "text": {
-          "name": "text",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_settings": {
-      "name": "haex_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_group_items": {
-      "name": "haex_passwords_group_items",
-      "columns": {
-        "group_id": {
-          "name": "group_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "group_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "haex_passwords_group_items_item_id_group_id_pk": {
-          "columns": [
-            "item_id",
-            "group_id"
-          ],
-          "name": "haex_passwords_group_items_item_id_group_id_pk"
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_groups": {
-      "name": "haex_passwords_groups",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_groups",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "parent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_details": {
-      "name": "haex_passwords_item_details",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "note": {
-          "name": "note",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tags": {
-          "name": "tags",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_history": {
-      "name": "haex_passwords_item_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "changed_property": {
-          "name": "changed_property",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_history",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_key_values": {
-      "name": "haex_passwords_item_key_values",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_key_values",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

src-tauri/database/migrations/meta/0002_snapshot.json

@@ -1,930 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "5387568f-75b3-4a85-86c5-67f539c3fedf",
-  "prevId": "862ac1d5-3065-4244-8652-2b6782254862",
-  "tables": {
-    "haex_crdt_configs": {
-      "name": "haex_crdt_configs",
-      "columns": {
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_logs": {
-      "name": "haex_crdt_logs",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "table_name": {
-          "name": "table_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "row_pks": {
-          "name": "row_pks",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "op_type": {
-          "name": "op_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "column_name": {
-          "name": "column_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_haex_timestamp": {
-          "name": "idx_haex_timestamp",
-          "columns": [
-            "haex_timestamp"
-          ],
-          "isUnique": false
-        },
-        "idx_table_row": {
-          "name": "idx_table_row",
-          "columns": [
-            "table_name",
-            "row_pks"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_snapshots": {
-      "name": "haex_crdt_snapshots",
-      "columns": {
-        "snapshot_id": {
-          "name": "snapshot_id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created": {
-          "name": "created",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "epoch_hlc": {
-          "name": "epoch_hlc",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "location_url": {
-          "name": "location_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "file_size_bytes": {
-          "name": "file_size_bytes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extension_permissions": {
-      "name": "haex_extension_permissions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "extension_id": {
-          "name": "extension_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "resource_type": {
-          "name": "resource_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "action": {
-          "name": "action",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "target": {
-          "name": "target",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "constraints": {
-          "name": "constraints",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'denied'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extension_permissions_extension_id_resource_type_action_target_unique": {
-          "name": "haex_extension_permissions_extension_id_resource_type_action_target_unique",
-          "columns": [
-            "extension_id",
-            "resource_type",
-            "action",
-            "target"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "haex_extension_permissions_extension_id_haex_extensions_id_fk": {
-          "name": "haex_extension_permissions_extension_id_haex_extensions_id_fk",
-          "tableFrom": "haex_extension_permissions",
-          "tableTo": "haex_extensions",
-          "columnsFrom": [
-            "extension_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extensions": {
-      "name": "haex_extensions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author": {
-          "name": "author",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "entry": {
-          "name": "entry",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'index.html'"
-        },
-        "homepage": {
-          "name": "homepage",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": true
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "signature": {
-          "name": "signature",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extensions_public_key_name_unique": {
-          "name": "haex_extensions_public_key_name_unique",
-          "columns": [
-            "public_key",
-            "name"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_notifications": {
-      "name": "haex_notifications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "alt": {
-          "name": "alt",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "date": {
-          "name": "date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "image": {
-          "name": "image",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "read": {
-          "name": "read",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "text": {
-          "name": "text",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_settings": {
-      "name": "haex_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_group_items": {
-      "name": "haex_passwords_group_items",
-      "columns": {
-        "group_id": {
-          "name": "group_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "group_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "haex_passwords_group_items_item_id_group_id_pk": {
-          "columns": [
-            "item_id",
-            "group_id"
-          ],
-          "name": "haex_passwords_group_items_item_id_group_id_pk"
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_groups": {
-      "name": "haex_passwords_groups",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_groups",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "parent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_details": {
-      "name": "haex_passwords_item_details",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "note": {
-          "name": "note",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tags": {
-          "name": "tags",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_history": {
-      "name": "haex_passwords_item_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "changed_property": {
-          "name": "changed_property",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_history",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_key_values": {
-      "name": "haex_passwords_item_key_values",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_key_values",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

src-tauri/database/migrations/meta/0003_snapshot.json

@@ -1,991 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "2f40a42e-9b3f-42be-8951-8e94baadcd65",
-  "prevId": "5387568f-75b3-4a85-86c5-67f539c3fedf",
-  "tables": {
-    "haex_crdt_configs": {
-      "name": "haex_crdt_configs",
-      "columns": {
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_logs": {
-      "name": "haex_crdt_logs",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "table_name": {
-          "name": "table_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "row_pks": {
-          "name": "row_pks",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "op_type": {
-          "name": "op_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "column_name": {
-          "name": "column_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_haex_timestamp": {
-          "name": "idx_haex_timestamp",
-          "columns": [
-            "haex_timestamp"
-          ],
-          "isUnique": false
-        },
-        "idx_table_row": {
-          "name": "idx_table_row",
-          "columns": [
-            "table_name",
-            "row_pks"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_snapshots": {
-      "name": "haex_crdt_snapshots",
-      "columns": {
-        "snapshot_id": {
-          "name": "snapshot_id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created": {
-          "name": "created",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "epoch_hlc": {
-          "name": "epoch_hlc",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "location_url": {
-          "name": "location_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "file_size_bytes": {
-          "name": "file_size_bytes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_desktop_items": {
-      "name": "haex_desktop_items",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_type": {
-          "name": "item_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "reference_id": {
-          "name": "reference_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "position_x": {
-          "name": "position_x",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "position_y": {
-          "name": "position_y",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extension_permissions": {
-      "name": "haex_extension_permissions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "extension_id": {
-          "name": "extension_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "resource_type": {
-          "name": "resource_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "action": {
-          "name": "action",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "target": {
-          "name": "target",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "constraints": {
-          "name": "constraints",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'denied'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extension_permissions_extension_id_resource_type_action_target_unique": {
-          "name": "haex_extension_permissions_extension_id_resource_type_action_target_unique",
-          "columns": [
-            "extension_id",
-            "resource_type",
-            "action",
-            "target"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "haex_extension_permissions_extension_id_haex_extensions_id_fk": {
-          "name": "haex_extension_permissions_extension_id_haex_extensions_id_fk",
-          "tableFrom": "haex_extension_permissions",
-          "tableTo": "haex_extensions",
-          "columnsFrom": [
-            "extension_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extensions": {
-      "name": "haex_extensions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author": {
-          "name": "author",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "entry": {
-          "name": "entry",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'index.html'"
-        },
-        "homepage": {
-          "name": "homepage",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": true
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "signature": {
-          "name": "signature",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extensions_public_key_name_unique": {
-          "name": "haex_extensions_public_key_name_unique",
-          "columns": [
-            "public_key",
-            "name"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_notifications": {
-      "name": "haex_notifications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "alt": {
-          "name": "alt",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "date": {
-          "name": "date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "image": {
-          "name": "image",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "read": {
-          "name": "read",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "text": {
-          "name": "text",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_settings": {
-      "name": "haex_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_group_items": {
-      "name": "haex_passwords_group_items",
-      "columns": {
-        "group_id": {
-          "name": "group_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "group_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "haex_passwords_group_items_item_id_group_id_pk": {
-          "columns": [
-            "item_id",
-            "group_id"
-          ],
-          "name": "haex_passwords_group_items_item_id_group_id_pk"
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_groups": {
-      "name": "haex_passwords_groups",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_groups",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "parent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_details": {
-      "name": "haex_passwords_item_details",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "note": {
-          "name": "note",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tags": {
-          "name": "tags",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_history": {
-      "name": "haex_passwords_item_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "changed_property": {
-          "name": "changed_property",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_history",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_key_values": {
-      "name": "haex_passwords_item_key_values",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_key_values",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

src-tauri/database/migrations/meta/_journal.json

@@ -5,29 +5,8 @@
     {
       "idx": 0,
       "version": "6",
-      "when": 1759402321133,
+      "when": 1761821821609,
-      "tag": "0000_glamorous_hulk",
+      "tag": "0000_dashing_night_nurse",
-      "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "6",
-      "when": 1759418087677,
-      "tag": "0001_green_stark_industries",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "6",
-      "when": 1760272083150,
-      "tag": "0002_amazing_iron_fist",
-      "breakpoints": true
-    },
-    {
-      "idx": 3,
-      "version": "6",
-      "when": 1760611690801,
-      "tag": "0003_daily_polaris",
       "breakpoints": true
     }
   ]

src-tauri/database/schemas/haex.ts

@@ -1,5 +1,6 @@
 import { sql } from 'drizzle-orm'
 import {
+  check,
   integer,
   sqliteTable,
   text,
@@ -8,35 +9,36 @@ import {
   type SQLiteColumnBuilderBase,
 } from 'drizzle-orm/sqlite-core'
 import tableNames from '../tableNames.json'
+import { crdtColumnNames } from '.'
 
-// Helper function to add common CRDT columns (haexTombstone and haexTimestamp)
+// Helper function to add common CRDT columns ( haexTimestamp)
-export const withCrdtColumns = <T extends Record<string, SQLiteColumnBuilderBase>>(
+export const withCrdtColumns = <
+  T extends Record<string, SQLiteColumnBuilderBase>,
+>(
   columns: T,
-  columnNames: { haexTombstone: string; haexTimestamp: string },
 ) => ({
   ...columns,
-  haexTombstone: integer(columnNames.haexTombstone, { mode: 'boolean' }),
+  haexTimestamp: text(crdtColumnNames.haexTimestamp),
-  haexTimestamp: text(columnNames.haexTimestamp),
 })
 
-export const haexSettings = sqliteTable(tableNames.haex.settings.name, {
+export const haexSettings = sqliteTable(
+  tableNames.haex.settings.name,
+  withCrdtColumns({
     id: text()
       .primaryKey()
       .$defaultFn(() => crypto.randomUUID()),
     key: text(),
     type: text(),
     value: text(),
-  haexTombstone: integer(tableNames.haex.settings.columns.haexTombstone, {
-    mode: 'boolean',
   }),
-  haexTimestamp: text(tableNames.haex.settings.columns.haexTimestamp),
+  (table) => [unique().on(table.key, table.type, table.value)],
-})
+)
 export type InsertHaexSettings = typeof haexSettings.$inferInsert
 export type SelectHaexSettings = typeof haexSettings.$inferSelect
 
 export const haexExtensions = sqliteTable(
   tableNames.haex.extensions.name,
-  {
+  withCrdtColumns({
     id: text()
       .primaryKey()
       .$defaultFn(() => crypto.randomUUID()),
@@ -45,16 +47,13 @@ export const haexExtensions = sqliteTable(
     version: text().notNull(),
     author: text(),
     description: text(),
-    entry: text().notNull().default('index.html'),
+    entry: text().default('index.html'),
     homepage: text(),
     enabled: integer({ mode: 'boolean' }).default(true),
     icon: text(),
     signature: text().notNull(),
-    haexTombstone: integer(tableNames.haex.extensions.columns.haexTombstone, {
+    single_instance: integer({ mode: 'boolean' }).default(false),
-      mode: 'boolean',
   }),
-    haexTimestamp: text(tableNames.haex.extensions.columns.haexTimestamp),
-  },
   (table) => [
     // UNIQUE constraint: Pro Developer (public_key) kann nur eine Extension mit diesem Namen existieren
     unique().on(table.public_key, table.name),
@@ -65,13 +64,15 @@ export type SelectHaexExtensions = typeof haexExtensions.$inferSelect
 
 export const haexExtensionPermissions = sqliteTable(
   tableNames.haex.extension_permissions.name,
-  {
+  withCrdtColumns({
     id: text()
       .primaryKey()
       .$defaultFn(() => crypto.randomUUID()),
-    extensionId: text(
+    extensionId: text(tableNames.haex.extension_permissions.columns.extensionId)
-      tableNames.haex.extension_permissions.columns.extensionId,
+      .notNull()
-    ).references((): AnySQLiteColumn => haexExtensions.id),
+      .references((): AnySQLiteColumn => haexExtensions.id, {
+        onDelete: 'cascade',
+      }),
     resourceType: text('resource_type', {
       enum: ['fs', 'http', 'db', 'shell'],
     }),
@@ -85,14 +86,7 @@ export const haexExtensionPermissions = sqliteTable(
     updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
       () => new Date(),
     ),
-    haexTombstone: integer(
+  }),
-      tableNames.haex.extension_permissions.columns.haexTombstone,
-      { mode: 'boolean' },
-    ),
-    haexTimestamp: text(
-      tableNames.haex.extension_permissions.columns.haexTimestamp,
-    ),
-  },
   (table) => [
     unique().on(
       table.extensionId,
@@ -109,7 +103,7 @@ export type SelecthaexExtensionPermissions =
 
 export const haexNotifications = sqliteTable(
   tableNames.haex.notifications.name,
-  {
+  withCrdtColumns({
     id: text().primaryKey(),
     alt: text(),
     date: text(),
@@ -122,36 +116,61 @@ export const haexNotifications = sqliteTable(
     type: text({
       enum: ['error', 'success', 'warning', 'info', 'log'],
     }).notNull(),
-    haexTombstone: integer(
+  }),
-      tableNames.haex.notifications.columns.haexTombstone,
-      { mode: 'boolean' },
-    ),
-    haexTimestamp: text(tableNames.haex.notifications.columns.haexTimestamp),
-  },
 )
 export type InsertHaexNotifications = typeof haexNotifications.$inferInsert
 export type SelectHaexNotifications = typeof haexNotifications.$inferSelect
 
+export const haexWorkspaces = sqliteTable(
+  tableNames.haex.workspaces.name,
+  withCrdtColumns({
+    id: text(tableNames.haex.workspaces.columns.id)
+      .primaryKey()
+      .$defaultFn(() => crypto.randomUUID()),
+    deviceId: text(tableNames.haex.workspaces.columns.deviceId).notNull(),
+    name: text(tableNames.haex.workspaces.columns.name).notNull(),
+    position: integer(tableNames.haex.workspaces.columns.position)
+      .notNull()
+      .default(0),
+  }),
+  (table) => [unique().on(table.position)],
+)
+export type InsertHaexWorkspaces = typeof haexWorkspaces.$inferInsert
+export type SelectHaexWorkspaces = typeof haexWorkspaces.$inferSelect
+
 export const haexDesktopItems = sqliteTable(
   tableNames.haex.desktop_items.name,
-  withCrdtColumns(
+  withCrdtColumns({
-    {
     id: text(tableNames.haex.desktop_items.columns.id)
       .primaryKey()
       .$defaultFn(() => crypto.randomUUID()),
+    workspaceId: text(tableNames.haex.desktop_items.columns.workspaceId)
+      .notNull()
+      .references(() => haexWorkspaces.id, { onDelete: 'cascade' }),
     itemType: text(tableNames.haex.desktop_items.columns.itemType, {
-        enum: ['extension', 'file', 'folder'],
+      enum: ['system', 'extension', 'file', 'folder'],
     }).notNull(),
-      referenceId: text(tableNames.haex.desktop_items.columns.referenceId).notNull(), // extensionId für extensions, filePath für files/folders
+    // Für Extensions (wenn itemType = 'extension')
+    extensionId: text(
+      tableNames.haex.desktop_items.columns.extensionId,
+    ).references((): AnySQLiteColumn => haexExtensions.id, {
+      onDelete: 'cascade',
+    }),
+    // Für System Windows (wenn itemType = 'system')
+    systemWindowId: text(tableNames.haex.desktop_items.columns.systemWindowId),
     positionX: integer(tableNames.haex.desktop_items.columns.positionX)
       .notNull()
       .default(0),
     positionY: integer(tableNames.haex.desktop_items.columns.positionY)
       .notNull()
       .default(0),
-    },
+  }),
-    tableNames.haex.desktop_items.columns,
+  (table) => [
+    check(
+      'item_reference',
+      sql`(${table.itemType} = 'extension' AND ${table.extensionId} IS NOT NULL AND ${table.systemWindowId} IS NULL) OR (${table.itemType} = 'system' AND ${table.systemWindowId} IS NOT NULL AND ${table.extensionId} IS NULL) OR (${table.itemType} = 'file' AND ${table.systemWindowId} IS NOT NULL AND ${table.extensionId} IS NULL) OR (${table.itemType} = 'folder' AND ${table.systemWindowId} IS NOT NULL AND ${table.extensionId} IS NULL)`,
     ),
+  ],
 )
 export type InsertHaexDesktopItems = typeof haexDesktopItems.$inferInsert
 export type SelectHaexDesktopItems = typeof haexDesktopItems.$inferSelect

src-tauri/database/schemas/index.ts

@@ -1,2 +1,5 @@
+export const crdtColumnNames = {
+  haexTimestamp: 'haex_timestamp',
+}
 export * from './crdt'
 export * from './haex'

src-tauri/database/schemas/vault.ts

@@ -1,112 +0,0 @@
-import { sql } from 'drizzle-orm'
-import {
-  integer,
-  primaryKey,
-  sqliteTable,
-  text,
-  type AnySQLiteColumn,
-} from 'drizzle-orm/sqlite-core'
-import tableNames from '../tableNames.json'
-
-export const haexPasswordsItemDetails = sqliteTable(
-  tableNames.haex.passwords.item_details,
-  {
-    id: text().primaryKey(),
-    title: text(),
-    username: text(),
-    password: text(),
-    note: text(),
-    icon: text(),
-    tags: text(),
-    url: text(),
-    createdAt: text('created_at').default(sql`(CURRENT_TIMESTAMP)`),
-    updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
-      () => new Date(),
-    ),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-)
-export type InsertHaexPasswordsItemDetails =
-  typeof haexPasswordsItemDetails.$inferInsert
-export type SelectHaexPasswordsItemDetails =
-  typeof haexPasswordsItemDetails.$inferSelect
-
-export const haexPasswordsItemKeyValues = sqliteTable(
-  tableNames.haex.passwords.item_key_values,
-  {
-    id: text().primaryKey(),
-    itemId: text('item_id').references(
-      (): AnySQLiteColumn => haexPasswordsItemDetails.id,
-    ),
-    key: text(),
-    value: text(),
-    updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
-      () => new Date(),
-    ),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-)
-export type InserthaexPasswordsItemKeyValues =
-  typeof haexPasswordsItemKeyValues.$inferInsert
-export type SelectHaexPasswordsItemKeyValues =
-  typeof haexPasswordsItemKeyValues.$inferSelect
-
-export const haexPasswordsItemHistory = sqliteTable(
-  tableNames.haex.passwords.item_histories,
-  {
-    id: text().primaryKey(),
-    itemId: text('item_id').references(
-      (): AnySQLiteColumn => haexPasswordsItemDetails.id,
-    ),
-    changedProperty:
-      text('changed_property').$type<keyof typeof haexPasswordsItemDetails>(),
-    oldValue: text('old_value'),
-    newValue: text('new_value'),
-    createdAt: text('created_at').default(sql`(CURRENT_TIMESTAMP)`),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-)
-export type InserthaexPasswordsItemHistory =
-  typeof haexPasswordsItemHistory.$inferInsert
-export type SelectHaexPasswordsItemHistory =
-  typeof haexPasswordsItemHistory.$inferSelect
-
-export const haexPasswordsGroups = sqliteTable(
-  tableNames.haex.passwords.groups,
-  {
-    id: text().primaryKey(),
-    name: text(),
-    description: text(),
-    icon: text(),
-    order: integer(),
-    color: text(),
-    parentId: text('parent_id').references(
-      (): AnySQLiteColumn => haexPasswordsGroups.id,
-    ),
-    createdAt: text('created_at').default(sql`(CURRENT_TIMESTAMP)`),
-    updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
-      () => new Date(),
-    ),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-)
-export type InsertHaexPasswordsGroups = typeof haexPasswordsGroups.$inferInsert
-export type SelectHaexPasswordsGroups = typeof haexPasswordsGroups.$inferSelect
-
-export const haexPasswordsGroupItems = sqliteTable(
-  tableNames.haex.passwords.group_items,
-  {
-    groupId: text('group_id').references(
-      (): AnySQLiteColumn => haexPasswordsGroups.id,
-    ),
-    itemId: text('item_id').references(
-      (): AnySQLiteColumn => haexPasswordsItemDetails.id,
-    ),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-  (table) => [primaryKey({ columns: [table.itemId, table.groupId] })],
-)
-export type InsertHaexPasswordsGroupItems =
-  typeof haexPasswordsGroupItems.$inferInsert
-export type SelectHaexPasswordsGroupItems =
-  typeof haexPasswordsGroupItems.$inferSelect

src-tauri/database/tableNames.json

@@ -7,7 +7,7 @@
         "key": "key",
         "type": "type",
         "value": "value",
-        "haexTombstone": "haex_tombstone",
+
         "haexTimestamp": "haex_timestamp"
       }
     },
@@ -26,7 +26,7 @@
         "signature": "signature",
         "url": "url",
         "version": "version",
-        "haexTombstone": "haex_tombstone",
+
         "haexTimestamp": "haex_timestamp"
       }
     },
@@ -42,7 +42,7 @@
         "status": "status",
         "createdAt": "created_at",
         "updateAt": "updated_at",
-        "haexTombstone": "haex_tombstone",
+
         "haexTimestamp": "haex_timestamp"
       }
     },
@@ -59,7 +59,19 @@
         "text": "text",
         "title": "title",
         "type": "type",
-        "haexTombstone": "haex_tombstone",
+
+        "haexTimestamp": "haex_timestamp"
+      }
+    },
+    "workspaces": {
+      "name": "haex_workspaces",
+      "columns": {
+        "id": "id",
+        "deviceId": "device_id",
+        "name": "name",
+        "position": "position",
+        "createdAt": "created_at",
+
         "haexTimestamp": "haex_timestamp"
       }
     },
@@ -67,21 +79,17 @@
       "name": "haex_desktop_items",
       "columns": {
         "id": "id",
+        "workspaceId": "workspace_id",
         "itemType": "item_type",
-        "referenceId": "reference_id",
+        "extensionId": "extension_id",
+        "systemWindowId": "system_window_id",
         "positionX": "position_x",
         "positionY": "position_y",
-        "haexTombstone": "haex_tombstone",
+
         "haexTimestamp": "haex_timestamp"
       }
     },
-    "passwords": {
+
-      "groups": "haex_passwords_groups",
-      "group_items": "haex_passwords_group_items",
-      "item_details": "haex_passwords_item_details",
-      "item_key_values": "haex_passwords_item_key_values",
-      "item_histories": "haex_passwords_item_history"
-    },
     "crdt": {
       "logs": {
         "name": "haex_crdt_logs",

src-tauri/gen/android/app/build.gradle.kts

@@ -24,6 +24,23 @@ android {
         versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
         versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
     }
+
+    signingConfigs {
+        create("release") {
+            val keystorePath = System.getenv("ANDROID_KEYSTORE_PATH")
+            val keystorePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
+            val keyAlias = System.getenv("ANDROID_KEY_ALIAS")
+            val keyPassword = System.getenv("ANDROID_KEY_PASSWORD")
+
+            if (keystorePath != null && keystorePassword != null && keyAlias != null && keyPassword != null) {
+                storeFile = file(keystorePath)
+                storePassword = keystorePassword
+                this.keyAlias = keyAlias
+                this.keyPassword = keyPassword
+            }
+        }
+    }
+
     buildTypes {
         getByName("debug") {
             manifestPlaceholders["usesCleartextTraffic"] = "true"
@@ -43,6 +60,12 @@ android {
                     .plus(getDefaultProguardFile("proguard-android-optimize.txt"))
                     .toList().toTypedArray()
             )
+
+            // Sign with release config if available
+            val releaseSigningConfig = signingConfigs.getByName("release")
+            if (releaseSigningConfig.storeFile != null) {
+                signingConfig = releaseSigningConfig
+            }
         }
     }
     kotlinOptions {

src-tauri/gen/schemas/android-schema.json

@@ -1400,10 +1400,10 @@
                         "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
                       },
                       {
-                        "description": "An empty permission you can use to modify the global scope.",
+                        "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
                         "type": "string",
                         "const": "fs:scope",
-                        "markdownDescription": "An empty permission you can use to modify the global scope."
+                        "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
                       },
                       {
                         "description": "This scope permits access to all files and list content of top level directories in the application folders.",
@@ -2277,10 +2277,10 @@
           "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
         },
         {
-          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`",
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
           "type": "string",
           "const": "core:app:default",
-          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`"
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
         },
         {
           "description": "Enables the app_hide command without any pre-configured scope.",
@@ -2324,12 +2324,24 @@
           "const": "core:app:allow-name",
           "markdownDescription": "Enables the name command without any pre-configured scope."
         },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
         {
           "description": "Enables the remove_data_store command without any pre-configured scope.",
           "type": "string",
           "const": "core:app:allow-remove-data-store",
           "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
         },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
         {
           "description": "Enables the set_app_theme command without any pre-configured scope.",
           "type": "string",
@@ -2396,12 +2408,24 @@
           "const": "core:app:deny-name",
           "markdownDescription": "Denies the name command without any pre-configured scope."
         },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
         {
           "description": "Denies the remove_data_store command without any pre-configured scope.",
           "type": "string",
           "const": "core:app:deny-remove-data-store",
           "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
         },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
         {
           "description": "Denies the set_app_theme command without any pre-configured scope.",
           "type": "string",
@@ -5541,10 +5565,10 @@
           "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
         },
         {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
           "type": "string",
           "const": "fs:scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
         },
         {
           "description": "This scope permits access to all files and list content of top level directories in the application folders.",

src-tauri/gen/schemas/desktop-schema.json

@@ -1400,10 +1400,10 @@
                         "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
                       },
                       {
-                        "description": "An empty permission you can use to modify the global scope.",
+                        "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
                         "type": "string",
                         "const": "fs:scope",
-                        "markdownDescription": "An empty permission you can use to modify the global scope."
+                        "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
                       },
                       {
                         "description": "This scope permits access to all files and list content of top level directories in the application folders.",
@@ -2277,10 +2277,10 @@
           "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
         },
         {
-          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`",
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
           "type": "string",
           "const": "core:app:default",
-          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`"
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
         },
         {
           "description": "Enables the app_hide command without any pre-configured scope.",
@@ -2324,12 +2324,24 @@
           "const": "core:app:allow-name",
           "markdownDescription": "Enables the name command without any pre-configured scope."
         },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
         {
           "description": "Enables the remove_data_store command without any pre-configured scope.",
           "type": "string",
           "const": "core:app:allow-remove-data-store",
           "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
         },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
         {
           "description": "Enables the set_app_theme command without any pre-configured scope.",
           "type": "string",
@@ -2396,12 +2408,24 @@
           "const": "core:app:deny-name",
           "markdownDescription": "Denies the name command without any pre-configured scope."
         },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
         {
           "description": "Denies the remove_data_store command without any pre-configured scope.",
           "type": "string",
           "const": "core:app:deny-remove-data-store",
           "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
         },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
         {
           "description": "Denies the set_app_theme command without any pre-configured scope.",
           "type": "string",
@@ -5541,10 +5565,10 @@
           "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
         },
         {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
           "type": "string",
           "const": "fs:scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
         },
         {
           "description": "This scope permits access to all files and list content of top level directories in the application folders.",

src-tauri/gen/schemas/linux-schema.json

@@ -1400,10 +1400,10 @@
                         "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
                       },
                       {
-                        "description": "An empty permission you can use to modify the global scope.",
+                        "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
                         "type": "string",
                         "const": "fs:scope",
-                        "markdownDescription": "An empty permission you can use to modify the global scope."
+                        "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
                       },
                       {
                         "description": "This scope permits access to all files and list content of top level directories in the application folders.",
@@ -2277,10 +2277,10 @@
           "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
         },
         {
-          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`",
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
           "type": "string",
           "const": "core:app:default",
-          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`"
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
         },
         {
           "description": "Enables the app_hide command without any pre-configured scope.",
@@ -2324,12 +2324,24 @@
           "const": "core:app:allow-name",
           "markdownDescription": "Enables the name command without any pre-configured scope."
         },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
         {
           "description": "Enables the remove_data_store command without any pre-configured scope.",
           "type": "string",
           "const": "core:app:allow-remove-data-store",
           "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
         },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
         {
           "description": "Enables the set_app_theme command without any pre-configured scope.",
           "type": "string",
@@ -2396,12 +2408,24 @@
           "const": "core:app:deny-name",
           "markdownDescription": "Denies the name command without any pre-configured scope."
         },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
         {
           "description": "Denies the remove_data_store command without any pre-configured scope.",
           "type": "string",
           "const": "core:app:deny-remove-data-store",
           "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
         },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
         {
           "description": "Denies the set_app_theme command without any pre-configured scope.",
           "type": "string",
@@ -5541,10 +5565,10 @@
           "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
         },
         {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
           "type": "string",
           "const": "fs:scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
         },
         {
           "description": "This scope permits access to all files and list content of top level directories in the application folders.",

src-tauri/gen/schemas/mobile-schema.json

@@ -1400,10 +1400,10 @@
                         "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
                       },
                       {
-                        "description": "An empty permission you can use to modify the global scope.",
+                        "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
                         "type": "string",
                         "const": "fs:scope",
-                        "markdownDescription": "An empty permission you can use to modify the global scope."
+                        "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
                       },
                       {
                         "description": "This scope permits access to all files and list content of top level directories in the application folders.",
@@ -2277,10 +2277,10 @@
           "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
         },
         {
-          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`",
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
           "type": "string",
           "const": "core:app:default",
-          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`"
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
         },
         {
           "description": "Enables the app_hide command without any pre-configured scope.",
@@ -2324,12 +2324,24 @@
           "const": "core:app:allow-name",
           "markdownDescription": "Enables the name command without any pre-configured scope."
         },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
         {
           "description": "Enables the remove_data_store command without any pre-configured scope.",
           "type": "string",
           "const": "core:app:allow-remove-data-store",
           "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
         },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
         {
           "description": "Enables the set_app_theme command without any pre-configured scope.",
           "type": "string",
@@ -2396,12 +2408,24 @@
           "const": "core:app:deny-name",
           "markdownDescription": "Denies the name command without any pre-configured scope."
         },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
         {
           "description": "Denies the remove_data_store command without any pre-configured scope.",
           "type": "string",
           "const": "core:app:deny-remove-data-store",
           "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
         },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
         {
           "description": "Denies the set_app_theme command without any pre-configured scope.",
           "type": "string",
@@ -5541,10 +5565,10 @@
           "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
         },
         {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
           "type": "string",
           "const": "fs:scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
         },
         {
           "description": "This scope permits access to all files and list content of top level directories in the application folders.",

src-tauri/generator/table_names.rs

@@ -1,5 +1,6 @@
 // src-tarui/src/build/table_names.rs
 use serde::Deserialize;
+use serde_json::Value;
 use std::collections::HashMap;
 use std::env;
 use std::fs::File;
@@ -8,24 +9,7 @@ use std::path::Path;
 
 #[derive(Debug, Deserialize)]
 struct Schema {
-    haex: Haex,
+    haex: HashMap<String, Value>,
-}
-
-#[derive(Debug, Deserialize)]
-#[allow(non_snake_case)]
-struct Haex {
-    settings: TableDefinition,
-    extensions: TableDefinition,
-    extension_permissions: TableDefinition,
-    notifications: TableDefinition,
-    crdt: Crdt,
-}
-
-#[derive(Debug, Deserialize)]
-struct Crdt {
-    logs: TableDefinition,
-    snapshots: TableDefinition,
-    configs: TableDefinition,
 }
 
 #[derive(Debug, Deserialize)]
@@ -44,166 +28,39 @@ pub fn generate_table_names() {
     let reader = BufReader::new(file);
     let schema: Schema =
         serde_json::from_reader(reader).expect("Konnte tableNames.json nicht parsen");
-    let haex = schema.haex;
 
-    let code = format!(
+    let mut code = String::from(
         r#"
 // ==================================================================
 // HINWEIS: Diese Datei wurde automatisch von build.rs generiert.
 // Manuelle Änderungen werden bei der nächsten Kompilierung überschrieben!
 // ==================================================================
 
-// --- Table: haex_settings ---
-pub const TABLE_SETTINGS: &str = "{t_settings}";
-pub const COL_SETTINGS_ID: &str = "{c_settings_id}";
-pub const COL_SETTINGS_KEY: &str = "{c_settings_key}";
-pub const COL_SETTINGS_TYPE: &str = "{c_settings_type}";
-pub const COL_SETTINGS_VALUE: &str = "{c_settings_value}";
-pub const COL_SETTINGS_HAEX_TOMBSTONE: &str = "{c_settings_tombstone}";
-pub const COL_SETTINGS_HAEX_TIMESTAMP: &str = "{c_settings_timestamp}";
-
-// --- Table: haex_extensions ---
-pub const TABLE_EXTENSIONS: &str = "{t_extensions}";
-pub const COL_EXTENSIONS_ID: &str = "{c_ext_id}";
-pub const COL_EXTENSIONS_AUTHOR: &str = "{c_ext_author}";
-pub const COL_EXTENSIONS_DESCRIPTION: &str = "{c_ext_description}";
-pub const COL_EXTENSIONS_ENTRY: &str = "{c_ext_entry}";
-pub const COL_EXTENSIONS_HOMEPAGE: &str = "{c_ext_homepage}";
-pub const COL_EXTENSIONS_ENABLED: &str = "{c_ext_enabled}";
-pub const COL_EXTENSIONS_ICON: &str = "{c_ext_icon}";
-pub const COL_EXTENSIONS_NAME: &str = "{c_ext_name}";
-pub const COL_EXTENSIONS_PUBLIC_KEY: &str = "{c_ext_public_key}";
-pub const COL_EXTENSIONS_SIGNATURE: &str = "{c_ext_signature}";
-pub const COL_EXTENSIONS_URL: &str = "{c_ext_url}";
-pub const COL_EXTENSIONS_VERSION: &str = "{c_ext_version}";
-pub const COL_EXTENSIONS_HAEX_TOMBSTONE: &str = "{c_ext_tombstone}";
-pub const COL_EXTENSIONS_HAEX_TIMESTAMP: &str = "{c_ext_timestamp}";
-
-// --- Table: haex_extension_permissions ---
-pub const TABLE_EXTENSION_PERMISSIONS: &str = "{t_ext_perms}";
-pub const COL_EXT_PERMS_ID: &str = "{c_extp_id}";
-pub const COL_EXT_PERMS_EXTENSION_ID: &str = "{c_extp_extensionId}";
-pub const COL_EXT_PERMS_RESOURCE_TYPE: &str = "{c_extp_resourceType}";
-pub const COL_EXT_PERMS_ACTION: &str = "{c_extp_action}";
-pub const COL_EXT_PERMS_TARGET: &str = "{c_extp_target}";
-pub const COL_EXT_PERMS_CONSTRAINTS: &str = "{c_extp_constraints}";
-pub const COL_EXT_PERMS_STATUS: &str = "{c_extp_status}";
-pub const COL_EXT_PERMS_CREATED_AT: &str = "{c_extp_createdAt}";
-pub const COL_EXT_PERMS_UPDATE_AT: &str = "{c_extp_updateAt}";
-pub const COL_EXT_PERMS_HAEX_TOMBSTONE: &str = "{c_extp_tombstone}";
-pub const COL_EXT_PERMS_HAEX_TIMESTAMP: &str = "{c_extp_timestamp}";
-
-// --- Table: haex_notifications ---
-pub const TABLE_NOTIFICATIONS: &str = "{t_notifications}";
-pub const COL_NOTIFICATIONS_ID: &str = "{c_notif_id}";
-pub const COL_NOTIFICATIONS_ALT: &str = "{c_notif_alt}";
-pub const COL_NOTIFICATIONS_DATE: &str = "{c_notif_date}";
-pub const COL_NOTIFICATIONS_ICON: &str = "{c_notif_icon}";
-pub const COL_NOTIFICATIONS_IMAGE: &str = "{c_notif_image}";
-pub const COL_NOTIFICATIONS_READ: &str = "{c_notif_read}";
-pub const COL_NOTIFICATIONS_SOURCE: &str = "{c_notif_source}";
-pub const COL_NOTIFICATIONS_TEXT: &str = "{c_notif_text}";
-pub const COL_NOTIFICATIONS_TITLE: &str = "{c_notif_title}";
-pub const COL_NOTIFICATIONS_TYPE: &str = "{c_notif_type}";
-pub const COL_NOTIFICATIONS_HAEX_TOMBSTONE: &str = "{c_notif_tombstone}";
-
-// --- Table: haex_crdt_logs ---
-pub const TABLE_CRDT_LOGS: &str = "{t_crdt_logs}";
-pub const COL_CRDT_LOGS_ID: &str = "{c_crdt_logs_id}";
-pub const COL_CRDT_LOGS_HAEX_TIMESTAMP: &str = "{c_crdt_logs_timestamp}";
-pub const COL_CRDT_LOGS_TABLE_NAME: &str = "{c_crdt_logs_tableName}";
-pub const COL_CRDT_LOGS_ROW_PKS: &str = "{c_crdt_logs_rowPks}";
-pub const COL_CRDT_LOGS_OP_TYPE: &str = "{c_crdt_logs_opType}";
-pub const COL_CRDT_LOGS_COLUMN_NAME: &str = "{c_crdt_logs_columnName}";
-pub const COL_CRDT_LOGS_NEW_VALUE: &str = "{c_crdt_logs_newValue}";
-pub const COL_CRDT_LOGS_OLD_VALUE: &str = "{c_crdt_logs_oldValue}";
-
-// --- Table: haex_crdt_snapshots ---
-pub const TABLE_CRDT_SNAPSHOTS: &str = "{t_crdt_snapshots}";
-pub const COL_CRDT_SNAPSHOTS_ID: &str = "{c_crdt_snap_id}";
-pub const COL_CRDT_SNAPSHOTS_CREATED: &str = "{c_crdt_snap_created}";
-pub const COL_CRDT_SNAPSHOTS_EPOCH_HLC: &str = "{c_crdt_snap_epoch}";
-pub const COL_CRDT_SNAPSHOTS_LOCATION_URL: &str = "{c_crdt_snap_location}";
-pub const COL_CRDT_SNAPSHOTS_FILE_SIZE: &str = "{c_crdt_snap_size}";
-
-// --- Table: haex_crdt_configs ---
-pub const TABLE_CRDT_CONFIGS: &str = "{t_crdt_configs}";
-pub const COL_CRDT_CONFIGS_KEY: &str = "{c_crdt_configs_key}";
-pub const COL_CRDT_CONFIGS_VALUE: &str = "{c_crdt_configs_value}";
 "#,
-        // Settings
-        t_settings = haex.settings.name,
-        c_settings_id = haex.settings.columns["id"],
-        c_settings_key = haex.settings.columns["key"],
-        c_settings_type = haex.settings.columns["type"],
-        c_settings_value = haex.settings.columns["value"],
-        c_settings_tombstone = haex.settings.columns["haexTombstone"],
-        c_settings_timestamp = haex.settings.columns["haexTimestamp"],
-        // Extensions
-        t_extensions = haex.extensions.name,
-        c_ext_id = haex.extensions.columns["id"],
-        c_ext_author = haex.extensions.columns["author"],
-        c_ext_description = haex.extensions.columns["description"],
-        c_ext_entry = haex.extensions.columns["entry"],
-        c_ext_homepage = haex.extensions.columns["homepage"],
-        c_ext_enabled = haex.extensions.columns["enabled"],
-        c_ext_icon = haex.extensions.columns["icon"],
-        c_ext_name = haex.extensions.columns["name"],
-        c_ext_public_key = haex.extensions.columns["public_key"],
-        c_ext_signature = haex.extensions.columns["signature"],
-        c_ext_url = haex.extensions.columns["url"],
-        c_ext_version = haex.extensions.columns["version"],
-        c_ext_tombstone = haex.extensions.columns["haexTombstone"],
-        c_ext_timestamp = haex.extensions.columns["haexTimestamp"],
-        // Extension Permissions
-        t_ext_perms = haex.extension_permissions.name,
-        c_extp_id = haex.extension_permissions.columns["id"],
-        c_extp_extensionId = haex.extension_permissions.columns["extensionId"],
-        c_extp_resourceType = haex.extension_permissions.columns["resourceType"],
-        c_extp_action = haex.extension_permissions.columns["action"],
-        c_extp_target = haex.extension_permissions.columns["target"],
-        c_extp_constraints = haex.extension_permissions.columns["constraints"],
-        c_extp_status = haex.extension_permissions.columns["status"],
-        c_extp_createdAt = haex.extension_permissions.columns["createdAt"],
-        c_extp_updateAt = haex.extension_permissions.columns["updateAt"],
-        c_extp_tombstone = haex.extension_permissions.columns["haexTombstone"],
-        c_extp_timestamp = haex.extension_permissions.columns["haexTimestamp"],
-        // Notifications
-        t_notifications = haex.notifications.name,
-        c_notif_id = haex.notifications.columns["id"],
-        c_notif_alt = haex.notifications.columns["alt"],
-        c_notif_date = haex.notifications.columns["date"],
-        c_notif_icon = haex.notifications.columns["icon"],
-        c_notif_image = haex.notifications.columns["image"],
-        c_notif_read = haex.notifications.columns["read"],
-        c_notif_source = haex.notifications.columns["source"],
-        c_notif_text = haex.notifications.columns["text"],
-        c_notif_title = haex.notifications.columns["title"],
-        c_notif_type = haex.notifications.columns["type"],
-        c_notif_tombstone = haex.notifications.columns["haexTombstone"],
-        // CRDT Logs
-        t_crdt_logs = haex.crdt.logs.name,
-        c_crdt_logs_id = haex.crdt.logs.columns["id"],
-        c_crdt_logs_timestamp = haex.crdt.logs.columns["haexTimestamp"],
-        c_crdt_logs_tableName = haex.crdt.logs.columns["tableName"],
-        c_crdt_logs_rowPks = haex.crdt.logs.columns["rowPks"],
-        c_crdt_logs_opType = haex.crdt.logs.columns["opType"],
-        c_crdt_logs_columnName = haex.crdt.logs.columns["columnName"],
-        c_crdt_logs_newValue = haex.crdt.logs.columns["newValue"],
-        c_crdt_logs_oldValue = haex.crdt.logs.columns["oldValue"],
-        // CRDT Snapshots
-        t_crdt_snapshots = haex.crdt.snapshots.name,
-        c_crdt_snap_id = haex.crdt.snapshots.columns["snapshotId"],
-        c_crdt_snap_created = haex.crdt.snapshots.columns["created"],
-        c_crdt_snap_epoch = haex.crdt.snapshots.columns["epochHlc"],
-        c_crdt_snap_location = haex.crdt.snapshots.columns["locationUrl"],
-        c_crdt_snap_size = haex.crdt.snapshots.columns["fileSizeBytes"],
-        // CRDT Configs
-        t_crdt_configs = haex.crdt.configs.name,
-        c_crdt_configs_key = haex.crdt.configs.columns["key"],
-        c_crdt_configs_value = haex.crdt.configs.columns["value"]
     );
 
+    // Dynamisch über alle Einträge in haex iterieren
+    for (key, value) in &schema.haex {
+        // Spezialbehandlung für nested structures wie "crdt"
+        if key == "crdt" {
+            if let Some(crdt_obj) = value.as_object() {
+                for (crdt_key, crdt_value) in crdt_obj {
+                    if let Ok(table) = serde_json::from_value::<TableDefinition>(crdt_value.clone())
+                    {
+                        let const_prefix = format!("CRDT_{}", to_screaming_snake_case(crdt_key));
+                        code.push_str(&generate_table_constants(&table, &const_prefix));
+                    }
+                }
+            }
+        } else {
+            // Normale Tabelle (settings, extensions, notifications, workspaces, desktop_items, etc.)
+            if let Ok(table) = serde_json::from_value::<TableDefinition>(value.clone()) {
+                let const_prefix = to_screaming_snake_case(key);
+                code.push_str(&generate_table_constants(&table, &const_prefix));
+            }
+        }
+    }
+
     // --- Datei schreiben ---
     let mut f = File::create(&dest_path).expect("Konnte Zieldatei nicht erstellen");
     f.write_all(code.as_bytes())
@@ -211,3 +68,51 @@ pub const COL_CRDT_CONFIGS_VALUE: &str = "{c_crdt_configs_value}";
 
     println!("cargo:rerun-if-changed=database/tableNames.json");
 }
+
+/// Konvertiert einen String zu SCREAMING_SNAKE_CASE
+fn to_screaming_snake_case(s: &str) -> String {
+    let mut result = String::new();
+    let mut prev_is_lower = false;
+
+    for (i, ch) in s.chars().enumerate() {
+        if ch == '_' {
+            result.push('_');
+            prev_is_lower = false;
+        } else if ch.is_uppercase() {
+            if i > 0 && prev_is_lower {
+                result.push('_');
+            }
+            result.push(ch);
+            prev_is_lower = false;
+        } else {
+            result.push(ch.to_ascii_uppercase());
+            prev_is_lower = true;
+        }
+    }
+
+    result
+}
+
+/// Generiert die Konstanten für eine Tabelle
+fn generate_table_constants(table: &TableDefinition, const_prefix: &str) -> String {
+    let mut code = String::new();
+
+    // Tabellenname
+    code.push_str(&format!("// --- Table: {} ---\n", table.name));
+    code.push_str(&format!(
+        "pub const TABLE_{}: &str = \"{}\";\n",
+        const_prefix, table.name
+    ));
+
+    // Spalten
+    for (col_key, col_value) in &table.columns {
+        let col_const_name = format!("COL_{}_{}", const_prefix, to_screaming_snake_case(col_key));
+        code.push_str(&format!(
+            "pub const {}: &str = \"{}\";\n",
+            col_const_name, col_value
+        ));
+    }
+
+    code.push('\n');
+    code
+}

src-tauri/src/crdt/insert_transformer.rs

@@ -0,0 +1,99 @@
+// src-tauri/src/crdt/insert_transformer.rs
+// INSERT-spezifische CRDT-Transformationen (ON CONFLICT, RETURNING)
+
+use crate::crdt::trigger::HLC_TIMESTAMP_COLUMN;
+use crate::database::error::DatabaseError;
+use sqlparser::ast::{Expr, Ident, Insert, SelectItem, SetExpr, Value};
+use uhlc::Timestamp;
+
+/// Helper-Struct für INSERT-Transformationen
+pub struct InsertTransformer {
+    hlc_timestamp_column: &'static str,
+}
+
+impl InsertTransformer {
+    pub fn new() -> Self {
+        Self {
+            hlc_timestamp_column: HLC_TIMESTAMP_COLUMN,
+        }
+    }
+
+    fn find_or_add_column(columns: &mut Vec<Ident>, col_name: &'static str) -> usize {
+        match columns.iter().position(|c| c.value == col_name) {
+            Some(index) => index, // Gefunden! Gib Index zurück.
+            None => {
+                // Nicht gefunden! Hinzufügen.
+                columns.push(Ident::new(col_name));
+                columns.len() - 1 // Der Index des gerade hinzugefügten Elements
+            }
+        }
+    }
+
+    /// Wenn der Index == der Länge ist, wird der Wert stattdessen gepusht.
+    fn set_or_push_value(row: &mut Vec<Expr>, index: usize, value: Expr) {
+        if index < row.len() {
+            // Spalte war vorhanden, Wert (wahrscheinlich `?` oder NULL) ersetzen
+            row[index] = value;
+        } else {
+            // Spalte war nicht vorhanden, Wert hinzufügen
+            row.push(value);
+        }
+    }
+
+    fn set_or_push_projection(projection: &mut Vec<SelectItem>, index: usize, value: Expr) {
+        let item = SelectItem::UnnamedExpr(value);
+        if index < projection.len() {
+            projection[index] = item;
+        } else {
+            projection.push(item);
+        }
+    }
+
+    /// Transformiert INSERT-Statements (fügt HLC-Timestamp hinzu)
+    /// Hard Delete: Kein ON CONFLICT mehr nötig - gelöschte Einträge sind wirklich weg
+    pub fn transform_insert(
+        &self,
+        insert_stmt: &mut Insert,
+        timestamp: &Timestamp,
+    ) -> Result<(), DatabaseError> {
+        // Add haex_timestamp  column if not exists
+        let hlc_col_index =
+            Self::find_or_add_column(&mut insert_stmt.columns, self.hlc_timestamp_column);
+
+        // ON CONFLICT Logik komplett entfernt!
+        // Bei Hard Deletes gibt es keine Tombstone-Einträge mehr zu reaktivieren
+        // UNIQUE Constraint Violations sind echte Fehler
+
+        match insert_stmt.source.as_mut() {
+            Some(query) => match &mut *query.body {
+                SetExpr::Values(values) => {
+                    for row in &mut values.rows {
+                        let hlc_value =
+                            Expr::Value(Value::SingleQuotedString(timestamp.to_string()).into());
+
+                        Self::set_or_push_value(row, hlc_col_index, hlc_value);
+                    }
+                }
+                SetExpr::Select(select) => {
+                    let hlc_value =
+                        Expr::Value(Value::SingleQuotedString(timestamp.to_string()).into());
+
+                    Self::set_or_push_projection(&mut select.projection, hlc_col_index, hlc_value);
+                }
+                _ => {
+                    return Err(DatabaseError::UnsupportedStatement {
+                        sql: insert_stmt.to_string(),
+                        reason: "INSERT with unsupported source type".to_string(),
+                    });
+                }
+            },
+            None => {
+                return Err(DatabaseError::UnsupportedStatement {
+                    reason: "INSERT statement has no source".to_string(),
+                    sql: insert_stmt.to_string(),
+                });
+            }
+        }
+        Ok(())
+    }
+}

src-tauri/src/crdt/mod.rs

@@ -1,3 +1,5 @@
 pub mod hlc;
+pub mod insert_transformer;
+//pub mod query_transformer;
 pub mod transformer;
 pub mod trigger;

src-tauri/src/crdt/transformer.rs

@@ -1,9 +1,12 @@
-use crate::crdt::trigger::{HLC_TIMESTAMP_COLUMN, TOMBSTONE_COLUMN};
+// src-tauri/src/crdt/transformer.rs
+
+use crate::crdt::insert_transformer::InsertTransformer;
+use crate::crdt::trigger::HLC_TIMESTAMP_COLUMN;
 use crate::database::error::DatabaseError;
 use crate::table_names::{TABLE_CRDT_CONFIGS, TABLE_CRDT_LOGS};
 use sqlparser::ast::{
-    Assignment, AssignmentTarget, BinaryOperator, ColumnDef, DataType, Expr, Ident, Insert,
+    Assignment, AssignmentTarget, ColumnDef, DataType, Expr, Ident, ObjectName, ObjectNamePart,
-    ObjectName, ObjectNamePart, SelectItem, SetExpr, Statement, TableFactor, TableObject, Value,
+    Statement, TableFactor, TableObject, Value,
 };
 use std::borrow::Cow;
 use std::collections::HashSet;
@@ -12,46 +15,14 @@ use uhlc::Timestamp;
 /// Konfiguration für CRDT-Spalten
 #[derive(Clone)]
 struct CrdtColumns {
-    tombstone: &'static str,
     hlc_timestamp: &'static str,
 }
 
 impl CrdtColumns {
     const DEFAULT: Self = Self {
-        tombstone: TOMBSTONE_COLUMN,
         hlc_timestamp: HLC_TIMESTAMP_COLUMN,
     };
 
-    /// Erstellt einen Tombstone-Filter für eine Tabelle
-    fn create_tombstone_filter(&self, table_alias: Option<&str>) -> Expr {
-        let column_expr = match table_alias {
-            Some(alias) => {
-                // Qualifizierte Referenz: alias.tombstone
-                Expr::CompoundIdentifier(vec![Ident::new(alias), Ident::new(self.tombstone)])
-            }
-            None => {
-                // Einfache Referenz: tombstone
-                Expr::Identifier(Ident::new(self.tombstone))
-            }
-        };
-
-        Expr::BinaryOp {
-            left: Box::new(column_expr),
-            op: BinaryOperator::NotEq,
-            right: Box::new(Expr::Value(Value::Number("1".to_string(), false).into())),
-        }
-    }
-
-    /// Erstellt eine Tombstone-Zuweisung für UPDATE/DELETE
-    fn create_tombstone_assignment(&self) -> Assignment {
-        Assignment {
-            target: AssignmentTarget::ColumnName(ObjectName(vec![ObjectNamePart::Identifier(
-                Ident::new(self.tombstone),
-            )])),
-            value: Expr::Value(Value::Number("1".to_string(), false).into()),
-        }
-    }
-
     /// Erstellt eine HLC-Zuweisung für UPDATE/DELETE
     fn create_hlc_assignment(&self, timestamp: &Timestamp) -> Assignment {
         Assignment {
@@ -64,13 +35,6 @@ impl CrdtColumns {
 
     /// Fügt CRDT-Spalten zu einer Tabellendefinition hinzu
     fn add_to_table_definition(&self, columns: &mut Vec<ColumnDef>) {
-        if !columns.iter().any(|c| c.name.value == self.tombstone) {
-            columns.push(ColumnDef {
-                name: Ident::new(self.tombstone),
-                data_type: DataType::Integer(None),
-                options: vec![],
-            });
-        }
         if !columns.iter().any(|c| c.name.value == self.hlc_timestamp) {
             columns.push(ColumnDef {
                 name: Ident::new(self.hlc_timestamp),
@@ -110,14 +74,61 @@ impl CrdtTransformer {
         Cow::Owned(name_str.trim_matches('`').trim_matches('"').to_string())
     }
 
-    pub fn transform_select_statement(&self, stmt: &mut Statement) -> Result<(), DatabaseError> {
+    // =================================================================
+    // ÖFFENTLICHE API-METHODEN
+    // =================================================================
+
+    pub fn transform_execute_statement_with_table_info(
+        &self,
+        stmt: &mut Statement,
+        hlc_timestamp: &Timestamp,
+    ) -> Result<Option<String>, DatabaseError> {
         match stmt {
-            Statement::Query(query) => self.transform_query_recursive(query),
+            Statement::CreateTable(create_table) => {
-            // Fange alle anderen Fälle ab und gib einen Fehler zurück
+                if self.is_crdt_sync_table(&create_table.name) {
-            _ => Err(DatabaseError::UnsupportedStatement {
+                    self.columns
-                sql: stmt.to_string(),
+                        .add_to_table_definition(&mut create_table.columns);
-                reason: "This operation only accepts SELECT statements.".to_string(),
+                    Ok(Some(
-            }),
+                        self.normalize_table_name(&create_table.name).into_owned(),
+                    ))
+                } else {
+                    Ok(None)
+                }
+            }
+            Statement::Insert(insert_stmt) => {
+                if let TableObject::TableName(name) = &insert_stmt.table {
+                    if self.is_crdt_sync_table(name) {
+                        // Hard Delete: Kein Schema-Lookup mehr nötig (kein ON CONFLICT)
+                        let insert_transformer = InsertTransformer::new();
+                        insert_transformer.transform_insert(insert_stmt, hlc_timestamp)?;
+                    }
+                }
+                Ok(None)
+            }
+            Statement::Update {
+                table, assignments, ..
+            } => {
+                if let TableFactor::Table { name, .. } = &table.relation {
+                    if self.is_crdt_sync_table(name) {
+                        assignments.push(self.columns.create_hlc_assignment(hlc_timestamp));
+                    }
+                }
+                Ok(None)
+            }
+            Statement::Delete(_del_stmt) => {
+                // Hard Delete - keine Transformation!
+                // DELETE bleibt DELETE
+                // BEFORE DELETE Trigger schreiben die Logs
+                Ok(None)
+            }
+            Statement::AlterTable { name, .. } => {
+                if self.is_crdt_sync_table(name) {
+                    Ok(Some(self.normalize_table_name(name).into_owned()))
+                } else {
+                    Ok(None)
+                }
+            }
+            _ => Ok(None),
         }
     }
 
@@ -141,7 +152,9 @@ impl CrdtTransformer {
             Statement::Insert(insert_stmt) => {
                 if let TableObject::TableName(name) = &insert_stmt.table {
                     if self.is_crdt_sync_table(name) {
-                        self.transform_insert(insert_stmt, hlc_timestamp)?;
+                        // Hard Delete: Keine ON CONFLICT Logik mehr nötig
+                        let insert_transformer = InsertTransformer::new();
+                        insert_transformer.transform_insert(insert_stmt, hlc_timestamp)?;
                     }
                 }
                 Ok(None)
@@ -156,18 +169,10 @@ impl CrdtTransformer {
                 }
                 Ok(None)
             }
-            Statement::Delete(del_stmt) => {
+            Statement::Delete(_del_stmt) => {
-                if let Some(table_name) = self.extract_table_name_from_delete(del_stmt) {
+                // Hard Delete - keine Transformation!
-                    if self.is_crdt_sync_table(&table_name) {
+                // DELETE bleibt DELETE
-                        self.transform_delete_to_update(stmt, hlc_timestamp)?;
-                    }
                 Ok(None)
-                } else {
-                    Err(DatabaseError::UnsupportedStatement {
-                        sql: del_stmt.to_string(),
-                        reason: "DELETE from non-table source or multiple tables".to_string(),
-                    })
-                }
             }
             Statement::AlterTable { name, .. } => {
                 if self.is_crdt_sync_table(name) {
@@ -179,619 +184,4 @@ impl CrdtTransformer {
             _ => Ok(None),
         }
     }
-
-    /// Transformiert Query-Statements (fügt Tombstone-Filter hinzu)
-    fn transform_query_recursive(
-        &self,
-        query: &mut sqlparser::ast::Query,
-    ) -> Result<(), DatabaseError> {
-        self.add_tombstone_filters_recursive(&mut query.body)
-    }
-
-    /// Rekursive Behandlung aller SetExpr-Typen mit vollständiger Subquery-Unterstützung
-    fn add_tombstone_filters_recursive(&self, set_expr: &mut SetExpr) -> Result<(), DatabaseError> {
-        match set_expr {
-            SetExpr::Select(select) => {
-                self.add_tombstone_filters_to_select(select)?;
-
-                // Transformiere auch Subqueries in Projektionen
-                for projection in &mut select.projection {
-                    match projection {
-                        SelectItem::UnnamedExpr(expr) | SelectItem::ExprWithAlias { expr, .. } => {
-                            self.transform_expression_subqueries(expr)?;
-                        }
-                        _ => {} // Wildcard projections ignorieren
-                    }
-                }
-
-                // Transformiere Subqueries in WHERE
-                if let Some(where_clause) = &mut select.selection {
-                    self.transform_expression_subqueries(where_clause)?;
-                }
-
-                // Transformiere Subqueries in GROUP BY
-                match &mut select.group_by {
-                    sqlparser::ast::GroupByExpr::All(_) => {
-                        // GROUP BY ALL - keine Expressions zu transformieren
-                    }
-                    sqlparser::ast::GroupByExpr::Expressions(exprs, _) => {
-                        for group_expr in exprs {
-                            self.transform_expression_subqueries(group_expr)?;
-                        }
-                    }
-                }
-
-                // Transformiere Subqueries in HAVING
-                if let Some(having) = &mut select.having {
-                    self.transform_expression_subqueries(having)?;
-                }
-            }
-            SetExpr::SetOperation { left, right, .. } => {
-                self.add_tombstone_filters_recursive(left)?;
-                self.add_tombstone_filters_recursive(right)?;
-            }
-            SetExpr::Query(query) => {
-                self.add_tombstone_filters_recursive(&mut query.body)?;
-            }
-            SetExpr::Values(values) => {
-                // Transformiere auch Subqueries in Values-Listen
-                for row in &mut values.rows {
-                    for expr in row {
-                        self.transform_expression_subqueries(expr)?;
-                    }
-                }
-            }
-            _ => {} // Andere Fälle
-        }
-        Ok(())
-    }
-
-    /// Transformiert Subqueries innerhalb von Expressions
-    fn transform_expression_subqueries(&self, expr: &mut Expr) -> Result<(), DatabaseError> {
-        match expr {
-            // Einfache Subqueries
-            Expr::Subquery(query) => {
-                self.add_tombstone_filters_recursive(&mut query.body)?;
-            }
-            // EXISTS Subqueries
-            Expr::Exists { subquery, .. } => {
-                self.add_tombstone_filters_recursive(&mut subquery.body)?;
-            }
-            // IN Subqueries
-            Expr::InSubquery {
-                expr: left_expr,
-                subquery,
-                ..
-            } => {
-                self.transform_expression_subqueries(left_expr)?;
-                self.add_tombstone_filters_recursive(&mut subquery.body)?;
-            }
-            // ANY/ALL Subqueries
-            Expr::AnyOp { left, right, .. } | Expr::AllOp { left, right, .. } => {
-                self.transform_expression_subqueries(left)?;
-                self.transform_expression_subqueries(right)?;
-            }
-            // Binäre Operationen
-            Expr::BinaryOp { left, right, .. } => {
-                self.transform_expression_subqueries(left)?;
-                self.transform_expression_subqueries(right)?;
-            }
-            // Unäre Operationen
-            Expr::UnaryOp {
-                expr: inner_expr, ..
-            } => {
-                self.transform_expression_subqueries(inner_expr)?;
-            }
-            // Verschachtelte Ausdrücke
-            Expr::Nested(nested) => {
-                self.transform_expression_subqueries(nested)?;
-            }
-            // CASE-Ausdrücke
-            Expr::Case {
-                operand,
-                conditions,
-                else_result,
-                ..
-            } => {
-                if let Some(op) = operand {
-                    self.transform_expression_subqueries(op)?;
-                }
-                for case_when in conditions {
-                    self.transform_expression_subqueries(&mut case_when.condition)?;
-                    self.transform_expression_subqueries(&mut case_when.result)?;
-                }
-                if let Some(else_res) = else_result {
-                    self.transform_expression_subqueries(else_res)?;
-                }
-            }
-            // Funktionsaufrufe
-            Expr::Function(func) => match &mut func.args {
-                sqlparser::ast::FunctionArguments::List(sqlparser::ast::FunctionArgumentList {
-                    args,
-                    ..
-                }) => {
-                    for arg in args {
-                        if let sqlparser::ast::FunctionArg::Unnamed(
-                            sqlparser::ast::FunctionArgExpr::Expr(expr),
-                        ) = arg
-                        {
-                            self.transform_expression_subqueries(expr)?;
-                        }
-                    }
-                }
-                _ => {}
-            },
-            // BETWEEN
-            Expr::Between {
-                expr: main_expr,
-                low,
-                high,
-                ..
-            } => {
-                self.transform_expression_subqueries(main_expr)?;
-                self.transform_expression_subqueries(low)?;
-                self.transform_expression_subqueries(high)?;
-            }
-            // IN Liste
-            Expr::InList {
-                expr: main_expr,
-                list,
-                ..
-            } => {
-                self.transform_expression_subqueries(main_expr)?;
-                for list_expr in list {
-                    self.transform_expression_subqueries(list_expr)?;
-                }
-            }
-            // IS NULL/IS NOT NULL
-            Expr::IsNull(inner) | Expr::IsNotNull(inner) => {
-                self.transform_expression_subqueries(inner)?;
-            }
-            // Andere Expression-Typen benötigen keine Transformation
-            _ => {}
-        }
-        Ok(())
-    }
-
-    /// Fügt Tombstone-Filter zu SELECT-Statements hinzu (nur wenn nicht explizit in WHERE gesetzt)
-    fn add_tombstone_filters_to_select(
-        &self,
-        select: &mut sqlparser::ast::Select,
-    ) -> Result<(), DatabaseError> {
-        // Sammle alle CRDT-Tabellen mit ihren Aliasen
-        let mut crdt_tables = Vec::new();
-        for twj in &select.from {
-            if let TableFactor::Table { name, alias, .. } = &twj.relation {
-                if self.is_crdt_sync_table(name) {
-                    let table_alias = alias.as_ref().map(|a| a.name.value.as_str());
-                    crdt_tables.push((name.clone(), table_alias));
-                }
-            }
-        }
-
-        if crdt_tables.is_empty() {
-            return Ok(());
-        }
-
-        // Prüfe, welche Tombstone-Spalten bereits in der WHERE-Klausel referenziert werden
-        let explicitly_filtered_tables = if let Some(where_clause) = &select.selection {
-            self.find_explicitly_filtered_tombstone_tables(where_clause, &crdt_tables)
-        } else {
-            HashSet::new()
-        };
-
-        // Erstelle Filter nur für Tabellen, die noch nicht explizit gefiltert werden
-        let mut tombstone_filters = Vec::new();
-        for (table_name, table_alias) in crdt_tables {
-            let table_name_string = table_name.to_string();
-            let table_key = table_alias.unwrap_or(&table_name_string);
-            if !explicitly_filtered_tables.contains(table_key) {
-                tombstone_filters.push(self.columns.create_tombstone_filter(table_alias));
-            }
-        }
-
-        // Füge die automatischen Filter hinzu
-        if !tombstone_filters.is_empty() {
-            let combined_filter = tombstone_filters
-                .into_iter()
-                .reduce(|acc, expr| Expr::BinaryOp {
-                    left: Box::new(acc),
-                    op: BinaryOperator::And,
-                    right: Box::new(expr),
-                })
-                .unwrap();
-
-            match &mut select.selection {
-                Some(existing) => {
-                    *existing = Expr::BinaryOp {
-                        left: Box::new(existing.clone()),
-                        op: BinaryOperator::And,
-                        right: Box::new(combined_filter),
-                    };
-                }
-                None => {
-                    select.selection = Some(combined_filter);
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Findet alle Tabellen, die bereits explizit Tombstone-Filter in der WHERE-Klausel haben
-    fn find_explicitly_filtered_tombstone_tables(
-        &self,
-        where_expr: &Expr,
-        crdt_tables: &[(ObjectName, Option<&str>)],
-    ) -> HashSet<String> {
-        let mut filtered_tables = HashSet::new();
-        self.scan_expression_for_tombstone_references(
-            where_expr,
-            crdt_tables,
-            &mut filtered_tables,
-        );
-        filtered_tables
-    }
-
-    /// Rekursiv durchsucht einen Expression-Baum nach Tombstone-Spalten-Referenzen
-    fn scan_expression_for_tombstone_references(
-        &self,
-        expr: &Expr,
-        crdt_tables: &[(ObjectName, Option<&str>)],
-        filtered_tables: &mut HashSet<String>,
-    ) {
-        match expr {
-            // Einfache Spaltenreferenz: tombstone = ?
-            Expr::Identifier(ident) => {
-                if ident.value == self.columns.tombstone {
-                    // Wenn keine Tabelle spezifiziert ist und es nur eine CRDT-Tabelle gibt
-                    if crdt_tables.len() == 1 {
-                        let table_name_str = crdt_tables[0].0.to_string();
-                        let table_key = crdt_tables[0].1.unwrap_or(&table_name_str);
-                        filtered_tables.insert(table_key.to_string());
-                    }
-                }
-            }
-            // Qualifizierte Spaltenreferenz: table.tombstone = ? oder alias.tombstone = ?
-            Expr::CompoundIdentifier(idents) => {
-                if idents.len() == 2 && idents[1].value == self.columns.tombstone {
-                    let table_ref = &idents[0].value;
-
-                    // Prüfe, ob es eine unserer CRDT-Tabellen ist (nach Name oder Alias)
-                    for (table_name, alias) in crdt_tables {
-                        let table_name_str = table_name.to_string();
-                        if table_ref == &table_name_str || alias.map_or(false, |a| a == table_ref) {
-                            filtered_tables.insert(table_ref.clone());
-                            break;
-                        }
-                    }
-                }
-            }
-            // Binäre Operationen: AND, OR, etc.
-            Expr::BinaryOp { left, right, .. } => {
-                self.scan_expression_for_tombstone_references(left, crdt_tables, filtered_tables);
-                self.scan_expression_for_tombstone_references(right, crdt_tables, filtered_tables);
-            }
-            // Unäre Operationen: NOT, etc.
-            Expr::UnaryOp { expr, .. } => {
-                self.scan_expression_for_tombstone_references(expr, crdt_tables, filtered_tables);
-            }
-            // Verschachtelte Ausdrücke
-            Expr::Nested(nested) => {
-                self.scan_expression_for_tombstone_references(nested, crdt_tables, filtered_tables);
-            }
-            // IN-Klauseln
-            Expr::InList { expr, .. } => {
-                self.scan_expression_for_tombstone_references(expr, crdt_tables, filtered_tables);
-            }
-            // BETWEEN-Klauseln
-            Expr::Between { expr, .. } => {
-                self.scan_expression_for_tombstone_references(expr, crdt_tables, filtered_tables);
-            }
-            // IS NULL/IS NOT NULL
-            Expr::IsNull(expr) | Expr::IsNotNull(expr) => {
-                self.scan_expression_for_tombstone_references(expr, crdt_tables, filtered_tables);
-            }
-            // Funktionsaufrufe - KORRIGIERT
-            Expr::Function(func) => {
-                match &func.args {
-                    sqlparser::ast::FunctionArguments::List(
-                        sqlparser::ast::FunctionArgumentList { args, .. },
-                    ) => {
-                        for arg in args {
-                            if let sqlparser::ast::FunctionArg::Unnamed(
-                                sqlparser::ast::FunctionArgExpr::Expr(expr),
-                            ) = arg
-                            {
-                                self.scan_expression_for_tombstone_references(
-                                    expr,
-                                    crdt_tables,
-                                    filtered_tables,
-                                );
-                            }
-                        }
-                    }
-                    _ => {} // Andere FunctionArguments-Varianten ignorieren
-                }
-            }
-            // CASE-Ausdrücke - KORRIGIERT
-            Expr::Case {
-                operand,
-                conditions,
-                else_result,
-                ..
-            } => {
-                if let Some(op) = operand {
-                    self.scan_expression_for_tombstone_references(op, crdt_tables, filtered_tables);
-                }
-                for case_when in conditions {
-                    self.scan_expression_for_tombstone_references(
-                        &case_when.condition,
-                        crdt_tables,
-                        filtered_tables,
-                    );
-                    self.scan_expression_for_tombstone_references(
-                        &case_when.result,
-                        crdt_tables,
-                        filtered_tables,
-                    );
-                }
-                if let Some(else_res) = else_result {
-                    self.scan_expression_for_tombstone_references(
-                        else_res,
-                        crdt_tables,
-                        filtered_tables,
-                    );
-                }
-            }
-            // Subqueries mit vollständiger Unterstützung
-            Expr::Subquery(query) => {
-                self.transform_query_recursive_for_tombstone_analysis(
-                    query,
-                    crdt_tables,
-                    filtered_tables,
-                )
-                .ok();
-            }
-            // EXISTS/NOT EXISTS Subqueries
-            Expr::Exists { subquery, .. } => {
-                self.transform_query_recursive_for_tombstone_analysis(
-                    subquery,
-                    crdt_tables,
-                    filtered_tables,
-                )
-                .ok();
-            }
-            // IN/NOT IN Subqueries
-            Expr::InSubquery { expr, subquery, .. } => {
-                self.scan_expression_for_tombstone_references(expr, crdt_tables, filtered_tables);
-                self.transform_query_recursive_for_tombstone_analysis(
-                    subquery,
-                    crdt_tables,
-                    filtered_tables,
-                )
-                .ok();
-            }
-            // ANY/ALL Subqueries
-            Expr::AnyOp { left, right, .. } | Expr::AllOp { left, right, .. } => {
-                self.scan_expression_for_tombstone_references(left, crdt_tables, filtered_tables);
-                self.scan_expression_for_tombstone_references(right, crdt_tables, filtered_tables);
-            }
-            // Andere Expression-Typen ignorieren wir für jetzt
-            _ => {}
-        }
-    }
-
-    /// Analysiert eine Subquery und sammelt Tombstone-Referenzen
-    fn transform_query_recursive_for_tombstone_analysis(
-        &self,
-        query: &sqlparser::ast::Query,
-        crdt_tables: &[(ObjectName, Option<&str>)],
-        filtered_tables: &mut HashSet<String>,
-    ) -> Result<(), DatabaseError> {
-        self.analyze_set_expr_for_tombstone_references(&query.body, crdt_tables, filtered_tables)
-    }
-
-    /// Rekursiv analysiert SetExpr für Tombstone-Referenzen
-    fn analyze_set_expr_for_tombstone_references(
-        &self,
-        set_expr: &SetExpr,
-        crdt_tables: &[(ObjectName, Option<&str>)],
-        filtered_tables: &mut HashSet<String>,
-    ) -> Result<(), DatabaseError> {
-        match set_expr {
-            SetExpr::Select(select) => {
-                // Analysiere WHERE-Klausel
-                if let Some(where_clause) = &select.selection {
-                    self.scan_expression_for_tombstone_references(
-                        where_clause,
-                        crdt_tables,
-                        filtered_tables,
-                    );
-                }
-
-                // Analysiere alle Projektionen (können auch Subqueries enthalten)
-                for projection in &select.projection {
-                    match projection {
-                        SelectItem::UnnamedExpr(expr) | SelectItem::ExprWithAlias { expr, .. } => {
-                            self.scan_expression_for_tombstone_references(
-                                expr,
-                                crdt_tables,
-                                filtered_tables,
-                            );
-                        }
-                        _ => {} // Wildcard projections ignorieren
-                    }
-                }
-
-                // Analysiere GROUP BY
-                match &select.group_by {
-                    sqlparser::ast::GroupByExpr::All(_) => {
-                        // GROUP BY ALL - keine Expressions zu analysieren
-                    }
-                    sqlparser::ast::GroupByExpr::Expressions(exprs, _) => {
-                        for group_expr in exprs {
-                            self.scan_expression_for_tombstone_references(
-                                group_expr,
-                                crdt_tables,
-                                filtered_tables,
-                            );
-                        }
-                    }
-                }
-
-                // Analysiere HAVING
-                if let Some(having) = &select.having {
-                    self.scan_expression_for_tombstone_references(
-                        having,
-                        crdt_tables,
-                        filtered_tables,
-                    );
-                }
-            }
-            SetExpr::SetOperation { left, right, .. } => {
-                self.analyze_set_expr_for_tombstone_references(left, crdt_tables, filtered_tables)?;
-                self.analyze_set_expr_for_tombstone_references(
-                    right,
-                    crdt_tables,
-                    filtered_tables,
-                )?;
-            }
-            SetExpr::Query(query) => {
-                self.analyze_set_expr_for_tombstone_references(
-                    &query.body,
-                    crdt_tables,
-                    filtered_tables,
-                )?;
-            }
-            SetExpr::Values(values) => {
-                // Analysiere Values-Listen
-                for row in &values.rows {
-                    for expr in row {
-                        self.scan_expression_for_tombstone_references(
-                            expr,
-                            crdt_tables,
-                            filtered_tables,
-                        );
-                    }
-                }
-            }
-            _ => {} // Andere Varianten
-        }
-        Ok(())
-    }
-
-    /// Transformiert INSERT-Statements (fügt HLC-Timestamp hinzu)
-    fn transform_insert(
-        &self,
-        insert_stmt: &mut Insert,
-        timestamp: &Timestamp,
-    ) -> Result<(), DatabaseError> {
-        // Add both haex_timestamp and haex_tombstone columns
-        insert_stmt
-            .columns
-            .push(Ident::new(self.columns.hlc_timestamp));
-        insert_stmt
-            .columns
-            .push(Ident::new(self.columns.tombstone));
-
-        match insert_stmt.source.as_mut() {
-            Some(query) => match &mut *query.body {
-                SetExpr::Values(values) => {
-                    for row in &mut values.rows {
-                        // Add haex_timestamp value
-                        row.push(Expr::Value(
-                            Value::SingleQuotedString(timestamp.to_string()).into(),
-                        ));
-                        // Add haex_tombstone value (0 = not deleted)
-                        row.push(Expr::Value(
-                            Value::Number("0".to_string(), false).into(),
-                        ));
-                    }
-                }
-                SetExpr::Select(select) => {
-                    let hlc_expr =
-                        Expr::Value(Value::SingleQuotedString(timestamp.to_string()).into());
-                    select.projection.push(SelectItem::UnnamedExpr(hlc_expr));
-                    // Add haex_tombstone value (0 = not deleted)
-                    let tombstone_expr =
-                        Expr::Value(Value::Number("0".to_string(), false).into());
-                    select.projection.push(SelectItem::UnnamedExpr(tombstone_expr));
-                }
-                _ => {
-                    return Err(DatabaseError::UnsupportedStatement {
-                        sql: insert_stmt.to_string(),
-                        reason: "INSERT with unsupported source type".to_string(),
-                    });
-                }
-            },
-            None => {
-                return Err(DatabaseError::UnsupportedStatement {
-                    reason: "INSERT statement has no source".to_string(),
-                    sql: insert_stmt.to_string(),
-                });
-            }
-        }
-        Ok(())
-    }
-
-    /// Transformiert DELETE zu UPDATE (soft delete)
-    fn transform_delete_to_update(
-        &self,
-        stmt: &mut Statement,
-        timestamp: &Timestamp,
-    ) -> Result<(), DatabaseError> {
-        if let Statement::Delete(del_stmt) = stmt {
-            let table_to_update = match &del_stmt.from {
-                sqlparser::ast::FromTable::WithFromKeyword(from)
-                | sqlparser::ast::FromTable::WithoutKeyword(from) => {
-                    if from.len() == 1 {
-                        from[0].clone()
-                    } else {
-                        return Err(DatabaseError::UnsupportedStatement {
-                            reason: "DELETE with multiple tables not supported".to_string(),
-                            sql: stmt.to_string(),
-                        });
-                    }
-                }
-            };
-
-            let assignments = vec![
-                self.columns.create_tombstone_assignment(),
-                self.columns.create_hlc_assignment(timestamp),
-            ];
-
-            *stmt = Statement::Update {
-                table: table_to_update,
-                assignments,
-                from: None,
-                selection: del_stmt.selection.clone(),
-                returning: None,
-                or: None,
-                limit: None,
-            };
-        }
-        Ok(())
-    }
-
-    /// Extrahiert Tabellennamen aus DELETE-Statement
-    fn extract_table_name_from_delete(
-        &self,
-        del_stmt: &sqlparser::ast::Delete,
-    ) -> Option<ObjectName> {
-        let tables = match &del_stmt.from {
-            sqlparser::ast::FromTable::WithFromKeyword(from)
-            | sqlparser::ast::FromTable::WithoutKeyword(from) => from,
-        };
-
-        if tables.len() == 1 {
-            if let TableFactor::Table { name, .. } = &tables[0].relation {
-                Some(name.clone())
-            } else {
-                None
-            }
-        } else {
-            None
-        }
-    }
 }

src-tauri/src/crdt/trigger.rs

@@ -9,20 +9,17 @@ use ts_rs::TS;
 // Der "z_"-Präfix soll sicherstellen, dass diese Trigger als Letzte ausgeführt werden
 const INSERT_TRIGGER_TPL: &str = "z_crdt_{TABLE_NAME}_insert";
 const UPDATE_TRIGGER_TPL: &str = "z_crdt_{TABLE_NAME}_update";
+const DELETE_TRIGGER_TPL: &str = "z_crdt_{TABLE_NAME}_delete";
 
-//const SYNC_ACTIVE_KEY: &str = "sync_active";
-pub const TOMBSTONE_COLUMN: &str = "haex_tombstone";
 pub const HLC_TIMESTAMP_COLUMN: &str = "haex_timestamp";
 
+/// Name der custom UUID-Generierungs-Funktion (registriert in database::core::open_and_init_db)
+pub const UUID_FUNCTION_NAME: &str = "gen_uuid";
+
 #[derive(Debug)]
 pub enum CrdtSetupError {
     /// Kapselt einen Fehler, der von der rusqlite-Bibliothek kommt.
     DatabaseError(rusqlite::Error),
-    /// Die Tabelle hat keine Tombstone-Spalte, was eine CRDT-Voraussetzung ist.
-    TombstoneColumnMissing {
-        table_name: String,
-        column_name: String,
-    },
     HlcColumnMissing {
         table_name: String,
         column_name: String,
@@ -36,14 +33,6 @@ impl Display for CrdtSetupError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
             CrdtSetupError::DatabaseError(e) => write!(f, "Database error: {}", e),
-            CrdtSetupError::TombstoneColumnMissing {
-                table_name,
-                column_name,
-            } => write!(
-                f,
-                "Table '{}' is missing the required tombstone column '{}'",
-                table_name, column_name
-            ),
             CrdtSetupError::HlcColumnMissing {
                 table_name,
                 column_name,
@@ -78,14 +67,14 @@ pub enum TriggerSetupResult {
     TableNotFound,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
-struct ColumnInfo {
+pub struct ColumnInfo {
-    name: String,
+    pub name: String,
-    is_pk: bool,
+    pub is_pk: bool,
 }
 
 impl ColumnInfo {
-    fn from_row(row: &Row) -> RusqliteResult<Self> {
+    pub fn from_row(row: &Row) -> RusqliteResult<Self> {
         Ok(ColumnInfo {
             name: row.get("name")?,
             is_pk: row.get::<_, i64>("pk")? > 0,
@@ -94,7 +83,8 @@ impl ColumnInfo {
 }
 
 fn is_safe_identifier(name: &str) -> bool {
-    !name.is_empty() && name.chars().all(|c| c.is_alphanumeric() || c == '_')
+    // Allow alphanumeric characters, underscores, and hyphens (for extension names like "nuxt-app")
+    !name.is_empty() && name.chars().all(|c| c.is_alphanumeric() || c == '_' || c == '-')
 }
 
 /// Richtet CRDT-Trigger für eine einzelne Tabelle ein.
@@ -109,13 +99,6 @@ pub fn setup_triggers_for_table(
         return Ok(TriggerSetupResult::TableNotFound);
     }
 
-    if !columns.iter().any(|c| c.name == TOMBSTONE_COLUMN) {
-        return Err(CrdtSetupError::TombstoneColumnMissing {
-            table_name: table_name.to_string(),
-            column_name: TOMBSTONE_COLUMN.to_string(),
-        });
-    }
-
     if !columns.iter().any(|c| c.name == HLC_TIMESTAMP_COLUMN) {
         return Err(CrdtSetupError::HlcColumnMissing {
             table_name: table_name.to_string(),
@@ -137,12 +120,13 @@ pub fn setup_triggers_for_table(
 
     let cols_to_track: Vec<String> = columns
         .iter()
-        .filter(|c| !c.is_pk) //&& c.name != TOMBSTONE_COLUMN && c.name != HLC_TIMESTAMP_COLUMN
+        .filter(|c| !c.is_pk)
         .map(|c| c.name.clone())
         .collect();
 
     let insert_trigger_sql = generate_insert_trigger_sql(table_name, &pks, &cols_to_track);
     let update_trigger_sql = generate_update_trigger_sql(table_name, &pks, &cols_to_track);
+    let delete_trigger_sql = generate_delete_trigger_sql(table_name, &pks, &cols_to_track);
 
     if recreate {
         drop_triggers_for_table(&tx, table_name)?;
@@ -150,12 +134,13 @@ pub fn setup_triggers_for_table(
 
     tx.execute_batch(&insert_trigger_sql)?;
     tx.execute_batch(&update_trigger_sql)?;
+    tx.execute_batch(&delete_trigger_sql)?;
 
     Ok(TriggerSetupResult::Success)
 }
 
 /// Holt das Schema für eine gegebene Tabelle.
-fn get_table_schema(conn: &Connection, table_name: &str) -> RusqliteResult<Vec<ColumnInfo>> {
+pub fn get_table_schema(conn: &Connection, table_name: &str) -> RusqliteResult<Vec<ColumnInfo>> {
     if !is_safe_identifier(table_name) {
         return Err(rusqlite::Error::InvalidParameterName(format!(
             "Invalid or unsafe table name provided: {}",
@@ -170,6 +155,8 @@ fn get_table_schema(conn: &Connection, table_name: &str) -> RusqliteResult<Vec<C
     rows.collect()
 }
 
+// get_foreign_key_columns() removed - not needed with hard deletes (no ON CONFLICT logic)
+
 pub fn drop_triggers_for_table(
     tx: &Transaction, // Arbeitet direkt auf einer Transaktion
     table_name: &str,
@@ -186,8 +173,13 @@ pub fn drop_triggers_for_table(
         drop_trigger_sql(INSERT_TRIGGER_TPL.replace("{TABLE_NAME}", table_name));
     let drop_update_trigger_sql =
         drop_trigger_sql(UPDATE_TRIGGER_TPL.replace("{TABLE_NAME}", table_name));
+    let drop_delete_trigger_sql =
+        drop_trigger_sql(DELETE_TRIGGER_TPL.replace("{TABLE_NAME}", table_name));
 
-    let sql_batch = format!("{}\n{}", drop_insert_trigger_sql, drop_update_trigger_sql);
+    let sql_batch = format!(
+        "{}\n{}\n{}",
+        drop_insert_trigger_sql, drop_update_trigger_sql, drop_delete_trigger_sql
+    );
 
     tx.execute_batch(&sql_batch)?;
     Ok(())
@@ -259,9 +251,10 @@ fn generate_insert_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
     let column_inserts = if cols.is_empty() {
         // Nur PKs -> einfacher Insert ins Log
         format!(
-            "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks)
+            "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks)
-            VALUES (NEW.\"{hlc_col}\", 'INSERT', '{table}', json_object({pk_payload}));",
+            VALUES ({uuid_fn}(), NEW.\"{hlc_col}\", 'INSERT', '{table}', json_object({pk_payload}));",
             log_table = TABLE_CRDT_LOGS,
+            uuid_fn = UUID_FUNCTION_NAME,
             hlc_col = HLC_TIMESTAMP_COLUMN,
             table = table_name,
             pk_payload = pk_json_payload
@@ -270,9 +263,10 @@ fn generate_insert_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
         cols.iter().fold(String::new(), |mut acc, col| {
             writeln!(
                 &mut acc,
-                "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks, column_name, new_value)
+                "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks, column_name, new_value)
-                VALUES (NEW.\"{hlc_col}\", 'INSERT', '{table}', json_object({pk_payload}), '{column}', json_object('value', NEW.\"{column}\"));",
+                VALUES ({uuid_fn}(), NEW.\"{hlc_col}\", 'INSERT', '{table}', json_object({pk_payload}), '{column}', json_object('value', NEW.\"{column}\"));",
                 log_table = TABLE_CRDT_LOGS,
+                uuid_fn = UUID_FUNCTION_NAME,
                 hlc_col = HLC_TIMESTAMP_COLUMN,
                 table = table_name,
                 pk_payload = pk_json_payload,
@@ -314,11 +308,12 @@ fn generate_update_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
         for col in cols {
             writeln!(
                 &mut body,
-                "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks, column_name, new_value, old_value)
+                "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks, column_name, new_value, old_value)
-                    SELECT NEW.\"{hlc_col}\", 'UPDATE', '{table}', json_object({pk_payload}), '{column}',
+                    SELECT {uuid_fn}(), NEW.\"{hlc_col}\", 'UPDATE', '{table}', json_object({pk_payload}), '{column}',
                     json_object('value', NEW.\"{column}\"), json_object('value', OLD.\"{column}\")
                     WHERE NEW.\"{column}\" IS NOT OLD.\"{column}\";",
                 log_table = TABLE_CRDT_LOGS,
+                uuid_fn = UUID_FUNCTION_NAME,
                 hlc_col = HLC_TIMESTAMP_COLUMN,
                 table = table_name,
                 pk_payload = pk_json_payload,
@@ -327,19 +322,7 @@ fn generate_update_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
         }
     }
 
-    // Soft-delete loggen
+    // Soft-delete Logging entfernt - wir nutzen jetzt Hard Deletes mit eigenem BEFORE DELETE Trigger
-    writeln!(
-        &mut body,
-        "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks)
-            SELECT NEW.\"{hlc_col}\", 'DELETE', '{table}', json_object({pk_payload})
-            WHERE NEW.\"{tombstone_col}\" = 1 AND OLD.\"{tombstone_col}\" = 0;",
-        log_table = TABLE_CRDT_LOGS,
-        hlc_col = HLC_TIMESTAMP_COLUMN,
-        table = table_name,
-        pk_payload = pk_json_payload,
-        tombstone_col = TOMBSTONE_COLUMN
-    )
-    .unwrap();
 
     let trigger_name = UPDATE_TRIGGER_TPL.replace("{TABLE_NAME}", table_name);
 
@@ -352,3 +335,57 @@ fn generate_update_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
             END;"
     )
 }
+
+/// Generiert das SQL für den BEFORE DELETE-Trigger.
+/// WICHTIG: BEFORE DELETE damit die Daten noch verfügbar sind!
+fn generate_delete_trigger_sql(table_name: &str, pks: &[String], cols: &[String]) -> String {
+    let pk_json_payload = pks
+        .iter()
+        .map(|pk| format!("'{}', OLD.\"{}\"", pk, pk))
+        .collect::<Vec<_>>()
+        .join(", ");
+
+    let mut body = String::new();
+
+    // Alle Spaltenwerte speichern für mögliche Wiederherstellung
+    if !cols.is_empty() {
+        for col in cols {
+            writeln!(
+                &mut body,
+                "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks, column_name, old_value)
+                    VALUES ({uuid_fn}(), OLD.\"{hlc_col}\", 'DELETE', '{table}', json_object({pk_payload}), '{column}',
+                    json_object('value', OLD.\"{column}\"));",
+                log_table = TABLE_CRDT_LOGS,
+                uuid_fn = UUID_FUNCTION_NAME,
+                hlc_col = HLC_TIMESTAMP_COLUMN,
+                table = table_name,
+                pk_payload = pk_json_payload,
+                column = col
+            ).unwrap();
+        }
+    } else {
+        // Nur PKs -> minimales Delete Log
+        writeln!(
+            &mut body,
+            "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks)
+                VALUES ({uuid_fn}(), OLD.\"{hlc_col}\", 'DELETE', '{table}', json_object({pk_payload}));",
+            log_table = TABLE_CRDT_LOGS,
+            uuid_fn = UUID_FUNCTION_NAME,
+            hlc_col = HLC_TIMESTAMP_COLUMN,
+            table = table_name,
+            pk_payload = pk_json_payload
+        )
+        .unwrap();
+    }
+
+    let trigger_name = DELETE_TRIGGER_TPL.replace("{TABLE_NAME}", table_name);
+
+    format!(
+        "CREATE TRIGGER IF NOT EXISTS \"{trigger_name}\"
+            BEFORE DELETE ON \"{table_name}\"
+            FOR EACH ROW
+            BEGIN
+            {body}
+            END;"
+    )
+}

src-tauri/src/database/core.rs

@@ -1,8 +1,11 @@
 // src-tauri/src/database/core.rs
 
+use crate::crdt::trigger::UUID_FUNCTION_NAME;
 use crate::database::error::DatabaseError;
 use crate::database::DbConnection;
+use crate::extension::database::executor::SqlExecutor;
 use base64::{engine::general_purpose::STANDARD, Engine as _};
+use rusqlite::functions::FunctionFlags;
 use rusqlite::types::Value as SqlValue;
 use rusqlite::{
     types::{Value as RusqliteValue, ValueRef},
@@ -12,9 +15,9 @@ use serde_json::Value as JsonValue;
 use sqlparser::ast::{Expr, Query, Select, SetExpr, Statement, TableFactor, TableObject};
 use sqlparser::dialect::SQLiteDialect;
 use sqlparser::parser::Parser;
+use uuid::Uuid;
 
 /// Öffnet und initialisiert eine Datenbank mit Verschlüsselung
-///
 pub fn open_and_init_db(path: &str, key: &str, create: bool) -> Result<Connection, DatabaseError> {
     let flags = if create {
         OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_CREATE
@@ -34,6 +37,19 @@ pub fn open_and_init_db(path: &str, key: &str, create: bool) -> Result<Connectio
             reason: e.to_string(),
         })?;
 
+    // Register custom UUID function for SQLite triggers
+    conn.create_scalar_function(
+        UUID_FUNCTION_NAME,
+        0,
+        FunctionFlags::SQLITE_UTF8 | FunctionFlags::SQLITE_DETERMINISTIC,
+        |_ctx| {
+            Ok(Uuid::new_v4().to_string())
+        },
+    )
+    .map_err(|e| DatabaseError::DatabaseError {
+        reason: format!("Failed to register {} function: {}", UUID_FUNCTION_NAME, e),
+    })?;
+
     let journal_mode: String = conn
         .query_row("PRAGMA journal_mode=WAL;", [], |row| row.get(0))
         .map_err(|e| DatabaseError::PragmaError {
@@ -73,12 +89,29 @@ pub fn parse_single_statement(sql: &str) -> Result<Statement, DatabaseError> {
 /// Utility für SQL-Parsing - parst mehrere SQL-Statements
 pub fn parse_sql_statements(sql: &str) -> Result<Vec<Statement>, DatabaseError> {
     let dialect = SQLiteDialect {};
-    Parser::parse_sql(&dialect, sql).map_err(|e| DatabaseError::ParseError {
+
-        reason: e.to_string(),
+    // Normalize whitespace: replace multiple whitespaces (including newlines, tabs) with single space
+    let normalized_sql = sql
+        .split_whitespace()
+        .collect::<Vec<&str>>()
+        .join(" ");
+
+    Parser::parse_sql(&dialect, &normalized_sql).map_err(|e| DatabaseError::ParseError {
+        reason: format!("Failed to parse SQL: {}", e),
         sql: sql.to_string(),
     })
 }
 
+/// Prüft ob ein Statement ein RETURNING Clause hat (AST-basiert, sicher)
+pub fn statement_has_returning(statement: &Statement) -> bool {
+    match statement {
+        Statement::Insert(insert) => insert.returning.is_some(),
+        Statement::Update { returning, .. } => returning.is_some(),
+        Statement::Delete(delete) => delete.returning.is_some(),
+        _ => false,
+    }
+}
+
 pub struct ValueConverter;
 
 impl ValueConverter {
@@ -116,6 +149,25 @@ impl ValueConverter {
     }
 }
 
+/// Execute SQL mit CRDT-Transformation (für Drizzle-Integration)
+/// Diese Funktion sollte von Drizzle verwendet werden, um CRDT-Support zu erhalten
+pub fn execute_with_crdt(
+    sql: String,
+    params: Vec<JsonValue>,
+    connection: &DbConnection,
+    hlc_service: &std::sync::MutexGuard<crate::crdt::hlc::HlcService>,
+) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
+    with_connection(connection, |conn| {
+        let tx = conn.transaction().map_err(DatabaseError::from)?;
+        let _modified_tables = SqlExecutor::execute_internal(&tx, hlc_service, &sql, &params)?;
+        tx.commit().map_err(DatabaseError::from)?;
+
+        // Für Drizzle: gebe leeres Array zurück (wie bei execute ohne RETURNING)
+        Ok(vec![])
+    })
+}
+
+/// Execute SQL OHNE CRDT-Transformation (für spezielle Fälle)
 pub fn execute(
     sql: String,
     params: Vec<JsonValue>,
@@ -129,45 +181,23 @@ pub fn execute(
     let params_sql: Vec<&dyn ToSql> = params_converted.iter().map(|v| v as &dyn ToSql).collect();
 
     with_connection(connection, |conn| {
-        // Check if the SQL contains RETURNING clause
+        if sql.to_uppercase().contains("RETURNING") {
-        let has_returning = sql.to_uppercase().contains("RETURNING");
+            let mut stmt = conn.prepare(&sql)?;
-
-        if has_returning {
-            // Use prepare + query for RETURNING statements
-            let mut stmt = conn.prepare(&sql).map_err(|e| DatabaseError::PrepareError {
-                reason: e.to_string(),
-            })?;
-
             let num_columns = stmt.column_count();
-            let mut rows = stmt
+            let mut rows = stmt.query(&params_sql[..])?;
-                .query(&params_sql[..])
-                .map_err(|e| DatabaseError::QueryError {
-                    reason: e.to_string(),
-                })?;
-
             let mut result_vec: Vec<Vec<JsonValue>> = Vec::new();
 
-            while let Some(row) = rows.next().map_err(|e| DatabaseError::RowProcessingError {
+            while let Some(row) = rows.next()? {
-                reason: format!("Row iteration error: {}", e),
-            })? {
                 let mut row_values: Vec<JsonValue> = Vec::with_capacity(num_columns);
-
                 for i in 0..num_columns {
-                    let value_ref = row.get_ref(i).map_err(|e| {
+                    let value_ref = row.get_ref(i)?;
-                        DatabaseError::RowProcessingError {
-                            reason: format!("Failed to get column {}: {}", i, e),
-                        }
-                    })?;
-
                     let json_val = convert_value_ref_to_json(value_ref)?;
                     row_values.push(json_val);
                 }
                 result_vec.push(row_values);
             }
-
             Ok(result_vec)
         } else {
-            // For non-RETURNING statements, just execute and return empty array
             conn.execute(&sql, &params_sql[..]).map_err(|e| {
                 let table_name = extract_primary_table_name_from_sql(&sql).unwrap_or(None);
                 DatabaseError::ExecutionError {
@@ -176,7 +206,6 @@ pub fn execute(
                     table: table_name,
                 }
             })?;
-
             Ok(vec![])
         }
     })
@@ -206,46 +235,36 @@ pub fn select(
     let params_sql: Vec<&dyn ToSql> = params_converted.iter().map(|v| v as &dyn ToSql).collect();
 
     with_connection(connection, |conn| {
-        let mut stmt = conn
+        let mut stmt = conn.prepare(&sql)?;
-            .prepare(&sql)
-            .map_err(|e| DatabaseError::PrepareError {
-                reason: e.to_string(),
-            })?;
-
         let num_columns = stmt.column_count();
-
+        let mut rows = stmt.query(&params_sql[..])?;
-        let mut rows = stmt
-            .query(&params_sql[..])
-            .map_err(|e| DatabaseError::QueryError {
-                reason: e.to_string(),
-            })?;
-
         let mut result_vec: Vec<Vec<JsonValue>> = Vec::new();
 
-        while let Some(row) = rows.next().map_err(|e| DatabaseError::RowProcessingError {
+        while let Some(row) = rows.next()? {
-            reason: format!("Row iteration error: {}", e),
-        })? {
             let mut row_values: Vec<JsonValue> = Vec::with_capacity(num_columns);
-
             for i in 0..num_columns {
-                let value_ref = row
+                let value_ref = row.get_ref(i)?;
-                    .get_ref(i)
-                    .map_err(|e| DatabaseError::RowProcessingError {
-                        reason: format!("Failed to get column {}: {}", i, e),
-                    })?;
-
                 let json_val = convert_value_ref_to_json(value_ref)?;
                 row_values.push(json_val);
             }
             result_vec.push(row_values);
         }
-
         Ok(result_vec)
     })
 }
 
+pub fn select_with_crdt(
+    sql: String,
+    params: Vec<JsonValue>,
+    connection: &DbConnection,
+) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
+    with_connection(&connection, |conn| {
+        SqlExecutor::query_select(conn, &sql, &params)
+    })
+}
+
 /// Konvertiert rusqlite ValueRef zu JSON
-fn convert_value_ref_to_json(value_ref: ValueRef) -> Result<JsonValue, DatabaseError> {
+pub fn convert_value_ref_to_json(value_ref: ValueRef) -> Result<JsonValue, DatabaseError> {
     let json_val = match value_ref {
         ValueRef::Null => JsonValue::Null,
         ValueRef::Integer(i) => JsonValue::Number(i.into()),

src-tauri/src/database/generated.rs

@@ -16,8 +16,6 @@ pub struct HaexSettings {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub value: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub haex_tombstone: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub haex_timestamp: Option<String>,
 }
 
@@ -28,8 +26,7 @@ impl HaexSettings {
             key: row.get(1)?,
             r#type: row.get(2)?,
             value: row.get(3)?,
-            haex_tombstone: row.get(4)?,
+            haex_timestamp: row.get(4)?,
-            haex_timestamp: row.get(5)?,
         })
     }
 }
@@ -54,8 +51,6 @@ pub struct HaexExtensions {
     pub icon: Option<String>,
     pub signature: String,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub haex_tombstone: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub haex_timestamp: Option<String>,
 }
 
@@ -73,8 +68,7 @@ impl HaexExtensions {
             enabled: row.get(8)?,
             icon: row.get(9)?,
             signature: row.get(10)?,
-            haex_tombstone: row.get(11)?,
+            haex_timestamp: row.get(11)?,
-            haex_timestamp: row.get(12)?,
         })
     }
 }
@@ -83,8 +77,7 @@ impl HaexExtensions {
 #[serde(rename_all = "camelCase")]
 pub struct HaexExtensionPermissions {
     pub id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub extension_id: String,
-    pub extension_id: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub resource_type: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -99,8 +92,6 @@ pub struct HaexExtensionPermissions {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub updated_at: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub haex_tombstone: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub haex_timestamp: Option<String>,
 }
 
@@ -116,8 +107,7 @@ impl HaexExtensionPermissions {
             status: row.get(6)?,
             created_at: row.get(7)?,
             updated_at: row.get(8)?,
-            haex_tombstone: row.get(9)?,
+            haex_timestamp: row.get(9)?,
-            haex_timestamp: row.get(10)?,
         })
     }
 }
@@ -200,3 +190,51 @@ impl HaexCrdtConfigs {
     }
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct HaexDesktopItems {
+    pub id: String,
+    pub workspace_id: String,
+    pub item_type: String,
+    pub reference_id: String,
+    pub position_x: i64,
+    pub position_y: i64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub haex_timestamp: Option<String>,
+}
+
+impl HaexDesktopItems {
+    pub fn from_row(row: &rusqlite::Row) -> rusqlite::Result<Self> {
+        Ok(Self {
+            id: row.get(0)?,
+            workspace_id: row.get(1)?,
+            item_type: row.get(2)?,
+            reference_id: row.get(3)?,
+            position_x: row.get(4)?,
+            position_y: row.get(5)?,
+            haex_timestamp: row.get(6)?,
+        })
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct HaexWorkspaces {
+    pub id: String,
+    pub name: String,
+    pub position: i64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub haex_timestamp: Option<String>,
+}
+
+impl HaexWorkspaces {
+    pub fn from_row(row: &rusqlite::Row) -> rusqlite::Result<Self> {
+        Ok(Self {
+            id: row.get(0)?,
+            name: row.get(1)?,
+            position: row.get(2)?,
+            haex_timestamp: row.get(3)?,
+        })
+    }
+}
+

src-tauri/src/database/init.rs

@@ -0,0 +1,67 @@
+// src-tauri/src/database/init.rs
+// Database initialization utilities (trigger setup, etc.)
+
+use crate::crdt::trigger;
+use crate::database::error::DatabaseError;
+use crate::table_names::{
+    TABLE_DESKTOP_ITEMS,
+    TABLE_EXTENSIONS,
+    TABLE_EXTENSION_PERMISSIONS,
+    TABLE_NOTIFICATIONS,
+    TABLE_SETTINGS,
+    TABLE_WORKSPACES,
+};
+use rusqlite::{params, Connection};
+
+/// Liste aller CRDT-Tabellen die Trigger benötigen (ohne Password-Tabellen - die kommen in Extension)
+const CRDT_TABLES: &[&str] = &[
+    TABLE_SETTINGS,
+    TABLE_EXTENSIONS,
+    TABLE_EXTENSION_PERMISSIONS,
+    TABLE_NOTIFICATIONS,
+    TABLE_WORKSPACES,
+    TABLE_DESKTOP_ITEMS,
+];
+
+/// Prüft ob Trigger bereits initialisiert wurden und erstellt sie falls nötig
+///
+/// Diese Funktion wird beim ersten Öffnen einer Template-DB aufgerufen.
+/// Sie erstellt alle CRDT-Trigger für die definierten Tabellen und markiert
+/// die Initialisierung in haex_settings.
+///
+/// Bei Migrations (ALTER TABLE) werden Trigger automatisch neu erstellt,
+/// daher ist kein Versioning nötig.
+pub fn ensure_triggers_initialized(conn: &mut Connection) -> Result<bool, DatabaseError> {
+    let tx = conn.transaction()?;
+
+    // Check if triggers already initialized
+    let check_sql = format!(
+        "SELECT value FROM {} WHERE key = ? AND type = ?",
+        TABLE_SETTINGS
+    );
+    let initialized: Option<String> = tx
+        .query_row(
+            &check_sql,
+            params!["triggers_initialized", "system"],
+            |row| row.get(0),
+        )
+        .ok();
+
+    if initialized.is_some() {
+        eprintln!("DEBUG: Triggers already initialized, skipping");
+        tx.commit()?; // Wichtig: Transaktion trotzdem abschließen
+        return Ok(true); // true = war schon initialisiert
+    }
+
+    eprintln!("INFO: Initializing CRDT triggers for database...");
+
+    // Create triggers for all CRDT tables
+    for table_name in CRDT_TABLES {
+        eprintln!("  - Setting up triggers for: {}", table_name);
+        trigger::setup_triggers_for_table(&tx, table_name, false)?;
+    }
+
+    tx.commit()?;
+    eprintln!("INFO: ✓ CRDT triggers created successfully (flag pending)");
+    Ok(false) // false = wurde gerade initialisiert
+}

src-tauri/src/database/mod.rs

@@ -3,10 +3,13 @@
 pub mod core;
 pub mod error;
 pub mod generated;
+pub mod init;
 
 use crate::crdt::hlc::HlcService;
+use crate::database::core::execute_with_crdt;
 use crate::database::error::DatabaseError;
-use crate::table_names::TABLE_CRDT_CONFIGS;
+use crate::extension::database::executor::SqlExecutor;
+use crate::table_names::{TABLE_CRDT_CONFIGS, TABLE_SETTINGS};
 use crate::AppState;
 use rusqlite::Connection;
 use serde::{Deserialize, Serialize};
@@ -17,6 +20,8 @@ use std::time::UNIX_EPOCH;
 use std::{fs, sync::Arc};
 use tauri::{path::BaseDirectory, AppHandle, Manager, State};
 use tauri_plugin_fs::FsExt;
+#[cfg(not(target_os = "android"))]
+use trash;
 use ts_rs::TS;
 
 pub struct DbConnection(pub Arc<Mutex<Option<Connection>>>);
@@ -42,6 +47,46 @@ pub fn sql_execute(
     core::execute(sql, params, &state.db)
 }
 
+#[tauri::command]
+pub fn sql_select_with_crdt(
+    sql: String,
+    params: Vec<JsonValue>,
+    state: State<'_, AppState>,
+) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
+    core::select_with_crdt(sql, params, &state.db)
+}
+
+#[tauri::command]
+pub fn sql_execute_with_crdt(
+    sql: String,
+    params: Vec<JsonValue>,
+    state: State<'_, AppState>,
+) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
+    let hlc_service = state.hlc.lock().map_err(|_| DatabaseError::MutexPoisoned {
+        reason: "Failed to lock HLC service".to_string(),
+    })?;
+    core::execute_with_crdt(sql, params, &state.db, &hlc_service)
+}
+
+#[tauri::command]
+pub fn sql_query_with_crdt(
+    sql: String,
+    params: Vec<JsonValue>,
+    state: State<'_, AppState>,
+) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
+    let hlc_service = state.hlc.lock().map_err(|_| DatabaseError::MutexPoisoned {
+        reason: "Failed to lock HLC service".to_string(),
+    })?;
+
+    core::with_connection(&state.db, |conn| {
+        let tx = conn.transaction().map_err(DatabaseError::from)?;
+        let (_modified_tables, result) =
+            SqlExecutor::query_internal(&tx, &hlc_service, &sql, &params)?;
+        tx.commit().map_err(DatabaseError::from)?;
+        Ok(result)
+    })
+}
+
 /// Resolves a database name to the full vault path
 fn get_vault_path(app_handle: &AppHandle, vault_name: &str) -> Result<String, DatabaseError> {
     // Sicherstellen, dass der Name eine .db Endung hat
@@ -90,7 +135,6 @@ pub fn get_vaults_directory(app_handle: &AppHandle) -> Result<String, DatabaseEr
     Ok(vaults_dir.to_string_lossy().to_string())
 }
 
-//#[serde(tag = "type", content = "details")]
 #[derive(Debug, Serialize, Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
@@ -164,15 +208,33 @@ pub fn list_vaults(app_handle: AppHandle) -> Result<Vec<VaultInfo>, DatabaseErro
 
 /// Checks if a vault with the given name exists
 #[tauri::command]
-pub fn vault_exists(app_handle: AppHandle, db_name: String) -> Result<bool, DatabaseError> {
+pub fn vault_exists(app_handle: AppHandle, vault_name: String) -> Result<bool, DatabaseError> {
-    let vault_path = get_vault_path(&app_handle, &db_name)?;
+    let vault_path = get_vault_path(&app_handle, &vault_name)?;
     Ok(Path::new(&vault_path).exists())
 }
 
-/// Deletes a vault database file
+/// Moves a vault database file to trash (or deletes permanently if trash is unavailable)
 #[tauri::command]
-pub fn delete_vault(app_handle: AppHandle, db_name: String) -> Result<String, DatabaseError> {
+pub fn move_vault_to_trash(
-    let vault_path = get_vault_path(&app_handle, &db_name)?;
+    app_handle: AppHandle,
+    vault_name: String,
+) -> Result<String, DatabaseError> {
+    // On Android, trash is not available, so delete permanently
+    #[cfg(target_os = "android")]
+    {
+        println!(
+            "Android platform detected, permanently deleting vault '{}'",
+            vault_name
+        );
+        return delete_vault(app_handle, vault_name);
+    }
+
+    // On non-Android platforms, try to use trash
+    #[cfg(not(target_os = "android"))]
+    {
+        let vault_path = get_vault_path(&app_handle, &vault_name)?;
+        let vault_shm_path = format!("{}-shm", vault_path);
+        let vault_wal_path = format!("{}-wal", vault_path);
 
         if !Path::new(&vault_path).exists() {
             return Err(DatabaseError::IoError {
@@ -181,12 +243,63 @@ pub fn delete_vault(app_handle: AppHandle, db_name: String) -> Result<String, Da
             });
         }
 
+        // Try to move to trash first (works on desktop systems)
+        let moved_to_trash = trash::delete(&vault_path).is_ok();
+
+        if moved_to_trash {
+            // Also try to move auxiliary files to trash (ignore errors as they might not exist)
+            let _ = trash::delete(&vault_shm_path);
+            let _ = trash::delete(&vault_wal_path);
+
+            Ok(format!(
+                "Vault '{}' successfully moved to trash",
+                vault_name
+            ))
+        } else {
+            // Fallback: Permanent deletion if trash fails
+            println!(
+                "Trash not available, falling back to permanent deletion for vault '{}'",
+                vault_name
+            );
+            delete_vault(app_handle, vault_name)
+        }
+    }
+}
+
+/// Deletes a vault database file permanently (bypasses trash)
+#[tauri::command]
+pub fn delete_vault(app_handle: AppHandle, vault_name: String) -> Result<String, DatabaseError> {
+    let vault_path = get_vault_path(&app_handle, &vault_name)?;
+    let vault_shm_path = format!("{}-shm", vault_path);
+    let vault_wal_path = format!("{}-wal", vault_path);
+
+    if !Path::new(&vault_path).exists() {
+        return Err(DatabaseError::IoError {
+            path: vault_path,
+            reason: "Vault does not exist".to_string(),
+        });
+    }
+
+    if Path::new(&vault_shm_path).exists() {
+        fs::remove_file(&vault_shm_path).map_err(|e| DatabaseError::IoError {
+            path: vault_shm_path.clone(),
+            reason: format!("Failed to delete vault: {}", e),
+        })?;
+    }
+
+    if Path::new(&vault_wal_path).exists() {
+        fs::remove_file(&vault_wal_path).map_err(|e| DatabaseError::IoError {
+            path: vault_wal_path.clone(),
+            reason: format!("Failed to delete vault: {}", e),
+        })?;
+    }
+
     fs::remove_file(&vault_path).map_err(|e| DatabaseError::IoError {
         path: vault_path.clone(),
         reason: format!("Failed to delete vault: {}", e),
     })?;
 
-    Ok(format!("Vault '{}' successfully deleted", db_name))
+    Ok(format!("Vault '{}' successfully deleted", vault_name))
 }
 
 #[tauri::command]
@@ -336,9 +449,6 @@ pub fn open_encrypted_database(
     state: State<'_, AppState>,
 ) -> Result<String, DatabaseError> {
     println!("Opening encrypted database vault_path: {}", vault_path);
-
-    // Vault-Pfad aus dem Namen ableiten
-    //let vault_path = get_vault_path(&app_handle, &vault_name)?;
     println!("Resolved vault path: {}", vault_path);
 
     if !Path::new(&vault_path).exists() {
@@ -361,9 +471,12 @@ fn initialize_session(
     state: &State<'_, AppState>,
 ) -> Result<(), DatabaseError> {
     // 1. Establish the raw database connection
-    let conn = core::open_and_init_db(path, key, false)?;
+    let mut conn = core::open_and_init_db(path, key, false)?;
 
-    // 2. Initialize the HLC service
+    // 2. Ensure CRDT triggers are initialized (for template DB)
+    let triggers_were_already_initialized = init::ensure_triggers_initialized(&mut conn)?;
+
+    // 3. Initialize the HLC service
     let hlc_service = HlcService::try_initialize(&conn, app_handle).map_err(|e| {
         // We convert the HlcError into a DatabaseError
         DatabaseError::ExecutionError {
@@ -373,16 +486,53 @@ fn initialize_session(
         }
     })?;
 
-    // 3. Store everything in the global AppState
+    // 4. Store everything in the global AppState
     let mut db_guard = state.db.0.lock().map_err(|e| DatabaseError::LockError {
         reason: e.to_string(),
     })?;
+    // Wichtig: Wir brauchen den db_guard gleich nicht mehr,
+    // da 'execute_with_crdt' 'with_connection' aufruft, was
+    // 'state.db' selbst locken muss.
+    // Wir müssen den Guard freigeben, *bevor* wir 'execute_with_crdt' rufen,
+    // um einen Deadlock zu verhindern.
+    // Aber wir müssen die 'conn' erst hineinbewegen.
     *db_guard = Some(conn);
+    drop(db_guard);
 
     let mut hlc_guard = state.hlc.lock().map_err(|e| DatabaseError::LockError {
         reason: e.to_string(),
     })?;
     *hlc_guard = hlc_service;
 
+    // WICHTIG: hlc_guard *nicht* freigeben, da 'execute_with_crdt'
+    // eine Referenz auf die Guard erwartet.
+
+    // 5. NEUER SCHRITT: Setze das Flag via CRDT, falls nötig
+    if !triggers_were_already_initialized {
+        eprintln!("INFO: Setting 'triggers_initialized' flag via CRDT...");
+
+        let insert_sql = format!(
+            "INSERT INTO {} (id, key, type, value) VALUES (?, ?, ?, ?)",
+            TABLE_SETTINGS
+        );
+
+        // execute_with_crdt erwartet Vec<JsonValue>, kein params!-Makro
+        let params_vec: Vec<JsonValue> = vec![
+            JsonValue::String(uuid::Uuid::new_v4().to_string()),
+            JsonValue::String("triggers_initialized".to_string()),
+            JsonValue::String("system".to_string()),
+            JsonValue::String("1".to_string()),
+        ];
+
+        // Jetzt können wir 'execute_with_crdt' sicher aufrufen,
+        // da der AppState initialisiert ist.
+        execute_with_crdt(
+            insert_sql, params_vec, &state.db,  // Das &DbConnection (der Mutex)
+            &hlc_guard, // Die gehaltene MutexGuard
+        )?;
+
+        eprintln!("INFO: ✓ 'triggers_initialized' flag set.");
+    }
+
     Ok(())
 }

src-tauri/src/extension/core/manager.rs

@@ -10,7 +10,8 @@ use crate::extension::permissions::manager::PermissionManager;
 use crate::extension::permissions::types::ExtensionPermission;
 use crate::table_names::{TABLE_EXTENSIONS, TABLE_EXTENSION_PERMISSIONS};
 use crate::AppState;
-use std::collections::HashMap;
+use serde_json::Value as JsonValue;
+use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::io::Cursor;
 use std::path::PathBuf;
@@ -65,17 +66,124 @@ impl ExtensionManager {
         Self::default()
     }
 
+    /// Helper function to validate path and check for path traversal
+    /// Returns the cleaned path if valid, or None if invalid/not found
+    /// If require_exists is true, returns None if path doesn't exist
+    pub fn validate_path_in_directory(
+        base_dir: &PathBuf,
+        relative_path: &str,
+        require_exists: bool,
+    ) -> Result<Option<PathBuf>, ExtensionError> {
+        // Check for path traversal patterns
+        if relative_path.contains("..") {
+            return Err(ExtensionError::SecurityViolation {
+                reason: format!("Path traversal attempt: {}", relative_path),
+            });
+        }
+
+        // Clean the path (same logic as in protocol.rs)
+        let clean_path = relative_path
+            .replace('\\', "/")
+            .trim_start_matches('/')
+            .split('/')
+            .filter(|&part| !part.is_empty() && part != "." && part != "..")
+            .collect::<PathBuf>();
+
+        let full_path = base_dir.join(&clean_path);
+
+        // Check if file/directory exists (if required)
+        if require_exists && !full_path.exists() {
+            return Ok(None);
+        }
+
+        // Verify path is within base directory
+        let canonical_base = base_dir
+            .canonicalize()
+            .map_err(|e| ExtensionError::Filesystem { source: e })?;
+
+        if let Ok(canonical_path) = full_path.canonicalize() {
+            if !canonical_path.starts_with(&canonical_base) {
+                return Err(ExtensionError::SecurityViolation {
+                    reason: format!("Path outside base directory: {}", relative_path),
+                });
+            }
+            Ok(Some(canonical_path))
+        } else {
+            // Path doesn't exist yet - still validate it would be within base
+            if full_path.starts_with(&canonical_base) {
+                Ok(Some(full_path))
+            } else {
+                Err(ExtensionError::SecurityViolation {
+                    reason: format!("Path outside base directory: {}", relative_path),
+                })
+            }
+        }
+    }
+
+    /// Validates icon path and falls back to favicon.ico if not specified
+    fn validate_and_resolve_icon_path(
+        extension_dir: &PathBuf,
+        haextension_dir: &str,
+        icon_path: Option<&str>,
+    ) -> Result<Option<String>, ExtensionError> {
+        // If icon is specified in manifest, validate it
+        if let Some(icon) = icon_path {
+            if let Some(clean_path) = Self::validate_path_in_directory(extension_dir, icon, true)? {
+                return Ok(Some(clean_path.to_string_lossy().to_string()));
+            } else {
+                eprintln!("WARNING: Icon path specified in manifest not found: {}", icon);
+                // Continue to fallback logic
+            }
+        }
+
+        // Fallback 1: Check haextension/favicon.ico
+        let haextension_favicon = format!("{}/favicon.ico", haextension_dir);
+        if let Some(clean_path) = Self::validate_path_in_directory(extension_dir, &haextension_favicon, true)? {
+            return Ok(Some(clean_path.to_string_lossy().to_string()));
+        }
+
+        // Fallback 2: Check public/favicon.ico
+        if let Some(clean_path) = Self::validate_path_in_directory(extension_dir, "public/favicon.ico", true)? {
+            return Ok(Some(clean_path.to_string_lossy().to_string()));
+        }
+
+        // No icon found
+        Ok(None)
+    }
+
     /// Extrahiert eine Extension-ZIP-Datei und validiert das Manifest
     fn extract_and_validate_extension(
         bytes: Vec<u8>,
         temp_prefix: &str,
+        app_handle: &AppHandle,
     ) -> Result<ExtractedExtension, ExtensionError> {
-        let temp = std::env::temp_dir().join(format!("{}_{}", temp_prefix, uuid::Uuid::new_v4()));
+        // Use app_cache_dir for better Android compatibility
+        let cache_dir = app_handle
+            .path()
+            .app_cache_dir()
+            .map_err(|e| ExtensionError::InstallationFailed {
+                reason: format!("Cannot get app cache dir: {}", e),
+            })?;
 
+        let temp_id = uuid::Uuid::new_v4();
+        let temp = cache_dir.join(format!("{}_{}", temp_prefix, temp_id));
+        let zip_file_path = cache_dir.join(format!("{}_{}_{}.haextension", temp_prefix, temp_id, "temp"));
+
+        // Write bytes to a temporary ZIP file first (important for Android file system)
+        fs::write(&zip_file_path, &bytes).map_err(|e| {
+            ExtensionError::filesystem_with_path(zip_file_path.display().to_string(), e)
+        })?;
+
+        // Create extraction directory
         fs::create_dir_all(&temp)
             .map_err(|e| ExtensionError::filesystem_with_path(temp.display().to_string(), e))?;
 
-        let mut archive = ZipArchive::new(Cursor::new(bytes)).map_err(|e| {
+        // Open ZIP file from disk (more reliable on Android than from memory)
+        let zip_file = fs::File::open(&zip_file_path).map_err(|e| {
+            ExtensionError::filesystem_with_path(zip_file_path.display().to_string(), e)
+        })?;
+
+        let mut archive = ZipArchive::new(zip_file).map_err(|e| {
             ExtensionError::InstallationFailed {
                 reason: format!("Invalid ZIP: {}", e),
             }
@@ -87,38 +195,54 @@ impl ExtensionManager {
                 reason: format!("Cannot extract ZIP: {}", e),
             })?;
 
-        // Check if manifest.json is directly in temp or in a subdirectory
+        // Clean up temporary ZIP file
-        let manifest_path = temp.join("manifest.json");
+        let _ = fs::remove_file(&zip_file_path);
-        let actual_dir = if manifest_path.exists() {
-            temp.clone()
-        } else {
-            // manifest.json is in a subdirectory - find it
-            let mut found_dir = None;
-            for entry in fs::read_dir(&temp)
-                .map_err(|e| ExtensionError::filesystem_with_path(temp.display().to_string(), e))?
-            {
-                let entry = entry.map_err(|e| ExtensionError::Filesystem { source: e })?;
-                let path = entry.path();
-                if path.is_dir() && path.join("manifest.json").exists() {
-                    found_dir = Some(path);
-                    break;
-                }
-            }
 
-            found_dir.ok_or_else(|| ExtensionError::ManifestError {
+        // Read haextension_dir from config if it exists, otherwise use default
-                reason: "manifest.json not found in extension archive".to_string(),
+        let config_path = temp.join("haextension.config.json");
-            })?
+        let haextension_dir = if config_path.exists() {
+            let config_content = std::fs::read_to_string(&config_path)
+                .map_err(|e| ExtensionError::ManifestError {
+                    reason: format!("Cannot read haextension.config.json: {}", e),
+                })?;
+
+            let config: serde_json::Value = serde_json::from_str(&config_content)
+                .map_err(|e| ExtensionError::ManifestError {
+                    reason: format!("Invalid haextension.config.json: {}", e),
+                })?;
+
+            let dir = config
+                .get("dev")
+                .and_then(|dev| dev.get("haextension_dir"))
+                .and_then(|dir| dir.as_str())
+                .unwrap_or("haextension")
+                .to_string();
+
+            dir
+        } else {
+            "haextension".to_string()
         };
 
-        let manifest_path = actual_dir.join("manifest.json");
+        // Validate manifest path using helper function
+        let manifest_relative_path = format!("{}/manifest.json", haextension_dir);
+        let manifest_path = Self::validate_path_in_directory(&temp, &manifest_relative_path, true)?
+            .ok_or_else(|| ExtensionError::ManifestError {
+                reason: format!("manifest.json not found at {}/manifest.json", haextension_dir),
+            })?;
+
+        let actual_dir = temp.clone();
         let manifest_content =
             std::fs::read_to_string(&manifest_path).map_err(|e| ExtensionError::ManifestError {
                 reason: format!("Cannot read manifest: {}", e),
             })?;
 
-        let manifest: ExtensionManifest = serde_json::from_str(&manifest_content)?;
+        let mut manifest: ExtensionManifest = serde_json::from_str(&manifest_content)?;
 
-        let content_hash = ExtensionCrypto::hash_directory(&actual_dir).map_err(|e| {
+        // Validate and resolve icon path with fallback logic
+        let validated_icon = Self::validate_and_resolve_icon_path(&actual_dir, &haextension_dir, manifest.icon.as_deref())?;
+        manifest.icon = validated_icon;
+
+        let content_hash = ExtensionCrypto::hash_directory(&actual_dir, &manifest_path).map_err(|e| {
             ExtensionError::SignatureVerificationFailed {
                 reason: e.to_string(),
             }
@@ -167,7 +291,6 @@ impl ExtensionManager {
         Ok(specific_extension_dir)
     }
 
-
     pub fn add_production_extension(&self, extension: Extension) -> Result<(), ExtensionError> {
         if extension.id.is_empty() {
             return Err(ExtensionError::ValidationError {
@@ -223,10 +346,11 @@ impl ExtensionManager {
         name: &str,
     ) -> Result<Option<(String, Extension)>, ExtensionError> {
         // 1. Check dev extensions first (higher priority)
-        let dev_extensions = self.dev_extensions.lock().map_err(|e| {
+        let dev_extensions =
-            ExtensionError::MutexPoisoned {
+            self.dev_extensions
+                .lock()
+                .map_err(|e| ExtensionError::MutexPoisoned {
                     reason: e.to_string(),
-            }
                 })?;
 
         for (id, ext) in dev_extensions.iter() {
@@ -236,10 +360,11 @@ impl ExtensionManager {
         }
 
         // 2. Check production extensions
-        let prod_extensions = self.production_extensions.lock().map_err(|e| {
+        let prod_extensions =
-            ExtensionError::MutexPoisoned {
+            self.production_extensions
+                .lock()
+                .map_err(|e| ExtensionError::MutexPoisoned {
                     reason: e.to_string(),
-            }
                 })?;
 
         for (id, ext) in prod_extensions.iter() {
@@ -262,11 +387,7 @@ impl ExtensionManager {
             .map(|(_, ext)| ext))
     }
 
-    pub fn remove_extension(
+    pub fn remove_extension(&self, public_key: &str, name: &str) -> Result<(), ExtensionError> {
-        &self,
-        public_key: &str,
-        name: &str,
-    ) -> Result<(), ExtensionError> {
         let (id, _) = self
             .find_extension_id_by_public_key_and_name(public_key, name)?
             .ok_or_else(|| ExtensionError::NotFound {
@@ -276,10 +397,11 @@ impl ExtensionManager {
 
         // Remove from dev extensions first
         {
-            let mut dev_extensions = self.dev_extensions.lock().map_err(|e| {
+            let mut dev_extensions =
-                ExtensionError::MutexPoisoned {
+                self.dev_extensions
+                    .lock()
+                    .map_err(|e| ExtensionError::MutexPoisoned {
                         reason: e.to_string(),
-                }
                     })?;
             if dev_extensions.remove(&id).is_some() {
                 return Ok(());
@@ -288,10 +410,11 @@ impl ExtensionManager {
 
         // Remove from production extensions
         {
-            let mut prod_extensions = self.production_extensions.lock().map_err(|e| {
+            let mut prod_extensions =
-                ExtensionError::MutexPoisoned {
+                self.production_extensions
+                    .lock()
+                    .map_err(|e| ExtensionError::MutexPoisoned {
                         reason: e.to_string(),
-                }
                     })?;
             prod_extensions.remove(&id);
         }
@@ -315,7 +438,11 @@ impl ExtensionManager {
                 name: extension_name.to_string(),
             })?;
 
-
+        eprintln!("DEBUG: Removing extension with ID: {}", extension.id);
+        eprintln!(
+            "DEBUG: Extension name: {}, version: {}",
+            extension_name, extension_version
+        );
 
         // Lösche Permissions und Extension-Eintrag in einer Transaktion
         with_connection(&state.db, |conn| {
@@ -326,14 +453,15 @@ impl ExtensionManager {
             })?;
 
             // Lösche alle Permissions mit extension_id
-            PermissionManager::delete_permissions_in_transaction(
+            eprintln!(
-                &tx,
+                "DEBUG: Deleting permissions for extension_id: {}",
-                &hlc_service,
+                extension.id
-                &extension.id,
+            );
-            )?;
+            PermissionManager::delete_permissions_in_transaction(&tx, &hlc_service, &extension.id)?;
 
             // Lösche Extension-Eintrag mit extension_id
             let sql = format!("DELETE FROM {} WHERE id = ?", TABLE_EXTENSIONS);
+            eprintln!("DEBUG: Executing SQL: {} with id = {}", sql, extension.id);
             SqlExecutor::execute_internal_typed(
                 &tx,
                 &hlc_service,
@@ -341,9 +469,12 @@ impl ExtensionManager {
                 rusqlite::params![&extension.id],
             )?;
 
+            eprintln!("DEBUG: Committing transaction");
             tx.commit().map_err(DatabaseError::from)
         })?;
 
+        eprintln!("DEBUG: Transaction committed successfully");
+
         // Entferne aus dem In-Memory-Manager
         self.remove_extension(public_key, extension_name)?;
 
@@ -385,9 +516,10 @@ impl ExtensionManager {
 
     pub async fn preview_extension_internal(
         &self,
+        app_handle: &AppHandle,
         file_bytes: Vec<u8>,
     ) -> Result<ExtensionPreview, ExtensionError> {
-        let extracted = Self::extract_and_validate_extension(file_bytes, "haexhub_preview")?;
+        let extracted = Self::extract_and_validate_extension(file_bytes, "haexhub_preview", app_handle)?;
 
         let is_valid_signature = ExtensionCrypto::verify_signature(
             &extracted.manifest.public_key,
@@ -412,7 +544,7 @@ impl ExtensionManager {
         custom_permissions: EditablePermissions,
         state: &State<'_, AppState>,
     ) -> Result<String, ExtensionError> {
-        let extracted = Self::extract_and_validate_extension(file_bytes, "haexhub_ext")?;
+        let extracted = Self::extract_and_validate_extension(file_bytes, "haexhub_ext", &app_handle)?;
 
         // Signatur verifizieren (bei Installation wird ein Fehler geworfen, nicht nur geprüft)
         ExtensionCrypto::verify_signature(
@@ -429,6 +561,17 @@ impl ExtensionManager {
             &extracted.manifest.version,
         )?;
 
+        // If extension version already exists, remove it completely before installing
+        if extensions_dir.exists() {
+            eprintln!(
+                "Extension version already exists at {}, removing old version",
+                extensions_dir.display()
+            );
+            std::fs::remove_dir_all(&extensions_dir).map_err(|e| {
+                ExtensionError::filesystem_with_path(extensions_dir.display().to_string(), e)
+            })?;
+        }
+
         std::fs::create_dir_all(&extensions_dir).map_err(|e| {
             ExtensionError::filesystem_with_path(extensions_dir.display().to_string(), e)
         })?;
@@ -460,16 +603,19 @@ impl ExtensionManager {
         let permissions = custom_permissions.to_internal_permissions(&extension_id);
 
         // Extension-Eintrag und Permissions in einer Transaktion speichern
-        with_connection(&state.db, |conn| {
+        let actual_extension_id = with_connection(&state.db, |conn| {
             let tx = conn.transaction().map_err(DatabaseError::from)?;
 
-            let hlc_service = state.hlc.lock().map_err(|_| DatabaseError::MutexPoisoned {
+            let hlc_service_guard = state.hlc.lock().map_err(|_| DatabaseError::MutexPoisoned {
                 reason: "Failed to lock HLC service".to_string(),
             })?;
+            // Klonen, um den MutexGuard freizugeben, bevor potenziell lange DB-Operationen stattfinden
+            let hlc_service = hlc_service_guard.clone();
+            drop(hlc_service_guard);
 
             // 1. Extension-Eintrag erstellen mit generierter UUID
             let insert_ext_sql = format!(
-                "INSERT INTO {} (id, name, version, author, entry, icon, public_key, signature, homepage, description, enabled) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                "INSERT INTO {} (id, name, version, author, entry, icon, public_key, signature, homepage, description, enabled, single_instance) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                 TABLE_EXTENSIONS
             );
 
@@ -489,12 +635,13 @@ impl ExtensionManager {
                         extracted.manifest.homepage,
                         extracted.manifest.description,
                         true, // enabled
+                        extracted.manifest.single_instance.unwrap_or(false),
                     ],
                 )?;
 
-            // 2. Permissions speichern (oder aktualisieren falls schon vorhanden)
+            // 2. Permissions speichern
             let insert_perm_sql = format!(
-                "INSERT OR REPLACE INTO {} (id, extension_id, resource_type, action, target, constraints, status) VALUES (?, ?, ?, ?, ?, ?, ?)",
+                "INSERT INTO {} (id, extension_id, resource_type, action, target, constraints, status) VALUES (?, ?, ?, ?, ?, ?, ?)",
                 TABLE_EXTENSION_PERMISSIONS
             );
 
@@ -535,7 +682,7 @@ impl ExtensionManager {
 
         self.add_production_extension(extension)?;
 
-        Ok(extension_id)
+        Ok(actual_extension_id) // Gebe die actual_extension_id an den Caller zurück
     }
 
     /// Scannt das Dateisystem beim Start und lädt alle installierten Erweiterungen.
@@ -544,6 +691,7 @@ impl ExtensionManager {
         app_handle: &AppHandle,
         state: &State<'_, AppState>,
     ) -> Result<Vec<String>, ExtensionError> {
+        // Clear existing data
         self.production_extensions
             .lock()
             .map_err(|e| ExtensionError::MutexPoisoned {
@@ -563,19 +711,21 @@ impl ExtensionManager {
             })?
             .clear();
 
-        // Schritt 1: Alle Daten aus der Datenbank in einem Rutsch laden.
+        // Lade alle Daten aus der Datenbank
         let extensions = with_connection(&state.db, |conn| {
             let sql = format!(
-                "SELECT id, name, version, author, entry, icon, public_key, signature, homepage, description, enabled FROM {}",
+            "SELECT id, name, version, author, entry, icon, public_key, signature, homepage, description, enabled, single_instance FROM {}",
             TABLE_EXTENSIONS
         );
             eprintln!("DEBUG: SQL Query before transformation: {}", sql);
-            let results = SqlExecutor::select_internal(conn, &sql, &[])?;
+
+            let results = SqlExecutor::query_select(conn, &sql, &[])?;
             eprintln!("DEBUG: Query returned {} results", results.len());
 
             let mut data = Vec::new();
-            for result in results {
+            for row in results {
-                let id = result["id"]
+                // Wir erwarten die Werte in der Reihenfolge der SELECT-Anweisung
+                let id = row[0]
                     .as_str()
                     .ok_or_else(|| DatabaseError::SerializationError {
                         reason: "Missing id field".to_string(),
@@ -583,31 +733,34 @@ impl ExtensionManager {
                     .to_string();
 
                 let manifest = ExtensionManifest {
-                    name: result["name"]
+                    name: row[1]
                         .as_str()
                         .ok_or_else(|| DatabaseError::SerializationError {
                             reason: "Missing name field".to_string(),
                         })?
                         .to_string(),
-                    version: result["version"]
+                    version: row[2]
                         .as_str()
                         .ok_or_else(|| DatabaseError::SerializationError {
                             reason: "Missing version field".to_string(),
                         })?
                         .to_string(),
-                    author: result["author"].as_str().map(String::from),
+                    author: row[3].as_str().map(String::from),
-                    entry: result["entry"].as_str().unwrap_or("index.html").to_string(),
+                    entry: row[4].as_str().map(String::from),
-                    icon: result["icon"].as_str().map(String::from),
+                    icon: row[5].as_str().map(String::from),
-                    public_key: result["public_key"].as_str().unwrap_or("").to_string(),
+                    public_key: row[6].as_str().unwrap_or("").to_string(),
-                    signature: result["signature"].as_str().unwrap_or("").to_string(),
+                    signature: row[7].as_str().unwrap_or("").to_string(),
                     permissions: ExtensionPermissions::default(),
-                    homepage: result["homepage"].as_str().map(String::from),
+                    homepage: row[8].as_str().map(String::from),
-                    description: result["description"].as_str().map(String::from),
+                    description: row[9].as_str().map(String::from),
+                    single_instance: row[11]
+                        .as_bool()
+                        .or_else(|| row[11].as_i64().map(|v| v != 0)),
                 };
 
-                let enabled = result["enabled"]
+                let enabled = row[10]
                     .as_bool()
-                    .or_else(|| result["enabled"].as_i64().map(|v| v != 0))
+                    .or_else(|| row[10].as_i64().map(|v| v != 0))
                     .unwrap_or(false);
 
                 data.push(ExtensionDataFromDb {
@@ -636,9 +789,10 @@ impl ExtensionManager {
                 &extension_data.manifest.version,
             )?;
 
-            if !extension_path.exists() || !extension_path.join("manifest.json").exists() {
+            // Check if extension directory exists
+            if !extension_path.exists() {
                 eprintln!(
-                    "DEBUG: Extension files missing for: {} at {:?}",
+                    "DEBUG: Extension directory missing for: {} at {:?}",
                     extension_id, extension_path
                 );
                 self.missing_extensions
@@ -655,10 +809,53 @@ impl ExtensionManager {
                 continue;
             }
 
+            // Read haextension_dir from config if it exists, otherwise use default
+            let config_path = extension_path.join("haextension.config.json");
+            let haextension_dir = if config_path.exists() {
+                match std::fs::read_to_string(&config_path) {
+                    Ok(config_content) => {
+                        match serde_json::from_str::<serde_json::Value>(&config_content) {
+                            Ok(config) => {
+                                config
+                                    .get("dev")
+                                    .and_then(|dev| dev.get("haextension_dir"))
+                                    .and_then(|dir| dir.as_str())
+                                    .unwrap_or("haextension")
+                                    .to_string()
+                            }
+                            Err(_) => "haextension".to_string(),
+                        }
+                    }
+                    Err(_) => "haextension".to_string(),
+                }
+            } else {
+                "haextension".to_string()
+            };
+
+            // Validate manifest.json path using helper function
+            let manifest_relative_path = format!("{}/manifest.json", haextension_dir);
+            if Self::validate_path_in_directory(&extension_path, &manifest_relative_path, true)?
+                .is_none()
+            {
                 eprintln!(
-                "DEBUG: Extension loaded successfully: {}",
+                    "DEBUG: manifest.json missing or invalid for: {} at {}/manifest.json",
-                extension_id
+                    extension_id, haextension_dir
                 );
+                self.missing_extensions
+                    .lock()
+                    .map_err(|e| ExtensionError::MutexPoisoned {
+                        reason: e.to_string(),
+                    })?
+                    .push(MissingExtension {
+                        id: extension_id.clone(),
+                        public_key: extension_data.manifest.public_key.clone(),
+                        name: extension_data.manifest.name.clone(),
+                        version: extension_data.manifest.version.clone(),
+                    });
+                continue;
+            }
+
+            eprintln!("DEBUG: Extension loaded successfully: {}", extension_id);
 
             let extension = Extension {
                 id: extension_id.clone(),

src-tauri/src/extension/core/manifest.rs

@@ -57,13 +57,20 @@ pub struct ExtensionManifest {
     pub name: String,
     pub version: String,
     pub author: Option<String>,
-    pub entry: String,
+    #[serde(default = "default_entry_value")]
+    pub entry: Option<String>,
     pub icon: Option<String>,
     pub public_key: String,
     pub signature: String,
     pub permissions: ExtensionPermissions,
     pub homepage: Option<String>,
     pub description: Option<String>,
+    #[serde(default)]
+    pub single_instance: Option<bool>,
+}
+
+fn default_entry_value() -> Option<String> {
+    Some("index.html".to_string())
 }
 
 impl ExtensionManifest {
@@ -155,7 +162,6 @@ impl ExtensionPermissions {
                 .and_then(|c| serde_json::from_value::<PermissionConstraints>(c.clone()).ok()),
             status: p.status.clone().unwrap_or(PermissionStatus::Ask),
             haex_timestamp: None,
-            haex_tombstone: None,
         })
     }
 }
@@ -173,6 +179,8 @@ pub struct ExtensionInfoResponse {
     pub description: Option<String>,
     pub homepage: Option<String>,
     pub icon: Option<String>,
+    pub entry: Option<String>,
+    pub single_instance: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub dev_server_url: Option<String>,
 }
@@ -198,6 +206,8 @@ impl ExtensionInfoResponse {
             description: extension.manifest.description.clone(),
             homepage: extension.manifest.homepage.clone(),
             icon: extension.manifest.icon.clone(),
+            entry: extension.manifest.entry.clone(),
+            single_instance: extension.manifest.single_instance,
             dev_server_url,
         })
     }

src-tauri/src/extension/crypto.rs

@@ -4,28 +4,13 @@ use std::{
 };
 
 // src-tauri/src/extension/crypto.rs
+use crate::extension::error::ExtensionError;
 use ed25519_dalek::{Signature, Verifier, VerifyingKey};
 use sha2::{Digest, Sha256};
 
 pub struct ExtensionCrypto;
 
 impl ExtensionCrypto {
-    /// Berechnet Hash vom Public Key (wie im SDK)
-    pub fn calculate_key_hash(public_key_hex: &str) -> Result<String, String> {
-        let public_key_bytes =
-            hex::decode(public_key_hex).map_err(|e| format!("Invalid public key hex: {}", e))?;
-
-        let public_key = VerifyingKey::from_bytes(&public_key_bytes.try_into().unwrap())
-            .map_err(|e| format!("Invalid public key: {}", e))?;
-
-        let mut hasher = Sha256::new();
-        hasher.update(public_key.as_bytes());
-        let result = hasher.finalize();
-
-        // Ersten 20 Hex-Zeichen (10 Bytes) - wie im SDK
-        Ok(hex::encode(&result[..10]))
-    }
-
     /// Verifiziert Extension-Signatur
     pub fn verify_signature(
         public_key_hex: &str,
@@ -50,26 +35,64 @@ impl ExtensionCrypto {
     }
 
     /// Berechnet Hash eines Verzeichnisses (für Verifikation)
-    pub fn hash_directory(dir: &Path) -> Result<String, String> {
+    pub fn hash_directory(dir: &Path, manifest_path: &Path) -> Result<String, ExtensionError> {
         // 1. Alle Dateipfade rekursiv sammeln
         let mut all_files = Vec::new();
         Self::collect_files_recursively(dir, &mut all_files)
-            .map_err(|e| format!("Failed to collect files: {}", e))?;
+            .map_err(|e| ExtensionError::Filesystem { source: e })?;
-        all_files.sort();
+
+        // 2. Konvertiere zu relativen Pfaden für konsistente Sortierung (wie im SDK)
+        let mut relative_files: Vec<(String, PathBuf)> = all_files
+            .into_iter()
+            .map(|path| {
+                let relative = path.strip_prefix(dir)
+                    .unwrap_or(&path)
+                    .to_string_lossy()
+                    .to_string()
+                    // Normalisiere Pfad-Separatoren zu Unix-Style (/) für plattformübergreifende Konsistenz
+                    .replace('\\', "/");
+                (relative, path)
+            })
+            .collect();
+
+        // 3. Sortiere nach relativen Pfaden
+        relative_files.sort_by(|a, b| a.0.cmp(&b.0));
 
         let mut hasher = Sha256::new();
-        let manifest_path = dir.join("manifest.json");
 
-        // 2. Inhalte der sortierten Dateien hashen
+        // Canonicalize manifest path for comparison (important on Android where symlinks may differ)
-        for file_path in all_files {
+        // Also ensure the canonical path is still within the allowed directory (security check)
-            if file_path == manifest_path {
+        let canonical_manifest_path = manifest_path.canonicalize()
+            .unwrap_or_else(|_| manifest_path.to_path_buf());
+
+        // Security: Verify canonical manifest path is still within dir
+        let canonical_dir = dir.canonicalize()
+            .unwrap_or_else(|_| dir.to_path_buf());
+
+        if !canonical_manifest_path.starts_with(&canonical_dir) {
+            return Err(ExtensionError::ManifestError {
+                reason: format!("Manifest path resolves outside of extension directory (potential path traversal)"),
+            });
+        }
+
+        // 4. Inhalte der sortierten Dateien hashen
+        for (_relative, file_path) in relative_files {
+            // Canonicalize file_path for comparison
+            let canonical_file_path = file_path.canonicalize()
+                .unwrap_or_else(|_| file_path.clone());
+
+            if canonical_file_path == canonical_manifest_path {
                 // FÜR DIE MANIFEST.JSON:
                 let content_str = fs::read_to_string(&file_path)
-                    .map_err(|e| format!("Cannot read manifest file: {}", e))?;
+                    .map_err(|e| ExtensionError::Filesystem { source: e })?;
 
                 // Parse zu einem generischen JSON-Wert
-                let mut manifest: serde_json::Value = serde_json::from_str(&content_str)
+                let mut manifest: serde_json::Value =
-                    .map_err(|e| format!("Cannot parse manifest JSON: {}", e))?;
+                    serde_json::from_str(&content_str).map_err(|e| {
+                        ExtensionError::ManifestError {
+                            reason: format!("Cannot parse manifest JSON: {}", e),
+                        }
+                    })?;
 
                 // Entferne oder leere das Signaturfeld, um den "kanonischen Inhalt" zu erhalten
                 if let Some(obj) = manifest.as_object_mut() {
@@ -80,13 +103,23 @@ impl ExtensionCrypto {
                 }
 
                 // Serialisiere das modifizierte Manifest zurück (mit 2 Spaces, wie in JS)
-                let canonical_manifest_content = serde_json::to_string_pretty(&manifest).unwrap();
+                // serde_json sortiert die Keys automatisch alphabetisch
-                println!("canonical_manifest_content: {}", canonical_manifest_content);
+                let canonical_manifest_content =
-                hasher.update(canonical_manifest_content.as_bytes());
+                    serde_json::to_string_pretty(&manifest).map_err(|e| {
+                        ExtensionError::ManifestError {
+                            reason: format!("Failed to serialize manifest: {}", e),
+                        }
+                    })?;
+
+                // Normalisiere Zeilenenden zu Unix-Style (\n), wie Node.js JSON.stringify es macht
+                // Dies ist wichtig für plattformübergreifende Konsistenz (Desktop vs Android)
+                let normalized_content = canonical_manifest_content.replace("\r\n", "\n");
+
+                hasher.update(normalized_content.as_bytes());
             } else {
                 // FÜR ALLE ANDEREN DATEIEN:
-                let content = fs::read(&file_path)
+                let content =
-                    .map_err(|e| format!("Cannot read file {}: {}", file_path.display(), e))?;
+                    fs::read(&file_path).map_err(|e| ExtensionError::Filesystem { source: e })?;
                 hasher.update(&content);
             }
         }

src-tauri/src/extension/database/executor.rs

@@ -1,11 +1,11 @@
-// src-tauri/src/extension/database/executor.rs (neu)
+// src-tauri/src/extension/database/executor.rs
 
 use crate::crdt::hlc::HlcService;
 use crate::crdt::transformer::CrdtTransformer;
 use crate::crdt::trigger;
-use crate::database::core::{parse_sql_statements, ValueConverter};
+use crate::database::core::{convert_value_ref_to_json, parse_sql_statements, ValueConverter};
 use crate::database::error::DatabaseError;
-use rusqlite::{params_from_iter, Params, Transaction};
+use rusqlite::{params_from_iter, types::Value as SqliteValue, ToSql, Transaction};
 use serde_json::Value as JsonValue;
 use sqlparser::ast::Statement;
 use std::collections::HashSet;
@@ -14,27 +14,25 @@ use std::collections::HashSet;
 pub struct SqlExecutor;
 
 impl SqlExecutor {
-    pub fn execute_internal_typed<P>(
+    /// Führt ein SQL Statement OHNE RETURNING aus (mit CRDT)
+    /// Returns: modified_schema_tables
+    pub fn execute_internal_typed(
         tx: &Transaction,
         hlc_service: &HlcService,
         sql: &str,
-        params: P, // Akzeptiert jetzt alles, was rusqlite als Parameter versteht
+        params: &[&dyn ToSql],
-    ) -> Result<HashSet<String>, DatabaseError>
+    ) -> Result<HashSet<String>, DatabaseError> {
-    where
-        P: Params,
-    {
         let mut ast_vec = parse_sql_statements(sql)?;
 
-        // Wir stellen sicher, dass wir nur EIN Statement verarbeiten. Das ist sicherer.
         if ast_vec.len() != 1 {
             return Err(DatabaseError::ExecutionError {
                 sql: sql.to_string(),
-                reason: "execute_internal_typed sollte nur ein einzelnes SQL-Statement erhalten"
+                reason: "execute_internal_typed should only receive a single SQL statement"
                     .to_string(),
                 table: None,
             });
         }
-        // Wir nehmen das einzige Statement aus dem Vektor.
+
         let mut statement = ast_vec.pop().unwrap();
 
         let transformer = CrdtTransformer::new();
@@ -46,53 +44,61 @@ impl SqlExecutor {
                 })?;
 
         let mut modified_schema_tables = HashSet::new();
-        if let Some(table_name) =
+        if let Some(table_name) = transformer.transform_execute_statement_with_table_info(
-            transformer.transform_execute_statement(&mut statement, &hlc_timestamp)?
+            &mut statement,
-        {
+            &hlc_timestamp,
+        )? {
             modified_schema_tables.insert(table_name);
         }
 
-        // Führe das transformierte Statement aus.
-        // `params` wird jetzt nur noch einmal hierher bewegt, was korrekt ist.
         let sql_str = statement.to_string();
+        eprintln!("DEBUG: Transformed execute SQL: {}", sql_str);
+
+        // Führe Statement aus
         tx.execute(&sql_str, params)
             .map_err(|e| DatabaseError::ExecutionError {
                 sql: sql_str.clone(),
                 table: None,
-                reason: e.to_string(),
+                reason: format!("Execute failed: {}", e),
             })?;
 
-        // Die Trigger-Logik für CREATE TABLE bleibt erhalten.
+        // Trigger-Logik für CREATE TABLE
         if let Statement::CreateTable(create_table_details) = statement {
-            let table_name_str = create_table_details.name.to_string();
+            let raw_name = create_table_details.name.to_string();
+            // Remove quotes from table name
+            let table_name_str = raw_name
+                .trim_matches('"')
+                .trim_matches('`')
+                .to_string();
+            eprintln!("DEBUG: Setting up triggers for table: {}", table_name_str);
             trigger::setup_triggers_for_table(tx, &table_name_str, false)?;
         }
 
         Ok(modified_schema_tables)
     }
-    /// Führt SQL aus (mit CRDT-Transformation) - OHNE Permission-Check
+
-    pub fn execute_internal(
+    /// Führt ein SQL Statement MIT RETURNING aus (mit CRDT)
+    /// Returns: (modified_schema_tables, returning_results)
+    pub fn query_internal_typed(
         tx: &Transaction,
         hlc_service: &HlcService,
         sql: &str,
-        params: &[JsonValue],
+        params: &[&dyn ToSql],
-    ) -> Result<HashSet<String>, DatabaseError> {
+    ) -> Result<(HashSet<String>, Vec<Vec<JsonValue>>), DatabaseError> {
-        // Parameter validation
+        let mut ast_vec = parse_sql_statements(sql)?;
-        let total_placeholders = sql.matches('?').count();
+
-        if total_placeholders != params.len() {
+        if ast_vec.len() != 1 {
-            return Err(DatabaseError::ParameterMismatchError {
+            return Err(DatabaseError::ExecutionError {
-                expected: total_placeholders,
-                provided: params.len(),
                 sql: sql.to_string(),
+                reason: "query_internal_typed should only receive a single SQL statement"
+                    .to_string(),
+                table: None,
             });
         }
 
-        // SQL parsing
+        let mut statement = ast_vec.pop().unwrap();
-        let mut ast_vec = parse_sql_statements(sql)?;
 
         let transformer = CrdtTransformer::new();
-
-        // Generate HLC timestamp
         let hlc_timestamp =
             hlc_service
                 .new_timestamp_and_persist(tx)
@@ -100,110 +106,179 @@ impl SqlExecutor {
                     reason: e.to_string(),
                 })?;
 
-        // Transform statements
         let mut modified_schema_tables = HashSet::new();
-        for statement in &mut ast_vec {
+        if let Some(table_name) = transformer.transform_execute_statement_with_table_info(
-            if let Some(table_name) =
+            &mut statement,
-                transformer.transform_execute_statement(statement, &hlc_timestamp)?
+            &hlc_timestamp,
-            {
+        )? {
             modified_schema_tables.insert(table_name);
         }
-        }
 
-        // Convert parameters
-        let sql_values = ValueConverter::convert_params(params)?;
-
-        // Execute statements
-        for statement in ast_vec {
         let sql_str = statement.to_string();
+        eprintln!("DEBUG: Transformed SQL (with RETURNING): {}", sql_str);
 
-            tx.execute(&sql_str, params_from_iter(sql_values.iter()))
+        // Prepare und query ausführen
+        let mut stmt = tx
+            .prepare(&sql_str)
             .map_err(|e| DatabaseError::ExecutionError {
                 sql: sql_str.clone(),
                 table: None,
                 reason: e.to_string(),
             })?;
 
-            if let Statement::CreateTable(create_table_details) = statement {
+        let column_names: Vec<String> = stmt
-                let table_name_str = create_table_details.name.to_string();
-                trigger::setup_triggers_for_table(tx, &table_name_str, false)?;
-            }
-        }
-
-        Ok(modified_schema_tables)
-    }
-
-    /// Führt SELECT aus (mit CRDT-Transformation) - OHNE Permission-Check
-    pub fn select_internal(
-        conn: &rusqlite::Connection,
-        sql: &str,
-        params: &[JsonValue],
-    ) -> Result<Vec<JsonValue>, DatabaseError> {
-        // Parameter validation
-        let total_placeholders = sql.matches('?').count();
-        if total_placeholders != params.len() {
-            return Err(DatabaseError::ParameterMismatchError {
-                expected: total_placeholders,
-                provided: params.len(),
-                sql: sql.to_string(),
-            });
-        }
-
-        let mut ast_vec = parse_sql_statements(sql)?;
-
-        if ast_vec.is_empty() {
-            return Ok(vec![]);
-        }
-
-        // Validate that all statements are queries
-        for stmt in &ast_vec {
-            if !matches!(stmt, Statement::Query(_)) {
-                return Err(DatabaseError::ExecutionError {
-                    sql: sql.to_string(),
-                    reason: "Only SELECT statements are allowed".to_string(),
-                    table: None,
-                });
-            }
-        }
-
-        let sql_params = ValueConverter::convert_params(params)?;
-        let transformer = CrdtTransformer::new();
-
-        let last_statement = ast_vec.pop().unwrap();
-        let mut stmt_to_execute = last_statement;
-
-        transformer.transform_select_statement(&mut stmt_to_execute)?;
-        let transformed_sql = stmt_to_execute.to_string();
-
-        let mut prepared_stmt =
-            conn.prepare(&transformed_sql)
-                .map_err(|e| DatabaseError::ExecutionError {
-                    sql: transformed_sql.clone(),
-                    reason: e.to_string(),
-                    table: None,
-                })?;
-
-        let column_names: Vec<String> = prepared_stmt
             .column_names()
             .into_iter()
             .map(|s| s.to_string())
             .collect();
+        let num_columns = column_names.len();
 
-        let rows = prepared_stmt
+        let mut rows = stmt
-            .query_map(params_from_iter(sql_params.iter()), |row| {
+            .query(params_from_iter(params.iter()))
-                crate::extension::database::row_to_json_value(row, &column_names)
+            .map_err(|e| DatabaseError::ExecutionError {
-            })
+                sql: sql_str.clone(),
-            .map_err(|e| DatabaseError::QueryError {
+                table: None,
                 reason: e.to_string(),
             })?;
 
-        let mut results = Vec::new();
+        let mut result_vec: Vec<Vec<JsonValue>> = Vec::new();
-        for row_result in rows {
+
-            results.push(row_result.map_err(|e| DatabaseError::RowProcessingError {
+        // Lese alle RETURNING Zeilen
+        while let Some(row) = rows.next().map_err(|e| DatabaseError::ExecutionError {
+            sql: sql_str.clone(),
+            table: None,
             reason: e.to_string(),
-            })?);
+        })? {
+            let mut row_values: Vec<JsonValue> = Vec::new();
+            for i in 0..num_columns {
+                let value_ref = row.get_ref(i).map_err(|e| DatabaseError::ExecutionError {
+                    sql: sql_str.clone(),
+                    table: None,
+                    reason: e.to_string(),
+                })?;
+                let json_value = convert_value_ref_to_json(value_ref)?;
+                row_values.push(json_value);
+            }
+            result_vec.push(row_values);
         }
 
-        Ok(results)
+        // Trigger-Logik für CREATE TABLE
+        if let Statement::CreateTable(create_table_details) = statement {
+            let raw_name = create_table_details.name.to_string();
+            // Remove quotes from table name
+            let table_name_str = raw_name
+                .trim_matches('"')
+                .trim_matches('`')
+                .to_string();
+            eprintln!("DEBUG: Setting up triggers for table (RETURNING): {}", table_name_str);
+            trigger::setup_triggers_for_table(tx, &table_name_str, false)?;
+        }
+
+        Ok((modified_schema_tables, result_vec))
+    }
+
+    /// Führt ein einzelnes SQL Statement OHNE Typinformationen aus (JSON params)
+    pub fn execute_internal(
+        tx: &Transaction,
+        hlc_service: &HlcService,
+        sql: &str,
+        params: &[JsonValue],
+    ) -> Result<HashSet<String>, DatabaseError> {
+        let sql_params: Vec<SqliteValue> = params
+            .iter()
+            .map(|v| crate::database::core::ValueConverter::json_to_rusqlite_value(v))
+            .collect::<Result<Vec<_>, _>>()?;
+        let param_refs: Vec<&dyn ToSql> = sql_params.iter().map(|p| p as &dyn ToSql).collect();
+        Self::execute_internal_typed(tx, hlc_service, sql, &param_refs)
+    }
+
+    /// Query-Variante (mit RETURNING) OHNE Typinformationen (JSON params)
+    pub fn query_internal(
+        tx: &Transaction,
+        hlc_service: &HlcService,
+        sql: &str,
+        params: &[JsonValue],
+    ) -> Result<(HashSet<String>, Vec<Vec<JsonValue>>), DatabaseError> {
+        let sql_params: Vec<SqliteValue> = params
+            .iter()
+            .map(|v| crate::database::core::ValueConverter::json_to_rusqlite_value(v))
+            .collect::<Result<Vec<_>, _>>()?;
+        let param_refs: Vec<&dyn ToSql> = sql_params.iter().map(|p| p as &dyn ToSql).collect();
+        Self::query_internal_typed(tx, hlc_service, sql, &param_refs)
+    }
+
+    /// Führt mehrere SQL Statements als Batch aus
+    pub fn execute_batch_internal(
+        tx: &Transaction,
+        hlc_service: &HlcService,
+        sqls: &[String],
+        params: &[Vec<JsonValue>],
+    ) -> Result<HashSet<String>, DatabaseError> {
+        if sqls.len() != params.len() {
+            return Err(DatabaseError::ExecutionError {
+                sql: format!("{} statements but {} param sets", sqls.len(), params.len()),
+                reason: "Statement count and parameter count mismatch".to_string(),
+                table: None,
+            });
+        }
+
+        let mut all_modified_tables = HashSet::new();
+
+        for (sql, param_set) in sqls.iter().zip(params.iter()) {
+            let modified_tables = Self::execute_internal(tx, hlc_service, sql, param_set)?;
+            all_modified_tables.extend(modified_tables);
+        }
+
+        Ok(all_modified_tables)
+    }
+
+    /// Query für SELECT-Statements (read-only, kein CRDT nötig außer Filter)
+    pub fn query_select(
+        conn: &rusqlite::Connection,
+        sql: &str,
+        params: &[JsonValue],
+    ) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
+        let mut ast_vec = parse_sql_statements(sql)?;
+
+        if ast_vec.len() != 1 {
+            return Err(DatabaseError::ExecutionError {
+                sql: sql.to_string(),
+                reason: "query_select should only receive a single SELECT statement".to_string(),
+                table: None,
+            });
+        }
+
+        // Hard Delete: Keine SELECT-Transformation mehr nötig
+        let stmt_to_execute = ast_vec.pop().unwrap();
+        let transformed_sql = stmt_to_execute.to_string();
+
+        eprintln!("DEBUG: SELECT (no transformation): {}", transformed_sql);
+
+        // Convert JSON params to SQLite values
+        let sql_params: Vec<SqliteValue> = params
+            .iter()
+            .map(|v| crate::database::core::ValueConverter::json_to_rusqlite_value(v))
+            .collect::<Result<Vec<_>, _>>()?;
+
+        let mut prepared_stmt = conn.prepare(&transformed_sql)?;
+
+        let num_columns = prepared_stmt.column_count();
+
+        let param_refs: Vec<&dyn ToSql> = sql_params.iter().map(|p| p as &dyn ToSql).collect();
+
+        let mut rows = prepared_stmt.query(params_from_iter(param_refs.iter()))?;
+
+        let mut result: Vec<Vec<JsonValue>> = Vec::new();
+        while let Some(row) = rows.next()? {
+            let mut row_values: Vec<JsonValue> = Vec::new();
+            for i in 0..num_columns {
+                let value_ref = row.get_ref(i)?;
+                let json_value = convert_value_ref_to_json(value_ref)?;
+                row_values.push(json_value);
+            }
+            result.push(row_values);
+        }
+
+        Ok(result)
     }
 }

src-tauri/src/extension/database/mod.rs

@@ -5,6 +5,7 @@ use crate::crdt::transformer::CrdtTransformer;
 use crate::crdt::trigger;
 use crate::database::core::{parse_sql_statements, with_connection, ValueConverter};
 use crate::database::error::DatabaseError;
+use crate::extension::database::executor::SqlExecutor;
 use crate::extension::error::ExtensionError;
 use crate::extension::permissions::validator::SqlPermissionValidator;
 use crate::AppState;
@@ -110,7 +111,7 @@ pub async fn extension_sql_execute(
     public_key: String,
     name: String,
     state: State<'_, AppState>,
-) -> Result<Vec<String>, ExtensionError> {
+) -> Result<Vec<Vec<JsonValue>>, ExtensionError> {
     // Get extension to retrieve its ID
     let extension = state
         .extension_manager
@@ -129,42 +130,72 @@ pub async fn extension_sql_execute(
     // SQL parsing
     let mut ast_vec = parse_sql_statements(sql)?;
 
+    if ast_vec.len() != 1 {
+        return Err(ExtensionError::Database {
+            source: DatabaseError::ExecutionError {
+                sql: sql.to_string(),
+                reason: "extension_sql_execute should only receive a single SQL statement"
+                    .to_string(),
+                table: None,
+            },
+        });
+    }
+
+    let mut statement = ast_vec.pop().unwrap();
+
+    // Check if statement has RETURNING clause
+    let has_returning = crate::database::core::statement_has_returning(&statement);
+
     // Database operation
     with_connection(&state.db, |conn| {
         let tx = conn.transaction().map_err(DatabaseError::from)?;
 
         let transformer = CrdtTransformer::new();
-        let executor = StatementExecutor::new(&tx);
+
+        // Get HLC service reference
+        let hlc_service = state.hlc.lock().map_err(|_| DatabaseError::MutexPoisoned {
+            reason: "Failed to lock HLC service".to_string(),
+        })?;
 
         // Generate HLC timestamp
-        let hlc_timestamp = state
+        let hlc_timestamp = hlc_service
-            .hlc
-            .lock()
-            .unwrap()
             .new_timestamp_and_persist(&tx)
             .map_err(|e| DatabaseError::HlcError {
                 reason: e.to_string(),
             })?;
 
-        // Transform statements
+        // Transform statement
-        let mut modified_schema_tables = HashSet::new();
+        transformer.transform_execute_statement(&mut statement, &hlc_timestamp)?;
-        for statement in &mut ast_vec {
-            if let Some(table_name) =
-                transformer.transform_execute_statement(statement, &hlc_timestamp)?
-            {
-                modified_schema_tables.insert(table_name);
-            }
-        }
 
-        // Convert parameters
+        // Convert parameters to references
         let sql_values = ValueConverter::convert_params(&params)?;
+        let param_refs: Vec<&dyn rusqlite::ToSql> = sql_values.iter().map(|v| v as &dyn rusqlite::ToSql).collect();
 
-        // Execute statements
+        let result = if has_returning {
-        for statement in ast_vec {
+            // Use query_internal for statements with RETURNING
-            executor.execute_statement_with_params(&statement, &sql_values)?;
+            let (_, rows) = SqlExecutor::query_internal_typed(&tx, &hlc_service, &statement.to_string(), &param_refs)?;
+            rows
+        } else {
+            // Use execute_internal for statements without RETURNING
+            SqlExecutor::execute_internal_typed(&tx, &hlc_service, &statement.to_string(), &param_refs)?;
+            vec![]
+        };
+
+        // Handle CREATE TABLE trigger setup
+        if let Statement::CreateTable(ref create_table_details) = statement {
+            // Extract table name and remove quotes (both " and `)
+            let raw_name = create_table_details.name.to_string();
+            println!("DEBUG: Raw table name from AST: {:?}", raw_name);
+            println!("DEBUG: Raw table name chars: {:?}", raw_name.chars().collect::<Vec<_>>());
+
+            let table_name_str = raw_name
+                .trim_matches('"')
+                .trim_matches('`')
+                .to_string();
+
+            println!("DEBUG: Cleaned table name: {:?}", table_name_str);
+            println!("DEBUG: Cleaned table name chars: {:?}", table_name_str.chars().collect::<Vec<_>>());
 
-            if let Statement::CreateTable(create_table_details) = statement {
-                let table_name_str = create_table_details.name.to_string();
             println!(
                 "Table '{}' created by extension, setting up CRDT triggers...",
                 table_name_str
@@ -175,12 +206,11 @@ pub async fn extension_sql_execute(
                 table_name_str
             );
         }
-        }
 
         // Commit transaction
         tx.commit().map_err(DatabaseError::from)?;
 
-        Ok(modified_schema_tables.into_iter().collect())
+        Ok(result)
     })
     .map_err(ExtensionError::from)
 }
@@ -192,7 +222,7 @@ pub async fn extension_sql_select(
     public_key: String,
     name: String,
     state: State<'_, AppState>,
-) -> Result<Vec<JsonValue>, ExtensionError> {
+) -> Result<Vec<Vec<JsonValue>>, ExtensionError> {
     // Get extension to retrieve its ID
     let extension = state
         .extension_manager
@@ -229,17 +259,10 @@ pub async fn extension_sql_select(
         }
     }
 
-    // Database operation
+    // Database operation - return Vec<Vec<JsonValue>> like sql_select_with_crdt
     with_connection(&state.db, |conn| {
         let sql_params = ValueConverter::convert_params(&params)?;
-        let transformer = CrdtTransformer::new();
+        let stmt_to_execute = ast_vec.pop().unwrap();
-
-        // Use the last statement for result set
-        let last_statement = ast_vec.pop().unwrap();
-        let mut stmt_to_execute = last_statement;
-
-        // Transform the statement
-        transformer.transform_select_statement(&mut stmt_to_execute)?;
         let transformed_sql = stmt_to_execute.to_string();
 
         // Prepare and execute query
@@ -251,51 +274,34 @@ pub async fn extension_sql_select(
                     table: None,
                 })?;
 
-        let column_names: Vec<String> = prepared_stmt
+        let num_columns = prepared_stmt.column_count();
-            .column_names()
+        let mut rows = prepared_stmt
-            .into_iter()
+            .query(params_from_iter(sql_params.iter()))
-            .map(|s| s.to_string())
-            .collect();
-
-        let rows = prepared_stmt
-            .query_map(params_from_iter(sql_params.iter()), |row| {
-                row_to_json_value(row, &column_names)
-            })
             .map_err(|e| DatabaseError::QueryError {
                 reason: e.to_string(),
             })?;
 
-        let mut results = Vec::new();
+        let mut result_vec: Vec<Vec<JsonValue>> = Vec::new();
-        for row_result in rows {
+
-            results.push(row_result.map_err(|e| DatabaseError::RowProcessingError {
+        while let Some(row) = rows.next().map_err(|e| DatabaseError::QueryError {
             reason: e.to_string(),
-            })?);
+        })? {
+            let mut row_values: Vec<JsonValue> = Vec::new();
+            for i in 0..num_columns {
+                let value_ref = row.get_ref(i).map_err(|e| DatabaseError::QueryError {
+                    reason: e.to_string(),
+                })?;
+                let json_value = crate::database::core::convert_value_ref_to_json(value_ref)?;
+                row_values.push(json_value);
+            }
+            result_vec.push(row_values);
         }
 
-        Ok(results)
+        Ok(result_vec)
     })
     .map_err(ExtensionError::from)
 }
 
-/// Konvertiert eine SQLite-Zeile zu JSON
-fn row_to_json_value(
-    row: &rusqlite::Row,
-    columns: &[String],
-) -> Result<JsonValue, rusqlite::Error> {
-    let mut map = serde_json::Map::new();
-    for (i, col_name) in columns.iter().enumerate() {
-        let value = row.get::<usize, rusqlite::types::Value>(i)?;
-        let json_value = match value {
-            rusqlite::types::Value::Null => JsonValue::Null,
-            rusqlite::types::Value::Integer(i) => json!(i),
-            rusqlite::types::Value::Real(f) => json!(f),
-            rusqlite::types::Value::Text(s) => json!(s),
-            rusqlite::types::Value::Blob(blob) => json!(blob.to_vec()),
-        };
-        map.insert(col_name.clone(), json_value);
-    }
-    Ok(JsonValue::Object(map))
-}
 
 /// Validiert Parameter gegen SQL-Platzhalter
 fn validate_params(sql: &str, params: &[JsonValue]) -> Result<(), DatabaseError> {
@@ -317,15 +323,6 @@ fn count_sql_placeholders(sql: &str) -> usize {
     sql.matches('?').count()
 }
 
-/// Kürzt SQL für Fehlermeldungen
-/* fn truncate_sql(sql: &str, max_length: usize) -> String {
-    if sql.len() <= max_length {
-        sql.to_string()
-    } else {
-        format!("{}...", &sql[..max_length])
-    }
-} */
-
 #[cfg(test)]
 mod tests {
     use super::*;

src-tauri/src/extension/mod.rs

@@ -1,7 +1,7 @@
 /// src-tauri/src/extension/mod.rs
 use crate::{
     extension::{
-        core::{EditablePermissions, ExtensionInfoResponse, ExtensionPreview},
+        core::{manager::ExtensionManager, EditablePermissions, ExtensionInfoResponse, ExtensionPreview},
         error::ExtensionError,
     },
     AppState,
@@ -37,7 +37,7 @@ pub async fn get_all_extensions(
     state: State<'_, AppState>,
 ) -> Result<Vec<ExtensionInfoResponse>, String> {
     // Check if extensions are loaded, if not load them first
-    let needs_loading = {
+    /*  let needs_loading = {
         let prod_exts = state
             .extension_manager
             .production_extensions
@@ -45,15 +45,15 @@ pub async fn get_all_extensions(
             .unwrap();
         let dev_exts = state.extension_manager.dev_extensions.lock().unwrap();
         prod_exts.is_empty() && dev_exts.is_empty()
-    };
+    }; */
 
-    if needs_loading {
+    /* if needs_loading { */
     state
         .extension_manager
         .load_installed_extensions(&app_handle, &state)
         .await
         .map_err(|e| format!("Failed to load extensions: {:?}", e))?;
-    }
+    /* } */
 
     let mut extensions = Vec::new();
 
@@ -82,12 +82,13 @@ pub async fn get_all_extensions(
 
 #[tauri::command]
 pub async fn preview_extension(
+    app_handle: AppHandle,
     state: State<'_, AppState>,
     file_bytes: Vec<u8>,
 ) -> Result<ExtensionPreview, ExtensionError> {
     state
         .extension_manager
-        .preview_extension_internal(file_bytes)
+        .preview_extension_internal(&app_handle, file_bytes)
         .await
 }
 
@@ -193,13 +194,7 @@ pub async fn remove_extension(
 ) -> Result<(), ExtensionError> {
     state
         .extension_manager
-        .remove_extension_internal(
+        .remove_extension_internal(&app_handle, &public_key, &name, &version, &state)
-            &app_handle,
-            &public_key,
-            &name,
-            &version,
-            &state,
-        )
         .await
 }
 
@@ -223,6 +218,16 @@ pub fn is_extension_installed(
 #[derive(serde::Deserialize, Debug)]
 struct HaextensionConfig {
     dev: DevConfig,
+    #[serde(default)]
+    keys: KeysConfig,
+}
+
+#[derive(serde::Deserialize, Debug, Default)]
+struct KeysConfig {
+    #[serde(default)]
+    public_key_path: Option<String>,
+    #[serde(default)]
+    private_key_path: Option<String>,
 }
 
 #[derive(serde::Deserialize, Debug)]
@@ -231,6 +236,8 @@ struct DevConfig {
     port: u16,
     #[serde(default = "default_host")]
     host: String,
+    #[serde(default = "default_haextension_dir")]
+    haextension_dir: String,
 }
 
 fn default_port() -> u16 {
@@ -241,10 +248,14 @@ fn default_host() -> String {
     "localhost".to_string()
 }
 
+fn default_haextension_dir() -> String {
+    "haextension".to_string()
+}
+
 /// Check if a dev server is reachable by making a simple HTTP request
 async fn check_dev_server_health(url: &str) -> bool {
-    use tauri_plugin_http::reqwest;
     use std::time::Duration;
+    use tauri_plugin_http::reqwest;
 
     // Try to connect with a short timeout
     let client = reqwest::Client::builder()
@@ -276,29 +287,28 @@ pub async fn load_dev_extension(
 
     let extension_path_buf = PathBuf::from(&extension_path);
 
-    // 1. Read haextension.json to get dev server config
+    // 1. Read haextension.config.json to get dev server config and haextension directory
-    let config_path = extension_path_buf.join("haextension.json");
+    let config_path = extension_path_buf.join("haextension.config.json");
-    let (host, port) = if config_path.exists() {
+    let (host, port, haextension_dir) = if config_path.exists() {
-        let config_content = std::fs::read_to_string(&config_path).map_err(|e| {
+        let config_content =
-            ExtensionError::ValidationError {
+            std::fs::read_to_string(&config_path).map_err(|e| ExtensionError::ValidationError {
-                reason: format!("Failed to read haextension.json: {}", e),
+                reason: format!("Failed to read haextension.config.json: {}", e),
-            }
             })?;
 
-        let config: HaextensionConfig = serde_json::from_str(&config_content).map_err(|e| {
+        let config: HaextensionConfig =
-            ExtensionError::ValidationError {
+            serde_json::from_str(&config_content).map_err(|e| ExtensionError::ValidationError {
-                reason: format!("Failed to parse haextension.json: {}", e),
+                reason: format!("Failed to parse haextension.config.json: {}", e),
-            }
             })?;
 
-        (config.dev.host, config.dev.port)
+        (config.dev.host, config.dev.port, config.dev.haextension_dir)
     } else {
         // Default values if config doesn't exist
-        (default_host(), default_port())
+        (default_host(), default_port(), default_haextension_dir())
     };
 
     let dev_server_url = format!("http://{}:{}", host, port);
     eprintln!("📡 Dev server URL: {}", dev_server_url);
+    eprintln!("📁 Haextension directory: {}", haextension_dir);
 
     // 1.5. Check if dev server is running
     if !check_dev_server_health(&dev_server_url).await {
@@ -311,35 +321,30 @@ pub async fn load_dev_extension(
     }
     eprintln!("✅ Dev server is reachable");
 
-    // 2. Build path to manifest: <extension_path>/haextension/manifest.json
+    // 2. Validate and build path to manifest: <extension_path>/<haextension_dir>/manifest.json
-    let manifest_path = extension_path_buf.join("haextension").join("manifest.json");
+    let manifest_relative_path = format!("{}/manifest.json", haextension_dir);
-
+    let manifest_path = ExtensionManager::validate_path_in_directory(
-    // Check if manifest exists
+        &extension_path_buf,
-    if !manifest_path.exists() {
+        &manifest_relative_path,
-        return Err(ExtensionError::ManifestError {
+        true,
+    )?
+    .ok_or_else(|| ExtensionError::ManifestError {
         reason: format!(
-                "Manifest not found at: {}. Make sure you run 'npx @haexhub/sdk init' first.",
+            "Manifest not found at: {}/manifest.json. Make sure you run 'npx @haexhub/sdk init' first.",
-                manifest_path.display()
+            haextension_dir
         ),
-        });
+    })?;
-    }
 
     // 3. Read and parse manifest
-    let manifest_content = std::fs::read_to_string(&manifest_path).map_err(|e| {
+    let manifest_content =
-        ExtensionError::ManifestError {
+        std::fs::read_to_string(&manifest_path).map_err(|e| ExtensionError::ManifestError {
             reason: format!("Failed to read manifest: {}", e),
-        }
         })?;
 
     let manifest: ExtensionManifest = serde_json::from_str(&manifest_content)?;
 
-    // 4. Generate a unique ID for dev extension: dev_<public_key_first_8>_<name>
+    // 4. Generate a unique ID for dev extension: dev_<public_key>_<name>
-    let key_prefix = manifest
+    let extension_id = format!("dev_{}_{}", manifest.public_key, manifest.name);
-        .public_key
-        .chars()
-        .take(8)
-        .collect::<String>();
-    let extension_id = format!("dev_{}_{}", key_prefix, manifest.name);
 
     // 5. Check if dev extension already exists (allow reload)
     if let Some(existing) = state
@@ -387,12 +392,10 @@ pub fn remove_dev_extension(
     state: State<'_, AppState>,
 ) -> Result<(), ExtensionError> {
     // Only remove from dev_extensions, not production_extensions
-    let mut dev_exts = state
+    let mut dev_exts = state.extension_manager.dev_extensions.lock().map_err(|e| {
-        .extension_manager
+        ExtensionError::MutexPoisoned {
-        .dev_extensions
-        .lock()
-        .map_err(|e| ExtensionError::MutexPoisoned {
             reason: e.to_string(),
+        }
     })?;
 
     // Find and remove by public_key and name
@@ -406,10 +409,7 @@ pub fn remove_dev_extension(
         eprintln!("✅ Dev extension removed: {}", name);
         Ok(())
     } else {
-        Err(ExtensionError::NotFound {
+        Err(ExtensionError::NotFound { public_key, name })
-            public_key,
-            name,
-        })
     }
 }
 

src-tauri/src/extension/permissions/manager.rs

@@ -197,6 +197,30 @@ impl PermissionManager {
         action: Action,
         table_name: &str,
     ) -> Result<(), ExtensionError> {
+        // Remove quotes from table name if present (from SDK's getTableName())
+        let clean_table_name = table_name.trim_matches('"');
+
+        // Auto-allow: Extensions have full access to their own tables
+        // Table format: {publicKey}__{extensionName}__{tableName}
+        // Extension ID format: dev_{publicKey}_{extensionName} or {publicKey}_{extensionName}
+
+        // Get the extension to check if this is its own table
+        let extension = app_state
+            .extension_manager
+            .get_extension(extension_id)
+            .ok_or_else(|| ExtensionError::ValidationError {
+                reason: format!("Extension with ID {} not found", extension_id),
+            })?;
+
+        // Build expected table prefix: {publicKey}__{extensionName}__
+        let expected_prefix = format!("{}__{}__", extension.manifest.public_key, extension.manifest.name);
+
+        if clean_table_name.starts_with(&expected_prefix) {
+            // This is the extension's own table - auto-allow
+            return Ok(());
+        }
+
+        // Not own table - check explicit permissions
         let permissions = Self::get_permissions(app_state, extension_id).await?;
 
         let has_permission = permissions
@@ -205,7 +229,7 @@ impl PermissionManager {
             .filter(|perm| perm.resource_type == ResourceType::Db)
             .filter(|perm| perm.action == action) // action ist nicht mehr Option
             .any(|perm| {
-                if perm.target != "*" && perm.target != table_name {
+                if perm.target != "*" && perm.target != clean_table_name {
                     return false;
                 }
                 true

src-tauri/src/extension/permissions/types.rs

@@ -165,8 +165,6 @@ pub struct ExtensionPermission {
     pub constraints: Option<PermissionConstraints>,
     pub status: PermissionStatus,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub haex_tombstone: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub haex_timestamp: Option<String>,
 }
 
@@ -341,9 +339,9 @@ impl From<&ExtensionPermission> for crate::database::generated::HaexExtensionPer
     fn from(perm: &ExtensionPermission) -> Self {
         Self {
             id: perm.id.clone(),
-            extension_id: Some(perm.extension_id.clone()),
+            extension_id: perm.extension_id.clone(),
             resource_type: Some(perm.resource_type.as_str().to_string()),
-            action: Some(perm.action.as_str()),
+            action: Some(perm.action.as_str().to_string()),
             target: Some(perm.target.clone()),
             constraints: perm
                 .constraints
@@ -352,7 +350,6 @@ impl From<&ExtensionPermission> for crate::database::generated::HaexExtensionPer
             status: perm.status.as_str().to_string(),
             created_at: None,
             updated_at: None,
-            haex_tombstone: perm.haex_tombstone,
             haex_timestamp: perm.haex_timestamp.clone(),
         }
     }
@@ -382,13 +379,12 @@ impl From<crate::database::generated::HaexExtensionPermissions> for ExtensionPer
 
         Self {
             id: db_perm.id,
-            extension_id: db_perm.extension_id.unwrap_or_default(),
+            extension_id: db_perm.extension_id,
             resource_type,
             action,
             target: db_perm.target.unwrap_or_default(),
             constraints,
             status,
-            haex_tombstone: db_perm.haex_tombstone,
             haex_timestamp: db_perm.haex_timestamp,
         }
     }

src-tauri/src/lib.rs

@@ -68,15 +68,19 @@ pub fn run() {
         .invoke_handler(tauri::generate_handler![
             database::create_encrypted_database,
             database::delete_vault,
+            database::move_vault_to_trash,
             database::list_vaults,
             database::open_encrypted_database,
+            database::sql_execute_with_crdt,
             database::sql_execute,
+            database::sql_query_with_crdt,
+            database::sql_select_with_crdt,
             database::sql_select,
             database::vault_exists,
             extension::database::extension_sql_execute,
             extension::database::extension_sql_select,
-            extension::get_all_extensions,
             extension::get_all_dev_extensions,
+            extension::get_all_extensions,
             extension::get_extension_info,
             extension::install_extension_with_permissions,
             extension::is_extension_installed,

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "haex-hub",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "identifier": "space.haex.hub",
   "build": {
     "beforeDevCommand": "pnpm dev",
@@ -25,7 +25,8 @@
           "'self'",
           "http://tauri.localhost",
           "haex-extension:",
-          "'wasm-unsafe-eval'"
+          "'wasm-unsafe-eval'",
+          "'unsafe-inline'"
         ],
         "style-src": [
           "'self'",

src/app.config.ts

@@ -2,7 +2,9 @@ export default defineAppConfig({
   ui: {
     colors: {
       primary: 'sky',
-      secondary: 'purple',
+      secondary: 'fuchsia',
+      warning: 'yellow',
+      danger: 'red',
     },
   },
 })

src/app.vue

@@ -1,8 +1,8 @@
 <template>
   <UApp :locale="locales[locale]">
-    <NuxtLayout>
+    <div data-vaul-drawer-wrapper>
       <NuxtPage />
-    </NuxtLayout>
+    </div>
   </UApp>
 </template>
 

src/assets/css/main.css

@@ -13,8 +13,48 @@
   [disabled] {
     @apply cursor-not-allowed;
   }
+
+  /* Define safe-area-insets as CSS custom properties for JavaScript access */
+  :root {
+    --safe-area-inset-top: env(safe-area-inset-top, 0px);
+    --safe-area-inset-bottom: env(safe-area-inset-bottom, 0px);
+    --safe-area-inset-left: env(safe-area-inset-left, 0px);
+    --safe-area-inset-right: env(safe-area-inset-right, 0px);
   }
 
-:root {
+  /* Verhindere Scrolling auf html und body */
-  --ui-header-height: 74px;
+  html {
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+    height: 100dvh;
+    height: 100vh; /* Fallback */
+    width: 100%;
+  }
+
+  body {
+    overflow: hidden;
+    margin: 0;
+    height: 100%;
+    width: 100%;
+    padding: 0;
+  }
+
+  #__nuxt {
+    /* Volle Höhe des body */
+    height: 100%;
+    width: 100%;
+
+    /* Safe-Area Paddings auf root element - damit ALLES davon profitiert */
+    padding-top: var(--safe-area-inset-top);
+    padding-bottom: var(--safe-area-inset-bottom);
+    padding-left: var(--safe-area-inset-left);
+    padding-right: var(--safe-area-inset-right);
+
+    box-sizing: border-box;
+  }
+}
+
+@theme {
+  --spacing-header: 3.5rem; /* 72px - oder dein Wunschwert */
 }

src/components/haex/debug/overlay.vue

@@ -0,0 +1,61 @@
+<template>
+  <div
+    v-if="data"
+    class="fixed top-2 right-2 bg-black/90 text-white text-xs p-3 rounded-lg shadow-2xl max-w-sm z-[9999] backdrop-blur-sm"
+  >
+    <div class="flex justify-between items-start gap-3 mb-2">
+      <span class="font-bold text-sm">{{ title }}</span>
+      <div class="flex gap-1">
+        <button
+          class="bg-white/20 hover:bg-white/30 px-2 py-1 rounded text-xs transition-colors"
+          @click="copyToClipboardAsync"
+        >
+          Copy
+        </button>
+        <button
+          v-if="dismissible"
+          class="bg-white/20 hover:bg-white/30 px-2 py-1 rounded text-xs transition-colors"
+          @click="handleDismiss"
+        >
+          ✕
+        </button>
+      </div>
+    </div>
+    <pre class="text-xs whitespace-pre-wrap font-mono overflow-auto max-h-96">{{ formattedData }}</pre>
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = withDefaults(
+  defineProps<{
+    data: Record<string, any> | null
+    title?: string
+    dismissible?: boolean
+  }>(),
+  {
+    title: 'Debug Info',
+    dismissible: false,
+  },
+)
+
+const emit = defineEmits<{
+  dismiss: []
+}>()
+
+const formattedData = computed(() => {
+  if (!props.data) return ''
+  return JSON.stringify(props.data, null, 2)
+})
+
+const copyToClipboardAsync = async () => {
+  try {
+    await navigator.clipboard.writeText(formattedData.value)
+  } catch (err) {
+    console.error('Failed to copy debug info:', err)
+  }
+}
+
+const handleDismiss = () => {
+  emit('dismiss')
+}
+</script>

src/components/haex/desktop/extension-frame.vue

@@ -0,0 +1,169 @@
+<template>
+  <div class="w-full h-full relative">
+    <!-- Error overlay for dev extensions when server is not reachable -->
+    <div
+      v-if="extension?.devServerUrl && hasError"
+      class="absolute inset-0 bg-white dark:bg-gray-900 flex items-center justify-center p-8"
+    >
+      <div class="max-w-md space-y-4 text-center">
+        <UIcon
+          name="i-heroicons-exclamation-circle"
+          class="w-16 h-16 mx-auto text-yellow-500"
+        />
+        <h3 class="text-lg font-semibold">Dev Server Not Reachable</h3>
+        <p class="text-sm opacity-70">
+          The dev server at {{ extension.devServerUrl }} is not reachable.
+        </p>
+        <div
+          class="bg-gray-100 dark:bg-gray-800 p-4 rounded text-left text-xs font-mono"
+        >
+          <p class="opacity-70 mb-2">To start the dev server:</p>
+          <code class="block">cd /path/to/extension</code>
+          <code class="block">npm run dev</code>
+        </div>
+        <UButton
+          label="Retry"
+          @click="retryLoad"
+        />
+      </div>
+    </div>
+
+    <!-- Loading Spinner -->
+    <div
+      v-if="isLoading"
+      class="absolute inset-0 bg-white dark:bg-gray-900 flex items-center justify-center"
+    >
+      <div class="flex flex-col items-center gap-4">
+        <div
+          class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"
+        />
+        <p class="text-sm text-gray-600 dark:text-gray-400">
+          Loading extension...
+        </p>
+      </div>
+    </div>
+
+    <iframe
+      ref="iframeRef"
+      :class="[
+        'w-full h-full border-0 transition-all duration-1000 ease-out',
+        isLoading ? 'opacity-0 scale-0' : 'opacity-100 scale-100',
+      ]"
+      :src="extensionUrl"
+      :sandbox="sandboxAttributes"
+      allow="autoplay; speaker-selection; encrypted-media;"
+      @load="handleIframeLoad"
+      @error="hasError = true"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  EXTENSION_PROTOCOL_PREFIX,
+  EXTENSION_PROTOCOL_NAME,
+} from '~/config/constants'
+
+const props = defineProps<{
+  extensionId: string
+  windowId: string 
+}>()
+
+const extensionsStore = useExtensionsStore()
+const { platform } = useDeviceStore()
+
+const iframeRef = useTemplateRef('iframeRef')
+const hasError = ref(false)
+const isLoading = ref(true)
+
+// Convert windowId to ref for reactive tracking
+const windowIdRef = toRef(props, 'windowId')
+
+const extension = computed(() => {
+  return extensionsStore.availableExtensions.find(
+    (ext) => ext.id === props.extensionId,
+  )
+})
+
+const handleIframeLoad = () => {
+  // Delay the fade-in slightly to allow window animation to mostly complete
+  setTimeout(() => {
+    isLoading.value = false
+  }, 200)
+}
+
+const sandboxDefault = ['allow-scripts'] as const
+
+const sandboxAttributes = computed(() => {
+  return extension.value?.devServerUrl
+    ? [...sandboxDefault, 'allow-same-origin'].join(' ')
+    : sandboxDefault.join(' ')
+})
+
+// Generate extension URL
+const extensionUrl = computed(() => {
+  if (!extension.value) return ''
+
+  const { publicKey, name, version, devServerUrl } = extension.value
+  const assetPath = 'index.html'
+
+  if (!publicKey || !name || !version) {
+    console.error('Missing required extension fields')
+    return ''
+  }
+
+  // If dev server URL is provided, load directly from dev server
+  if (devServerUrl) {
+    const cleanUrl = devServerUrl.replace(/\/$/, '')
+    const cleanPath = assetPath.replace(/^\//, '')
+    return cleanPath ? `${cleanUrl}/${cleanPath}` : cleanUrl
+  }
+
+  const extensionInfo = {
+    name,
+    publicKey,
+    version,
+  }
+  const encodedInfo = btoa(JSON.stringify(extensionInfo))
+
+  if (platform === 'android' || platform === 'windows') {
+    // Android: Tauri uses http://{scheme}.localhost format
+    return `http://${EXTENSION_PROTOCOL_NAME}.localhost/${encodedInfo}/${assetPath}`
+  } else {
+    // Desktop: Use custom protocol with base64 as host
+    return `${EXTENSION_PROTOCOL_PREFIX}${encodedInfo}/${assetPath}`
+  }
+})
+
+const retryLoad = () => {
+  hasError.value = false
+  if (iframeRef.value) {
+    //iframeRef.value.src = iframeRef.value.src // Force reload
+  }
+}
+
+// Initialize extension message handler to set up context
+useExtensionMessageHandler(iframeRef, extension, windowIdRef)
+
+// Additional explicit registration on mount to ensure iframe is registered
+onMounted(() => {
+  // Wait for iframe to be ready
+  if (iframeRef.value && extension.value) {
+    console.log(
+      '[ExtensionFrame] Manually registering iframe on mount',
+      extension.value.name,
+      'windowId:',
+      props.windowId,
+    )
+    registerExtensionIFrame(iframeRef.value, extension.value, props.windowId)
+  }
+})
+
+// Explicit cleanup before unmount
+onBeforeUnmount(() => {
+  if (iframeRef.value) {
+    console.log('[ExtensionFrame] Unregistering iframe on unmount')
+    unregisterExtensionIFrame(iframeRef.value)
+  }
+})
+</script>

src/components/haex/desktop/icon.vue

@@ -1,35 +1,75 @@
 <template>
+  <div>
+    <UiDialogConfirm
+      v-model:open="showUninstallDialog"
+      :title="t('confirmUninstall.title')"
+      :description="t('confirmUninstall.message', { name: label })"
+      :confirm-label="t('confirmUninstall.confirm')"
+      :abort-label="t('confirmUninstall.cancel')"
+      confirm-icon="i-heroicons-trash"
+      @confirm="handleConfirmUninstall"
+    />
+
     <UContextMenu :items="contextMenuItems">
       <div
         ref="draggableEl"
         :style="style"
         class="select-none cursor-grab active:cursor-grabbing"
-      @pointerdown="handlePointerDown"
+        @pointerdown.left="handlePointerDown"
         @pointermove="handlePointerMove"
         @pointerup="handlePointerUp"
-      @dblclick="handleOpen"
+        @click.left="handleClick"
+        @dblclick="handleDoubleClick"
       >
-      <div class="flex flex-col items-center gap-1 p-2">
+        <div class="flex flex-col items-center gap-2 p-3 group">
           <div
-          class="w-16 h-16 flex items-center justify-center bg-white/90 dark:bg-gray-800/90 rounded-lg shadow-lg hover:shadow-xl transition-shadow"
+            :class="[
+              'w-20 h-20 flex items-center justify-center rounded-2xl transition-all duration-200 ease-out',
+              'backdrop-blur-sm border',
+              isSelected
+                ? 'bg-white/95 dark:bg-gray-800/95 border-blue-500 dark:border-blue-400 shadow-lg scale-105'
+                : 'bg-white/80 dark:bg-gray-800/80 border-gray-200/50 dark:border-gray-700/50 hover:bg-white/90 dark:hover:bg-gray-800/90 hover:border-gray-300 dark:hover:border-gray-600 hover:shadow-md hover:scale-105',
+            ]"
           >
-          <img v-if="icon" :src="icon" :alt="label" class="w-12 h-12 object-contain" />
+            <img
-          <Icon v-else name="i-heroicons-puzzle-piece-solid" class="w-12 h-12 text-gray-500" />
+              v-if="icon"
+              :src="icon"
+              :alt="label"
+              class="w-14 h-14 object-contain transition-transform duration-200"
+              :class="{ 'scale-110': isSelected }"
+            />
+            <UIcon
+              v-else
+              name="i-heroicons-puzzle-piece-solid"
+              :class="[
+                'w-14 h-14 transition-all duration-200',
+                isSelected
+                  ? 'text-blue-500 dark:text-blue-400 scale-110'
+                  : 'text-gray-400 dark:text-gray-500 group-hover:text-gray-500 dark:group-hover:text-gray-400',
+              ]"
+            />
           </div>
           <span
-          class="text-xs text-center max-w-20 truncate bg-white/80 dark:bg-gray-800/80 px-2 py-1 rounded shadow"
+            :class="[
+              'text-xs text-center max-w-24 truncate px-3 py-1.5 rounded-lg transition-all duration-200',
+              'backdrop-blur-sm',
+              isSelected
+                ? 'bg-white/95 dark:bg-gray-800/95 text-gray-900 dark:text-gray-100 font-medium shadow-md'
+                : 'bg-white/70 dark:bg-gray-800/70 text-gray-700 dark:text-gray-300 group-hover:bg-white/85 dark:group-hover:bg-gray-800/85',
+            ]"
           >
             {{ label }}
           </span>
         </div>
       </div>
     </UContextMenu>
+  </div>
 </template>
 
 <script setup lang="ts">
 const props = defineProps<{
   id: string
-  itemType: 'extension' | 'file' | 'folder'
+  itemType: DesktopItemType
   referenceId: string
   initialX: number
   initialY: number
@@ -39,24 +79,51 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   positionChanged: [id: string, x: number, y: number]
-  open: [itemType: string, referenceId: string]
-  uninstall: [itemType: string, referenceId: string]
   dragStart: [id: string, itemType: string, referenceId: string]
   dragEnd: []
 }>()
 
 const desktopStore = useDesktopStore()
+const showUninstallDialog = ref(false)
+const { t } = useI18n()
+
+const isSelected = computed(() => desktopStore.isItemSelected(props.id))
+
+const handleClick = (e: MouseEvent) => {
+  // Prevent selection during drag
+  if (isDragging.value) return
+
+  desktopStore.toggleSelection(props.id, e.ctrlKey || e.metaKey)
+}
+
+const handleUninstallClick = () => {
+  showUninstallDialog.value = true
+}
+
+const handleConfirmUninstall = async () => {
+  showUninstallDialog.value = false
+  await desktopStore.uninstallDesktopItem(
+    props.id,
+    props.itemType,
+    props.referenceId,
+  )
+}
 
 const contextMenuItems = computed(() =>
   desktopStore.getContextMenuItems(
     props.id,
     props.itemType,
     props.referenceId,
-    handleOpen,
+    handleUninstallClick,
-    handleUninstall,
   ),
 )
 
+// Inject viewport size from parent desktop
+const viewportSize = inject<{
+  width: Ref<number>
+  height: Ref<number>
+}>('viewportSize')
+
 const draggableEl = ref<HTMLElement>()
 const x = ref(props.initialX)
 const y = ref(props.initialY)
@@ -64,6 +131,10 @@ const isDragging = ref(false)
 const offsetX = ref(0)
 const offsetY = ref(0)
 
+// Icon dimensions (approximate)
+const iconWidth = 120 // Matches design in template
+const iconHeight = 140
+
 const style = computed(() => ({
   position: 'absolute' as const,
   left: `${x.value}px`,
@@ -105,15 +176,52 @@ const handlePointerUp = (e: PointerEvent) => {
   if (draggableEl.value) {
     draggableEl.value.releasePointerCapture(e.pointerId)
   }
+
+  // Snap icon to viewport bounds if outside
+  if (viewportSize) {
+    const maxX = Math.max(0, viewportSize.width.value - iconWidth)
+    const maxY = Math.max(0, viewportSize.height.value - iconHeight)
+    x.value = Math.max(0, Math.min(maxX, x.value))
+    y.value = Math.max(0, Math.min(maxY, y.value))
+  }
+
   emit('dragEnd')
   emit('positionChanged', props.id, x.value, y.value)
 }
 
-const handleOpen = () => {
+const handleDoubleClick = () => {
-  emit('open', props.itemType, props.referenceId)
+  // Get icon position and size for animation
+  if (draggableEl.value) {
+    const rect = draggableEl.value.getBoundingClientRect()
+    const sourcePosition = {
+      x: rect.left,
+      y: rect.top,
+      width: rect.width,
+      height: rect.height,
+    }
+    desktopStore.openDesktopItem(
+      props.itemType,
+      props.referenceId,
+      sourcePosition,
+    )
+  } else {
+    desktopStore.openDesktopItem(props.itemType, props.referenceId)
   }
-
-const handleUninstall = () => {
-  emit('uninstall', props.itemType, props.referenceId)
 }
 </script>
+
+<i18n lang="yaml">
+de:
+  confirmUninstall:
+    title: Erweiterung deinstallieren
+    message: Möchten Sie die Erweiterung '{name}' wirklich deinstallieren? Diese Aktion kann nicht rückgängig gemacht werden.
+    confirm: Deinstallieren
+    cancel: Abbrechen
+
+en:
+  confirmUninstall:
+    title: Uninstall Extension
+    message: Do you really want to uninstall the extension '{name}'? This action cannot be undone.
+    confirm: Uninstall
+    cancel: Cancel
+</i18n>

src/components/haex/desktop/index.vue

@@ -1,143 +1,322 @@
 <template>
   <div
-    class="w-full h-full relative overflow-hidden bg-gradient-to-br from-blue-50 to-blue-100 dark:from-gray-900 dark:to-gray-800"
+    ref="desktopEl"
+    class="absolute inset-0 overflow-hidden"
+  >
+    <Swiper
+      :modules="[SwiperNavigation]"
+      :slides-per-view="1"
+      :space-between="0"
+      :initial-slide="currentWorkspaceIndex"
+      :speed="300"
+      :touch-angle="45"
+      :no-swiping="true"
+      no-swiping-class="no-swipe"
+      :allow-touch-move="allowSwipe"
+      class="h-full w-full"
+      direction="vertical"
+      @swiper="onSwiperInit"
+      @slide-change="onSlideChange"
+    >
+      <SwiperSlide
+        v-for="workspace in workspaces"
+        :key="workspace.id"
+        class="w-full h-full"
       >
-    <!-- Dropzones (only visible during drag) -->
-    <Transition name="slide-down">
         <div
-        v-if="isDragging"
+          class="w-full h-full relative"
-        class="absolute top-0 left-0 right-0 flex gap-2 p-4 z-50"
+          @click.self.stop="handleDesktopClick"
+          @mousedown.left.self="handleAreaSelectStart"
+          @dragover.prevent="handleDragOver"
+          @drop.prevent="handleDrop($event, workspace.id)"
         >
-        <!-- Remove from Desktop Dropzone -->
+          <!-- Grid Pattern Background -->
           <div
-          ref="removeDropzoneEl"
+            class="absolute inset-0 pointer-events-none opacity-30"
-          class="flex-1 h-20 flex items-center justify-center gap-2 rounded-lg border-2 border-dashed transition-all"
+            :style="{
-          :class="
+              backgroundImage:
-            isOverRemoveZone
+                'linear-gradient(rgba(0, 0, 0, 0.1) 1px, transparent 1px), linear-gradient(90deg, rgba(0, 0, 0, 0.1) 1px, transparent 1px)',
-              ? 'bg-orange-500/20 border-orange-500 dark:bg-orange-400/20 dark:border-orange-400'
+              backgroundSize: '32px 32px',
-              : 'border-orange-500/50 dark:border-orange-400/50'
+            }"
-          "
-        >
-          <Icon
-            name="i-heroicons-x-mark"
-            class="w-6 h-6"
-            :class="
-              isOverRemoveZone
-                ? 'text-orange-700 dark:text-orange-300'
-                : 'text-orange-600 dark:text-orange-400'
-            "
           />
-          <span
-            class="font-semibold"
-            :class="
-              isOverRemoveZone
-                ? 'text-orange-700 dark:text-orange-300'
-                : 'text-orange-600 dark:text-orange-400'
-            "
-          >
-            Von Desktop entfernen
-          </span>
-        </div>
 
-        <!-- Uninstall Dropzone -->
+          <!-- Snap Dropzones (only visible when window drag near edge) -->
+
           <div
-          ref="uninstallDropzoneEl"
+            class="absolute left-0 top-0 bottom-0 border-blue-500 pointer-events-none backdrop-blur-sm z-50 transition-all duration-500 ease-in-out"
-          class="flex-1 h-20 flex items-center justify-center gap-2 rounded-lg border-2 border-dashed transition-all"
+            :class="showLeftSnapZone ? 'w-1/2 bg-blue-500/20 border-2' : 'w-0'"
-          :class="
-            isOverUninstallZone
-              ? 'bg-red-500/20 border-red-500 dark:bg-red-400/20 dark:border-red-400'
-              : 'border-red-500/50 dark:border-red-400/50'
-          "
-        >
-          <Icon
-            name="i-heroicons-trash"
-            class="w-6 h-6"
-            :class="
-              isOverUninstallZone
-                ? 'text-red-700 dark:text-red-300'
-                : 'text-red-600 dark:text-red-400'
-            "
           />
-          <span
-            class="font-semibold"
-            :class="
-              isOverUninstallZone
-                ? 'text-red-700 dark:text-red-300'
-                : 'text-red-600 dark:text-red-400'
-            "
-          >
-            Deinstallieren
-          </span>
-        </div>
-      </div>
-    </Transition>
 
+          <div
+            class="absolute right-0 top-0 bottom-0 border-blue-500 pointer-events-none backdrop-blur-sm z-50 transition-all duration-500 ease-in-out"
+            :class="showRightSnapZone ? 'w-1/2 bg-blue-500/20 border-2' : 'w-0'"
+          />
+
+          <!-- Area Selection Box -->
+          <div
+            v-if="isAreaSelecting"
+            class="absolute bg-blue-500/20 border-2 border-blue-500 pointer-events-none z-30"
+            :style="selectionBoxStyle"
+          />
+
+          <!-- Icons for this workspace -->
           <HaexDesktopIcon
-      v-for="item in desktopItemIcons"
+            v-for="item in getWorkspaceIcons(workspace.id)"
-      :key="item.id"
             :id="item.id"
+            :key="item.id"
             :item-type="item.itemType"
             :reference-id="item.referenceId"
             :initial-x="item.positionX"
             :initial-y="item.positionY"
             :label="item.label"
             :icon="item.icon"
+            class="no-swipe"
             @position-changed="handlePositionChanged"
-      @open="handleOpen"
             @drag-start="handleDragStart"
             @drag-end="handleDragEnd"
-      @uninstall="handleUninstall"
           />
+
+          <!-- Windows for this workspace -->
+          <template
+            v-for="window in getWorkspaceWindows(workspace.id)"
+            :key="window.id"
+          >
+            <!-- Overview Mode: Teleport to window preview -->
+            <Teleport
+              v-if="
+                windowManager.showWindowOverview &&
+                overviewWindowState.has(window.id)
+              "
+              :to="`#window-preview-${window.id}`"
+            >
+              <div
+                class="absolute origin-top-left"
+                :style="{
+                  transform: `scale(${overviewWindowState.get(window.id)!.scale})`,
+                  width: `${overviewWindowState.get(window.id)!.width}px`,
+                  height: `${overviewWindowState.get(window.id)!.height}px`,
+                }"
+              >
+                <HaexWindow
+                  v-show="
+                    windowManager.showWindowOverview || !window.isMinimized
+                  "
+                  :id="window.id"
+                  v-model:x="overviewWindowState.get(window.id)!.x"
+                  v-model:y="overviewWindowState.get(window.id)!.y"
+                  v-model:width="overviewWindowState.get(window.id)!.width"
+                  v-model:height="overviewWindowState.get(window.id)!.height"
+                  :title="window.title"
+                  :icon="window.icon"
+                  :is-active="windowManager.isWindowActive(window.id)"
+                  :source-x="window.sourceX"
+                  :source-y="window.sourceY"
+                  :source-width="window.sourceWidth"
+                  :source-height="window.sourceHeight"
+                  :is-opening="window.isOpening"
+                  :is-closing="window.isClosing"
+                  :warning-level="
+                    window.type === 'extension' &&
+                    availableExtensions.find(
+                      (ext) => ext.id === window.sourceId,
+                    )?.devServerUrl
+                      ? 'warning'
+                      : undefined
+                  "
+                  class="no-swipe"
+                  @close="windowManager.closeWindow(window.id)"
+                  @minimize="windowManager.minimizeWindow(window.id)"
+                  @activate="windowManager.activateWindow(window.id)"
+                  @position-changed="
+                    (x, y) =>
+                      windowManager.updateWindowPosition(window.id, x, y)
+                  "
+                  @size-changed="
+                    (width, height) =>
+                      windowManager.updateWindowSize(window.id, width, height)
+                  "
+                  @drag-start="handleWindowDragStart(window.id)"
+                  @drag-end="handleWindowDragEnd"
+                >
+                  <!-- System Window: Render Vue Component -->
+                  <component
+                    :is="getSystemWindowComponent(window.sourceId)"
+                    v-if="window.type === 'system'"
+                  />
+
+                  <!-- Extension Window: Render iFrame -->
+                  <HaexDesktopExtensionFrame
+                    v-else
+                    :extension-id="window.sourceId"
+                    :window-id="window.id"
+                  />
+                </HaexWindow>
+              </div>
+            </Teleport>
+
+            <!-- Desktop Mode: Render directly in workspace -->
+            <HaexWindow
+              v-else
+              v-show="windowManager.showWindowOverview || !window.isMinimized"
+              :id="window.id"
+              v-model:x="window.x"
+              v-model:y="window.y"
+              v-model:width="window.width"
+              v-model:height="window.height"
+              :title="window.title"
+              :icon="window.icon"
+              :is-active="windowManager.isWindowActive(window.id)"
+              :source-x="window.sourceX"
+              :source-y="window.sourceY"
+              :source-width="window.sourceWidth"
+              :source-height="window.sourceHeight"
+              :is-opening="window.isOpening"
+              :is-closing="window.isClosing"
+              :warning-level="
+                window.type === 'extension' &&
+                availableExtensions.find((ext) => ext.id === window.sourceId)
+                  ?.devServerUrl
+                  ? 'warning'
+                  : undefined
+              "
+              class="no-swipe"
+              @close="windowManager.closeWindow(window.id)"
+              @minimize="windowManager.minimizeWindow(window.id)"
+              @activate="windowManager.activateWindow(window.id)"
+              @position-changed="
+                (x, y) => windowManager.updateWindowPosition(window.id, x, y)
+              "
+              @size-changed="
+                (width, height) =>
+                  windowManager.updateWindowSize(window.id, width, height)
+              "
+              @drag-start="handleWindowDragStart(window.id)"
+              @drag-end="handleWindowDragEnd"
+            >
+              <!-- System Window: Render Vue Component -->
+              <component
+                :is="getSystemWindowComponent(window.sourceId)"
+                v-if="window.type === 'system'"
+              />
+
+              <!-- Extension Window: Render iFrame -->
+              <HaexDesktopExtensionFrame
+                v-else
+                :extension-id="window.sourceId"
+                :window-id="window.id"
+              />
+            </HaexWindow>
+          </template>
+        </div>
+      </SwiperSlide>
+    </Swiper>
+
+    <!-- Window Overview Modal -->
+    <HaexWindowOverview />
   </div>
 </template>
 
 <script setup lang="ts">
+import { Swiper, SwiperSlide } from 'swiper/vue'
+import { Navigation } from 'swiper/modules'
+import type { Swiper as SwiperType } from 'swiper'
+import 'swiper/css'
+import 'swiper/css/navigation'
+
+const SwiperNavigation = Navigation
+
 const desktopStore = useDesktopStore()
 const extensionsStore = useExtensionsStore()
-const router = useRouter()
+const windowManager = useWindowManagerStore()
-
+const workspaceStore = useWorkspaceStore()
 const { desktopItems } = storeToRefs(desktopStore)
 const { availableExtensions } = storeToRefs(extensionsStore)
+const {
+  currentWorkspace,
+  currentWorkspaceIndex,
+  workspaces,
+  swiperInstance,
+  allowSwipe,
+  isOverviewMode,
+} = storeToRefs(workspaceStore)
 
-// Drag state
+const { x: mouseX } = useMouse()
+
+const desktopEl = useTemplateRef('desktopEl')
+
+// Track desktop viewport size reactively
+const { width: viewportWidth, height: viewportHeight } =
+  useElementSize(desktopEl)
+
+// Provide viewport size to child windows
+provide('viewportSize', {
+  width: viewportWidth,
+  height: viewportHeight,
+})
+
+// Area selection state
+const isAreaSelecting = ref(false)
+const selectionStart = ref({ x: 0, y: 0 })
+const selectionEnd = ref({ x: 0, y: 0 })
+
+const selectionBoxStyle = computed(() => {
+  const x1 = Math.min(selectionStart.value.x, selectionEnd.value.x)
+  const y1 = Math.min(selectionStart.value.y, selectionEnd.value.y)
+  const x2 = Math.max(selectionStart.value.x, selectionEnd.value.x)
+  const y2 = Math.max(selectionStart.value.y, selectionEnd.value.y)
+
+  return {
+    left: `${x1}px`,
+    top: `${y1}px`,
+    width: `${x2 - x1}px`,
+    height: `${y2 - y1}px`,
+  }
+})
+
+// Drag state for desktop icons
 const isDragging = ref(false)
 const currentDraggedItemId = ref<string>()
 const currentDraggedItemType = ref<string>()
 const currentDraggedReferenceId = ref<string>()
 
-// Dropzone refs
+// Window drag state for snap zones
-const removeDropzoneEl = ref<HTMLElement>()
+const isWindowDragging = ref(false)
-const uninstallDropzoneEl = ref<HTMLElement>()
+const snapEdgeThreshold = 50 // pixels from edge to show snap zone
 
-// Setup dropzones with VueUse
+// Computed visibility for snap zones (uses mouseX from above)
-const { isOverDropZone: isOverRemoveZone } = useDropZone(removeDropzoneEl, {
+const showLeftSnapZone = computed(() => {
-  onDrop: () => {
+  return isWindowDragging.value && mouseX.value <= snapEdgeThreshold
-    if (currentDraggedItemId.value) {
-      handleRemoveFromDesktop(currentDraggedItemId.value)
-    }
-  },
 })
 
-const { isOverDropZone: isOverUninstallZone } = useDropZone(uninstallDropzoneEl, {
+const showRightSnapZone = computed(() => {
-  onDrop: () => {
+  if (!isWindowDragging.value) return false
-    if (currentDraggedItemType.value && currentDraggedReferenceId.value) {
+  const viewportWidth = window.innerWidth
-      handleUninstall(currentDraggedItemType.value, currentDraggedReferenceId.value)
+  return mouseX.value >= viewportWidth - snapEdgeThreshold
-    }
-  },
 })
 
-interface DesktopItemIcon extends IDesktopItem {
+// Get icons for a specific workspace
-  label: string
+const getWorkspaceIcons = (workspaceId: string) => {
-  icon?: string
+  return desktopItems.value
+    .filter((item) => item.workspaceId === workspaceId)
+    .map((item) => {
+      if (item.itemType === 'system') {
+        const systemWindow = windowManager
+          .getAllSystemWindows()
+          .find((win) => win.id === item.referenceId)
+
+        return {
+          ...item,
+          label: systemWindow?.name || 'Unknown',
+          icon: systemWindow?.icon || '',
+        }
       }
 
-const desktopItemIcons = computed<DesktopItemIcon[]>(() => {
-  return desktopItems.value.map((item) => {
       if (item.itemType === 'extension') {
         const extension = availableExtensions.value.find(
           (ext) => ext.id === item.referenceId,
         )
 
+        console.log('found ext', extension)
         return {
           ...item,
           label: extension?.name || 'Unknown',
@@ -169,7 +348,18 @@ const desktopItemIcons = computed<DesktopItemIcon[]>(() => {
         icon: undefined,
       }
     })
-})
+}
+
+// Get windows for a specific workspace (including minimized for teleport)
+const getWorkspaceWindows = (workspaceId: string) => {
+  return windowManager.windows.filter((w) => w.workspaceId === workspaceId)
+}
+
+// Get Vue Component for system window
+const getSystemWindowComponent = (sourceId: string) => {
+  const systemWindow = windowManager.getSystemWindow(sourceId)
+  return systemWindow?.component
+}
 
 const handlePositionChanged = async (id: string, x: number, y: number) => {
   try {
@@ -179,55 +369,306 @@ const handlePositionChanged = async (id: string, x: number, y: number) => {
   }
 }
 
-const localePath = useLocalePath()
-
-const handleOpen = (itemType: string, referenceId: string) => {
-  if (itemType === 'extension') {
-    router.push(
-      localePath({
-        name: 'extension',
-        params: { extensionId: referenceId },
-      })
-    )
-  }
-  // Für später: file und folder handling
-}
-
 const handleDragStart = (id: string, itemType: string, referenceId: string) => {
   isDragging.value = true
   currentDraggedItemId.value = id
   currentDraggedItemType.value = itemType
   currentDraggedReferenceId.value = referenceId
+  allowSwipe.value = false // Disable Swiper during icon drag
 }
 
-const handleDragEnd = () => {
+const handleDragEnd = async () => {
+  // Cleanup drag state
   isDragging.value = false
   currentDraggedItemId.value = undefined
   currentDraggedItemType.value = undefined
   currentDraggedReferenceId.value = undefined
+  allowSwipe.value = true // Re-enable Swiper after drag
 }
 
-const handleUninstall = async (itemType: string, referenceId: string) => {
+// Handle drag over for launcher items
-  if (itemType === 'extension') {
+const handleDragOver = (event: DragEvent) => {
-    try {
+  if (!event.dataTransfer) return
-      const extension = availableExtensions.value.find((ext) => ext.id === referenceId)
+
-      if (extension) {
+  // Check if this is a launcher item
-        await extensionsStore.removeExtensionAsync(
+  if (event.dataTransfer.types.includes('application/haex-launcher-item')) {
-          extension.publicKey,
+    event.dataTransfer.dropEffect = 'copy'
-          extension.name,
+  }
-          extension.version,
+}
+
+// Handle drop for launcher items
+const handleDrop = async (event: DragEvent, workspaceId: string) => {
+  if (!event.dataTransfer) return
+
+  const launcherItemData = event.dataTransfer.getData(
+    'application/haex-launcher-item',
   )
-        // Reload extensions after uninstall
+  if (!launcherItemData) return
-        await extensionsStore.loadExtensionsAsync()
+
+  try {
+    const item = JSON.parse(launcherItemData) as {
+      id: string
+      name: string
+      icon: string
+      type: 'system' | 'extension'
     }
+
+    // Get drop position relative to desktop
+    const desktopRect = (
+      event.currentTarget as HTMLElement
+    ).getBoundingClientRect()
+    const x = Math.max(0, event.clientX - desktopRect.left - 32) // Center icon (64px / 2)
+    const y = Math.max(0, event.clientY - desktopRect.top - 32)
+
+    // Create desktop icon on the specific workspace
+    await desktopStore.addDesktopItemAsync(
+      item.type as DesktopItemType,
+      item.id,
+      x,
+      y,
+      workspaceId,
+    )
   } catch (error) {
-      console.error('Fehler beim Deinstallieren:', error)
+    console.error('Failed to create desktop icon:', error)
   }
 }
-  // Für später: file und folder handling
+
+const handleDesktopClick = () => {
+  // Only clear selection if it was a simple click, not an area selection
+  // Check if we just finished an area selection (box size > threshold)
+  const boxWidth = Math.abs(selectionEnd.value.x - selectionStart.value.x)
+  const boxHeight = Math.abs(selectionEnd.value.y - selectionStart.value.y)
+
+  // If box is larger than 5px in any direction, it was an area select, not a click
+  if (boxWidth > 5 || boxHeight > 5) {
+    return
   }
 
+  desktopStore.clearSelection()
+  isOverviewMode.value = false
+}
+
+const handleWindowDragStart = (windowId: string) => {
+  console.log('[Desktop] handleWindowDragStart:', windowId)
+  isWindowDragging.value = true
+  windowManager.draggingWindowId = windowId // Set in store for workspace cards
+  console.log(
+    '[Desktop] draggingWindowId set to:',
+    windowManager.draggingWindowId,
+  )
+  allowSwipe.value = false // Disable Swiper during window drag
+}
+
+const handleWindowDragEnd = async () => {
+  console.log('[Desktop] handleWindowDragEnd')
+
+  // Check if window should snap to left or right
+  const draggingWindowId = windowManager.draggingWindowId
+
+  if (draggingWindowId) {
+    if (showLeftSnapZone.value) {
+      // Snap to left half
+      windowManager.updateWindowPosition(draggingWindowId, 0, 0)
+      windowManager.updateWindowSize(
+        draggingWindowId,
+        viewportWidth.value / 2,
+        viewportHeight.value,
+      )
+    } else if (showRightSnapZone.value) {
+      // Snap to right half
+      windowManager.updateWindowPosition(
+        draggingWindowId,
+        viewportWidth.value / 2,
+        0,
+      )
+      windowManager.updateWindowSize(
+        draggingWindowId,
+        viewportWidth.value / 2,
+        viewportHeight.value,
+      )
+    }
+  }
+
+  isWindowDragging.value = false
+  windowManager.draggingWindowId = null // Clear from store
+  allowSwipe.value = true // Re-enable Swiper after drag
+}
+
+// Area selection handlers
+const handleAreaSelectStart = (e: MouseEvent) => {
+  if (!desktopEl.value) return
+
+  const rect = desktopEl.value.getBoundingClientRect()
+  const x = e.clientX - rect.left
+  const y = e.clientY - rect.top
+
+  isAreaSelecting.value = true
+  selectionStart.value = { x, y }
+  selectionEnd.value = { x, y }
+
+  // Clear current selection
+  desktopStore.clearSelection()
+}
+
+// Track mouse movement for area selection
+useEventListener(window, 'mousemove', (e: MouseEvent) => {
+  if (isAreaSelecting.value && desktopEl.value) {
+    const rect = desktopEl.value.getBoundingClientRect()
+    const x = e.clientX - rect.left
+    const y = e.clientY - rect.top
+
+    selectionEnd.value = { x, y }
+
+    // Find all items within selection box
+    selectItemsInBox()
+  }
+})
+
+// End area selection
+useEventListener(window, 'mouseup', () => {
+  if (isAreaSelecting.value) {
+    isAreaSelecting.value = false
+
+    // Reset selection coordinates after a short delay
+    // This allows handleDesktopClick to still check the box size
+    setTimeout(() => {
+      selectionStart.value = { x: 0, y: 0 }
+      selectionEnd.value = { x: 0, y: 0 }
+    }, 100)
+  }
+})
+
+const selectItemsInBox = () => {
+  const x1 = Math.min(selectionStart.value.x, selectionEnd.value.x)
+  const y1 = Math.min(selectionStart.value.y, selectionEnd.value.y)
+  const x2 = Math.max(selectionStart.value.x, selectionEnd.value.x)
+  const y2 = Math.max(selectionStart.value.y, selectionEnd.value.y)
+
+  desktopStore.clearSelection()
+
+  desktopItems.value.forEach((item) => {
+    // Check if item position is within selection box
+    const itemX = item.positionX + 60 // Icon center (approx)
+    const itemY = item.positionY + 60
+
+    if (itemX >= x1 && itemX <= x2 && itemY >= y1 && itemY <= y2) {
+      desktopStore.toggleSelection(item.id, true) // true = add to selection
+    }
+  })
+}
+
+// Swiper event handlers
+const onSwiperInit = (swiper: SwiperType) => {
+  swiperInstance.value = swiper
+}
+
+const onSlideChange = (swiper: SwiperType) => {
+  workspaceStore.switchToWorkspace(
+    workspaceStore.workspaces.at(swiper.activeIndex)?.id,
+  )
+}
+
+/* const handleRemoveWorkspace = async () => {
+  if (!currentWorkspace.value || workspaces.value.length <= 1) return
+
+  const currentIndex = currentWorkspaceIndex.value
+  await workspaceStore.removeWorkspaceAsync(currentWorkspace.value.id)
+
+  // Slide to adjusted index
+  nextTick(() => {
+    if (swiperInstance.value) {
+      const newIndex = Math.min(currentIndex, workspaces.value.length - 1)
+      swiperInstance.value.slideTo(newIndex)
+    }
+  })
+}
+
+const handleDropWindowOnWorkspace = async (
+  event: DragEvent,
+  targetWorkspaceId: string,
+) => {
+  // Get the window ID from drag data (will be set when we implement window dragging)
+  const windowId = event.dataTransfer?.getData('windowId')
+  if (windowId) {
+    await moveWindowToWorkspace(windowId, targetWorkspaceId)
+  }
+} */
+
+// Overview Mode: Calculate grid positions and scale for windows
+// Calculate preview dimensions for window overview
+const MIN_PREVIEW_WIDTH = 300 // 50% increase from 200
+const MAX_PREVIEW_WIDTH = 600 // 50% increase from 400
+const MIN_PREVIEW_HEIGHT = 225 // 50% increase from 150
+const MAX_PREVIEW_HEIGHT = 450 // 50% increase from 300
+
+// Store window state for overview (position only, size stays original)
+const overviewWindowState = ref(
+  new Map<
+    string,
+    { x: number; y: number; width: number; height: number; scale: number }
+  >(),
+)
+
+// Calculate scale and card dimensions for each window
+watch(
+  () => windowManager.showWindowOverview,
+  (isOpen) => {
+    if (isOpen) {
+      // Wait for the Overview modal to mount and create the teleport targets
+      nextTick(() => {
+        windowManager.windows.forEach((window) => {
+          const scaleX = MAX_PREVIEW_WIDTH / window.width
+          const scaleY = MAX_PREVIEW_HEIGHT / window.height
+          const scale = Math.min(scaleX, scaleY, 1)
+
+          // Ensure minimum card size
+          const scaledWidth = window.width * scale
+          const scaledHeight = window.height * scale
+
+          let finalScale = scale
+          if (scaledWidth < MIN_PREVIEW_WIDTH) {
+            finalScale = MIN_PREVIEW_WIDTH / window.width
+          }
+          if (scaledHeight < MIN_PREVIEW_HEIGHT) {
+            finalScale = Math.max(
+              finalScale,
+              MIN_PREVIEW_HEIGHT / window.height,
+            )
+          }
+
+          overviewWindowState.value.set(window.id, {
+            x: 0,
+            y: 0,
+            width: window.width,
+            height: window.height,
+            scale: finalScale,
+          })
+        })
+      })
+    } else {
+      // Clear state when overview is closed
+      overviewWindowState.value.clear()
+    }
+  },
+)
+
+// Disable Swiper in overview mode
+watch(isOverviewMode, (newValue) => {
+  allowSwipe.value = !newValue
+})
+
+// Watch for workspace changes to reload desktop items
+watch(currentWorkspace, async () => {
+  if (currentWorkspace.value) {
+    await desktopStore.loadDesktopItemsAsync()
+  }
+})
+
 onMounted(async () => {
+  // Load workspaces first
+  await workspaceStore.loadWorkspacesAsync()
+
+  // Then load desktop items for current workspace
   await desktopStore.loadDesktopItemsAsync()
 })
 </script>
@@ -247,4 +688,14 @@ onMounted(async () => {
   opacity: 0;
   transform: translateY(-100%);
 }
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.2s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+}
 </style>

src/components/haex/extension/card.vue

@@ -89,7 +89,11 @@ const removeExtensionAsync = async () => {
   }
 
   try {
-    await extensionStore.removeExtensionAsync(extension.id, extension.version)
+    await extensionStore.removeExtensionAsync(
+      extension.publicKey,
+      extension.name,
+      extension.version,
+    )
     await extensionStore.loadExtensionsAsync()
 
     add({

src/components/haex/extension/dialog/install.vue

@@ -15,7 +15,7 @@
           <div class="flex items-start gap-4">
             <div
               v-if="preview?.manifest.icon"
-              class="w-16 h-16 flex-shrink-0"
+              class="w-16 h-16 shrink-0"
             >
               <UIcon
                 :name="preview.manifest.icon"
@@ -184,7 +184,6 @@ const shellPermissions = computed({
   },
 })
 
-
 const permissionAccordionItems = computed(() => {
   const items = []
 

src/components/haex/extension/launcher.vue

@@ -1,32 +1,48 @@
 <template>
-  <UPopover v-model:open="open">
+  <UDrawer
+    v-model:open="open"
+    direction="right"
+    :title="t('launcher.title')"
+    :description="t('launcher.description')"
+    :ui="{
+      content: 'w-dvw max-w-md sm:max-w-fit',
+    }"
+  >
     <UButton
       icon="material-symbols:apps"
       color="neutral"
       variant="outline"
       v-bind="$attrs"
-      size="xl"
+      size="lg"
     />
 
     <template #content>
-      <ul class="p-4 max-h-96 grid grid-cols-3 gap-2 overflow-scroll">
+      <div class="p-4 h-full overflow-y-auto">
-        <!-- Enabled Extensions -->
+        <div class="flex flex-wrap">
+          <!-- All launcher items (system windows + enabled extensions, alphabetically sorted) -->
+          <UContextMenu
+            v-for="item in launcherItems"
+            :key="item.id"
+            :items="getContextMenuItems(item)"
+          >
             <UiButton
-          v-for="extension in enabledExtensions"
-          :key="extension.id"
               square
-          size="xl"
+              size="lg"
               variant="ghost"
               :ui="{
-            base: 'size-24 flex flex-wrap text-sm items-center justify-center overflow-visible',
+                base: 'size-24 flex flex-wrap text-sm items-center justify-center overflow-visible cursor-grab active:cursor-grabbing',
                 leadingIcon: 'size-10',
                 label: 'w-full',
               }"
-          :icon="extension.icon || 'i-heroicons-puzzle-piece-solid'"
+              :icon="item.icon"
-          :label="extension.name"
+              :label="item.name"
-          :tooltip="extension.name"
+              :tooltip="item.name"
-          @click="openExtension(extension.id)"
+              draggable="true"
+              @click="openItem(item)"
+              @dragstart="handleDragStart($event, item)"
+              @dragend="handleDragEnd"
             />
+          </UContextMenu>
 
           <!-- Disabled Extensions (grayed out) -->
           <UiButton
@@ -45,70 +61,189 @@
             :label="extension.name"
             :tooltip="`${extension.name} (${t('disabled')})`"
           />
-
+        </div>
-        <!-- Marketplace Button (always at the end) -->
+      </div>
-        <UiButton
-          square
-          size="xl"
-          variant="soft"
-          color="primary"
-          :ui="{
-            base: 'size-24 flex flex-wrap text-sm items-center justify-center overflow-visible',
-            leadingIcon: 'size-10',
-            label: 'w-full',
-          }"
-          icon="i-heroicons-plus-circle"
-          :label="t('marketplace')"
-          :tooltip="t('marketplace')"
-          @click="openMarketplace"
-        />
-      </ul>
     </template>
-  </UPopover>
+  </UDrawer>
+
+  <!-- Uninstall Confirmation Dialog -->
+  <UiDialogConfirm
+    v-model:open="showUninstallDialog"
+    :title="t('uninstall.confirm.title')"
+    :description="
+      t('uninstall.confirm.description', {
+        name: extensionToUninstall?.name || '',
+      })
+    "
+    :confirm-label="t('uninstall.confirm.button')"
+    confirm-icon="i-heroicons-trash"
+    @confirm="confirmUninstall"
+  />
 </template>
 
 <script setup lang="ts">
+defineOptions({
+  inheritAttrs: false,
+})
+
 const extensionStore = useExtensionsStore()
-const router = useRouter()
+const windowManagerStore = useWindowManagerStore()
-const route = useRoute()
+
-const localePath = useLocalePath()
 const { t } = useI18n()
 
 const open = ref(false)
 
-// Enabled extensions first
+// Uninstall dialog state
-const enabledExtensions = computed(() => {
+const showUninstallDialog = ref(false)
-  return extensionStore.availableExtensions.filter((ext) => ext.enabled)
+const extensionToUninstall = ref<LauncherItem | null>(null)
+
+// Unified launcher item type
+interface LauncherItem {
+  id: string
+  name: string
+  icon: string
+  type: 'system' | 'extension'
+}
+
+// Combine system windows and enabled extensions, sorted alphabetically
+const launcherItems = computed(() => {
+  const items: LauncherItem[] = []
+
+  // Add system windows
+  const systemWindows = windowManagerStore.getAllSystemWindows()
+  systemWindows.forEach((sysWin: SystemWindowDefinition) => {
+    items.push({
+      id: sysWin.id,
+      name: sysWin.name,
+      icon: sysWin.icon,
+      type: 'system',
+    })
   })
 
-// Disabled extensions last
+  // Add enabled extensions
+  const enabledExtensions = extensionStore.availableExtensions.filter(
+    (ext) => ext.enabled,
+  )
+  enabledExtensions.forEach((ext) => {
+    items.push({
+      id: ext.id,
+      name: ext.name,
+      icon: ext.icon || 'i-heroicons-puzzle-piece-solid',
+      type: 'extension',
+    })
+  })
+
+  // Sort alphabetically by name
+  return items.sort((a, b) => a.name.localeCompare(b.name))
+})
+
+// Disabled extensions (shown grayed out at the end)
 const disabledExtensions = computed(() => {
   return extensionStore.availableExtensions.filter((ext) => !ext.enabled)
 })
 
-const openExtension = (extensionId: string) => {
+// Open launcher item (system window or extension)
-  router.push(
+const openItem = async (item: LauncherItem) => {
-    localePath({
+  try {
-      name: 'haexExtension',
+    // Open the window with correct type and sourceId
-      params: {
+    await windowManagerStore.openWindowAsync({
-        vaultId: route.params.vaultId,
+      sourceId: item.id,
-        extensionId,
+      type: item.type,
-      },
+      icon: item.icon,
-    }),
+      title: item.name,
-  )
+    })
+
     open.value = false
+  } catch (error) {
+    console.log(error)
+  }
 }
 
-const openMarketplace = () => {
+// Uninstall extension - shows confirmation dialog first
-  router.push(
+const uninstallExtension = async (item: LauncherItem) => {
-    localePath({
+  extensionToUninstall.value = item
-      name: 'extensionOverview',
+  showUninstallDialog.value = true
-      params: {
+}
-        vaultId: route.params.vaultId,
+
-      },
+// Confirm uninstall - actually removes the extension
-    }),
+const confirmUninstall = async () => {
+  if (!extensionToUninstall.value) return
+
+  try {
+    const extension = extensionStore.availableExtensions.find(
+      (ext) => ext.id === extensionToUninstall.value!.id,
     )
-  open.value = false
+    if (!extension) return
+
+    // Close all windows of this extension first
+    const extensionWindows = windowManagerStore.windows.filter(
+      (win) => win.type === 'extension' && win.sourceId === extension.id,
+    )
+
+    for (const win of extensionWindows) {
+      windowManagerStore.closeWindow(win.id)
+    }
+
+    // Uninstall the extension
+    await extensionStore.removeExtensionAsync(
+      extension.publicKey,
+      extension.name,
+      extension.version,
+    )
+
+    // Refresh available extensions list
+    await extensionStore.loadExtensionsAsync()
+
+    // Close dialog and reset state
+    showUninstallDialog.value = false
+    extensionToUninstall.value = null
+  } catch (error) {
+    console.error('Failed to uninstall extension:', error)
+  }
+}
+
+// Get context menu items for launcher item
+const getContextMenuItems = (item: LauncherItem) => {
+  const items = [
+    {
+      label: t('contextMenu.open'),
+      icon: 'i-heroicons-arrow-top-right-on-square',
+      onSelect: () => openItem(item),
+    },
+  ]
+
+  // Add uninstall option for extensions
+  if (item.type === 'extension') {
+    items.push({
+      label: t('contextMenu.uninstall'),
+      icon: 'i-heroicons-trash',
+      onSelect: () => uninstallExtension(item),
+    })
+  }
+
+  return items
+}
+
+// Drag & Drop handling
+const handleDragStart = (event: DragEvent, item: LauncherItem) => {
+  if (!event.dataTransfer) return
+
+  // Store the launcher item data
+  event.dataTransfer.effectAllowed = 'copy'
+  event.dataTransfer.setData(
+    'application/haex-launcher-item',
+    JSON.stringify(item),
+  )
+
+  // Set drag image (optional - uses default if not set)
+  const dragImage = event.target as HTMLElement
+  if (dragImage) {
+    event.dataTransfer.setDragImage(dragImage, 20, 20)
+  }
+}
+
+const handleDragEnd = () => {
+  // Cleanup if needed
 }
 </script>
 
@@ -116,8 +251,30 @@ const openMarketplace = () => {
 de:
   disabled: Deaktiviert
   marketplace: Marketplace
+  launcher:
+    title: App Launcher
+    description: Wähle eine App zum Öffnen
+  contextMenu:
+    open: Öffnen
+    uninstall: Deinstallieren
+  uninstall:
+    confirm:
+      title: Erweiterung deinstallieren
+      description: Möchtest du wirklich "{name}" deinstallieren? Diese Aktion kann nicht rückgängig gemacht werden.
+      button: Deinstallieren
 
 en:
   disabled: Disabled
   marketplace: Marketplace
+  launcher:
+    title: App Launcher
+    description: Select an app to open
+  contextMenu:
+    open: Open
+    uninstall: Uninstall
+  uninstall:
+    confirm:
+      title: Uninstall Extension
+      description: Do you really want to uninstall "{name}"? This action cannot be undone.
+      button: Uninstall
 </i18n>

src/components/haex/extension/manifest/permissions/database.vue

@@ -15,7 +15,7 @@
             type="checkbox"
             class="checkbox"
             :checked="Object.values(read).at(0)"
-          />
+          >
           <label
             class="label-text text-base"
             :for="Object.keys(read).at(0)"
@@ -42,7 +42,7 @@
             type="checkbox"
             class="checkbox"
             :checked="Object.values(write).at(0)"
-          />
+          >
           <label
             class="label-text text-base"
             :for="Object.keys(write).at(0)"
@@ -69,7 +69,7 @@
             type="checkbox"
             class="checkbox"
             :checked="Object.values(create).at(0)"
-          />
+          >
           <label
             class="label-text text-base"
             :for="Object.keys(create).at(0)"

src/components/haex/extension/manifest/permissions/filesystem.vue

@@ -14,7 +14,7 @@
             type="checkbox"
             class="checkbox"
             :checked="Object.values(read).at(0)"
-          />
+          >
           <label
             class="label-text text-base"
             :for="Object.keys(read).at(0)"
@@ -41,7 +41,7 @@
             type="checkbox"
             class="checkbox"
             :checked="Object.values(write).at(0)"
-          />
+          >
           <label
             class="label-text text-base"
             :for="Object.keys(write).at(0)"

src/components/haex/extension/manifest/permissions/http.vue

@@ -15,7 +15,7 @@
             type="checkbox"
             class="checkbox"
             :checked="Object.values(access).at(0)"
-          />
+          >
           <label
             class="label-text text-base"
             :for="Object.keys(access).at(0)"

src/components/haex/extension/marketplace-card.vue

@@ -8,7 +8,7 @@
   >
     <div class="flex items-start gap-4">
       <!-- Icon -->
-      <div class="flex-shrink-0">
+      <div class="shrink-0">
         <div
           v-if="extension.icon"
           class="w-16 h-16 rounded-lg bg-primary/10 flex items-center justify-center"
@@ -52,7 +52,7 @@
 
         <p
           v-if="extension.description"
-          class="text-sm text-gray-600 dark:text-gray-300 mt-2 line-clamp-2"
+          class="hidden @lg:flex text-sm text-gray-600 dark:text-gray-300 mt-2 line-clamp-2"
         >
           {{ extension.description }}
         </p>
@@ -67,7 +67,9 @@
           >
             <UIcon name="i-heroicons-check-circle-solid" />
             <span v-if="!extension.installedVersion">{{ t('installed') }}</span>
-            <span v-else>{{ t('installedVersion', { version: extension.installedVersion }) }}</span>
+            <span v-else>{{
+              t('installedVersion', { version: extension.installedVersion })
+            }}</span>
           </div>
           <div
             v-if="extension.downloads"
@@ -114,10 +116,16 @@
       <div class="flex items-center justify-between gap-2">
         <UButton
           :label="getInstallButtonLabel()"
-          :color="extension.isInstalled && !extension.installedVersion ? 'neutral' : 'primary'"
+          :color="
+            extension.isInstalled && !extension.installedVersion
+              ? 'neutral'
+              : 'primary'
+          "
           :disabled="extension.isInstalled && !extension.installedVersion"
           :icon="
-            extension.isInstalled && !extension.installedVersion ? 'i-heroicons-check' : 'i-heroicons-arrow-down-tray'
+            extension.isInstalled && !extension.installedVersion
+              ? 'i-heroicons-check'
+              : 'i-heroicons-arrow-down-tray'
           "
           size="sm"
           @click.stop="$emit('install')"

src/components/haex/system/developer.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="p-4 max-w-4xl mx-auto space-y-6">
+  <div class="p-4 mx-auto space-y-6 bg-default/90 backdrop-blur-2xl">
     <div class="space-y-2">
       <h1 class="text-2xl font-bold">{{ t('title') }}</h1>
       <p class="text-sm opacity-70">{{ t('description') }}</p>
@@ -85,28 +85,16 @@
 <script setup lang="ts">
 import { invoke } from '@tauri-apps/api/core'
 import { open } from '@tauri-apps/plugin-dialog'
-
+import type { ExtensionInfoResponse } from '~~/src-tauri/bindings/ExtensionInfoResponse'
-definePageMeta({
-  name: 'settings-developer',
-})
 
 const { t } = useI18n()
 const { add } = useToast()
 const { loadExtensionsAsync } = useExtensionsStore()
 
-
 // State
 const extensionPath = ref('')
 const isLoading = ref(false)
-const devExtensions = ref<
+const devExtensions = ref<Array<ExtensionInfoResponse>>([])
-  Array<{
-    id: string
-    publicKey: string
-    name: string
-    version: string
-    enabled: boolean
-  }>
->([])
 
 // Load dev extensions on mount
 onMounted(async () => {
@@ -140,7 +128,7 @@ const loadDevExtensionAsync = async () => {
 
   isLoading.value = true
   try {
-    const extensionId = await invoke<string>('load_dev_extension', {
+    await invoke<string>('load_dev_extension', {
       extensionPath: extensionPath.value,
     })
 
@@ -157,10 +145,10 @@ const loadDevExtensionAsync = async () => {
 
     // Clear input
     extensionPath.value = ''
-  } catch (error: any) {
+  } catch (error) {
     console.error('Failed to load dev extension:', error)
     add({
-      description: error || t('add.errors.loadFailed'),
+      description: t('add.errors.loadFailed') + error,
       color: 'error',
     })
   } finally {
@@ -171,7 +159,9 @@ const loadDevExtensionAsync = async () => {
 // Load all dev extensions (for the list on this page)
 const loadDevExtensionListAsync = async () => {
   try {
-    const extensions = await invoke<Array<any>>('get_all_dev_extensions')
+    const extensions = await invoke<Array<ExtensionInfoResponse>>(
+      'get_all_dev_extensions',
+    )
     devExtensions.value = extensions
   } catch (error) {
     console.error('Failed to load dev extensions:', error)
@@ -179,29 +169,30 @@ const loadDevExtensionListAsync = async () => {
 }
 
 // Reload a dev extension (removes and re-adds)
-const reloadDevExtensionAsync = async (ext: any) => {
+const reloadDevExtensionAsync = async (extension: ExtensionInfoResponse) => {
   try {
+    console.log('reloadDevExtensionAsync', extension)
     // Get the extension path from somewhere (we need to store this)
     // For now, just show a message
     add({
       description: t('list.reloadInfo'),
       color: 'info',
     })
-  } catch (error: any) {
+  } catch (error) {
     console.error('Failed to reload dev extension:', error)
     add({
-      description: error || t('list.errors.reloadFailed'),
+      description: t('list.errors.reloadFailed') + error,
       color: 'error',
     })
   }
 }
 
 // Remove a dev extension
-const removeDevExtensionAsync = async (ext: any) => {
+const removeDevExtensionAsync = async (extension: ExtensionInfoResponse) => {
   try {
     await invoke('remove_dev_extension', {
-      publicKey: ext.publicKey,
+      publicKey: extension.publicKey,
-      name: ext.name,
+      name: extension.name,
     })
 
     add({
@@ -214,10 +205,10 @@ const removeDevExtensionAsync = async (ext: any) => {
 
     // Reload all extensions store
     await loadExtensionsAsync()
-  } catch (error: any) {
+  } catch (error) {
     console.error('Failed to remove dev extension:', error)
     add({
-      description: error || t('list.errors.removeFailed'),
+      description: t('list.errors.removeFailed') + error,
       color: 'error',
     })
   }

src/components/haex/system/marketplace.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="flex flex-col h-full">
+  <div class="flex flex-col h-full bg-default">
     <!-- Header with Actions -->
     <div
-      class="flex flex-col sm:flex-row sm:items-center justify-between gap-4 p-6 border-b border-gray-200 dark:border-gray-800"
+      class="flex flex-col @lg:flex-row @lg:items-center justify-between gap-4 p-6 border-b border-gray-200 dark:border-gray-800"
     >
       <div>
         <h1 class="text-2xl font-bold">
@@ -14,14 +14,14 @@
       </div>
 
       <div
-        class="flex flex-col sm:flex-row items-stretch sm:items-center gap-3"
+        class="flex flex-col @lg:flex-row items-stretch @lg:items-center gap-3"
       >
         <!-- Marketplace Selector -->
         <USelectMenu
           v-model="selectedMarketplace"
           :items="marketplaces"
           value-key="id"
-          class="w-full sm:w-48"
+          class="w-full @lg:w-48"
         >
           <template #leading>
             <UIcon name="i-heroicons-building-storefront" />
@@ -33,6 +33,7 @@
           :label="t('extension.installFromFile')"
           icon="i-heroicons-arrow-up-tray"
           color="neutral"
+          block
           @click="onSelectExtensionAsync"
         />
       </div>
@@ -40,7 +41,7 @@
 
     <!-- Search and Filters -->
     <div
-      class="flex flex-col sm:flex-row items-stretch sm:items-center gap-4 p-6 border-b border-gray-200 dark:border-gray-800"
+      class="flex flex-col @lg:flex-row items-stretch @lg:items-center gap-4 p-6 border-b border-gray-200 dark:border-gray-800"
     >
       <UInput
         v-model="searchQuery"
@@ -53,7 +54,7 @@
         :items="categories"
         :placeholder="t('filter.category')"
         value-key="id"
-        class="w-full sm:w-48"
+        class="w-full @lg:w-48"
       >
         <template #leading>
           <UIcon name="i-heroicons-tag" />
@@ -65,7 +66,7 @@
     <div class="flex-1 overflow-auto p-6">
       <div
         v-if="filteredExtensions.length"
-        class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4"
+        class="grid grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3 gap-4"
       >
         <!-- Marketplace Extension Card -->
         <HaexExtensionMarketplaceCard
@@ -104,7 +105,7 @@
     <HaexExtensionDialogInstall
       v-model:open="showConfirmation"
       :preview="preview"
-      @confirm="(addToDesktop) => addExtensionAsync(addToDesktop)"
+      @confirm="addExtensionAsync"
     />
 
     <HaexExtensionDialogRemove
@@ -124,13 +125,8 @@ import type {
 import { open } from '@tauri-apps/plugin-dialog'
 import type { ExtensionPreview } from '~~/src-tauri/bindings/ExtensionPreview'
 
-definePageMeta({
-  name: 'extensionOverview',
-})
-
 const { t } = useI18n()
 const extensionStore = useExtensionsStore()
-const desktopStore = useDesktopStore()
 
 const showConfirmation = ref(false)
 const openOverwriteDialog = ref(false)
@@ -203,7 +199,8 @@ const marketplaceExtensions = ref<IMarketplaceExtension[]>([
     name: 'HaexPassDummy',
     version: '1.0.0',
     author: 'HaexHub Team',
-    public_key: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2',
+    public_key:
+      'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2',
     description:
       'Sicherer Passwort-Manager mit Ende-zu-Ende-Verschlüsselung und Autofill-Funktion.',
     icon: 'i-heroicons-lock-closed',
@@ -221,7 +218,8 @@ const marketplaceExtensions = ref<IMarketplaceExtension[]>([
     name: 'HaexNotes',
     version: '2.1.0',
     author: 'HaexHub Team',
-    public_key: 'b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3',
+    public_key:
+      'b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3',
     description:
       'Markdown-basierter Notizen-Editor mit Syntax-Highlighting und Live-Preview.',
     icon: 'i-heroicons-document-text',
@@ -239,7 +237,8 @@ const marketplaceExtensions = ref<IMarketplaceExtension[]>([
     name: 'HaexBackup',
     version: '1.5.2',
     author: 'Community',
-    public_key: 'c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4',
+    public_key:
+      'c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4',
     description:
       'Automatische Backups deiner Daten mit Cloud-Sync-Unterstützung.',
     icon: 'i-heroicons-cloud-arrow-up',
@@ -257,7 +256,8 @@ const marketplaceExtensions = ref<IMarketplaceExtension[]>([
     name: 'HaexCalendar',
     version: '3.0.1',
     author: 'HaexHub Team',
-    public_key: 'd4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5',
+    public_key:
+      'd4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5',
     description:
       'Integrierter Kalender mit Event-Management und Synchronisation.',
     icon: 'i-heroicons-calendar',
@@ -275,7 +275,8 @@ const marketplaceExtensions = ref<IMarketplaceExtension[]>([
     name: 'Haex2FA',
     version: '1.2.0',
     author: 'Security Team',
-    public_key: 'e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6',
+    public_key:
+      'e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6',
     description:
       '2-Faktor-Authentifizierung Manager mit TOTP und Backup-Codes.',
     icon: 'i-heroicons-shield-check',
@@ -293,7 +294,8 @@ const marketplaceExtensions = ref<IMarketplaceExtension[]>([
     name: 'GitHub Integration',
     version: '1.0.5',
     author: 'Community',
-    public_key: 'f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7',
+    public_key:
+      'f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7',
     description:
       'Direkter Zugriff auf GitHub Repositories, Issues und Pull Requests.',
     icon: 'i-heroicons-code-bracket',
@@ -312,16 +314,23 @@ const marketplaceExtensions = ref<IMarketplaceExtension[]>([
 const allExtensions = computed((): IMarketplaceExtension[] => {
   return marketplaceExtensions.value.map((ext) => {
     // Extensions are uniquely identified by public_key + name
-    const installedExt = extensionStore.availableExtensions.find((installed) => {
+    const installedExt = extensionStore.availableExtensions.find(
-      return installed.publicKey === ext.publicKey && installed.name === ext.name
+      (installed) => {
-    })
+        return (
+          installed.publicKey === ext.publicKey && installed.name === ext.name
+        )
+      },
+    )
 
     if (installedExt) {
       return {
         ...ext,
         isInstalled: true,
         // Show installed version if it differs from marketplace version
-        installedVersion: installedExt.version !== ext.version ? installedExt.version : undefined,
+        installedVersion:
+          installedExt.version !== ext.version
+            ? installedExt.version
+            : undefined,
       }
     }
 
@@ -375,7 +384,7 @@ const onSelectExtensionAsync = async () => {
     const isAlreadyInstalled = extensionStore.availableExtensions.some(
       (ext) =>
         ext.publicKey === preview.value!.manifest.public_key &&
-        ext.name === preview.value!.manifest.name
+        ext.name === preview.value!.manifest.name,
     )
 
     if (isAlreadyInstalled) {
@@ -389,23 +398,18 @@ const onSelectExtensionAsync = async () => {
   }
 }
 
-const addExtensionAsync = async (addToDesktop: boolean = false) => {
+const addExtensionAsync = async () => {
   try {
     console.log(
       'preview.value?.editable_permissions',
       preview.value?.editable_permissions,
     )
-    const extensionId = await extensionStore.installAsync(
+    await extensionStore.installAsync(
       extension.path,
       preview.value?.editable_permissions,
     )
     await extensionStore.loadExtensionsAsync()
 
-    // Add to desktop if requested
-    if (addToDesktop && extensionId) {
-      await desktopStore.addDesktopItemAsync('extension', extensionId, 50, 50)
-    }
-
     add({
       color: 'success',
       title: t('extension.success.title', {
@@ -435,7 +439,7 @@ const reinstallExtensionAsync = async () => {
     const installedExt = extensionStore.availableExtensions.find(
       (ext) =>
         ext.publicKey === preview.value!.manifest.public_key &&
-        ext.name === preview.value!.manifest.name
+        ext.name === preview.value!.manifest.name,
     )
 
     if (installedExt) {
@@ -443,7 +447,7 @@ const reinstallExtensionAsync = async () => {
       await extensionStore.removeExtensionAsync(
         installedExt.publicKey,
         installedExt.name,
-        installedExt.version
+        installedExt.version,
       )
     }
 
@@ -476,7 +480,11 @@ onMounted(async () => {
 } */
 
 const removeExtensionAsync = async () => {
-  if (!extensionToBeRemoved.value?.publicKey || !extensionToBeRemoved.value?.name || !extensionToBeRemoved.value?.version) {
+  if (
+    !extensionToBeRemoved.value?.publicKey ||
+    !extensionToBeRemoved.value?.name ||
+    !extensionToBeRemoved.value?.version
+  ) {
     add({
       color: 'error',
       description: 'Erweiterung kann nicht gelöscht werden',

src/components/haex/system/settings.vue

@@ -1,8 +1,6 @@
 <template>
-  <div>
+  <div class="w-full h-full bg-default">
-    <div
+    <div class="grid grid-cols-2 p-2">
-      class="grid grid-rows-2 sm:grid-cols-2 sm:gap-2 p-2 max-w-2xl w-full h-fit"
-    >
       <div class="p-2">{{ t('language') }}</div>
       <div><UiDropdownLocale @select="onSelectLocaleAsync" /></div>
 
@@ -34,20 +32,15 @@
           @change="onUpdateDeviceNameAsync"
         />
       </div>
-    </div>
 
-    <!-- Child routes (like developer.vue) will be rendered here -->
+      <div class="h-full"/>
-    <NuxtPage />
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import type { Locale } from 'vue-i18n'
 
-definePageMeta({
-  name: 'settings',
-})
-
 const { t, setLocale } = useI18n()
 
 const { currentVaultName } = storeToRefs(useVaultStore())

src/components/haex/vault/create.vue

@@ -2,6 +2,7 @@
   <UiDialogConfirm
     :confirm-label="t('create')"
     @confirm="onCreateAsync"
+    :description="t('description')"
   >
     <UiButton
       :label="t('vault.create')"
@@ -55,7 +56,9 @@
 <script setup lang="ts">
 import { vaultSchema } from './schema'
 
-const { t } = useI18n()
+const { t } = useI18n({
+  useScope: 'local',
+})
 
 const vault = reactive<{
   name: string
@@ -98,7 +101,7 @@ const onCreateAsync = async () => {
       if (vaultId) {
         initVault()
         await navigateTo(
-          useLocaleRoute()({ name: 'vaultOverview', params: { vaultId } }),
+          useLocaleRoute()({ name: 'desktop', params: { vaultId } }),
         )
       }
     }
@@ -118,6 +121,7 @@ de:
     name: HaexVault
   title: Neue {haexvault} erstellen
   create: Erstellen
+  description: Erstelle eine neue Vault für deine Daten
 
 en:
   vault:
@@ -127,4 +131,5 @@ en:
     name: HaexVault
   title: Create new {haexvault}
   create: Create
+  description: Create a new vault for your data
 </i18n>

src/components/haex/vault/open.vue

@@ -5,7 +5,7 @@
     :description="vault.path || path"
     @confirm="onOpenDatabase"
   >
-    <!-- <UiButton
+    <UiButton
       :label="t('vault.open')"
       :ui="{
         base: 'px-3 py-2',
@@ -14,8 +14,7 @@
       size="xl"
       variant="outline"
       block
-      @click.stop="onLoadDatabase"
+    />
-    /> -->
 
     <template #title>
       <i18n-t
@@ -59,7 +58,9 @@ const props = defineProps<{
   path?: string
 }>()
 
-const { t } = useI18n()
+const { t } = useI18n({
+  useScope: 'local',
+})
 
 const vault = reactive<{
   name: string
@@ -100,9 +101,6 @@ const vault = reactive<{
   }
 } */
 
-const { syncLocaleAsync, syncThemeAsync, syncVaultNameAsync } =
-  useVaultSettingsStore()
-
 const check = ref(false)
 
 const initVault = () => {
@@ -150,21 +148,23 @@ const onOpenDatabase = async () => {
 
     await navigateTo(
       localePath({
-        name: 'vaultOverview',
+        name: 'desktop',
         params: {
           vaultId,
         },
       }),
     )
-    await Promise.allSettled([
-      syncLocaleAsync(),
-      syncThemeAsync(),
-      syncVaultNameAsync(),
-    ])
   } catch (error) {
     open.value = false
-    console.error('handleError', error, typeof error)
+    if (error?.details?.reason === 'file is not a database') {
-    add({ color: 'error', description: `${error}` })
+      add({
+        color: 'error',
+        title: t('error.password.title'),
+        description: t('error.password.description'),
+      })
+    } else {
+      add({ color: 'error', description: JSON.stringify(error) })
+    }
   }
 }
 </script>
@@ -178,7 +178,9 @@ de:
     open: Vault öffnen
   description: Öffne eine vorhandene Vault
   error:
-    open: Vault konnte nicht geöffnet werden. \n Vermutlich ist das Passwort falsch
+    password:
+      title: Vault konnte nicht geöffnet werden
+      description: Bitte üperprüfe das Passwort
 
 en:
   open: Unlock
@@ -188,5 +190,7 @@ en:
   vault:
     open: Open Vault
   error:
-    open: Vault couldn't be opened. \n The password is probably wrong
+    password:
+      title: Vault couldn't be opened
+      description: Please check your password
 </i18n>

src/components/haex/window/button.vue

@@ -0,0 +1,83 @@
+<template>
+  <UTooltip :text="tooltip">
+    <button
+      class="size-8 shrink-0 rounded-lg flex justify-center transition-colors group"
+      :class="variantClasses.buttonClass"
+      @click="(e) => $emit('click', e)"
+    >
+      <UIcon
+        :name="icon"
+        class="size-4 text-gray-600 dark:text-gray-400"
+        :class="variantClasses.iconClass"
+      />
+    </button>
+  </UTooltip>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  variant: 'close' | 'maximize' | 'minimize'
+  isMaximized?: boolean
+}>()
+
+defineEmits(['click'])
+
+const icon = computed(() => {
+  switch (props.variant) {
+    case 'close':
+      return 'i-heroicons-x-mark'
+    case 'maximize':
+      return props.isMaximized
+        ? 'i-heroicons-arrows-pointing-in'
+        : 'i-heroicons-arrows-pointing-out'
+    default:
+      return 'i-heroicons-minus'
+  }
+})
+
+const variantClasses = computed(() => {
+  if (props.variant === 'close') {
+    return {
+      iconClass: 'group-hover:text-error',
+      buttonClass: 'hover:bg-error/30 items-center',
+    }
+  } else if (props.variant === 'maximize') {
+    return {
+      iconClass: 'group-hover:text-warning',
+      buttonClass: 'hover:bg-warning/30 items-center',
+    }
+  } else {
+    return {
+      iconClass: 'group-hover:text-success',
+      buttonClass: 'hover:bg-success/30 items-end pb-1',
+    }
+  }
+})
+
+const { t } = useI18n()
+
+const tooltip = computed(() => {
+  switch (props.variant) {
+    case 'close':
+      return t('close')
+    case 'maximize':
+      return props.isMaximized ? t('shrink') : t('maximize')
+    default:
+      return t('minimize')
+  }
+})
+</script>
+
+<i18n lang="yaml">
+de:
+  close: Schließen
+  maximize: Maximieren
+  shrink: Verkleinern
+  minimize: Minimieren
+
+en:
+  close: Close
+  maximize: Maximize
+  shrink: Shrink
+  minimize: Minimize
+</i18n>

src/components/haex/window/index.vue

@@ -0,0 +1,429 @@
+<template>
+  <div
+    ref="windowEl"
+    :style="windowStyle"
+    :class="[
+      'absolute bg-default/80 backdrop-blur-xl rounded-lg shadow-xl overflow-hidden',
+      'transition-all ease-out duration-600',
+      'flex flex-col @container',
+      { 'select-none': isResizingOrDragging },
+      isActive ? 'z-20' : 'z-10',
+      // Border colors based on warning level
+      warningLevel === 'warning'
+        ? 'border-2 border-warning-500'
+        : warningLevel === 'danger'
+          ? 'border-2 border-danger-500'
+          : 'border border-gray-200 dark:border-gray-700',
+    ]"
+    @mousedown="handleActivate"
+  >
+    <!-- Window Titlebar -->
+    <div
+      ref="titlebarEl"
+      class="grid grid-cols-3 items-center px-3 py-1 bg-white/80 dark:bg-gray-800/80 border-b border-gray-200/50 dark:border-gray-700/50 cursor-move select-none touch-none"
+      @dblclick="handleMaximize"
+    >
+      <!-- Left: Icon -->
+      <div class="flex items-center gap-2">
+        <img
+          v-if="icon"
+          :src="icon"
+          :alt="title"
+          class="w-5 h-5 object-contain shrink-0"
+        />
+      </div>
+
+      <!-- Center: Title -->
+      <div class="flex items-center justify-center">
+        <span
+          class="text-sm font-medium text-gray-900 dark:text-gray-100 truncate max-w-full"
+        >
+          {{ title }}
+        </span>
+      </div>
+
+      <!-- Right: Window Controls -->
+      <div class="flex items-center gap-1 justify-end">
+        <HaexWindowButton
+          variant="minimize"
+          @click.stop="handleMinimize"
+        />
+
+        <HaexWindowButton
+          :is-maximized
+          variant="maximize"
+          @click.stop="handleMaximize"
+        />
+
+        <HaexWindowButton
+          variant="close"
+          @click.stop="handleClose"
+        />
+      </div>
+    </div>
+
+    <!-- Window Content -->
+    <div
+      :class="[
+        'flex-1 overflow-auto relative ',
+        isResizingOrDragging ? 'pointer-events-none' : '',
+      ]"
+    >
+      <slot />
+    </div>
+
+    <!-- Resize Handles -->
+    <HaexWindowResizeHandles
+      :disabled="isMaximized"
+      @resize-start="handleResizeStart"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  id: string
+  title: string
+  icon?: string | null
+  isActive?: boolean
+  sourceX?: number
+  sourceY?: number
+  sourceWidth?: number
+  sourceHeight?: number
+  isOpening?: boolean
+  isClosing?: boolean
+  warningLevel?: 'warning' | 'danger' // Warning indicator (e.g., dev extension, dangerous permissions)
+}>()
+
+const emit = defineEmits<{
+  close: []
+  minimize: []
+  activate: []
+  positionChanged: [x: number, y: number]
+  sizeChanged: [width: number, height: number]
+  dragStart: []
+  dragEnd: []
+}>()
+
+// Use defineModel for x, y, width, height
+const x = defineModel<number>('x', { default: 100 })
+const y = defineModel<number>('y', { default: 100 })
+const width = defineModel<number>('width', { default: 800 })
+const height = defineModel<number>('height', { default: 600 })
+
+const windowEl = useTemplateRef('windowEl')
+const titlebarEl = useTemplateRef('titlebarEl')
+
+// Inject viewport size from parent desktop
+const viewportSize = inject<{
+  width: Ref<number>
+  height: Ref<number>
+}>('viewportSize')
+const isMaximized = ref(false) // Don't start maximized
+
+// Store initial position/size for restore
+const preMaximizeState = ref({
+  x: x.value,
+  y: y.value,
+  width: width.value,
+  height: height.value,
+})
+
+// Dragging state
+const isDragging = ref(false)
+const dragStartX = ref(0)
+const dragStartY = ref(0)
+
+// Resizing state
+const isResizing = ref(false)
+const resizeDirection = ref<string>('')
+const resizeStartX = ref(0)
+const resizeStartY = ref(0)
+const resizeStartWidth = ref(0)
+const resizeStartHeight = ref(0)
+const resizeStartPosX = ref(0)
+const resizeStartPosY = ref(0)
+
+const isResizingOrDragging = computed(
+  () => isResizing.value || isDragging.value,
+)
+
+// Setup drag with useDrag composable (supports mouse + touch)
+useDrag(
+  ({ movement: [mx, my], first, last }) => {
+    if (isMaximized.value) return
+
+    if (first) {
+      // Drag started - save initial position
+      isDragging.value = true
+      dragStartX.value = x.value
+      dragStartY.value = y.value
+      emit('dragStart')
+      return // Don't update position on first event
+    }
+
+    if (last) {
+      // Drag ended
+      isDragging.value = false
+      globalThis.getSelection()?.removeAllRanges()
+      emit('positionChanged', x.value, y.value)
+      emit('sizeChanged', width.value, height.value)
+      emit('dragEnd')
+      return
+    }
+
+    // Dragging (not first, not last)
+    const newX = dragStartX.value + mx
+    const newY = dragStartY.value + my
+
+    // Apply constraints during drag
+    const constrained = constrainToViewportDuringDrag(newX, newY)
+    x.value = constrained.x
+    y.value = constrained.y
+  },
+  {
+    domTarget: titlebarEl,
+    eventOptions: { passive: false },
+    pointer: { touch: true },
+    drag: {
+      filterTaps: true, // Filter out taps (clicks) vs drags
+      delay: 0, // No delay for immediate response
+    },
+  },
+)
+
+const windowStyle = computed(() => {
+  const baseStyle: Record<string, string> = {}
+
+  // Opening animation: start from icon position
+  if (
+    props.isOpening &&
+    props.sourceX !== undefined &&
+    props.sourceY !== undefined
+  ) {
+    baseStyle.left = `${props.sourceX}px`
+    baseStyle.top = `${props.sourceY}px`
+    baseStyle.width = `${props.sourceWidth || 100}px`
+    baseStyle.height = `${props.sourceHeight || 100}px`
+    baseStyle.opacity = '0'
+    baseStyle.transform = 'scale(0.3)'
+  }
+  // Closing animation: shrink to icon position
+  else if (
+    props.isClosing &&
+    props.sourceX !== undefined &&
+    props.sourceY !== undefined
+  ) {
+    baseStyle.left = `${props.sourceX}px`
+    baseStyle.top = `${props.sourceY}px`
+    baseStyle.width = `${props.sourceWidth || 100}px`
+    baseStyle.height = `${props.sourceHeight || 100}px`
+    baseStyle.opacity = '0'
+    baseStyle.transform = 'scale(0.3)'
+  }
+  // Normal state (maximized windows now use actual pixel dimensions)
+  else {
+    baseStyle.left = `${x.value}px`
+    baseStyle.top = `${y.value}px`
+    baseStyle.width = `${width.value}px`
+    baseStyle.height = `${height.value}px`
+    baseStyle.opacity = '1'
+
+    // Remove border-radius when maximized
+    if (isMaximized.value) {
+      baseStyle.borderRadius = '0'
+    }
+  }
+
+  // Performance optimization: hint browser about transforms
+  if (isDragging.value || isResizing.value) {
+    baseStyle.willChange = 'transform, width, height'
+    baseStyle.transform = 'translateZ(0)'
+  }
+
+  return baseStyle
+})
+
+const getViewportBounds = () => {
+  // Use reactive viewport size from parent if available
+  if (viewportSize) {
+    return {
+      width: viewportSize.width.value,
+      height: viewportSize.height.value,
+    }
+  }
+
+  // Fallback to parent element measurement
+  if (!windowEl.value?.parentElement) return null
+
+  const parent = windowEl.value.parentElement
+  return {
+    width: parent.clientWidth,
+    height: parent.clientHeight,
+  }
+}
+
+const constrainToViewportDuringDrag = (newX: number, newY: number) => {
+  const bounds = getViewportBounds()
+  if (!bounds) return { x: newX, y: newY }
+
+  const windowWidth = width.value
+  const windowHeight = height.value
+
+  // Allow sides and bottom to go out more
+  const maxOffscreenX = windowWidth / 3
+  const maxOffscreenBottom = windowHeight / 3
+
+  // For X axis: allow 1/3 to go outside on both sides
+  const maxX = bounds.width - windowWidth + maxOffscreenX
+  const minX = -maxOffscreenX
+
+  // For Y axis: HARD constraint at top (y=0), never allow window to go above header
+  const minY = 0
+  // Bottom: allow 1/3 to go outside
+  const maxY = bounds.height - windowHeight + maxOffscreenBottom
+
+  const constrainedX = Math.max(minX, Math.min(maxX, newX))
+  const constrainedY = Math.max(minY, Math.min(maxY, newY))
+
+  return { x: constrainedX, y: constrainedY }
+}
+
+const handleActivate = () => {
+  emit('activate')
+}
+
+const handleClose = () => {
+  emit('close')
+}
+
+const handleMinimize = () => {
+  emit('minimize')
+}
+
+const handleMaximize = () => {
+  if (isMaximized.value) {
+    // Restore
+    x.value = preMaximizeState.value.x
+    y.value = preMaximizeState.value.y
+    width.value = preMaximizeState.value.width
+    height.value = preMaximizeState.value.height
+    isMaximized.value = false
+  } else {
+    // Maximize - set position and size to viewport dimensions
+    preMaximizeState.value = {
+      x: x.value,
+      y: y.value,
+      width: width.value,
+      height: height.value,
+    }
+
+    // Get viewport bounds (desktop container, already excludes header)
+    const bounds = getViewportBounds()
+
+    if (bounds && bounds.width > 0 && bounds.height > 0) {
+      // Get safe-area-insets from CSS variables for debug
+      const safeAreaTop = parseFloat(
+        getComputedStyle(document.documentElement).getPropertyValue(
+          '--safe-area-inset-top',
+        ) || '0',
+      )
+      const safeAreaBottom = parseFloat(
+        getComputedStyle(document.documentElement).getPropertyValue(
+          '--safe-area-inset-bottom',
+        ) || '0',
+      )
+
+      // Desktop container uses 'absolute inset-0' which stretches over full viewport
+      // bounds.height = full viewport height (includes header area + safe-areas)
+      // We need to calculate available space properly
+
+      // Get header height from UI store (measured reactively in layout)
+      const uiStore = useUiStore()
+      const headerHeight = uiStore.headerHeight
+
+      x.value = 0
+      y.value = 0 // Start below header and status bar
+      width.value = bounds.width
+      // Height: viewport - header - both safe-areas
+      height.value = bounds.height - headerHeight - safeAreaTop - safeAreaBottom
+      isMaximized.value = true
+    }
+  }
+}
+
+// Window resizing
+const handleResizeStart = (direction: string, e: MouseEvent | TouchEvent) => {
+  isResizing.value = true
+  resizeDirection.value = direction
+  let clientX: number
+  let clientY: number
+
+  if ('touches' in e) {
+    // Es ist ein TouchEvent
+    const touch = e.touches[0] // Hole den ersten Touch
+
+    // Prüfe, ob 'touch' existiert (ist undefined, wenn e.touches leer ist)
+    if (touch) {
+      clientX = touch.clientX
+      clientY = touch.clientY
+    } else {
+      // Ungültiges Start-Event (kein Finger). Abbruch.
+      isResizing.value = false
+      return
+    }
+  } else {
+    // Es ist ein MouseEvent
+    clientX = e.clientX
+    clientY = e.clientY
+  }
+
+  resizeStartX.value = clientX
+  resizeStartY.value = clientY
+  resizeStartWidth.value = width.value
+  resizeStartHeight.value = height.value
+  resizeStartPosX.value = x.value
+  resizeStartPosY.value = y.value
+}
+
+// Global mouse move handler (for resizing only, dragging handled by useDrag)
+useEventListener(window, 'mousemove', (e: MouseEvent) => {
+  if (isResizing.value) {
+    const deltaX = e.clientX - resizeStartX.value
+    const deltaY = e.clientY - resizeStartY.value
+
+    const dir = resizeDirection.value
+
+    // Handle width changes
+    if (dir.includes('e')) {
+      width.value = Math.max(300, resizeStartWidth.value + deltaX)
+    } else if (dir.includes('w')) {
+      const newWidth = Math.max(300, resizeStartWidth.value - deltaX)
+      const widthDiff = resizeStartWidth.value - newWidth
+      x.value = resizeStartPosX.value + widthDiff
+      width.value = newWidth
+    }
+
+    // Handle height changes
+    if (dir.includes('s')) {
+      height.value = Math.max(200, resizeStartHeight.value + deltaY)
+    } else if (dir.includes('n')) {
+      const newHeight = Math.max(200, resizeStartHeight.value - deltaY)
+      const heightDiff = resizeStartHeight.value - newHeight
+      y.value = resizeStartPosY.value + heightDiff
+      height.value = newHeight
+    }
+  }
+})
+
+// Global mouse up handler (for resizing only, dragging handled by useDrag)
+useEventListener(window, 'mouseup', () => {
+  if (isResizing.value) {
+    globalThis.getSelection()?.removeAllRanges()
+    isResizing.value = false
+
+    emit('positionChanged', x.value, y.value)
+    emit('sizeChanged', width.value, height.value)
+  }
+})
+</script>

src/components/haex/window/overview.vue

@@ -0,0 +1,222 @@
+<template>
+  <UDrawer
+    v-model:open="localShowWindowOverview"
+    direction="bottom"
+    :title="t('modal.title')"
+    :description="t('modal.description')"
+  >
+    <template #content>
+      <div class="h-full overflow-y-auto p-6 justify-center flex">
+        <!-- Window Thumbnails Flex Layout -->
+
+        <div
+          v-if="windows.length > 0"
+          class="flex flex-wrap gap-6 justify-center-safe items-start"
+        >
+          <div
+            v-for="window in windows"
+            :key="window.id"
+            class="relative group cursor-pointer"
+          >
+            <!-- Window Title Bar -->
+            <div class="flex items-center gap-3 mb-2 px-2">
+              <UIcon
+                v-if="window.icon"
+                :name="window.icon"
+                class="size-5 shrink-0"
+              />
+              <div class="flex-1 min-w-0">
+                <p class="font-semibold text-sm truncate">
+                  {{ window.title }}
+                </p>
+              </div>
+              <!-- Minimized Badge -->
+              <UBadge
+                v-if="window.isMinimized"
+                color="info"
+                size="xs"
+                :title="t('minimized')"
+              />
+            </div>
+
+            <!-- Scaled Window Preview Container / Teleport Target -->
+            <div
+              :id="`window-preview-${window.id}`"
+              class="relative bg-gray-100 dark:bg-gray-900 rounded-xl overflow-hidden border-2 border-gray-200 dark:border-gray-700 group-hover:border-primary-500 transition-all shadow-lg"
+              :style="getCardStyle(window)"
+              @click="handleRestoreAndActivateWindow(window.id)"
+            >
+              <!-- Hover Overlay -->
+              <div
+                class="absolute inset-0 bg-primary-500/10 opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none z-40"
+              />
+            </div>
+          </div>
+        </div>
+
+        <!-- Empty State -->
+        <div
+          v-else
+          class="flex flex-col items-center justify-center py-12 text-gray-500 dark:text-gray-400"
+        >
+          <UIcon
+            name="i-heroicons-window"
+            class="size-16 mb-4 shrink-0"
+          />
+          <p class="text-lg font-medium">No windows open</p>
+          <p class="text-sm">
+            Open an extension or system window to see it here
+          </p>
+        </div>
+      </div>
+    </template>
+  </UDrawer>
+</template>
+
+<script setup lang="ts">
+const { t } = useI18n()
+
+const windowManager = useWindowManagerStore()
+const workspaceStore = useWorkspaceStore()
+
+const { showWindowOverview, windows } = storeToRefs(windowManager)
+
+// Local computed for two-way binding with UModal
+const localShowWindowOverview = computed({
+  get: () => showWindowOverview.value,
+  set: (value) => {
+    showWindowOverview.value = value
+  },
+})
+
+const handleRestoreAndActivateWindow = (windowId: string) => {
+  const window = windowManager.windows.find((w) => w.id === windowId)
+  if (!window) return
+
+  // Switch to the workspace where this window is located
+  if (window.workspaceId) {
+    workspaceStore.slideToWorkspace(window.workspaceId)
+  }
+
+  // If window is minimized, restore it first
+  if (window.isMinimized) {
+    windowManager.restoreWindow(windowId)
+  } else {
+    // If not minimized, just activate it
+    windowManager.activateWindow(windowId)
+  }
+
+  // Close the overview
+  localShowWindowOverview.value = false
+}
+
+// Store original window sizes and positions to restore after overview closes
+const originalWindowState = ref<
+  Map<string, { width: number; height: number; x: number; y: number }>
+>(new Map())
+
+// Min/Max dimensions for preview cards
+const MIN_PREVIEW_WIDTH = 300
+const MAX_PREVIEW_WIDTH = 600
+const MIN_PREVIEW_HEIGHT = 225
+const MAX_PREVIEW_HEIGHT = 450
+
+// Calculate card size and scale based on window dimensions
+const getCardStyle = (window: (typeof windows.value)[0]) => {
+  const scaleX = MAX_PREVIEW_WIDTH / window.width
+  const scaleY = MAX_PREVIEW_HEIGHT / window.height
+  const scale = Math.min(scaleX, scaleY, 1) // Never scale up, only down
+
+  // Calculate scaled dimensions
+  const scaledWidth = window.width * scale
+  const scaledHeight = window.height * scale
+
+  // Ensure minimum card size
+  let finalScale = scale
+  if (scaledWidth < MIN_PREVIEW_WIDTH) {
+    finalScale = MIN_PREVIEW_WIDTH / window.width
+  }
+  if (scaledHeight < MIN_PREVIEW_HEIGHT) {
+    finalScale = Math.max(finalScale, MIN_PREVIEW_HEIGHT / window.height)
+  }
+
+  const cardWidth = window.width * finalScale
+  const cardHeight = window.height * finalScale
+
+  return {
+    width: `${cardWidth}px`,
+    height: `${cardHeight}px`,
+    '--window-scale': finalScale, // CSS variable for scale
+  }
+}
+
+// Watch for overview closing to restore windows
+watch(localShowWindowOverview, async (isOpen, wasOpen) => {
+  if (!isOpen && wasOpen) {
+    console.log('[WindowOverview] Overview closed, restoring windows...')
+
+    // Restore original window state
+    for (const window of windows.value) {
+      const originalState = originalWindowState.value.get(window.id)
+      if (originalState) {
+        console.log(
+          `[WindowOverview] Restoring window ${window.id} to:`,
+          originalState,
+        )
+
+        windowManager.updateWindowSize(
+          window.id,
+          originalState.width,
+          originalState.height,
+        )
+        windowManager.updateWindowPosition(
+          window.id,
+          originalState.x,
+          originalState.y,
+        )
+      }
+    }
+    originalWindowState.value.clear()
+  }
+})
+
+// Watch for overview opening to store original state
+watch(
+  () => localShowWindowOverview.value && windows.value.length,
+  (shouldStore) => {
+    if (shouldStore && originalWindowState.value.size === 0) {
+      console.log('[WindowOverview] Storing original window states...')
+
+      for (const window of windows.value) {
+        console.log(`[WindowOverview] Window ${window.id}:`, {
+          originalSize: { width: window.width, height: window.height },
+          originalPos: { x: window.x, y: window.y },
+        })
+
+        originalWindowState.value.set(window.id, {
+          width: window.width,
+          height: window.height,
+          x: window.x,
+          y: window.y,
+        })
+      }
+    }
+  },
+)
+</script>
+
+<i18n lang="yaml">
+de:
+  modal:
+    title: Fensterübersicht
+    description: Übersicht aller offenen Fenster auf allen Workspaces
+
+  minimized: Minimiert
+
+en:
+  modal:
+    title: Window Overview
+    description: Overview of all open windows on all workspaces
+
+  minimized: Minimized
+</i18n>

src/components/haex/window/resizeHandles.vue

@@ -0,0 +1,61 @@
+<template>
+  <template v-if="!disabled">
+    <div
+      class="absolute top-0 left-0 size-2 cursor-nw-resize z-10"
+      @mousedown.left.stop="emitResizeStart('nw', $event)"
+      @touchstart.passive.stop="emitResizeStart('nw', $event)"
+    />
+    <div
+      class="absolute top-0 right-0 size-2 cursor-ne-resize z-10"
+      @mousedown.left.stop="emitResizeStart('ne', $event)"
+      @touchstart.passive.stop="emitResizeStart('ne', $event)"
+    />
+    <div
+      class="absolute bottom-0 left-0 size-2 cursor-sw-resize z-10"
+      @mousedown.left.stop="emitResizeStart('sw', $event)"
+      @touchstart.passive.stop="emitResizeStart('sw', $event)"
+    />
+    <div
+      class="absolute bottom-0 right-0 w-2 h-2 cursor-se-resize z-10"
+      @mousedown.left.stop="emitResizeStart('se', $event)"
+      @touchstart.passive.stop="emitResizeStart('se', $event)"
+    />
+    <div
+      class="absolute top-0 left-2 right-2 h-2 cursor-n-resize z-10"
+      @mousedown.left.stop="emitResizeStart('n', $event)"
+      @touchstart.passive.stop="emitResizeStart('n', $event)"
+    />
+    <div
+      class="absolute bottom-0 left-2 right-2 h-2 cursor-s-resize z-10"
+      @mousedown.left.stop="emitResizeStart('s', $event)"
+      @touchstart.passive.stop="emitResizeStart('s', $event)"
+    />
+    <div
+      class="absolute left-0 top-2 bottom-2 w-2 cursor-w-resize z-10"
+      @mousedown.left.stop="emitResizeStart('w', $event)"
+      @touchstart.passive.stop="emitResizeStart('w', $event)"
+    />
+    <div
+      class="absolute right-0 top-2 bottom-2 w-2 cursor-e-resize z-10"
+      @mousedown.left.stop="emitResizeStart('e', $event)"
+      @touchstart.passive.stop="emitResizeStart('e', $event)"
+    />
+  </template>
+</template>
+
+<script setup lang="ts">
+// Props: Nur Information, ob Handles angezeigt werden sollen
+defineProps<{
+  disabled?: boolean // True if window is maximized
+}>()
+
+// Emits: Signalisiert den Start des Resizing mit Richtung und Event
+const emit = defineEmits<{
+  resizeStart: [direction: string, event: MouseEvent | TouchEvent]
+}>()
+
+// Funktion, um das Event nach oben weiterzuleiten
+const emitResizeStart = (direction: string, event: MouseEvent | TouchEvent) => {
+  emit('resizeStart', direction, event)
+}
+</script>

src/components/haex/workspace/card.vue

@@ -0,0 +1,98 @@
+<template>
+  <UCard
+    ref="cardEl"
+    class="cursor-pointer transition-all h-32 w-72 shrink-0 group duration-500 rounded-lg"
+    :class="[
+      workspace.id === currentWorkspace?.id
+        ? 'ring-2 ring-secondary bg-secondary/10'
+        : 'hover:ring-2 hover:ring-gray-300',
+      isDragOver ? 'ring-4 ring-primary bg-primary/20 scale-105' : '',
+    ]"
+    @click="workspaceStore.slideToWorkspace(workspace.id)"
+  >
+    <template #header>
+      <div class="flex justify-between">
+        <h3 class="font-semibold text-gray-900 dark:text-white text-lg">
+          {{ workspace.name }}
+        </h3>
+
+        <UButton
+          v-if="workspaceStore.workspaces.length > 1"
+          icon="mdi-close"
+          variant="ghost"
+          class="group-hover:opacity-100 opacity-0 transition-opacity duration-300"
+          @click.stop="workspaceStore.closeWorkspaceAsync(workspace.id)"
+        />
+      </div>
+    </template>
+  </UCard>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{ workspace: IWorkspace }>()
+
+const workspaceStore = useWorkspaceStore()
+const windowManager = useWindowManagerStore()
+
+const { currentWorkspace } = storeToRefs(workspaceStore)
+
+const cardEl = useTemplateRef('cardEl')
+const isDragOver = ref(false)
+
+// Use mouse position to detect if over card
+const { x: mouseX, y: mouseY } = useMouse()
+
+// Check if mouse is over this card while dragging
+watchEffect(() => {
+  if (!windowManager.draggingWindowId || !cardEl.value?.$el) {
+    isDragOver.value = false
+    return
+  }
+
+  // Get card bounding box
+  const rect = cardEl.value.$el.getBoundingClientRect()
+
+  // Check if mouse is within card bounds
+  const isOver =
+    mouseX.value >= rect.left &&
+    mouseX.value <= rect.right &&
+    mouseY.value >= rect.top &&
+    mouseY.value <= rect.bottom
+
+  isDragOver.value = isOver
+})
+
+// Handle drop when drag ends - check BEFORE draggingWindowId is cleared
+let wasOverThisCard = false
+
+watchEffect(() => {
+  if (isDragOver.value && windowManager.draggingWindowId) {
+    wasOverThisCard = true
+  }
+})
+
+watch(
+  () => windowManager.draggingWindowId,
+  (newValue, oldValue) => {
+    // Drag ended (from something to null)
+    if (oldValue && !newValue && wasOverThisCard) {
+      console.log(
+        '[WorkspaceCard] Drop detected! Moving window to workspace:',
+        props.workspace.name,
+      )
+      const window = windowManager.windows.find((w) => w.id === oldValue)
+      if (window) {
+        window.workspaceId = props.workspace.id
+        window.x = 0
+        window.y = 0
+        // Switch to the workspace after dropping
+        //workspaceStore.slideToWorkspace(props.workspace.id)
+      }
+      wasOverThisCard = false
+    } else if (!newValue) {
+      // Drag ended but not over this card
+      wasOverThisCard = false
+    }
+  },
+)
+</script>

src/components/ui/button/context.vue

@@ -0,0 +1,28 @@
+<template>
+  <UContextMenu :items="contextMenuItems">
+    <UiButton
+      v-bind="$attrs"
+      @click="$emit('click', $event)"
+    >
+      <template
+        v-for="(_, slotName) in $slots"
+        #[slotName]="slotProps"
+      >
+        <slot
+          :name="slotName"
+          v-bind="slotProps"
+        />
+      </template>
+    </UiButton>
+  </UContextMenu>
+</template>
+
+<script setup lang="ts">
+import type { ContextMenuItem } from '@nuxt/ui'
+
+defineProps<{
+  contextMenuItems: ContextMenuItem[]
+}>()
+
+defineEmits<{ click: [Event] }>()
+</script>

src/components/ui/button/index.vue

@@ -4,11 +4,10 @@
       <UButton
         class="pointer-events-auto"
         v-bind="{
-          ...{ size: isSmallScreen ? 'lg' : 'md' },
           ...buttonProps,
           ...$attrs,
         }"
-        @click="(e) => $emit('click', e)"
+        @click="$emit('click', $event)"
       >
         <template
           v-for="(_, slotName) in $slots"

src/components/ui/dialog/confirm.vue

@@ -4,23 +4,15 @@
     :title
     :description
   >
-    <slot>
+    <template
-      <!-- <UiButton
+      v-for="(_, name) in $slots"
-        color="primary"
+      :key="name"
-        variant="outline"
+      #[name]="slotData"
-        icon="mdi:menu"
+    >
-        :ui="{
+      <slot
-          base: '',
+        :name="name"
-        }"
+        v-bind="slotData"
-      /> -->
+      />
-    </slot>
-
-    <template #title>
-      <slot name="title" />
-    </template>
-
-    <template #body>
-      <slot name="body" />
     </template>
 
     <template #footer>
@@ -38,7 +30,7 @@
           :label="confirmLabel || t('confirm')"
           block
           color="primary"
-          varaint="solid"
+          variant="solid"
           @click="$emit('confirm')"
         />
       </div>

src/components/ui/dropdown/theme.vue

@@ -11,10 +11,6 @@ const { availableThemes, currentTheme } = storeToRefs(useUiStore())
 
 const emit = defineEmits<{ select: [string] }>()
 
-watchImmediate(availableThemes, () =>
-  console.log('availableThemes', availableThemes),
-)
-
 const items = computed<DropdownMenuItem[]>(() =>
   availableThemes?.value.map((theme) => ({
     ...theme,

src/components/ui/select/color.vue

@@ -17,7 +17,7 @@
       :title="t('pick')"
       class="top-0 left-0 absolute size-0"
       type="color"
-    />
+    >
 
     <UiTooltip :tooltip="t('reset')">
       <UiButton

src/components/ui/select/icon.vue

@@ -2,8 +2,8 @@
   <UDropdownMenu
     :items="icons"
     class="btn"
-    @select="(newIcon) => (iconName = newIcon)"
     :read_only
+    @select="(newIcon) => (iconName = newIcon)"
   >
     <template #activator>
       <Icon :name="iconName ? iconName : defaultIcon || icons.at(0)" />
@@ -12,8 +12,8 @@
     <template #items="{ items }">
       <div class="grid grid-cols-6 -ml-2">
         <li
-          class="dropdown-item"
           v-for="item in items"
+          class="dropdown-item"
           @click="read_only ? '' : (iconName = item)"
         >
           <Icon

src/components/ui/select/index.vue

@@ -6,8 +6,8 @@
     <button
       :id
       class="advance-select-toogle flex justify-between grow p-3"
-      @click.prevent="toogleMenu"
       :disabled="read_only"
+      @click.prevent="toogleMenu"
     >
       <slot
         name="value"
@@ -18,9 +18,9 @@
       </slot>
     </button>
     <button
-      @click.prevent="toogleMenu"
       class="flex items-center p-2 hover:shadow rounded-md hover:bg-primary hover:text-base-content"
       :disabled="read_only"
+      @click.prevent="toogleMenu"
     >
       <i class="i-[material-symbols--keyboard-arrow-down] size-4" />
     </button>

src/composables/extensionContextBroadcast.ts

@@ -1,65 +0,0 @@
-// composables/extensionContextBroadcast.ts
-// NOTE: This composable is deprecated. Use tabsStore.broadcastToAllTabs() instead.
-// Keeping for backwards compatibility.
-
-import { getExtensionWindow } from './extensionMessageHandler'
-
-export const useExtensionContextBroadcast = () => {
-  // Globaler State für Extension IDs statt IFrames
-  const extensionIds = useState<Set<string>>(
-    'extension-ids',
-    () => new Set(),
-  )
-
-  const registerExtensionIframe = (_iframe: HTMLIFrameElement, extensionId: string) => {
-    extensionIds.value.add(extensionId)
-  }
-
-  const unregisterExtensionIframe = (_iframe: HTMLIFrameElement, extensionId: string) => {
-    extensionIds.value.delete(extensionId)
-  }
-
-  const broadcastContextChange = (context: {
-    theme: string
-    locale: string
-    platform: string
-  }) => {
-    const message = {
-      type: 'context.changed',
-      data: { context },
-      timestamp: Date.now(),
-    }
-
-    extensionIds.value.forEach((extensionId) => {
-      const win = getExtensionWindow(extensionId)
-      if (win) {
-        win.postMessage(message, '*')
-      }
-    })
-  }
-
-  const broadcastSearchRequest = (query: string, requestId: string) => {
-    const message = {
-      type: 'search.request',
-      data: {
-        query: { query, limit: 10 },
-        requestId,
-      },
-      timestamp: Date.now(),
-    }
-
-    extensionIds.value.forEach((extensionId) => {
-      const win = getExtensionWindow(extensionId)
-      if (win) {
-        win.postMessage(message, '*')
-      }
-    })
-  }
-
-  return {
-    registerExtensionIframe,
-    unregisterExtensionIframe,
-    broadcastContextChange,
-    broadcastSearchRequest,
-  }
-}

src/composables/extensionMessageHandler.ts

@@ -16,11 +16,15 @@ interface ExtensionRequest {
 
 // Globaler Handler - nur einmal registriert
 let globalHandlerRegistered = false
-const iframeRegistry = new Map<HTMLIFrameElement, IHaexHubExtension>()
+interface ExtensionInstance {
-// Map event.source (WindowProxy) to extension for sandbox-compatible matching
+  extension: IHaexHubExtension
-const sourceRegistry = new Map<Window, IHaexHubExtension>()
+  windowId: string
-// Reverse map: extension ID to Window for broadcasting
+}
-const extensionToWindowMap = new Map<string, Window>()
+const iframeRegistry = new Map<HTMLIFrameElement, ExtensionInstance>()
+// Map event.source (WindowProxy) to extension instance for sandbox-compatible matching
+const sourceRegistry = new Map<Window, ExtensionInstance>()
+// Reverse map: window ID to Window for broadcasting (supports multiple windows per extension)
+const windowIdToWindowMap = new Map<string, Window>()
 
 // Store context values that need to be accessed outside setup
 let contextGetters: {
@@ -40,15 +44,25 @@ const registerGlobalMessageHandler = () => {
 
     const request = event.data as ExtensionRequest
 
-    // Find extension by decoding event.origin (works with sandboxed iframes)
+    // Find extension instance by decoding event.origin (works with sandboxed iframes)
     // Origin formats:
     // - Desktop: haex-extension://<base64>
     // - Android: http://haex-extension.localhost (need to check request URL for base64)
-    let extension: IHaexHubExtension | undefined
+    let instance: ExtensionInstance | undefined
 
+    // Debug: Find which extension sent this message
+    let sourceInfo = 'unknown source'
+    for (const [iframe, inst] of iframeRegistry.entries()) {
+      if (iframe.contentWindow === event.source) {
+        sourceInfo = `${inst.extension.name} (${inst.windowId})`
+        break
+      }
+    }
     console.log(
-      '[ExtensionHandler] Received message from origin:',
+      '[ExtensionHandler] Received message from:',
-      event.origin,
+      sourceInfo,
+      'Method:',
+      request.method,
     )
 
     // Try to decode extension info from origin
@@ -74,10 +88,10 @@ const registerGlobalMessageHandler = () => {
         if (iframeRegistry.size === 1) {
           const entry = Array.from(iframeRegistry.entries())[0]
           if (entry) {
-            const [_, ext] = entry
+            const [_, inst] = entry
-            extension = ext
+            instance = inst
-            sourceRegistry.set(event.source as Window, ext)
+            sourceRegistry.set(event.source as Window, inst)
-            extensionToWindowMap.set(ext.id, event.source as Window)
+            windowIdToWindowMap.set(inst.windowId, event.source as Window)
           }
         }
       }
@@ -91,16 +105,16 @@ const registerGlobalMessageHandler = () => {
           }
 
           // Find matching extension in registry
-          for (const [_, ext] of iframeRegistry.entries()) {
+          for (const [_, inst] of iframeRegistry.entries()) {
             if (
-              ext.name === decodedInfo.name &&
+              inst.extension.name === decodedInfo.name &&
-              ext.publicKey === decodedInfo.publicKey &&
+              inst.extension.publicKey === decodedInfo.publicKey &&
-              ext.version === decodedInfo.version
+              inst.extension.version === decodedInfo.version
             ) {
-              extension = ext
+              instance = inst
               // Register for future lookups
-              sourceRegistry.set(event.source as Window, ext)
+              sourceRegistry.set(event.source as Window, inst)
-              extensionToWindowMap.set(ext.id, event.source as Window)
+              windowIdToWindowMap.set(inst.windowId, event.source as Window)
               break
             }
           }
@@ -110,31 +124,36 @@ const registerGlobalMessageHandler = () => {
       }
     }
 
-    // Fallback: Try to find extension by event.source (for localhost origin or legacy)
+    // Fallback: Try to find extension instance by event.source (for localhost origin or legacy)
-    if (!extension) {
+    if (!instance) {
-      extension = sourceRegistry.get(event.source as Window)
+      instance = sourceRegistry.get(event.source as Window)
 
-      // If not registered yet, register on first message from this source
+      // If not registered yet, find by matching iframe.contentWindow to event.source
-      if (!extension && iframeRegistry.size === 1) {
+      if (!instance) {
-        // If we only have one iframe, assume this message is from it
+        for (const [iframe, inst] of iframeRegistry.entries()) {
-        const entry = Array.from(iframeRegistry.entries())[0]
+          if (iframe.contentWindow === event.source) {
-        if (entry) {
+            instance = inst
-          const [_, ext] = entry
+            // Register for future lookups
-          const windowSource = event.source as Window
+            sourceRegistry.set(event.source as Window, inst)
-          sourceRegistry.set(windowSource, ext)
+            windowIdToWindowMap.set(inst.windowId, event.source as Window)
-          extensionToWindowMap.set(ext.id, windowSource)
+            console.log(
-          extension = ext
+              '[ExtensionHandler] Registered instance via contentWindow match:',
+              inst.windowId,
+            )
+            break
           }
-      } else if (extension && !extensionToWindowMap.has(extension.id)) {
+        }
+      } else if (instance && !windowIdToWindowMap.has(instance.windowId)) {
         // Also register in reverse map for broadcasting
-        extensionToWindowMap.set(extension.id, event.source as Window)
+        windowIdToWindowMap.set(instance.windowId, event.source as Window)
       }
     }
 
-    if (!extension) {
+    if (!instance) {
       console.warn(
-        '[ExtensionHandler] Could not identify extension for message:',
+        '[ExtensionHandler] Could not identify extension instance from event.source.',
-        event.origin,
+        'Registered iframes:',
+        iframeRegistry.size,
       )
       return // Message ist nicht von einem registrierten IFrame
     }
@@ -147,20 +166,18 @@ const registerGlobalMessageHandler = () => {
     try {
       let result: unknown
 
-      if (request.method.startsWith('extension.')) {
+      if (request.method.startsWith('haextension.context.')) {
-        result = await handleExtensionMethodAsync(request, extension)
-      } else if (request.method.startsWith('db.')) {
-        result = await handleDatabaseMethodAsync(request, extension)
-      } else if (request.method.startsWith('fs.')) {
-        result = await handleFilesystemMethodAsync(request, extension)
-      } else if (request.method.startsWith('http.')) {
-        result = await handleHttpMethodAsync(request, extension)
-      } else if (request.method.startsWith('permissions.')) {
-        result = await handlePermissionsMethodAsync(request, extension)
-      } else if (request.method.startsWith('context.')) {
         result = await handleContextMethodAsync(request)
-      } else if (request.method.startsWith('storage.')) {
+      } else if (request.method.startsWith('haextension.storage.')) {
-        result = await handleStorageMethodAsync(request, extension)
+        result = await handleStorageMethodAsync(request, instance)
+      } else if (request.method.startsWith('haextension.db.')) {
+        result = await handleDatabaseMethodAsync(request, instance.extension)
+      } else if (request.method.startsWith('haextension.fs.')) {
+        result = await handleFilesystemMethodAsync(request, instance.extension)
+      } else if (request.method.startsWith('haextension.http.')) {
+        result = await handleHttpMethodAsync(request, instance.extension)
+      } else if (request.method.startsWith('haextension.permissions.')) {
+        result = await handlePermissionsMethodAsync(request, instance.extension)
       } else {
         throw new Error(`Unknown method: ${request.method}`)
       }
@@ -203,6 +220,7 @@ const registerGlobalMessageHandler = () => {
 export const useExtensionMessageHandler = (
   iframeRef: Ref<HTMLIFrameElement | undefined | null>,
   extension: ComputedRef<IHaexHubExtension | undefined | null>,
+  windowId: Ref<string>,
 ) => {
   // Initialize context getters (can use composables here because we're in setup)
   const { currentTheme } = storeToRefs(useUiStore())
@@ -223,13 +241,26 @@ export const useExtensionMessageHandler = (
   // Registriere dieses IFrame
   watchEffect(() => {
     if (iframeRef.value && extension.value) {
-      iframeRegistry.set(iframeRef.value, extension.value)
+      iframeRegistry.set(iframeRef.value, {
+        extension: extension.value,
+        windowId: windowId.value,
+      })
     }
   })
 
   // Cleanup beim Unmount
   onUnmounted(() => {
     if (iframeRef.value) {
+      const instance = iframeRegistry.get(iframeRef.value)
+      if (instance) {
+        // Remove from all maps
+        windowIdToWindowMap.delete(instance.windowId)
+        for (const [source, inst] of sourceRegistry.entries()) {
+          if (inst.windowId === instance.windowId) {
+            sourceRegistry.delete(source)
+          }
+        }
+      }
       iframeRegistry.delete(iframeRef.value)
     }
   })
@@ -239,6 +270,7 @@ export const useExtensionMessageHandler = (
 export const registerExtensionIFrame = (
   iframe: HTMLIFrameElement,
   extension: IHaexHubExtension,
+  windowId: string,
 ) => {
   // Stelle sicher, dass der globale Handler registriert ist
   registerGlobalMessageHandler()
@@ -250,55 +282,72 @@ export const registerExtensionIFrame = (
     )
   }
 
-  iframeRegistry.set(iframe, extension)
+  iframeRegistry.set(iframe, { extension, windowId })
 }
 
 export const unregisterExtensionIFrame = (iframe: HTMLIFrameElement) => {
-  // Also remove from source registry
+  // Also remove from source registry and instance map
-  const ext = iframeRegistry.get(iframe)
+  const instance = iframeRegistry.get(iframe)
-  if (ext) {
+  if (instance) {
-    // Find and remove all sources pointing to this extension
+    // Find and remove all sources pointing to this instance
-    for (const [source, extension] of sourceRegistry.entries()) {
+    for (const [source, inst] of sourceRegistry.entries()) {
-      if (extension === ext) {
+      if (inst.windowId === instance.windowId) {
         sourceRegistry.delete(source)
       }
     }
-    // Remove from extension-to-window map
+    // Remove from instance-to-window map
-    extensionToWindowMap.delete(ext.id)
+    windowIdToWindowMap.delete(instance.windowId)
   }
   iframeRegistry.delete(iframe)
 }
 
-// Export function to get Window for an extension (for broadcasting)
+// Export function to get Window for a specific instance (for broadcasting)
+export const getInstanceWindow = (windowId: string): Window | undefined => {
+  return windowIdToWindowMap.get(windowId)
+}
+
+// Get all windows for an extension (all instances)
+export const getAllInstanceWindows = (extensionId: string): Window[] => {
+  const windows: Window[] = []
+  for (const [_, instance] of iframeRegistry.entries()) {
+    if (instance.extension.id === extensionId) {
+      const win = windowIdToWindowMap.get(instance.windowId)
+      if (win) {
+        windows.push(win)
+      }
+    }
+  }
+  return windows
+}
+
+// Deprecated - kept for backwards compatibility
 export const getExtensionWindow = (extensionId: string): Window | undefined => {
-  return extensionToWindowMap.get(extensionId)
+  // Return first window for this extension
+  return getAllInstanceWindows(extensionId)[0]
 }
 
-// ==========================================
+// Broadcast context changes to all extension instances
-// Extension Methods
+export const broadcastContextToAllExtensions = (context: {
-// ==========================================
+  theme: string
+  locale: string
+  platform?: string
+}) => {
+  const message = {
+    type: 'haextension.context.changed',
+    data: { context },
+    timestamp: Date.now(),
+  }
 
-async function handleExtensionMethodAsync(
+  console.log('[ExtensionHandler] Broadcasting context to all extensions:', context)
-  request: ExtensionRequest,
+
-  extension: IHaexHubExtension, // Direkter Typ, kein ComputedRef mehr
+  // Send to all registered extension windows
-) {
+  for (const [_, instance] of iframeRegistry.entries()) {
-  switch (request.method) {
+    const win = windowIdToWindowMap.get(instance.windowId)
-    case 'extension.getInfo': {
+    if (win) {
-      const info = (await invoke('get_extension_info', {
+      console.log('[ExtensionHandler] Sending context to:', instance.extension.name, instance.windowId)
-        publicKey: extension.publicKey,
+      win.postMessage(message, '*')
-        name: extension.name,
-      })) as Record<string, unknown>
-      // Override allowedOrigin with the actual window origin
-      // This fixes the dev-mode issue where Rust returns "tauri://localhost"
-      // but the actual origin is "http://localhost:3003"
-      return {
-        ...info,
-        allowedOrigin: window.location.origin,
     }
   }
-    default:
-      throw new Error(`Unknown extension method: ${request.method}`)
-  }
 }
 
 // ==========================================
@@ -315,11 +364,12 @@ async function handleDatabaseMethodAsync(
   }
 
   switch (request.method) {
-    case 'db.query': {
+    case 'haextension.db.query': {
       const rows = await invoke<unknown[]>('extension_sql_select', {
         sql: params.query || '',
         params: params.params || [],
-        extensionId: extension.id,
+        publicKey: extension.publicKey,
+        name: extension.name,
       })
 
       return {
@@ -329,21 +379,22 @@ async function handleDatabaseMethodAsync(
       }
     }
 
-    case 'db.execute': {
+    case 'haextension.db.execute': {
-      await invoke<string[]>('extension_sql_execute', {
+      const rows = await invoke<unknown[]>('extension_sql_execute', {
         sql: params.query || '',
         params: params.params || [],
-        extensionId: extension.id,
+        publicKey: extension.publicKey,
+        name: extension.name,
       })
 
       return {
-        rows: [],
+        rows,
         rowsAffected: 1,
         lastInsertId: undefined,
       }
     }
 
-    case 'db.transaction': {
+    case 'haextension.db.transaction': {
       const statements =
         (request.params as { statements?: string[] }).statements || []
 
@@ -351,7 +402,8 @@ async function handleDatabaseMethodAsync(
         await invoke('extension_sql_execute', {
           sql: stmt,
           params: [],
-          extensionId: extension.id,
+          publicKey: extension.publicKey,
+          name: extension.name,
         })
       }
 
@@ -413,7 +465,7 @@ async function handlePermissionsMethodAsync(
 
 async function handleContextMethodAsync(request: ExtensionRequest) {
   switch (request.method) {
-    case 'context.get':
+    case 'haextension.context.get':
       if (!contextGetters) {
         throw new Error(
           'Context not initialized. Make sure useExtensionMessageHandler is called in a component.',
@@ -436,34 +488,35 @@ async function handleContextMethodAsync(request: ExtensionRequest) {
 
 async function handleStorageMethodAsync(
   request: ExtensionRequest,
-  extension: IHaexHubExtension,
+  instance: ExtensionInstance,
 ) {
-  const storageKey = `ext_${extension.id}_`
+  // Storage is now per-window, not per-extension
+  const storageKey = `ext_${instance.extension.id}_${instance.windowId}_`
   console.log(
-    `[HaexHub Storage] ${request.method} for extension ${extension.id}`,
+    `[HaexHub Storage] ${request.method} for window ${instance.windowId}`,
   )
 
   switch (request.method) {
-    case 'storage.getItem': {
+    case 'haextension.storage.getItem': {
       const key = request.params.key as string
       return localStorage.getItem(storageKey + key)
     }
 
-    case 'storage.setItem': {
+    case 'haextension.storage.setItem': {
       const key = request.params.key as string
       const value = request.params.value as string
       localStorage.setItem(storageKey + key, value)
       return null
     }
 
-    case 'storage.removeItem': {
+    case 'haextension.storage.removeItem': {
       const key = request.params.key as string
       localStorage.removeItem(storageKey + key)
       return null
     }
 
-    case 'storage.clear': {
+    case 'haextension.storage.clear': {
-      // Remove only extension-specific keys
+      // Remove only instance-specific keys
       const keys = Object.keys(localStorage).filter((k) =>
         k.startsWith(storageKey),
       )
@@ -471,8 +524,8 @@ async function handleStorageMethodAsync(
       return null
     }
 
-    case 'storage.keys': {
+    case 'haextension.storage.keys': {
-      // Return only extension-specific keys (without prefix)
+      // Return only instance-specific keys (without prefix)
       const keys = Object.keys(localStorage)
         .filter((k) => k.startsWith(storageKey))
         .map((k) => k.substring(storageKey.length))

src/composables/useAndroidBackButton.ts

@@ -14,12 +14,20 @@ export function useAndroidBackButton() {
 
   // Track navigation history manually
   router.afterEach((to, from) => {
-    console.log('[AndroidBack] Navigation:', { to: to.path, from: from.path, stackSize: historyStack.value.length })
+    console.log('[AndroidBack] Navigation:', {
+      to: to.path,
+      from: from.path,
+      stackSize: historyStack.value.length,
+    })
 
     // If navigating forward (new page)
-    if (from.path && to.path !== from.path && !historyStack.value.includes(to.path)) {
+    if (
+      from.path &&
+      to.path !== from.path &&
+      !historyStack.value.includes(to.path)
+    ) {
       historyStack.value.push(from.path)
-      console.log('[AndroidBack] Added to stack:', from.path, 'Stack:', historyStack.value)
+      //console.log('[AndroidBack] Added to stack:', from.path, 'Stack:', historyStack.value)
     }
   })
 
@@ -31,7 +39,10 @@ export function useAndroidBackButton() {
 
       // Listen to close requested event (triggered by Android back button)
       unlisten = await appWindow.onCloseRequested(async (event) => {
-        console.log('[AndroidBack] Back button pressed, stack size:', historyStack.value.length)
+        console.log(
+          '[AndroidBack] Back button pressed, stack size:',
+          historyStack.value.length,
+        )
 
         // Check if we have history
         if (historyStack.value.length > 0) {
@@ -40,7 +51,10 @@ export function useAndroidBackButton() {
 
           // Remove current page from stack
           historyStack.value.pop()
-          console.log('[AndroidBack] Going back, new stack size:', historyStack.value.length)
+          console.log(
+            '[AndroidBack] Going back, new stack size:',
+            historyStack.value.length,
+          )
 
           // Navigate back in router
           router.back()

src/layouts/app.vue

@@ -1,67 +0,0 @@
-<template>
-  <div class="flex flex-col w-full h-full overflow-hidden">
-    <UPageHeader
-      as="header"
-      :ui="{
-        root: [
-          'bg-default border-b border-accented sticky top-0 z-50 py-0 px-8',
-        ],
-        wrapper: [
-          'pt-6 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4',
-        ],
-      }"
-    >
-      <template #title>
-        <div class="flex items-center">
-          <UiLogoHaexhub class="size-12 shrink-0" />
-
-          <NuxtLinkLocale
-            class="link text-base-content link-neutral text-xl font-semibold no-underline flex items-center"
-            :to="{ name: 'vaultOverview' }"
-          >
-            <UiTextGradient class="text-nowrap">
-              {{ currentVaultName }}
-            </UiTextGradient>
-          </NuxtLinkLocale>
-        </div>
-      </template>
-
-      <template #links>
-        <HaexExtensionLauncher :block="isSmallScreen" />
-        <UiDropdownVault :block="isSmallScreen" />
-      </template>
-    </UPageHeader>
-
-    <main class="flex-1 overflow-hidden bg-elevated">
-      <NuxtPage />
-    </main>
-  </div>
-</template>
-
-<script setup lang="ts">
-const { currentVaultName } = storeToRefs(useVaultStore())
-
-const { isSmallScreen } = storeToRefs(useUiStore())
-</script>
-
-<i18n lang="yaml">
-de:
-  vault:
-    close: Vault schließen
-
-  sidebar:
-    close: Sidebar ausblenden
-    show: Sidebar anzeigen
-
-  search:
-    label: Suche
-en:
-  vault:
-    close: Close vault
-  sidebar:
-    close: close sidebar
-    show: show sidebar
-
-  search:
-    label: Search
-</i18n>

src/layouts/default.vue

@@ -1,5 +1,155 @@
 <template>
-  <div class="bg-default isolate w-dvw h-dvh flex flex-col">
+  <div class="w-full h-dvh flex flex-col">
-    <slot />
+    <UPageHeader
+      ref="headerEl"
+      as="header"
+      :ui="{
+        root: ['px-8 py-0'],
+        wrapper: ['flex flex-row items-center justify-between gap-4'],
+      }"
+    >
+      <template #default>
+        <div class="flex justify-between items-center py-1">
+          <div>
+            <!-- <NuxtLinkLocale
+                class="link text-base-content link-neutral text-xl font-semibold no-underline flex items-center"
+                :to="{ name: 'desktop' }"
+              >
+                <UiTextGradient class="text-nowrap">
+                  {{ currentVaultName }}
+                </UiTextGradient>
+              </NuxtLinkLocale> -->
+            <UiButton
+              v-if="currentVaultId"
+              color="neutral"
+              variant="outline"
+              icon="i-bi-person-workspace"
+              size="lg"
+              :tooltip="t('workspaces.label')"
+              @click="isOverviewMode = !isOverviewMode"
+            />
+          </div>
+
+          <div>
+            <div v-if="!currentVaultId">
+              <UiDropdownLocale @select="onSelectLocale" />
+            </div>
+            <div
+              v-else
+              class="flex flex-row gap-2"
+            >
+              <UButton
+                v-if="openWindowsCount > 0"
+                color="primary"
+                variant="outline"
+                size="lg"
+                @click="showWindowOverview = !showWindowOverview"
+              >
+                {{ openWindowsCount }}
+              </UButton>
+              <HaexExtensionLauncher />
+            </div>
+          </div>
         </div>
       </template>
+    </UPageHeader>
+
+    <main class="overflow-hidden relative bg-elevated h-full">
+      <slot />
+    </main>
+
+    <!-- Workspace Drawer -->
+    <UDrawer
+      v-model:open="isOverviewMode"
+      direction="left"
+      :dismissible="false"
+      :overlay="false"
+      :modal="false"
+      title="Workspaces"
+      description="Workspaces"
+    >
+      <template #content>
+        <div class="p-6 h-full overflow-y-auto">
+          <UButton
+            block
+            trailing-icon="mdi-close"
+            class="text-2xl font-bold ext-gray-900 dark:text-white mb-4"
+            @click="isOverviewMode = false"
+          >
+            Workspaces
+          </UButton>
+
+          <!-- Workspace Cards -->
+          <div class="flex flex-col gap-3">
+            <HaexWorkspaceCard
+              v-for="workspace in workspaces"
+              :key="workspace.id"
+              :workspace
+            />
+          </div>
+
+          <!-- Add New Workspace Button -->
+          <UButton
+            block
+            variant="outline"
+            class="mt-6"
+            @click="handleAddWorkspace"
+            icon="i-heroicons-plus"
+            :label="t('workspaces.add')"
+          >
+          </UButton>
+        </div>
+      </template>
+    </UDrawer>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { Locale } from 'vue-i18n'
+
+const { t, setLocale } = useI18n()
+const onSelectLocale = async (locale: Locale) => {
+  await setLocale(locale)
+}
+
+const { currentVaultId } = storeToRefs(useVaultStore())
+const { showWindowOverview, openWindowsCount } = storeToRefs(
+  useWindowManagerStore(),
+)
+
+const workspaceStore = useWorkspaceStore()
+const { workspaces, isOverviewMode } = storeToRefs(workspaceStore)
+
+const handleAddWorkspace = async () => {
+  const workspace = await workspaceStore.addWorkspaceAsync()
+  nextTick(() => {
+    workspaceStore.slideToWorkspace(workspace?.id)
+  })
+}
+
+// Measure header height and store it in UI store
+const headerEl = useTemplateRef('headerEl')
+const { height } = useElementSize(headerEl)
+const uiStore = useUiStore()
+
+watch(height, (newHeight) => {
+  uiStore.headerHeight = newHeight
+})
+</script>
+
+<i18n lang="yaml">
+de:
+  search:
+    label: Suche
+
+  workspaces:
+    label: Workspaces
+    add: Workspace hinzufügen
+en:
+  search:
+    label: Search
+
+  workspaces:
+    label: Workspaces
+    add: Add Workspace
+</i18n>

src/middleware/database.ts

@@ -3,7 +3,6 @@ export default defineNuxtRouteMiddleware(async (to) => {
 
   const toVaultId = getSingleRouteParam(to.params.vaultId)
 
-  console.log('middleware', openVaults.value?.[toVaultId])
   if (!openVaults.value?.[toVaultId]) {
     return await navigateTo(useLocalePath()({ name: 'vaultOpen' }))
   }

src/pages/index.vue

@@ -1,10 +1,9 @@
 <template>
-  <div class="items-center justify-center flex w-full h-full relative">
+  <div class="h-full">
-    <div class="absolute top-8 right-8 sm:top-4 sm:right-4">
+    <NuxtLayout>
-      <UiDropdownLocale @select="onSelectLocale" />
+      <div
-    </div>
+        class="flex flex-col justify-center items-center gap-5 mx-auto h-full overflow-scroll"
-
+      >
-    <div class="flex flex-col justify-center items-center gap-5 max-w-3xl">
         <UiLogoHaexhub class="bg-primary p-3 size-16 rounded-full shrink-0" />
         <span
           class="flex flex-wrap font-bold text-pretty text-xl gap-2 justify-center"
@@ -15,7 +14,7 @@
           <UiTextGradient>Haex Hub</UiTextGradient>
         </span>
 
-      <div class="flex flex-col md:flex-row gap-4 w-full h-24 md:h-auto">
+        <div class="flex flex-col gap-4 h-24 items-stretch justify-center">
           <HaexVaultCreate />
 
           <HaexVaultOpen
@@ -26,9 +25,9 @@
 
         <div
           v-show="lastVaults.length"
-        class="w-full"
+          class="max-w-md w-full sm:px-5"
         >
-        <div class="font-thin text-sm justify-start px-2 pb-1">
+          <div class="font-thin text-sm pb-1 w-full">
             {{ t('lastUsed') }}
           </div>
 
@@ -40,10 +39,19 @@
               :key="vault.name"
               class="flex items-center justify-between group overflow-x-scroll"
             >
-            <UButton
+              <UiButtonContext
                 variant="ghost"
                 color="neutral"
-              class="flex items-center no-underline justify-between text-nowrap text-sm md:text-base shrink w-full px-3"
+                size="xl"
+                class="flex items-center no-underline justify-between text-nowrap text-sm md:text-base shrink w-full hover:bg-default"
+                :context-menu-items="[
+                  {
+                    icon: 'mdi:trash-can-outline',
+                    label: t('remove.button'),
+                    onSelect: () => prepareRemoveVault(vault.name),
+                    color: 'error',
+                  },
+                ]"
                 @click="
                   () => {
                     passwordPromptOpen = true
@@ -54,7 +62,7 @@
                 <span class="block">
                   {{ vault.name }}
                 </span>
-            </UButton>
+              </UiButtonContext>
               <UButton
                 color="error"
                 square
@@ -62,7 +70,7 @@
               >
                 <Icon
                   name="mdi:trash-can-outline"
-                @click="removeVaultAsync(vault.name)"
+                  @click="prepareRemoveVault(vault.name)"
                 />
               </UButton>
             </div>
@@ -81,45 +89,84 @@
           </div>
         </div>
       </div>
+
+      <UiDialogConfirm
+        v-model:open="showRemoveDialog"
+        :title="t('remove.title')"
+        :description="t('remove.description', { vaultName: vaultToBeRemoved })"
+        @confirm="onConfirmRemoveAsync"
+      />
+    </NuxtLayout>
   </div>
 </template>
 
 <script setup lang="ts">
 import { openUrl } from '@tauri-apps/plugin-opener'
-import type { Locale } from 'vue-i18n'
+
+import type { VaultInfo } from '@bindings/VaultInfo'
 
 definePageMeta({
   name: 'vaultOpen',
 })
-const { t, setLocale } = useI18n()
+
+const { t } = useI18n()
 
 const passwordPromptOpen = ref(false)
-const selectedVault = ref<IVaultInfo>()
+const selectedVault = ref<VaultInfo>()
+
+const showRemoveDialog = ref(false)
 
-const { syncLastVaultsAsync, removeVaultAsync } = useLastVaultStore()
 const { lastVaults } = storeToRefs(useLastVaultStore())
 
+const { syncLastVaultsAsync, moveVaultToTrashAsync } = useLastVaultStore()
+const { syncDeviceIdAsync } = useDeviceStore()
+
+const vaultToBeRemoved = ref('')
+const prepareRemoveVault = (vaultName: string) => {
+  vaultToBeRemoved.value = vaultName
+  showRemoveDialog.value = true
+}
+
+const toast = useToast()
+const onConfirmRemoveAsync = async () => {
+  try {
+    await moveVaultToTrashAsync(vaultToBeRemoved.value)
+    showRemoveDialog.value = false
+    await syncLastVaultsAsync()
+  } catch (error) {
+    toast.add({
+      color: 'error',
+      description: JSON.stringify(error),
+    })
+  }
+}
+
 onMounted(async () => {
   try {
     await syncLastVaultsAsync()
+    await syncDeviceIdAsync()
   } catch (error) {
     console.error('ERROR: ', error)
   }
 })
-
-const onSelectLocale = async (locale: Locale) => {
-  await setLocale(locale)
-}
 </script>
 
 <i18n lang="yaml">
 de:
   welcome: 'Viel Spass mit'
   lastUsed: 'Zuletzt verwendete Vaults'
-  sponsors: 'Supported by'
+  sponsors: Supported by
+  remove:
+    button: Löschen
+    title: Vault löschen
+    description: Möchtest du die Vault {vaultName} wirklich löschen?
 
 en:
   welcome: 'Have fun with'
   lastUsed: 'Last used Vaults'
   sponsors: 'Supported by'
+  remove:
+    button: Delete
+    title: Delete Vault
+    description: Are you sure you really want to delete {vaultName}?
 </i18n>

src/pages/vault.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="w-full h-full overflow-y-auto">
+  <div>
-    <NuxtLayout name="app">
+    <NuxtLayout>
       <NuxtPage />
     </NuxtLayout>
 
@@ -9,6 +9,7 @@
         v-model:open="showNewDeviceDialog"
         :confirm-label="t('newDevice.save')"
         :title="t('newDevice.title')"
+        :description="t('newDevice.setName')"
         confirm-icon="mdi:content-save-outline"
         @abort="showNewDeviceDialog = false"
         @confirm="onSetDeviceNameAsync"
@@ -48,16 +49,26 @@ const newDeviceName = ref<string>('unknown')
 const { readNotificationsAsync } = useNotificationStore()
 const { isKnownDeviceAsync } = useDeviceStore()
 const { loadExtensionsAsync } = useExtensionsStore()
-const { setDeviceIdIfNotExistsAsync, addDeviceNameAsync } = useDeviceStore()
+const { addDeviceNameAsync } = useDeviceStore()
 const { deviceId } = storeToRefs(useDeviceStore())
+const { syncLocaleAsync, syncThemeAsync, syncVaultNameAsync } =
+  useVaultSettingsStore()
 
 onMounted(async () => {
   try {
-    await setDeviceIdIfNotExistsAsync()
+    // Sync settings first before other initialization
-    await loadExtensionsAsync()
-    await readNotificationsAsync()
 
-    if (!(await isKnownDeviceAsync())) {
+    await Promise.allSettled([
+      syncLocaleAsync(),
+      syncThemeAsync(),
+      syncVaultNameAsync(),
+      loadExtensionsAsync(),
+      readNotificationsAsync(),
+    ])
+
+    const knownDevice = await isKnownDeviceAsync()
+
+    if (!knownDevice) {
       console.log('not known device')
       newDeviceName.value = hostname.value ?? 'unknown'
       showNewDeviceDialog.value = true

src/pages/vault/[vaultId]/extensions/[extensionId].vue

@@ -1,459 +0,0 @@
-<template>
-  <div class="h-screen w-screen flex flex-col">
-    <!-- Tab Bar -->
-    <div
-      class="flex gap-2 bg-base-200 overflow-x-auto border-b border-base-300 flex-shrink-0"
-    >
-      <UButton
-        v-for="tab in tabsStore.sortedTabs"
-        :key="tab.extension.id"
-        :class="[
-          'gap-2',
-          tabsStore.activeTabId === tab.extension.id ? 'primary' : 'neutral',
-        ]"
-        @click="tabsStore.setActiveTab(tab.extension.id)"
-      >
-        {{ tab.extension.name }}
-
-        <template #trailing>
-          <div
-            class="ml-1 hover:text-error"
-            @click.stop="tabsStore.closeTab(tab.extension.id)"
-          >
-            <Icon
-              name="mdi:close"
-              size="16"
-            />
-          </div>
-        </template>
-      </UButton>
-
-      <!-- Console Tab -->
-      <UButton
-        :class="['gap-2', showConsole ? 'primary' : 'neutral']"
-        @click="showConsole = !showConsole"
-      >
-        <Icon
-          name="mdi:console"
-          size="16"
-        />
-        Console
-        <UBadge
-          v-if="visibleLogs.length > 0"
-          size="xs"
-          color="primary"
-        >
-          {{ visibleLogs.length }}
-        </UBadge>
-      </UButton>
-    </div>
-
-    <!-- IFrame Container -->
-    <div class="flex-1 relative min-h-0">
-      <!-- Extension IFrames -->
-      <div
-        v-for="tab in tabsStore.sortedTabs"
-        :key="tab.extension.id"
-        :style="{ display: tab.isVisible && !showConsole ? 'block' : 'none' }"
-        class="absolute inset-0"
-      >
-        <!-- Error overlay for dev extensions when server is not reachable -->
-        <div
-          v-if="tab.extension.devServerUrl && iframe.errors[tab.extension.id]"
-          class="absolute inset-0 bg-base-100 flex items-center justify-center p-8"
-        >
-          <div class="max-w-md space-y-4 text-center">
-            <Icon
-              name="mdi:alert-circle-outline"
-              size="64"
-              class="mx-auto text-warning"
-            />
-            <h3 class="text-lg font-semibold">
-              {{ t('devServer.notReachable.title') }}
-            </h3>
-            <p class="text-sm opacity-70">
-              {{
-                t('devServer.notReachable.description', {
-                  url: tab.extension.devServerUrl,
-                })
-              }}
-            </p>
-            <div class="bg-base-200 p-4 rounded text-left text-xs font-mono">
-              <p class="opacity-70 mb-2">
-                {{ t('devServer.notReachable.howToStart') }}
-              </p>
-              <code class="block">cd /path/to/extension</code>
-              <code class="block">npm run dev</code>
-            </div>
-            <UButton
-              :label="t('devServer.notReachable.retry')"
-              @click="retryLoadIFrame(tab.extension.id)"
-            />
-          </div>
-        </div>
-
-        <iframe
-          :ref="
-            (el) => registerIFrame(tab.extension.id, el as HTMLIFrameElement)
-          "
-          class="w-full h-full border-0"
-          :src="
-            getExtensionUrl(
-              tab.extension.publicKey,
-              tab.extension.name,
-              tab.extension.version,
-              'index.html',
-              tab.extension.devServerUrl ?? undefined,
-            )
-          "
-          :sandbox="iframe.sandboxAttributes(tab.extension.devServerUrl)"
-          allow="autoplay; speaker-selection; encrypted-media;"
-          @error="onIFrameError(tab.extension.id)"
-        />
-      </div>
-
-      <!-- Console View -->
-      <div
-        v-if="showConsole"
-        class="absolute inset-0 bg-base-100 flex flex-col"
-      >
-        <!-- Console Header -->
-        <div
-          class="p-2 border-b border-base-300 flex justify-between items-center"
-        >
-          <h3 class="font-semibold">Console Output</h3>
-          <UButton
-            size="xs"
-            color="neutral"
-            variant="ghost"
-            @click="$clearConsoleLogs()"
-          >
-            Clear
-          </UButton>
-        </div>
-
-        <!-- Console Logs -->
-        <div class="flex-1 overflow-y-auto p-2 font-mono text-sm">
-          <!-- Info banner if logs are limited -->
-          <div
-            v-if="consoleLogs.length > maxVisibleLogs"
-            class="mb-2 p-2 bg-warning/10 border border-warning/30 rounded text-xs"
-          >
-            Showing last {{ maxVisibleLogs }} of {{ consoleLogs.length }} logs
-          </div>
-
-          <!-- Simple log list instead of accordion for better performance -->
-          <div
-            v-if="visibleLogs.length > 0"
-            class="space-y-1"
-          >
-            <div
-              v-for="(log, index) in visibleLogs"
-              :key="index"
-              class="border-b border-base-200 pb-2"
-            >
-              <!-- Log header with timestamp and level -->
-              <div class="flex justify-between items-center mb-1">
-                <span class="text-xs opacity-60">
-                  [{{ log.timestamp }}] [{{ log.level.toUpperCase() }}]
-                </span>
-                <UButton
-                  size="xs"
-                  color="neutral"
-                  variant="ghost"
-                  icon="i-heroicons-clipboard-document"
-                  @click="copyToClipboard(log.message)"
-                />
-              </div>
-              <!-- Log message -->
-              <pre
-                :class="[
-                  'text-xs whitespace-pre-wrap break-all',
-                  log.level === 'error' ? 'text-error' : '',
-                  log.level === 'warn' ? 'text-warning' : '',
-                  log.level === 'info' ? 'text-info' : '',
-                  log.level === 'debug' ? 'text-base-content/70' : '',
-                ]"
-                >{{ log.message }}</pre
-              >
-            </div>
-          </div>
-
-          <div
-            v-if="visibleLogs.length === 0"
-            class="text-center text-base-content/50 py-8"
-          >
-            No console messages yet
-          </div>
-        </div>
-      </div>
-
-      <!-- Loading State -->
-      <div
-        v-if="tabsStore.tabCount === 0"
-        class="absolute inset-0 flex items-center justify-center"
-      >
-        <p>{{ t('loading') }}</p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import {
-  EXTENSION_PROTOCOL_PREFIX,
-  EXTENSION_PROTOCOL_NAME,
-} from '~/config/constants'
-
-definePageMeta({
-  name: 'extension',
-})
-
-const { t } = useI18n()
-
-const tabsStore = useExtensionTabsStore()
-
-// Track iframe errors (for dev mode)
-//const iframeErrors = ref<Record<string, boolean>>({})
-
-const sandboxDefault = [
-  'allow-scripts',
-  'allow-storage-access-by-user-activation',
-  'allow-forms',
-] as const
-
-const iframe = reactive<{
-  errors: Record<string, boolean>
-  sandboxAttributes: (devUrl?: string | null) => string
-}>({
-  errors: {},
-  sandboxAttributes: (devUrl) => {
-    return devUrl
-      ? [...sandboxDefault, 'allow-same-origin'].join(' ')
-      : sandboxDefault.join(' ')
-  },
-})
-
-const { platform } = useDeviceStore()
-
-// Generate extension URL (uses cached platform)
-const getExtensionUrl = (
-  publicKey: string,
-  name: string,
-  version: string,
-  assetPath: string = 'index.html',
-  devServerUrl?: string,
-) => {
-  if (!publicKey || !name || !version) {
-    console.error('Missing required extension fields')
-    return ''
-  }
-
-  // If dev server URL is provided, load directly from dev server
-  if (devServerUrl) {
-    const cleanUrl = devServerUrl.replace(/\/$/, '')
-    const cleanPath = assetPath.replace(/^\//, '')
-    return cleanPath ? `${cleanUrl}/${cleanPath}` : cleanUrl
-  }
-
-  const extensionInfo = {
-    name,
-    publicKey,
-    version,
-  }
-  const encodedInfo = btoa(JSON.stringify(extensionInfo))
-
-  if (platform === 'android' || platform === 'windows') {
-    // Android: Tauri uses http://{scheme}.localhost format
-    return `http://${EXTENSION_PROTOCOL_NAME}.localhost/${encodedInfo}/${assetPath}`
-  } else {
-    // Desktop: Use custom protocol with base64 as host
-    return `${EXTENSION_PROTOCOL_PREFIX}${encodedInfo}/${assetPath}`
-  }
-}
-
-// Console logging - use global logs from plugin
-const { $consoleLogs, $clearConsoleLogs } = useNuxtApp()
-const showConsole = ref(false)
-const maxVisibleLogs = ref(100) // Limit for performance on mobile
-const consoleLogs = $consoleLogs as Ref<
-  Array<{
-    timestamp: string
-    level: 'log' | 'info' | 'warn' | 'error' | 'debug'
-    message: string
-  }>
->
-
-// Only show last N logs for performance
-const visibleLogs = computed(() => {
-  return consoleLogs.value.slice(-maxVisibleLogs.value)
-})
-
-// Extension aus Route öffnen
-//const extensionId = computed(() => route.params.extensionId as string)
-
-const { currentExtensionId } = storeToRefs(useExtensionsStore())
-watchEffect(() => {
-  if (currentExtensionId.value) {
-    tabsStore.openTab(currentExtensionId.value)
-  }
-})
-
-// Setup global message handler EINMAL im Setup-Kontext
-// Dies registriert den globalen Event Listener
-const dummyIframeRef = ref<HTMLIFrameElement | null>(null)
-const dummyExtensionRef = computed(() => null)
-useExtensionMessageHandler(dummyIframeRef, dummyExtensionRef)
-
-// Track which iframes have been registered to prevent duplicate registrations
-const registeredIFrames = new WeakSet<HTMLIFrameElement>()
-
-const registerIFrame = (extensionId: string, el: HTMLIFrameElement | null) => {
-  if (!el) return
-
-  // Prevent duplicate registration (Vue calls ref functions on every render)
-  if (registeredIFrames.has(el)) {
-    return
-  }
-
-  console.log('[Vue Debug] ========== registerIFrame called ==========')
-  console.log('[Vue Debug] Extension ID:', extensionId)
-  console.log('[Vue Debug] Element:', 'HTMLIFrameElement')
-
-  // Mark as registered
-  registeredIFrames.add(el)
-
-  // Registriere IFrame im Store
-  tabsStore.registerIFrame(extensionId, el)
-
-  // Registriere IFrame im globalen Message Handler Registry
-  const tab = tabsStore.openTabs.get(extensionId)
-  if (tab?.extension) {
-    console.log(
-      '[Vue Debug] Registering iframe in message handler for:',
-      tab.extension.name,
-    )
-    registerExtensionIFrame(el, tab.extension)
-    console.log('[Vue Debug] Registration complete!')
-  } else {
-    console.error('[Vue Debug] ❌ No tab found for extension ID:', extensionId)
-  }
-  console.log('[Vue Debug] ========================================')
-}
-
-// Listen for console messages from extensions (via postMessage)
-const handleExtensionConsole = (event: MessageEvent) => {
-  if (event.data?.type === 'console.forward') {
-    const { timestamp, level, message } = event.data.data
-    consoleLogs.value.push({
-      timestamp,
-      level,
-      message: `[Extension] ${message}`,
-    })
-
-    // Limit to last 1000 logs
-    if (consoleLogs.value.length > 1000) {
-      consoleLogs.value = consoleLogs.value.slice(-1000)
-    }
-  }
-}
-
-onMounted(() => {
-  window.addEventListener('message', handleExtensionConsole)
-})
-
-onBeforeUnmount(() => {
-  window.removeEventListener('message', handleExtensionConsole)
-
-  // Unregister all iframes when the page unmounts
-  tabsStore.openTabs.forEach((tab) => {
-    if (tab.iframe) {
-      unregisterExtensionIFrame(tab.iframe)
-    }
-  })
-})
-
-// Cleanup wenn Tabs geschlossen werden
-watch(
-  () => tabsStore.openTabs,
-  (newTabs, oldTabs) => {
-    if (oldTabs) {
-      // Finde gelöschte Tabs
-      oldTabs.forEach((tab, id) => {
-        if (!newTabs.has(id) && tab.iframe) {
-          unregisterExtensionIFrame(tab.iframe)
-        }
-      })
-    }
-  },
-  { deep: true },
-)
-
-// Context Changes an alle Tabs broadcasten
-const { currentTheme } = storeToRefs(useUiStore())
-const { locale } = useI18n()
-
-watch([currentTheme, locale], () => {
-  tabsStore.broadcastToAllTabs({
-    type: 'context.changed',
-    data: {
-      context: {
-        theme: currentTheme.value || 'system',
-        locale: locale.value,
-        platform:
-          window.innerWidth < 768
-            ? 'mobile'
-            : window.innerWidth < 1024
-              ? 'tablet'
-              : 'desktop',
-      },
-    },
-    timestamp: Date.now(),
-  })
-})
-
-// Copy to clipboard function
-const copyToClipboard = async (text: string) => {
-  try {
-    await navigator.clipboard.writeText(text)
-    // Optional: Show success toast
-    console.log('Copied to clipboard')
-  } catch (err) {
-    console.error('Failed to copy:', err)
-  }
-}
-
-// Handle iframe errors (e.g., dev server not running)
-const onIFrameError = (extensionId: string) => {
-  iframe.errors[extensionId] = true
-}
-
-// Retry loading iframe (clears error and reloads)
-const retryLoadIFrame = (extensionId: string) => {
-  iframe.errors[extensionId] = false
-  // Reload the iframe by updating the tab
-  const tab = tabsStore.openTabs.get(extensionId)
-  if (tab?.iframe) {
-    tab.iframe.src = tab.iframe.src // Force reload
-  }
-}
-</script>
-
-<i18n lang="yaml">
-de:
-  loading: Erweiterung wird geladen
-  devServer:
-    notReachable:
-      title: Dev-Server nicht erreichbar
-      description: Der Dev-Server unter {url} ist nicht erreichbar.
-      howToStart: 'So starten Sie den Dev-Server:'
-      retry: Erneut versuchen
-en:
-  loading: Extension is loading
-  devServer:
-    notReachable:
-      title: Dev Server Not Reachable
-      description: The dev server at {url} is not reachable.
-      howToStart: 'To start the dev server:'
-      retry: Retry
-</i18n>

src/pages/vault/[vaultId]/index.vue

@@ -1,11 +1,13 @@
 <template>
-  <div class="w-full h-full flex items-center justify-center">
+  <div>
+    <UDashboardPanel resizable>
       <HaexDesktop />
+    </UDashboardPanel>
   </div>
 </template>
 
 <script setup lang="ts">
 definePageMeta({
-  name: 'vaultOverview',
+  name: 'desktop',
 })
 </script>

src/stores/desktop/de.json

@@ -0,0 +1,13 @@
+{
+  "contextMenu": {
+    "open": "Öffnen",
+    "removeFromDesktop": "Von Desktop entfernen",
+    "uninstall": "Deinstallieren"
+  },
+  "confirmUninstall": {
+    "title": "Erweiterung deinstallieren",
+    "message": "Möchten Sie die Erweiterung '{name}' wirklich deinstallieren? Diese Aktion kann nicht rückgängig gemacht werden.",
+    "confirm": "Deinstallieren",
+    "cancel": "Abbrechen"
+  }
+}

src/stores/desktop/en.json

@@ -0,0 +1,13 @@
+{
+  "contextMenu": {
+    "open": "Open",
+    "removeFromDesktop": "Remove from Desktop",
+    "uninstall": "Uninstall"
+  },
+  "confirmUninstall": {
+    "title": "Uninstall Extension",
+    "message": "Do you really want to uninstall the extension '{name}'? This action cannot be undone.",
+    "confirm": "Uninstall",
+    "cancel": "Cancel"
+  }
+}

src/stores/desktop/index.ts

@@ -0,0 +1,342 @@
+import { eq } from 'drizzle-orm'
+import { haexDesktopItems } from '~~/src-tauri/database/schemas'
+import type {
+  InsertHaexDesktopItems,
+  SelectHaexDesktopItems,
+} from '~~/src-tauri/database/schemas'
+import de from './de.json'
+import en from './en.json'
+
+export type DesktopItemType = 'extension' | 'file' | 'folder' | 'system'
+
+export interface IDesktopItem extends SelectHaexDesktopItems {
+  label?: string
+  icon?: string
+  referenceId: string // Computed: extensionId or systemWindowId
+}
+
+export const useDesktopStore = defineStore('desktopStore', () => {
+  const { currentVault } = storeToRefs(useVaultStore())
+  const workspaceStore = useWorkspaceStore()
+  const { currentWorkspace } = storeToRefs(workspaceStore)
+  const { $i18n } = useNuxtApp()
+
+  $i18n.setLocaleMessage('de', {
+    desktop: de,
+  })
+  $i18n.setLocaleMessage('en', { desktop: en })
+
+  const desktopItems = ref<IDesktopItem[]>([])
+  const selectedItemIds = ref<Set<string>>(new Set())
+
+  const loadDesktopItemsAsync = async () => {
+    if (!currentVault.value?.drizzle) {
+      console.error('Kein Vault geöffnet')
+      return
+    }
+
+    if (!currentWorkspace.value) {
+      console.error('Kein Workspace aktiv')
+      return
+    }
+
+    try {
+      const items = await currentVault.value.drizzle
+        .select()
+        .from(haexDesktopItems)
+        .where(eq(haexDesktopItems.workspaceId, currentWorkspace.value.id))
+
+      desktopItems.value = items.map(item => ({
+        ...item,
+        referenceId: item.itemType === 'extension' ? item.extensionId! : item.systemWindowId!,
+      }))
+    } catch (error) {
+      console.error('Fehler beim Laden der Desktop-Items:', error)
+      throw error
+    }
+  }
+
+  const addDesktopItemAsync = async (
+    itemType: DesktopItemType,
+    referenceId: string,
+    positionX: number = 0,
+    positionY: number = 0,
+    workspaceId?: string,
+  ) => {
+    if (!currentVault.value?.drizzle) {
+      throw new Error('Kein Vault geöffnet')
+    }
+
+    const targetWorkspaceId = workspaceId || currentWorkspace.value?.id
+    if (!targetWorkspaceId) {
+      throw new Error('Kein Workspace aktiv')
+    }
+
+    try {
+      const newItem: InsertHaexDesktopItems = {
+        workspaceId: targetWorkspaceId,
+        itemType: itemType,
+        extensionId: itemType === 'extension' ? referenceId : null,
+        systemWindowId: itemType === 'system' || itemType === 'file' || itemType === 'folder' ? referenceId : null,
+        positionX: positionX,
+        positionY: positionY,
+      }
+
+      const result = await currentVault.value.drizzle
+        .insert(haexDesktopItems)
+        .values(newItem)
+        .returning()
+
+      if (result.length > 0 && result[0]) {
+        const itemWithRef = {
+          ...result[0],
+          referenceId: itemType === 'extension' ? result[0].extensionId! : result[0].systemWindowId!,
+        }
+        desktopItems.value.push(itemWithRef)
+        return itemWithRef
+      }
+    } catch (error) {
+      console.error('Fehler beim Hinzufügen des Desktop-Items:', {
+        error,
+        itemType,
+        referenceId,
+        workspaceId: targetWorkspaceId,
+        position: { x: positionX, y: positionY }
+      })
+
+      // Log full error details
+      if (error && typeof error === 'object') {
+        console.error('Full error object:', JSON.stringify(error, null, 2))
+      }
+
+      throw error
+    }
+  }
+
+  const updateDesktopItemPositionAsync = async (
+    id: string,
+    positionX: number,
+    positionY: number,
+  ) => {
+    if (!currentVault.value?.drizzle) {
+      throw new Error('Kein Vault geöffnet')
+    }
+
+    try {
+      const result = await currentVault.value.drizzle
+        .update(haexDesktopItems)
+        .set({
+          positionX: positionX,
+          positionY: positionY,
+        })
+        .where(eq(haexDesktopItems.id, id))
+        .returning()
+
+      if (result.length > 0 && result[0]) {
+        const index = desktopItems.value.findIndex((item) => item.id === id)
+        if (index !== -1) {
+          const item = result[0]
+          desktopItems.value[index] = {
+            ...item,
+            referenceId: item.itemType === 'extension' ? item.extensionId! : item.systemWindowId!,
+          }
+        }
+      }
+    } catch (error) {
+      console.error('Fehler beim Aktualisieren der Position:', error)
+      throw error
+    }
+  }
+
+  const removeDesktopItemAsync = async (id: string) => {
+    console.log('removeDesktopItemAsync', id)
+    if (!currentVault.value?.drizzle) {
+      throw new Error('Kein Vault geöffnet')
+    }
+
+    try {
+      // Soft delete using haexTombstone
+      await currentVault.value.drizzle
+        .delete(haexDesktopItems)
+        .where(eq(haexDesktopItems.id, id))
+
+      desktopItems.value = desktopItems.value.filter((item) => item.id !== id)
+    } catch (error) {
+      console.error('Fehler beim Entfernen des Desktop-Items:', error)
+      throw error
+    }
+  }
+
+  const getDesktopItemByReference = (
+    itemType: DesktopItemType,
+    referenceId: string,
+  ) => {
+    return desktopItems.value.find(
+      (item) => {
+        if (item.itemType !== itemType) return false
+        if (itemType === 'extension') {
+          return item.extensionId === referenceId
+        } else {
+          return item.systemWindowId === referenceId
+        }
+      },
+    )
+  }
+
+  const openDesktopItem = (
+    itemType: DesktopItemType,
+    referenceId: string,
+    sourcePosition?: { x: number; y: number; width: number; height: number },
+  ) => {
+    const windowManager = useWindowManagerStore()
+
+    if (itemType === 'system') {
+      const systemWindow = windowManager.getAllSystemWindows().find(
+        (win) => win.id === referenceId,
+      )
+
+      if (systemWindow) {
+        windowManager.openWindowAsync({
+          sourceId: systemWindow.id,
+          type: 'system',
+          icon: systemWindow.icon,
+          title: systemWindow.name,
+          sourcePosition,
+        })
+      }
+    } else if (itemType === 'extension') {
+      const extensionsStore = useExtensionsStore()
+
+      const extension = extensionsStore.availableExtensions.find(
+        (ext) => ext.id === referenceId,
+      )
+
+      if (extension) {
+        windowManager.openWindowAsync({
+          sourceId: extension.id,
+          type: 'extension',
+          icon: extension.icon,
+          title: extension.name,
+          sourcePosition,
+        })
+      }
+    }
+    // Für später: file und folder handling
+  }
+
+  const uninstallDesktopItem = async (
+    id: string,
+    itemType: DesktopItemType,
+    referenceId: string,
+  ) => {
+    if (itemType === 'extension') {
+      try {
+        const extensionsStore = useExtensionsStore()
+        const extension = extensionsStore.availableExtensions.find(
+          (ext) => ext.id === referenceId,
+        )
+        if (!extension) {
+          console.error('Extension nicht gefunden')
+          return
+        }
+
+        // Uninstall the extension
+        await extensionsStore.removeExtensionAsync(
+          extension.publicKey,
+          extension.name,
+          extension.version,
+        )
+
+        // Reload extensions after uninstall
+        await extensionsStore.loadExtensionsAsync()
+
+        // Remove desktop item
+        await removeDesktopItemAsync(id)
+      } catch (error) {
+        console.error('Fehler beim Deinstallieren:', error)
+      }
+    }
+    // Für später: file und folder handling
+  }
+
+  const toggleSelection = (id: string, ctrlKey: boolean = false) => {
+    if (ctrlKey) {
+      // Mit Ctrl: Toggle einzelnes Element
+      if (selectedItemIds.value.has(id)) {
+        selectedItemIds.value.delete(id)
+      } else {
+        selectedItemIds.value.add(id)
+      }
+    } else {
+      // Ohne Ctrl: Nur dieses Element auswählen
+      selectedItemIds.value.clear()
+      selectedItemIds.value.add(id)
+    }
+  }
+
+  const clearSelection = () => {
+    selectedItemIds.value.clear()
+  }
+
+  const isItemSelected = (id: string) => {
+    return selectedItemIds.value.has(id)
+  }
+
+  const selectedItems = computed(() => {
+    return desktopItems.value.filter((item) =>
+      selectedItemIds.value.has(item.id),
+    )
+  })
+
+  const getContextMenuItems = (
+    id: string,
+    itemType: DesktopItemType,
+    referenceId: string,
+    onUninstall: () => void,
+  ) => {
+    const handleOpen = () => {
+      openDesktopItem(itemType, referenceId)
+    }
+
+    return [
+      [
+        {
+          label: $i18n.t('desktop.contextMenu.open'),
+          icon: 'i-heroicons-arrow-top-right-on-square',
+          onSelect: handleOpen,
+        },
+      ],
+      [
+        {
+          label: $i18n.t('desktop.contextMenu.removeFromDesktop'),
+          icon: 'i-heroicons-x-mark',
+          onSelect: async () => {
+            await removeDesktopItemAsync(id)
+          },
+        },
+        {
+          label: $i18n.t('desktop.contextMenu.uninstall'),
+          icon: 'i-heroicons-trash',
+          onSelect: onUninstall,
+        },
+      ],
+    ]
+  }
+
+  return {
+    desktopItems,
+    selectedItemIds,
+    selectedItems,
+    loadDesktopItemsAsync,
+    addDesktopItemAsync,
+    updateDesktopItemPositionAsync,
+    removeDesktopItemAsync,
+    getDesktopItemByReference,
+    getContextMenuItems,
+    openDesktopItem,
+    uninstallDesktopItem,
+    toggleSelection,
+    clearSelection,
+    isItemSelected,
+  }
+})

src/stores/desktop/windowManager.ts

@@ -0,0 +1,362 @@
+import { defineAsyncComponent, type Component } from 'vue'
+
+export interface IWindow {
+  id: string
+  workspaceId: string // Window belongs to a specific workspace
+  type: 'system' | 'extension'
+  sourceId: string // extensionId or systemWindowId (depends on type)
+  title: string
+  icon?: string | null
+  x: number
+  y: number
+  width: number
+  height: number
+  isMinimized: boolean
+  zIndex: number
+  // Animation source position (icon position)
+  sourceX?: number
+  sourceY?: number
+  sourceWidth?: number
+  sourceHeight?: number
+  // Animation state
+  isOpening?: boolean
+  isClosing?: boolean
+}
+
+export interface SystemWindowDefinition {
+  id: string
+  name: string
+  icon: string
+  component: Component
+  defaultWidth: number
+  defaultHeight: number
+  resizable?: boolean
+  singleton?: boolean // Nur eine Instanz erlaubt?
+}
+
+export const useWindowManagerStore = defineStore('windowManager', () => {
+  const windows = ref<IWindow[]>([])
+  const activeWindowId = ref<string | null>(null)
+  const nextZIndex = ref(100)
+
+  // Window Overview State
+  const showWindowOverview = ref(false)
+
+  // Computed: Count of all open windows (including minimized)
+  const openWindowsCount = computed(() => windows.value.length)
+
+  // Window Dragging State (for drag & drop to workspaces)
+  const draggingWindowId = ref<string | null>(null)
+
+  // System Windows Registry
+  const systemWindows: Record<string, SystemWindowDefinition> = {
+    developer: {
+      id: 'developer',
+      name: 'Developer',
+      icon: 'i-hugeicons-developer',
+      component: defineAsyncComponent(
+        () => import('@/components/haex/system/developer.vue'),
+      ) as Component,
+      defaultWidth: 800,
+      defaultHeight: 600,
+      resizable: true,
+      singleton: true,
+    },
+    settings: {
+      id: 'settings',
+      name: 'Settings',
+      icon: 'i-mdi-cog',
+      component: defineAsyncComponent(
+        () => import('@/components/haex/system/settings.vue'),
+      ) as Component,
+      defaultWidth: 800,
+      defaultHeight: 600,
+      resizable: true,
+      singleton: true,
+    },
+    marketplace: {
+      id: 'marketplace',
+      name: 'Marketplace',
+      icon: 'i-mdi-store',
+      component: defineAsyncComponent(
+        () => import('@/components/haex/system/marketplace.vue'),
+      ),
+      defaultWidth: 1000,
+      defaultHeight: 700,
+      resizable: true,
+      singleton: false,
+    },
+  }
+
+  const getSystemWindow = (id: string): SystemWindowDefinition | undefined => {
+    return systemWindows[id]
+  }
+
+  const getAllSystemWindows = (): SystemWindowDefinition[] => {
+    return Object.values(systemWindows)
+  }
+
+  // Window animation settings
+  const windowAnimationDuration = ref(600) // in milliseconds (matches Tailwind duration-600)
+
+  // Get windows for current workspace only
+  const currentWorkspaceWindows = computed(() => {
+    if (!useWorkspaceStore().currentWorkspace) return []
+    return windows.value.filter(
+      (w) => w.workspaceId === useWorkspaceStore().currentWorkspace?.id,
+    )
+  })
+
+  const windowsByWorkspaceId = (workspaceId: string) =>
+    computed(() =>
+      windows.value.filter((window) => window.workspaceId === workspaceId),
+    )
+
+  const moveWindowsToWorkspace = (
+    fromWorkspaceId: string,
+    toWorkspaceId: string,
+  ) => {
+    const windowsFrom = windowsByWorkspaceId(fromWorkspaceId)
+    windowsFrom.value.forEach((window) => (window.workspaceId = toWorkspaceId))
+  }
+
+  const openWindowAsync = async ({
+    height = 800,
+    icon = '',
+    sourceId,
+    sourcePosition,
+    title,
+    type,
+    width = 600,
+    workspaceId,
+  }: {
+    height?: number
+    icon?: string | null
+    sourceId: string
+    sourcePosition?: { x: number; y: number; width: number; height: number }
+    title?: string
+    type: 'system' | 'extension'
+    width?: number
+    workspaceId?: string
+  }) => {
+    try {
+      // Wenn kein workspaceId angegeben ist, nutze die current workspace
+      const targetWorkspaceId =
+        workspaceId || useWorkspaceStore().currentWorkspace?.id
+
+      if (!targetWorkspaceId) {
+        console.error('Cannot open window: No active workspace')
+        return
+      }
+
+      const workspace = useWorkspaceStore().workspaces?.find(
+        (w) => w.id === targetWorkspaceId,
+      )
+      if (!workspace) {
+        console.error('Cannot open window: Invalid workspace')
+        return
+      }
+
+      // System Window specific handling
+      if (type === 'system') {
+        const systemWindowDef = getSystemWindow(sourceId)
+        if (!systemWindowDef) {
+          console.error(`System window '${sourceId}' not found in registry`)
+          return
+        }
+
+        // Singleton check: If already open, activate existing window
+        if (systemWindowDef.singleton) {
+          const existingWindow = windows.value.find(
+            (w) => w.type === 'system' && w.sourceId === sourceId,
+          )
+          if (existingWindow) {
+            activateWindow(existingWindow.id)
+            return existingWindow.id
+          }
+        }
+
+        // Use system window defaults
+        title = title ?? systemWindowDef.name
+        icon = icon ?? systemWindowDef.icon
+        width = width ?? systemWindowDef.defaultWidth
+        height = height ?? systemWindowDef.defaultHeight
+      }
+
+      // Create new window
+      const windowId = crypto.randomUUID()
+
+      // Calculate viewport-aware size
+      const viewportWidth = window.innerWidth
+      const viewportHeight = window.innerHeight - 60
+
+      console.log('viewportHeight', window.innerHeight, viewportHeight)
+      const windowHeight = Math.min(height, viewportHeight)
+
+      // Adjust width proportionally if needed (optional)
+      const aspectRatio = width / height
+      const windowWidth = Math.min(
+        width,
+        viewportWidth,
+        windowHeight * aspectRatio,
+      )
+
+      // Calculate centered position with cascading offset (only count windows in current workspace)
+      const offset = currentWorkspaceWindows.value.length * 30
+      const centerX = Math.max(0, (viewportWidth - windowWidth) / 1 / 3)
+      const centerY = Math.max(0, (viewportHeight - windowHeight) / 1 / 3)
+      const x = Math.min(centerX + offset, viewportWidth - windowWidth)
+      const y = Math.min(centerY + offset, viewportHeight - windowHeight)
+
+      const newWindow: IWindow = {
+        id: windowId,
+        workspaceId: workspace.id,
+        type,
+        sourceId,
+        title: title!,
+        icon,
+        x,
+        y,
+        width: windowWidth,
+        height: windowHeight,
+        isMinimized: false,
+        zIndex: nextZIndex.value++,
+        sourceX: sourcePosition?.x,
+        sourceY: sourcePosition?.y,
+        sourceWidth: sourcePosition?.width,
+        sourceHeight: sourcePosition?.height,
+        isOpening: true,
+        isClosing: false,
+      }
+
+      windows.value.push(newWindow)
+      activeWindowId.value = windowId
+
+      // Remove opening flag after animation
+      setTimeout(() => {
+        const window = windows.value.find((w) => w.id === windowId)
+        if (window) {
+          window.isOpening = false
+        }
+      }, windowAnimationDuration.value)
+
+      return windowId
+    } catch (error) {
+      console.error('Error opening window:', error)
+      // Optional: Fehler weiterwerfen wenn nötig
+      throw error
+    }
+  }
+
+  /*****************************************************************************************************
+   * TODO: Momentan werden die Fenster einfach nur geschlossen.
+   * In Zukunft sollte aber vorher ein close event an die Erweiterungen via postMessage geschickt werden,
+   * so dass die Erweiterungen darauf reagieren können, um eventuell ungespeicherte Daten zu sichern
+   *****************************************************************************************************/
+  const closeWindow = (windowId: string) => {
+    const window = windows.value.find((w) => w.id === windowId)
+    if (!window) return
+
+    // Start closing animation
+    window.isClosing = true
+
+    // Remove window after animation completes
+    setTimeout(() => {
+      const index = windows.value.findIndex((w) => w.id === windowId)
+      if (index !== -1) {
+        windows.value.splice(index, 1)
+
+        // If closed window was active, activate the topmost window
+        if (activeWindowId.value === windowId) {
+          if (windows.value.length > 0) {
+            const topWindow = windows.value.reduce((max, w) =>
+              w.zIndex > max.zIndex ? w : max,
+            )
+            activeWindowId.value = topWindow.id
+          } else {
+            activeWindowId.value = null
+          }
+        }
+      }
+    }, windowAnimationDuration.value)
+  }
+
+  const minimizeWindow = (windowId: string) => {
+    const window = windows.value.find((w) => w.id === windowId)
+    if (window) {
+      window.isMinimized = true
+    }
+  }
+
+  const restoreWindow = (windowId: string) => {
+    const window = windows.value.find((w) => w.id === windowId)
+    if (window) {
+      window.isMinimized = false
+      activateWindow(windowId)
+    }
+  }
+
+  const activateWindow = (windowId: string) => {
+    const window = windows.value.find((w) => w.id === windowId)
+    if (window) {
+      window.zIndex = nextZIndex.value++
+      activeWindowId.value = windowId
+    }
+  }
+
+  const updateWindowPosition = (windowId: string, x: number, y: number) => {
+    const window = windows.value.find((w) => w.id === windowId)
+    if (window) {
+      window.x = x
+      window.y = y
+    }
+  }
+
+  const updateWindowSize = (
+    windowId: string,
+    width: number,
+    height: number,
+  ) => {
+    const window = windows.value.find((w) => w.id === windowId)
+    if (window) {
+      window.width = width
+      window.height = height
+    }
+  }
+
+  const isWindowActive = (windowId: string) => {
+    return activeWindowId.value === windowId
+  }
+
+  const getVisibleWindows = computed(() => {
+    return currentWorkspaceWindows.value.filter((w) => !w.isMinimized)
+  })
+
+  const getMinimizedWindows = computed(() => {
+    return currentWorkspaceWindows.value.filter((w) => w.isMinimized)
+  })
+
+  return {
+    activateWindow,
+    activeWindowId,
+    closeWindow,
+    currentWorkspaceWindows,
+    draggingWindowId,
+    getAllSystemWindows,
+    getMinimizedWindows,
+    getSystemWindow,
+    getVisibleWindows,
+    isWindowActive,
+    minimizeWindow,
+    moveWindowsToWorkspace,
+    openWindowAsync,
+    openWindowsCount,
+    restoreWindow,
+    showWindowOverview,
+    updateWindowPosition,
+    updateWindowSize,
+    windowAnimationDuration,
+    windows,
+    windowsByWorkspaceId,
+  }
+})

src/stores/desktop/workspace.ts

@@ -0,0 +1,223 @@
+import { asc, eq } from 'drizzle-orm'
+import {
+  haexWorkspaces,
+  type SelectHaexWorkspaces,
+} from '~~/src-tauri/database/schemas'
+import type { Swiper } from 'swiper/types'
+
+export type IWorkspace = SelectHaexWorkspaces
+
+export const useWorkspaceStore = defineStore('workspaceStore', () => {
+  const vaultStore = useVaultStore()
+  const windowStore = useWindowManagerStore()
+  const { deviceId } = storeToRefs(useDeviceStore())
+
+  const { currentVault } = storeToRefs(vaultStore)
+
+  const swiperInstance = ref<Swiper | null>(null)
+
+  const allowSwipe = ref(true)
+
+  // Workspace Overview Mode (GNOME-style)
+  const isOverviewMode = ref(false)
+
+  const workspaces = ref<IWorkspace[]>([])
+
+  const currentWorkspaceIndex = ref(0)
+
+  // Load workspaces from database
+  const loadWorkspacesAsync = async () => {
+    if (!currentVault.value?.drizzle) {
+      console.error('Kein Vault geöffnet')
+      return
+    }
+
+    if (!deviceId.value) {
+      console.error('Keine DeviceId vergeben')
+      return
+    }
+
+    try {
+      const items = await currentVault.value.drizzle
+        .select()
+        .from(haexWorkspaces)
+        .where(eq(haexWorkspaces.deviceId, deviceId.value))
+        .orderBy(asc(haexWorkspaces.position))
+
+      workspaces.value = items
+
+      // Create default workspace if none exist
+      if (items.length === 0) {
+        await addWorkspaceAsync('Workspace 1')
+      }
+    } catch (error) {
+      console.error('Fehler beim Laden der Workspaces:', error)
+      throw error
+    }
+  }
+
+  const currentWorkspace = computed(() => {
+    return workspaces.value[currentWorkspaceIndex.value]
+  })
+
+  const addWorkspaceAsync = async (name?: string) => {
+    if (!currentVault.value?.drizzle) {
+      throw new Error('Kein Vault geöffnet')
+    }
+
+    if (!deviceId.value) {
+      return
+    }
+
+    try {
+      const newIndex = workspaces.value.length + 1
+      const newWorkspace = {
+        name: name || `Workspace ${newIndex}`,
+        position: workspaces.value.length,
+        deviceId: deviceId.value,
+      }
+
+      const result = await currentVault.value.drizzle
+        .insert(haexWorkspaces)
+        .values(newWorkspace)
+        .returning()
+
+      if (result.length > 0 && result[0]) {
+        workspaces.value.push(result[0])
+        currentWorkspaceIndex.value = workspaces.value.length - 1
+        return result[0]
+      }
+    } catch (error) {
+      console.error('Fehler beim Hinzufügen des Workspace:', error)
+      throw error
+    }
+  }
+
+  const closeWorkspaceAsync = async (workspaceId: string) => {
+    const openWindows = windowStore.windowsByWorkspaceId(workspaceId)
+
+    for (const window of openWindows.value) {
+      windowStore.closeWindow(window.id)
+    }
+
+    return await removeWorkspaceAsync(workspaceId)
+  }
+
+  const removeWorkspaceAsync = async (workspaceId: string) => {
+    // Don't allow removing the last workspace
+    if (workspaces.value.length <= 1) return
+
+    if (!currentVault.value?.drizzle) {
+      throw new Error('Kein Vault geöffnet')
+    }
+
+    const index = workspaces.value.findIndex((ws) => ws.id === workspaceId)
+    if (index === -1) return
+
+    try {
+      await currentVault.value.drizzle.transaction(async (tx) => {
+        // Delete workspace
+        await tx
+          .delete(haexWorkspaces)
+          .where(eq(haexWorkspaces.id, workspaceId))
+
+        // Update local state
+        workspaces.value.splice(index, 1)
+        workspaces.value.forEach((workspace, idx) => {
+          workspace.position = idx
+        })
+
+        // Update positions in database
+        for (const workspace of workspaces.value) {
+          await tx
+            .update(haexWorkspaces)
+            .set({ position: workspace.position })
+            .where(eq(haexWorkspaces.id, workspace.id))
+        }
+      })
+
+      // Adjust current index if needed
+      if (currentWorkspaceIndex.value >= workspaces.value.length) {
+        currentWorkspaceIndex.value = workspaces.value.length - 1
+      }
+    } catch (error) {
+      console.error('Fehler beim Entfernen des Workspace:', error)
+      throw error
+    }
+  }
+
+  const switchToWorkspace = (workspaceId?: string) => {
+    const workspace = workspaces.value.find((w) => w.id === workspaceId)
+
+    console.log('switchToWorkspace', workspace)
+    if (workspace) {
+      currentWorkspaceIndex.value = workspace?.position
+    } else {
+      currentWorkspaceIndex.value = 0
+    }
+
+    return currentWorkspaceIndex.value
+  }
+
+  const switchToNext = () => {
+    if (currentWorkspaceIndex.value < workspaces.value.length - 1) {
+      currentWorkspaceIndex.value++
+    }
+  }
+
+  const switchToPrevious = () => {
+    if (currentWorkspaceIndex.value > 0) {
+      currentWorkspaceIndex.value--
+    }
+  }
+
+  const renameWorkspaceAsync = async (workspaceId: string, newName: string) => {
+    if (!currentVault.value?.drizzle) {
+      throw new Error('Kein Vault geöffnet')
+    }
+
+    try {
+      const result = await currentVault.value.drizzle
+        .update(haexWorkspaces)
+        .set({ name: newName })
+        .where(eq(haexWorkspaces.id, workspaceId))
+        .returning()
+
+      if (result.length > 0 && result[0]) {
+        const index = workspaces.value.findIndex((ws) => ws.id === workspaceId)
+        if (index !== -1) {
+          workspaces.value[index] = result[0]
+        }
+      }
+    } catch (error) {
+      console.error('Fehler beim Umbenennen des Workspace:', error)
+      throw error
+    }
+  }
+
+  const slideToWorkspace = (workspaceId?: string) => {
+    const index = switchToWorkspace(workspaceId)
+    if (swiperInstance.value) {
+      swiperInstance.value.slideTo(index)
+    }
+    isOverviewMode.value = false
+  }
+
+  return {
+    addWorkspaceAsync,
+    allowSwipe,
+    closeWorkspaceAsync,
+    currentWorkspace,
+    currentWorkspaceIndex,
+    isOverviewMode,
+    slideToWorkspace,
+    loadWorkspacesAsync,
+    removeWorkspaceAsync,
+    renameWorkspaceAsync,
+    swiperInstance,
+    switchToNext,
+    switchToPrevious,
+    switchToWorkspace,
+    workspaces,
+  }
+})

src/stores/extensions/index.ts

@@ -31,26 +31,12 @@ export const useExtensionsStore = defineStore('extensionsStore', () => {
     )
   })
 
-  /* const { addNotificationAsync } = useNotificationStore() */
+  /* const isActive = (id: string) =>
-
-  /*  const extensionLinks = computed<ISidebarItem[]>(() =>
-    availableExtensions.value
-      .filter((extension) => extension.enabled && extension.installed)
-      .map((extension) => ({
-        icon: extension.icon ?? '',
-        id: extension.id,
-        name: extension.name ?? '',
-        tooltip: extension.name ?? '',
-        to: { name: 'haexExtension', params: { extensionId: extension.id } },
-      })),
-  ) */
-
-  const isActive = (id: string) =>
     computed(
       () =>
         currentRoute.value.name === 'extension' &&
         currentRoute.value.params.extensionId === id,
-    )
+    ) */
 
   const extensionEntry = computed(() => {
     if (
@@ -64,8 +50,8 @@ export const useExtensionsStore = defineStore('extensionsStore', () => {
       currentExtension.value.publicKey,
       currentExtension.value.name,
       currentExtension.value.version,
-      'index.html',
+      currentExtension.value.entry ?? 'index.html',
-      currentExtension.value.devServerUrl ?? undefined
+      currentExtension.value.devServerUrl ?? undefined,
     )
   })
 
@@ -104,6 +90,7 @@ export const useExtensionsStore = defineStore('extensionsStore', () => {
       const extensions =
         await invoke<ExtensionInfoResponse[]>('get_all_extensions')
 
+      console.log('get_all_extensions', extensions)
       // ExtensionInfoResponse is now directly compatible with IHaexHubExtension
       availableExtensions.value = extensions
     } catch (error) {
@@ -286,7 +273,7 @@ export const useExtensionsStore = defineStore('extensionsStore', () => {
     currentExtensionId,
     extensionEntry,
     installAsync,
-    isActive,
+    //isActive,
     isExtensionInstalledAsync,
     loadExtensionsAsync,
     previewManifestAsync,