Minor cleanup from refactor

Merge branch 'pioarduino' into pioarduino-power
Merge branch 'develop' into pioarduino
2026-10-22 03:02:08 +10:00 · 2026-05-08 17:30:00 -05:00 · 2026-05-05 18:06:16 -05:00 · 2026-05-05 09:10:28 -04:00 · 2026-05-05 06:52:07 -05:00 · 2026-05-04 18:10:59 -05:00
490 changed files with 15352 additions and 12309 deletions
@@ -49,17 +49,11 @@ Call the meshtastic MCP tool bundle and format a structured health report for on
   - Do the LoRa configs match? (region, channel_num, modem_preset should all agree; mismatch = no mesh)
   - Do the primary channel NAMES match? Mismatch = different PSK = no decode.

-7. **Recorder slice (cheap, always available).** The mcp-server runs an autouse log recorder that's been collecting from every connected device. Pull two short slices to surface anything weird that's already happened:
-   - `mcp__meshtastic__logs_window(start="-2m", level="WARN|ERROR|CRIT", max_lines=20)` — recent firmware errors. If empty, say "no recent errors"; don't manufacture concern.
-   - `mcp__meshtastic__telemetry_timeline(window="1h", field="free_heap", max_points=60)` — heap trend. If `slope_per_min < -50`, flag it and recommend `/leakhunt window=6h` for a deeper read; otherwise just note the current free heap.
-   - If `recorder_status` shows `running:false` or `files.telemetry.last_ts` is null, note "recorder has no telemetry yet — enable `set_debug_log_api(True)` to populate" and skip this step gracefully.
-
-8. **Suggest next actions only for specific, recognisable failure modes**:
+7. **Suggest next actions only for specific, recognisable failure modes**:
   - Stale PKI pubkey one-way → "run `/test tests/mesh/test_direct_with_ack.py` — the retry + nodeinfo-ping heals this in the test path."
   - Region mismatch → "re-bake one side via `./mcp-server/run-tests.sh --force-bake`."
   - Device unreachable, reachable via DFU → `touch_1200bps(port=...)` + `pio_flash`. If not even DFU responds AND the device is on a PPPS hub, escalate to `uhubctl_cycle(role=..., confirm=True)`.
   - CP2102-wedged-driver on macOS → see the note in `run-tests.sh`.
-   - Heap slope strongly negative → "run `/leakhunt window=6h` for a full timeline + classification."

 ## What NOT to do

@@ -1,103 +0,0 @@
---
-description: Hunt for memory leaks (and other slow degradations) by reading the persistent recorder's heap timeline + log slice over a window
-argument-hint: [window=1h] [field=free_heap] [variant=local]
---
-
-<!-- markdownlint-disable MD029 -->
-
-# `/leakhunt` — read the recorder, classify a memory leak
-
-Use the always-on recorder (`mcp-server/.mtlog/`) to read a heap timeline plus the matching log slice and produce a one-page verdict: **steady / slow leak / fragmentation / OOM-imminent**. No firmware changes, no special build flags — the LocalStats telemetry packet that the firmware already broadcasts every ~60 s carries `heap_free_bytes` and `heap_total_bytes`.
-
-## Two signal paths — pick the right one
-
-| Path                  | Build flag       | Cadence        | Per-thread attribution | Cost                      |
-| --------------------- | ---------------- | -------------- | ---------------------- | ------------------------- |
-| LocalStats packet     | (default)        | ~60 s          | No                     | Free — always on          |
-| `[heap N]` log prefix | `-DDEBUG_HEAP=1` | every log line | Yes (Thread X leaked)  | Bigger flash + log volume |
-
-Both feed the same `telemetry_timeline(field="free_heap")` query — when DEBUG_HEAP is on, the recorder synthesizes telemetry rows from log prefixes (tagged `source: debug_heap`), so a single timeline call gets whichever signal is available. **For a slow leak diagnosis, the default path is plenty** (60 s cadence over 6 h = 360 points; linear regression over that nails sub-100-byte/min slopes). **DEBUG_HEAP is for attribution** — when the slope is real and you need to know which thread is leaking.
-
-## What to do
-
-1. **Parse `$ARGUMENTS`**: optional `window` (default `1h`, accepts `30m`/`6h`/`-3d`/etc.), optional `field` (default `free_heap`; alternates: `total_heap`, `battery_level`, anything in the LocalStats variant), optional `variant` (default `local`; alternates: `device`, `environment`, `power`, `airQuality`, `health`).
-
-2. **Verify the recorder is alive** — call `mcp__meshtastic__recorder_status`. Check:
-   - `running == True`
-   - `files.telemetry.lines > 0` (at least one telemetry packet recorded — if zero, the device hasn't broadcast LocalStats yet OR `set_debug_log_api` has never been on; tell the operator to run `mcp__meshtastic__set_debug_log_api(enabled=True)` and wait one device-update interval)
-   - `files.telemetry.last_ts` within the last 5 minutes (if older, the device is silent — log that, not "leak detected")
-
-3. **Detect whether DEBUG_HEAP is active** — `mcp__meshtastic__logs_window(start="-2m", grep=r"\\[heap \\d+\\]", max_lines=3)`. If any line matches, the firmware has the prefix → DEBUG_HEAP is on, expect higher-cadence data and `heap_event` rows. If zero matches over the last 2 minutes, you're on the LocalStats-only path.
-
-4. **Pull the timeline** — `mcp__meshtastic__telemetry_timeline(window=$window, variant=$variant, field=$field, max_points=200)`. Read:
-   - `samples` — how many raw points contributed
-   - `min`, `max` — total swing
-   - `slope_per_min` — units per minute (linear regression over the whole window)
-
-5. **Pull the log context for the same window** — `mcp__meshtastic__logs_window(start="-${window}", grep="Heap status|leaked heap|freed heap|out of memory|Alloc an err|panic|abort", max_lines=200)`. These are the strings the firmware emits when something memory-related happens (`DEBUG_HEAP` builds emit `"Heap status:"` and `"leaked heap"` lines; production builds emit `"Alloc an err"` on failure and `"out of memory"` on OOM).
-
-6. **Pull marker events** so we know if the operator labeled phases — `mcp__meshtastic__events_window(start="-${window}", kind="mark|connection_lost|connection_established")`. If a `connection_lost` overlaps a sharp drop, that's not a leak; that's a reboot.
-
-6a. **(DEBUG_HEAP only) Per-thread attribution** — `mcp__meshtastic__logs_window(start="-${window}", grep="leaked heap", max_lines=200)`. Each row has a structured `heap_event` field with `{kind, thread, before, after, delta}`. Aggregate by thread: sum the `delta` over the window per thread name. The thread with the largest cumulative negative delta is your suspect. Note the count too — a thread with 50× small leaks is different from 1× big leak.
-
-7. **Classify** based on what the data says, NOT on what you wish it said. Use these rules in order:
-   - **Insufficient data** (< 5 samples): say so. Suggest a longer window or longer wait. Stop.
-   - **Reboot mid-window**: if any `connection_lost` event is present AND `free_heap` jumped UP at that timestamp, the device rebooted. Note it; pre-reboot trend may be a leak but you only have part of the curve.
-   - **OOM-imminent**: any `Alloc an err=` or `out of memory` line in the log slice. This trumps everything; flag urgently.
-   - **Slow leak**: `slope_per_min < -50` AND `max - min > 1000` AND no reboot. The heap is monotonically (or near-monotonically) declining. Estimate time-to-zero: `min / -slope_per_min` minutes. Surface it.
-   - **Fragmentation suspect**: `slope_per_min` close to zero (|x| < 50) BUT min trends down across the window AND the log slice shows `Alloc an err` warnings WITHOUT total OOM. Means free total is OK but largest contiguous block is shrinking. Recommend a `DEBUG_HEAP` build to confirm.
-   - **Steady**: |slope_per_min| < 50, no error lines. Heap is fine.
-   - **Recovery curve**: slope is POSITIVE — heap recovered. Either a workload completed or GC fired. Note it; not a leak.
-
-8. **Report**:
-
-   ```text
-   /leakhunt window=6h field=free_heap variant=local
-   ────────────────────────────────────────────────────
-   recorder        : running, telem last_ts 8s ago
-   build           : DEBUG_HEAP=ON (per-line prefix detected)
-   samples         : 14,200 over 6h (cadence ~1.5s, log-line synth)
-   free_heap       : min 92,344 / max 124,008 / range 31,664
-   slope           : -82 bytes/min (negative — heap declining)
-   reboots         : none in window
-   OOM events      : none
-   error lines     : 3× "Alloc an err=ESP_ERR_NO_MEM" at +4h12m, +5h08m, +5h44m
-   thread leaks    : (DEBUG_HEAP) MeshPacket -3,124 B over 18 events
-                                  Router       -1,408 B over 4 events
-                                  others       -240 B
-   verdict         : SLOW LEAK — primary suspect MeshPacket thread
-   est. time-to-OOM: ~1,127 min (~18.8 h) at current slope
-   evidence        : (3 log line citations with uptimes)
-   ```
-
-   Then: **what to do next.**
-   - SLOW LEAK, **DEBUG_HEAP off** → recommend rebuilding with the flag and re-running this skill. Concrete one-liner the operator can copy:
-     ```text
-     mcp__meshtastic__build(env="<env>", build_flags={"DEBUG_HEAP": 1})
-     mcp__meshtastic__pio_flash(env="<env>", port="<port>", confirm=True)
-     ```
-     After flash, set debug_log_api back on and wait one window; re-run `/leakhunt`.
-   - SLOW LEAK, **DEBUG_HEAP on** → cite the top-leaking thread name from step 6a. Point at the corresponding source file (`grep -rn "ThreadName(\"<name>\")" src/`); the operator decides what to fix.
-   - FRAGMENTATION SUSPECT → propose pre-allocating any per-packet buffers; or rebuilding with `CONFIG_HEAP_TASK_TRACKING=y` on ESP32 to see who's holding the largest blocks.
-   - OOM-IMMINENT → flag for immediate attention; don't wait for the next telemetry interval.
-   - STEADY → say so; stop. Don't invent problems.
-
-## What NOT to do
-
- Don't assume a leak from a single dip. LocalStats fires every ~60 s and the firmware naturally allocates+frees on each broadcast cycle; one packet sees the trough. Look at the slope, not the deltas.
- Don't recommend code changes. This skill diagnoses; the operator decides what to fix.
- Don't enable `set_debug_log_api` automatically — if it's off, telemetry isn't reaching pubsub anyway, and the recorder will be empty. Tell the operator to flip it on and wait, then re-run.
- Don't run heavy workloads to "trigger the leak." The recorder is passive; we read what's there.
-
-## Companion: `mark_event` for stress runs
-
-If the operator wants to test under stimulus (e.g. blast 50 broadcasts and see what the heap does), they can frame the experiment with markers:
-
-```text
-mark_event("burst-start")
-… run the workload …
-mark_event("burst-end")
-/leakhunt window=15m
-```
-
-The markers land in both `events.jsonl` and `logs.jsonl`, so the report can show "free_heap dipped 8 KB during the burst window, recovered to baseline within 2 LocalStats cycles" → not a leak.
@@ -3,8 +3,6 @@ description: Re-run a specific test N times in isolation to triage flakes, diff
 argument-hint: <test-node-id> [count=5]
 ---

-<!-- markdownlint-disable MD029 -->
-
 # `/repro` — flakiness triage for one test

 Re-run a single pytest node ID N times in isolation, track pass rate, and surface what's _different_ in the firmware logs between the passing attempts and the failing ones. Turns "it's flaky, I guess" into "it fails when X, passes when Y."
@@ -42,8 +40,6 @@ Re-run a single pytest node ID N times in isolation, track pass rate, and surfac

   Surface the top 3 differences as a "passes when / fails when" table. Don't dump full logs — pull specific lines with uptime timestamps.

-5a. **Archive recorder slices per attempt** (no extra device interaction; the recorder runs autouse). Right after each attempt finishes, capture its `(start_ts, end_ts)` and call `mcp__meshtastic__recorder_export(start=<start>, end=<end>, dest_dir="mcp-server/tests/repro_artifacts/<safe-test-id>/attempt_<n>/")`. This drops a `logs.jsonl`, `telemetry.jsonl`, `packets.jsonl`, and `events.jsonl` snapshot scoped to the attempt window. Use these for cross-attempt diffs in step 5: `jq '.line' logs.jsonl` is faster than re-running the test, and the telemetry slice lets you compare heap behavior across attempts.
-
 6. **Classify the flake** into one of:
   - **LoRa airtime collision** → pass rate improves with fewer concurrent transmitters; propose a `time.sleep` gap or retry bump in the test body.
   - **PKI key staleness** → fails on first attempt, passes after self-heal; existing retry loop in `test_direct_with_ack.py` handles this.
@@ -15,14 +15,10 @@
    "vscode": {
      "extensions": [
        "ms-vscode.cpptools",
-        "Jason2866.esp-decoder",
-        "pioarduino.pioarduino-ide",
+        "platformio.platformio-ide",
        "Trunk.io"
      ],
-      "unwantedRecommendations": [
-        "ms-azuretools.vscode-docker",
-        "platformio.platformio-ide"
-      ],
+      "unwantedRecommendations": ["ms-azuretools.vscode-docker"],
      "settings": {
        "extensions.ignoreRecommendations": true
      }
@@ -5,7 +5,7 @@ runs:
  using: composite
  steps:
    - name: Checkout code
-      uses: actions/checkout@v7
+      uses: actions/checkout@v6
      with:
        submodules: recursive

@@ -196,8 +196,6 @@ firmware/
 - Prefer `LOG_DEBUG`, `LOG_INFO`, `LOG_WARN`, `LOG_ERROR` for logging
 - Use `assert()` for invariants that should never fail
 - C++17 features are available (`std::optional`, structured bindings, `if constexpr`, etc.)
- **Keep code comments minimal — one or two lines, max.** Comment only when the _why_ isn't obvious from the code; never restate what the next line does. No multi-paragraph block comments explaining straightforward changes. The diff and commit message carry the rationale; the code carries the behavior.
- **Use `Throttle` for time-based rate limiting, not raw `millis()` math.** `src/mesh/Throttle.h` provides `Throttle::isWithinTimespanMs(lastMs, intervalMs)` (returns true while inside the cooldown) and `Throttle::execute(&lastMs, intervalMs, func)` (function-pointer form that updates the timestamp on fire). Use these for any "did N ms pass since X" check — raw `millis() > lastMs + N` is rollover-unsafe (breaks after ~49.7 days) and inconsistent with the rest of the codebase. The helpers compute `now - lastMs` with unsigned subtraction, which wraps correctly.

 ### Naming Conventions

@@ -23,7 +23,7 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive
          path: meshtasticd
@@ -23,7 +23,7 @@ jobs:
    outputs:
      artifact-id: ${{ steps.upload-firmware.outputs.artifact-id }}
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -16,7 +16,7 @@ jobs:
    runs-on: macos-${{ inputs.macos_ver }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -4,9 +4,14 @@ on:
  workflow_dispatch:
    inputs:
      # trunk-ignore(checkov/CKV_GHA_7)
+      target:
+        type: string
+        required: false
+        description: Choose the target board, e.g. nrf52_promicro_diy_tcxo. If blank, will find available targets.
      arch:
        type: choice
        options:
+          - all
          - esp32
          - esp32s3
          - esp32c3
@@ -15,35 +20,21 @@ on:
          - rp2040
          - rp2350
          - stm32
-      target:
-        type: string
-        required: false
-        description: Choose the target board, e.g. nrf52_promicro_diy_tcxo. If blank, will find available targets.
-      # find-target:
-      #   type: boolean
-      #   default: true
-      #   description: 'Find the available targets'
+        description: Choose an arch to limit the search, or 'all' to search all architectures.
+        default: all

 permissions: read-all

 jobs:
  find-targets:
-    if: ${{ inputs.target == '' }}
    strategy:
      fail-fast: false
      matrix:
        arch:
-          - esp32
-          - esp32s3
-          - esp32c3
-          - esp32c6
-          - nrf52840
-          - rp2040
-          - rp2350
-          - stm32
+          - all
    runs-on: ubuntu-24.04
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - uses: actions/setup-python@v6
        with:
          python-version: 3.x
@@ -51,20 +42,43 @@ jobs:
      - run: pip install -U platformio
      - name: Generate matrix
        id: jsonStep
+        env:
+          BUILDTARGET: ${{ inputs.target }}
+          MATRIXARCH: ${{ inputs.arch }}
        run: |
          TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} --level extra)
-          echo "Name: $GITHUB_REF_NAME" >> $GITHUB_STEP_SUMMARY
-          echo "Base: $GITHUB_BASE_REF" >> $GITHUB_STEP_SUMMARY
-          echo "Arch: ${{matrix.arch}}" >> $GITHUB_STEP_SUMMARY
-          echo "Ref: $GITHUB_REF" >> $GITHUB_STEP_SUMMARY
-          echo "Targets:" >> $GITHUB_STEP_SUMMARY
-          echo $TARGETS | jq -r 'sort_by(.board) |.[] | "- " + .board' >> $GITHUB_STEP_SUMMARY
+          if [ "$BUILDTARGET" = "" ]; then
+            echo "Name: $GITHUB_REF_NAME" >> $GITHUB_STEP_SUMMARY
+            echo "Base: $GITHUB_BASE_REF" >> $GITHUB_STEP_SUMMARY
+            echo "Arch: $MATRIXARCH" >> $GITHUB_STEP_SUMMARY
+            echo "Ref: $GITHUB_REF" >> $GITHUB_STEP_SUMMARY
+            echo "## 🎯 The following target boards are available to build:" >> $GITHUB_STEP_SUMMARY
+            echo "| Platform | Board |" >> $GITHUB_STEP_SUMMARY
+            echo "| -------- | ----- |" >> $GITHUB_STEP_SUMMARY
+            echo $TARGETS | jq -r 'sort_by(.board) | sort_by(.platform) |.[] | "| " + .platform + " | " + .board + " |" ' >> $GITHUB_STEP_SUMMARY
+          else
+            echo "We build this one:" >> $GITHUB_STEP_SUMMARY
+            ARCH=$(echo "$TARGETS" | jq --arg BUILDTARGET "$BUILDTARGET" -r '.[] | select(.board==$BUILDTARGET) | .platform')
+            echo "| Platform | Board |" >> $GITHUB_STEP_SUMMARY
+            echo "| -------- | ----- |" >> $GITHUB_STEP_SUMMARY
+            echo "| $ARCH | "$BUILDTARGET" |" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            if [[ "$ARCH" == "" ]]; then
+              echo "## ❌ Error: Target "$BUILDTARGET" not found!" >> $GITHUB_STEP_SUMMARY
+            else
+              echo "## ✅ Target "$BUILDTARGET" found, proceeding to build." >> $GITHUB_STEP_SUMMARY
+            fi
+            echo "You may need to refresh this page to make the built firmware appear below." >> $GITHUB_STEP_SUMMARY
+            echo "arch=$ARCH" >> $GITHUB_OUTPUT
+          fi
+    outputs:
+      arch: ${{ steps.jsonStep.outputs.arch }}

  version:
    if: ${{ inputs.target != '' }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - name: Get release version string
        run: |
          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
@@ -78,12 +92,12 @@ jobs:

  build:
    if: ${{ inputs.target != '' && inputs.arch != 'native' }}
-    needs: [version]
+    needs: [version, find-targets]
    uses: ./.github/workflows/build_firmware.yml
    with:
      version: ${{ needs.version.outputs.long }}
      pio_env: ${{ inputs.target }}
-      platform: ${{ inputs.arch }}
+      platform: ${{ needs.find-targets.outputs.arch }}

  gather-artifacts:
    permissions:
@@ -93,7 +107,7 @@ jobs:
    needs: [version, build]
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -47,7 +47,7 @@ jobs:
    runs-on: ${{ inputs.runs-on }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -103,7 +103,7 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -1,40 +0,0 @@
-name: DS18B20 Heltec V3
-
-on:
-  push:
-    branches:
-      - ds18b20-heltec-v3-v2.7.26
-  pull_request:
-    branches:
-      - ds18b20-heltec-v3-v2.7.26
-  workflow_dispatch:
-
-permissions: read-all
-
-jobs:
-  version:
-    runs-on: ubuntu-latest
-    outputs:
-      long: ${{ steps.version.outputs.long }}
-    steps:
-      - uses: actions/checkout@v7
-      - id: version
-        run: echo "long=$(./bin/buildinfo.py long)" >> "$GITHUB_OUTPUT"
-
-  firmware:
-    needs: version
-    uses: ./.github/workflows/build_firmware.yml
-    with:
-      version: ${{ needs.version.outputs.long }}
-      platform: esp32s3
-      pio_env: heltec-v3-ds18b20
-
-  ds18b20-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          submodules: recursive
-      - uses: ./.github/actions/setup-native
-      - name: Run DS18B20 unit tests
-        run: PLATFORMIO_TEST_DIR=test/test_ds18b20 platformio test -e native-ds18b20
@@ -1,190 +0,0 @@
-name: Post Web Flasher Link Comment
-
-on:
-  workflow_run:
-    workflows: [CI]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-  actions: read
-
-jobs:
-  post-flasher-link:
-    if: >
-      github.event.workflow_run.event == 'pull_request' &&
-      github.event.workflow_run.conclusion != 'cancelled' &&
-      github.repository == 'meshtastic/firmware'
-    continue-on-error: true
-    runs-on: ubuntu-latest
-    steps:
-      # Per-board manifests carry the firmware's own metadata (activelySupported,
-      # displayName, ...) generated from each target's custom_meshtastic_* config.
-      - name: Download board manifests
-        uses: actions/download-artifact@v8
-        continue-on-error: true
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-          pattern: manifest-*
-          path: ./manifests
-          merge-multiple: true
-
-      - name: Post or update web flasher link comment
-        uses: actions/github-script@v9
-        with:
-          script: |
-            const marker = '<!-- web-flasher-link -->';
-            const run = context.payload.workflow_run;
-            const { owner, repo } = context.repo;
-
-            // Resolve the PR number (run.pull_requests is empty for fork PRs)
-            let prNumber = run.pull_requests?.[0]?.number;
-            if (!prNumber) {
-              const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
-                owner, repo, commit_sha: run.head_sha,
-              });
-              prNumber = (prs.find((pr) => pr.head.sha === run.head_sha) ?? prs[0])?.number;
-            }
-            if (!prNumber) {
-              core.info('No pull request associated with this run; skipping.');
-              return;
-            }
-
-            const { data: pr } = await github.rest.pulls.get({ owner, repo, pull_number: prNumber });
-
-            // Only comment on PRs authored by members of the organization.
-            // author_association MEMBER is computed by GitHub and reflects org
-            // membership (including concealed members); OWNER covers a repo owner.
-            const allowedAssociations = ['OWNER', 'MEMBER'];
-            if (!allowedAssociations.includes(pr.author_association)) {
-              core.info(`Author association ${pr.author_association} is not an org member; skipping.`);
-              return;
-            }
-            if (pr.state !== 'open') {
-              core.info('Pull request is not open; skipping.');
-              return;
-            }
-            if (pr.head.sha !== run.head_sha) {
-              core.info('Run is for an outdated commit; skipping.');
-              return;
-            }
-
-            // Require at least one per-arch firmware artifact from gather-artifacts
-            const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, {
-              owner, repo, run_id: run.id, per_page: 100,
-            });
-            const archRe = /^firmware-(esp32|esp32s3|esp32c3|esp32c6|nrf52840|rp2040|rp2350|stm32)-(\d+\.\d+\.\d+\.[0-9a-f]+)$/;
-            const archArtifacts = artifacts.filter((a) => archRe.test(a.name) && !a.expired);
-            if (archArtifacts.length === 0) {
-              core.info('No per-arch firmware artifacts found; skipping.');
-              return;
-            }
-
-            const version = archRe.exec(archArtifacts[0].name)[2];
-            const expiresAt = archArtifacts[0].expires_at
-              ? new Date(archArtifacts[0].expires_at).toISOString().slice(0, 10)
-              : null;
-
-            // Read each built board's manifest (.mt.json). activelySupported,
-            // displayName and architecture come straight from the board's
-            // custom_meshtastic_* platformio config, so the list is in sync with
-            // the firmware itself — no external device database needed.
-            const fs = require('fs');
-            let boards = [];
-            try {
-              boards = fs.readdirSync('./manifests')
-                .filter((f) => f.endsWith('.mt.json'))
-                .map((f) => {
-                  try { return JSON.parse(fs.readFileSync(`./manifests/${f}`, 'utf8')); }
-                  catch { return null; }
-                })
-                .filter((m) => m && m.activelySupported === true && m.platformioTarget)
-                .map((m) => ({
-                  board: m.platformioTarget,
-                  platform: m.architecture || '',
-                  // displayName is maintainer-authored text; escape table-breaking pipes
-                  displayName: String(m.displayName || m.platformioTarget).replace(/\|/g, '\\|'),
-                  image: Array.isArray(m.images) && m.images[0] ? String(m.images[0]) : '',
-                }))
-                .sort((a, b) => a.board.localeCompare(b.board));
-            } catch (e) {
-              core.warning(`Could not read board manifests: ${e.message}`);
-            }
-
-            const flasherUrl = `https://flasher.meshtastic.org/?pr=${prNumber}`;
-            // Device illustrations are served by the flasher from the same image
-            // names the manifest declares (custom_meshtastic_images). The flasher
-            // serves its SPA shell (HTML, 200) for unknown paths, so confirm each
-            // image really resolves to an image before linking it.
-            const imageBase = 'https://flasher.meshtastic.org/img/devices/';
-            await Promise.all(boards.map(async (b) => {
-              if (!b.image) return;
-              try {
-                const res = await fetch(`${imageBase}${encodeURIComponent(b.image)}`);
-                const type = res.headers.get('content-type') || '';
-                if (!res.ok || !type.startsWith('image/')) b.image = '';
-              } catch { b.image = ''; }
-            }));
-
-            const boardLines = boards
-              .map((b) => {
-                const img = b.image ? `<img src="${imageBase}${encodeURIComponent(b.image)}" alt="" height="34">` : '';
-                return `| ${img} | ${b.displayName} | [\`${b.board}\`](${flasherUrl}&device=${encodeURIComponent(b.board)}) | ${b.platform} |`;
-              })
-              .join('\n');
-
-            // Shields.io badges. Only non-user-controlled, charset-constrained values
-            // (version, commit sha, counts, dates) go into badge URLs — never board
-            // names or the PR title — so the rendered comment cannot be spoofed.
-            const shieldText = (s) =>
-              encodeURIComponent(String(s).replace(/-/g, '--').replace(/_/g, '__').replace(/ /g, '_'));
-            const shield = (label, message, color) =>
-              `https://img.shields.io/badge/${shieldText(label)}-${shieldText(message)}-${color}`;
-            const buttonUrl =
-              `https://img.shields.io/badge/${shieldText('Flash this PR in the Web Flasher')}-2C2D3C?style=for-the-badge`;
-            const badges = [
-              `![firmware](${shield('firmware', version, '67EA94')})`,
-              `![commit](${shield('commit', run.head_sha.slice(0, 7), '2C2D3C')})`,
-              `![boards](${shield('boards', boards.length, '5C6BC0')})`,
-            ];
-            if (expiresAt) badges.push(`![expires](${shield('expires', expiresAt, '9A4E00')})`);
-
-            // Only render the board table when there are supported boards to list
-            const boardTable = boards.length > 0 ? [
-              `<details><summary>Supported boards built by this PR (${boards.length})</summary>`,
-              '',
-              '| | Device | Board | Platform |',
-              '| --- | --- | --- | --- |',
-              boardLines,
-              '',
-              '</details>',
-              '',
-            ] : [];
-
-            const body = [
-              marker,
-              '## ⚡ Try this PR in the Web Flasher',
-              '',
-              `[![Flash this PR in the Web Flasher](${buttonUrl})](${flasherUrl})`,
-              '',
-              badges.join(' '),
-              '',
-              '> [!WARNING]',
-              '> This is an automated, unreviewed CI test build. Back up your device configuration',
-              '> before flashing, and only flash devices you are able to recover.',
-              '',
-              ...boardTable,
-              `*Build artifacts expire${expiresAt ? ` on ${expiresAt}` : ' after 30 days'}. Updated for \`${run.head_sha.slice(0, 7)}\`.*`,
-            ].join('\n');
-
-            // Sticky comment: update in place when the marker is found
-            const comments = await github.paginate(github.rest.issues.listComments, {
-              owner, repo, issue_number: prNumber, per_page: 100,
-            });
-            const existing = comments.find((c) => c.body?.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({ owner, repo, comment_id: existing.id, body });
-            } else {
-              await github.rest.issues.createComment({ owner, repo, issue_number: prNumber, body });
-            }
@@ -1,60 +0,0 @@
-name: Post Web Flasher Build Placeholder
-
-# Drops an immediate "build in progress" comment when a PR opens, so the web
-# flasher entry shows up right away. The real CI-driven workflow
-# (flasher-link-comment.yml) later replaces it in place via the shared marker.
-#
-# SECURITY: this uses pull_request_target (write token, runs for fork PRs) but is
-# safe because it never checks out or runs PR code and posts a fully static body
-# — no PR title, branch name, or other untrusted input is used anywhere.
-
-on:
-  pull_request_target:
-    types: [opened, reopened]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  post-placeholder:
-    if: github.repository == 'meshtastic/firmware'
-    continue-on-error: true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Post web flasher build-in-progress placeholder
-        uses: actions/github-script@v9
-        with:
-          script: |
-            const marker = '<!-- web-flasher-link -->';
-            const { owner, repo } = context.repo;
-            const pr = context.payload.pull_request;
-
-            // Only org members get the flasher comment (matches the real workflow)
-            const allowedAssociations = ['OWNER', 'MEMBER'];
-            if (!allowedAssociations.includes(pr.author_association)) {
-              core.info(`Author association ${pr.author_association} is not an org member; skipping.`);
-              return;
-            }
-
-            // Only seed a placeholder when no flasher comment exists yet — never
-            // overwrite a real (or existing placeholder) comment.
-            const comments = await github.paginate(github.rest.issues.listComments, {
-              owner, repo, issue_number: pr.number, per_page: 100,
-            });
-            if (comments.some((c) => c.body?.includes(marker))) {
-              core.info('Flasher comment already exists; nothing to do.');
-              return;
-            }
-
-            const body = [
-              marker,
-              '## ⚡ Try this PR in the Web Flasher',
-              '',
-              '> [!NOTE]',
-              '> Building this pull request… the flash button, badges and supported-board',
-              '> list will appear here automatically once CI finishes.',
-            ].join('\n');
-
-            await github.rest.issues.createComment({
-              owner, repo, issue_number: pr.number, body,
-            });
@@ -18,7 +18,7 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -40,7 +40,7 @@ jobs:
          - check
    runs-on: ubuntu-24.04
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - uses: actions/setup-python@v6
        with:
          python-version: 3.x
