meshtastic · jamesarich · Mar 17, 2026 · Mar 17, 2026 · Mar 17, 2026 · Mar 17, 2026
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -152,7 +152,7 @@
 
         <!-- This is the public API for doing mesh radio operations from android apps -->
         <service
-            android:name="org.meshtastic.app.service.MeshService"
+            android:name="org.meshtastic.core.service.MeshService"
             android:enabled="true"
             android:foregroundServiceType="connectedDevice|location"
             android:exported="true" tools:ignore="ExportedActivity">
@@ -228,7 +228,7 @@
                 android:resource="@xml/device_filter" />
         </activity>
 
-        <receiver android:name="org.meshtastic.app.service.BootCompleteReceiver"
+        <receiver android:name="org.meshtastic.core.service.BootCompleteReceiver"
             android:exported="false">
             <!-- handle boot events -->
             <intent-filter>
@@ -252,9 +252,9 @@
                     android:path="com.geeksville.mesh" /> -->
             </intent-filter>
         </receiver>
-        <receiver android:name="org.meshtastic.app.service.ReplyReceiver" android:exported="false" />
-        <receiver android:name="org.meshtastic.app.service.MarkAsReadReceiver" android:exported="false" />
-        <receiver android:name="org.meshtastic.app.service.ReactionReceiver" android:exported="false" />
+        <receiver android:name="org.meshtastic.core.service.ReplyReceiver" android:exported="false" />
+        <receiver android:name="org.meshtastic.core.service.MarkAsReadReceiver" android:exported="false" />
+        <receiver android:name="org.meshtastic.core.service.ReactionReceiver" android:exported="false" />
 
         <receiver
             android:name="org.meshtastic.app.widget.LocalStatsWidgetReceiver"

diff --git a/app/src/main/kotlin/org/meshtastic/app/MeshServiceClient.kt b/app/src/main/kotlin/org/meshtastic/app/MeshServiceClient.kt
@@ -25,13 +25,13 @@ import androidx.lifecycle.lifecycleScope
 import co.touchlab.kermit.Logger
 import kotlinx.coroutines.launch
 import org.koin.core.annotation.Factory
-import org.meshtastic.app.service.MeshService
-import org.meshtastic.app.service.startService
 import org.meshtastic.core.common.util.SequentialJob
 import org.meshtastic.core.service.AndroidServiceRepository
 import org.meshtastic.core.service.BindFailedException
 import org.meshtastic.core.service.IMeshService
+import org.meshtastic.core.service.MeshService
 import org.meshtastic.core.service.ServiceClient
+import org.meshtastic.core.service.startService
 
 /** A Activity-lifecycle-aware [ServiceClient] that binds [MeshService] once the Activity is started. */
 @Factory

diff --git a/app/src/main/kotlin/org/meshtastic/app/MeshUtilApplication.kt b/app/src/main/kotlin/org/meshtastic/app/MeshUtilApplication.kt
@@ -40,10 +40,10 @@ import org.koin.core.context.startKoin
 import org.meshtastic.app.di.AppKoinModule
 import org.meshtastic.app.di.module
 import org.meshtastic.app.widget.LocalStatsWidgetReceiver
-import org.meshtastic.app.worker.MeshLogCleanupWorker
 import org.meshtastic.core.common.ContextServices
 import org.meshtastic.core.database.DatabaseManager
 import org.meshtastic.core.repository.MeshPrefs
+import org.meshtastic.core.service.worker.MeshLogCleanupWorker
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toJavaDuration

diff --git a/app/src/main/kotlin/org/meshtastic/app/di/AppKoinModule.kt b/app/src/main/kotlin/org/meshtastic/app/di/AppKoinModule.kt
@@ -37,14 +37,15 @@ import org.meshtastic.core.database.di.CoreDatabaseAndroidModule
 import org.meshtastic.core.database.di.CoreDatabaseModule
 import org.meshtastic.core.datastore.di.CoreDatastoreAndroidModule
 import org.meshtastic.core.datastore.di.CoreDatastoreModule
+import org.meshtastic.core.network.di.CoreNetworkAndroidModule
 import org.meshtastic.core.network.di.CoreNetworkModule
