diff --git a/DEVICES.md b/DEVICES.md index e7c4c62..340c871 100644 --- a/DEVICES.md +++ b/DEVICES.md @@ -15,8 +15,18 @@ when `CONFIG_TEDGE=y`; `apps/tedge-agent` is the client with no protocol. Whether a given *board* can is a separate question, answered below. **What is released** for each board is [`release/devices.yml`](release/devices.yml); -every `tedge-*` build listed there points at the entry below that records -its run on the board. +every `full` and `ota` build listed there points at the entry below that +records its run on the board. + +> **Image names before 0.17.0.** The entries below keep the names images had +> when they were measured: `--`, with the variants +> `standalone`, `tedge-full`, `tedge-ota`, `tedge-onboard` (ESP-IDF) and +> `nuttx`. From 0.17.0 every image is named `---`: +> `standalone`, `tedge-full` and `tedge-ota` are now `zephyr-standalone`, +> `zephyr-full` and `zephyr-ota`, `tedge-agent-idf-tedge-onboard-…` is +> `tedge-agent-idf-full-…`, and `tedge-agent-nuttx-…` is +> `tedge-agent-nuttx-full-…`. The README's "Moving a device to the new +> names" has the full table. ## Where they are diff --git a/README.md b/README.md index 8c9ce68..cdf3d0e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,32 @@ -# OPC-UA Server Firmware (Zephyr RTOS) +# Microcontroller devices -Phase 1 firmware that turns a Wi-Fi microcontroller into an **OPC-UA server**, -so a separate collector/gateway can read its data over OPC-UA. Built on -[Zephyr RTOS](https://www.zephyrproject.org/) with the -[open62541](https://www.open62541.org/) OPC-UA stack. +Ready-to-flash firmware that turns Wi-Fi microcontrollers (ESP32, ESP32-S3, +ESP32-C6) into industrial devices: -See [`SCOPE.md`](SCOPE.md) for scope/phasing, and -[`openspec/changes/opcua-server-firmware/`](openspec/changes/opcua-server-firmware/) -for the proposal, design, specs and task breakdown/status. +- **Protocol servers**: Modbus TCP (`modbus-server`), OPC-UA + (`opcua-server`) and SNMP (`snmp-agent`), serving simulated process data + to a collector or gateway. +- **Device management**: with + [tiny-edge](https://github.com/thin-edge/tiny-edge), thin-edge.io's + client for microcontrollers, a device connects directly to Cumulocity: + telemetry, firmware update, remote access, logs, parameters and a cloud + shell. `tedge-agent` is that client with no protocol server. + +The device agent also runs on several operating systems, so they can be +compared on the same board: + +| Operating system | Built with | Apps | Set-up | +|---|---|---|---| +| `zephyr` ([Zephyr RTOS](https://www.zephyrproject.org/)) | west, in this repository | every app | Improv or lab-ztp-provisioner over Bluetooth, or tedge-onboard over USB | +| `idf` (ESP-IDF, FreeRTOS) | idf.py, `apps/tedge-agent-idf/` | `tedge-agent` | tedge-onboard over USB | +| `nuttx` ([NuttX](https://nuttx.apache.org/)) | tiny-edge's NuttX port | `tedge-agent` | tedge-onboard over USB | + +Each image's name says its app, operating system, feature set and board: +`---`, as described below. + +See [`SCOPE.md`](SCOPE.md) for the project's scope, [`DEVICES.md`](DEVICES.md) +for what has been measured on each board, and [`openspec/`](openspec/) for +the specifications and changes. ## Flash a prebuilt image @@ -15,40 +34,57 @@ Every [release](https://github.com/thin-edge/microcontroller-devices/releases) carries ready-to-flash images for these devices — no toolchain, no build: -| Device | Zephyr board | standalone | tedge-full | tedge-ota | tedge-onboard | nuttx | +| Device | Zephyr board | zephyr-standalone | zephyr-full | zephyr-ota | idf-full | nuttx-full | |---|---|---|---|---|---|---| -| ESP32-C6-DevKitC-1 (N4) | `esp32c6_devkitc/esp32c6/hpcore` | `modbus-server`, `opcua-server`, `snmp-agent` | `modbus-server`, `snmp-agent`, `tedge-agent` | `modbus-server`, `snmp-agent`, `tedge-agent` | `tedge-agent-idf` | `tedge-agent` | +| ESP32-C6-DevKitC-1 (N4) | `esp32c6_devkitc/esp32c6/hpcore` | `modbus-server`, `opcua-server`, `snmp-agent` | `modbus-server`, `snmp-agent`, `tedge-agent` | `modbus-server`, `snmp-agent`, `tedge-agent` | `tedge-agent` | `tedge-agent` | | ESP32-S3-DevKitC-1 (N16R8) | `esp32s3_devkitc/esp32s3/procpu` | `modbus-server`, `opcua-server`, `snmp-agent` | `modbus-server`, `snmp-agent`, `tedge-agent` | `modbus-server`, `snmp-agent`, `tedge-agent` | — | `tedge-agent` | | Adafruit QT Py ESP32-S3 (N4R2) | `adafruit_qt_py_esp32s3/esp32s3/procpu` | `modbus-server`, `opcua-server`, `snmp-agent` | `modbus-server`, `snmp-agent`, `tedge-agent` | `modbus-server`, `opcua-server`, `snmp-agent`, `tedge-agent` | — | — | | ESP32-WROOM-32 DevKitC | `esp32_devkitc/esp32/procpu` | `modbus-server`, `opcua-server`, `snmp-agent` | — | `modbus-server`, `tedge-agent` | — | — | | ESP32-CAM (ESP32 + 4 MB PSRAM) | `esp32_devkitc/esp32/procpu` | — | — | `snmp-agent`, `modbus-server`, `tedge-agent` | — | — | -- **standalone** — the protocol server on its own (Modbus TCP, OPC-UA or - SNMP). You give it Wi-Fi over Bluetooth with [Improv](https://www.improv-wifi.com/). -- **tedge-full** — the protocol server plus every thin-edge.io device-management - feature, connected directly to Cumulocity (remote access, firmware update, - logs, parameters, ...). Wi-Fi *and* the Cumulocity tenant arrive over - Bluetooth from [lab-ztp-provisioner](https://github.com/reubenmiller/lab-ztp-provisioner). -- **tedge-ota** — the smallest thin-edge.io image that can still be updated - over the air, plus whatever else fits on that board; the release notes list - each image's features. `tedge-agent` has no protocol server: it is for a - device that is managed and gives Cumulocity remote access to its LAN. -- **tedge-onboard** — `tedge-agent-idf`, the same device agent on ESP-IDF - (FreeRTOS) with every thin-edge.io feature. You set it up over USB with - [tedge-onboard](https://github.com/thin-edge/tiny-edge/tree/main/tools/onboard): - it gives the device your computer's Wi-Fi network and registers it in your - tenant. The images are not signed (ESP-IDF's bootloader, no MCUboot). -- **nuttx** — `tedge-agent` on [NuttX](https://nuttx.apache.org/): tiny-edge's - NuttX agent with every thin-edge.io feature, set up over USB with - `tedge-onboard` like the `tedge-onboard` images (on a DevKitC, the connector labelled - USB). It boots through MCUboot, so a firmware update that cannot connect is - rolled back. The images are not signed with a key: MCUboot checks their - hash. The ESP32-S3 image needs the module's 8 MB of octal PSRAM (an - `N16R8` module, as on the ESP32-S3-DevKitC-1 listed) and does not start - on a module without PSRAM. - -Each image comes as `---` with: +Every image is named `---`, for example +`tedge-agent-nuttx-full-esp32c6-devkitc`. The same name is the firmware name +the device reports and its firmware entry in Cumulocity, so the same app on +each operating system sits side by side: + +- **app** — `modbus-server`, `opcua-server` or `snmp-agent` (a protocol + server), or `tedge-agent`: no protocol server, for a device that is + managed and gives Cumulocity remote access to its LAN. +- **os** — the operating system it runs: + - `zephyr`: [Zephyr RTOS](https://www.zephyrproject.org/), booting through + MCUboot. + - `idf`: ESP-IDF (FreeRTOS), with ESP-IDF's bootloader. These images are + not signed. + - `nuttx`: [NuttX](https://nuttx.apache.org/), tiny-edge's NuttX agent, + booting through MCUboot. The images are not signed with a key: MCUboot + checks their hash. The ESP32-S3 image needs the module's 8 MB of octal + PSRAM (an `N16R8` module, as on the ESP32-S3-DevKitC-1 listed) and does + not start on a module without PSRAM. +- **set** — what is in it: + - `standalone`: the protocol server on its own (Modbus TCP, OPC-UA or + SNMP). You give it Wi-Fi over Bluetooth with + [Improv](https://www.improv-wifi.com/). + - `full`: every thin-edge.io device-management feature, connected directly + to Cumulocity (remote access, firmware update, logs, parameters, ...). + - `ota`: the smallest thin-edge.io image that can still be updated over the + air, plus whatever else fits on that board; the release notes list each + image's features. + + The `zephyr` `full` and `ota` images get Wi-Fi *and* the Cumulocity tenant + over Bluetooth from + [lab-ztp-provisioner](https://github.com/reubenmiller/lab-ztp-provisioner), + or over USB with tedge-onboard. The `idf` and `nuttx` images are set up + over USB with + [tedge-onboard](https://github.com/thin-edge/tiny-edge/tree/main/tools/onboard) + (on a DevKitC, the connector labelled USB): it gives the device your + computer's Wi-Fi network and registers it in your tenant. + +Releases before 0.17.0 named the images `--` (such as +`modbus-server-tedge-full-esp32c6-devkitc`); see +[Moving a device to the new names](#moving-a-device-to-the-new-names). + +Each image comes as `----` with: | File | What it is for | |---|---| @@ -74,7 +110,7 @@ hold **BOOT**, tap **RESET**, release **BOOT**, and connect again. ```sh pip install esptool esptool --chip esp32c6 --before usb-reset erase-flash -esptool --chip esp32c6 --before usb-reset write-flash 0x0 modbus-server-standalone-esp32c6-devkitc-0.4.0.factory.bin +esptool --chip esp32c6 --before usb-reset write-flash 0x0 modbus-server-zephyr-standalone-esp32c6-devkitc-0.17.0.factory.bin ``` Use the chip of your board (`esp32`, `esp32s3`, `esp32c6`). The QT Py ESP32-S3 @@ -86,7 +122,7 @@ bundle, checking first that the board has the flash it was laid out for. Verify downloads with `sha256sum -c SHA256SUMS`. Then provision the device: [Improv](#provisioning-a-device) for -`standalone`, and for `tedge-*` +`standalone`, and for `full` and `ota` [tedge-onboard over USB](#setting-a-device-up-over-usb-with-tedge-onboard) or [lab-ztp-provisioner](#provisioning-wi-fi-and-cumulocity-with-lab-ztp-provisioner). The security notes there apply to prebuilt images too. @@ -95,75 +131,32 @@ Then provision the device: [Improv](#provisioning-a-device) for > Anyone can sign an image such a bootloader accepts: fine for evaluation, > not for production. -## Status - -**Verified end-to-end on real ESP32-WROOM-32 hardware:** the board joins Wi-Fi, -runs the OPC-UA server, advertises over mDNS, and a standard OPC-UA client on -the LAN discovers it as `tedge-opcua.local`, browses the Device object, and -reads live, updating measurements (temperature/humidity/pressure). - -## Targets - -| Board | Zephyr board target | Role | Status | -|-------|---------------------|------|--------| -| ESP32-WROOM-32 | `esp32_devkitc/esp32/procpu` | co-primary | **verified on hardware** | -| Adafruit QT Py ESP32-S3 | `adafruit_qt_py_esp32s3/esp32s3/procpu` | co-primary | **verified on hardware** | -| **ESP32-C6** (WROOM-1-N4) | `esp32c6_devkitc/esp32c6/hpcore` | co-primary | **verified on hardware — all three apps** | -| **ESP32-S3-DevKitC-1** | `esp32s3_devkitc/esp32s3/procpu` | co-primary | **verified on hardware — all three apps** | -| Feather ESP32-S2 TFT | `adafruit_feather_esp32s2_tft/esp32s2` | co-primary | builds & flashes; **Wi-Fi data path broken upstream — see note** | -| Raspberry Pi Pico W | `rpi_pico/rp2040/w` | stretch | config authored, not yet built | -| Host simulation | `native_sim/native/64` | dev / CI | builds & runs (see NSOS note) | - -All hardware targets are Wi-Fi-only (station mode). - -> **ESP32-C6 note — the first RISC-V and Wi-Fi 6 target.** Every other board -> here is Xtensa; the C6 is single-core RISC-V with a Wi-Fi 6 radio, and all -> three applications built for it **without a single source change** — only the -> per-app `boards/` files. That is the strongest evidence so far that -> `lib/common/` and the protocol frontends are genuinely architecture-portable -> rather than accidentally Xtensa-shaped. All three were then verified on -> hardware: SNMP (`snmpget`/`snmpwalk` of the ifTable plus a coldStart trap), -> Modbus TCP (register reads, and a coil+setpoint write spinning the pump sim -> up), and OPC-UA (browsing the Device object, live updating measurements). -> Despite the 4 MB part being the smallest flash in the fleet, even the OPC-UA -> image uses only ~45% of its 1792 KB slot. - -> **ESP32-S2 Feather Wi-Fi note:** the same firmware that works end-to-end on -> the WROOM builds and flashes on the S2, and the S2 *associates* (correct SSID, -> RSSI, and it obtains a DHCP lease), but its **IP data path does not pass -> traffic** under Zephyr 4.4.2: no default gateway is installed, ICMP echo -> requests send but never get a reply, and the network path hangs on the first -> transmit. Systematically ruled out as causes: DHCP-vs-static IP, MAC -> block/override, Wi-Fi power-save, router L2 isolation, Kconfig (`WIFI_ESP32` / -> `NET_L2_WIFI_MGMT` / `NET_L2_ETHERNET` are correct and identical to the working -> WROOM), and RAM starvation (server disabled + enlarged Wi-Fi buffers still -> hang). Diagnose in the field with `CONFIG_APP_PING_TARGET` + the on-display -> `GWPING` line. This is single-core ESP32-S2 Wi-Fi immaturity upstream, not -> firmware config. Paths forward if the S2 is needed: try a newer Zephyr / -> `hal_espressif`, or use ESP-IDF for the S2, or track it via a Zephyr issue. -> **Use the WROOM for real deployments.** - -> **The C6 does *not* repeat the S2 failure.** Worth stating explicitly, since -> the S2 taught us to distrust "associated" as evidence. The C6's Wi-Fi 6 radio -> associates **and passes IPv4 traffic** under the same Zephyr 4.4.2: it takes a -> DHCP lease, answers ICMP with 0% loss over sustained pings, resolves over -> mDNS, and serves SNMP, Modbus TCP and OPC-UA round-trips to external clients. -> Whatever ails the single-core S2 is specific to it, not a general weakness of -> Espressif Wi-Fi under this Zephyr. -> -> Two harmless log lines on the C6 during bring-up: `net_arp: Gateway not set -> for iface 1` in the window before the DHCP lease installs a gateway, and -> `net_dhcpv4: DHCP server provided more DNS servers than can be saved` when the -> router offers more servers than `DNS_SERVER_COUNT` slots. Neither affects -> connectivity. +## Boards + +The release boards are in the table under +[Flash a prebuilt image](#flash-a-prebuilt-image); each has run its images +on hardware (DEVICES.md). The Zephyr apps also build for: + +| Board | Zephyr board target | Status | +|-------|---------------------|--------| +| Feather ESP32-S2 TFT | `adafruit_feather_esp32s2_tft/esp32s2` | builds and flashes; **its Wi-Fi passes no traffic under Zephyr 4.4.2** (below) | +| Raspberry Pi Pico W | `rpi_pico/rp2040/w` | configuration written, not built | +| Host simulation | `native_sim/native/64` | builds and runs; OPC-UA cannot complete a handshake (below) | + +All hardware targets are Wi-Fi-only (station mode). The Zephyr images are +built with **Zephyr v4.4.2** and **Zephyr SDK 1.0.1** (the +`zephyrprojectrtos/zephyr-build` image). -Built and verified with **Zephyr v4.4.2** and **Zephyr SDK 1.0.1** (as shipped -in the `zephyrprojectrtos/zephyr-build` image). +> **ESP32-S2 Feather Wi-Fi:** the S2 associates and takes a DHCP lease, but +> its IP data path passes no traffic under Zephyr 4.4.2: no default gateway +> is installed, pings get no reply, and the first transmit hangs. DHCP or +> static addressing, MAC settings, power save, router isolation, Kconfig and +> RAM have been ruled out. `CONFIG_APP_PING_TARGET` and the display's +> `GWPING` line help diagnose it. Use another board. -> **native_sim note:** `native_sim` uses host-offloaded sockets (NSOS). The -> firmware builds and the OPC-UA server starts, but the OPC-UA handshake cannot -> complete under NSOS because its `select()` does not report readability on -> accepted sockets. Use real hardware for end-to-end OPC-UA testing. +> **native_sim:** `native_sim` uses host-offloaded sockets (NSOS), whose +> `select()` does not report readability on accepted sockets, so an OPC-UA +> client cannot complete its handshake. Use real hardware to test OPC-UA. ## Prerequisites (macOS) @@ -430,7 +423,7 @@ its network over BLE after flashing. ## Setting a device up over USB with tedge-onboard -The `tedge-*` builds are set up from a computer by default. Plug the device +The `full` and `ota` images are set up from a computer by default. Plug the device into a computer with a USB data cable and run [`tedge-onboard`](https://github.com/thin-edge/tiny-edge/tree/main/tools/onboard) there. It finds the device, gives it the computer's Wi-Fi network (the one @@ -447,7 +440,7 @@ or download it from the [tiny-edge releases](https://github.com/thin-edge/tiny-edge/releases) and run `./tedge-onboard`. -A `tedge-*` device with no Wi-Fi network waits for the tool: its status LED +A `full` or `ota` device with no Wi-Fi network waits for the tool: its status LED shows the provisioning pattern (two short blinks, then a pause), and the log says so. To provision it over BLE instead (Improv, or lab-ztp-provisioner), **press the button 3 times within 2 seconds**: it reboots into the Wi-Fi @@ -460,7 +453,7 @@ cannot join it, the device keeps its previous network. On boards with a BLE radio the device can join any network without a rebuild. A `standalone` device with no credentials boots into the **Wi-Fi provisioner** -(a `tedge-*` device does after the button pattern above): it advertises +(a `zephyr` `full` or `ota` device does after the button pattern above): it advertises the [Improv Wi-Fi](https://www.improv-wifi.com/ble/) BLE service, a phone or laptop sends it an SSID and password, and the device checks them by actually joining the network, stores them, and reboots into the application. @@ -591,7 +584,7 @@ it through reset enters the ROM serial bootloader instead): |---|---| | **3 quick presses** within 2 s | Reboot into the provisioner. The stored network is kept until new credentials are verified, so an abandoned attempt returns to it when the window expires. | | **Hold ≥ 10 s**, then release | Erase the stored credentials and reboot into the provisioner. The LED flickers once the erase is armed, so you know before letting go. | -| **2 quick presses** (`tedge-*` images) | Identify: a `zephyr_Identify` event goes to the cloud and the LED fast-blinks for 1 s. The device keeps serving. See [Identifying a device](#identifying-a-device). | +| **2 quick presses** (`full` and `ota` images) | Identify: a `zephyr_Identify` event goes to the cloud and the LED fast-blinks for 1 s. The device keeps serving. See [Identifying a device](#identifying-a-device). | | anything else | Nothing (1 or 4+ presses, presses too slow, a shorter hold). | | a press in the provisioner | Restarts an expired window; authorizes provisioning when `CONFIG_APP_WIFI_PROV_REQUIRE_AUTH=y`. | @@ -623,7 +616,7 @@ gesture on the console. default in an MCUboot build with the provisioner layout), `APP_WIFI_PROV_PRESS_COUNT` (3), `APP_WIFI_PROV_PRESS_WINDOW_MS` (2000), `APP_WIFI_PROV_ERASE_HOLD_S` (10), and for identify `APP_IDENTIFY` (on in -`tedge-*` images), `APP_IDENTIFY_PRESS_COUNT` (2, must differ from the +`full` and `ota` images), `APP_IDENTIFY_PRESS_COUNT` (2, must differ from the provisioning count), `APP_IDENTIFY_DURATION_S` (30). Provisioner (`apps/wifi-provisioner/Kconfig`): `APP_WIFI_PROV_WINDOW_S` (900), `APP_WIFI_PROV_CONNECT_TIMEOUT_S` (30), `APP_WIFI_PROV_REQUIRE_AUTH` (off); set them for the provisioner image with a @@ -1135,6 +1128,7 @@ apps/snmp-agent/ SNMP agent firmware: lib/common (switch sim) + lib/snmp apps/tedge-agent/ device-management agent: lib/common + tiny-edge, no protocol apps/tedge-agent-idf/ the same agent on ESP-IDF (FreeRTOS), set up with tedge-onboard; an ESP-IDF project, built with idf.py (its README.md) +release/devices.yml what a release builds, for which boards (see "Releasing") ├── boards/.conf per-app board overlays (RAM/Wi-Fi tuning) └── points.d//*.toml point library: the app's address map for a collector (see "Point libraries" below) @@ -1142,7 +1136,10 @@ apps/tedge-agent-idf/ the same agent on ESP-IDF (FreeRTOS), set up with tedge-o Each Zephyr firmware is built by targeting its app directory, e.g. `west build -b apps/modbus-server`. `apps/tedge-agent-idf` is an -ESP-IDF project instead: `idf.py build` in its directory. A new protocol becomes a new +ESP-IDF project instead: `idf.py build` in its directory. The NuttX agent +has no directory here: it is tiny-edge's NuttX port, built with tiny-edge's +`ports/nuttx/scripts/build.sh` (see tiny-edge's `ports/nuttx/README.md`, and +`scripts/release/build.sh` for how a release builds it). A new protocol becomes a new `lib/` + `apps/` pair; nothing else needs to change. ### Simulations (per-firmware, selectable) @@ -1315,7 +1312,7 @@ of receive buffers, and an `htop` session over a tunnel fails (DEVICES.md). ## Telemetry in Cumulocity -Every `tedge-*` image publishes its app's measurements, and the client's own +Every `full` and `ota` image publishes its app's measurements, and the client's own health, on thin-edge.io topics over the Cumulocity MQTT Service. Cumulocity only turns them into measurements where a **Smart Function** maps them; a tenant without one shows the device connected, with firmware, restart and @@ -1376,7 +1373,7 @@ out while the device is not associated): | `heap_free` | B (system heap) | | `rssi` | dBm | -**Every `tedge-*` image** — `te/device////m/tedge_health`, every 900 s +**Every `full` and `ota` image** — `te/device////m/tedge_health`, every 900 s (the client's own health; the operator can change the interval with the `tedge` parameter `health_interval_s`): @@ -1392,7 +1389,7 @@ out while the device is not associated): | `resetCause` | Zephyr reset-cause bits of the last boot: 1 pin, 2 software, 4 brown-out, 8 power-on, 16 watchdog, 256 CPU lockup | The measurement type is a Kconfig default -(`CONFIG_APP_TEDGE_MEASUREMENT_TYPE`). On `tedge-full` images an operator can +(`CONFIG_APP_TEDGE_MEASUREMENT_TYPE`). On `full` images an operator can change the interval (`interval_s`) and switch telemetry off (`telemetry`) through the app's parameters, and on the Modbus app also the type (`measurement_type`): a mapping keyed on the topic's last segment keeps @@ -1401,7 +1398,7 @@ working when they do. ## Identifying a device With several identical boards on a bench, the cloud's device list does not -say which board is which. Every `tedge-*` image (`CONFIG_APP_IDENTIFY`) can be +say which board is which. Every `full` and `ota` image (`CONFIG_APP_IDENTIFY`) can be matched both ways. **From the cloud: which board is this device?** Run `tedge identify` as a @@ -1509,10 +1506,10 @@ interface count needs rows added or switched off with `enabled = false`. ## Update over the air from Cumulocity -A `tedge-*` image can replace itself with a newer one from Cumulocity's +A `full` or `ota` image can replace itself with a newer one from Cumulocity's firmware repository. Every release carries `c8y-firmware.json`, listing each `tedge` image with the firmware name it reports -(`--`, e.g. `modbus-server-tedge-full-esp32c6-devkitc`), +(`---`, e.g. `modbus-server-zephyr-full-esp32c6-devkitc`), its version, device type and checksum. Put a release into your tenant with a [go-c8y-cli](https://goc8ycli.netlify.app/) session: @@ -1527,13 +1524,13 @@ install from the device's **Firmware** tab, or: ```sh c8y firmware versions install --device \ - --firmware modbus-server-tedge-full-esp32c6-devkitc --version 0.4.0 + --firmware modbus-server-zephyr-full-esp32c6-devkitc --version 0.17.0 ``` Things to know: - **Only images for the same device.** The firmware name is unique per app, - variant and board, so an entry only ever holds images built for one kind of + operating system, set and board, so an entry only ever holds images built for one kind of hardware; install versions from the entry named after what the device reports. - **Same signing key.** The bootloader accepts only images signed with its @@ -1552,6 +1549,31 @@ Things to know: certificate expires, a year after enrolment; the release notes name every such image. +### Moving a device to the new names + +Releases before 0.17.0 named the images `--`, without +the operating system: `modbus-server-tedge-full-esp32c6-devkitc` is now +`modbus-server-zephyr-full-esp32c6-devkitc`. A device running an image with +an old name finds no newer versions in its old firmware entry. Update it +once from the entry with the new name: + +```sh +c8y firmware versions install --device \ + --firmware modbus-server-zephyr-full-esp32c6-devkitc --version 0.17.0 +``` + +The device installs it like any other update and from then on reports the +new name, so later versions come from the new entry. Delete the old entries +once no device reports their names. + +| Before 0.17.0 | From 0.17.0 | +|---|---| +| `-standalone-` | `-zephyr-standalone-` | +| `-tedge-full-` | `-zephyr-full-` | +| `-tedge-ota-` | `-zephyr-ota-` | +| `tedge-agent-idf-tedge-onboard-` | `tedge-agent-idf-full-` | +| `tedge-agent-nuttx-` | `tedge-agent-nuttx-full-` | + ## Releasing All applications share **one version**, kept in every `apps/*/VERSION` @@ -1625,7 +1647,7 @@ per job, so a run after the first rebuilds little. ```sh docker exec -w /ws/app -e ZEPHYR_SDK_INSTALL_DIR=$SDK zephyr-dev \ - scripts/release/build.sh modbus-server-tedge-full-esp32c6-devkitc + scripts/release/build.sh modbus-server-zephyr-full-esp32c6-devkitc # -> dist/-.{factory.bin,app.bin,zip,meta.json,size.json} # (fails if the image is over budget or grew past release/size-baseline.json) python3 scripts/release/matrix.py --markdown # every build name @@ -1644,7 +1666,7 @@ pull request: ```sh docker exec -w /ws/app -e ZEPHYR_SDK_INSTALL_DIR=$SDK zephyr-dev \ - scripts/release/build.sh modbus-server-tedge-full-esp32c6-devkitc --write-baseline + scripts/release/build.sh modbus-server-zephyr-full-esp32c6-devkitc --write-baseline docker exec -w /ws/app -e ZEPHYR_SDK_INSTALL_DIR=$SDK zephyr-dev \ scripts/release/baseline.sh # or every build (takes a while) ``` @@ -1660,7 +1682,7 @@ fingerprint. Devices change keys only by a flash by cable. **Adding a device or a build.** Its board needs a provisioner layout (`lib/common/dts/layout-*.dtsi`, listed in `sysbuild/provisioning.cmake`) and -board files for each app. For a `tedge-*` build, also a board settings file in +board files for each app. For a `full` or `ota` build, also a board settings file in [`tiny-edge/ports/zephyr/profiles/boards/`](https://github.com/thin-edge/tiny-edge/blob/main/ports/zephyr/profiles/boards/README.md), and a run on the board recorded in DEVICES.md — connection, telemetry, a firmware update that confirms, a tunnel if remote access is in — which the manifest entry diff --git a/SCOPE.md b/SCOPE.md index 6b2290b..b49e1b5 100644 --- a/SCOPE.md +++ b/SCOPE.md @@ -108,7 +108,7 @@ single-purpose devices (OPC-UA today; SNMP/Modbus/CAN as later Phase-2 apps): tiny-edge's FreeRTOS port: no protocol server, set up over USB with `tedge-onboard`. An ESP-IDF project (`idf.py build`), built by the `esp-idf` workflow for the ESP32-C6 and ESP32-S3; the releases carry the ESP32-C6 - image (`tedge-onboard` variant in `release/devices.yml`). + image (`idf-full` variant in `release/devices.yml`). - The thin-edge.io device-management client is not in this repository. It is [tiny-edge](https://github.com/thin-edge/tiny-edge), a Zephyr module (`tedge`) that `west.yml` pins to a release. Apps here opt in with diff --git a/apps/tedge-agent-idf/README.md b/apps/tedge-agent-idf/README.md index 9ff5cc1..ea962c2 100644 --- a/apps/tedge-agent-idf/README.md +++ b/apps/tedge-agent-idf/README.md @@ -14,11 +14,14 @@ Cumulocity and reports its own vitals. | Device type | `thin-edge.io-esp-idf-agent` | | Version | `VERSION`, the same file and format as the Zephyr applications, so a release bumps it with them | -Built and run on the ESP32-C6, and released for it as the `tedge-onboard` -variant: `tedge-agent-idf-tedge-onboard-esp32c6-devkitc-` with +Built and run on the ESP32-C6, and released for it as the `idf-full` +variant: `tedge-agent-idf-full-esp32c6-devkitc-` with `.factory.bin`, `.app.bin`, and `.zip`, like the Zephyr images. The release -build (`scripts/release/build.sh`) names the firmware after the variant and -the board instead of the chip. CI also builds it for the ESP32-S3 (workflow +names it `tedge-agent` (the `apps` section of `release/devices.yml`), so its +images sit beside the Zephyr and NuttX agents' +(`tedge-agent---`). The release build +(`scripts/release/build.sh`) names the firmware after the board, not the +chip. CI also builds it for the ESP32-S3 (workflow `esp-idf`); the S3 image joins the releases once it has run on that board. ## Build diff --git a/cumulocity/README.md b/cumulocity/README.md index fca3e85..a7f1822 100644 --- a/cumulocity/README.md +++ b/cumulocity/README.md @@ -108,7 +108,7 @@ reason, and nothing is applied. ## Shell diagnostics -The `tedge-full` Modbus and agent images of the ESP32-S3-DevKitC and the QT Py +The `zephyr-full` Modbus and agent images of the ESP32-S3-DevKitC and the QT Py ESP32-S3 carry the shell command (`tiny-edge/ports/zephyr/profiles/extras/shell-diagnostics.conf`) for general checks from the device's **Shell** tab. Send `help` to see what the device runs: @@ -124,7 +124,7 @@ the device runs: `net ping` is not offered: Zephyr prints the replies after the command returns, so the cloud would only ever see the `PING ` line. -The ESP32-C6 Modbus `tedge-full` image carries a leaner set +The ESP32-C6 Modbus `zephyr-full` image carries a leaner set (`release/extras/shell-lean.conf`), because the full one costs too much RAM and flash there (DEVICES.md, "Lean cloud shell on the ESP32-C6"). In place of `net iface`, `net conn` and `wifi status` it has: diff --git a/openspec/changes/consistent-image-names/.openspec.yaml b/openspec/changes/consistent-image-names/.openspec.yaml new file mode 100644 index 0000000..ce56180 --- /dev/null +++ b/openspec/changes/consistent-image-names/.openspec.yaml @@ -0,0 +1,2 @@ +schema: spec-driven +created: 2026-11-19 diff --git a/openspec/changes/consistent-image-names/design.md b/openspec/changes/consistent-image-names/design.md new file mode 100644 index 0000000..02f0116 --- /dev/null +++ b/openspec/changes/consistent-image-names/design.md @@ -0,0 +1,83 @@ +## Context + +`release/devices.yml` lists each device's builds as (app, variant). The +firmware name is `--`, and it is everything a person +sees: the release files' stem, the firmware name a device reports, and its +firmware entry in Cumulocity. The operating system only shows where an app +directory (`tedge-agent-idf`) or a variant (`nuttx`) happens to name it. + +The firmware name is at most 47 characters: tiny-edge keeps it in a 48-byte +buffer. + +## Goals / Non-Goals + +**Goals:** + +- Every name says its app, operating system, feature set and board, in that + order, so the same app's images on each operating system sort together. +- The manifest enforces the scheme, so a new build cannot break it. + +**Non-goals:** + +- Renaming app directories, device ids or device types. + +## Decisions + +### 1. `---` + +The app comes first, so `tedge-agent-zephyr-full-…`, `tedge-agent-idf-full-…` +and `tedge-agent-nuttx-full-…` sit side by side. The set drops today's +`tedge-` prefix: `full` and `ota` only exist with thin-edge.io, and +`standalone` says it has none. With the prefix, the longest name would also +be at the 47-character limit, and so would the next. + +Rejected: the operating system first (groups by operating system, but splits +one app's images apart, which is what a comparison needs side by side). + +### 2. `idf` for ESP-IDF + +ESP-IDF includes FreeRTOS. `idf` is short, and is what someone rebuilding +the image uses (`idf.py`). `freertos` would not say that the image is built +with ESP-IDF, and `esp-idf` would add a hyphen to a name that is split on +hyphens. + +### 3. Variants are named `-` + +The manifest's variants become `zephyr-standalone`, `zephyr-full`, +`zephyr-ota`, `idf-full` and `nuttx-full`, and the firmware name keeps its +formula, `--`. The operating system comes from +the variant's `framework` (`zephyr` → `zephyr`, `esp-idf` → `idf`, `nuttx` +→ `nuttx`), and the set from its new `set` field. `matrix.py` checks that +the variant's name is `-`, so the name cannot drift from how the +variant is built. + +### 4. The app name can differ from the app directory + +The ESP-IDF agent's project is `apps/tedge-agent-idf/`, beside the Zephyr +`apps/tedge-agent/`. A top-level `apps:` section in the manifest gives it +the name `tedge-agent`; an app without an entry is named after its +directory. `matrix.py` rejects two builds with the same firmware name. + +### 5. One update moves a device to its new name + +A device installs whatever firmware it is sent. It only compares names to +skip reinstalling the exact name and version it already runs. So a device +on `modbus-server-tedge-ota-esp32c6-devkitc 0.16.0` installs +`modbus-server-zephyr-ota-esp32c6-devkitc 0.17.0` from the new entry, and +from then on it reports the new name. The old entries in Cumulocity stay +until someone deletes them. + +## Risks / Trade-offs + +- A device left on an old name finds no newer version in its old entry. + → The release notes say once that the names changed, and how to move. +- Links to old release files keep working, but the names differ from later + releases. → DEVICES.md records each measurement under the name it had + then, with a note at its top that maps old names to new ones. + +## Migration Plan + +1. Merge; the next release (0.17.0) has the new names. +2. Upload the release with `scripts/release/c8y-upload.sh`, which creates the + new firmware entries. +3. Update each device once from its new entry. diff --git a/openspec/changes/consistent-image-names/proposal.md b/openspec/changes/consistent-image-names/proposal.md new file mode 100644 index 0000000..b8c6c57 --- /dev/null +++ b/openspec/changes/consistent-image-names/proposal.md @@ -0,0 +1,65 @@ +## Why + +The release images showcase one device agent on three operating systems, but +their names only sometimes say which one: + +- Zephyr: never (`modbus-server-tedge-full-esp32c6-devkitc`). +- ESP-IDF: only in the app's name (`tedge-agent-idf-tedge-onboard-esp32c6-devkitc`). +- NuttX: only in the variant (`tedge-agent-nuttx-esp32c6-devkitc`). + +Someone comparing operating systems cannot tell from a release file, a +firmware entry in Cumulocity or the firmware name a device reports which +operating system an image runs, nor which images are the same app. + +## What Changes + +- **BREAKING** Every image is named `---`: + - ``: `modbus-server`, `opcua-server`, `snmp-agent` or `tedge-agent`. + The ESP-IDF agent is `tedge-agent` too; its project stays in + `apps/tedge-agent-idf/`. + - ``: `zephyr`, `idf` (ESP-IDF, which includes FreeRTOS) or `nuttx`. + - ``: `standalone` (the protocol server alone), `full` (every + thin-edge.io feature) or `ota` (connection, telemetry, restart and + firmware update, plus what else fits). + - ``: the device id, as before. + + For example `tedge-agent-zephyr-full-esp32c6-devkitc`, + `tedge-agent-idf-full-esp32c6-devkitc` and + `tedge-agent-nuttx-full-esp32c6-devkitc`. The name is the release files' + stem, the firmware name the image reports, and its firmware entry in + Cumulocity. The longest is 47 characters, the most a device stores. +- The manifest's variants are renamed `-`: `zephyr-standalone`, + `zephyr-full`, `zephyr-ota`, `idf-full` and `nuttx-full`. The manifest + rejects a variant whose name does not match its framework and set, and + two builds with the same firmware name. +- The README's supported-devices table and the release notes show the + variants by operating system. +- A device running an image with an old name moves to the new one with a + single update from the new firmware entry. The device does not compare + firmware names when it installs, so nothing on the device changes. + +## Capabilities + +### New Capabilities + +None. + +### Modified Capabilities + +- `firmware-release`: the variants, the asset stem and the firmware name. + +## Impact + +- `release/devices.yml`, `scripts/release/` (matrix, packaging, notes, + tests), `release/size-baseline.json` (keyed by firmware name), the + README, DEVICES.md (a note on the old names), and the release workflow's + job names. +- Cumulocity: a release uploads under new firmware entries. The old entries + stay; each device needs one update from its new entry. +- No firmware code changes. Local builds, outside the release, keep their own + names (`zephyr-`, and `tedge-agent-idf-` on ESP-IDF). + +## Non-goals + +- Renaming `apps/tedge-agent-idf/` or the Zephyr apps' directories. +- Changing device types, the version scheme or the board ids. diff --git a/openspec/changes/consistent-image-names/specs/firmware-release/spec.md b/openspec/changes/consistent-image-names/specs/firmware-release/spec.md new file mode 100644 index 0000000..732fe86 --- /dev/null +++ b/openspec/changes/consistent-image-names/specs/firmware-release/spec.md @@ -0,0 +1,162 @@ +## RENAMED Requirements + +- FROM: `### Requirement: Three variants per build` +- TO: `### Requirement: Variants name the operating system and the feature set` + +## MODIFIED Requirements + +### Requirement: Variants name the operating system and the feature set + +Each build SHALL be one of these variants, named `-`: + +| Variant | Operating system | Contents | Set-up | +|---|---|---|---| +| `zephyr-standalone` | Zephyr | a protocol app, no `tiny-edge` code | Improv Wi-Fi over BLE | +| `zephyr-full` | Zephyr | every `tiny-edge` feature (`profiles/full.conf`) | lab-ztp-provisioner | +| `zephyr-ota` | Zephyr | at least connection, inventory, health, telemetry, restart and firmware update (`profiles/ota.conf`), plus the extra features its manifest entry lists | lab-ztp-provisioner | +| `idf-full` | ESP-IDF (FreeRTOS) | the device agent with every `tiny-edge` feature | `tedge-onboard` over USB | +| `nuttx-full` | NuttX | tiny-edge's NuttX agent with every feature | `tedge-onboard` over USB | + +`` SHALL follow from the variant's framework (`zephyr`, `idf` for +ESP-IDF, `nuttx`) and `` SHALL be `standalone`, `full` or `ota`; the +manifest SHALL be rejected when a variant's name does not. The Zephyr +`full` and `ota` variants SHALL use the device's shared board-level `tedge` +settings. Every build SHALL be named `--`, where +`` is the app's name in the manifest (the ESP-IDF agent in +`apps/tedge-agent-idf/` is `tedge-agent`), and no two builds SHALL share a +name. The release notes SHALL list each `tedge` image's features as read +from its build configuration. No release image SHALL contain Wi-Fi +credentials, a Cumulocity tenant, or any other site-specific setting. + +#### Scenario: Protocol apps on the C6 and S3 boards + +- **WHEN** a release is built +- **THEN** for each of the ESP32-C6, ESP32-S3-DevKitC and QT Py ESP32-S3, + and each of `modbus-server`, `opcua-server` and `snmp-agent`, there is a + `zephyr-standalone` and a `zephyr-ota` image, and a `zephyr-full` image + wherever its capacity measurement passed + +#### Scenario: One app on several operating systems + +- **WHEN** a release has the device agent for the ESP32-C6 on Zephyr, + ESP-IDF and NuttX +- **THEN** its images are `tedge-agent-zephyr-full-esp32c6-devkitc`, + `tedge-agent-idf-full-esp32c6-devkitc` and + `tedge-agent-nuttx-full-esp32c6-devkitc`, and so are the firmware names + the devices report + +#### Scenario: A variant name that does not match its build + +- **WHEN** the manifest names a NuttX variant `zephyr-full`, or gives two + builds the same firmware name +- **THEN** the matrix job fails with a message naming the variant or the + builds, and no build runs + +#### Scenario: Most capable image on a constrained board + +- **WHEN** `zephyr-full` does not fit or run on a board +- **THEN** that board's `zephyr-ota` image for the app carries every further + feature that passed measurement there, and the notes list them + +#### Scenario: Standalone image + +- **WHEN** a `zephyr-standalone` image is flashed and provisioned over Improv +- **THEN** the device serves its protocol on the provisioned network and makes + no connection to Cumulocity + +#### Scenario: tedge image gets its tenant from provisioning + +- **WHEN** a `zephyr-full` or `zephyr-ota` image is flashed and provisioned + by lab-ztp-provisioner +- **THEN** the device joins the network and enrols with the tenant delivered + in the ZTP bundle, without any tenant having been compiled in + +#### Scenario: No secrets in the build + +- **WHEN** a release build runs +- **THEN** it passes no Wi-Fi, tenant or `*.local.conf` overlay, and the + resulting `.config` has empty `CONFIG_APP_WIFI_SSID` and `CONFIG_TEDGE_C8Y_URL` + +### Requirement: Release assets are complete and named consistently + +For every build, the release SHALL attach, named with the stem +`----` (the firmware name, then the +version): + +- `.factory.bin` — bootloader, application and provisioner merged into + one image to be written at `0x0`; +- `.app.bin` — the signed application image alone; +- `.zip` — the bootloader, the signed application, the signed + provisioner, a `flash.json` giving the chip, flash mode, frequency and size, + each image's offset and partition, the signing key statement, and a + `README.txt` with the flash commands. + +The release SHALL attach `SHA256SUMS` covering every asset. + +#### Scenario: Offsets match the build + +- **WHEN** a bundle is produced for the ESP32-WROOM-32 +- **THEN** `flash.json` places the bootloader at `0x1000` and the application + and provisioner at the `slot0_partition` and `prov_partition` offsets of + that build's devicetree + +#### Scenario: Checksums + +- **WHEN** a user runs `sha256sum -c SHA256SUMS` over the downloaded assets +- **THEN** every asset verifies + +### Requirement: tedge images can be installed over the air from Cumulocity + +Every `tedge` build SHALL report the firmware name +`---` (at most 47 characters), unique per build. Every release SHALL attach `c8y-firmware.json` listing, per `tedge` +build, the firmware name, the version exactly as the image reports it +(`X.Y.Z` or `X.Y.Z-
`), the device type, the `.app.bin` asset name and
+its SHA-256. The project SHALL provide a user-run script that uploads a
+release's `tedge` application images, pre-releases included, into a
+Cumulocity tenant's firmware repository under those names and versions,
+idempotently. The workflow itself SHALL hold no Cumulocity credentials.
+
+#### Scenario: Upload and install
+
+- **WHEN** a user runs the upload script for `v0.4.0` against their tenant
+  and then installs `modbus-server-zephyr-ota-esp32c6-devkitc` `0.4.0` on a C6
+  running an earlier `tedge` image signed with the same key
+- **THEN** the device downloads the image from the tenant, reboots into it,
+  confirms it, reports `modbus-server-zephyr-ota-esp32c6-devkitc 0.4.0`, and the
+  operation succeeds
+
+#### Scenario: Only matching images are offered
+
+- **WHEN** an operator opens the firmware repository entry named after a
+  device's reported firmware name
+- **THEN** every version in it was built for that device, app and operating
+  system
+
+#### Scenario: Running the upload twice
+
+- **WHEN** the upload script is run again for a release already uploaded
+- **THEN** it creates nothing new and reports the existing versions
+
+#### Scenario: Pre-release over the air
+
+- **WHEN** `v0.4.0-rc1` is uploaded and installed on a device running
+  `0.3.x` or `0.4.0-rc0`
+- **THEN** the operation succeeds and the device reports `0.4.0-rc1`
+
+#### Scenario: From a pre-release to the final release
+
+- **WHEN** `0.4.0` is installed on a device running `0.4.0-rc1`
+- **THEN** the install is accepted, succeeds, and the device reports `0.4.0`
+
+#### Scenario: Checksum mismatch
+
+- **WHEN** a downloaded `.app.bin` does not match `SHA256SUMS`
+- **THEN** the script uploads nothing and names the file
+
+#### Scenario: Moving a device to the new names
+
+- **WHEN** a device running `modbus-server-tedge-ota-esp32c6-devkitc` (a name
+  from before 0.17.0) is sent `modbus-server-zephyr-ota-esp32c6-devkitc`
+  `0.17.0`
+- **THEN** it installs it, confirms it, and reports
+  `modbus-server-zephyr-ota-esp32c6-devkitc 0.17.0`
diff --git a/openspec/changes/consistent-image-names/tasks.md b/openspec/changes/consistent-image-names/tasks.md
new file mode 100644
index 0000000..9ee649d
--- /dev/null
+++ b/openspec/changes/consistent-image-names/tasks.md
@@ -0,0 +1,22 @@
+## 1. Manifest
+
+- [x] 1.1 Rename the variants to `zephyr-standalone`, `zephyr-full`, `zephyr-ota`, `idf-full` and `nuttx-full`, with a `set` field each
+- [x] 1.2 Add the `apps:` section, naming `tedge-agent-idf` `tedge-agent`
+- [x] 1.3 `matrix.py`: the app name, `-` checked against the framework and set, unique firmware names, `tedge` from the set, job names `--`
+- [x] 1.4 Tests for the new checks; the existing tests on the new names
+
+## 2. Packaging and notes
+
+- [x] 2.1 Packaging scripts and `meta.json`: the app name, not the directory
+- [x] 2.2 Release notes: variants by operating system, and a one-time note on the new names
+- [x] 2.3 Re-key `release/size-baseline.json`
+
+## 3. Documentation
+
+- [x] 3.1 README: the naming scheme, the regenerated table, examples
+- [x] 3.2 DEVICES.md: a note mapping old names to new ones
+- [ ] 3.3 Sync the `firmware-release` spec (when archiving)
+
+## 4. Check
+
+- [ ] 4.1 Release tests pass; a pull request builds every framework under the new names
diff --git a/release/devices.yml b/release/devices.yml
index 8f5b7b9..192bedd 100644
--- a/release/devices.yml
+++ b/release/devices.yml
@@ -8,7 +8,7 @@
 # OPC-UA runs out of memory beside the client on every board but the QT Py
 # (DEVICES.md), so it ships standalone elsewhere.
 #
-# A tedge-* build is listed only once it has been built *and run* on the
+# A full or ota build is listed only once it has been built *and run* on the
 # board (connection, telemetry, a firmware update that confirms, a tunnel if
 # remote access is in, a protocol read alongside): `measured` points at the
 # DEVICES.md entry that records it.
@@ -20,6 +20,14 @@
 # Adding a device: its board needs a provisioner layout
 # (sysbuild/provisioning.cmake) and board files for each app it builds.
 
+# Every image is named ---: the release files, the
+# firmware name the image reports, and its firmware entry in Cumulocity. A
+# variant is named -:  follows from its framework (zephyr, idf
+# for esp-idf, nuttx), and  is its `set`: standalone (the protocol
+# server alone), full (every thin-edge.io feature) or ota (connection,
+# telemetry, restart and firmware update, plus what else fits). A name is at
+# most 47 characters.
+#
 # How each variant is built. `profile` and the device's `tedge_board_conf` go
 # into EXTRA_CONF_FILE (profile first, so the board's sizes win), then the
 # build's `extra_conf`. `provisioner` selects the Wi-Fi provisioner image.
@@ -36,26 +44,37 @@
 # are NuttX configuration fragments, such as
 # "{tiny-edge}/ports/nuttx/configs/esp32s3-psram-octal.conf".
 variants:
-  standalone:
+  zephyr-standalone:
     description: the protocol server alone; Wi-Fi over Improv BLE
+    set: standalone
     provisioner: improv
-  tedge-full:
+  zephyr-full:
     description: every thin-edge.io feature; Wi-Fi and Cumulocity over lab-ztp-provisioner
+    set: full
     profile: "{tiny-edge}/ports/zephyr/profiles/full.conf"
     provisioner: ztp
-  tedge-ota:
+  zephyr-ota:
     description: connection, telemetry, restart and firmware update, plus what else fits; Wi-Fi and Cumulocity over lab-ztp-provisioner
+    set: ota
     profile: "{tiny-edge}/ports/zephyr/profiles/ota.conf"
     provisioner: ztp
-  tedge-onboard:
+  idf-full:
     description: the device agent on ESP-IDF (FreeRTOS) with every thin-edge.io feature; Wi-Fi and Cumulocity over USB with tedge-onboard
     framework: esp-idf
+    set: full
     provisioner: tedge-onboard
-  nuttx:
+  nuttx-full:
     description: the device agent on NuttX with every thin-edge.io feature; Wi-Fi and Cumulocity over USB with tedge-onboard
     framework: nuttx
+    set: full
     provisioner: tedge-onboard
 
+# An app's name in the image names, where it differs from its directory
+# under apps/.
+apps:
+  tedge-agent-idf:
+    name: tedge-agent
+
 provisioners:
   improv: null
   ztp: apps/wifi-provisioner/overlay-ztp.conf
@@ -72,39 +91,39 @@ devices:
     tedge_board_conf: "{tiny-edge}/ports/zephyr/profiles/boards/esp32c6-devkitc.conf"
     nuttx_board: esp32c6-devkitc
     builds:
-      - { app: modbus-server, variant: standalone, pr: true }
-      - { app: opcua-server, variant: standalone }
-      - { app: snmp-agent, variant: standalone }
+      - { app: modbus-server, variant: zephyr-standalone, pr: true }
+      - { app: opcua-server, variant: zephyr-standalone }
+      - { app: snmp-agent, variant: zephyr-standalone }
       - app: modbus-server
-        variant: tedge-full
+        variant: zephyr-full
         pr: true
         extra_conf:
           - "{tiny-edge}/ports/zephyr/profiles/extras/shell-diagnostics.conf"
           - release/extras/shell-lean.conf
         measured: DEVICES.md#lean-cloud-shell-on-the-esp32-c6-2026-11-11
       - app: modbus-server
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: snmp-agent
-        variant: tedge-full
+        variant: zephyr-full
         pr: true
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: snmp-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: tedge-agent
-        variant: tedge-full
+        variant: zephyr-full
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: tedge-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         pr: true
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: tedge-agent-idf
-        variant: tedge-onboard
+        variant: idf-full
         pr: true
         measured: DEVICES.md#esp-idf-agent-on-the-esp32-c6-2026-11-12
       - app: tedge-agent
-        variant: nuttx
+        variant: nuttx-full
         pr: true
         measured: DEVICES.md#nuttx-agent-on-the-esp32-c6-2026-11-17
 
@@ -117,35 +136,35 @@ devices:
     tedge_board_conf: "{tiny-edge}/ports/zephyr/profiles/boards/esp32s3-devkitc.conf"
     nuttx_board: esp32s3-devkit
     builds:
-      - { app: modbus-server, variant: standalone }
-      - { app: opcua-server, variant: standalone, pr: true }
-      - { app: snmp-agent, variant: standalone }
+      - { app: modbus-server, variant: zephyr-standalone }
+      - { app: opcua-server, variant: zephyr-standalone, pr: true }
+      - { app: snmp-agent, variant: zephyr-standalone }
       - app: modbus-server
-        variant: tedge-full
+        variant: zephyr-full
         pr: true
         extra_conf: ["{tiny-edge}/ports/zephyr/profiles/extras/shell-diagnostics.conf"]
         measured: DEVICES.md#shell-diagnostics-measured-2026-09-22
       - app: modbus-server
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: snmp-agent
-        variant: tedge-full
+        variant: zephyr-full
         pr: true
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: snmp-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: tedge-agent
-        variant: tedge-full
+        variant: zephyr-full
         extra_conf: ["{tiny-edge}/ports/zephyr/profiles/extras/shell-diagnostics.conf"]
         measured: DEVICES.md#shell-diagnostics-measured-2026-09-22
       - app: tedge-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       # Every feature needs the module's 8 MB of octal PSRAM for the mbedTLS
       # heap; the image does not start on a module without PSRAM.
       - app: tedge-agent
-        variant: nuttx
+        variant: nuttx-full
         pr: true
         extra_conf: ["{tiny-edge}/ports/nuttx/configs/esp32s3-psram-octal.conf"]
         measured: DEVICES.md#nuttx-agent-on-the-esp32-s3-2026-11-17
@@ -158,33 +177,33 @@ devices:
     esptool_before: usb-reset
     tedge_board_conf: "{tiny-edge}/ports/zephyr/profiles/boards/qtpy-esp32s3.conf"
     builds:
-      - { app: modbus-server, variant: standalone }
-      - { app: opcua-server, variant: standalone }
-      - { app: snmp-agent, variant: standalone, pr: true }
+      - { app: modbus-server, variant: zephyr-standalone }
+      - { app: opcua-server, variant: zephyr-standalone }
+      - { app: snmp-agent, variant: zephyr-standalone, pr: true }
       - app: modbus-server
-        variant: tedge-full
+        variant: zephyr-full
         extra_conf: ["{tiny-edge}/ports/zephyr/profiles/extras/shell-diagnostics.conf"]
         measured: DEVICES.md#shell-diagnostics-measured-2026-09-22
       - app: modbus-server
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: opcua-server
-        variant: tedge-ota
+        variant: zephyr-ota
         pr: true
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: snmp-agent
-        variant: tedge-full
+        variant: zephyr-full
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: snmp-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
       - app: tedge-agent
-        variant: tedge-full
+        variant: zephyr-full
         pr: true
         extra_conf: ["{tiny-edge}/ports/zephyr/profiles/extras/shell-diagnostics.conf"]
         measured: DEVICES.md#shell-diagnostics-measured-2026-09-22
       - app: tedge-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#release-builds-measured-on-the-boards-2026-09-21
 
   - id: esp32-devkitc
@@ -195,22 +214,22 @@ devices:
     esptool_before: default-reset
     tedge_board_conf: "{tiny-edge}/ports/zephyr/profiles/boards/esp32-devkitc.conf"
     builds:
-      - { app: modbus-server, variant: standalone }
-      - { app: opcua-server, variant: standalone, pr: true }
-      - { app: snmp-agent, variant: standalone }
+      - { app: modbus-server, variant: zephyr-standalone }
+      - { app: opcua-server, variant: zephyr-standalone, pr: true }
+      - { app: snmp-agent, variant: zephyr-standalone }
       # One feature set for every tedge build on this board: ota (which
       # includes certificate renewal) and parameters. No remote access: its
       # 32 x 128 B receive buffers hold about three Wi-Fi frames, and an
       # interactive session (htop) fails (DEVICES.md). No log upload: its 8 KB stack does not
       # fit beside the mbedTLS heap here.
       - app: modbus-server
-        variant: tedge-ota
+        variant: zephyr-ota
         pr: true
         extra_conf:
           - "{tiny-edge}/ports/zephyr/profiles/extras/parameters.conf"
         measured: DEVICES.md#wroom-and-esp32-cam-release-builds-measured-2026-09-23
       - app: tedge-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         pr: true
         extra_conf:
           - "{tiny-edge}/ports/zephyr/profiles/extras/parameters.conf"
@@ -231,17 +250,17 @@ devices:
     # too shallow for an interactive tunnel, as on the WROOM (DEVICES.md).
     builds:
       - app: snmp-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         pr: true
         extra_conf: &cam-extras
           - "{tiny-edge}/ports/zephyr/profiles/extras/parameters.conf"
           - "{tiny-edge}/ports/zephyr/profiles/extras/log-upload.conf"
         measured: DEVICES.md#wroom-and-esp32-cam-release-builds-measured-2026-09-23
       - app: modbus-server
-        variant: tedge-ota
+        variant: zephyr-ota
         extra_conf: *cam-extras
         measured: DEVICES.md#wroom-and-esp32-cam-release-builds-measured-2026-09-23
       - app: tedge-agent
-        variant: tedge-ota
+        variant: zephyr-ota
         extra_conf: *cam-extras
         measured: DEVICES.md#wroom-and-esp32-cam-release-builds-measured-2026-09-23
diff --git a/release/extras/shell-lean.conf b/release/extras/shell-lean.conf
index e8af746..26cd323 100644
--- a/release/extras/shell-lean.conf
+++ b/release/extras/shell-lean.conf
@@ -4,7 +4,7 @@
 # shell-diagnostics extra: goes after
 # {tiny-edge}/ports/zephyr/profiles/extras/shell-diagnostics.conf in a build's
 # extra_conf (release/devices.yml), and trims it. Measured on the
-# ESP32-C6 Modbus tedge-full image in DEVICES.md.
+# ESP32-C6 Modbus zephyr-full image in DEVICES.md.
 #
 # A cloud command runs on the client's command thread against the dummy
 # backend, and its result is cut at about 220 bytes. So the shell needs no
diff --git a/release/size-baseline.json b/release/size-baseline.json
index d7ccbf6..be299eb 100644
--- a/release/size-baseline.json
+++ b/release/size-baseline.json
@@ -1,79 +1,5 @@
 {
-  "modbus-server-standalone-esp32-devkitc": {
-    "image": 590360,
-    "content": 590360,
-    "ram": {
-      "iram0_0_seg": 59648,
-      "dram0_0_seg": 97304,
-      "dram1_0_seg": 46904
-    },
-    "arena": 99288,
-    "provisioner": {
-      "image": 740422,
-      "content": 740422,
-      "ram": {
-        "iram0_0_seg": 92928,
-        "dram0_0_seg": 125688,
-        "dram1_0_seg": 55280
-      },
-      "arena": 14744
-    }
-  },
-  "modbus-server-standalone-esp32c6-devkitc": {
-    "image": 733899,
-    "content": 633083,
-    "ram": {
-      "sram0_0_seg": 205924,
-      "lp_ram_seg": 36
-    },
-    "arena": 303520,
-    "provisioner": {
-      "image": 943756,
-      "content": 863692,
-      "ram": {
-        "sram0_0_seg": 282496,
-        "lp_ram_seg": 36
-      },
-      "arena": 226944
-    }
-  },
-  "modbus-server-standalone-esp32s3-devkitc": {
-    "image": 583883,
-    "content": 583883,
-    "ram": {
-      "iram0_0_seg": 56672,
-      "dram0_0_seg": 196248
-    },
-    "arena": 202852,
-    "provisioner": {
-      "image": 662059,
-      "content": 662059,
-      "ram": {
-        "iram0_0_seg": 57688,
-        "dram0_0_seg": 230784
-      },
-      "arena": 168316
-    }
-  },
-  "modbus-server-standalone-qtpy-esp32s3": {
-    "image": 584028,
-    "content": 584028,
-    "ram": {
-      "iram0_0_seg": 56200,
-      "dram0_0_seg": 193652
-    },
-    "arena": 205444,
-    "provisioner": {
-      "image": 662219,
-      "content": 662219,
-      "ram": {
-        "iram0_0_seg": 57216,
-        "dram0_0_seg": 228168
-      },
-      "arena": 170932
-    }
-  },
-  "modbus-server-tedge-full-esp32c6-devkitc": {
+  "modbus-server-zephyr-full-esp32c6-devkitc": {
     "image": 966571,
     "content": 864319,
     "ram": {
@@ -94,7 +20,7 @@
       "provisioner": "96.7 % of prov on 2026-09-23: the provisioner's snprintf needs picolibc's integer printf (PICOLIBC_IO_INTEGER, the ZTP timestamp fix), which crossed a 64 KB image boundary again; must not grow, reduce-memory-footprint task 9.1 brings it under 92 %"
     }
   },
-  "modbus-server-tedge-full-esp32s3-devkitc": {
+  "modbus-server-zephyr-full-esp32s3-devkitc": {
     "image": 932636,
     "content": 932636,
     "ram": {
@@ -112,7 +38,7 @@
       "arena": 148244
     }
   },
-  "modbus-server-tedge-full-qtpy-esp32s3": {
+  "modbus-server-zephyr-full-qtpy-esp32s3": {
     "image": 932827,
     "content": 932827,
     "ram": {
@@ -130,7 +56,7 @@
       "arena": 150860
     }
   },
-  "modbus-server-tedge-ota-esp32-cam": {
+  "modbus-server-zephyr-ota-esp32-cam": {
     "image": 803255,
     "content": 803255,
     "ram": {
@@ -150,7 +76,7 @@
       "arena": 13416
     }
   },
-  "modbus-server-tedge-ota-esp32-devkitc": {
+  "modbus-server-zephyr-ota-esp32-devkitc": {
     "image": 798711,
     "content": 798711,
     "ram": {
@@ -170,7 +96,7 @@
       "arena": 13416
     }
   },
-  "modbus-server-tedge-ota-esp32c6-devkitc": {
+  "modbus-server-zephyr-ota-esp32c6-devkitc": {
     "image": 888684,
     "content": 814564,
     "ram": {
@@ -191,7 +117,7 @@
       "provisioner": "96.7 % of prov on 2026-09-23: the provisioner's snprintf needs picolibc's integer printf (PICOLIBC_IO_INTEGER, the ZTP timestamp fix), which crossed a 64 KB image boundary again; must not grow, reduce-memory-footprint task 9.1 brings it under 92 %"
     }
   },
-  "modbus-server-tedge-ota-esp32s3-devkitc": {
+  "modbus-server-zephyr-ota-esp32s3-devkitc": {
     "image": 737532,
     "content": 737532,
     "ram": {
@@ -209,7 +135,7 @@
       "arena": 148244
     }
   },
-  "modbus-server-tedge-ota-qtpy-esp32s3": {
+  "modbus-server-zephyr-ota-qtpy-esp32s3": {
     "image": 737675,
     "content": 737675,
     "ram": {
@@ -227,18 +153,18 @@
       "arena": 150860
     }
   },
-  "opcua-server-standalone-esp32-devkitc": {
-    "image": 750072,
-    "content": 750072,
+  "modbus-server-zephyr-standalone-esp32-devkitc": {
+    "image": 590360,
+    "content": 590360,
     "ram": {
-      "iram0_0_seg": 59904,
-      "dram0_0_seg": 101636,
-      "dram1_0_seg": 65656
+      "iram0_0_seg": 59648,
+      "dram0_0_seg": 97304,
+      "dram1_0_seg": 46904
     },
-    "arena": 94960,
+    "arena": 99288,
     "provisioner": {
-      "image": 740423,
-      "content": 740423,
+      "image": 740422,
+      "content": 740422,
       "ram": {
         "iram0_0_seg": 92928,
         "dram0_0_seg": 125688,
@@ -247,14 +173,14 @@
       "arena": 14744
     }
   },
-  "opcua-server-standalone-esp32c6-devkitc": {
-    "image": 854154,
-    "content": 794154,
+  "modbus-server-zephyr-standalone-esp32c6-devkitc": {
+    "image": 733899,
+    "content": 633083,
     "ram": {
-      "sram0_0_seg": 229996,
+      "sram0_0_seg": 205924,
       "lp_ram_seg": 36
     },
-    "arena": 279440,
+    "arena": 303520,
     "provisioner": {
       "image": 943756,
       "content": 863692,
@@ -265,17 +191,17 @@
       "arena": 226944
     }
   },
-  "opcua-server-standalone-esp32s3-devkitc": {
-    "image": 768668,
-    "content": 768668,
+  "modbus-server-zephyr-standalone-esp32s3-devkitc": {
+    "image": 583883,
+    "content": 583883,
     "ram": {
-      "iram0_0_seg": 56924,
-      "dram0_0_seg": 219616
+      "iram0_0_seg": 56672,
+      "dram0_0_seg": 196248
     },
-    "arena": 179468,
+    "arena": 202852,
     "provisioner": {
-      "image": 662060,
-      "content": 662060,
+      "image": 662059,
+      "content": 662059,
       "ram": {
         "iram0_0_seg": 57688,
         "dram0_0_seg": 230784
@@ -283,14 +209,14 @@
       "arena": 168316
     }
   },
-  "opcua-server-standalone-qtpy-esp32s3": {
-    "image": 768810,
-    "content": 768810,
+  "modbus-server-zephyr-standalone-qtpy-esp32s3": {
+    "image": 584028,
+    "content": 584028,
     "ram": {
-      "iram0_0_seg": 56452,
-      "dram0_0_seg": 217008
+      "iram0_0_seg": 56200,
+      "dram0_0_seg": 193652
     },
-    "arena": 182084,
+    "arena": 205444,
     "provisioner": {
       "image": 662219,
       "content": 662219,
@@ -301,7 +227,7 @@
       "arena": 170932
     }
   },
-  "opcua-server-tedge-ota-qtpy-esp32s3": {
+  "opcua-server-zephyr-ota-qtpy-esp32s3": {
     "image": 921627,
     "content": 921627,
     "ram": {
@@ -319,18 +245,18 @@
       "arena": 150860
     }
   },
-  "snmp-agent-standalone-esp32-devkitc": {
-    "image": 578823,
-    "content": 578823,
+  "opcua-server-zephyr-standalone-esp32-devkitc": {
+    "image": 750072,
+    "content": 750072,
     "ram": {
-      "iram0_0_seg": 59648,
-      "dram0_0_seg": 105752,
-      "dram1_0_seg": 45144
+      "iram0_0_seg": 59904,
+      "dram0_0_seg": 101636,
+      "dram1_0_seg": 65656
     },
-    "arena": 90840,
+    "arena": 94960,
     "provisioner": {
-      "image": 740424,
-      "content": 740424,
+      "image": 740423,
+      "content": 740423,
       "ram": {
         "iram0_0_seg": 92928,
         "dram0_0_seg": 125688,
@@ -339,14 +265,14 @@
       "arena": 14744
     }
   },
-  "snmp-agent-standalone-esp32c6-devkitc": {
-    "image": 732011,
-    "content": 616763,
+  "opcua-server-zephyr-standalone-esp32c6-devkitc": {
+    "image": 854154,
+    "content": 794154,
     "ram": {
-      "sram0_0_seg": 212504,
+      "sram0_0_seg": 229996,
       "lp_ram_seg": 36
     },
-    "arena": 296928,
+    "arena": 279440,
     "provisioner": {
       "image": 943756,
       "content": 863692,
@@ -357,17 +283,17 @@
       "arena": 226944
     }
   },
-  "snmp-agent-standalone-esp32s3-devkitc": {
-    "image": 582428,
-    "content": 582428,
+  "opcua-server-zephyr-standalone-esp32s3-devkitc": {
+    "image": 768668,
+    "content": 768668,
     "ram": {
-      "iram0_0_seg": 56560,
-      "dram0_0_seg": 202832
+      "iram0_0_seg": 56924,
+      "dram0_0_seg": 219616
     },
-    "arena": 196260,
+    "arena": 179468,
     "provisioner": {
-      "image": 662058,
-      "content": 662058,
+      "image": 662060,
+      "content": 662060,
       "ram": {
         "iram0_0_seg": 57688,
         "dram0_0_seg": 230784
@@ -375,17 +301,17 @@
       "arena": 168316
     }
   },
-  "snmp-agent-standalone-qtpy-esp32s3": {
-    "image": 582571,
-    "content": 582571,
+  "opcua-server-zephyr-standalone-qtpy-esp32s3": {
+    "image": 768810,
+    "content": 768810,
     "ram": {
-      "iram0_0_seg": 56088,
-      "dram0_0_seg": 200236
+      "iram0_0_seg": 56452,
+      "dram0_0_seg": 217008
     },
-    "arena": 198852,
+    "arena": 182084,
     "provisioner": {
-      "image": 662218,
-      "content": 662218,
+      "image": 662219,
+      "content": 662219,
       "ram": {
         "iram0_0_seg": 57216,
         "dram0_0_seg": 228168
@@ -393,7 +319,7 @@
       "arena": 170932
     }
   },
-  "snmp-agent-tedge-full-esp32c6-devkitc": {
+  "snmp-agent-zephyr-full-esp32c6-devkitc": {
     "image": 892475,
     "content": 831215,
     "ram": {
@@ -414,7 +340,7 @@
       "provisioner": "96.7 % of prov on 2026-09-23: the provisioner's snprintf needs picolibc's integer printf (PICOLIBC_IO_INTEGER, the ZTP timestamp fix), which crossed a 64 KB image boundary again; must not grow, reduce-memory-footprint task 9.1 brings it under 92 %"
     }
   },
-  "snmp-agent-tedge-full-esp32s3-devkitc": {
+  "snmp-agent-zephyr-full-esp32s3-devkitc": {
     "image": 806938,
     "content": 806938,
     "ram": {
@@ -432,7 +358,7 @@
       "arena": 148244
     }
   },
-  "snmp-agent-tedge-full-qtpy-esp32s3": {
+  "snmp-agent-zephyr-full-qtpy-esp32s3": {
     "image": 807083,
     "content": 807083,
     "ram": {
@@ -450,7 +376,7 @@
       "arena": 150860
     }
   },
-  "snmp-agent-tedge-ota-esp32-cam": {
+  "snmp-agent-zephyr-ota-esp32-cam": {
     "image": 797622,
     "content": 797622,
     "ram": {
@@ -470,7 +396,7 @@
       "arena": 13416
     }
   },
-  "snmp-agent-tedge-ota-esp32c6-devkitc": {
+  "snmp-agent-zephyr-ota-esp32c6-devkitc": {
     "image": 887323,
     "content": 806795,
     "ram": {
@@ -491,7 +417,7 @@
       "provisioner": "96.7 % of prov on 2026-09-23: the provisioner's snprintf needs picolibc's integer printf (PICOLIBC_IO_INTEGER, the ZTP timestamp fix), which crossed a 64 KB image boundary again; must not grow, reduce-memory-footprint task 9.1 brings it under 92 %"
     }
   },
-  "snmp-agent-tedge-ota-esp32s3-devkitc": {
+  "snmp-agent-zephyr-ota-esp32s3-devkitc": {
     "image": 736587,
     "content": 736587,
     "ram": {
@@ -509,7 +435,7 @@
       "arena": 148244
     }
   },
-  "snmp-agent-tedge-ota-qtpy-esp32s3": {
+  "snmp-agent-zephyr-ota-qtpy-esp32s3": {
     "image": 736731,
     "content": 736731,
     "ram": {
@@ -527,7 +453,81 @@
       "arena": 150860
     }
   },
-  "tedge-agent-tedge-full-esp32c6-devkitc": {
+  "snmp-agent-zephyr-standalone-esp32-devkitc": {
+    "image": 578823,
+    "content": 578823,
+    "ram": {
+      "iram0_0_seg": 59648,
+      "dram0_0_seg": 105752,
+      "dram1_0_seg": 45144
+    },
+    "arena": 90840,
+    "provisioner": {
+      "image": 740424,
+      "content": 740424,
+      "ram": {
+        "iram0_0_seg": 92928,
+        "dram0_0_seg": 125688,
+        "dram1_0_seg": 55280
+      },
+      "arena": 14744
+    }
+  },
+  "snmp-agent-zephyr-standalone-esp32c6-devkitc": {
+    "image": 732011,
+    "content": 616763,
+    "ram": {
+      "sram0_0_seg": 212504,
+      "lp_ram_seg": 36
+    },
+    "arena": 296928,
+    "provisioner": {
+      "image": 943756,
+      "content": 863692,
+      "ram": {
+        "sram0_0_seg": 282496,
+        "lp_ram_seg": 36
+      },
+      "arena": 226944
+    }
+  },
+  "snmp-agent-zephyr-standalone-esp32s3-devkitc": {
+    "image": 582428,
+    "content": 582428,
+    "ram": {
+      "iram0_0_seg": 56560,
+      "dram0_0_seg": 202832
+    },
+    "arena": 196260,
+    "provisioner": {
+      "image": 662058,
+      "content": 662058,
+      "ram": {
+        "iram0_0_seg": 57688,
+        "dram0_0_seg": 230784
+      },
+      "arena": 168316
+    }
+  },
+  "snmp-agent-zephyr-standalone-qtpy-esp32s3": {
+    "image": 582571,
+    "content": 582571,
+    "ram": {
+      "iram0_0_seg": 56088,
+      "dram0_0_seg": 200236
+    },
+    "arena": 198852,
+    "provisioner": {
+      "image": 662218,
+      "content": 662218,
+      "ram": {
+        "iram0_0_seg": 57216,
+        "dram0_0_seg": 228168
+      },
+      "arena": 170932
+    }
+  },
+  "tedge-agent-zephyr-full-esp32c6-devkitc": {
     "image": 890667,
     "content": 817303,
     "ram": {
@@ -548,7 +548,7 @@
       "provisioner": "96.7 % of prov on 2026-09-23: the provisioner's snprintf needs picolibc's integer printf (PICOLIBC_IO_INTEGER, the ZTP timestamp fix), which crossed a 64 KB image boundary again; must not grow, reduce-memory-footprint task 9.1 brings it under 92 %"
     }
   },
-  "tedge-agent-tedge-full-esp32s3-devkitc": {
+  "tedge-agent-zephyr-full-esp32s3-devkitc": {
     "image": 929019,
     "content": 929019,
     "ram": {
@@ -566,7 +566,7 @@
       "arena": 148244
     }
   },
-  "tedge-agent-tedge-full-qtpy-esp32s3": {
+  "tedge-agent-zephyr-full-qtpy-esp32s3": {
     "image": 929210,
     "content": 929210,
     "ram": {
@@ -584,7 +584,7 @@
       "arena": 150860
     }
   },
-  "tedge-agent-tedge-ota-esp32-cam": {
+  "tedge-agent-zephyr-ota-esp32-cam": {
     "image": 787654,
     "content": 787654,
     "ram": {
@@ -604,7 +604,7 @@
       "arena": 13416
     }
   },
-  "tedge-agent-tedge-ota-esp32-devkitc": {
+  "tedge-agent-zephyr-ota-esp32-devkitc": {
     "image": 783336,
     "content": 783336,
     "ram": {
@@ -624,7 +624,7 @@
       "arena": 13416
     }
   },
-  "tedge-agent-tedge-ota-esp32c6-devkitc": {
+  "tedge-agent-zephyr-ota-esp32c6-devkitc": {
     "image": 885739,
     "content": 793291,
     "ram": {
@@ -645,7 +645,7 @@
       "provisioner": "96.7 % of prov on 2026-09-23: the provisioner's snprintf needs picolibc's integer printf (PICOLIBC_IO_INTEGER, the ZTP timestamp fix), which crossed a 64 KB image boundary again; must not grow, reduce-memory-footprint task 9.1 brings it under 92 %"
     }
   },
-  "tedge-agent-tedge-ota-esp32s3-devkitc": {
+  "tedge-agent-zephyr-ota-esp32s3-devkitc": {
     "image": 735114,
     "content": 735114,
     "ram": {
@@ -663,7 +663,7 @@
       "arena": 148244
     }
   },
-  "tedge-agent-tedge-ota-qtpy-esp32s3": {
+  "tedge-agent-zephyr-ota-qtpy-esp32s3": {
     "image": 735258,
     "content": 735258,
     "ram": {
diff --git a/scripts/flash.sh b/scripts/flash.sh
index da48730..38f5644 100755
--- a/scripts/flash.sh
+++ b/scripts/flash.sh
@@ -24,7 +24,7 @@
 #
 # A bundle built for more flash than the connected chip has is refused.
 #
-# An ESP-IDF bundle (a `tedge-onboard` image: flash.json says
+# An ESP-IDF bundle (an `idf` image: flash.json says
 # "framework": "esp-idf") is flashed the same way: everything, or with
 # --app-only the application into ota_0; --erase-storage erases its NVS
 # partition (the Wi-Fi network and the Cumulocity certificate). A NuttX
diff --git a/scripts/release/build.sh b/scripts/release/build.sh
index a6f6955..f9932cd 100755
--- a/scripts/release/build.sh
+++ b/scripts/release/build.sh
@@ -8,9 +8,9 @@
 #                            [--write-baseline]
 #
 #   docker exec -w /ws/app -e ZEPHYR_SDK_INSTALL_DIR=$SDK zephyr-dev \
-#     scripts/release/build.sh modbus-server-tedge-full-esp32c6-devkitc
+#     scripts/release/build.sh modbus-server-zephyr-full-esp32c6-devkitc
 #
-#  is -- from release/devices.yml
+#  is --- from release/devices.yml
 # (scripts/release/matrix.py lists them). The version is whatever the
 # apps/*/VERSION files say; run scripts/release/check-version.sh --apply
 # first to set a pre-release or dev suffix. KEY_FILE, when set, signs with that
diff --git a/scripts/release/c8y-manifest.py b/scripts/release/c8y-manifest.py
index 89b8b11..75040d0 100755
--- a/scripts/release/c8y-manifest.py
+++ b/scripts/release/c8y-manifest.py
@@ -7,7 +7,7 @@
 One entry per tedge image (standalone images have no cloud client). The
 version is exactly what the image reports once installed — the application's
 own version string — so an install is recognised as done rather than as a
-rollback. The name is unique per (app, variant, device), so a firmware
+rollback. The name, ---, is unique per build, so a firmware
 repository entry only ever holds images for one kind of hardware.
 scripts/release/c8y-upload.sh reads it.
 """
diff --git a/scripts/release/matrix.py b/scripts/release/matrix.py
index 09d139f..7df111c 100755
--- a/scripts/release/matrix.py
+++ b/scripts/release/matrix.py
@@ -16,6 +16,12 @@
 (every device, app, variant and extra, with each board's tightest builds);
 a release builds everything.
 
+Every image is named ---, and a variant -:
+ follows from the variant's framework (OS_NAMES),  is its `set`
+(standalone, full or ota), and  is the app's directory or its `name`
+in the manifest's `apps` section. The name is the release files' stem, the
+firmware name the image reports, and its firmware entry in Cumulocity.
+
 A variant with `framework: esp-idf` is an ESP-IDF project (apps/ with
 idf.py) instead of a Zephyr sysbuild: it has no Zephyr profile, board files
 or tiny-edge board configuration, and its builds form a matrix of their own
@@ -62,6 +68,10 @@
 FLASH_RE = re.compile(r"^(1|2|4|8|16|32)MB$")
 ESPTOOL_BEFORE = {"default-reset", "usb-reset", "no-reset"}
 FRAMEWORKS = {"zephyr", "esp-idf", "nuttx"}
+# The operating system in an image's name, by framework; ESP-IDF includes
+# FreeRTOS.
+OS_NAMES = {"zephyr": "zephyr", "esp-idf": "idf", "nuttx": "nuttx"}
+SETS = ("standalone", "full", "ota")
 
 
 class ManifestError(Exception):
@@ -79,10 +89,18 @@ class Build:
     extra_conf: list = field(default_factory=list)
     measured: str = ""
     pr: bool = False
+    name: str = ""
+
+    def __post_init__(self):
+        self.name = self.name or self.app
 
     @property
     def tedge(self):
-        return self.variant != "standalone"
+        return self.variant_def.get("set") != "standalone"
+
+    @property
+    def os(self):
+        return OS_NAMES.get(self.framework, self.framework)
 
     @property
     def framework(self):
@@ -90,7 +108,8 @@ def framework(self):
 
     @property
     def firmware_name(self):
-        return f"{self.app}-{self.variant}-{self.device['id']}"
+        """---: the variant is named -."""
+        return f"{self.name}-{self.variant}-{self.device['id']}"
 
     def conf_files(self):
         """EXTRA_CONF_FILE for the application, repository-relative; for
@@ -117,6 +136,7 @@ def matrix_entry(self, manifest):
             "flash_size": self.device["flash_size"],
             "esptool_before": self.device.get("esptool_before", "default-reset"),
             "app": self.app,
+            "name": self.name,
             "variant": self.variant,
             "framework": self.framework,
             "nuttx_board": self.device.get("nuttx_board", ""),
@@ -199,17 +219,33 @@ def need_file(where, rel):
         if framework not in FRAMEWORKS:
             problems.append(f"variant {name}: framework must be one of "
                             f"{', '.join(sorted(FRAMEWORKS))}")
-        elif framework == "zephyr" and name != "standalone" and not v.get("profile"):
+            continue
+        if v.get("set") not in SETS:
+            problems.append(f"variant {name}: set must be one of {', '.join(SETS)}")
+        elif name != f"{OS_NAMES[framework]}-{v['set']}":
+            problems.append(f"variant {name}: a {framework} variant with set "
+                            f"{v['set']} is named {OS_NAMES[framework]}-{v['set']}")
+        elif framework == "zephyr" and v["set"] != "standalone" and not v.get("profile"):
             problems.append(f"variant {name}: a tedge variant needs a profile")
     for name, conf in provisioners.items():
         if conf:
             need_file(f"provisioner {name}", conf)
 
+    app_names = {}
+    for app, a in (manifest.get("apps") or {}).items():
+        if not (root / "apps" / app).is_dir():
+            problems.append(f"apps: there is no apps/{app}")
+        elif not ID_RE.match(str((a or {}).get("name", ""))):
+            problems.append(f"apps: {app} needs a name of lowercase letters, "
+                            "digits and dashes")
+        else:
+            app_names[app] = a["name"]
+
     layout_boards = set(
         re.findall(r'_board STREQUAL "([^"]+)"',
                    (root / "sysbuild" / "provisioning.cmake").read_text()))
 
-    builds, seen_ids, seen_builds = [], set(), set()
+    builds, seen_ids, seen_builds, seen_names = [], set(), set(), {}
     doc_anchors = {}
     for dev in manifest.get("devices") or []:
         did = dev.get("id", "?")
@@ -264,7 +300,7 @@ def need_file(where, rel):
                 problems.append(f"{bwhere}: pr must be true or false")
             build = Build(dev, app, variant, variants[variant],
                           list(b.get("extra_conf", [])), b.get("measured", ""),
-                          b.get("pr", False) is True)
+                          b.get("pr", False) is True, app_names.get(app, ""))
             if build.tedge:
                 if build.framework == "zephyr" and not dev.get("tedge_board_conf"):
                     problems.append(f"{bwhere}: the device has no tedge_board_conf")
@@ -281,6 +317,10 @@ def need_file(where, rel):
                         if anchor not in doc_anchors[doc]:
                             problems.append(f"{bwhere}: measured: {doc} has no "
                                             f"heading #{anchor}")
+            if build.firmware_name in seen_names:
+                problems.append(f"{bwhere}: firmware name {build.firmware_name} "
+                                f"is also {seen_names[build.firmware_name]}'s")
+            seen_names.setdefault(build.firmware_name, bwhere)
             if len(build.firmware_name) > FIRMWARE_NAME_MAX:
                 problems.append(f"{bwhere}: firmware name {build.firmware_name} is "
                                 f"{len(build.firmware_name)} characters "
@@ -301,14 +341,11 @@ def need_file(where, rel):
 def groups(builds):
     """One matrix job per (device, app, framework), in manifest order.
 
-    The group names the job's artifact. The NuttX agent shares its app name
-    with the Zephyr tedge-agent builds, so its group names the framework.
+    The group, --, names the job's artifact.
     """
     out = {}
     for b in builds:
-        name = f"{b.app}-{b.device['id']}"
-        if b.framework == "nuttx":
-            name = f"{b.app}-nuttx-{b.device['id']}"
+        name = f"{b.name}-{b.os}-{b.device['id']}"
         g = out.setdefault((b.device["id"], b.app, b.framework), {
             "group": name,
             "device": b.device["id"],
@@ -329,7 +366,7 @@ def markdown(manifest, builds):
     for dev in manifest["devices"]:
         cells = []
         for variant in variants:
-            apps = [b.app for b in builds
+            apps = [b.name for b in builds
                     if b.device is dev and b.variant == variant]
             cells.append(", ".join(f"`{a}`" for a in apps) or "—")
         rows.append(f"| {dev['name']} | `{dev['board']}` | " + " | ".join(cells) + " |")
diff --git a/scripts/release/notes.py b/scripts/release/notes.py
index 37d1815..d8433e0 100755
--- a/scripts/release/notes.py
+++ b/scripts/release/notes.py
@@ -33,9 +33,12 @@ def notes(manifest, metas, tag, repo):
     readme = README.format(repo=repo, tag=tag)
     signing = {json.dumps(m["signing"], sort_keys=True): m["signing"] for m in metas.values()}
     out = [f"Prebuilt firmware for {len({m['device'] for m in metas.values()})} "
-           f"devices, version `{tag.lstrip('v')}`. Pick your device and a variant, "
-           "flash the `.factory.bin`, then set the device up: over Bluetooth, or over "
-           "USB with `tedge-onboard` for the `tedge-onboard` images.",
+           f"devices, version `{tag.lstrip('v')}`. Pick your device, an app, its "
+           "operating system and a set, flash the `.factory.bin`, then set the "
+           "device up: over Bluetooth, or over USB with `tedge-onboard`.",
+           "",
+           "Every image is named `---`, and the device "
+           "reports the same name as its firmware in Cumulocity.",
            "",
            "## Variants",
            ""]
@@ -44,15 +47,16 @@ def notes(manifest, metas, tag, repo):
     out += ["",
             "## Images",
             "",
-            "| Device | App | Variant | Flash this first | Update / OTA | Bundle |",
-            "|---|---|---|---|---|---|"]
+            "| Device | App | OS | Set | Flash this first | Update / OTA | Bundle |",
+            "|---|---|---|---|---|---|---|"]
     for dev in manifest["devices"]:
         for (did, app, variant), m in metas.items():
             if did != dev["id"]:
                 continue
             s = m["stem"]
-            out.append(f"| {dev['name']} | `{app}` | {variant} | `{s}.factory.bin` | "
-                       f"`{s}.app.bin` | `{s}.zip` |")
+            os_name, _, set_name = variant.partition("-")
+            out.append(f"| {dev['name']} | `{app}` | {os_name} | {set_name} | "
+                       f"`{s}.factory.bin` | `{s}.app.bin` | `{s}.zip` |")
     out += ["",
             "## Flashing",
             "",
@@ -73,12 +77,13 @@ def notes(manifest, metas, tag, repo):
             "bundle's `README.txt` has the exact commands, and "
             "`scripts/flash.sh ` flashes a bundle from a checkout.",
             "",
-            f"Then provision it: `standalone` images with Improv Wi-Fi, `tedge-full` "
-            f"and `tedge-ota` images with lab-ztp-provisioner. See [Provisioning "
+            f"Then provision it: `zephyr-standalone` images with Improv Wi-Fi, "
+            f"`zephyr-full` and `zephyr-ota` images with lab-ztp-provisioner (or "
+            f"`tedge-onboard`, below). See [Provisioning "
             f"Wi-Fi over BLE]({readme}#provisioning-wi-fi-over-ble), including its "
             f"security notes.",
             "",
-            "The ESP-IDF (`tedge-onboard`) and NuttX (`nuttx`) agent images are "
+            "The `idf` (ESP-IDF) and `nuttx` (NuttX) agent images are "
             "set up over USB instead: run "
             "[tedge-onboard](https://github.com/thin-edge/tiny-edge/tree/main/tools/onboard) "
             "(or `c8y tinyedge onboard`, after `c8y extensions install "
diff --git a/scripts/release/package.py b/scripts/release/package.py
index be187ce..572b1f0 100755
--- a/scripts/release/package.py
+++ b/scripts/release/package.py
@@ -5,7 +5,7 @@
     scripts/release/package.py  --device  --app  \\
         --variant  --out 
 
-Writes, with  = ---:
+Writes, with  = ----:
 
   .factory.bin  MCUboot + application + provisioner merged into one
                       image that is written at 0x0 (esptool, or a browser
@@ -215,7 +215,7 @@ def main(argv=None):
         "device": dev["id"],
         "device_name": dev["name"],
         "board": dev["board"],
-        "app": args.app,
+        "app": build.name,
         "variant": args.variant,
         "version": version,
         "firmware_name": build.firmware_name,
@@ -234,7 +234,7 @@ def main(argv=None):
                     "tenant.")
     readme = README.format(
         name=stem, rule="=" * len(stem), stem=stem, device_name=dev["name"],
-        app=args.app, variant=args.variant, version=version, chip=info["chip"],
+        app=build.name, variant=args.variant, version=version, chip=info["chip"],
         before=before, app_off=imgs["app"]["offset"],
         writes=" ".join(f"{i['offset']:#x} {names[n]}" for n, i in order),
         provisioning=provisioning, signing=sign["statement"])
diff --git a/scripts/release/package_idf.py b/scripts/release/package_idf.py
index ae254c2..7690640 100644
--- a/scripts/release/package_idf.py
+++ b/scripts/release/package_idf.py
@@ -7,7 +7,7 @@
 
 The ESP-IDF counterpart of package.py, with the same outputs, so the release
 notes, c8y-firmware.json and SHA256SUMS treat both alike. With
- = ---:
+ = ----:
 
   .factory.bin  bootloader, partition table, OTA data and application
                       merged into one image that is written at 0x0
@@ -186,7 +186,7 @@ def main(argv=None):
         "device": dev["id"],
         "device_name": dev["name"],
         "board": dev["board"],
-        "app": args.app,
+        "app": build.name,
         "variant": args.variant,
         "version": version,
         "firmware_name": build.firmware_name,
@@ -202,7 +202,7 @@ def main(argv=None):
     }
     readme = README.format(
         name=stem, rule="=" * len(stem), stem=stem, device_name=dev["name"],
-        app=args.app, variant=args.variant, version=version, chip=chip,
+        app=build.name, variant=args.variant, version=version, chip=chip,
         before=before, app_off=flasher["app"]["offset"],
         writes=" ".join(f"{i['offset']} {NAMES[n]}" for n, i in images),
         signing=SIGNING["statement"])
diff --git a/scripts/release/package_nuttx.py b/scripts/release/package_nuttx.py
index ba17707..22cb50b 100644
--- a/scripts/release/package_nuttx.py
+++ b/scripts/release/package_nuttx.py
@@ -11,7 +11,7 @@
 outputs, so the release notes, c8y-firmware.json and SHA256SUMS treat every
 framework alike.  is what tiny-edge's build.sh wrote: MCUboot,
 nuttx.bin (padded and confirmed, for flashing) and nuttx-update.bin (for a
-firmware update). With  = ---:
+firmware update). With  = ----:
 
   .factory.bin  MCUboot and the confirmed image, merged into one image
                       that is written at 0x0
