feat: sync upstream/main + integrate PR #3 + extend HA coherence

.github/workflows/ci.yml

@@ -1,125 +1,136 @@
-name: CI
-
-on:
-  push:
-    branches: [ main ]
-    paths-ignore:
-      - 'custom_components/**'
-      - '.github/workflows/release.yml'
-      - '.github/workflows/release-ha.yml'
-      - '.github/workflows/prerelease.yml'
-      - '.github/workflows/slash-command.yml'
-      - '**/*.md'
-      - 'docs/**'
-      - 'LICENSE'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'hacs.json'
-  pull_request:
-    paths-ignore:
-      - 'custom_components/**'
-      - '.github/workflows/release.yml'
-      - '.github/workflows/release-ha.yml'
-      - '.github/workflows/prerelease.yml'
-      - '.github/workflows/slash-command.yml'
-      - '**/*.md'
-      - 'docs/**'
-      - 'LICENSE'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'hacs.json'
-
-permissions:
-  contents: read
-
-jobs:
-  firmware:
-    name: Firmware (${{ matrix.env }})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        env: [c3-debug, s3-debug, esp32-debug]
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: npm
-          cache-dependency-path: frontend/package-lock.json
-
-      - name: Build frontend (generates web_assets.h)
-        run: npm ci && npm run build
-        working-directory: frontend
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Cache PlatformIO
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.platformio/platforms
-            ~/.platformio/packages
-          key: platformio-${{ matrix.env }}-${{ hashFiles('platformio.ini') }}
-
-      - name: Install PlatformIO
-        # intelhex is an unlisted runtime dep of the newer tool-esptoolpy
-        # bundled with pioarduino 54.x; esptool imports it at module load.
-        run: pip install platformio intelhex
-
-      - name: Build firmware
-        run: pio run -e ${{ matrix.env }}
-
-      - name: Format check (clang-format)
-        run: python scripts/check_format.py
-
-      - name: Static analysis (clang-tidy)
-        run: pio check -e ${{ matrix.env }} --fail-on-defect=low
-
-  frontend:
-    name: Frontend
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: npm
-          cache-dependency-path: frontend/package-lock.json
-
-      - name: Install dependencies
-        run: npm ci
-        working-directory: frontend
-
-      - name: Lint and format check
-        run: npm run check
-        working-directory: frontend
-
-      - name: Build (lint + typecheck + vite + embed)
-        run: npm run build
-        working-directory: frontend
-
-  flash-tool:
-    name: Flash Tool
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: flash/go.mod
-
-      - name: Lint
-        uses: golangci/golangci-lint-action@v7
-        with:
-          version: v2.11.3
-          args: ./...
-          working-directory: flash
-
-      - name: Build
-        run: go build -o openneato-flash .
-        working-directory: flash
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - 'custom_components/**'
+      - '.github/workflows/release.yml'
+      - '.github/workflows/release-ha.yml'
+      - '.github/workflows/prerelease.yml'
+      - '.github/workflows/slash-command.yml'
+      - '**/*.md'
+      - 'docs/**'
+      - 'LICENSE'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'hacs.json'
+  pull_request:
+    paths-ignore:
+      - 'custom_components/**'
+      - '.github/workflows/release.yml'
+      - '.github/workflows/release-ha.yml'
+      - '.github/workflows/prerelease.yml'
+      - '.github/workflows/slash-command.yml'
+      - '**/*.md'
+      - 'docs/**'
+      - 'LICENSE'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'hacs.json'
+
+permissions:
+  contents: read
+
+jobs:
+  firmware:
+    name: Firmware (${{ matrix.env }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        env: [c3-debug, c6-debug, c6-ota, s3-debug, esp32-debug]
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Build frontend (generates web_assets.h)
+        run: npm ci && npm run build
+        working-directory: frontend
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Cache PlatformIO
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.platformio/platforms
+            ~/.platformio/packages
+          key: platformio-${{ matrix.env }}-${{ hashFiles('platformio.ini') }}
+
+      - name: Install PlatformIO
+        # intelhex is an unlisted runtime dep of the newer tool-esptoolpy
+        # bundled with pioarduino 54.x; esptool imports it at module load.
+        run: pip install platformio intelhex
+
+      - name: Build firmware
+        run: pio run -e ${{ matrix.env }}
+
+      - name: Upload firmware binary
+        if: matrix.env == 'c6-ota'
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ matrix.env }}
+          path: |
+            .pio/build/${{ matrix.env }}/firmware.bin
+            .pio/build/${{ matrix.env }}/partitions.bin
+            .pio/build/${{ matrix.env }}/bootloader.bin
+          retention-days: 7
+
+      - name: Format check (clang-format)
+        run: python scripts/check_format.py
+
+      - name: Static analysis (clang-tidy)
+        run: pio check -e ${{ matrix.env }} --fail-on-defect=low
+
+  frontend:
+    name: Frontend
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Install dependencies
+        run: npm ci
+        working-directory: frontend
+
+      - name: Lint and format check
+        run: npm run check
+        working-directory: frontend
+
+      - name: Build (lint + typecheck + vite + embed)
+        run: npm run build
+        working-directory: frontend
+
+  flash-tool:
+    name: Flash Tool
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: flash/go.mod
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v7
+        with:
+          version: v2.11.3
+          args: ./...
+          working-directory: flash
+
+      - name: Build
+        run: go build -o openneato-flash .
+        working-directory: flash

.github/workflows/prerelease.yml

