Merge all 50 codex PRs (#4–#58) into v0.6 (MeshCore) + security/regression fixes

.gitattributes

@@ -1,2 +1,11 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Union-merge ONLY genuinely append-safe files: narrative markdown docs and the
+# flat declarations/#defines header. The 50 codex PRs each append a line/block to
+# these, so union auto-resolves them. Do NOT add structured code with nested {}
+# blocks (main_sim.c, serial_cli.cpp, store.c, ...) here — line-based union splits
+# their brace structure and silently corrupts the file. Resolve those by hand.
+docs/tdeck-firmware-roadmap.md           merge=union
+docs/tdeck-feature-inventory.md          merge=union
+docs/tdeck-hardware-dogfood-checklist.md merge=union
+docs/tdeck-local-app-manifest.md         merge=union
+README.md                                merge=union
+src/services/mesh.h                      merge=union

.github/workflows/firmware.yml

@@ -43,6 +43,17 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install platformio
 
+      - name: Run Python tooling selftests
+        run: |
+          python -m py_compile scripts/check_tdeck_budget.py scripts/fetch_tdeck_artifact.py scripts/serial_harness.py scripts/tdeck_smoke.py scripts/tdm_airtime_smoke.py
+          python scripts/tdm_airtime_smoke.py --selftest
+      - name: Validate local app samples
+        run: |
+          python -m py_compile scripts/validate_local_app_samples.py
+          python scripts/validate_local_app_samples.py
+      - name: Validate app catalog schema
+        run: python scripts/validate_app_catalog.py docs/examples/app-catalog-index.json
+
       - name: Build native simulator
         run: pio run -e native
 
@@ -68,8 +79,11 @@ jobs:
           pio run -e tdeck -t size | tee tdeck-size.txt
           cp tdeck-build.txt .pio/build/tdeck/tdeck-build.txt
           cp tdeck-size.txt .pio/build/tdeck/tdeck-size.txt
+          # RAM usage ("used N from M") is only printed by the build log, not by
+          # `-t size` (which emits the GNU size table) — and -t size is cached
+          # here since the firmware was already built above. Parse the build log.
           python scripts/check_tdeck_budget.py \
-            --size-report tdeck-size.txt \
+            --size-report tdeck-build.txt \
             --json-out .pio/build/tdeck/size-budget.json \
             --markdown-out .pio/build/tdeck/SIZE_BUDGET.md \
             --manifest-out .pio/build/tdeck/SIZE_BUDGET.txt
@@ -120,6 +134,73 @@ jobs:
             .pio/build/tdeck/tdeck-build.txt
             .pio/build/tdeck/tdeck-size.txt
 
+      - name: Build MeshCore-enabled TDM firmware
+        run: |
+          set -o pipefail
+          pio run -e tdeck-meshcore 2>&1 | tee tdeck-meshcore-build.txt
+
+      - name: Capture MeshCore-enabled size report and budget
+        run: |
+          pio run -e tdeck-meshcore -t size | tee tdeck-meshcore-size.txt
+          cp tdeck-meshcore-build.txt .pio/build/tdeck-meshcore/tdeck-build.txt
+          cp tdeck-meshcore-size.txt .pio/build/tdeck-meshcore/tdeck-size.txt
+          python scripts/check_tdeck_budget.py \
+            --firmware .pio/build/tdeck-meshcore/firmware.bin \
+            --size-report tdeck-meshcore-build.txt \
+            --json-out .pio/build/tdeck-meshcore/size-budget.json \
+            --markdown-out .pio/build/tdeck-meshcore/SIZE_BUDGET.md \
+            --manifest-out .pio/build/tdeck-meshcore/SIZE_BUDGET.txt
+          {
+            echo "## MeshCore-enabled T-Deck firmware budget"
+            echo
+            cat .pio/build/tdeck-meshcore/SIZE_BUDGET.md
+            echo
+            echo "## MeshCore-enabled T-Deck firmware size"
+            echo
+            echo "\`\`\`"
+            cat tdeck-meshcore-size.txt
+            echo "\`\`\`"
+            echo
+            echo "- firmware.bin: $(stat -c%s .pio/build/tdeck-meshcore/firmware.bin) bytes"
+            echo "- firmware.elf: $(stat -c%s .pio/build/tdeck-meshcore/firmware.elf) bytes"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Prepare MeshCore-enabled flash bundle
+        env:
+          ARTIFACT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
+        run: |
+          cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin .pio/build/tdeck-meshcore/boot_app0.bin
+          {
+            echo "repo=${GITHUB_REPOSITORY}"
+            echo "sha=${ARTIFACT_SHA}"
+            echo "github_sha=${GITHUB_SHA}"
+            echo "workflow=${GITHUB_WORKFLOW}"
+            echo "run_id=${GITHUB_RUN_ID}"
+            echo "env=tdeck-meshcore"
+            echo "meshcore_enabled=1"
+            echo "flash_offsets=0x0 bootloader.bin 0x8000 partitions.bin 0xe000 boot_app0.bin 0x10000 firmware.bin"
+            cat .pio/build/tdeck-meshcore/SIZE_BUDGET.txt
+          } > .pio/build/tdeck-meshcore/FLASH_MANIFEST.txt
+
+      - name: Upload MeshCore-enabled TDM artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: tdeck-meshcore-firmware-${{ github.event.pull_request.head.sha || github.sha }}
+          if-no-files-found: error
+          path: |
+            .pio/build/tdeck-meshcore/bootloader.bin
+            .pio/build/tdeck-meshcore/boot_app0.bin
+            .pio/build/tdeck-meshcore/firmware.bin
+            .pio/build/tdeck-meshcore/firmware.elf
+            .pio/build/tdeck-meshcore/firmware.map
+            .pio/build/tdeck-meshcore/partitions.bin
+            .pio/build/tdeck-meshcore/FLASH_MANIFEST.txt
+            .pio/build/tdeck-meshcore/SIZE_BUDGET.md
+            .pio/build/tdeck-meshcore/SIZE_BUDGET.txt
+            .pio/build/tdeck-meshcore/size-budget.json
+            .pio/build/tdeck-meshcore/tdeck-build.txt
+            .pio/build/tdeck-meshcore/tdeck-size.txt
+
       - name: Upload native screenshots
         uses: actions/upload-artifact@v7
         with:

.gitignore

@@ -7,5 +7,6 @@ __pycache__/
 lzdata/
 lzdata_shots/
 lzdata_simtest/
+lzdata_nodeschema/
 .claude/
 .serena/