@@ -227,7 +227,7 @@ def main(argv=None):
         "device": dev["id"],
         "device_name": dev["name"],
         "board": dev["nuttx_board"],
-        "app": args.app,
+        "app": build.name,
         "variant": args.variant,
         "version": args.version,
         "firmware_name": build.firmware_name,
@@ -243,7 +243,7 @@ def main(argv=None):
     }
     readme = README.format(
         name=stem, rule="=" * len(stem), stem=stem, device_name=dev["name"],
-        app=args.app, variant=args.variant, version=args.version, chip=chip,
+        app=build.name, variant=args.variant, version=args.version, chip=chip,
         before=before, app_off=f"{slot0:#x}",
         writes=" ".join(f"{off:#x} {f}" for _, f, _, off in images),
         signing=SIGNING["statement"])
diff --git a/scripts/release/tests/test_matrix.py b/scripts/release/tests/test_matrix.py
index 1fa0db0..2f68b30 100644
--- a/scripts/release/tests/test_matrix.py
+++ b/scripts/release/tests/test_matrix.py
@@ -20,8 +20,8 @@
 
 VALID = """
 variants:
-  standalone: {provisioner: improv}
-  tedge-ota: {profile: profiles/ota.conf, provisioner: ztp}
+  zephyr-standalone: {set: standalone, provisioner: improv}
+  zephyr-ota: {set: ota, profile: profiles/ota.conf, provisioner: ztp}
 provisioners:
   improv: null
   ztp: prov/ztp.conf
@@ -33,9 +33,9 @@
     flash_size: 4MB
     tedge_board_conf: boards/c6.conf
     builds:
-      - {app: modbus-server, variant: standalone, pr: true}
+      - {app: modbus-server, variant: zephyr-standalone, pr: true}
       - app: modbus-server
-        variant: tedge-ota
+        variant: zephyr-ota
         measured: DEVICES.md#measured-on-the-c6
 """
 
