Draft: controlled DZMM cutover candidate

.github/workflows/backend-ci.yml

@@ -0,0 +1,32 @@
+name: backend-ci
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: vnext/backend
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+          cache: pip
+          cache-dependency-path: vnext/backend/pyproject.toml
+
+      - name: install backend dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -e '.[dev]'
+
+      - name: lint
+        run: python -m ruff check src tests
+
+      - name: test
+        run: python -m pytest -q

.github/workflows/e2e.yml

@@ -1,12 +1,12 @@
-name: E2E smoke
+name: vNext smoke
 
 on:
   push:
     branches: [main]
   pull_request:
 
 jobs:
-  e2e:
+  core-and-desktop:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -19,34 +19,34 @@ jobs:
         with:
           node-version: '20.x'
 
-      - name: backend deps
-        working-directory: backend
+      - uses: dtolnay/rust-toolchain@stable
+
+      - name: install Linux desktop build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libwebkit2gtk-4.1-dev \
+            libappindicator3-dev \
+            librsvg2-dev \
+            patchelf
+
+      - name: install vNext backend
+        working-directory: vnext/backend
         run: |
           python -m venv .venv
-          ./.venv/bin/pip install --upgrade pip
-          ./.venv/bin/pip install -e ".[dev]"
+          ./.venv/bin/python -m pip install --upgrade pip
+          ./.venv/bin/python -m pip install -e '.[dev]'
 
-      - name: frontend deps
-        working-directory: frontend
-        run: npm ci || npm install
+      - name: run vNext core tests
+        working-directory: vnext/backend
+        run: ./.venv/bin/python -m pytest -q
 
-      - name: install playwright browsers
-        working-directory: frontend
-        run: npx playwright install chromium --with-deps
+      - name: install desktop dependencies
+        working-directory: vnext/desktop
+        run: npm ci
 
-      - name: run e2e
-        working-directory: frontend
-        # Put the backend venv first on PATH so `python e2e/mock_backend.py`
-        # picks up the right interpreter (with FastAPI / uvicorn installed).
+      - name: build desktop renderer and Tauri host
+        working-directory: vnext/desktop
         run: |
-          export PATH="$(pwd)/../backend/.venv/bin:$PATH"
-          npx playwright test
-        env:
-          CI: 'true'
-
-      - name: upload playwright report
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: playwright-report
-          path: frontend/playwright-report/
+          npm run build
+          cargo check --manifest-path src-tauri/Cargo.toml

.github/workflows/release.yml

@@ -14,10 +14,10 @@ jobs:
         include:
           - os: macos-14
             label: macos-arm64
-            artifact_glob: 'frontend/src-tauri/target/release/bundle/dmg/*.dmg'
+            artifact_glob: 'vnext/desktop/src-tauri/target/release/bundle/dmg/*.dmg'
           - os: windows-latest
             label: windows-x64
-            artifact_glob: 'frontend/src-tauri/target/release/bundle/nsis/*.exe'
+            artifact_glob: 'vnext/desktop/src-tauri/target/release/bundle/nsis/*.exe'
 
     runs-on: ${{ matrix.os }}
     name: build (${{ matrix.label }})
@@ -44,24 +44,24 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-            frontend/src-tauri/target
-          key: ${{ matrix.os }}-cargo-${{ hashFiles('frontend/src-tauri/Cargo.lock') }}
+            vnext/desktop/src-tauri/target
+          key: ${{ matrix.os }}-cargo-${{ hashFiles('vnext/desktop/src-tauri/Cargo.lock') }}
 
       - name: backend venv + deps
-        working-directory: backend
+        working-directory: vnext/backend
         shell: bash
         run: |
           python -m venv .venv
           if [[ "${{ runner.os }}" == "Windows" ]]; then
             ./.venv/Scripts/python -m pip install --upgrade pip
-            ./.venv/Scripts/python -m pip install -e ".[dev]"
+            ./.venv/Scripts/python -m pip install -e ".[dev,package]"
           else
             ./.venv/bin/python -m pip install --upgrade pip
-            ./.venv/bin/python -m pip install -e ".[dev]"
+            ./.venv/bin/python -m pip install -e ".[dev,package]"
           fi
 
       - name: backend tests
-        working-directory: backend
+        working-directory: vnext/backend
         shell: bash
         run: |
           if [[ "${{ runner.os }}" == "Windows" ]]; then
@@ -71,29 +71,35 @@ jobs:
           fi
 
       - name: build sidecar
-        working-directory: backend
+        working-directory: vnext/backend
         shell: bash
         run: |
           if [[ "${{ runner.os }}" == "Windows" ]]; then
-            ./.venv/Scripts/python build_sidecar.py
+            ./.venv/Scripts/python ../packaging/build_backend.py
           else
-            ./.venv/bin/python build_sidecar.py
+            ./.venv/bin/python ../packaging/build_backend.py
           fi
 
-      - name: install frontend deps
-        working-directory: frontend
+      - name: install desktop deps
+        working-directory: vnext/desktop
         run: npm ci || npm install
 
       - name: tauri build