+import org.meshtastic.core.network.repository.ProbeTableProvider
 import org.meshtastic.core.prefs.di.CorePrefsAndroidModule
 import org.meshtastic.core.prefs.di.CorePrefsModule
 import org.meshtastic.core.service.di.CoreServiceAndroidModule
 import org.meshtastic.core.service.di.CoreServiceModule
 import org.meshtastic.core.ui.di.CoreUiModule
 import org.meshtastic.feature.connections.di.FeatureConnectionsModule
-import org.meshtastic.feature.connections.repository.ProbeTableProvider
 import org.meshtastic.feature.firmware.di.FeatureFirmwareModule
 import org.meshtastic.feature.intro.di.FeatureIntroModule
 import org.meshtastic.feature.map.di.FeatureMapModule
@@ -72,6 +73,7 @@ import org.meshtastic.feature.settings.di.FeatureSettingsModule
         CoreServiceModule::class,
         CoreServiceAndroidModule::class,
         CoreNetworkModule::class,
+        CoreNetworkAndroidModule::class,
         CoreUiModule::class,
         FeatureNodeModule::class,
         FeatureMessagingModule::class,

diff --git a/app/src/main/kotlin/org/meshtastic/app/messaging/domain/worker/WorkManagerMessageQueue.kt b/app/src/main/kotlin/org/meshtastic/app/messaging/domain/worker/WorkManagerMessageQueue.kt
@@ -22,6 +22,7 @@ import androidx.work.WorkManager
 import androidx.work.workDataOf
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.MessageQueue
+import org.meshtastic.core.service.worker.SendMessageWorker
 
 /** Android implementation of [MessageQueue] that uses [WorkManager] for reliable background transmission. */
 @Single

diff --git a/app/src/main/kotlin/org/meshtastic/app/ui/Main.kt b/app/src/main/kotlin/org/meshtastic/app/ui/Main.kt
@@ -74,7 +74,6 @@ import org.meshtastic.app.navigation.firmwareGraph
 import org.meshtastic.app.navigation.mapGraph
 import org.meshtastic.app.navigation.nodesGraph
 import org.meshtastic.app.navigation.settingsGraph
-import org.meshtastic.app.service.MeshService
 import org.meshtastic.core.model.ConnectionState
 import org.meshtastic.core.model.DeviceType
 import org.meshtastic.core.model.DeviceVersion
@@ -96,6 +95,7 @@ import org.meshtastic.core.resources.should_update
 import org.meshtastic.core.resources.should_update_firmware
 import org.meshtastic.core.resources.traceroute
 import org.meshtastic.core.resources.view_on_map
+import org.meshtastic.core.service.MeshService
 import org.meshtastic.core.ui.component.MeshtasticDialog
 import org.meshtastic.core.ui.component.ScrollToTopEvent
 import org.meshtastic.core.ui.navigation.icon

