Merge main into stable

.devcontainer/devcontainer.json

@@ -0,0 +1,13 @@
+{
+	"name": "meshtastic-web",
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-22-bookworm",
+	"features": {
+		"ghcr.io/r3dpoint/devcontainer-features/tailwindcss-standalone-cli:1": {
+			"version": "latest"
+		},
+		"ghcr.io/devcontainers-extra/features/pnpm:2": {
+			"version": "latest"
+		}
+	}
+}
+

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
           set -euo pipefail
 
           # List packages to exclude (full paths under repo root)
-          EXCLUDED_DIRS=("packages/protobufs" "packages/transport-deno")
+          EXCLUDED_DIRS=("packages/protobufs" "packages/transport-deno" "packages/ui" "pacakges/web")
 
           is_excluded() {
             local dir="$1"

.github/workflows/inactive-issue.yml

@@ -0,0 +1,24 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "0 */4 * * *" # every 4 hours
+  workflow_dispatch: # allow manual runs
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v10
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-issue-stale: 60
+          days-before-issue-close: 14
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 60 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          only-issue-labels: "Bug"
+          remove-stale-when-updated: true

.github/workflows/nightly.yml

@@ -97,7 +97,7 @@ jobs:
             ${{ steps.meta.outputs.moving_tag }}
             ${{ steps.meta.outputs.immutable_tag }}
           oci: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           labels: |
             org.opencontainers.image.source=${{ github.repository }}
             org.opencontainers.image.revision=${{ github.sha }}

.github/workflows/release-web.yml

@@ -135,7 +135,7 @@ jobs:
         with:
           context: .
           file: ./packages/web/infra/Containerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: ${{ github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.tag_name != '') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/update-stable-from-master.yml

@@ -15,59 +15,81 @@ jobs:
   update-stable-branch:
     name: Update stable from latest release source
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # need full history for reset/push
+          fetch-depth: 0
+          fetch-tags: true  # IMPORTANT: we need tags to resolve the release commit
 
       - name: Configure Git author
         run: |
           git config user.name  "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Determine source ref & SHA
+      - name: Determine source SHA (prefer tag)
         id: meta
         shell: bash
         run: |
           set -euo pipefail
-          SRC="${{ github.event.release.target_commitish }}"
-          if [ -z "$SRC" ] || ! git ls-remote --exit-code origin "refs/heads/$SRC" >/dev/null 2>&1; then
-            # Fallback to main if target_commitish is empty or not a branch
-            SRC="main"
+
+          TAG="${{ github.event.release.tag_name }}"
+          TARGET="${{ github.event.release.target_commitish || '' }}"
+
+          # Always ensure we have latest remote heads/tags
+          git fetch --tags --prune origin
+
+          SHA=""
+          SRC_DESC=""
+
+          # 1) Prefer the release tag commit
+          if [ -n "${TAG}" ] && git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
+            SHA="$(git rev-list -n1 "${TAG}")"
+            SRC_DESC="tag:${TAG}"
           fi
 
-          echo "Using source branch: $SRC"
-          git fetch origin "$SRC":"refs/remotes/origin/$SRC" --prune
-          SHA="$(git rev-parse "origin/$SRC")"
-          echo "sha=$SHA"   >> "$GITHUB_OUTPUT"
-          echo "src=$SRC"   >> "$GITHUB_OUTPUT"
+          # 2) Fall back to target_commitish if it points to a branch on origin
+          if [ -z "${SHA}" ] && [ -n "${TARGET}" ] && git ls-remote --exit-code --heads origin "${TARGET}" >/dev/null 2>&1; then
+            git fetch origin "${TARGET}:${TARGET}" --prune
+            SHA="$(git rev-parse "${TARGET}^{commit}")"
+            SRC_DESC="branch:${TARGET}"
+          fi
+
+          # 3) Fall back to main if present
+          if [ -z "${SHA}" ] && git ls-remote --exit-code --heads origin "main" >/dev/null 2>&1; then
+            git fetch origin "main:main" --prune
+            SHA="$(git rev-parse "main^{commit}")"
+            SRC_DESC="branch:main"
+          fi
 
-      - name: Prepare local stable branch
+          if [ -z "${SHA}" ]; then
+            echo "::error::Unable to resolve source commit from tag (${TAG}), target_commitish (${TARGET}), or main."
+            exit 1
+          fi
+
+          echo "Using source: ${SRC_DESC}"
+          echo "sha=${SHA}"      >> "$GITHUB_OUTPUT"
+          echo "source=${SRC_DESC}" >> "$GITHUB_OUTPUT"
+
+      - name: Create/reset local stable to SHA
         shell: bash
         run: |
           set -euo pipefail
-          # Ensure we have the remote stable ref if it exists
+          # Make sure we know if remote stable exists (non-fatal if not)
           git fetch origin stable:refs/remotes/origin/stable || true
 
-          if git show-ref --verify --quiet refs/heads/stable; then
-            echo "Local stable exists."
-          elif git show-ref --verify --quiet refs/remotes/origin/stable; then
-            echo "Creating local stable tracking branch from remote."
-            git checkout -b stable --track origin/stable
-          else
-            echo "Creating new local stable branch at source SHA."
-            git checkout -b stable "${{ steps.meta.outputs.sha }}"
-          fi
-
-      - name: Reset stable to source SHA
-        run: |
-          git checkout stable
-          git reset --hard "${{ steps.meta.outputs.sha }}"
+          # Create or reset local stable in one command
+          git checkout -B stable "${{ steps.meta.outputs.sha }}"
           git status --short --branch
 
       - name: Push stable (force-with-lease)
         run: |
-          # Safer than --force; refuses if remote moved unexpectedly
-          git push origin stable --force-with-lease
+          # Safer than --force; refuses if remote moved unexpectedly (protects against races)
+          REMOTE_STABLE_SHA="$(git rev-parse refs/remotes/origin/stable || echo '')"
+          if [ -z "$REMOTE_STABLE_SHA" ]; then
+            # If remote stable doesn't exist, just use --force-with-lease=stable (no SHA)
+            git push origin stable:stable --force-with-lease=stable
+          else
+            # Use the specific SHA for maximum safety
+            git push origin stable:stable --force-with-lease=stable:$REMOTE_STABLE_SHA
+          fi

.gitignore

@@ -9,5 +9,12 @@ __screenshots__*
 npm/
 .idea
 **/LICENSE
+.DS_Store
 
 packages/protobufs/packages/ts/dist
+.pnpm-store/
+
+# Local dev certs
+*.pem
+*.crt
+*.key

README.md

@@ -12,6 +12,9 @@ This monorepo consolidates the official [Meshtastic](https://meshtastic.org) web
 interface and its supporting JavaScript libraries. It aims to provide a unified
 development experience for interacting with Meshtastic devices.
 
+> [!NOTE]
+> You can find the main Meshtastic documentation at https://meshtastic.org/docs/introduction/.
+
 ### Projects within this Monorepo (`packages/`)
 
 All projects are located within the `packages/` directory:
@@ -33,7 +36,7 @@ All `Meshtastic JS` packages (core and transports) are published both to
 
 ---
 
-## Stats
+## Repository activity
 
 | Project        | Repobeats                                                                                                             |
 | :------------- | :-------------------------------------------------------------------------------------------------------------------- |
@@ -74,6 +77,9 @@ Follow the installation instructions on their home page.
    ```
    This command installs all necessary dependencies for all packages within the
    monorepo.
+3. **Install the Buf CLI**
+    Required for building `packages/protobufs`
+    https://buf.build/docs/cli/installation/
 
 ### Running Projects
 
@@ -87,28 +93,18 @@ If you encounter any issues, please report them in our
 [issues tracker](https://github.com/meshtastic/web/issues). Your feedback helps
 improve the stability of future releases
 
-### Contributing
-
-We welcome contributions! Here’s how the deployment flow works for pull
-requests:
-
-- **Preview Deployments:**\
-  Every pull request automatically generates a preview deployment on Vercel.
-  This allows you and reviewers to easily preview changes before merging.
+## Star history
 
-- **Staging Environment (`client-test`):**\
-  Once your PR is merged, your changes will be available on our staging site:
-  [client-test.meshtastic.org](https://client-test.meshtastic.org/).\
-  This environment supports rapid feature iteration and testing without
-  impacting the production site.
+<a href="https://star-history.com/#meshtastic/web&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=meshtastic/web&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=meshtastic/web&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=meshtastic/web&type=Date" width="100%" />
+ </picture>
+</a>
 
-- **Production Releases:**\
-  At regular intervals, stable and fully tested releases are promoted to our
-  production site: [client.meshtastic.org](https://client.meshtastic.org/).\
-  This is the primary interface used by the public to connect with their
-  Meshtastic nodes.
+## Contributors
 
-Please review our
-[Contribution Guidelines](https://github.com/meshtastic/web/blob/main/CONTRIBUTING.md)
-before submitting a pull request. We appreciate your help in making the project
-better!
+<a href="https://github.com/meshtastic/web/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=meshtastic/web" width="100%"/>
+</a>

biome.json

@@ -4,10 +4,13 @@
       "**/*.ts",
       "**/*.tsx",
       "!npm_modules",
-      "!dist",
+      "!**/dist",
+      "!**/protobufs",
+      "!**/.*",
       "!npm",
       "**/*.json",
-      "!**/locales/*-*/*.json"
+      "!**/locales/*-*/*.json",
+      "!**/packages/ui/"
     ],
     "ignoreUnknown": false
   },
@@ -21,7 +24,7 @@
   },
   "linter": {
     "enabled": true,
-    "includes": ["**", "!test/**"],
+    "includes": ["**", "!test/**", "!**/dist/**"],
     "rules": {
       "recommended": true,
       "suspicious": {

package.json

@@ -35,14 +35,15 @@
     "tslog": "^4.9.3"
   },
   "devDependencies": {
-    "@types/node": "^24.3.1",
     "@biomejs/biome": "2.2.4",
+    "@types/node": "^24.3.1",
     "tsdown": "^0.15.0",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
+      "@serialport/bindings-cpp",
       "@tailwindcss/oxide",
       "core-js",
       "esbuild",

packages/core/package.json

@@ -12,6 +12,7 @@
   "license": "GPL-3.0-only",
   "tsdown": {
     "entry": "mod.ts",
+    "platform": "browser",
     "dts": true,
     "format": [
       "esm"

packages/core/src/types.ts

@@ -46,6 +46,7 @@ export enum DeviceStatusEnum {
   DeviceConnected = 5,
   DeviceConfiguring = 6,
   DeviceConfigured = 7,
+  DeviceError = 8,
 }
 
 export type LogEventPacket = LogEvent & { date: Date };

packages/core/src/utils/eventSystem.ts

@@ -387,4 +387,12 @@ export class EventSystem {
    */
   public readonly onQueueStatus: SimpleEventDispatcher<Protobuf.Mesh.QueueStatus> =
     new SimpleEventDispatcher<Protobuf.Mesh.QueueStatus>();
+
+  /**
+   * Fires when a configCompleteId message is received from the device
+   *
+   * @event onConfigComplete
+   */
+  public readonly onConfigComplete: SimpleEventDispatcher<number> =
+    new SimpleEventDispatcher<number>();
 }

packages/core/src/utils/transform/decodePacket.ts

@@ -135,21 +135,27 @@ export const decodePacket = (device: MeshDevice) =>
             }
 
             case "configCompleteId": {
-              if (decodedMessage.payloadVariant.value !== device.configId) {
-                device.log.error(
-                  Types.Emitter[Types.Emitter.HandleFromRadio],
-                  `❌ Invalid config id received from device, expected ${device.configId} but received ${decodedMessage.payloadVariant.value}`,
-                );
-              }
-
               device.log.info(
                 Types.Emitter[Types.Emitter.HandleFromRadio],
-                `⚙️ Valid config id received from device: ${device.configId}`,
+                `⚙️ Received config complete id: ${decodedMessage.payloadVariant.value}`,
               );
 
-              device.updateDeviceStatus(
-                Types.DeviceStatusEnum.DeviceConfigured,
+              // Emit the configCompleteId event for MeshService to handle two-stage flow
+              device.events.onConfigComplete.dispatch(
+                decodedMessage.payloadVariant.value,
               );
+
+              // For backward compatibility: if configId matches, update device status
+              // MeshService will override this behavior for two-stage flow
+              if (decodedMessage.payloadVariant.value === device.configId) {
+                device.log.info(
+                  Types.Emitter[Types.Emitter.HandleFromRadio],
+                  `⚙️ Config id matches device.configId: ${device.configId}`,
+                );
+                device.updateDeviceStatus(
+                  Types.DeviceStatusEnum.DeviceConfigured,
+                );
+              }
               break;
             }
 

packages/ui/components.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": false,
+  "tsx": true,
+  "tailwind": {
+    "config": "",
+    "css": "src/base.css",
+    "baseColor": "slate",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "iconLibrary": "lucide",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks"
+  },
+  "registries": {}
+}