-        working-directory: frontend
-        run: npm run tauri:build
+        working-directory: vnext/desktop
+        shell: bash
+        run: |
+          if [[ "${{ runner.os }}" == "Windows" ]]; then
+            npm run tauri:build:windows
+          else
+            npm run tauri:build
+          fi
 
       - name: smoke artifact (macOS)
         if: runner.os == 'macOS'
         shell: bash
         run: |
           set -euo pipefail
-          DMG=$(find frontend/src-tauri/target/release/bundle/dmg -name '*.dmg' | head -1)
+          DMG=$(find vnext/desktop/src-tauri/target/release/bundle/dmg -name '*.dmg' | head -1)
           if [ -z "$DMG" ]; then
             echo "::error::no .dmg found"
             exit 1
@@ -109,21 +115,22 @@ jobs:
           hdiutil attach "$DMG" -mountpoint "$MOUNTPOINT" -nobrowse -readonly
           trap "hdiutil detach \"$MOUNTPOINT\" -force || true" EXIT
 
-          APP=$(find "$MOUNTPOINT" -maxdepth 2 -name 'dzmm.app' -type d | head -1)
+          APP=$(find "$MOUNTPOINT" -maxdepth 2 -name '*.app' -type d | head -1)
           if [ -z "$APP" ]; then
             echo "::error::dzmm.app missing from DMG"
             exit 1
           fi
 
-          if [ ! -f "$APP/Contents/MacOS/dzmm" ] && [ ! -f "$APP/Contents/MacOS/app" ]; then
+          MAIN=$(find "$APP/Contents/MacOS" -maxdepth 1 -type f | head -1)
+          if [ -z "$MAIN" ]; then
             echo "::error::main binary missing in dzmm.app/Contents/MacOS"
             ls -la "$APP/Contents/MacOS/" || true
             exit 1
           fi
 
-          BACKEND=$(find "$APP/Contents/Resources" -name 'dzmm-backend' -type f | head -1)
+          BACKEND=$(find "$APP/Contents/Resources" -name 'dzmm-next-backend' -type f | head -1)
           if [ -z "$BACKEND" ]; then
-            echo "::error::dzmm-backend missing from .app resources"
+            echo "::error::dzmm-next-backend missing from .app resources"
             ls -la "$APP/Contents/Resources/" | head -20
             exit 1
           fi
@@ -141,7 +148,7 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          EXE=$(find frontend/src-tauri/target/release/bundle/nsis -name '*-setup.exe' | head -1)
+          EXE=$(find vnext/desktop/src-tauri/target/release/bundle/nsis -name '*-setup.exe' | head -1)
           if [ -z "$EXE" ]; then
             echo "::error::no NSIS .exe found"
             exit 1
@@ -159,8 +166,8 @@ jobs:
           head -100 /tmp/nsis_contents.txt
           echo "::endgroup::"
 
-          if ! grep -q 'dzmm-backend.exe' /tmp/nsis_contents.txt; then
-            echo "::error::dzmm-backend.exe not found in NSIS installer"
+          if ! grep -q 'dzmm-next-backend.exe' /tmp/nsis_contents.txt; then
+            echo "::error::dzmm-next-backend.exe not found in NSIS installer"
             exit 1
           fi
 
@@ -169,7 +176,32 @@ jobs:
             exit 1
           fi
 
-          echo "::notice::EXE smoke OK: $SIZE bytes, dzmm-backend.exe + Python runtime present"
+          echo "::notice::EXE smoke OK: $SIZE bytes, dzmm-next-backend.exe + Python runtime present"
+
+      - name: smoke packaged Local Host sidecar (Windows)
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          set -euo pipefail
+          SIDECAR="vnext/desktop/src-tauri/backend-runtime/dzmm-next-backend/dzmm-next-backend.exe"
+          DATA_DIR="$RUNNER_TEMP/dzmm-next-windows-sidecar"
+          PORT=18765
+          mkdir -p "$DATA_DIR"
+          DZMM_NEXT_DATA_DIR="$DATA_DIR" DZMM_NEXT_PORT="$PORT" "$SIDECAR" >/tmp/dzmm-next-sidecar.log 2>&1 &
+          PID=$!
+          trap 'kill "$PID" 2>/dev/null || true' EXIT
+          for _ in $(seq 1 60); do
+            if curl --fail --silent "http://127.0.0.1:${PORT}/health" > /tmp/dzmm-next-health.json; then
+              grep -q '"storage":"local"' /tmp/dzmm-next-health.json
+              grep -q '"host":"127.0.0.1"' /tmp/dzmm-next-health.json
+              echo "::notice::Windows packaged sidecar Local Host health OK"
+              exit 0
+            fi
+            sleep 1
+          done
+          cat /tmp/dzmm-next-sidecar.log || true
+          echo "::error::Windows packaged sidecar did not become healthy"
+          exit 1
 
       - name: upload artifact
         uses: actions/upload-artifact@v4