diff --git a/conductor/archive/extract_services_20260317/index.md b/conductor/archive/extract_services_20260317/index.md
@@ -0,0 +1,5 @@
+# Track extract_services_20260317 Context
+
+- [Specification](./spec.md)
+- [Implementation Plan](./plan.md)
+- [Metadata](./metadata.json)
diff --git a/conductor/archive/extract_services_20260317/metadata.json b/conductor/archive/extract_services_20260317/metadata.json
@@ -0,0 +1,8 @@
+{
+  "track_id": "extract_services_20260317",
+  "type": "refactor",
+  "status": "new",
+  "created_at": "2026-03-17T00:00:00Z",
+  "updated_at": "2026-03-17T00:00:00Z",
+  "description": "Extract service/worker/radio files from `app` to `core:service/androidMain` and `core:network/androidMain`"
+}
diff --git a/conductor/archive/extract_services_20260317/plan.md b/conductor/archive/extract_services_20260317/plan.md
@@ -0,0 +1,44 @@
+# Implementation Plan: Extract service/worker/radio files from `app`
+
+## Phase 1: Preparation & Analysis [checkpoint: 72022ed]
+- [x] Task: Identify all Android-specific classes to be moved (Services, WorkManager workers, Radio connections in `app`) [fd916e3]
+    - [ ] Locate `Service` classes in `app/src/main/java/org/meshtastic/app`
+    - [ ] Locate WorkManager `Worker` classes
+    - [ ] Locate Radio connection classes
+- [x] Task: Conductor - User Manual Verification 'Preparation & Analysis' (Protocol in workflow.md)
+
+## Phase 2: Extraction to `core:service` [checkpoint: ff47af8]
+- [x] Task: Setup `core:service` module for Android and Common targets (if not already fully configured) [a114084]
+- [x] Task: Move Android `Service` implementations to `core:service/androidMain` [965def0]
+    - [x] Move the files
+    - [x] Update imports and Koin injections
+- [x] Task: Abstract shared service logic into `core:service/commonMain` [a85e282]
+    - [x] Write failing tests for abstracted shared logic (TDD Red)
+    - [x] Extract interfaces and platform-agnostic logic (TDD Green)
+    - [x] Refactor the implementations to use these shared abstractions
+- [x] Task: Conductor - User Manual Verification 'Extraction to core:service' (Protocol in workflow.md)
+
+## Phase 3: Extraction to `core:network` [checkpoint: 97a5b62]
+- [x] Task: Move Radio connection and networking files from `app` to `core:network/androidMain` [b5233cf]
+    - [x] Move the files
+    - [x] Update imports and Koin injections
+- [x] Task: Abstract shared radio/network logic into `core:network/commonMain` [cc1581d]
+    - [x] Write failing tests for abstracted radio logic (TDD Red)
+    - [x] Extract platform-agnostic business logic (TDD Green)
+    - [x] Refactor implementations to use shared abstractions
+- [x] Task: Conductor - User Manual Verification 'Extraction to core:network' (Protocol in workflow.md)
+
+## Phase 4: Desktop Integration [checkpoint: fffcedc]
+- [x] Task: Integrate newly extracted shared abstractions into the `desktop` module [f39df2f]
+    - [x] Implement desktop-specific actuals or Koin bindings for the shared interfaces
+    - [x] Wire up abstracted services/radio logic in desktop Koin graph
+- [x] Task: Conductor - User Manual Verification 'Desktop Integration' (Protocol in workflow.md)
+
+## Phase 5: Verification & Cleanup [checkpoint: a0866e0]
+- [x] Task: Build project and verify no regressions in background processing or radio connectivity [a9edc2e]
+- [x] Task: Verify test coverage (>80%) for all extracted and refactored code [9cff9bc]
+- [x] Task: Remove any lingering unused dependencies or dead code in `app` [e39d2e2]
+- [x] Task: Conductor - User Manual Verification 'Verification & Cleanup' (Protocol in workflow.md)
+
+## Phase: Review Fixes
+- [x] Task: Apply review suggestions [1ae9fb6]
diff --git a/conductor/archive/extract_services_20260317/spec.md b/conductor/archive/extract_services_20260317/spec.md
@@ -0,0 +1,32 @@
+# Specification: Extract service/worker/radio files from `app`
+
+## Overview
+This track aims to decouple the main `app` module by extracting Android-specific service, WorkManager worker, and radio connection files into `core:service` and `core:network` modules. The goal is to maximize code reuse across Kotlin Multiplatform (KMP) targets, clarify class responsibilities, and improve unit testability by isolating the network and service layers.
+
+## Goals
+- **Decouple `app`:** Remove Android-specific service dependencies from the main app module.
+- **KMP Preparation:** Migrate as much logic as possible into `commonMain` for reuse across platforms.
+- **Desktop Integration:** If logic is successfully abstracted into `commonMain`, integrate and use it within the `desktop` target to ensure reusability.
+- **Testability:** Isolate service and network layers to facilitate better unit testing.
+- **Simplification:** Refactor logic during the move to clarify and simplify responsibilities.
+
+## Functional Requirements
+- Identify all service, worker, and radio-related classes currently residing in the `app` module.
+- Move Android-specific implementations (e.g., `Service`, `Worker`) to `core:service/androidMain` and `core:network/androidMain`.
+- Extract platform-agnostic business logic and interfaces into `commonMain` within those core modules.
+- Refactor existing logic where necessary to establish a clear delineation of responsibility.
+- Update all dependency injections (Koin modules) and imports across the project to reflect the new locations.
+- Attempt to wire up the newly abstracted shared logic within the `desktop` module if applicable.
+
+## Non-Functional Requirements
+- **Architecture Compliance:** Changes must adhere to the MVI / Unidirectional Data Flow and KMP structures defined in `tech-stack.md`.
+- **Performance:** Refactoring should not negatively impact app startup time or background processing efficiency.
+- **Code Coverage:** Maintain or improve overall test coverage for the extracted components (>80% target).
+
+## Acceptance Criteria
+- [ ] No service, worker, or radio connection classes remain in the `app` module.
+- [ ] Extracted Android-specific classes compile successfully in `core:service/androidMain` and `core:network/androidMain`.
+- [ ] Shared business logic compiles successfully in `core:service/commonMain` and `core:network/commonMain`.
+- [ ] If logic is abstracted for reuse, it is integrated and utilized in the `desktop` target where applicable.
+- [ ] The app compiles, installs, and runs without regressions in background processing or radio connectivity.
+- [ ] Unit tests for the moved and refactored classes pass.
diff --git a/conductor/product.md b/conductor/product.md
@@ -20,6 +20,6 @@ Meshtastic-Android is a Kotlin Multiplatform (KMP) application designed to facil
 - Device configuration and firmware updates
 
 ## Key Architecture Goals