@@ -64,7 +64,7 @@ jobs:
  version:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - name: Get release version string
        run: |
          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
@@ -86,7 +86,7 @@ jobs:
    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
    if: ${{ github.event_name != 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive
      - name: Check ${{ matrix.check.board }}
@@ -189,7 +189,7 @@ jobs:
    needs: [version, build]
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - uses: actions/download-artifact@v8
        with:
@@ -245,6 +245,48 @@ jobs:
          path: ./*.elf
          retention-days: 30

+  shame:
+    if: github.repository == 'meshtastic/firmware'
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - uses: actions/checkout@v6
+        if: github.event_name == 'pull_request'
+        with:
+          filter: blob:none # means we download all the git history but none of the commit (except ones with checkout like the head)
+          fetch-depth: 0
+      - name: Download the current manifests
+        uses: actions/download-artifact@v8
+        with:
+          path: ./manifests-new/
+          pattern: manifest-*
+          merge-multiple: true
+      - name: Upload combined manifests for later commit and global stats crunching.
+        uses: actions/upload-artifact@v7
+        id: upload-manifest
+        with:
+          name: manifests-${{ github.sha }}
+          overwrite: true
+          path: manifests-new/*.mt.json
+      - name: Find the merge base
+        if: github.event_name == 'pull_request'
+        run: echo "MERGE_BASE=$(git merge-base "origin/$base" "$head")" >> $GITHUB_ENV
+        env:
+          base: ${{ github.base_ref }}
+          head: ${{ github.sha }}
+      # Currently broken (for-loop through EVERY artifact -- rate limiting)
+      # - name: Download the old manifests
+      #   if: github.event_name == 'pull_request'
+      #   run: gh run download -R "$repo" --name "manifests-$merge_base" --dir manifest-old/
+      #   env:
+      #     GH_TOKEN: ${{ github.token }}
+      #     merge_base: ${{ env.MERGE_BASE }}
+      #     repo: ${{ github.repository }}
+      # - name: Do scan and post comment
+      #   if: github.event_name == 'pull_request'
+      #   run: python3 bin/shame.py ${{ github.event.pull_request.number }} manifests-old/ manifests-new/
+
  release-artifacts:
    permissions: # Needed for 'gh release upload'.
      contents: write
@@ -261,7 +303,7 @@ jobs:
      # - MacOS
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -291,7 +333,6 @@ jobs:
          prerelease: true
          name: Meshtastic Firmware ${{ needs.version.outputs.long }} Alpha
          tag_name: v${{ needs.version.outputs.long }}
-          target_commitish: ${{ github.sha }}
          body: ${{ steps.release_notes.outputs.notes }}

      - name: Download source deb
@@ -362,7 +403,7 @@ jobs:
    needs: [release-artifacts, version]
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Setup Python
        uses: actions/setup-python@v6
@@ -417,7 +458,7 @@ jobs:
        esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,rp2350,stm32
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -14,16 +14,16 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1.3.1
+        uses: trunk-io/trunk-action@v1
        with:
          trunk-token: ${{ secrets.TRUNK_TOKEN }}

  trunk_upgrade:
    if: github.repository == 'meshtastic/firmware'
-    # See: https://github.com/trunk-io/trunk-action/blob/main/readme.md#automatic-upgrades
+    # See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
    name: Trunk Upgrade (PR)
    runs-on: ubuntu-24.04
    permissions:
@@ -31,9 +31,9 @@ jobs:
      pull-requests: write # For trunk to create PRs
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Trunk Upgrade
-        uses: trunk-io/trunk-action/upgrade@v1.3.1
+        uses: trunk-io/trunk-action/upgrade@v1
        with:
          base: master
@@ -33,7 +33,7 @@ jobs:
    needs: build-debian-src
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive
          path: meshtasticd
@@ -23,7 +23,7 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -34,7 +34,7 @@ jobs:
    needs: build-debian-src
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive
          path: meshtasticd
@@ -40,7 +40,7 @@ jobs:
      checks: write
      pull-requests: write
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -91,7 +91,7 @@ jobs:
        shell: bash
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          # Always use master branch for version bumps
          ref: master
@@ -21,7 +21,7 @@ jobs:
    steps:
      # step 1
      - name: clone application source code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      # step 2
      - name: full scan
@@ -13,7 +13,7 @@ jobs:
    steps:
      # step 1
      - name: clone application source code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -17,7 +17,7 @@ jobs:

    steps:
      - name: Stale PR+Issues
-        uses: actions/stale@v10.3.0
+        uses: actions/stale@v10.2.0
        with:
          days-before-stale: 45
          stale-issue-message: This issue has not had any comment or update in the last month. If it is still relevant, please post update comments. If no comments are made, this issue will be closed automagically in 7 days.
@@ -14,7 +14,7 @@ jobs:
    name: Native Simulator Tests
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -68,7 +68,7 @@ jobs:
    name: Native PlatformIO Tests
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -86,7 +86,13 @@ jobs:
        run: sed -i 's/-DBUILD_EPOCH=$UNIX_TIME/#-DBUILD_EPOCH=$UNIX_TIME/' platformio.ini

      - name: PlatformIO Tests
-        run: platformio test -e coverage -v --junit-output-path testreport.xml
+        run: |
+          set -o pipefail
+          # Filter out SKIPPED summary rows for hardware variants that can't run on the
+          # native host. They flood the log and make it harder to spot real failures.
+          # The JUnit XML is written directly to testreport.xml before the pipe, so
+          # the test artifact is unaffected.
+          platformio test -e coverage -v --junit-output-path testreport.xml 2>&1 | grep -v "[[:space:]]SKIPPED$"

      - name: Save test results
        if: always() # run this step even if previous step failed
@@ -123,7 +129,7 @@ jobs:
      - platformio-tests
    if: always()
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6

      - name: Get release version string
        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
@@ -20,7 +20,7 @@ jobs:
    runs-on: test-runner
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      # - uses: actions/setup-python@v6
      #   with:
@@ -1,5 +1,5 @@
 name: Annotate PR with trunk issues
-# See: https://github.com/trunk-io/trunk-action/blob/main/readme.md#getting-inline-annotations-for-fork-prs
+# See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#getting-inline-annotations-for-fork-prs

 on:
  workflow_run:
@@ -18,9 +18,9 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1.3.1
+        uses: trunk-io/trunk-action@v1
        with:
          post-annotations: true
@@ -16,9 +16,9 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1.3.1
+        uses: trunk-io/trunk-action@v1
        with:
          save-annotations: true
@@ -11,23 +11,18 @@ jobs:
      pull-requests: write
    steps:
      - name: Checkout code
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: true

      - name: Update submodule
-        if: ${{ github.ref_name == 'master' || github.ref_name == 'develop' }}
-        working-directory: protobufs
-        env:
-          # Use the branch that triggered the workflow as the protobuf branch.
-          GIT_BRANCH: ${{ github.ref_name }}
+        if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' }}
        run: |
-          git fetch --prune origin $GIT_BRANCH
-          git checkout origin/$GIT_BRANCH
+          git submodule update --remote protobufs

      - name: Download nanopb
        run: |
-          wget https://github.com/nanopb/nanopb/releases/download/nanopb-0.4.9.1/nanopb-0.4.9.1-linux-x86.tar.gz
+          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.9.1-linux-x86.tar.gz
          tar xvzf nanopb-0.4.9.1-linux-x86.tar.gz
          mv nanopb-0.4.9.1-linux-x86 nanopb-0.4.9

@@ -38,7 +33,7 @@ jobs:
      - name: Create pull request
        uses: peter-evans/create-pull-request@v8
        with:
-          branch: create-pull-request/update-protobufs-${{ github.ref_name }}
+          branch: create-pull-request/update-protobufs
          labels: submodules
          title: Update protobufs and classes
          commit-message: Update protobufs
@@ -6,6 +6,7 @@ web.tar

 # ignore vscode IDE settings files
 .vscode/*
+!.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/extensions.json
 *.code-workspace
@@ -4,21 +4,21 @@ cli:
 plugins:
  sources:
    - id: trunk
-      ref: v1.10.2
+      ref: v1.8.0
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.3.1
-    - renovate@43.236.0
-    - prettier@3.8.4
-    - trufflehog@3.95.6
+    - checkov@3.2.526
+    - renovate@43.150.0
+    - prettier@3.8.3
+    - trufflehog@3.95.2
    - yamllint@1.38.0
    - bandit@1.9.4
-    - trivy@0.71.2
+    - trivy@0.70.0
    - taplo@0.10.0
-    - ruff@0.15.18
+    - ruff@0.15.12
    - isort@8.0.1
-    - markdownlint@0.49.0
+    - markdownlint@0.48.0
    - oxipng@10.1.1
    - svgo@4.0.1
    - actionlint@1.7.12
@@ -26,7 +26,7 @@ lint:
    - hadolint@2.14.0
    - shfmt@3.6.0
    - shellcheck@0.11.0
-    - black@26.5.1
+    - black@26.3.1
    - git-diff-check
    - gitleaks@8.30.1
    - clang-format@16.0.3
@@ -0,0 +1,14 @@
+{
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "trunk.io",
+  "trunk.enableWindows": true,
+  "files.insertFinalNewline": false,
+  "files.trimFinalNewlines": false,
+  "cmake.configureOnOpen": false,
+  "[cpp]": {
+    "editor.defaultFormatter": "trunk.io"
+  },
+  "[powershell]": {
+    "editor.defaultFormatter": "ms-vscode.powershell"
+  }
+}
@@ -66,8 +66,6 @@ Key rotation to never trigger casually: only the **full** factory reset (`factor
 - **Don't speculate about firmware root causes.** When evidence doesn't support a classification, say "unknown" and list what would disambiguate.
 - **Run `trunk fmt` before proposing a commit.** The `trunk_check` CI gate will reject unformatted code.
 - **`confirm=True` on destructive MCP tools is a real gate, not a formality.** Don't bypass it via auto-approve settings.
- **Keep code comments minimal — one or two lines, max.** Comment only when the _why_ isn't obvious from the code; never restate what the next line does. No multi-paragraph block comments explaining straightforward changes. The diff and commit message carry the rationale; the code carries the behavior.
- **Use `Throttle` for time-based rate limiting, not raw `millis()` math.** `src/mesh/Throttle.h` provides `Throttle::isWithinTimespanMs(lastMs, intervalMs)` (returns true while inside the cooldown) and `Throttle::execute(&lastMs, intervalMs, func)` (function-pointer form that updates the timestamp on fire). Use these for any "did N ms pass since X" check — raw `millis() > lastMs + N` is rollover-unsafe (breaks after ~49.7 days) and inconsistent with the rest of the codebase. The helpers compute `now - lastMs` with unsigned subtraction, which wraps correctly.

 ## Typical agent workflows

@@ -4,7 +4,7 @@
 # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions

 # Ensure the Alpine version is updated in both stages of the container!
-FROM alpine:3.24 AS builder
+FROM alpine:3.23 AS builder
 ARG PIO_ENV=native

 # Enable Alpine community repository (for 'py3-grpcio-tools')
@@ -35,7 +35,7 @@ RUN bash ./bin/build-native.sh "$PIO_ENV" && \

 # ##### PRODUCTION BUILD #############

-FROM alpine:3.24
+FROM alpine:3.23
 LABEL org.opencontainers.image.title="Meshtastic" \
      org.opencontainers.image.description="Alpine Meshtastic daemon" \
      org.opencontainers.image.url="https://meshtastic.org" \
@@ -38,4 +38,4 @@ cp bin/device-install.* $OUTDIR/
 cp bin/device-update.* $OUTDIR/

 echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json || true
+cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
@@ -0,0 +1,30 @@
+---
+Lora:
+## Ebyte E80-900M22S
+## This is a bit experimental
+## 
+##
+  Module: lr1121
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO3_TCXO_VOLTAGE: 1.8
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1
+
+
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+  
+rfswitch_table:
+  pins: [DIO5, DIO6, DIO7]
+  MODE_STBY: [LOW, LOW, LOW]
+  MODE_RX: [LOW, HIGH, LOW]
+  MODE_TX: [HIGH, HIGH, LOW]
+  MODE_TX_HP: [HIGH, LOW, LOW]
+  MODE_TX_HF: [LOW, LOW, LOW]
+  MODE_GNSS: [LOW, LOW, HIGH]
+  MODE_WIFI: [LOW, LOW, LOW]
+
+General:
+  MACAddressSource: eth0
@@ -0,0 +1,46 @@
+---
+Lora:
+## Ebyte E80-900M22S
+## This is a bit experimental
+## 
+##
+  Module: lr1121
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO3_TCXO_VOLTAGE: 1.8
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1
+
+
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+  
+rfswitch_table:
+  pins:
+    - DIO5
+    - DIO6
+  MODE_STBY:
+    - LOW
+    - LOW
+  MODE_RX:
+    - HIGH
+    - LOW
+  MODE_TX:
+    - HIGH
+    - HIGH
+  MODE_TX_HP:
+    - LOW
+    - HIGH
+  MODE_TX_HF:
+    - LOW
+    - LOW
+  MODE_GNSS:
+    - LOW
+    - LOW
+  MODE_WIFI:
+    - LOW
+    - LOW
+
+General:
+  MACAddressSource: eth0
@@ -0,0 +1,30 @@
+---
+Lora:
+## Ebyte E80-900M22S
+## This is a bit experimental
+## 
+##
+  Module: lr1121
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO3_TCXO_VOLTAGE: 1.8
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1
+
+
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+  
+rfswitch_table:
+  pins: [DIO5, DIO6, DIO7]
+  MODE_STBY: [LOW, LOW, LOW]
+  MODE_RX: [LOW, LOW, LOW]
+  MODE_TX: [LOW, HIGH, LOW]
+  MODE_TX_HP: [HIGH, LOW, LOW]
+  # MODE_TX_HF: []
+  # MODE_GNSS: []
+  MODE_WIFI: [LOW, LOW, LOW]
+
+General:
+  MACAddressSource: eth0
@@ -1,19 +0,0 @@
-# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/NebraHat
-# Use for 1 watt hat
-Meta:
-  name: NebraHat 1W
-  support: community
-  compatible:
-    - raspberry-pi
-
-Lora:
-  Module: sx1262  # Nebra SX1262 Pi Hat - 1W
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-#  CS: 8          # Newer version of MeshtasticD do not need this? If issues uncomment this line
-  IRQ: 22
-  Busy: 4
-  Reset: 18
-  RXen: 25  
-I2C:
-  I2CDevice: /dev/i2c-1
@@ -1,20 +0,0 @@
-# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/NebraHat
-# Use for 2 watt hat
-Meta:
-  name: NebraHat 2W
-  support: community
-  compatible:
-    - raspberry-pi
-
-Lora:
-  Module: sx1262  # Nebra SX1262 Pi Hat - 2W
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  SX126X_MAX_POWER: 8
-#  CS: 8          # Newer version of MeshtasticD do not need this? If issues uncomment this line
-  IRQ: 22
-  Busy: 4
-  Reset: 18
-  RXen: 25
-I2C:
-  I2CDevice: /dev/i2c-1
@@ -18,4 +18,4 @@ Lora:
  DIO3_TCXO_VOLTAGE: true
  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.0
-  # CS: 8
+  # CS: 8
@@ -5,9 +5,7 @@ Meta:
    - raspberry-pi

 Lora:
-  
-  ### RAK13300 in Slot 2
-  Module: sx1262
+  ### RAK13300 in Slot 2 pins
  IRQ: 18 #IO6
  Reset: 24 # IO4
  Busy: 19 # IO5
@@ -15,7 +13,5 @@ Lora:
  Enable_Pins:
    - 26
    - 23
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.1
-  # CS: 7
+  # CS: 7
@@ -5,18 +5,14 @@ Meta:
    - raspberry-pi

 Lora:
-
-  ### RAK13302 in Slot 2
-  Module: sx1262
+  ### RAK13302 in Slot 2 pins
  IRQ: 18 #IO6
  Reset: 24 # IO4
  Busy: 19 # IO5
-  # Ant_sw: 23 # IO3
+  # Ant_sw: 23 # IO3 
  Enable_Pins:
    - 26
    - 23
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.1
  # CS: 7
  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,19 +0,0 @@
-# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/ZebraHAT
-# Use for 1 watt hat
-Meta:
-  name: ZebraHat 1W
-  support: community
-  compatible:
-    - raspberry-pi
-
-Lora:
-  Module: sx1262  # Zebra SX1262 Pi Hat - 1W
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  SX126X_MAX_POWER: 18 
-  CS: 24
-  IRQ: 22
-  Busy: 27
-  Reset: 17
-I2C:
-  I2CDevice: /dev/i2c-1
@@ -1,20 +0,0 @@
-# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/ZebraHAT
-# Use for 2 watt hat
-Meta:
-  name: ZebraHat 2W
-  support: community
-  compatible:
-    - raspberry-pi
-
-Lora:
-  Module: sx1262  # Zebra SX1262 Pi Hat - 2W
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  SX126X_MAX_POWER: 8 
-  CS: 24
-  IRQ: 22
-  Busy: 27
-  Reset: 17
-  RXen: 25
-I2C:
-  I2CDevice: /dev/i2c-1
@@ -29,8 +29,6 @@ Lora:
    - pin: 50 # GPIO1_C2 (physical 16)
      gpiochip: 1
      line: 18
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.1
  # CS: # GPIO0_A7 (SPI1_CSN1, physical 26)
  #   pin: 7
@@ -29,8 +29,6 @@ Lora:
    - pin: 50 # GPIO1_C2 (physical 16)
      gpiochip: 1
      line: 18
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.1
  # CS: # GPIO0_A7 (SPI1_CSN1, physical 26)
  #   pin: 7
@@ -1,29 +0,0 @@
-# Station G3 + BQ35LORA900V1M Primary Slot
-# Board Doc: https://wiki.bqvoy.com/en/devkits/station-g3
-Meta:
-  name: B&Q Station G3 + BQ35LORA900V1M Primary Slot
-  support: official
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (physical 15)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO1_D1 (physical 36)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_B4 (physical 18)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B2 (physical 24)
-  #   pin: 10
-  #   gpiochip: 0
-  #   line: 10
@@ -29,8 +29,6 @@ Lora:
    - pin: 13 # GPIO0_B5
      gpiochip: 0
      line: 13
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.1
  # CS: # GPIO0_B1
  #   pin: 9
@@ -29,8 +29,6 @@ Lora:
    - pin: 13 # GPIO0_B5
      gpiochip: 0
      line: 13
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.1
  # CS: # GPIO0_B1
  #   pin: 9
@@ -31,8 +31,6 @@ Lora:
    - pin: 103 # GPIO3_A7 (physical 16)
      gpiochip: 3
      line: 7
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.1
  # CS: # GPIO0_B7 (SPI0_CSN1, physical 26)
  #   pin: 15
@@ -31,8 +31,6 @@ Lora:
    - pin: 103 # GPIO3_A7 (physical 16)
      gpiochip: 3
      line: 7
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.1
  # CS: # GPIO0_B7 (SPI0_CSN1, physical 26)
  #   pin: 15
@@ -1,17 +0,0 @@
-# Station G3 + BQ35LORA900V1M Primary Slot
-# Board Doc: https://wiki.bqvoy.com/en/devkits/station-g3
-Meta:
-  name: B&Q Station G3 + BQ35LORA900V1M Primary Slot
-  support: official
-  compatible:
-    - raspberry-pi
-
-Lora:
-  Module: sx1262
-  IRQ: 22
-  Reset: 16
-  Busy: 24
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  #CS: 8
@@ -1,18 +0,0 @@
-# Station G3 motherboard with a Raspberry Pi Zero 2W as the MCU daughterboard.
-# Verify spidev / I2C device paths for your OS — they may differ.
-Meta:
-  name: Station G3
-  support: community
-  compatible:
-    - raspberry-pi
-
-Lora:
-  Module: sx1262
-  IRQ: 22                       # BCM pin — wiki spec
-  Reset: 16                     # BCM pin — wiki spec
-  Busy: 24                      # BCM pin — wiki spec
-  # CS: 8                       # BCM 8 = SPI0 CE0 (default); uncomment only to override
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
-  # SX126X_MAX_POWER: 19        # matches Station G2 firmware cap; raise carefully per PA jumper mode
@@ -1,5 +1,3 @@
-# This config works with all revisions of the Meshtoad USB radio.
-
 Meta:
  name: meshtoad-e22
  support: official
@@ -87,15 +87,6 @@
  </screenshots>

  <releases>
-    <release version="2.7.26" date="2026-06-10">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.26</url>
-    </release>
-    <release version="2.7.25" date="2026-05-23">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.25</url>
-    </release>
-    <release version="2.7.24" date="2026-05-08">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.24</url>
-    </release>
    <release version="2.7.23" date="2026-04-14">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.23</url>
    </release>
@@ -293,9 +293,12 @@ if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
 board_arch = infer_architecture(env.BoardConfig())
 should_skip_manifest = board_arch is None

-# For host/native envs, avoid depending on 'buildprog' (some targets don't define it)
-mtjson_deps = [] if should_skip_manifest else ["buildprog"]
-if not should_skip_manifest and platform.name == "espressif32":
+# Most platforms can generate the manifest as part of the default 'buildprog' target.
+# Typically this passes success/failure properly.
+mtjson_deps = ["buildprog"]
+if platform.name == "espressif32":
+    # On ESP32, we need to explicitly depend upon the binary to prevent fake-success upon failure.
+    mtjson_deps = ["$BUILD_DIR/${PROGNAME}.bin"]
    # Build littlefs image as part of mtjson target
    # Equivalent to `pio run -t buildfs`
    target_lfs = env.DataToBin(
@@ -309,7 +312,8 @@ if should_skip_manifest:

    env.AddCustomTarget(
        name="mtjson",
-        dependencies=mtjson_deps,
+        # For host/native envs, avoid depending on 'buildprog' (some targets don't define it)
+        dependencies=[],
        actions=[skip_manifest],
        title="Meshtastic Manifest (skipped)",
        description="mtjson generation is skipped for native environments",
@@ -7,7 +7,7 @@
    "extra_flags": [
      "-D CDEBYTE_EORA_S3",
      "-D ARDUINO_USB_CDC_ON_BOOT=1",
-      "-D ARDUINO_USB_MODE=0",
+      "-D ARDUINO_USB_MODE=1",
      "-D ARDUINO_RUNNING_CORE=1",
      "-D ARDUINO_EVENT_RUNNING_CORE=1",
      "-D BOARD_HAS_PSRAM"
@@ -1,42 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-D BOARD_HAS_PSRAM",
-      "-D ARDUINO_USB_CDC_ON_BOOT=0",
-      "-D ARDUINO_USB_MODE=0",
-      "-D ARDUINO_RUNNING_CORE=1",
-      "-D ARDUINO_EVENT_RUNNING_CORE=0"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "psram_type": "qio_opi",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "ELECROW-ThinkNode-M7"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "ELECROW ThinkNode M7",
-  "upload": {
-    "flash_size": "8MB",
-    "maximum_ram_size": 524288,
-    "maximum_size": 8388608,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://www.elecrow.com",
-  "vendor": "ELECROW"
-}
@@ -6,7 +6,7 @@
    "core": "esp32",
    "extra_flags": [
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1",
      "-DBOARD_HAS_PSRAM"
@@ -8,7 +8,7 @@
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -1,54 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"],
-      ["0x2886", "0x1667"]
-    ],
-    "usb_product": "HT-n5262",
-    "mcu": "nrf52840",
-    "variant": "heltec_mesh_node_t1",
-    "variants_dir": "variants",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "Heltec Mesh Node T1",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://heltec.org",
-  "vendor": "Heltec"
-}
@@ -9,7 +9,7 @@
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -9,7 +9,7 @@
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -9,7 +9,7 @@
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -8,7 +8,7 @@
    "extra_flags": [
      "-DHELTEC_WIRELESS_TRACKER",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -7,7 +7,7 @@
    "core": "esp32",
    "extra_flags": [
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -8,7 +8,7 @@
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=0"
    ],
@@ -1,41 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=0"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "station-g3"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "BQ Station G3",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "",
-  "vendor": "BQ Consulting"
-}
@@ -9,7 +9,7 @@
      "-DBOARD_HAS_PSRAM",
      "-DLILYGO_TBEAM_1W",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -8,7 +8,7 @@
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -1,53 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_T_IMPULSE_PLUS -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [["0x239A", "0x8029"]],
-    "usb_product": "T-Impulse-Plus-nRF52840",
-    "mcu": "nrf52840",
-    "variant": "t-impulse-plus",
-    "variants_dir": "variants",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd"
-  },
-  "frameworks": ["arduino"],
-  "name": "Lilygo T-Impulse-Plus-nRF52840",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "require_upload_port": true,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink",
-      "cmsis-dap",
-      "blackmagic"
-    ]
-  },
-  "url": "https://www.lilygo.cc/",
-  "vendor": "Lilygo"
-}
@@ -8,7 +8,7 @@
      "-DBOARD_HAS_PSRAM",
      "-DLILYGO_TBEAM_S3_CORE",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -7,7 +7,7 @@
    "extra_flags": [
      "-DLILYGO_T3S3_V1",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1",
      "-DBOARD_HAS_PSRAM"
@@ -10,7 +10,7 @@
      "-DBOARD_HAS_PSRAM",
      "-DUNPHONE_SPIN=9",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@@ -1,21 +1,3 @@
-meshtasticd (2.7.26.0) unstable; urgency=medium
-
-  * Version 2.7.26
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Wed, 10 Jun 2026 00:19:23 +0000
-
-meshtasticd (2.7.25.0) unstable; urgency=medium
-
-  * Version 2.7.25
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Sat, 23 May 2026 01:16:20 +0000
-
-meshtasticd (2.7.24.0) unstable; urgency=medium
-
-  * Version 2.7.24
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Fri, 08 May 2026 10:44:12 +0000
-
 meshtasticd (2.7.23.0) unstable; urgency=medium

  * Version 2.7.23
@@ -33,5 +33,5 @@ if [[ -n $GPG_KEY_ID ]]; then
 	debuild -S -nc -k"$GPG_KEY_ID"
 else
 	# Build the source deb without signing (forks)
-	debuild -S -nc -us -uc
+	debuild -S -nc
 fi
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x640000,
+app1,     app,  ota_1,   0x650000,0x640000,
+spiffs,   data, spiffs,  0xc90000,0x360000,
+coredump, data, coredump,0xFF0000,0x10000,
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x330000,
+app1,     app,  ota_1,   0x340000,0x330000,
+spiffs,   data, spiffs,  0x670000,0x180000,
+coredump, data, coredump,0x7F0000,0x10000,
@@ -70,17 +70,6 @@ def esp32_create_combined_bin(source, target, env):

 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)

-esp32_kind = env.GetProjectOption("custom_esp32_kind")
-if esp32_kind == "esp32":
-    # Free up some IRAM by removing auxiliary SPI flash chip drivers.
-    # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
-    env.Append(
-        LINKFLAGS=[
-            "-Wl,--wrap=esp_flash_chip_gd",
-            "-Wl,--wrap=esp_flash_chip_issi",
-            "-Wl,--wrap=esp_flash_chip_winbond",
-        ]
-    )
-else:
-    # For newer ESP32 targets, using newlib nano works better.
-    env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
+# Enable Newlib Nano formatting to save space
+# ...but allow printf float support (compromise)
+env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+# trunk-ignore-all(ruff/F821)
+# trunk-ignore-all(flake8/F821): For SConstruct imports
+
+# force linker response file instead of command line arguments
+
+Import("env")
+
+
+def wrap_with_tempfile(command_key):
+    command = env.get(command_key)
+    if not command or not isinstance(command, str):
+        return
+    if "TEMPFILE(" in command:
+        return
+    env.Replace(**{command_key: "${TEMPFILE('%s')}" % command})
+
+
+# Force SCons to spill long commands into response files on this target.
+env.Replace(MAXLINELENGTH=8192)
+
+for key in ("LINKCOM", "CXXLINKCOM", "SHLINKCOM", "SHCXXLINKCOM"):
+    wrap_with_tempfile(key)
@@ -7,12 +7,6 @@ __pycache__/
 dist/
 build/

-# Persistent device-log capture (recorder + Datadog cursor).
-# Cross-session JSONL streams written by the autouse Recorder singleton
-# (see src/meshtastic_mcp/recorder/). Lives outside tests/ so the pytest
-# fixture truncate doesn't touch it.
-.mtlog/
-
 # Test harness artifacts
 tests/report.html
 tests/junit.xml
@@ -1,217 +0,0 @@
-{
-  "title": "Meshtastic Firmware — Recorder Stream",
-  "description": "Live view of `.mtlog/` streams shipped by `mtlog_to_datadog.py`. Heap, packet volume, log levels, errors. One row per port.",
-  "widgets": [
-    {
-      "definition": {
-        "title": "Free heap (bytes)",
-        "type": "timeseries",
-        "show_legend": true,
-        "requests": [
-          {
-            "queries": [
-              {
-                "name": "free_heap",
-                "data_source": "metrics",
-                "query": "avg:mesh.local.heap_free_bytes{service:meshtastic-firmware} by {port}"
-              }
-            ],
-            "response_format": "timeseries",
-            "display_type": "line"
-          }
-        ],
-        "yaxis": { "label": "bytes" }
-      }
-    },
-    {
-      "definition": {
-        "title": "Heap slope (bytes/min) — last 1h",
-        "type": "query_value",
-        "precision": 0,
-        "requests": [
-          {
-            "queries": [
-              {
-                "name": "slope",
-                "data_source": "metrics",
-                "query": "derivative(avg:mesh.local.heap_free_bytes{service:meshtastic-firmware})",
-                "aggregator": "avg"
-              }
-            ],
-            "response_format": "scalar"
-          }
-        ],
-        "conditional_formats": [
-          { "comparator": "<", "value": -100, "palette": "white_on_red" },
-          { "comparator": "<", "value": 0, "palette": "white_on_yellow" },
-          { "comparator": ">=", "value": 0, "palette": "white_on_green" }
-        ]
-      }
-    },
-    {
-      "definition": {
-        "title": "Total heap (bytes)",
-        "type": "timeseries",
-        "requests": [
-          {
-            "queries": [
-              {
-                "name": "total_heap",
-                "data_source": "metrics",
-                "query": "avg:mesh.local.heap_total_bytes{service:meshtastic-firmware} by {port}"
-              }
-            ],
-            "response_format": "timeseries",
-            "display_type": "line"
-          }
-        ]
-      }
-    },
-    {
-      "definition": {
-        "title": "Battery level (%)",
-        "type": "timeseries",
-        "requests": [
-          {
-            "queries": [
-              {
-                "name": "battery",
-                "data_source": "metrics",
-                "query": "avg:mesh.device.battery_level{service:meshtastic-firmware} by {port}"
-              }
-            ],
-            "response_format": "timeseries",
-            "display_type": "line"
-          }
-        ],
-        "yaxis": { "min": "0", "max": "105" }
-      }
-    },
-    {
-      "definition": {
-        "title": "Air utilization (TX %)",
-        "type": "timeseries",
-        "requests": [
-          {
-            "queries": [
-              {
-                "name": "airutil",
-                "data_source": "metrics",
-                "query": "avg:mesh.device.air_util_tx{service:meshtastic-firmware} by {port}"
-              }
-            ],
-            "response_format": "timeseries",
-            "display_type": "line"
-          }
-        ]
-      }
-    },
-    {
-      "definition": {
-        "title": "Channel utilization (%)",
-        "type": "timeseries",
-        "requests": [
-          {
-            "queries": [
-              {
-                "name": "chutil",
-                "data_source": "metrics",
-                "query": "avg:mesh.device.channel_utilization{service:meshtastic-firmware} by {port}"
-              }
-            ],
-            "response_format": "timeseries",
-            "display_type": "line"
-          }
-        ]
-      }
-    },
-    {
-      "definition": {
-        "title": "Log volume by level",
-        "type": "timeseries",
-        "show_legend": true,
-        "requests": [
-          {
-            "response_format": "timeseries",
-            "display_type": "bars",
-            "queries": [
-              {
-                "name": "log_count",
-                "data_source": "logs",
-                "indexes": ["*"],
-                "compute": { "aggregation": "count" },
-                "search": { "query": "service:meshtastic-firmware" },
-                "group_by": [
-                  {
-                    "facet": "@level",
-                    "limit": 10,
-                    "sort": { "order": "desc", "aggregation": "count" }
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "definition": {
-        "title": "Recent ERROR / CRIT firmware logs",
-        "type": "list_stream",
-        "requests": [
-          {
-            "response_format": "event_list",
-            "query": {
-              "data_source": "logs_stream",
-              "query_string": "service:meshtastic-firmware (status:error OR @level:ERROR OR @level:CRIT)",
-              "indexes": [],
-              "sort": { "column": "timestamp", "order": "desc" }
-            },
-            "columns": [
-              { "field": "timestamp", "width": "auto" },
-              { "field": "host", "width": "auto" },
-              { "field": "@port", "width": "auto" },
-              { "field": "@level", "width": "auto" },
-              { "field": "@thread", "width": "auto" },
-              { "field": "message", "width": "stretch" }
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "definition": {
-        "title": "Recorder marker events",
-        "type": "list_stream",
-        "requests": [
-          {
-            "response_format": "event_list",
-            "query": {
-              "data_source": "logs_stream",
-              "query_string": "service:meshtastic-firmware @level:MARK",
-              "indexes": [],
-              "sort": { "column": "timestamp", "order": "desc" }
-            },
-            "columns": [
-              { "field": "timestamp", "width": "auto" },
-              { "field": "host", "width": "auto" },
-              { "field": "message", "width": "stretch" }
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "template_variables": [
-    {
-      "name": "port",
-      "prefix": "port",
-      "available_values": [],
-      "default": "*"
-    },
-    { "name": "host", "prefix": "host", "available_values": [], "default": "*" }
-  ],
-  "layout_type": "ordered",
-  "notify_list": [],
-  "reflow_type": "auto"
-}
@@ -1,389 +0,0 @@
-#!/usr/bin/env python3
-"""Forward selected recorder JSONL streams to Datadog.
-
-Reads `.mtlog/logs.jsonl` and `.mtlog/telemetry.jsonl`, ships logs to the
-Logs Intake API and telemetry numerics to the Metrics v2 series API.
-Resumes from `.mtlog/.dd-cursor.json` so a daemon restart doesn't
-duplicate rows already shipped from the current live files.
-
-This forwarder does not currently backfill rotated `.jsonl.gz` archives.
-If the recorder rotates before this process drains the live file, or the
-forwarder is down across a rotation, those older rows are skipped.
-
-Usage:
-    DD_API_KEY=... ./scripts/mtlog_to_datadog.py --tail
-    ./scripts/mtlog_to_datadog.py --once          # catch up + exit
-    ./scripts/mtlog_to_datadog.py --since 3600   # backfill last hour from start
-
-Default `DD_SITE` is `us5.datadoghq.com` — the team's Datadog instance.
-Override via `DD_SITE=...` env var or `--site` flag for one-offs.
-
-The forwarder is a separate process by design — a Datadog outage or
-auth failure must not backpressure the recorder. We exit non-zero on
-fatal config errors (missing API key) and keep retrying on transient
-network/HTTP errors.
-"""
-
-from __future__ import annotations
-
-import argparse
-import json
-import os
-import socket
-import sys
-import time
-from pathlib import Path
-from typing import Any, Iterator
-
-try:
-    import requests
-except ImportError:
-    print(
-        "requests is required. Install it in the mcp-server venv: "
-        "uv pip install requests",
-        file=sys.stderr,
-    )
-    sys.exit(2)
-
-
-_DEFAULT_LOG_DIR = Path(__file__).resolve().parents[1] / ".mtlog"
-_LOG_INTAKE_TPL = "https://http-intake.logs.{site}/api/v2/logs"
-_METRICS_TPL = "https://api.{site}/api/v2/series"
-_LOG_BATCH = 50
-_METRICS_BATCH = 100
-_MAX_RETRIES = 5
-_RETRY_BASE_S = 1.5
-
-
-# --- streaming JSONL with byte-position cursor -------------------------
-
-
-class _StreamReader:
-    """Reads a single rotating JSONL with cursor-based resume.
-
-    This tails only the live `.jsonl` file. The recorder rotates files
-    (live `.jsonl` → `.YYYYMMDD-HHMMSS-uuuuuu-NNNNN.jsonl.gz`), which means
-    the live file shrinks abruptly. We detect that via inode change OR live
-    size < cursor position, and reset the live-file cursor to 0.
-    """
-
-    def __init__(self, path: Path, cursor: dict[str, Any]):
-        self.path = path
-        self.cursor = cursor
-
-    def _state(self) -> tuple[int, int]:
-        """Return (inode, size) for the live file. (0, 0) if missing."""
-        try:
-            st = self.path.stat()
-            return (st.st_ino, st.st_size)
-        except FileNotFoundError:
-            return (0, 0)
-
-    def iter_new_records(self) -> Iterator[dict[str, Any]]:
-        ino, size = self._state()
-        last_ino = self.cursor.get("ino")
-        last_pos = int(self.cursor.get("pos") or 0)
-        if ino == 0:
-            return
-        if last_ino is not None and last_ino != ino:
-            # Rotation happened. Start over.
-            last_pos = 0
-        if last_pos > size:
-            # Live file truncated/shrunk under us — recorder rotated.
-            last_pos = 0
-        try:
-            with self.path.open("r", encoding="utf-8") as fh:
-                fh.seek(last_pos)
-                for line in fh:
-                    line = line.rstrip("\n")
-                    if not line:
-                        continue
-                    try:
-                        yield json.loads(line)
-                    except json.JSONDecodeError:
-                        continue
-                    last_pos = fh.tell()
-        except FileNotFoundError:
-            return
-        self.cursor["ino"] = ino
-        self.cursor["pos"] = last_pos
-
-
-def _load_cursor(path: Path) -> dict[str, Any]:
-    if not path.exists():
-        return {}
-    try:
-        return json.loads(path.read_text())
-    except (OSError, json.JSONDecodeError):
-        return {}
-
-
-def _save_cursor(path: Path, data: dict[str, Any]) -> None:
-    tmp = path.with_suffix(".json.tmp")
-    tmp.write_text(json.dumps(data, separators=(",", ":")))
-    tmp.replace(path)
-
-
-# --- Datadog clients ---------------------------------------------------
-
-
-class _DDSession:
-    """Pool one HTTPS session, share retry logic."""
-
-    def __init__(self, api_key: str, site: str, hostname: str) -> None:
-        self.api_key = api_key
-        self.site = site
-        self.hostname = hostname
-        self.session = requests.Session()
-        self.session.headers.update(
-            {
-                "DD-API-KEY": api_key,
-                "Content-Type": "application/json",
-            }
-        )
-
-    def _post(self, url: str, payload: Any) -> bool:
-        for attempt in range(_MAX_RETRIES):
-            try:
-                resp = self.session.post(url, json=payload, timeout=30)
-            except requests.RequestException as e:
-                _wait_retry(attempt, f"network error: {e}")
-                continue
-            if 200 <= resp.status_code < 300:
-                return True
-            if resp.status_code in (408, 429, 500, 502, 503, 504):
-                _wait_retry(
-                    attempt,
-                    f"HTTP {resp.status_code} retrying",
-                )
-                continue
-            print(
-                f"datadog refused: {resp.status_code} {resp.text[:200]}",
-                file=sys.stderr,
-            )
-            return False
-        return False
-
-    def send_logs(self, records: list[dict[str, Any]]) -> int:
-        if not records:
-            return 0
-        url = _LOG_INTAKE_TPL.format(site=self.site)
-        sent = 0
-        for i in range(0, len(records), _LOG_BATCH):
-            batch = records[i : i + _LOG_BATCH]
-            if self._post(url, batch):
-                sent += len(batch)
-        return sent
-
-    def send_metrics(self, series: list[dict[str, Any]]) -> int:
-        if not series:
-            return 0
-        url = _METRICS_TPL.format(site=self.site)
-        sent = 0
-        for i in range(0, len(series), _METRICS_BATCH):
-            batch = series[i : i + _METRICS_BATCH]
-            if self._post(url, {"series": batch}):
-                sent += len(batch)
-        return sent
-
-
-def _wait_retry(attempt: int, reason: str) -> None:
-    wait = _RETRY_BASE_S * (2**attempt)
-    print(
-        f"  retry {attempt + 1}/{_MAX_RETRIES} in {wait:.1f}s ({reason})",
-        file=sys.stderr,
-    )
-    time.sleep(wait)
-
-
-# --- record → datadog payload ------------------------------------------
-
-
-def _log_record_to_dd(rec: dict[str, Any], host: str) -> dict[str, Any]:
-    line = rec.get("line") or ""
-    tags = [
-        f"role:{rec.get('role')}",
-        f"port:{rec.get('port')}",
-    ]
-    level = rec.get("level")
-    if level:
-        tags.append(f"level:{level}")
-    tag = rec.get("tag")
-    if tag:
-        tags.append(f"thread:{tag}")
-    return {
-        "ddsource": "meshtastic-firmware",
-        "service": "meshtastic-firmware",
-        "hostname": host,
-        "message": line,
-        "ddtags": ",".join(t for t in tags if t and "None" not in t),
-        "timestamp": int((rec.get("ts") or time.time()) * 1000),
-        "level": level,
-    }
-
-
-def _telemetry_record_to_metrics(
-    rec: dict[str, Any], host: str
-) -> list[dict[str, Any]]:
-    fields = rec.get("fields") or {}
-    if not isinstance(fields, dict):
-        return []
-    variant = rec.get("variant") or "unknown"
-    ts = int(rec.get("ts") or time.time())
-    out: list[dict[str, Any]] = []
-    tags = []
-    if rec.get("port"):
-        tags.append(f"port:{rec['port']}")
-    if rec.get("role"):
-        tags.append(f"role:{rec['role']}")
-    if rec.get("from_node"):
-        tags.append(f"from_node:{rec['from_node']}")
-    tags.append(f"variant:{variant}")
-    for field, value in fields.items():
-        if not isinstance(value, (int, float)) or isinstance(value, bool):
-            continue
-        metric = f"mesh.{variant}.{_metric_safe(field)}"
-        out.append(
-            {
-                "metric": metric,
-                "type": 3,  # GAUGE
-                "points": [{"timestamp": ts, "value": float(value)}],
-                "tags": tags,
-                "resources": [{"type": "host", "name": host}],
-            }
-        )
-    return out
-
-
-def _metric_safe(name: str) -> str:
-    # Lowercase, replace non-alnum with underscore for safe metric names.
-    return "".join(c.lower() if c.isalnum() else "_" for c in name)
-
-
-# --- main loop ---------------------------------------------------------
-
-
-def run(
-    log_dir: Path,
-    *,
-    once: bool,
-    since_seconds: float | None,
-    poll_interval: float,
-    dd: _DDSession,
-) -> int:
-    cursor_path = log_dir / ".dd-cursor.json"
-    cursors = _load_cursor(cursor_path)
-
-    # `--since` overrides cursor: rewind to (now-since) timestamp.
-    # We can't seek by timestamp directly (cursor is byte position), so
-    # we just reset cursors to 0 and let the time filter in iter_new
-    # drop older records.
-    cutoff_ts: float | None = None
-    if since_seconds is not None:
-        cursors = {}
-        cutoff_ts = time.time() - since_seconds
-
-    sent_total = {"logs": 0, "telemetry": 0}
-
-    while True:
-        # logs.jsonl → DD logs
-        log_cursor = cursors.setdefault("logs", {})
-        log_batch: list[dict[str, Any]] = []
-        for rec in _StreamReader(log_dir / "logs.jsonl", log_cursor).iter_new_records():
-            if cutoff_ts and (rec.get("ts") or 0) < cutoff_ts:
-                continue
-            log_batch.append(_log_record_to_dd(rec, dd.hostname))
-        if log_batch:
-            n = dd.send_logs(log_batch)
-            sent_total["logs"] += n
-            print(f"logs: sent {n}/{len(log_batch)}")
-
-        # telemetry.jsonl → DD metrics
-        telem_cursor = cursors.setdefault("telemetry", {})
-        metric_series: list[dict[str, Any]] = []
-        for rec in _StreamReader(
-            log_dir / "telemetry.jsonl", telem_cursor
-        ).iter_new_records():
-            if cutoff_ts and (rec.get("ts") or 0) < cutoff_ts:
-                continue
-            metric_series.extend(_telemetry_record_to_metrics(rec, dd.hostname))
-        if metric_series:
-            n = dd.send_metrics(metric_series)
-            sent_total["telemetry"] += n
-            print(f"telemetry: sent {n}/{len(metric_series)} metric points")
-
-        _save_cursor(cursor_path, cursors)
-
-        if once:
-            print(f"done. logs={sent_total['logs']} metrics={sent_total['telemetry']}")
-            return 0
-        time.sleep(poll_interval)
-
-
-def main(argv: list[str] | None = None) -> int:
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument(
-        "--log-dir",
-        default=str(_DEFAULT_LOG_DIR),
-        help="Path to .mtlog/ (default: mcp-server/.mtlog)",
-    )
-    mode = parser.add_mutually_exclusive_group()
-    mode.add_argument("--once", action="store_true", help="Catch up then exit")
-    mode.add_argument(
-        "--tail",
-        action="store_true",
-        help="Daemon: poll forever (default)",
-    )
-    parser.add_argument(
-        "--since",
-        type=float,
-        default=None,
-        help="Backfill last N seconds. Resets cursor.",
-    )
-    parser.add_argument(
-        "--poll-interval",
-        type=float,
-        default=5.0,
-        help="Seconds between tail polls (default 5)",
-    )
-    parser.add_argument(
-        "--site",
-        default=os.environ.get("DD_SITE", "us5.datadoghq.com"),
-        help=(
-            "Datadog site. Default is the team's instance (us5.datadoghq.com). "
-            "Override via DD_SITE env var or this flag."
-        ),
-    )
-    parser.add_argument(
-        "--host",
-        default=socket.gethostname(),
-        help="Hostname tag (default: socket.gethostname())",
-    )
-    args = parser.parse_args(argv)
-
-    api_key = os.environ.get("DD_API_KEY")
-    if not api_key:
-        print("DD_API_KEY env var required.", file=sys.stderr)
-        return 2
-
-    log_dir = Path(args.log_dir)
-    if not log_dir.exists():
-        print(
-            f"log dir {log_dir} does not exist — start the mcp-server first.",
-            file=sys.stderr,
-        )
-        return 2
-
-    dd = _DDSession(api_key=api_key, site=args.site, hostname=args.host)
-    once = args.once and not args.tail
-    return run(
-        log_dir,
-        once=once,
-        since_seconds=args.since,
-        poll_interval=args.poll_interval,
-        dd=dd,
-    )
-
-
-if __name__ == "__main__":
-    sys.exit(main())
@@ -108,33 +108,18 @@ def build(
    env: str,
    with_manifest: bool = True,
    userprefs_overrides: dict[str, Any] | None = None,
-    build_flags: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
    """Run `pio run -e <env>` and return artifact paths.

    `userprefs_overrides` (optional): dict of `USERPREFS_<KEY>: value` to inject
    into userPrefs.jsonc for this build only. File is restored byte-for-byte
    on exit. Use `userprefs_set()` for persistent changes.
-
-    `build_flags` (optional): dict of `-D<NAME>=<VALUE>` macros to set for
-    this build only via `PLATFORMIO_BUILD_FLAGS`. Common useful flag:
-    `{"DEBUG_HEAP": 1}` enables per-thread leak detection + `[heap N]`
-    prefix on every log line. Combines with the recorder so heap shows
-    up at log cadence (much higher resolution than the ~60 s LocalStats
-    packet) — see `recorder/parsers.py:_HEAP_PREFIX_RE`. Bool values
-    expand to bare `-D<NAME>` (presence-only flags).
    """
    args = ["run", "-e", env]
    if with_manifest:
        args.extend(["-t", "mtjson"])
-    extra_env = _build_flags_env(build_flags) if build_flags else None
    with userprefs.temporary_overrides(userprefs_overrides) as effective:
-        result = pio.run(
-            args,
-            timeout=pio.TIMEOUT_BUILD,
-            check=False,
-            extra_env=extra_env,
-        )
+        result = pio.run(args, timeout=pio.TIMEOUT_BUILD, check=False)
    return {
        "exit_code": result.returncode,
        "artifacts": [str(p) for p in _artifacts_for(env)],
@@ -142,27 +127,9 @@ def build(
        "stderr_tail": pio.tail_lines(result.stderr, 200),
        "duration_s": round(result.duration_s, 2),
        "userprefs": _userprefs_summary(effective),
-        "build_flags": dict(build_flags) if build_flags else None,
    }


-def _build_flags_env(build_flags: dict[str, Any]) -> dict[str, str]:
-    """Translate `{"DEBUG_HEAP": 1, "FOO": "bar"}` → `{"PLATFORMIO_BUILD_FLAGS":
-    "-DDEBUG_HEAP=1 -DFOO=bar"}`. Bool True → bare `-D<NAME>`; False/None drop
-    the flag entirely. Other types stringify."""
-    parts: list[str] = []
-    for key, value in build_flags.items():
-        if value is False or value is None:
-            continue
-        if value is True:
-            parts.append(f"-D{key}")
-        else:
-            parts.append(f"-D{key}={value}")
-    if not parts:
-        return {}
-    return {"PLATFORMIO_BUILD_FLAGS": " ".join(parts)}
-
-
 def clean(env: str) -> dict[str, Any]:
    """Run `pio run -e <env> -t clean`."""
    result = pio.run(["run", "-e", env, "-t", "clean"], timeout=120, check=False)
@@ -179,29 +146,20 @@ def flash(
    port: str,
    confirm: bool = False,
    userprefs_overrides: dict[str, Any] | None = None,
-    build_flags: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
    """`pio run -e <env> -t upload --upload-port <port>`. All architectures.

    `userprefs_overrides` (optional): see `build()` — the rebuild-before-upload
    that pio performs will pick up the injected values.
-
-    `build_flags` (optional): same shape as `build()` — `PLATFORMIO_BUILD_FLAGS`
-    is exported for the rebuild-before-upload, so the uploaded firmware
-    actually carries the flags. Without this propagation, `pio run -t upload`
-    would relink without the env var and silently drop them. Common use:
-    `build_flags={"DEBUG_HEAP": 1}` for the leak-hunt path.
    """
    _require_confirm(confirm, "flash")
    _reject_native_env(env, "flash")
    connection.reject_if_tcp(port, "flash")
-    extra_env = _build_flags_env(build_flags) if build_flags else None
    with userprefs.temporary_overrides(userprefs_overrides) as effective:
        result = pio.run(
            ["run", "-e", env, "-t", "upload", "--upload-port", port],
            timeout=pio.TIMEOUT_UPLOAD,
            check=False,
-            extra_env=extra_env,
        )
    return {
        "exit_code": result.returncode,
@@ -209,7 +167,6 @@ def flash(
        "stderr_tail": pio.tail_lines(result.stderr, 200),
        "duration_s": round(result.duration_s, 2),
        "userprefs": _userprefs_summary(effective),
-        "build_flags": dict(build_flags) if build_flags else None,
    }


@@ -1,410 +0,0 @@
-"""Read-side queries over the recorder's JSONL streams.
-
-Pure functions over `mcp-server/.mtlog/`. Streaming JSONL reader: never
-loads a whole file. Time-bound queries short-circuit as soon as `ts`
-exceeds the requested end. The recorder writes monotonically, so a
-forward scan is cheap; we don't need an index.
-
-All time arguments accept:
-  - epoch seconds (int/float)
-  - relative strings: "-15m", "-2h", "-3d", "now"
-  - ISO-ish absolute strings: "2026-05-07T14:30:00" (naive timestamps are
-    treated as UTC)
-
-Tools that return data ALWAYS cap their output (max_lines / max_points
-/ max), and report whether more matched than was returned.
-"""
-
-from __future__ import annotations
-
-import gzip
-import json
-import re
-import statistics
-import time
-from datetime import datetime, timezone
-from pathlib import Path
-from typing import Any, Iterator
-
-from .recorder.recorder import get_recorder
-
-_REL_RE = re.compile(r"^\s*-\s*(\d+(?:\.\d+)?)\s*([smhd])\s*$")
-_REGEX_PREVIEW_MAX = 100
-_REGEX_PREVIEW_TRUNCATE = 97
-
-
-def _parse_time(value: Any, *, now: float | None = None) -> float:
-    """Coerce to epoch seconds. Defaults `now` to `time.time()`."""
-    if value is None:
-        return time.time()
-    if isinstance(value, (int, float)):
-        return float(value)
-    if not isinstance(value, str):
-        raise ValueError(f"invalid time: {value!r}")
-    s = value.strip().lower()
-    if s in ("", "now"):
-        return time.time() if now is None else now
-    m = _REL_RE.match(s)
-    if m:
-        n = float(m.group(1))
-        unit = m.group(2)
-        secs = n * {"s": 1, "m": 60, "h": 3600, "d": 86400}[unit]
-        base = time.time() if now is None else now
-        return base - secs
-    # Try ISO 8601. Accept naive (assume UTC) and Z-suffixed.
-    try:
-        if s.endswith("z"):
-            s = s[:-1] + "+00:00"
-        dt = datetime.fromisoformat(s)
-        if dt.tzinfo is None:
-            dt = dt.replace(tzinfo=timezone.utc)
-        return dt.timestamp()
-    except ValueError as e:
-        raise ValueError(f"unparseable time: {value!r}") from e
-
-
-def _iter_jsonl(path: Path, *, since: float, until: float) -> Iterator[dict[str, Any]]:
-    """Stream records in chronological order: rotated archives first
-    (oldest → newest by lex sort, which is chronological for our
-    `YYYYMMDD-HHMMSS-uuuuuu-NNNNN` archive naming), then the live file
-    last. The "keep last N" pop-front logic in the window queries
-    relies on records arriving in time order across files.
-    """
-    files: list[Path] = []
-    # Gzipped archives are named "<stem>.YYYYMMDD-HHMMSS-uuuuuu-NNNNN.jsonl.gz".
-    for archive in sorted(path.parent.glob(f"{path.stem}.*.jsonl.gz")):
-        files.append(archive)
-    if path.exists():
-        files.append(path)
-    for f in files:
-        opener = gzip.open if f.suffix == ".gz" else open
-        try:
-            with opener(f, "rt", encoding="utf-8") as fh:  # type: ignore[arg-type]
-                for line in fh:
-                    line = line.strip()
-                    if not line:
-                        continue
-                    try:
-                        rec = json.loads(line)
-                    except json.JSONDecodeError:
-                        continue
-                    ts = rec.get("ts")
-                    if not isinstance(ts, (int, float)):
-                        continue
-                    if ts < since:
-                        continue
-                    if ts > until:
-                        # Records are append-monotonic within a file, so
-                        # the rest of this file is also past `until`.
-                        # Archives can still overlap each other, so only
-                        # short-circuit this file, not the whole scan.
-                        break
-                    yield rec
-        except (FileNotFoundError, OSError):
-            continue
-
-
-# -- queries ------------------------------------------------------------
-
-
-def logs_window(
-    start: Any = "-15m",
-    end: Any = "now",
-    *,
-    grep: str | None = None,
-    level: str | None = None,
-    tag: str | None = None,
-    port: str | None = None,
-    max_lines: int = 200,
-) -> dict[str, Any]:
-    """Recent firmware log lines, filtered.
-
-    `level` accepts a single level name or pipe-separated set
-    ("WARN|ERROR|CRIT"). `grep` is a regex (Python re) over the raw
-    `line` field. Returns the last `max_lines` matches.
-    """
-    s = _parse_time(start)
-    e = _parse_time(end)
-    levels = _split_set(level)
-    if grep:
-        try:
-            grep_re = re.compile(grep)
-        except re.error as exc:
-            preview = (
-                grep
-                if len(grep) <= _REGEX_PREVIEW_MAX
-                else f"{grep[:_REGEX_PREVIEW_TRUNCATE]}..."
-            )
-            raise ValueError(f"invalid grep regex {preview!r}: {exc}") from exc
-    else:
-        grep_re = None
-
-    base = get_recorder().base_dir
-    matched = 0
-    out: list[dict[str, Any]] = []
-    for rec in _iter_jsonl(base / "logs.jsonl", since=s, until=e):
-        if levels and rec.get("level") not in levels:
-            continue
-        if tag and rec.get("tag") != tag:
-            continue
-        if port and rec.get("port") != port:
-            continue
-        if grep_re and not grep_re.search(rec.get("line") or ""):
-            continue
-        matched += 1
-        out.append(rec)
-        if len(out) > max_lines:
-            out.pop(0)  # keep the most recent N
-    return {
-        "lines": out,
-        "total_matched": matched,
-        "dropped": max(0, matched - max_lines),
-        "window": {"start": s, "end": e},
-    }
-
-
-def telemetry_timeline(
-    window: Any = "1h",
-    *,
-    variant: str = "local",
-    field: str = "free_heap",
-    port: str | None = None,
-    max_points: int = 200,
-) -> dict[str, Any]:
-    """Timeseries of one telemetry field, downsampled.
-
-    `field` matches both the protobuf snake_case name (`free_heap`,
-    `heap_free_bytes`, `battery_level`) and camelCase (`freeHeap`).
-    Server-side bucket-mean downsamples to ≤ `max_points`. Returns
-    `slope_per_min` (linear regression slope, units/min) so a leak
-    detector can read one number.
-    """
-    end = time.time()
-    if isinstance(window, (int, float)):
-        # Numeric `window` is a duration in seconds — "last N seconds".
-        # Without this branch, `_parse_time(-N)` would treat -N as an
-        # absolute epoch timestamp (i.e., Jan 1 1970 minus N seconds),
-        # producing a wildly negative `start` and matching nothing.
-        start = end - float(window)
-    elif isinstance(window, str) and not window.startswith("-"):
-        # Bare string like "1h" is sugar for "-1h".
-        start = _parse_time(f"-{window}", now=end)
-    else:
-        start = _parse_time(window, now=end)
-
-    base = get_recorder().base_dir
-    raw: list[tuple[float, float]] = []
-    field_aliases = _field_aliases(field)
-    for rec in _iter_jsonl(base / "telemetry.jsonl", since=start, until=end):
-        if rec.get("variant") != variant:
-            continue
-        if port and rec.get("port") != port:
-            continue
-        fields = rec.get("fields") or {}
-        value: Any = None
-        for alias in field_aliases:
-            if alias in fields:
-                value = fields[alias]
-                break
-        if not isinstance(value, (int, float)):
-            continue
-        raw.append((float(rec["ts"]), float(value)))
-
-    if not raw:
-        return {
-            "points": [],
-            "samples": 0,
-            "min": None,
-            "max": None,
-            "slope_per_min": None,
-            "window": {"start": start, "end": end, "variant": variant, "field": field},
-        }
-
-    points = _downsample(raw, max_points=max_points)
-    values = [v for _, v in raw]
-    return {
-        "points": [{"ts": ts, "value": v} for ts, v in points],
-        "samples": len(raw),
-        "min": min(values),
-        "max": max(values),
-        "slope_per_min": _slope_per_min(raw),
-        "window": {"start": start, "end": end, "variant": variant, "field": field},
-    }
-
-
-def packets_window(
-    start: Any = "-5m",
-    end: Any = "now",
-    *,
-    portnum: str | None = None,
-    from_node: str | None = None,
-    to_node: str | None = None,
-    max: int = 200,
-) -> dict[str, Any]:
-    s = _parse_time(start)
-    e = _parse_time(end)
-    portnums = _split_set(portnum)
-    base = get_recorder().base_dir
-    matched = 0
-    out: list[dict[str, Any]] = []
-    for rec in _iter_jsonl(base / "packets.jsonl", since=s, until=e):
-        if portnums and rec.get("portnum") not in portnums:
-            continue
-        if from_node and str(rec.get("from_node")) != str(from_node):
-            continue
-        if to_node and str(rec.get("to_node")) != str(to_node):
-            continue
-        matched += 1
-        out.append(rec)
-        if len(out) > max:
-            out.pop(0)
-    return {
-        "packets": out,
-        "total_matched": matched,
-        "dropped": matched - max if matched > max else 0,
-        "window": {"start": s, "end": e},
-    }
-
-
-def events_window(
-    start: Any = "-1h",
-    end: Any = "now",
-    *,
-    kind: str | None = None,
-    max: int = 200,
-) -> dict[str, Any]:
-    s = _parse_time(start)
-    e = _parse_time(end)
-    kinds = _split_set(kind)
-    base = get_recorder().base_dir
-    matched = 0
-    out: list[dict[str, Any]] = []
-    for rec in _iter_jsonl(base / "events.jsonl", since=s, until=e):
-        if kinds and rec.get("kind") not in kinds:
-            continue
-        matched += 1
-        out.append(rec)
-        if len(out) > max:
-            out.pop(0)
-    return {
-        "events": out,
-        "total_matched": matched,
-        "dropped": matched - max if matched > max else 0,
-        "window": {"start": s, "end": e},
-    }
-
-
-def export(
-    start: Any,
-    end: Any,
-    dest_dir: str,
-    *,
-    streams: list[str] | None = None,
-) -> dict[str, Any]:
-    """Bundle a slice of each requested stream into `dest_dir`.
-
-    For a notebook, a bug report, or a Datadog backfill. Output files
-    are uncompressed JSONL (callers gzip themselves if they want to).
-    """
-    s = _parse_time(start)
-    e = _parse_time(end)
-    selected = streams or ["logs", "telemetry", "packets", "events"]
-    dest = Path(dest_dir)
-    dest.mkdir(parents=True, exist_ok=True)
-
-    base = get_recorder().base_dir
-    paths: dict[str, str] = {}
-    for stream in selected:
-        src = base / f"{stream}.jsonl"
-        if not src.exists() and not list(base.glob(f"{stream}.*.jsonl.gz")):
-            continue
-        out_path = dest / f"{stream}.jsonl"
-        n = 0
-        with out_path.open("w", encoding="utf-8") as fh:
-            for rec in _iter_jsonl(src, since=s, until=e):
-                fh.write(json.dumps(rec, separators=(",", ":")) + "\n")
-                n += 1
-        paths[stream] = str(out_path)
-        paths[f"{stream}_count"] = str(n)
-    return {"dest_dir": str(dest), "paths": paths, "window": {"start": s, "end": e}}
-
-
-# -- helpers ------------------------------------------------------------
-
-
-def _split_set(value: str | None) -> set[str] | None:
-    if not value:
-        return None
-    return {v.strip() for v in value.split("|") if v.strip()}
-
-
-def _field_aliases(field: str) -> list[str]:
-    """Accept snake_case OR camelCase, plus a few legacy aliases."""
-    snake = field
-    camel = _snake_to_camel(field)
-    aliases = {snake, camel}
-    # Old protobuf fields (pre-LocalStats) used different names
-    legacy = {
-        "free_heap": ["free_heap", "freeHeap", "heap_free_bytes", "heapFreeBytes"],
-        "heap_free_bytes": [
-            "heap_free_bytes",
-            "heapFreeBytes",
-            "free_heap",
-            "freeHeap",
-        ],
-        "total_heap": ["total_heap", "totalHeap", "heap_total_bytes", "heapTotalBytes"],
-        "heap_total_bytes": [
-            "heap_total_bytes",
-            "heapTotalBytes",
-            "total_heap",
-            "totalHeap",
-        ],
-    }
-    if field in legacy:
-        aliases.update(legacy[field])
-    return list(aliases)
-
-
-def _snake_to_camel(name: str) -> str:
-    parts = name.split("_")
-    return parts[0] + "".join(p.title() for p in parts[1:])
-
-
-def _downsample(
-    points: list[tuple[float, float]], *, max_points: int
-) -> list[tuple[float, float]]:
-    if len(points) <= max_points:
-        return points
-    # Even-bucket mean. Preserves shape better than nth-sample picking.
-    n = len(points)
-    bucket = n / max_points
-    out: list[tuple[float, float]] = []
-    i = 0
-    for k in range(max_points):
-        end = int((k + 1) * bucket)
-        end = min(end, n)
-        if end <= i:
-            continue
-        chunk = points[i:end]
-        ts = chunk[len(chunk) // 2][0]
-        val = statistics.fmean(v for _, v in chunk)
-        out.append((ts, val))
-        i = end
-    return out
-
-
-def _slope_per_min(points: list[tuple[float, float]]) -> float | None:
-    """Least-squares slope (units per minute). None if too few points."""
-    if len(points) < 2:
-        return None
-    xs = [t for t, _ in points]
-    ys = [v for _, v in points]
-    n = len(xs)
-    mean_x = sum(xs) / n
-    mean_y = sum(ys) / n
-    num = sum((xs[i] - mean_x) * (ys[i] - mean_y) for i in range(n))
-    den = sum((x - mean_x) ** 2 for x in xs)
-    if den == 0:
-        return None
-    slope_per_sec = num / den
-    return slope_per_sec * 60.0
@@ -92,7 +92,6 @@ def _run_capturing(
    cwd: Path | None = None,
    timeout: float | None = None,
    tee_header: str | None = None,
-    extra_env: dict[str, str] | None = None,
 ) -> tuple[int, str, str, float]:
    """Run a subprocess, capture stdout+stderr, optionally tee to the flash log.

@@ -100,9 +99,6 @@ def _run_capturing(
    `subprocess.TimeoutExpired` on timeout (callers map this to their own
    domain-specific error).

-    `extra_env` merges into the subprocess environment (parent env stays
-    intact). Used for `PLATFORMIO_BUILD_FLAGS=-DDEBUG_HEAP=1` and similar.
-
    Fast path: `subprocess.run(capture_output=True)` when no flash log is
    configured (unchanged behavior).

@@ -114,9 +110,6 @@ def _run_capturing(
    """
    log_path = _flash_log_path()
    t0 = time.monotonic()
-    env = None
-    if extra_env:
-        env = {**os.environ, **extra_env}

    if log_path is None:
        # Fast path — unchanged.
@@ -126,7 +119,6 @@ def _run_capturing(
            capture_output=True,
            text=True,
            timeout=timeout,
-            env=env,
        )
        return (
            proc.returncode,
@@ -153,7 +145,6 @@ def _run_capturing(
        stderr=subprocess.PIPE,
        text=True,
        bufsize=1,  # line-buffered
-        env=env,
    )
    stdout_chunks: list[str] = []
    stderr_chunks: list[str] = []
@@ -241,17 +232,12 @@ def run(
    cwd: Path | None = None,
    timeout: float | None = TIMEOUT_DEFAULT,
    check: bool = True,
-    extra_env: dict[str, str] | None = None,
 ) -> PioResult:
    """Invoke `pio <args>` and return captured output.

    `cwd` defaults to the firmware root. `check=True` raises `PioError` on
    non-zero exit; set `check=False` to inspect `returncode` manually.

-    `extra_env` merges into the subprocess environment — used for
-    `PLATFORMIO_BUILD_FLAGS=-DDEBUG_HEAP=1` and similar build-time
-    toggles that can't be expressed as command-line args.
-
    If `MESHTASTIC_MCP_FLASH_LOG` is set, output is also tee'd to that file
    line-by-line as it arrives (for live flash progress in the TUI).
    """
@@ -264,7 +250,6 @@ def run(
            cwd=work_dir,
            timeout=timeout,
            tee_header=f"pio {' '.join(args)}",
-            extra_env=extra_env,
        )
    except subprocess.TimeoutExpired as exc:
        raise PioTimeout(f"pio {' '.join(args)} timed out after {timeout}s") from exc
@@ -1,19 +0,0 @@
-"""Persistent device-log capture.
-
-Singleton `Recorder` subscribes once to the meshtastic pubsub fan-out
-(`meshtastic.log.line`, `meshtastic.receive.*`, `meshtastic.connection.*`)
-and appends to four JSONL files under `mcp-server/.mtlog/`. Pubsub is
-process-global so a single subscription captures every active interface
-(serial / TCP / BLE) without any per-connection bookkeeping.
-
-The recorder is opt-in-by-import: importing this package is a no-op; call
-`get_recorder().start()` (which `server.py` does at FastMCP app init) to
-begin writing. `pause()` / `resume()` exist for the rare case the user
-wants a clean stretch of file (e.g. capturing a known-good baseline).
-"""
-
-from __future__ import annotations
-
-from .recorder import Recorder, get_recorder
-
-__all__ = ["Recorder", "get_recorder"]
@@ -1,309 +0,0 @@
-"""Best-effort parsers for log lines and telemetry packets.
-
-Two flavors of log line cross our pubsub subscription:
-  1. Text-mode path (debug_log_api disabled): the meshtastic Python lib
-     accumulates bytes between protobuf frames and emits the full
-     firmware-formatted line, e.g.
-         "INFO  | 12:34:56 12345 [Main] Booting"
-     — level, HH:MM:SS, uptime seconds, thread bracket, then message.
-  2. LogRecord protobuf path (debug_log_api enabled): the lib calls
-     `_handleLogLine(record.message)` with ONLY the message body. The
-     level/source/time fields on the LogRecord are dropped before
-     pubsub fan-out. We get e.g. just "Booting".
-
-Both arrive on `meshtastic.log.line`. The parser tries to recover a
-level + thread when the prefix is present and falls back to level=None
-otherwise. Consumers who want level filtering on protobuf-mode hosts
-should grep the raw `line` field instead.
-
-Telemetry: `meshtastic.receive.telemetry` packets carry one of several
-metric variants in `packet["decoded"]["telemetry"]`. We flatten the
-chosen variant into a {field: value} dict so callers don't have to
-know the protobuf shape.
-"""
-
-from __future__ import annotations
-
-import re
-from typing import Any
-
-# Match: LEVEL | HH:MM:SS UPTIME [Thread] message
-# HH:MM:SS may be ??:??:?? when RTC isn't valid. The level alternation
-# below is the canonical list — DebugConfiguration.h's MESHTASTIC_LOG_LEVEL_*
-# macros must stay in sync with these strings.
-_LINE_RE = re.compile(
-    r"""
-    ^
-    (?P<level>DEBUG|INFO\ |WARN\ |ERROR|CRIT\ |TRACE|HEAP\ )
-    \s*\|\s*
-    (?P<clock>(?:\d{2}:\d{2}:\d{2})|(?:\?{2}:\?{2}:\?{2}))
-    \s+
-    (?P<uptime>\d+)
-    \s+
-    (?:\[(?P<thread>[^\]]+)\]\s+)?
-    (?P<msg>.*)
-    $
-    """,
-    re.VERBOSE,
-)
-
-# DEBUG_HEAP build prepends `[heap N] ` to every message body, AFTER the
-# thread bracket. See src/RedirectablePrint.cpp:175.
-_HEAP_PREFIX_RE = re.compile(r"^\[heap\s+(?P<heap>\d+)\]\s+(?P<rest>.*)$")
-
-# OSThread leak/free detection. See src/concurrency/OSThread.cpp:89-91.
-# Format: "------ Thread NAME leaked heap A -> B (delta) ------"
-#         "++++++ Thread NAME freed heap A -> B (delta) ++++++"
-_THREAD_HEAP_RE = re.compile(
-    r"""
-    ^[\-+]+\s*
-    Thread\s+(?P<thread>\S+)\s+
-    (?P<kind>leaked|freed)\s+heap\s+
-    (?P<before>-?\d+)\s*->\s*(?P<after>-?\d+)\s+
-    \((?P<delta>-?\d+)\)
-    """,
-    re.VERBOSE,
-)
-
-# Power.cpp:908 periodic heap status (DEBUG_HEAP only).
-# Format: "Heap status: FREE/TOTAL bytes free (DELTA), running R/N threads"
-_HEAP_STATUS_RE = re.compile(
-    r"""
-    Heap\s+status:\s+
-    (?P<free>\d+)\s*/\s*(?P<total>\d+)\s+bytes\s+free
-    (?:\s+\((?P<delta>-?\d+)\))?
-    """,
-    re.VERBOSE,
-)
-
-
-_ANSI_RE = re.compile(r"\x1b\[[0-9;]*[A-Za-z]")
-_HEAP_BRACKET_RE = re.compile(r"^heap\s+(?P<heap>\d+)$")
-
-
-def parse_log_line(line: str) -> dict[str, Any]:
-    """Best-effort decompose a raw firmware log line.
-
-    Returns a dict with at least `line` (the original, unmodified — ANSI
-    codes preserved for fidelity). Adds `level`, `tag`, `clock`,
-    `uptime_s`, and `msg` when the full prefix is present.
-
-    Handles two firmware quirks:
-      - LogRecord.message can carry ANSI color escapes from RedirectablePrint
-        (the BLE/StreamAPI path inherited the colored body in some builds).
-        We strip ANSI before regex matching so the prefix survives.
-      - DEBUG_HEAP injects `[heap N]` after the thread bracket. When NO
-        thread name is set, the heap takes the thread bracket position —
-        looks like `[heap 12345] msg`. We detect that shape and move it
-        out of `tag` and into `heap_free`.
-
-    DEBUG_HEAP-build extras (when `[heap N]` is injected): `heap_free`
-    (bytes), and when a `Thread X leaked|freed heap` line is recognized,
-    `heap_event` = {kind, thread, before, after, delta}.
-
-    Never raises.
-    """
-    out: dict[str, Any] = {"line": line}
-    if not line:
-        return out
-
-    # Strip ANSI escapes BEFORE any regex matching. The original `line`
-    # stays in `out["line"]` for fidelity / future grep.
-    clean = _ANSI_RE.sub("", line)
-
-    m = _LINE_RE.match(clean)
-    msg: str | None = None
-    if m:
-        level = m.group("level").rstrip()
-        out["level"] = level
-        out["clock"] = m.group("clock")
-        try:
-            out["uptime_s"] = int(m.group("uptime"))
-        except (TypeError, ValueError):
-            out["uptime_s"] = None
-        thread = m.group("thread")
-        if thread:
-            # If "thread" is actually the heap prefix taking the bracket
-            # position (DEBUG_HEAP build, no thread set), capture heap
-            # and leave tag unset.
-            hb = _HEAP_BRACKET_RE.match(thread.strip())
-            if hb:
-                try:
-                    out["heap_free"] = int(hb.group("heap"))
-                except (TypeError, ValueError):
-                    pass
-            else:
-                out["tag"] = thread
-        msg = m.group("msg")
-        out["msg"] = msg
-    else:
-        # No prefix — bare LogRecord.message body. Inspect the whole
-        # line for DEBUG_HEAP-style content; the heap-prefix and
-        # thread-leak patterns can survive on either path.
-        msg = clean
-
-    # DEBUG_HEAP per-line heap prefix: `[heap 92344] message`.
-    # Sits AFTER the thread bracket and BEFORE the message body, but
-    # for bare LogRecord lines it's at the start. Match it at the
-    # head of `msg`.
-    if msg:
-        hp = _HEAP_PREFIX_RE.match(msg)
-        if hp:
-            try:
-                out["heap_free"] = int(hp.group("heap"))
-            except (TypeError, ValueError):
-                pass
-            else:
-                # Strip the prefix from `msg` so a grep on the message
-                # body doesn't have to know about it.
-                out["msg"] = hp.group("rest")
-                msg = hp.group("rest")
-
-        # Thread-level leak/free detection.
-        thr = _THREAD_HEAP_RE.search(msg)
-        if thr:
-            try:
-                out["heap_event"] = {
-                    "kind": thr.group("kind"),
-                    "thread": thr.group("thread"),
-                    "before": int(thr.group("before")),
-                    "after": int(thr.group("after")),
-                    "delta": int(thr.group("delta")),
-                }
-            except (TypeError, ValueError):
-                pass
-
-        # Power.cpp periodic "Heap status: F/T bytes free (D), running ..."
-        hs = _HEAP_STATUS_RE.search(msg)
-        if hs:
-            try:
-                out["heap_free"] = int(hs.group("free"))
-                out["heap_total"] = int(hs.group("total"))
-                if hs.group("delta") is not None:
-                    out["heap_delta"] = int(hs.group("delta"))
-            except (TypeError, ValueError):
-                pass
-
-    return out
-
-
-# -- Telemetry ----------------------------------------------------------
-
-# Order matters: meshtastic-python decoded packets use the protobuf
-# `oneof variant` field name (snake_case) as the dict key.
-_TELEMETRY_VARIANTS = (
-    ("device_metrics", "device"),
-    ("local_stats", "local"),
-    ("environment_metrics", "environment"),
-    ("power_metrics", "power"),
-    ("air_quality_metrics", "airQuality"),
-    ("health_metrics", "health"),
-    ("host_metrics", "host"),
-)
-
-
-def extract_telemetry(packet: dict[str, Any]) -> dict[str, Any] | None:
-    """Pull the telemetry variant + flat fields out of a `meshtastic.receive.telemetry`
-    packet. Returns None when the shape isn't what we expect — so the
-    caller can fall back to a generic packets.jsonl row.
-    """
-    if not isinstance(packet, dict):
-        return None
-    decoded = packet.get("decoded")
-    if not isinstance(decoded, dict):
-        return None
-    telem = decoded.get("telemetry")
-    if not isinstance(telem, dict):
-        return None
-    # The Python lib produces dict-of-camelCase keys via MessageToDict.
-    # Try both camelCase and snake_case to be robust to lib version drift.
-    for snake, label in _TELEMETRY_VARIANTS:
-        camel = _snake_to_camel(snake)
-        for key in (snake, camel):
-            value = telem.get(key)
-            if isinstance(value, dict):
-                return {
-                    "variant": label,
-                    "fields": {k: _scalarize(v) for k, v in value.items()},
-                    "time": telem.get("time"),
-                }
-    return None
-
-
-def _snake_to_camel(name: str) -> str:
-    parts = name.split("_")
-    return parts[0] + "".join(p.title() for p in parts[1:])
-
-
-def _scalarize(value: Any) -> Any:
-    """Keep telemetry fields JSON-friendly. Lists/dicts pass through
-    untouched; bytes -> hex string; protobuf enums occasionally arrive
-    as ints (fine) or strings (also fine)."""
-    if isinstance(value, (bytes, bytearray, memoryview)):
-        return bytes(value).hex()
-    return value
-
-
-# -- Generic packet summary ---------------------------------------------
-
-
-def summarize_packet(
-    packet: dict[str, Any], *, payload_hex_len: int = 64
-) -> dict[str, Any]:
-    """Reduce a packet dict to a stable, queryable summary. Drops the
-    full payload bytes — the recorder records summaries, not pcaps.
-    """
-    if not isinstance(packet, dict):
-        return {"raw_type": type(packet).__name__}
-    decoded = packet.get("decoded") if isinstance(packet.get("decoded"), dict) else {}
-    portnum = decoded.get("portnum") if isinstance(decoded, dict) else None
-    payload = decoded.get("payload") if isinstance(decoded, dict) else None
-    payload_hex = None
-    payload_size = None
-    if isinstance(payload, (bytes, bytearray, memoryview)):
-        b = bytes(payload)
-        payload_size = len(b)
-        payload_hex = b[:payload_hex_len].hex() if b else ""
-    elif isinstance(payload, str):
-        # Some decoded payloads (text messages) come as decoded strings.
-        payload_size = len(payload)
-        payload_hex = None  # not bytes
-    return {
-        "from_node": packet.get("fromId") or packet.get("from"),
-        "to_node": packet.get("toId") or packet.get("to"),
-        "portnum": portnum,
-        "hop_limit": packet.get("hopLimit"),
-        "want_ack": packet.get("wantAck"),
-        "rx_rssi": packet.get("rxRssi"),
-        "rx_snr": packet.get("rxSnr"),
-        "channel": packet.get("channel"),
-        "id": packet.get("id"),
-        "payload_size": payload_size,
-        "payload_hex_prefix": payload_hex,
-    }
-
-
-# -- Interface identification ------------------------------------------
-
-
-def interface_label(interface: Any) -> dict[str, Any]:
-    """Stable identifier for the meshtastic interface that emitted an event.
-
-    Used as the `port`/`role` tag on every recorded row. SerialInterface
-    has `devPath`; TCPInterface has `hostname`+`portNumber`; BLEInterface
-    has `address`. Falls back to the class name when none of those exist.
-    """
-    if interface is None:
-        return {"port": None, "role": None}
-    dev_path = getattr(interface, "devPath", None)
-    if dev_path:
-        return {"port": str(dev_path), "role": "serial"}
-    hostname = getattr(interface, "hostname", None)
-    if hostname:
-        port_num = getattr(interface, "portNumber", None)
-        endpoint = f"tcp://{hostname}:{port_num}" if port_num else f"tcp://{hostname}"
-        return {"port": endpoint, "role": "tcp"}
-    address = getattr(interface, "address", None)
-    if address:
-        return {"port": str(address), "role": "ble"}
-    return {"port": type(interface).__name__, "role": None}
@@ -1,467 +0,0 @@
-"""Process-global recorder singleton.
-
-Subscribes once to the meshtastic pubsub fan-out and writes four append-only
-JSONL streams under `mcp-server/.mtlog/`. The pubsub fan-out is
-process-global — a single subscription captures every active interface
-without per-connection bookkeeping.
-
-Files:
-  logs.jsonl      — every `meshtastic.log.line` event (best-effort prefix
-                    parsed for level/tag/uptime; raw `line` always preserved)
-  telemetry.jsonl — `meshtastic.receive.telemetry` packets, flattened by
-                    variant (device / local / environment / power / etc.)
-  packets.jsonl   — every other `meshtastic.receive.*` packet, summarized
-                    (portnum, hops, RSSI/SNR, payload size + 64-byte hex)
-  events.jsonl    — connection lifecycle, node-DB updates, and manual
-                    `mark_event` rows. Lower volume; useful for aligning
-                    timelines.
-
-Pause/resume: `pause()` flips a flag; subscriptions stay registered. The
-write methods short-circuit when paused, so we don't lose ordering when
-resumed (we just have a gap). No queueing.
-"""
-
-from __future__ import annotations
-
-import logging
-import os
-import threading
-import time
-from pathlib import Path
-from typing import Any
-
-from . import parsers
-from .rotating import _RotatingJsonl
-
-_DEFAULT_DIR = Path(__file__).resolve().parents[3] / ".mtlog"
-log = logging.getLogger(__name__)
-
-
-class Recorder:
-    """Singleton write-side of the persistent log capture system."""
-
-    def __init__(self, base_dir: Path | None = None) -> None:
-        self.base_dir = Path(base_dir) if base_dir else _DEFAULT_DIR
-        self._lock = threading.RLock()
-        self._started = False
-        self._paused = False
-        self._pause_reason: str | None = None
-        self._started_at: float | None = None
-        self._handlers: list[tuple[str, Any]] = []
-        self._files: dict[str, _RotatingJsonl] = {}
-
-    # -- lifecycle ----------------------------------------------------
-
-    def start(self) -> None:
-        """Idempotent. Safe to call from FastMCP app startup."""
-        with self._lock:
-            if self._started:
-                return
-            self.base_dir.mkdir(parents=True, exist_ok=True)
-            self._files = {
-                "logs": _RotatingJsonl(self.base_dir / "logs.jsonl"),
-                "telemetry": _RotatingJsonl(self.base_dir / "telemetry.jsonl"),
-                "packets": _RotatingJsonl(self.base_dir / "packets.jsonl"),
-                "events": _RotatingJsonl(self.base_dir / "events.jsonl"),
-            }
-            self._wire_pubsub()
-            self._started = True
-            self._started_at = time.time()
-        # Write the recorder_start marker after the initialization block.
-        # `_write_event()` re-checks recorder state via `_files_snapshot()`,
-        # so keeping this out of the setup block avoids nested lifecycle work.
-        self._write_event(kind="recorder_start", label="recorder_started")
-
-    def stop(self) -> None:
-        with self._lock:
-            if not self._started:
-                return
-            self._unwire_pubsub()
-            for f in self._files.values():
-                f.close()
-            self._files = {}
-            self._started = False
-
-    def pause(self, reason: str | None = None) -> None:
-        # Write the pause marker BEFORE flipping the flag — `_write_event`
-        # short-circuits when paused, so the order matters for this event
-        # to actually land in events.jsonl.
-        self._write_event(
-            kind="recorder_pause",
-            label="paused",
-            note=reason,
-        )
-        with self._lock:
-            self._paused = True
-            self._pause_reason = reason
-
-    def resume(self) -> None:
-        # Mirror of `pause()`: clear the flag first, then write the marker
-        # so it isn't suppressed by the still-paused short-circuit.
-        with self._lock:
-            self._paused = False
-            self._pause_reason = None
-        self._write_event(kind="recorder_resume", label="resumed")
-
-    # -- pubsub wiring ------------------------------------------------
-
-    def _wire_pubsub(self) -> None:
-        from pubsub import pub  # type: ignore[import-untyped]
-
-        # Subscribers — one per topic. Each pubsub publisher sends
-        # keyword args matching its handler's signature; pubsub
-        # introspects the function signature to route args.
-        bindings = [
-            ("meshtastic.log.line", self._on_log_line),
-            ("meshtastic.serial.line", self._on_serial_line),
-            ("meshtastic.receive", self._on_receive),
-            ("meshtastic.receive.telemetry", self._on_telemetry),
-            ("meshtastic.connection.established", self._on_connection_established),
-            ("meshtastic.connection.lost", self._on_connection_lost),
-            ("meshtastic.node.updated", self._on_node_updated),
-        ]
-        for topic, handler in bindings:
-            try:
-                pub.subscribe(handler, topic)
-                self._handlers.append((topic, handler))
-            except Exception as exc:
-                # If pubsub refuses one binding (signature mismatch on
-                # an old lib version), log it and keep the rest.
-                log.warning("Recorder failed to subscribe to %s: %s", topic, exc)
-
-    def _unwire_pubsub(self) -> None:
-        from pubsub import pub  # type: ignore[import-untyped]
-
-        for topic, handler in self._handlers:
-            try:
-                pub.unsubscribe(handler, topic)
-            except Exception:
-                pass
-        self._handlers.clear()
-
-    # -- handlers -----------------------------------------------------
-    #
-    # Pubsub callbacks must never raise. Every handler is wrapped in a
-    # try/except that swallows so a bug here can't take down the
-    # SerialInterface receive thread.
-    #
-    # Threading: handlers fire on whatever thread the meshtastic library
-    # dispatches from (varies by interface), while `stop()` clears
-    # `self._files` under `self._lock`. We snapshot `_files` under the
-    # lock at the top of each handler so a concurrent stop can't
-    # KeyError us mid-write. The actual file write goes through
-    # `_RotatingJsonl` which has its own lock.
-
-    def _files_snapshot(self) -> dict[str, _RotatingJsonl] | None:
-        """Atomic-ish view of `self._files`. Returns None when the recorder
-        is paused or stopped, so handlers can early-exit cleanly without
-        racing `stop()`'s clear."""
-        with self._lock:
-            if not self._started or self._paused:
-                return None
-            return dict(self._files)
-
-    def _on_log_line(self, line: str, interface: Any = None) -> None:
-        files = self._files_snapshot()
-        if files is None:
-            return
-        try:
-            tags = parsers.interface_label(interface)
-            parsed = parsers.parse_log_line(str(line))
-            ts = time.time()
-            record: dict[str, Any] = {
-                "ts": ts,
-                "port": tags["port"],
-                "role": tags["role"],
-                "level": parsed.get("level"),
-                "tag": parsed.get("tag"),
-                "uptime_s": parsed.get("uptime_s"),
-                "line": parsed["line"],
-            }
-            # DEBUG_HEAP enrichments (only present when the firmware
-            # was built with -DDEBUG_HEAP=1). Surface as first-class
-            # fields so logs_window can grep/filter on them and so
-            # heap_free synthesizes a telemetry point below.
-            if "heap_free" in parsed:
-                record["heap_free"] = parsed["heap_free"]
-            if "heap_total" in parsed:
-                record["heap_total"] = parsed["heap_total"]
-            if "heap_delta" in parsed:
-                record["heap_delta"] = parsed["heap_delta"]
-            heap_event = parsed.get("heap_event")
-            if heap_event:
-                record["heap_event"] = heap_event
-            files["logs"].write(record)
-
-            # If the line carried a heap snapshot, also write it as a
-            # synthesized LocalStats-shaped row so telemetry_timeline
-            # picks it up at log cadence (much higher resolution than
-            # the ~60 s LocalStats packet). Tagged source=debug_heap so
-            # consumers can filter if mixing scales is unwanted.
-            heap_free = parsed.get("heap_free")
-            if isinstance(heap_free, int):
-                fields: dict[str, Any] = {"heap_free_bytes": heap_free}
-                heap_total = parsed.get("heap_total")
-                if isinstance(heap_total, int):
-                    fields["heap_total_bytes"] = heap_total
-                files["telemetry"].write(
-                    {
-                        "ts": ts,
-                        "port": tags["port"],
-                        "role": tags["role"],
-                        "from_node": None,
-                        "variant": "local",
-                        "fields": fields,
-                        "source": "debug_heap",
-                    }
-                )
-        except Exception:
-            pass
-
-    def _on_serial_line(self, line: str, port: str | None = None) -> None:
-        """Text-mode passive tap. Fired from `serial_session._drain` when a
-        `pio device monitor` subprocess is running.
-
-        Same parse + heap-synthesis path as `_on_log_line`, but receives
-        the raw text-formatted line (full level/clock/uptime/thread/`[heap N]`/
-        body). On DEBUG_HEAP builds in text mode this gives us per-log-line
-        heap data — far higher cadence than LocalStats, and works without
-        protobuf API mode (no SerialInterface required).
-        """
-        files = self._files_snapshot()
-        if files is None:
-            return
-        try:
-            parsed = parsers.parse_log_line(str(line))
-            ts = time.time()
-            record: dict[str, Any] = {
-                "ts": ts,
-                "port": port,
-                "role": "serial_session",
-                "level": parsed.get("level"),
-                "tag": parsed.get("tag"),
-                "uptime_s": parsed.get("uptime_s"),
-                "line": parsed["line"],
-            }
-            if "heap_free" in parsed:
-                record["heap_free"] = parsed["heap_free"]
-            if "heap_total" in parsed:
-                record["heap_total"] = parsed["heap_total"]
-            if "heap_delta" in parsed:
-                record["heap_delta"] = parsed["heap_delta"]
-            heap_event = parsed.get("heap_event")
-            if heap_event:
-                record["heap_event"] = heap_event
-            files["logs"].write(record)
-
-            # Synthesize a heap_free telemetry sample whenever the line
-            # carries one — same logic as _on_log_line, tagged source so
-            # consumers can distinguish text-mode tap from protobuf path.
-            heap_free = parsed.get("heap_free")
-            if isinstance(heap_free, int):
-                fields: dict[str, Any] = {"heap_free_bytes": heap_free}
-                heap_total = parsed.get("heap_total")
-                if isinstance(heap_total, int):
-                    fields["heap_total_bytes"] = heap_total
-                files["telemetry"].write(
-                    {
-                        "ts": ts,
-                        "port": port,
-                        "role": "serial_session",
-                        "from_node": None,
-                        "variant": "local",
-                        "fields": fields,
-                        "source": "debug_heap_serial",
-                    }
-                )
-        except Exception:
-            pass
-
-    def _on_telemetry(self, packet: dict[str, Any], interface: Any = None) -> None:
-        files = self._files_snapshot()
-        if files is None:
-            return
-        try:
-            tags = parsers.interface_label(interface)
-            extracted = parsers.extract_telemetry(packet)
-            if extracted is None:
-                # Couldn't extract a known variant — fall through to the
-                # generic `_on_receive` path, which will still fire for
-                # this packet via the parent topic.
-                return
-            record = {
-                "ts": time.time(),
-                "port": tags["port"],
-                "role": tags["role"],
-                "from_node": packet.get("fromId") or packet.get("from"),
-                "variant": extracted["variant"],
-                "fields": extracted["fields"],
-                "device_time": extracted.get("time"),
-            }
-            files["telemetry"].write(record)
-        except Exception:
-            pass
-
-    def _on_receive(self, packet: dict[str, Any], interface: Any = None) -> None:
-        # Generic-receive fires for EVERY packet. Telemetry packets get
-        # recorded twice (here and in _on_telemetry) — that's intentional:
-        # packets.jsonl is the universal record, telemetry.jsonl is the
-        # structured timeseries view.
-        files = self._files_snapshot()
-        if files is None:
-            return
-        try:
-            tags = parsers.interface_label(interface)
-            summary = parsers.summarize_packet(packet)
-            record = {
-                "ts": time.time(),
-                "port": tags["port"],
-                "role": tags["role"],
-                **summary,
-            }
-            files["packets"].write(record)
-        except Exception:
-            pass
-
-    def _on_connection_established(self, interface: Any = None) -> None:
-        self._write_event(
-            kind="connection_established",
-            interface=interface,
-        )
-
-    def _on_connection_lost(self, interface: Any = None) -> None:
-        self._write_event(
-            kind="connection_lost",
-            interface=interface,
-        )
-
-    def _on_node_updated(
-        self, node: dict[str, Any] | None = None, interface: Any = None
-    ) -> None:
-        # Lower-volume than packets but informative — node ID, hops away,
-        # last heard. Skip the user dict if absent.
-        try:
-            user = (node or {}).get("user") if isinstance(node, dict) else None
-            self._write_event(
-                kind="node_updated",
-                interface=interface,
-                data={
-                    "num": (node or {}).get("num"),
-                    "id": (user or {}).get("id"),
-                    "short": (user or {}).get("shortName"),
-                    "long": (user or {}).get("longName"),
-                    "hops_away": (node or {}).get("hopsAway"),
-                    "snr": (node or {}).get("snr"),
-                    "last_heard": (node or {}).get("lastHeard"),
-                },
-            )
-        except Exception:
-            pass
-
-    # -- public write helpers -----------------------------------------
-
-    def mark_event(
-        self,
-        label: str,
-        note: str | None = None,
-        data: dict[str, Any] | None = None,
-    ) -> dict[str, Any]:
-        """User-facing marker. Writes to events.jsonl AND emits a
-        synthetic logs.jsonl row tagged level=MARK so timelines align.
-        """
-        ts = self._write_event(kind="mark", label=label, note=note, data=data)
-        # Mirror into logs so a single logs_window grep finds it.
-        files = self._files_snapshot()
-        if files is not None:
-            try:
-                files["logs"].write(
-                    {
-                        "ts": ts,
-                        "port": None,
-                        "role": "marker",
-                        "level": "MARK",
-                        "tag": "mark_event",
-                        "line": f"[mark] {label}" + (f" — {note}" if note else ""),
-                    }
-                )
-            except Exception:
-                pass
-        return {"ts": ts, "label": label}
-
-    def _write_event(
-        self,
-        *,
-        kind: str,
-        label: str | None = None,
-        note: str | None = None,
-        interface: Any = None,
-        data: dict[str, Any] | None = None,
-    ) -> float:
-        ts = time.time()
-        # Lifecycle markers (recorder_start, recorder_pause, recorder_resume)
-        # arrive at choreographed moments — `pause()` writes BEFORE flipping
-        # the flag and `resume()` writes AFTER clearing it, so those calls
-        # see _paused=False here. Other event kinds short-circuit when
-        # paused via the snapshot guard below.
-        files = self._files_snapshot()
-        if files is None:
-            return ts
-        try:
-            tags = parsers.interface_label(interface)
-            files["events"].write(
-                {
-                    "ts": ts,
-                    "kind": kind,
-                    "label": label,
-                    "note": note,
-                    "port": tags["port"],
-                    "role": tags["role"],
-                    "data": data,
-                }
-            )
-        except Exception:
-            pass
-        return ts
-
-    # -- introspection ------------------------------------------------
-
-    def status(self) -> dict[str, Any]:
-        with self._lock:
-            return {
-                "running": self._started,
-                "paused": self._paused,
-                "pause_reason": self._pause_reason,
-                "started_at": self._started_at,
-                "base_dir": str(self.base_dir),
-                "files": {name: f.status() for name, f in self._files.items()},
-            }
-
-    def force_rotate_all(self) -> dict[str, Any]:
-        """Test/admin hook: rotate every stream right now."""
-        with self._lock:
-            files = list(self._files.values())
-        for f in files:
-            f.force_rotate()
-        # `status()` re-acquires `self._lock`; release before calling it.
-        return self.status()
-
-
-# -- module-level singleton accessor ------------------------------------
-
-_INSTANCE_LOCK = threading.Lock()
-_INSTANCE: Recorder | None = None
-
-
-def get_recorder() -> Recorder:
-    """Return the process-global Recorder. Created on first call.
-
-    Honors `MESHTASTIC_MCP_LOG_DIR` env var for the base directory
-    (used by tests to redirect to a tmpdir).
-    """
-    global _INSTANCE
-    with _INSTANCE_LOCK:
-        if _INSTANCE is None:
-            override = os.environ.get("MESHTASTIC_MCP_LOG_DIR")
-            base = Path(override) if override else None
-            _INSTANCE = Recorder(base_dir=base)
-        return _INSTANCE
@@ -1,163 +0,0 @@
-"""Append-only JSONL writer with size-capped rotation.
-
-A `_RotatingJsonl` owns one live `.jsonl` file. Writes are line-delimited
-JSON objects (one row per call). When the live file exceeds `max_bytes`,
-it is closed, gzipped to `<name>.YYYYMMDD-HHMMSS-uuuuuu-NNNNN.jsonl.gz`,
-and the live file resets to empty. Old archives past `keep_archives` are
-unlinked oldest-first.
-
-Size check is amortized — `os.fstat` runs every `check_every` writes,
-not per-write, so the hot path stays at one `fh.write` + one `fh.flush`.
-
-Threading: every public method acquires `self._lock`. The recorder runs
-several pubsub handlers on whatever thread the meshtastic library
-dispatches from (varies by interface), and queries from MCP tool calls
-arrive on the FastMCP request thread, so this lock is not optional.
-"""
-
-from __future__ import annotations
-
-import gzip
-import json
-import os
-import shutil
-import threading
-from datetime import datetime, timezone
-from pathlib import Path
-from typing import Any
-
-
-class _RotatingJsonl:
-    """Append-only JSONL with size rotation. Thread-safe."""
-
-    def __init__(
-        self,
-        path: Path,
-        *,
-        max_bytes: int = 100 * 1024 * 1024,
-        keep_archives: int = 5,
-        check_every: int = 1000,
-    ) -> None:
-        self.path = path
-        self.max_bytes = max_bytes
-        self.keep_archives = keep_archives
-        self.check_every = check_every
-        self._lock = threading.Lock()
-        self._fh: Any = None
-        self._writes_since_check = 0
-        self._rotations = 0
-        self._lines_written = 0
-        self._last_ts: float | None = None
-        self._open()
-
-    # -- lifecycle ----------------------------------------------------
-
-    def _open(self) -> None:
-        self.path.parent.mkdir(parents=True, exist_ok=True)
-        self._fh = self.path.open("a", encoding="utf-8")
-
-    def close(self) -> None:
-        with self._lock:
-            if self._fh is not None:
-                try:
-                    self._fh.close()
-                finally:
-                    self._fh = None
-
-    # -- write --------------------------------------------------------
-
-    def write(self, record: dict[str, Any]) -> None:
-        """Append one JSON object as a line. Triggers rotation if oversized."""
-        line = json.dumps(record, separators=(",", ":"), default=str) + "\n"
-        with self._lock:
-            if self._fh is None:
-                return
-            try:
-                self._fh.write(line)
-                self._fh.flush()
-            except Exception:
-                # Best-effort: a failed write must not crash the pubsub
-                # handler. Caller has no way to react anyway.
-                return
-            self._lines_written += 1
-            ts = record.get("ts")
-            if isinstance(ts, (int, float)):
-                self._last_ts = float(ts)
-            self._writes_since_check += 1
-            if self._writes_since_check >= self.check_every:
-                self._writes_since_check = 0
-                self._maybe_rotate()
-
-    # -- rotation -----------------------------------------------------
-
-    def _maybe_rotate(self) -> None:
-        # Caller holds self._lock.
-        try:
-            size = os.fstat(self._fh.fileno()).st_size
-        except OSError:
-            return
-        if size < self.max_bytes:
-            return
-        self._rotate_locked()
-
-    def _rotate_locked(self) -> None:
-        # Close, gzip-rename, reopen empty, prune oldest archives.
-        try:
-            self._fh.close()
-        except Exception:
-            pass
-        self._fh = None
-        # Microsecond-resolution timestamp + per-instance counter so back-
-        # to-back rotations (small max_bytes, repeated `force_rotate()`,
-        # or chatty test loops) get unique archive filenames. The lex
-        # sort order of `YYYYMMDD-HHMMSS-uuuuuu-NNNNN` is chronological,
-        # which `_prune_archives()` and `log_query._iter_jsonl()` both
-        # rely on.
-        stamp = datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S-%f")
-        archive = self.path.with_suffix(f".{stamp}-{self._rotations:05d}.jsonl.gz")
-        try:
-            with self.path.open("rb") as src, gzip.open(archive, "wb") as dst:
-                shutil.copyfileobj(src, dst, length=1024 * 1024)
-            self.path.unlink()
-        except Exception:
-            # Rotation is best-effort. If gzip fails, leave the file
-            # in place and re-open it; we'll try again next check.
-            pass
-        self._open()
-        self._rotations += 1
-        self._prune_archives()
-
-    def _prune_archives(self) -> None:
-        # Match siblings of self.path.name with `.jsonl.gz` suffix.
-        prefix = self.path.stem  # "logs" for "logs.jsonl"
-        # Archive filenames are already lexicographically chronological.
-        # Prune by name, not mtime, so copied/restored files don't reorder.
-        archives = sorted(self.path.parent.glob(f"{prefix}.*.jsonl.gz"))
-        excess = len(archives) - self.keep_archives
-        for old in archives[: max(0, excess)]:
-            try:
-                old.unlink()
-            except OSError:
-                pass
-
-    def force_rotate(self) -> None:
-        """Test/admin hook: rotate immediately regardless of size."""
-        with self._lock:
-            if self._fh is not None:
-                self._rotate_locked()
-
-    # -- introspection ------------------------------------------------
-
-    def status(self) -> dict[str, Any]:
-        with self._lock:
-            try:
-                size = os.fstat(self._fh.fileno()).st_size if self._fh else 0
-            except OSError:
-                size = 0
-            return {
-                "path": str(self.path),
-                "size": size,
-                "lines": self._lines_written,
-                "last_ts": self._last_ts,
-                "rotations": self._rotations,
-            }
@@ -46,23 +46,7 @@ class SerialSession:


 def _drain(session: SerialSession) -> None:
-    """Reader thread: line-by-line pull stdout into buffer.
-
-    Each line is also published to the `meshtastic.serial.line` pubsub
-    topic so the persistent recorder can capture it without holding its
-    own port. This is the text-mode tap path: when no SerialInterface is
-    open, the firmware emits full formatted lines (level + clock + uptime
-    + thread + `[heap N]` prefix on DEBUG_HEAP builds + body), and we
-    fan them out to whoever is listening. Pubsub is best-effort —
-    publish failures must never block the reader.
-    """
-    # Lazy import: pubsub isn't required just to import this module
-    # (e.g., during static analysis), and we want a clean test surface.
-    try:
-        from pubsub import pub  # type: ignore[import-untyped]
-    except Exception:  # pragma: no cover - defensive
-        pub = None
-
+    """Reader thread: line-by-line pull stdout into buffer."""
    assert session.proc.stdout is not None
    try:
        for line in session.proc.stdout:
@@ -70,16 +54,6 @@ def _drain(session: SerialSession) -> None:
            with session.lock:
                session.buffer.append(line_stripped)
                session.total_lines += 1
-            if pub is not None:
-                try:
-                    pub.sendMessage(
-                        "meshtastic.serial.line",
-                        line=line_stripped,
-                        port=session.port,
-                    )
-                except Exception:
-                    # A subscriber raising must not break the reader.
-                    pass
    except Exception:  # pragma: no cover - defensive
        pass
    finally:
@@ -6,7 +6,6 @@ etc.). Business logic does not live here.

 from __future__ import annotations

-import logging
 from typing import Any

 from mcp.server.fastmcp import FastMCP
@@ -18,34 +17,14 @@ from . import (
    flash,
    hw_tools,
    info,
-    log_query,
    registry,
    serial_session,
 )
 from . import userprefs as userprefs_mod
-from .recorder import get_recorder
-
-log = logging.getLogger(__name__)

 app = FastMCP("meshtastic-mcp")


-def _start_recorder() -> None:
-    # Persistent device-log capture. Starts on first import — pubsub fan-out
-    # is process-global, so subscribing here captures every active interface
-    # (whether opened by an MCP tool, a pytest fixture, or a serial_session).
-    # Files land in mcp-server/.mtlog/ (gitignored). See recorder/recorder.py
-    # for the full design. Recorder startup is best-effort: an unwritable
-    # log dir or pubsub mismatch should not take the MCP server down.
-    try:
-        get_recorder().start()
-    except Exception as exc:
-        log.warning("Failed to start persistent recorder: %s", exc)
-
-
-_start_recorder()
-
-
 # ---------- Discovery & metadata ------------------------------------------


@@ -96,7 +75,6 @@ def build(
    env: str,
    with_manifest: bool = True,
    userprefs: dict[str, Any] | None = None,
-    build_flags: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
    """Build firmware for one env via `pio run -e <env>`.

@@ -108,21 +86,8 @@ def build(
    build via userPrefs.jsonc injection. The file is restored after the build
    completes. Use `userprefs_manifest` to discover available keys. Use
    `userprefs_set` for persistent changes.
-
-    `build_flags` (optional): dict of `-D<NAME>=<VALUE>` macros for this build
-    only, injected via `PLATFORMIO_BUILD_FLAGS`. Common pattern:
-    `build_flags={"DEBUG_HEAP": 1}` enables per-thread leak detection + a
-    `[heap N]` prefix on every log line. The recorder picks the prefix up
-    automatically and synthesizes a high-resolution heap timeline that
-    `telemetry_timeline(field="free_heap")` can read alongside the normal
-    ~60 s LocalStats packets. Pair with `/leakhunt` for classification.
    """
-    return flash.build(
-        env,
-        with_manifest=with_manifest,
-        userprefs_overrides=userprefs,
-        build_flags=build_flags,
-    )
+    return flash.build(env, with_manifest=with_manifest, userprefs_overrides=userprefs)


@app.tool()
@@ -140,7 +105,6 @@ def pio_flash(
    port: str,
    confirm: bool = False,
    userprefs: dict[str, Any] | None = None,
-    build_flags: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
    """Flash firmware via `pio run -e <env> -t upload --upload-port <port>`.

@@ -150,19 +114,8 @@ def pio_flash(

    `userprefs` (optional): dict of `USERPREFS_<KEY>: value` baked into this
    build via userPrefs.jsonc injection; restored after upload.
-
-    `build_flags` (optional): dict of `-D<NAME>=<VALUE>` macros for the
-    rebuild-before-upload, e.g. `{"DEBUG_HEAP": 1}`. Required for the flags
-    to actually land in the uploaded firmware — without it, the implicit
-    rebuild relinks without the env var and silently drops them.
    """
-    return flash.flash(
-        env,
-        port,
-        confirm=confirm,
-        userprefs_overrides=userprefs,
-        build_flags=build_flags,
-    )
+    return flash.flash(env, port, confirm=confirm, userprefs_overrides=userprefs)


@app.tool()
@@ -781,185 +734,3 @@ def picotool_load(uf2_path: str, confirm: bool = False) -> dict[str, Any]:
 def picotool_raw(args: list[str], confirm: bool = False) -> dict[str, Any]:
    """Pass-through to `picotool`. load/reboot/save/erase require confirm=True."""
    return hw_tools.picotool_raw(args, confirm=confirm)
-
-
-# ---------- Persistent device-log capture (recorder) ----------------------
-#
-# The recorder is autouse — it starts at server import and continuously
-# writes every meshtastic pubsub event to JSONL files under .mtlog/. These
-# tools are query-only over those files, plus a few lifecycle controls.
-
-
-@app.tool()
-def logs_window(
-    start: str = "-15m",
-    end: str = "now",
-    grep: str | None = None,
-    level: str | None = None,
-    tag: str | None = None,
-    port: str | None = None,
-    max_lines: int = 200,
-) -> dict[str, Any]:
-    """Recent firmware log lines from the persistent recorder.
-
-    Filters by time window, regex over the line, level (single or
-    pipe-separated set like "WARN|ERROR|CRIT"), thread-name tag, and
-    interface port. Returns up to max_lines most-recent matches.
-
-    Time strings: "-15m", "-2h", "-3d", "now", or ISO 8601.
-
-    Note: lines arriving via the LogRecord protobuf path (when
-    set_debug_log_api(True) is on) come without level prefix — the
-    meshtastic Python lib drops record.level before fan-out. For those,
-    `level` filter won't match; use `grep` instead.
-    """
-    return log_query.logs_window(
-        start=start,
-        end=end,
-        grep=grep,
-        level=level,
-        tag=tag,
-        port=port,
-        max_lines=max_lines,
-    )
-
-
-@app.tool()
-def telemetry_timeline(
-    window: str = "1h",
-    variant: str = "local",
-    field: str = "free_heap",
-    port: str | None = None,
-    max_points: int = 200,
-) -> dict[str, Any]:
-    """Time series of one telemetry field, downsampled to <= max_points.
-
-    `variant` ∈ device, local, environment, power, airQuality, health, host.
-    `field` accepts snake_case or camelCase; common aliases (free_heap ↔
-    heap_free_bytes) are normalized.
-
-    Returns slope_per_min (linear-regression slope, units/minute) so a
-    leak detector can read one number — negative slope on free_heap over
-    a long window indicates a real leak.
-
-    LocalStats variant ("local") cadence is ~60 s (whatever the device's
-    `device_update_interval` is set to), so a 1 h window gives ~60 raw
-    points. Bucket-mean downsampling preserves shape.
-    """
-    return log_query.telemetry_timeline(
-        window=window,
-        variant=variant,
-        field=field,
-        port=port,
-        max_points=max_points,
-    )
-
-
-@app.tool()
-def packets_window(
-    start: str = "-5m",
-    end: str = "now",
-    portnum: str | None = None,
-    from_node: str | None = None,
-    to_node: str | None = None,
-    max: int = 200,
-) -> dict[str, Any]:
-    """Recent mesh packets recorded by the recorder.
-
-    Each row is a summary (portnum, from/to, hop_limit, RSSI/SNR, payload
-    size + first 64 bytes hex) — full payload bytes are not stored.
-    `portnum` accepts a pipe-separated set like "TEXT_MESSAGE_APP|POSITION_APP".
-    """
-    return log_query.packets_window(
-        start=start,
-        end=end,
-        portnum=portnum,
-        from_node=from_node,
-        to_node=to_node,
-        max=max,
-    )
-
-
-@app.tool()
-def events_window(
-    start: str = "-1h",
-    end: str = "now",
-    kind: str | None = None,
-    max: int = 200,
-) -> dict[str, Any]:
-    """Return recorder events: connection lifecycle, node updates, and `mark_event` markers.
-
-    `kind` ∈ recorder_start, recorder_pause, recorder_resume,
-    connection_established, connection_lost, node_updated, mark.
-    Pipe-separated sets ("connection_lost|connection_established") work.
-    """
-    return log_query.events_window(start=start, end=end, kind=kind, max=max)
-
-
-@app.tool()
-def mark_event(
-    label: str,
-    note: str | None = None,
-    data: dict[str, Any] | None = None,
-) -> dict[str, Any]:
-    """Drop a named marker into events.jsonl AND logs.jsonl.
-
-    Useful for aligning a timeline around a known stimulus: call before
-    and after a stress workload, then query telemetry_timeline /
-    logs_window with the markers' timestamps as bounds.
-
-    The marker also lands in logs.jsonl with level=MARK so a single
-    grep over logs picks it up.
-    """
-    return get_recorder().mark_event(label=label, note=note, data=data)
-
-
-@app.tool()
-def recorder_status() -> dict[str, Any]:
-    """Return recorder runtime info: running, paused, file sizes, last_ts per stream.
-
-    Use this to sanity-check that capture is working before you trust a
-    `logs_window` / `telemetry_timeline` result.
-    """
-    return get_recorder().status()
-
-
-@app.tool()
-def recorder_pause(reason: str | None = None) -> dict[str, Any]:
-    """Pause writes to all four streams. Pubsub subscriptions stay active —
-    we just drop events on the floor while paused. Resume with `recorder_resume`.
-
-    Use when capturing a known-good baseline that you don't want to
-    pollute with pre-test noise. Default state is recording; this is
-    rarely needed.
-    """
-    get_recorder().pause(reason=reason)
-    return {"ok": True, "paused": True, "reason": reason}
-
-
-@app.tool()
-def recorder_resume() -> dict[str, Any]:
-    """Resume writes after `recorder_pause`. No-op if already running."""
-    get_recorder().resume()
-    return {"ok": True, "paused": False}
-
-
-@app.tool()
-def recorder_export(
-    start: str,
-    end: str,
-    dest_dir: str,
-    streams: list[str] | None = None,
-) -> dict[str, Any]:
-    """Bundle a slice of the recorder's streams into `dest_dir`.
-
-    Writes one uncompressed JSONL per requested stream (logs / telemetry /
-    packets / events). Useful for: attaching to a bug report, feeding a
-    notebook, or backfilling Datadog after the fact.
-    """
-    return log_query.export(
-        start=start,
-        end=end,
-        dest_dir=dest_dir,
-        streams=streams,
-    )
@@ -1,88 +0,0 @@
-"""Unit tests for the `build_flags` injection on `flash.build()`.
-
-We don't actually run pio here — too slow, requires hardware-aware envs.
-We test the translation layer (`_build_flags_env`) and that the env vars
-are threaded through pio.run correctly via mock.
-"""
-
-from __future__ import annotations
-
-from unittest.mock import patch
-
-from meshtastic_mcp import flash, pio
-
-
-class TestBuildFlagsEnv:
-    def test_simple_value(self) -> None:
-        out = flash._build_flags_env({"DEBUG_HEAP": 1})
-        assert out == {"PLATFORMIO_BUILD_FLAGS": "-DDEBUG_HEAP=1"}
-
-    def test_string_value(self) -> None:
-        out = flash._build_flags_env({"FOO": "bar"})
-        assert out == {"PLATFORMIO_BUILD_FLAGS": "-DFOO=bar"}
-
-    def test_bool_true_is_bare_flag(self) -> None:
-        out = flash._build_flags_env({"DEBUG_HEAP": True})
-        assert out == {"PLATFORMIO_BUILD_FLAGS": "-DDEBUG_HEAP"}
-
-    def test_bool_false_dropped(self) -> None:
-        out = flash._build_flags_env({"DEBUG_HEAP": False, "OTHER": 1})
-        assert out == {"PLATFORMIO_BUILD_FLAGS": "-DOTHER=1"}
-
-    def test_none_dropped(self) -> None:
-        out = flash._build_flags_env({"DEBUG_HEAP": None})
-        assert out == {}
-
-    def test_multiple_combined(self) -> None:
-        out = flash._build_flags_env({"DEBUG_HEAP": 1, "FOO": "x", "BAR": True})
-        # Order isn't guaranteed in dict iteration, so check membership.
-        flags = out["PLATFORMIO_BUILD_FLAGS"].split()
-        assert set(flags) == {"-DDEBUG_HEAP=1", "-DFOO=x", "-DBAR"}
-
-
-class TestBuildPropagatesFlags:
-    def test_extra_env_passed_to_pio_run(self) -> None:
-        # Mock pio.run so we don't actually invoke pio. Capture extra_env.
-        captured = {}
-
-        class _StubResult:
-            returncode = 0
-            stdout = ""
-            stderr = ""
-            duration_s = 0.1
-
-        def _stub(args, **kwargs):
-            captured["args"] = args
-            captured["kwargs"] = kwargs
-            return _StubResult()
-
-        with patch.object(pio, "run", side_effect=_stub):
-            with patch.object(flash, "_artifacts_for", return_value=[]):
-                out = flash.build(
-                    "fake-env",
-                    with_manifest=False,
-                    build_flags={"DEBUG_HEAP": 1},
-                )
-        assert captured["args"] == ["run", "-e", "fake-env"]
-        assert captured["kwargs"]["extra_env"] == {
-            "PLATFORMIO_BUILD_FLAGS": "-DDEBUG_HEAP=1"
-        }
-        assert out["build_flags"] == {"DEBUG_HEAP": 1}
-
-    def test_no_flags_means_no_extra_env(self) -> None:
-        captured = {}
-
-        class _StubResult:
-            returncode = 0
-            stdout = ""
-            stderr = ""
-            duration_s = 0.1
-
-        def _stub(args, **kwargs):
-            captured["kwargs"] = kwargs
-            return _StubResult()
-
-        with patch.object(pio, "run", side_effect=_stub):
-            with patch.object(flash, "_artifacts_for", return_value=[]):
-                flash.build("fake-env", with_manifest=False)
-        assert captured["kwargs"]["extra_env"] is None
@@ -1,548 +0,0 @@
-"""Unit tests for the persistent device-log recorder.
-
-Hardware-free: drives the Recorder through its `_on_*` handlers with
-synthetic packet/line dicts, then queries via log_query. Validates
-prefix parsing, telemetry variant dispatch, marker round-trip, time
-window filtering, downsampling, slope estimation, and gzip rotation
-+ archive pruning.
-"""
-
-from __future__ import annotations
-
-import gzip
-import json
-import logging
-import os
-import time
-from pathlib import Path
-
-import pubsub
-import pytest
-from meshtastic_mcp import log_query
-from meshtastic_mcp.recorder.parsers import (
-    extract_telemetry,
-    interface_label,
-    parse_log_line,
-    summarize_packet,
-)
-from meshtastic_mcp.recorder.recorder import Recorder
-from meshtastic_mcp.recorder.rotating import _RotatingJsonl
-
-# -- isolation: every test gets a fresh Recorder + tmp dir -----------
-
-
-@pytest.fixture
-def recorder(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Recorder:
-    # Redirect both the Recorder and the module-level singleton lookup
-    # to the same tmp dir so log_query queries the same files we write.
-    monkeypatch.setenv("MESHTASTIC_MCP_LOG_DIR", str(tmp_path))
-    monkeypatch.setattr(
-        "meshtastic_mcp.recorder.recorder._INSTANCE", None, raising=False
-    )
-    r = Recorder(base_dir=tmp_path)
-    r.start()
-    monkeypatch.setattr("meshtastic_mcp.recorder.recorder._INSTANCE", r, raising=False)
-    yield r
-    r.stop()
-
-
-class _FakeIface:
-    devPath = "/dev/cu.fake"
-
-
-# -- parsers ---------------------------------------------------------
-
-
-class TestParseLogLine:
-    def test_full_prefix(self) -> None:
-        out = parse_log_line("INFO  | 12:34:56 12345 [Main] Booting")
-        assert out["level"] == "INFO"
-        assert out["tag"] == "Main"
-        assert out["uptime_s"] == 12345
-        assert out["msg"] == "Booting"
-        assert out["clock"] == "12:34:56"
-
-    def test_invalid_clock(self) -> None:
-        out = parse_log_line("WARN  | ??:??:?? 7 [SerialConsole] Boot")
-        assert out["level"] == "WARN"
-        assert out["clock"] == "??:??:??"
-        assert out["uptime_s"] == 7
-
-    def test_no_thread_bracket(self) -> None:
-        out = parse_log_line("DEBUG | 00:00:00 0 raw message body")
-        assert out["level"] == "DEBUG"
-        assert out.get("tag") is None
-        assert out["msg"] == "raw message body"
-
-    def test_bare_message(self) -> None:
-        # LogRecord.message path — no level prefix at all.
-        out = parse_log_line("just a bare message")
-        assert "level" not in out or out.get("level") is None
-        assert out["line"] == "just a bare message"
-
-    def test_empty(self) -> None:
-        assert parse_log_line("") == {"line": ""}
-
-    def test_debug_heap_prefix_extracted(self) -> None:
-        out = parse_log_line("INFO  | 12:34:56 12345 [Main] [heap 92344] Booting")
-        assert out["level"] == "INFO"
-        assert out["tag"] == "Main"
-        assert out["heap_free"] == 92344
-        assert out["msg"] == "Booting"
-
-    def test_debug_heap_prefix_on_bare_line(self) -> None:
-        # LogRecord.message path: no level prefix but still has [heap N].
-        out = parse_log_line("[heap 12345] some message")
-        assert out["heap_free"] == 12345
-        assert out["msg"] == "some message"
-
-    def test_thread_leak_event(self) -> None:
-        out = parse_log_line(
-            "HEAP  | 00:00:01 100 [Power] [heap 90000] "
-            "------ Thread MeshPacket leaked heap 92344 -> 90000 (-2344) ------"
-        )
-        assert out["level"] == "HEAP"
-        assert out["heap_free"] == 90000
-        ev = out["heap_event"]
-        assert ev["kind"] == "leaked"
-        assert ev["thread"] == "MeshPacket"
-        assert ev["before"] == 92344
-        assert ev["after"] == 90000
-        assert ev["delta"] == -2344
-
-    def test_thread_freed_event(self) -> None:
-        out = parse_log_line(
-            "++++++ Thread Router freed heap 1000 -> 1500 (500) ++++++"
-        )
-        ev = out["heap_event"]
-        assert ev["kind"] == "freed"
-        assert ev["thread"] == "Router"
-        assert ev["delta"] == 500
-
-    def test_heap_status_periodic(self) -> None:
-        out = parse_log_line(
-            "HEAP  | 00:00:30 30 [Power] "
-            "Heap status: 92344/200000 bytes free (-128), running 8/12 threads"
-        )
-        assert out["heap_free"] == 92344
-        assert out["heap_total"] == 200000
-        assert out["heap_delta"] == -128
-
-
-class TestRecorderDebugHeapSynthesis:
-    def test_log_with_heap_writes_telemetry(self, recorder: "Recorder") -> None:
-        # When a log line carries [heap N], the recorder should also
-        # emit a synthesized telemetry row tagged source=debug_heap.
-        recorder._on_log_line(
-            "INFO  | 00:00:00 1 [Main] [heap 88888] hello",
-            _FakeIface(),
-        )
-        telem = (recorder.base_dir / "telemetry.jsonl").read_text().splitlines()
-        synth = [json.loads(r) for r in telem if '"source":"debug_heap"' in r]
-        assert len(synth) == 1
-        assert synth[0]["fields"]["heap_free_bytes"] == 88888
-        assert synth[0]["variant"] == "local"
-
-    def test_heap_status_writes_total_too(self, recorder: "Recorder") -> None:
-        recorder._on_log_line(
-            "HEAP  | 00:00:30 30 [Power] "
-            "Heap status: 50000/200000 bytes free (-100), running 8/12 threads",
-            _FakeIface(),
-        )
-        telem = (recorder.base_dir / "telemetry.jsonl").read_text().splitlines()
-        synth = [json.loads(r) for r in telem if '"source":"debug_heap"' in r]
-        assert synth[-1]["fields"]["heap_free_bytes"] == 50000
-        assert synth[-1]["fields"]["heap_total_bytes"] == 200000
-
-    def test_no_heap_no_synthesis(self, recorder: "Recorder") -> None:
-        # Plain log line (no [heap N], no Heap status) — telemetry.jsonl
-        # should NOT gain a synth row.
-        before = (recorder.base_dir / "telemetry.jsonl").read_text().count("\n")
-        recorder._on_log_line("INFO  | 00:00:00 1 [Main] just a message", _FakeIface())
-        after = (recorder.base_dir / "telemetry.jsonl").read_text().count("\n")
-        assert after == before
-
-    def test_thread_leak_event_persists_on_log_row(self, recorder: "Recorder") -> None:
-        recorder._on_log_line(
-            "HEAP  | 00:00:01 100 [Power] [heap 90000] "
-            "------ Thread MeshPacket leaked heap 92344 -> 90000 (-2344) ------",
-            _FakeIface(),
-        )
-        rows = [
-            json.loads(r)
-            for r in (recorder.base_dir / "logs.jsonl").read_text().splitlines()
-            if r
-        ]
-        evt_rows = [r for r in rows if r.get("heap_event")]
-        assert len(evt_rows) == 1
-        assert evt_rows[0]["heap_event"]["thread"] == "MeshPacket"
-        assert evt_rows[0]["heap_event"]["delta"] == -2344
-
-
-class TestSerialTap:
-    def test_serial_line_records_log_and_synthesizes_heap(
-        self, recorder: "Recorder"
-    ) -> None:
-        recorder._on_serial_line(
-            "INFO  | 00:00:00 5 [Main] [heap 88888] tap-line",
-            port="/dev/cu.tap",
-        )
-        logs = (recorder.base_dir / "logs.jsonl").read_text().splitlines()
-        telem = (recorder.base_dir / "telemetry.jsonl").read_text().splitlines()
-        log_rows = [json.loads(r) for r in logs if r]
-        # Find the row from this call (port=/dev/cu.tap, role=serial_session)
-        tap_rows = [r for r in log_rows if r.get("port") == "/dev/cu.tap"]
-        assert len(tap_rows) == 1
-        assert tap_rows[0]["role"] == "serial_session"
-        assert tap_rows[0]["level"] == "INFO"
-        assert tap_rows[0]["tag"] == "Main"
-        assert tap_rows[0]["heap_free"] == 88888
-        synth = [json.loads(r) for r in telem if '"source":"debug_heap_serial"' in r]
-        assert len(synth) == 1
-        assert synth[0]["fields"]["heap_free_bytes"] == 88888
-        assert synth[0]["role"] == "serial_session"
-
-    def test_serial_line_thread_leak_event(self, recorder: "Recorder") -> None:
-        recorder._on_serial_line(
-            "HEAP  | 00:00:30 30 [Power] [heap 53484] "
-            "------ Thread Router leaked heap 53612 -> 53484 (-128) ------",
-            port="/dev/cu.tap",
-        )
-        rows = [
-            json.loads(r)
-            for r in (recorder.base_dir / "logs.jsonl").read_text().splitlines()
-            if r
-        ]
-        evt = [r for r in rows if r.get("heap_event")]
-        assert len(evt) == 1
-        assert evt[0]["heap_event"]["thread"] == "Router"
-        assert evt[0]["heap_event"]["delta"] == -128
-        # Heap also synthesized.
-        telem = (recorder.base_dir / "telemetry.jsonl").read_text()
-        assert '"source":"debug_heap_serial"' in telem
-
-    def test_serial_line_pause(self, recorder: "Recorder") -> None:
-        recorder.pause("baseline")
-        recorder._on_serial_line(
-            "INFO  | 00:00:00 1 [t] [heap 1000] dropped",
-            port="/dev/cu.tap",
-        )
-        # Only the pause event row should exist; no tap row.
-        logs = (recorder.base_dir / "logs.jsonl").read_text()
-        assert "dropped" not in logs
-
-    def test_serial_line_handler_swallows_exceptions(
-        self, recorder: "Recorder"
-    ) -> None:
-        # Hostile input — should not raise.
-        recorder._on_serial_line(None, port="/dev/cu.tap")  # type: ignore[arg-type]
-        recorder._on_serial_line(b"\x00\x01\x02\x03", port="/dev/cu.tap")  # type: ignore[arg-type]
-        # Survived.
-
-
-class TestExtractTelemetry:
-    def test_local_stats_camel(self) -> None:
-        pkt = {
-            "decoded": {
-                "telemetry": {
-                    "localStats": {"heap_total_bytes": 1000, "heap_free_bytes": 600}
-                }
-            }
-        }
-        out = extract_telemetry(pkt)
-        assert out is not None
-        assert out["variant"] == "local"
-        assert out["fields"]["heap_free_bytes"] == 600
-
-    def test_device_metrics_snake(self) -> None:
-        pkt = {
-            "decoded": {
-                "telemetry": {"device_metrics": {"battery_level": 88, "voltage": 4.1}}
-            }
-        }
-        out = extract_telemetry(pkt)
-        assert out is not None
-        assert out["variant"] == "device"
-        assert out["fields"]["battery_level"] == 88
-
-    def test_unknown_variant_returns_none(self) -> None:
-        assert extract_telemetry({"decoded": {"telemetry": {"weird": {}}}}) is None
-        assert extract_telemetry({}) is None
-        assert extract_telemetry({"decoded": "not-a-dict"}) is None
-
-
-class TestSummarizePacket:
-    def test_text_with_payload(self) -> None:
-        pkt = {
-            "fromId": "!abc",
-            "toId": "!def",
-            "decoded": {"portnum": "TEXT_MESSAGE_APP", "payload": b"hello"},
-            "hopLimit": 3,
-        }
-        out = summarize_packet(pkt)
-        assert out["from_node"] == "!abc"
-        assert out["portnum"] == "TEXT_MESSAGE_APP"
-        assert out["payload_size"] == 5
-        assert out["payload_hex_prefix"] == "68656c6c6f"
-
-    def test_no_decoded(self) -> None:
-        out = summarize_packet({"fromId": "!abc"})
-        assert out["from_node"] == "!abc"
-        assert out["portnum"] is None
-
-
-class TestInterfaceLabel:
-    def test_serial(self) -> None:
-        assert interface_label(_FakeIface()) == {
-            "port": "/dev/cu.fake",
-            "role": "serial",
-        }
-
-    def test_tcp(self) -> None:
-        class T:
-            hostname = "node.lan"
-            portNumber = 4403
-
-        assert interface_label(T()) == {"port": "tcp://node.lan:4403", "role": "tcp"}
-
-    def test_unknown(self) -> None:
-        assert interface_label(object()) == {"port": "object", "role": None}
-
-    def test_none(self) -> None:
-        assert interface_label(None) == {"port": None, "role": None}
-
-
-# -- recorder write side ---------------------------------------------
-
-
-class TestRecorderWrites:
-    def test_log_line_is_recorded(self, recorder: Recorder) -> None:
-        recorder._on_log_line("INFO  | 12:34:56 99 [T] hi", _FakeIface())
-        path = recorder.base_dir / "logs.jsonl"
-        rows = [json.loads(line) for line in path.read_text().splitlines() if line]
-        # First row is recorder_start_event mirror? No — that's events.jsonl only.
-        assert any(r.get("level") == "INFO" and r.get("tag") == "T" for r in rows)
-
-    def test_telemetry_recorded_and_packet_double(self, recorder: Recorder) -> None:
-        # _on_telemetry alone — only telemetry.jsonl
-        recorder._on_telemetry(
-            {
-                "fromId": "!abc",
-                "decoded": {"telemetry": {"localStats": {"heap_free_bytes": 600}}},
-            },
-            _FakeIface(),
-        )
-        telem_rows = (recorder.base_dir / "telemetry.jsonl").read_text().splitlines()
-        assert any('"variant":"local"' in r for r in telem_rows)
-
-    def test_packets_summary(self, recorder: Recorder) -> None:
-        recorder._on_receive(
-            {
-                "fromId": "!abc",
-                "toId": "!def",
-                "decoded": {"portnum": "TEXT_MESSAGE_APP", "payload": b"hi"},
-            },
-            _FakeIface(),
-        )
-        rows = (recorder.base_dir / "packets.jsonl").read_text().splitlines()
-        assert any('"portnum":"TEXT_MESSAGE_APP"' in r for r in rows)
-
-    def test_mark_event_round_trip(self, recorder: Recorder) -> None:
-        out = recorder.mark_event("checkpoint", note="midpoint")
-        assert "ts" in out
-        events = (recorder.base_dir / "events.jsonl").read_text().splitlines()
-        logs = (recorder.base_dir / "logs.jsonl").read_text().splitlines()
-        assert any('"label":"checkpoint"' in r and '"kind":"mark"' in r for r in events)
-        assert any('"level":"MARK"' in r and "checkpoint" in r for r in logs)
-
-    def test_pause_drops_writes(self, recorder: Recorder) -> None:
-        before = len((recorder.base_dir / "logs.jsonl").read_text().splitlines())
-        recorder.pause(reason="baseline")
-        recorder._on_log_line("INFO  | 00:00:00 1 [t] swallowed", _FakeIface())
-        after = len((recorder.base_dir / "logs.jsonl").read_text().splitlines())
-        assert after == before
-        recorder.resume()
-        recorder._on_log_line("INFO  | 00:00:00 2 [t] kept", _FakeIface())
-        post_resume = (recorder.base_dir / "logs.jsonl").read_text()
-        assert "kept" in post_resume
-
-    def test_pubsub_handler_swallows_exceptions(self, recorder: Recorder) -> None:
-        # If the writer dies, the pubsub callback must NOT raise — that
-        # would crash the meshtastic receive thread.
-        bad_packet = object()  # not a dict
-        recorder._on_receive(bad_packet, _FakeIface())  # type: ignore[arg-type]
-        recorder._on_telemetry(bad_packet, _FakeIface())  # type: ignore[arg-type]
-        recorder._on_log_line(None, _FakeIface())  # type: ignore[arg-type]
-        # No assertion needed — survival is the test.
-
-
-# -- log_query read side ---------------------------------------------
-
-
-class TestLogQuery:
-    def test_logs_window_grep_and_level(self, recorder: Recorder) -> None:
-        recorder._on_log_line("INFO  | 12:00:00 1 [A] alpha", _FakeIface())
-        recorder._on_log_line("WARN  | 12:00:01 2 [B] bravo failed", _FakeIface())
-        recorder._on_log_line("ERROR | 12:00:02 3 [C] charlie failed", _FakeIface())
-
-        out = log_query.logs_window(start="-1m", level="WARN|ERROR", max_lines=10)
-        assert out["total_matched"] == 2
-        levels = {r["level"] for r in out["lines"]}
-        assert levels == {"WARN", "ERROR"}
-
-        out2 = log_query.logs_window(start="-1m", grep=r"failed$", max_lines=10)
-        assert out2["total_matched"] == 2
-
-    def test_logs_window_invalid_regex(self, recorder: Recorder) -> None:
-        recorder._on_log_line("INFO  | 12:00:00 1 [A] alpha", _FakeIface())
-        with pytest.raises(ValueError, match="invalid grep regex"):
-            log_query.logs_window(start="-1m", grep="(")
-
-    def test_telemetry_timeline_slope_and_downsample(self, recorder: Recorder) -> None:
-        # Synthesize a downward leak: 100 points, free_heap drops 1 byte/sample.
-        base_ts = time.time() - 60
-        for i in range(100):
-            recorder._files["telemetry"].write(
-                {
-                    "ts": base_ts + i * 0.5,
-                    "port": "/dev/cu.fake",
-                    "role": "serial",
-                    "from_node": "!abc",
-                    "variant": "local",
-                    "fields": {"heap_free_bytes": 10000 - i},
-                }
-            )
-
-        out = log_query.telemetry_timeline(
-            window="2m", variant="local", field="free_heap", max_points=10
-        )
-        assert out["samples"] == 100
-        assert len(out["points"]) <= 10
-        # Negative slope (heap dropping). Magnitude: 1 byte every 0.5s = 120/min.
-        assert out["slope_per_min"] is not None
-        assert out["slope_per_min"] < -100
-
-    def test_export_bundles_slice(self, recorder: Recorder, tmp_path: Path) -> None:
-        recorder._on_log_line("INFO  | 00:00:00 1 [t] one", _FakeIface())
-        recorder._on_log_line("INFO  | 00:00:00 2 [t] two", _FakeIface())
-        dest = tmp_path / "bundle"
-        out = log_query.export(start="-1m", end="now", dest_dir=str(dest))
-        assert (dest / "logs.jsonl").exists()
-        assert "logs" in out["paths"]
-
-
-# -- time parser -----------------------------------------------------
-
-
-class TestParseTime:
-    def test_relative(self) -> None:
-        now = 1_000_000.0
-        assert log_query._parse_time("-15m", now=now) == now - 900
-        assert log_query._parse_time("-2h", now=now) == now - 7200
-        assert log_query._parse_time("-1d", now=now) == now - 86400
-
-    def test_now_and_epoch(self) -> None:
-        now = 1_000_000.0
-        assert log_query._parse_time("now", now=now) == now
-        assert log_query._parse_time(now) == now
-
-    def test_iso(self) -> None:
-        ts = log_query._parse_time("2026-01-01T00:00:00Z")
-        assert isinstance(ts, float) and ts > 1_700_000_000
-
-    def test_naive_iso_assumes_utc(self) -> None:
-        assert log_query._parse_time("2026-01-01T00:00:00") == log_query._parse_time(
-            "2026-01-01T00:00:00Z"
-        )
-
-    def test_invalid(self) -> None:
-        with pytest.raises(ValueError):
-            log_query._parse_time("not a time")
-
-
-# -- rotation --------------------------------------------------------
-
-
-class TestRotation:
-    def test_size_cap_rotates_and_gzips(self, tmp_path: Path) -> None:
-        path = tmp_path / "rot.jsonl"
-        r = _RotatingJsonl(path, max_bytes=512, keep_archives=5, check_every=1)
-        for i in range(100):
-            r.write({"ts": float(i), "i": i, "pad": "x" * 40})
-        r.close()
-        archives = sorted(tmp_path.glob("rot.*.jsonl.gz"))
-        assert archives, "expected at least one rotation"
-        # Archive content is valid gzip + valid JSONL
-        with gzip.open(archives[0], "rt") as fh:
-            first = json.loads(fh.readline())
-            assert "ts" in first
-
-    def test_archive_pruning(self, tmp_path: Path) -> None:
-        path = tmp_path / "rot.jsonl"
-        r = _RotatingJsonl(path, max_bytes=200, keep_archives=2, check_every=1)
-        # Force several rotations.
-        for _ in range(8):
-            for i in range(20):
-                r.write({"ts": float(i), "pad": "x" * 30})
-            r.force_rotate()
-        r.close()
-        archives = sorted(tmp_path.glob("rot.*.jsonl.gz"))
-        assert len(archives) <= 2, f"expected ≤2 kept archives, got {len(archives)}"
-
-    def test_archive_pruning_uses_filename_order(self, tmp_path: Path) -> None:
-        path = tmp_path / "rot.jsonl"
-        r = _RotatingJsonl(path, keep_archives=2)
-        old = tmp_path / "rot.20260101-000000-000000-00000.jsonl.gz"
-        mid = tmp_path / "rot.20260101-000001-000000-00000.jsonl.gz"
-        new = tmp_path / "rot.20260101-000002-000000-00000.jsonl.gz"
-        for archive in (old, mid, new):
-            with gzip.open(archive, "wt", encoding="utf-8") as fh:
-                fh.write('{"ts":1}\n')
-        # Deliberately scramble mtimes so lexicographic filename order is
-        # the only stable chronological signal.
-        os.utime(old, (300, 300))
-        os.utime(mid, (100, 100))
-        os.utime(new, (200, 200))
-
-        r._prune_archives()
-        r.close()
-
-        archives = sorted(p.name for p in tmp_path.glob("rot.*.jsonl.gz"))
-        assert archives == [mid.name, new.name]
-
-    def test_force_rotate_when_below_threshold(self, tmp_path: Path) -> None:
-        path = tmp_path / "rot.jsonl"
-        r = _RotatingJsonl(path, max_bytes=10_000_000, check_every=999_999)
-        r.write({"ts": 1.0, "msg": "tiny"})
-        r.force_rotate()
-        r.write({"ts": 2.0, "msg": "after-rotate"})
-        r.close()
-        archives = sorted(tmp_path.glob("rot.*.jsonl.gz"))
-        assert len(archives) == 1
-        assert path.exists()
-        assert "after-rotate" in path.read_text()
-
-
-class TestRecorderLocks:
-    def test_force_rotate_all_returns_status(self, recorder: Recorder) -> None:
-        out = recorder.force_rotate_all()
-        assert out["running"] is True
-        assert out["files"]
-
-    def test_wire_pubsub_logs_subscription_failure(
-        self,
-        tmp_path: Path,
-        monkeypatch: pytest.MonkeyPatch,
-        caplog: pytest.LogCaptureFixture,
-    ) -> None:
-        class FailingPubSubMock:
-            def subscribe(self, callback: object, topic: str) -> None:
-                raise RuntimeError("boom")
-
-        monkeypatch.setattr(pubsub, "pub", FailingPubSubMock())
-        recorder = Recorder(base_dir=tmp_path)
-        with caplog.at_level(logging.WARNING):
-            recorder._wire_pubsub()
-        assert (
-            "Recorder failed to subscribe to meshtastic.log.line: boom" in caplog.text
-        )
@@ -2,7 +2,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [platformio]
-default_envs = tbeam
+default_envs = heltec-v3

 extra_configs =
 	variants/*/*.ini
@@ -57,7 +57,6 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
 	-DMESHTASTIC_EXCLUDE_POWERMON=1
-	-DMESHTASTIC_EXCLUDE_STATUS=1
 	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
 	#-DBUILD_EPOCH=$UNIX_TIME ; set in platformio-custom.py now
 	#-D OLED_PL=1
@@ -68,7 +67,7 @@ monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/2e26010040e028baee72e2093402fa7b3c59e430.zip
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/6bfd1f135e1ebe37afd6050bb4b9964cea3fcfda.zip
 	# renovate: datasource=git-refs depName=meshtastic-OneButton packageName=https://github.com/meshtastic/OneButton gitBranch=master
 	https://github.com/meshtastic/OneButton/archive/fa352d668c53f290cfa480a5f79ad422cd828c70.zip
 	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master
@@ -121,12 +120,12 @@ lib_deps =
 [radiolib_base]
 lib_deps =
 	# renovate: datasource=github-tags depName=RadioLib packageName=jgromes/RadioLib
-	https://github.com/jgromes/RadioLib/archive/refs/tags/7.6.0.zip
+	https://github.com/jgromes/RadioLib/archive/afe72ae46a343e15e3cac7f26ac585c7f98bffe5.zip

 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/1c45ebc7433acb8ba3fe96a6f7deca9c43fa54cf.zip
+	https://github.com/meshtastic/device-ui/archive/4bf593a82100b911ff816dddf7158ffdee2114cd.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -138,9 +137,9 @@ lib_deps =
 	# renovate: datasource=github-tags depName=Adafruit GFX packageName=adafruit/Adafruit-GFX-Library
 	https://github.com/adafruit/Adafruit-GFX-Library/archive/refs/tags/1.12.6.zip
 	# renovate: datasource=github-tags depName=NeoPixel packageName=adafruit/Adafruit_NeoPixel
-	https://github.com/adafruit/Adafruit_NeoPixel/archive/1.15.5.zip
+	https://github.com/adafruit/Adafruit_NeoPixel/archive/refs/tags/1.15.4.zip
 	# renovate: datasource=github-tags depName=Adafruit SSD1306 packageName=adafruit/Adafruit_SSD1306
-	https://github.com/adafruit/Adafruit_SSD1306/archive/2.5.17.zip
+	https://github.com/adafruit/Adafruit_SSD1306/archive/refs/tags/2.5.16.zip
 	# renovate: datasource=github-tags depName=Adafruit BMP280 packageName=adafruit/Adafruit_BMP280_Library
 	https://github.com/adafruit/Adafruit_BMP280_Library/archive/refs/tags/3.0.0.zip
 	# renovate: datasource=github-tags depName=Adafruit BMP085 packageName=adafruit/Adafruit-BMP085-Library
@@ -171,8 +170,8 @@ lib_deps =
 	https://github.com/EmotiBit/EmotiBit_MLX90632/archive/refs/tags/v1.0.8.zip
 	# renovate: datasource=github-tags depName=Adafruit MLX90614 packageName=adafruit/Adafruit_MLX90614
 	https://github.com/adafruit/Adafruit-MLX90614-Library/archive/refs/tags/2.1.6.zip
-	# renovate: datasource=git-refs depName=INA3221 packageName=https://github.com/sgtwilko/INA3221 gitBranch=FixOverflow
-	https://github.com/sgtwilko/INA3221/archive/bb03d7e9bfcc74fc798838a54f4f99738f29fc6a.zip
+	# renovate: datasource=github-tags depName=INA3221_RT packageName=RobTillaart/INA3221_RT
+	https://github.com/RobTillaart/INA3221_RT/archive/refs/tags/0.4.2.zip
 	# renovate: datasource=github-tags depName=QMC5883L Compass packageName=mprograms/QMC5883LCompass
 	https://github.com/mprograms/QMC5883LCompass/archive/refs/tags/v1.2.3.zip
 	# renovate: datasource=github-tags depName=DFRobot_RTU packageName=dfrobot/DFRobot_RTU
@@ -185,22 +184,16 @@ lib_deps =
 	https://github.com/sparkfun/SparkFun_MAX3010x_Sensor_Library/archive/refs/tags/v1.1.2.zip
 	# renovate: datasource=github-tags depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/SparkFun_ICM-20948_ArduinoLibrary
 	https://github.com/sparkfun/SparkFun_ICM-20948_ArduinoLibrary/archive/refs/tags/v1.3.2.zip
-	# renovate: datasource=github-tags depName=TDK InvenSense ICM42670P packageName=tdk-invn-oss/motion.arduino.ICM42670P
-	https://github.com/tdk-invn-oss/motion.arduino.ICM42670P/archive/refs/tags/1.0.8.zip
 	# renovate: datasource=github-tags depName=Adafruit LTR390 Library packageName=adafruit/Adafruit_LTR390
 	https://github.com/adafruit/Adafruit_LTR390/archive/refs/tags/1.1.2.zip
 	# renovate: datasource=github-tags depName=Adafruit PCT2075 packageName=adafruit/Adafruit_PCT2075
 	https://github.com/adafruit/Adafruit_PCT2075/archive/refs/tags/1.0.6.zip
 	# renovate: datasource=github-tags depName=DFRobot_BMM150 packageName=dfrobot/DFRobot_BMM150
 	https://github.com/DFRobot/DFRobot_BMM150/archive/refs/tags/V1.0.0.zip
-	# renovate: datasource=github-tags depName=SparkFun MMC5983MA Magnetometer packageName=sparkfun/SparkFun_MMC5983MA_Magnetometer_Arduino_Library
-	https://github.com/sparkfun/SparkFun_MMC5983MA_Magnetometer_Arduino_Library/archive/v1.1.5.zip
 	# renovate: datasource=github-tags depName=Adafruit_TSL2561 packageName=adafruit/Adafruit_TSL2561
 	https://github.com/adafruit/Adafruit_TSL2561/archive/refs/tags/1.1.3.zip
 	# renovate: datasource=github-tags depName=BH1750_WE packageName=wollewald/BH1750_WE
 	https://github.com/wollewald/BH1750_WE/archive/refs/tags/1.1.10.zip
-	# renovate: datasource=github-tags depName=Adafruit SHTC3 packageName=adafruit/Adafruit_SHTC3
-	https://github.com/adafruit/Adafruit_SHTC3/archive/refs/tags/1.0.2.zip

 ; Common environmental sensor libraries (not included in native / portduino)
 [environmental_extra_common]
@@ -209,6 +202,8 @@ lib_deps =
 	https://github.com/adafruit/Adafruit_BMP3XX/archive/refs/tags/2.1.6.zip
 	# renovate: datasource=github-tags depName=Adafruit MAX1704X packageName=adafruit/Adafruit_MAX1704X
 	https://github.com/adafruit/Adafruit_MAX1704X/archive/refs/tags/1.0.3.zip
+	# renovate: datasource=github-tags depName=Adafruit SHTC3 packageName=adafruit/Adafruit_SHTC3
+	https://github.com/adafruit/Adafruit_SHTC3/archive/refs/tags/1.0.2.zip
 	# renovate: datasource=github-tags depName=Adafruit LPS2X packageName=adafruit/Adafruit_LPS2X
 	https://github.com/adafruit/Adafruit_LPS2X/archive/refs/tags/2.0.6.zip
 	# renovate: datasource=github-tags depName=Adafruit SHT31 packageName=adafruit/Adafruit_SHT31
@@ -230,7 +225,9 @@ lib_deps =
 	# renovate: datasource=github-tags depName=Sensirion I2C SFA3x packageName=sensirion/arduino-i2c-sfa3x
 	https://github.com/Sensirion/arduino-i2c-sfa3x/archive/refs/tags/1.0.0.zip
 	# renovate: datasource=github-tags depName=Sensirion I2C SCD30 packageName=sensirion/arduino-i2c-scd30
-	https://github.com/Sensirion/arduino-i2c-scd30/archive/1.1.1.zip
+	https://github.com/Sensirion/arduino-i2c-scd30/archive/refs/tags/1.0.0.zip
+	# renovate: datasource=github-tags depName=arduino-sht packageName=sensirion/arduino-sht
+	https://github.com/Sensirion/arduino-sht/archive/refs/tags/v1.2.6.zip

 ; Environmental sensors with BSEC2 (Bosch proprietary IAQ)
 [environmental_extra]
@@ -26,8 +26,6 @@ SOFTWARE.*/

 #include "DebugConfiguration.h"

-#include <memory>
-
 #ifdef ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
 #endif
@@ -121,22 +119,27 @@ bool Syslog::vlogf(uint16_t pri, const char *fmt, va_list args)

 bool Syslog::vlogf(uint16_t pri, const char *appName, const char *fmt, va_list args)
 {
-    // First measure the formatted length using a copy of args; passing args directly
-    // to vsnprintf consumes it, and reusing a consumed va_list is undefined behavior.
-    va_list args_measure;
-    va_copy(args_measure, args);
-    int needed = vsnprintf(nullptr, 0, fmt, args_measure);
-    va_end(args_measure);
+    char *message;
+    size_t initialLen;
+    size_t len;
+    bool result;

-    if (needed < 0)
-        return false; // encoding error
+    initialLen = strlen(fmt);

-    auto message = std::unique_ptr<char[]>(new char[static_cast<size_t>(needed) + 1]);
-    int written = vsnprintf(message.get(), static_cast<size_t>(needed) + 1, fmt, args);
-    if (written < 0)
-        return false;
+    message = new char[initialLen + 1];

-    return this->_sendLog(pri, appName, message.get());
+    len = vsnprintf(message, initialLen + 1, fmt, args);
+    if (len > initialLen) {
+        delete[] message;
+        message = new char[len + 1];
+
+        vsnprintf(message, len + 1, fmt, args);
+    }
+
+    result = this->_sendLog(pri, appName, message);
+
+    delete[] message;
+    return result;
 }

 inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *message)
@@ -151,7 +154,7 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
    if (!this->_enabled)
        return false;

-    if ((this->_server == NULL && this->_ip == IPAddress(0, 0, 0, 0)) || this->_port == 0)
+    if ((this->_server == NULL && this->_ip == INADDR_NONE) || this->_port == 0)
        return false;

    // Check priority against priMask values.
--- a/Show More
+++ b/Show More