@@ -76,7 +76,7 @@ def test_valid_manifest(self):
         self.assertEqual(std["provisioner_conf"], "")
         self.assertEqual(ota["conf_files"], "profiles/ota.conf;boards/c6.conf")
         self.assertEqual(ota["provisioner_conf"], "prov/ztp.conf")
-        self.assertEqual(ota["firmware_name"], "modbus-server-tedge-ota-c6")
+        self.assertEqual(ota["firmware_name"], "modbus-server-zephyr-ota-c6")
         json.dumps({"include": entries})  # serialisable
 
     def test_west_project_paths(self):
@@ -106,7 +106,7 @@ def test_west_project_paths(self):
 
     def test_unknown_app(self):
         p = self.problems(VALID.replace("app: modbus-server\n", "app: nope\n"))
-        self.assertIn("device c6, nope tedge-ota: there is no apps/nope", p)
+        self.assertIn("device c6, nope zephyr-ota: there is no apps/nope", p)
 
     def test_missing_overlay(self):
         p = self.problems(VALID.replace("boards/c6.conf", "boards/gone.conf"))
@@ -123,12 +123,12 @@ def test_duplicate_device_id(self):
         self.assertIn("device c6: duplicate device id", p)
 
     def test_unknown_variant(self):
-        p = self.problems(VALID.replace("variant: standalone", "variant: tedge-max"))
-        self.assertIn("device c6, modbus-server tedge-max: unknown variant", p)
+        p = self.problems(VALID.replace("variant: zephyr-standalone", "variant: zephyr-max"))
+        self.assertIn("device c6, modbus-server zephyr-max: unknown variant", p)
 
     def test_tedge_build_must_be_measured(self):
         p = self.problems(VALID.replace("        measured: DEVICES.md#measured-on-the-c6\n", ""))