@@ -22,6 +22,7 @@ jobs:
       pr_number: ${{ steps.resolve.outputs.pr_number }}
       head_sha: ${{ steps.resolve.outputs.head_sha }}
       head_ref: ${{ steps.resolve.outputs.head_ref }}
+      checkout_ref: ${{ steps.resolve.outputs.checkout_ref }}
       release_tag: ${{ steps.resolve.outputs.tag }}
       version: ${{ steps.resolve.outputs.version }}
 
@@ -37,9 +38,11 @@ jobs:
             PR_JSON=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json headRefOid,headRefName)
             HEAD_SHA=$(echo "$PR_JSON" | jq -r '.headRefOid')
             HEAD_REF=$(echo "$PR_JSON" | jq -r '.headRefName')
+            CHECKOUT_REF="refs/pull/$PR_NUMBER/head"
           else
             HEAD_SHA="$GITHUB_SHA"
             HEAD_REF="$GITHUB_REF_NAME"
+            CHECKOUT_REF="$GITHUB_SHA"
           fi
 
           LATEST_TAG=$(gh release list --repo "$GITHUB_REPOSITORY" \
@@ -51,15 +54,18 @@ jobs:
           if [ -n "$PR_NUMBER" ]; then
             TAG="v${BASE}-pr${PR_NUMBER}.${SHORT_SHA}"
           else
-            SAFE_REF=$(echo "$HEAD_REF" | sed 's/[^a-zA-Z0-9._-]/-/g')
+            SAFE_REF="${HEAD_REF//[^a-zA-Z0-9._-]/-}"
             TAG="v${BASE}-${SAFE_REF}.${SHORT_SHA}"
           fi
 
-          echo "pr_number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
-          echo "head_sha=$HEAD_SHA" >> "$GITHUB_OUTPUT"
-          echo "head_ref=$HEAD_REF" >> "$GITHUB_OUTPUT"
-          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
-          echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"
+          {
+            echo "pr_number=$PR_NUMBER"
+            echo "head_sha=$HEAD_SHA"
+            echo "head_ref=$HEAD_REF"
+            echo "checkout_ref=$CHECKOUT_REF"
+            echo "tag=$TAG"
+            echo "version=${TAG#v}"
+          } >> "$GITHUB_OUTPUT"
           echo "Release: $TAG ($HEAD_REF @ $SHORT_SHA)"
 
   prerelease:
@@ -71,7 +77,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ needs.resolve.outputs.head_sha }}
+          ref: ${{ needs.resolve.outputs.checkout_ref }}
           fetch-depth: 0
 
       - name: Create release tag
@@ -122,10 +128,10 @@ jobs:
         env:
           FIRMWARE_VERSION: ${{ needs.resolve.outputs.version }}
         run: |
-          for env in $(grep -oE '^\[env:([a-zA-Z0-9_-]+-release)\]' platformio.ini | sed 's/\[env:\(.*\)\]/\1/'); do
+          while IFS= read -r env; do
             echo "Building $env..."
             pio run -e "$env"
-          done
+          done < <(grep -oE '^\[env:([a-zA-Z0-9_-]+-release)\]' platformio.ini | sed 's/\[env:\(.*\)\]/\1/')
 
       # --- Flash tool + GitHub Release ---
 

.github/workflows/release.yml

@@ -58,7 +58,7 @@ jobs:
         run: |
           RELEASE_TAG="${{ github.event.inputs.release_tag }}"
           VERSION=${RELEASE_TAG#v}
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "Setting version to: $VERSION"
 
       - name: Save release notes
@@ -98,7 +98,7 @@ jobs:
         run: npm ci
         working-directory: frontend
 
-      - name: Build frontend (lint + typecheck + vite + embed)
+      - name: Build frontend (lint + codegen + path-sync + typecheck + vite + embed)
         run: npm run build
         working-directory: frontend
 
@@ -128,10 +128,10 @@ jobs:
         run: |
           # Build all *-release environments; post-build hook packages
           # firmware artifacts into each env's build dir for GoReleaser
-          for env in $(grep -oE '^\[env:([a-zA-Z0-9_-]+-release)\]' platformio.ini | sed 's/\[env:\(.*\)\]/\1/'); do
+          while IFS= read -r env; do
             echo "Building $env..."
             pio run -e "$env"
-          done
+          done < <(grep -oE '^\[env:([a-zA-Z0-9_-]+-release)\]' platformio.ini | sed 's/\[env:\(.*\)\]/\1/')
 
       # --- Flash tool + GitHub Release ---
 

.github/workflows/slash-command.yml

@@ -28,8 +28,7 @@ jobs:
             -f content='rocket' --silent
 
           PR_NUMBER="${{ github.event.issue.number }}"
-          HEAD_REF=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json headRefName --jq '.headRefName')
 
-          gh workflow run prerelease.yml --repo "$GITHUB_REPOSITORY" --ref "$HEAD_REF" \
+          gh workflow run prerelease.yml --repo "$GITHUB_REPOSITORY" --ref "${{ github.event.repository.default_branch }}" \
             -f pr_number="$PR_NUMBER" \
             -f comment_id="${{ github.event.comment.id }}"

.gitignore

@@ -1,9 +1,14 @@
 .pio
 .cache
+__pycache__/
+*.pyc
+compile_commands.json
 firmware/compile_commands.json
 firmware/src/web_assets.h
 frontend/node_modules
 frontend/dist
+frontend/mock/build-info.js
+frontend/src/types.generated.ts
 flash/openneato-flash
 release/
 dist/