-- Provide a robust, shared KMP core (`core:model`, `core:ble`, `core:repository`, `core:domain`, `core:data`, `core:network`) to support multiple platforms (Android, Desktop, iOS)
+- Provide a robust, shared KMP core (`core:model`, `core:ble`, `core:repository`, `core:domain`, `core:data`, `core:network`, `core:service`) to support multiple platforms (Android, Desktop, iOS)
 - Ensure offline-first functionality and resilient data persistence (Room KMP)
 - Decouple UI logic into shared components (`core:ui`, `feature:*`) using Compose Multiplatform
diff --git a/conductor/tech-stack.md b/conductor/tech-stack.md
@@ -7,6 +7,9 @@
 - **Compose Multiplatform:** Shared UI layer for rendering on Android and Desktop.
 - **Jetpack Compose:** Used where platform-specific UI (like charts or permissions) is necessary on Android.
 
+## Background & Services
+- **Platform Services:** Core service orchestrations and background work are abstracted into `core:service` to maximize logic reuse across targets, using platform-specific implementations (e.g., WorkManager/Service on Android) only where necessary.
+
 ## Architecture
 - **MVI / Unidirectional Data Flow:** Shared view models using the multiplatform `androidx.lifecycle.ViewModel`.
 - **JetBrains Navigation 3:** Multiplatform fork for state-based, compose-first navigation without relying on `NavController`.

diff --git a/conductor/tracks.md b/conductor/tracks.md
@@ -1,5 +1,3 @@
 # Project Tracks
 
 This file tracks all major tracks for the project. Each track has its own detailed plan in its respective folder.
-
----
diff --git a/core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/CommandSenderImpl.kt b/core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/CommandSenderImpl.kt
@@ -258,7 +258,7 @@ class CommandSenderImpl(
                 wantAck = true,
                 id = requestId,
                 channel = nodeManager.nodeDBbyNodeNum[destNum]?.channel ?: 0,
-                decoded = Data(portnum = PortNum.TRACEROUTE_APP, want_response = true),
+                decoded = Data(portnum = PortNum.TRACEROUTE_APP, want_response = true, dest = destNum),
             ),
         )
     }
@@ -296,7 +296,7 @@ class CommandSenderImpl(
                 to = destNum,
                 id = requestId,
                 channel = nodeManager.nodeDBbyNodeNum[destNum]?.channel ?: 0,
-                decoded = Data(portnum = portNum, payload = payloadBytes, want_response = true),
+                decoded = Data(portnum = portNum, payload = payloadBytes, want_response = true, dest = destNum),
             ),
         )
     }
@@ -349,7 +349,7 @@ class CommandSenderImpl(
                     wantAck = true,
                     id = requestId,
                     channel = nodeManager.nodeDBbyNodeNum[destNum]?.channel ?: 0,
-                    decoded = Data(portnum = PortNum.NEIGHBORINFO_APP, want_response = true),
+                    decoded = Data(portnum = PortNum.NEIGHBORINFO_APP, want_response = true, dest = destNum),
                 ),
             )
         }

diff --git a/core/model/src/commonMain/kotlin/org/meshtastic/core/model/DeviceVersion.kt b/core/model/src/commonMain/kotlin/org/meshtastic/core/model/DeviceVersion.kt
@@ -52,4 +52,9 @@ data class DeviceVersion(val asString: String) : Comparable<DeviceVersion> {
     }
 
     override fun compareTo(other: DeviceVersion): Int = asInt.compareTo(other.asInt)