-        self.assertIn("device c6, modbus-server tedge-ota: a tedge build needs `measured`", p)
+        self.assertIn("device c6, modbus-server zephyr-ota: a tedge build needs `measured`", p)
 
     def test_measured_anchor_must_exist(self):
         p = self.problems(VALID.replace("#measured-on-the-c6", "#never-measured"))
@@ -141,14 +141,14 @@ def test_firmware_name_length(self):
 
     def test_every_problem_is_reported(self):
         text = VALID.replace("boards/c6.conf", "boards/gone.conf").replace(
-            "variant: standalone", "variant: tedge-max")
+            "variant: zephyr-standalone", "variant: zephyr-max")
         p = self.problems(text)
         self.assertIn("boards/gone.conf does not exist", p)
         self.assertIn("unknown variant", p)
 
     def test_main_prints_nothing_on_error(self):
         path = self.root / "devices.yml"
-        path.write_text(VALID.replace("variant: standalone", "variant: tedge-max"))
+        path.write_text(VALID.replace("variant: zephyr-standalone", "variant: zephyr-max"))
         from io import StringIO
         from contextlib import redirect_stdout, redirect_stderr
         out, err = StringIO(), StringIO()
@@ -162,10 +162,11 @@ def test_one_job_per_device_and_app(self):
         manifest, builds = self.load(VALID)
         groups = matrix.groups(builds)
         self.assertEqual(len(groups), 1)
-        self.assertEqual(groups[0]["group"], "modbus-server-c6")
+        self.assertEqual(groups[0]["group"], "modbus-server-zephyr-c6")
         self.assertEqual(groups[0]["chip"], "esp32c6")
         self.assertEqual(groups[0]["builds"],
-                         "modbus-server-standalone-c6 modbus-server-tedge-ota-c6")
+                         "modbus-server-zephyr-standalone-c6 "
+                         "modbus-server-zephyr-ota-c6")
 
     def test_pr_subset(self):
         path = self.root / "devices.yml"
@@ -178,7 +179,7 @@ def test_pr_subset(self):
                               "--subset", "pr"])
         self.assertEqual(rc, 0)
         jobs = json.loads(out.getvalue())["include"]
-        self.assertEqual([j["builds"] for j in jobs], ["modbus-server-standalone-c6"])
+        self.assertEqual([j["builds"] for j in jobs], ["modbus-server-zephyr-standalone-c6"])
 
     def test_every_device_needs_a_pr_build(self):
         p = self.problems(VALID.replace(", pr: true", ""))
@@ -188,14 +189,14 @@ def test_pr_must_be_boolean(self):
         p = self.problems(VALID.replace("pr: true", "pr: yes please"))
         self.assertIn("pr must be true or false", p)
 