+
+    companion object {
+        const val MIN_FW_VERSION = "2.5.14"
+        const val ABS_MIN_FW_VERSION = "2.3.15"
+    }
 }
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -51,7 +51,10 @@ kotlin {
         val jvmMain by getting { dependencies { implementation(libs.ktor.client.java) } }
 
         androidMain.dependencies {
+            implementation(projects.core.ble)
+            implementation(projects.core.prefs)
             implementation(libs.org.eclipse.paho.client.mqttv3)
+            implementation(libs.usb.serial.android)
             implementation(libs.coil.network.okhttp)
             implementation(libs.coil.svg)
             implementation(libs.ktor.client.okhttp)

diff --git a/...ory/radio/AndroidRadioInterfaceService.kt → ...ork/radio/AndroidRadioInterfaceService.kt b/...ory/radio/AndroidRadioInterfaceService.kt → ...ork/radio/AndroidRadioInterfaceService.kt
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import android.app.Application
 import android.provider.Settings
@@ -37,8 +37,8 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.koin.core.annotation.Named
 import org.koin.core.annotation.Single
-import org.meshtastic.app.BuildConfig
 import org.meshtastic.core.ble.BluetoothRepository
+import org.meshtastic.core.common.BuildConfigProvider
 import org.meshtastic.core.common.util.BinaryLogFile
 import org.meshtastic.core.common.util.handledLaunch
 import org.meshtastic.core.common.util.ignoreException
@@ -49,11 +49,11 @@ import org.meshtastic.core.model.ConnectionState
 import org.meshtastic.core.model.InterfaceId
 import org.meshtastic.core.model.MeshActivity
 import org.meshtastic.core.model.util.anonymize
+import org.meshtastic.core.network.repository.NetworkRepository
 import org.meshtastic.core.repository.PlatformAnalytics
 import org.meshtastic.core.repository.RadioInterfaceService
 import org.meshtastic.core.repository.RadioPrefs
 import org.meshtastic.core.repository.RadioTransport
-import org.meshtastic.feature.connections.repository.NetworkRepository
 import org.meshtastic.proto.Heartbeat
 import org.meshtastic.proto.ToRadio
 
@@ -73,6 +73,7 @@ class AndroidRadioInterfaceService(
     private val dispatchers: CoroutineDispatchers,
     private val bluetoothRepository: BluetoothRepository,
     private val networkRepository: NetworkRepository,
+    private val buildConfigProvider: BuildConfigProvider,
     @Named("ProcessLifecycle") private val processLifecycle: Lifecycle,
     private val radioPrefs: RadioPrefs,
     private val interfaceFactory: Lazy<InterfaceFactory>,
@@ -187,7 +188,7 @@ class AndroidRadioInterfaceService(
         interfaceFactory.value.toInterfaceAddress(interfaceId, rest)
 
     override fun isMockInterface(): Boolean =
-        BuildConfig.DEBUG || Settings.System.getString(context.contentResolver, "firebase.test.lab") == "true"
+        buildConfigProvider.isDebug || Settings.System.getString(context.contentResolver, "firebase.test.lab") == "true"
 
     override fun getDeviceAddress(): String? {
         // If the user has unpaired our device, treat things as if we don't have one

diff --git a/...app/repository/radio/BleRadioInterface.kt → ...c/core/network/radio/BleRadioInterface.kt b/...app/repository/radio/BleRadioInterface.kt → ...c/core/network/radio/BleRadioInterface.kt
@@ -14,7 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+@file:Suppress("TooManyFunctions", "TooGenericExceptionCaught")
+
+package org.meshtastic.core.network.radio
 
 import android.annotation.SuppressLint
 import co.touchlab.kermit.Logger

diff --git a/...ository/radio/BleRadioInterfaceFactory.kt → ...network/radio/BleRadioInterfaceFactory.kt b/...ository/radio/BleRadioInterfaceFactory.kt → ...network/radio/BleRadioInterfaceFactory.kt
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.ble.BleConnectionFactory

diff --git a/...repository/radio/BleRadioInterfaceSpec.kt → ...re/network/radio/BleRadioInterfaceSpec.kt b/...repository/radio/BleRadioInterfaceSpec.kt → ...re/network/radio/BleRadioInterfaceSpec.kt
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.RadioInterfaceService

diff --git a/.../app/repository/radio/InterfaceFactory.kt → ...ic/core/network/radio/InterfaceFactory.kt b/.../app/repository/radio/InterfaceFactory.kt → ...ic/core/network/radio/InterfaceFactory.kt
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.model.InterfaceId