-    IDF = VALID.replace("""  tedge-ota: {profile: profiles/ota.conf, provisioner: ztp}
-""", """  tedge-ota: {profile: profiles/ota.conf, provisioner: ztp}
-  tedge-onboard: {framework: esp-idf, provisioner: onboard}
+    IDF = VALID.replace("""  zephyr-ota: {set: ota, profile: profiles/ota.conf, provisioner: ztp}
+""", """  zephyr-ota: {set: ota, profile: profiles/ota.conf, provisioner: ztp}
+  idf-full: {framework: esp-idf, set: full, provisioner: onboard}
 """).replace("""  ztp: prov/ztp.conf
 """, """  ztp: prov/ztp.conf
   onboard: null
 """) + """      - app: agent-idf
-        variant: tedge-onboard
+        variant: idf-full
         measured: DEVICES.md#measured-on-the-c6
 """
 
@@ -215,7 +216,7 @@ def test_esp_idf_build(self):
         entry = idf.matrix_entry(manifest)
         self.assertEqual(entry["framework"], "esp-idf")
         self.assertEqual(entry["conf_files"], "")
-        self.assertEqual(entry["firmware_name"], "agent-idf-tedge-onboard-c6")
+        self.assertEqual(entry["firmware_name"], "agent-idf-idf-full-c6")
 
         from contextlib import redirect_stdout
         import io
@@ -230,7 +231,51 @@ def test_esp_idf_build(self):
         idf_jobs = json.loads(lines["idf_matrix"])["include"]
         self.assertEqual([j["app"] for j in zephyr], ["modbus-server"])
         self.assertEqual([j["builds"] for j in idf_jobs],
-                         ["agent-idf-tedge-onboard-c6"])
+                         ["agent-idf-idf-full-c6"])
+
+    def test_app_name(self):
+        """The `apps` section names an app whose directory says more; the
+        image name and the job use it, the build its directory."""
+        self.idf_app()
+        text = self.IDF.replace("provisioners:", "apps:\n  agent-idf: {name: agent}\nprovisioners:")
+        manifest, builds = self.load(text)
+        idf = [b for b in builds if b.app == "agent-idf"][0]
+        entry = idf.matrix_entry(manifest)
+        self.assertEqual(entry["firmware_name"], "agent-idf-full-c6")
+        self.assertEqual(entry["app"], "agent-idf")
+        self.assertEqual(matrix.groups([idf])[0]["group"], "agent-idf-c6")
+
+    def test_app_name_needs_the_app(self):
+        p = self.problems(VALID.replace("provisioners:", "apps:\n  gone: {name: x}\nprovisioners:"))
+        self.assertIn("apps: there is no apps/gone", p)
+
+    def test_variant_name_follows_framework_and_set(self):
+        self.idf_app()
+        p = self.problems(self.IDF.replace("idf-full: {framework: esp-idf",
+                                           "zephyr-full: {framework: esp-idf")
+                                  .replace("variant: idf-full", "variant: zephyr-full"))
+        self.assertIn("variant zephyr-full: a esp-idf variant with set full is "
+                      "named idf-full", p)
+        p = self.problems(VALID.replace("set: ota", "set: max"))
+        self.assertIn("variant zephyr-ota: set must be one of standalone, full, ota", p)
+
+    def test_firmware_names_are_unique(self):
+        """Two app directories with the same name would share images."""
+        self.idf_app()
+        # The same app name is fine while the variants differ...
+        text = self.IDF.replace("provisioners:", "apps:\n  agent-idf: {name: modbus-server}\nprovisioners:")
+        manifest, builds = self.load(text)
+        names = [b.firmware_name for b in builds]
+        self.assertEqual(len(names), len(set(names)))
+        # ...but not when an image would carry another's name.
+        dup = text + """      - app: agent-idf
+        variant: zephyr-ota
+        measured: DEVICES.md#measured-on-the-c6
+"""
+        (self.root / "apps/agent-idf/boards").mkdir()
+        (self.root / f"apps/agent-idf/boards/{matrix.board_dir_name(BOARD)}.conf").write_text("")
+        p = self.problems(dup)
+        self.assertIn("firmware name modbus-server-zephyr-ota-c6 is also", p)
 
     def test_esp_idf_app_must_be_an_idf_project(self):
         self.idf_app(defaults=False)
@@ -240,11 +285,11 @@ def test_esp_idf_app_must_be_an_idf_project(self):
     def test_unknown_framework(self):
         self.idf_app()
         p = self.problems(self.IDF.replace("framework: esp-idf", "framework: threadx"))
-        self.assertIn("variant tedge-onboard: framework must be one of", p)
+        self.assertIn("variant idf-full: framework must be one of", p)
 
-    NUTTX = VALID.replace("""  tedge-ota: {profile: profiles/ota.conf, provisioner: ztp}
-""", """  tedge-ota: {profile: profiles/ota.conf, provisioner: ztp}
-  nuttx: {framework: nuttx, provisioner: onboard}
+    NUTTX = VALID.replace("""  zephyr-ota: {set: ota, profile: profiles/ota.conf, provisioner: ztp}
+""", """  zephyr-ota: {set: ota, profile: profiles/ota.conf, provisioner: ztp}
+  nuttx-full: {framework: nuttx, set: full, provisioner: onboard}
 """).replace("""  ztp: prov/ztp.conf
 """, """  ztp: prov/ztp.conf
   onboard: null
@@ -252,7 +297,7 @@ def test_unknown_framework(self):
 """, """    tedge_board_conf: boards/c6.conf
     nuttx_board: esp32c6-devkitc
 """) + """      - app: modbus-server
-        variant: nuttx
+        variant: nuttx-full
         extra_conf: [nuttx/psram.conf]
         measured: DEVICES.md#measured-on-the-c6
 """
@@ -264,12 +309,12 @@ def test_nuttx_build(self):
         (self.root / "nuttx").mkdir()
         (self.root / "nuttx/psram.conf").write_text("")
         manifest, builds = self.load(self.NUTTX)
-        nx = [b for b in builds if b.variant == "nuttx"][0]
+        nx = [b for b in builds if b.variant == "nuttx-full"][0]
         entry = nx.matrix_entry(manifest)
         self.assertEqual(entry["framework"], "nuttx")
         self.assertEqual(entry["nuttx_board"], "esp32c6-devkitc")
         self.assertEqual(entry["conf_files"], "nuttx/psram.conf")
-        self.assertEqual(entry["firmware_name"], "modbus-server-nuttx-c6")
+        self.assertEqual(entry["firmware_name"], "modbus-server-nuttx-full-c6")
 
         from contextlib import redirect_stdout
         import io
@@ -281,9 +326,9 @@ def test_nuttx_build(self):
         lines = dict(l.split("=", 1) for l in out.getvalue().splitlines())
         zephyr = json.loads(lines["matrix"])["include"]
         nuttx = json.loads(lines["nuttx_matrix"])["include"]
-        self.assertEqual([j["group"] for j in zephyr], ["modbus-server-c6"])
+        self.assertEqual([j["group"] for j in zephyr], ["modbus-server-zephyr-c6"])
         self.assertEqual([j["group"] for j in nuttx], ["modbus-server-nuttx-c6"])
-        self.assertEqual([j["builds"] for j in nuttx], ["modbus-server-nuttx-c6"])
+        self.assertEqual([j["builds"] for j in nuttx], ["modbus-server-nuttx-full-c6"])
 
     def test_nuttx_build_needs_a_board(self):
         (self.root / "nuttx").mkdir()
diff --git a/scripts/release/tests/test_size.py b/scripts/release/tests/test_size.py
index 6eea5ef..178b13f 100644
--- a/scripts/release/tests/test_size.py
+++ b/scripts/release/tests/test_size.py
@@ -61,7 +61,7 @@ def elf32(sections):
 
 def report(image=100, ram=None, arena=1000, prov_image=None, prov_ram=None):
     r = {
-        "name": "modbus-server-tedge-ota-c6", "app": "modbus-server",
+        "name": "modbus-server-zephyr-ota-c6", "app": "modbus-server",
         "image": image, "slot0": 1000, "slot0_percent": image / 10.0,
         "ram": [{"region": k, "used": v, "size": 2 * v, "percent": 50.0}
                 for k, v in (ram or {"sram0_0_seg": 500}).items()],
@@ -142,15 +142,15 @@ def test_write_then_compare_equal(self):
     def test_write_keeps_other_builds_and_exceptions(self):
         self.path.write_text(json.dumps({
             "other-build": {"image": 1, "ram": {}, "arena": None},
-            "modbus-server-tedge-ota-c6": {
+            "modbus-server-zephyr-ota-c6": {
                 "image": 1, "ram": {}, "arena": None,
                 "budget_exceptions": {"provisioner": "96.8 % on 2026-09-22"}},
         }))
         size.write_baseline(self.path, report())
         data = json.loads(self.path.read_text())
         self.assertIn("other-build", data)
-        self.assertEqual(data["modbus-server-tedge-ota-c6"]["image"], 100)
-        self.assertEqual(data["modbus-server-tedge-ota-c6"]["budget_exceptions"],
+        self.assertEqual(data["modbus-server-zephyr-ota-c6"]["image"], 100)
+        self.assertEqual(data["modbus-server-zephyr-ota-c6"]["budget_exceptions"],
                          {"provisioner": "96.8 % on 2026-09-22"})
 
     def test_ram_growth_past_tolerance_fails(self):
@@ -158,7 +158,7 @@ def test_ram_growth_past_tolerance_fails(self):
         problems, _ = size.compare(report(ram={"sram0_0_seg": 800}),
                                    size.load_baseline(self.path), 256)
         self.assertEqual(len(problems), 1)
-        self.assertIn("modbus-server-tedge-ota-c6: sram0_0_seg grew by 300 B", problems[0])
+        self.assertIn("modbus-server-zephyr-ota-c6: sram0_0_seg grew by 300 B", problems[0])
 
     def test_growth_within_tolerance_passes(self):
         size.write_baseline(self.path, report(image=100, ram={"sram0_0_seg": 500}))
@@ -169,7 +169,7 @@ def test_growth_within_tolerance_passes(self):
     def test_image_growth_fails_and_names_delta(self):
         size.write_baseline(self.path, report(image=100))
         problems, _ = size.compare(report(image=1000), size.load_baseline(self.path), 256)
-        self.assertEqual(problems, ["modbus-server-tedge-ota-c6: image grew by 900 B "
+        self.assertEqual(problems, ["modbus-server-zephyr-ota-c6: image grew by 900 B "
                                     "past the baseline (100 -> 1000 B, tolerance 256 B)"])
 
     def test_provisioner_growth_fails(self):
@@ -189,7 +189,7 @@ def test_shrinking_is_a_note_not_a_problem(self):
 
     def test_unknown_build_fails(self):
         problems, _ = size.compare(report(), {}, 256)
-        self.assertEqual(problems, ["modbus-server-tedge-ota-c6: not in the baseline; "
+        self.assertEqual(problems, ["modbus-server-zephyr-ota-c6: not in the baseline; "
                                     "add it with --write-baseline"])
 
     def test_new_region_fails(self):
@@ -207,7 +207,7 @@ def test_within_budget(self):
 
     def test_app_over_budget_names_partition_and_percent(self):
         problems, _ = size.budget(report(image=850), 80, 92, 95, {})
-        self.assertEqual(problems, ["modbus-server-tedge-ota-c6: app image is 850 B, 85.0% "
+        self.assertEqual(problems, ["modbus-server-zephyr-ota-c6: app image is 850 B, 85.0% "
                                     "of the 1000 B slot0 partition (budget 80%)"])
 
     def test_provisioner_over_budget(self):
@@ -216,7 +216,7 @@ def test_provisioner_over_budget(self):
         self.assertIn("provisioner image is 950 B, 95.0% of the 1000 B prov partition", problems[0])
 
     def test_known_exception_is_a_warning(self):
-        baseline = {"modbus-server-tedge-ota-c6": {
+        baseline = {"modbus-server-zephyr-ota-c6": {
             "budget_exceptions": {"provisioner": "until group 9 trims it"}}}
         problems, warnings = size.budget(report(prov_image=950), 80, 92, 95, baseline)
         self.assertEqual(problems, [])
@@ -224,7 +224,7 @@ def test_known_exception_is_a_warning(self):
         self.assertIn("known exception: until group 9 trims it", warnings[0])
 
     def test_ota_ceiling_is_separate_and_not_excepted(self):
-        baseline = {"modbus-server-tedge-ota-c6": {"budget_exceptions": {"app": "x"}}}
+        baseline = {"modbus-server-zephyr-ota-c6": {"budget_exceptions": {"app": "x"}}}
         problems, warnings = size.budget(report(image=960), 80, 92, 95, baseline)
         self.assertEqual(len(warnings), 1)  # the budget, excepted
         self.assertEqual(len(problems), 1)  # the ceiling, never excepted