refactor: Remove AIDL API and modernize service architecture

.agent_memory/session_context.md

@@ -3,6 +3,22 @@
 # Do NOT edit or remove previous entries — stale state claims cause agent confusion.
 # Format: ## YYYY-MM-DD — <summary>
 
+## 2026-05-30 — Merged main into remove-aidl-api branch; resolved conflicts; PR #5586 mergeable
+- `git merge origin/main` (branch was 40 behind / 31 ahead). 12 files flagged; git auto-resolved 11. Only real conflict: this append-only `session_context.md` (both sides added top entries — kept both in date order).
+- AIDL removal preserved through the merge (main still ships `IMeshService.aidl`/`FakeIMeshService` etc.; our deletions held). Manifest `MeshService` now `exported=false` with no AIDL bind filter; main's Android Auto removal (#5662) carried through.
+- proto submodule advanced to v2.7.24 (dd6c3f8) per main #5654; synced working tree. main dep bumps merged: takpacket-sdk 0.5.1, firebase-bom 34.14.0, atomicfu 0.33.0.
+- Validated: `assembleDebug`, `spotlessCheck`, `detekt`, `:core:data:jvmTest`, `:core:takserver:allTests` all green (the two conflicted feature modules). Pushed; PR #5586 → MERGEABLE, CI re-running.
+- Aside (separate repo): meshtastic-sdk PR #3 was superseded by main's PR #1; extracted only the toolchain bump into SDK PR #4 (Kotlin 2.3.21 / SKIE 0.10.12 / Wire 6.4.0 / Ktor 3.5.0 / coroutines stable).
+
+## 2026-05-29 — Removed AIDL/broadcast service layer; modernized RadioController; deferred R4/R5
+- AIDL bound-service + broadcast (`core:api`, `IMeshService`, `ServiceBroadcasts`, `ServiceAction`, `MeshActionHandler`, `MeshRouter`) removed; replaced with direct suspend-based `RadioController`.
+- `RadioController` split into `AdminController`/`MessagingController`/`NodeController`/`RequestController`, composed in `DirectRadioControllerImpl` via Kotlin `by` delegation to four focused impls (`AdminControllerImpl` etc., core/service commonMain).
+- Typed addressing: `NodeAddress` (sealed) + `ContactKey` (value class) in core/model; 6 hand-rolled contact-key parsers consolidated onto `ContactKey.channelOrNull`/`addressString`.
+- Idempotent node ops: `setFavorite`/`setIgnored(Boolean)` + `toggleMuted` (fixed a latent toggle bug in `SendMessageUseCase`); `editSettings { }` DSL (`AdminEditScope`) replaced begin/commitEditSettings.
+- Shared `RequestTimer` extracted from Traceroute/NeighborInfo handlers. `formatAgo` runBlocking removed. Contact import re-marks `manually_verified=true` (review-fix regression).
+- Admin sends are intentionally fire-and-forget (device = source of truth).
+- R4 (`AdminResult<T>`) and R5 (`NodeId` value class) investigated and DEFERRED to the SDK migration — do not build standalone. Rationale in `.agent_plans/post-aidl-modernization.md`.
+
 ## 2026-05-28 — Stabilized DatabaseManager withDb retry host test
 - Hardened `DatabaseManagerWithDbRetryTest` to remove CI race conditions by running the manager on a `StandardTestDispatcher(testScheduler)` instead of real `Dispatchers.IO`.
 - Added a `withTimeout(10_000)` guard around the test body to fail fast on coordination stalls instead of hanging/flapping.

.github/copilot-instructions.md

@@ -33,7 +33,7 @@ git submodule update --init
 
 KMP modules have different task names than pure-Android modules. Using the wrong name silently skips tests or fails resolution.
 
-| Intent | KMP modules (`core:*`, `feature:*`) | Android-only (`app`, `core:api`, `core:barcode`) |
+| Intent | KMP modules (`core:*`, `feature:*`) | Android-only (`app`, `core:barcode`) |
 |--------|--------------------------------------|--------------------------------------------------|
 | Run tests | `:module:allTests` | `:module:testFdroidDebugUnitTest` |
 | Detekt | `:module:detekt` (lifecycle task) | `:module:detekt` |

.github/workflows/reusable-check.yml

@@ -113,7 +113,7 @@ jobs:
 
       - name: Lint, Analysis & KMP Smoke Compile
         if: inputs.run_lint == true
-        run: ./gradlew spotlessCheck detekt androidApp:lintFdroidDebug androidApp:lintGoogleDebug core:barcode:lintFdroidDebug core:barcode:lintGoogleDebug core:api:lintDebug kmpSmokeCompile -Pci=true --continue
+        run: ./gradlew spotlessCheck detekt androidApp:lintFdroidDebug androidApp:lintGoogleDebug core:barcode:lintFdroidDebug core:barcode:lintGoogleDebug kmpSmokeCompile -Pci=true --continue
 
       - name: KMP Smoke Compile (lint skipped)
         if: inputs.run_lint == false

.skills/project-overview/SKILL.md

@@ -5,7 +5,7 @@ Module directory, namespacing conventions, environment setup, and troubleshootin
 
 - **Build System:** Gradle (Kotlin DSL). JDK 21 REQUIRED. Target SDK: API 36. Min SDK: API 26.
 - **Flavors:** `fdroid` (OSS only) · `google` (Maps + DataDog analytics)
-- **Android-only Modules:** `core:api` (AIDL), `core:barcode` (CameraX). Shared contracts abstracted into `core:ui/commonMain`.
+- **Android-only Modules:** `core:barcode` (CameraX). Shared contracts abstracted into `core:ui/commonMain`.
 
 ## Codebase Map
 
@@ -28,7 +28,6 @@ Module directory, namespacing conventions, environment setup, and troubleshootin
 | `core:navigation` | Shared navigation keys/routes for Navigation 3 using `@Serializable sealed interface` hierarchies. `DeepLinkRouter` for typed backstack synthesis, and `MeshtasticNavSavedStateConfig` with `subclassesOfSealed()` for automatic polymorphic backstack persistence. |
 | `core:ui` | Shared Compose UI components (`MeshtasticAppShell`, `MeshtasticNavDisplay`, `MeshtasticNavigationSuite`, `AlertHost`, `SharedDialogs`, `PlaceholderScreen`, `MainAppBar`, dialogs, preferences) and platform abstractions. |
 | `core:service` | KMP service layer; Android bindings stay in `androidMain`. |
-| `core:api` | Public AIDL/API integration module for external clients. |
 | `core:prefs` | KMP preferences layer built on DataStore abstractions. |
 | `core:barcode` | Barcode scanning (Android-only). |
 | `core:nfc` | NFC abstractions (KMP). Android NFC hardware implementation in `androidMain`. |

.skills/testing-ci/SKILL.md

@@ -17,7 +17,7 @@ Run in a single invocation for routine changes to ensure code formatting, analys
 > In KMP modules, the `test` task name is **ambiguous**. Gradle matches both `testAndroid` and
 > `testAndroidHostTest` and refuses to run either, silently skipping KMP modules.
 > `allTests` is the `KotlinTestReport` lifecycle task registered by the KMP plugin.
-> Conversely, `allTests` does **not** cover pure-Android modules (`:androidApp`, `:core:api`, etc.), which is why both `test` and `allTests` are needed.
+> Conversely, `allTests` does **not** cover pure-Android modules (`:androidApp`, `:core:barcode`, etc.), which is why both `test` and `allTests` are needed.
 
 *Note: If testing Compose UI on the JVM (Robolectric) with Java 21, pin tests to `@Config(sdk = [34])` to avoid SDK 35 compatibility crashes.*
 

README.md

@@ -87,7 +87,6 @@ Each module has its own README with details on its responsibilities, API surface
 
 | Module | Description |
 |---|---|
-| [core/api](core/api/README.md) | AIDL service API for third-party integrations |
 | [core/domain](core/domain/README.md) | Business-logic use cases (radio config, sessions, exports) |
 | [core/repository](core/repository/README.md) | Data & infrastructure contracts (RadioTransport, NodeRepository, ServiceRepository) |
 | [core/takserver](core/takserver/README.md) | Meshtastic ↔ TAK (ATAK/iTAK) bridge — CoT server & conversion |
@@ -123,13 +122,9 @@ Each module has its own README with details on its responsibilities, API surface
 
 You can help translate the app into your native language using [Crowdin](https://crowdin.meshtastic.org/android).
 
-## API & Integration
+## Integration
 
-Developers can integrate with the Meshtastic Android app using our published API library via **JitPack**. This allows third-party applications (like the ATAK plugin) to communicate with the mesh service via AIDL.
-
-For detailed integration instructions, see [core/api/README.md](core/api/README.md).
-
-Additionally, the app includes a built-in **Local TAK Server** feature that can be enabled in settings. This runs a local TCP server on port 8089 to allow ATAK clients to connect directly and route their traffic over the mesh.
+The app includes a built-in **Local TAK Server** feature that can be enabled in settings. This runs a local TCP server on port 8089 to allow ATAK clients to connect directly and route their traffic over the mesh.
 
 ## Building the Android App
 > [!WARNING]

androidApp/build.gradle.kts

@@ -110,7 +110,7 @@ configure<ApplicationExtension> {
                 ),
             )
         }
-        ndk { abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64") }
+        ndk { abiFilters += listOf("armeabi-v7a", "arm64-v8a") }
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -124,7 +124,7 @@ configure<ApplicationExtension> {
         abi {
             isEnable = !disableSplits
             reset()
-            include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+            include("armeabi-v7a", "arm64-v8a")
             isUniversalApk = true
         }
     }

androidApp/src/fdroid/java/org/meshtastic/app/map/cluster/MarkerClusterer.java

@@ -127,8 +127,8 @@ protected void hideInfoWindows(){
 		int zoomLevel = mapView.getZoomLevel();
 		if (zoomLevel != mLastZoomLevel && !mapView.isAnimating()){
 			hideInfoWindows();
-        	mClusters = clusterer(mapView);
-        	renderer(mClusters, canvas, mapView);
+			mClusters = clusterer(mapView);
+			renderer(mClusters, canvas, mapView);
 			mLastZoomLevel = zoomLevel;
 		}
 

androidApp/src/fdroid/java/org/meshtastic/app/map/cluster/RadiusMarkerClusterer.java

@@ -27,6 +27,8 @@
 import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;
 
+import androidx.core.content.res.ResourcesCompat;
+
 import org.meshtastic.app.map.model.MarkerWithLabel;
 
 import org.osmdroid.bonuspack.R;
@@ -72,7 +74,7 @@ public RadiusMarkerClusterer(Context ctx) {
         mTextPaint.setFakeBoldText(true);
         mTextPaint.setTextAlign(Paint.Align.CENTER);
         mTextPaint.setAntiAlias(true);
-        Drawable clusterIconD = ctx.getResources().getDrawable(R.drawable.marker_cluster);
+        Drawable clusterIconD = ResourcesCompat.getDrawable(ctx.getResources(), R.drawable.marker_cluster, ctx.getTheme());
         Bitmap clusterIcon = ((BitmapDrawable) clusterIconD).getBitmap();
         setIcon(clusterIcon);
         mAnimated = true;

androidApp/src/fdroid/kotlin/org/meshtastic/app/map/MapView.kt

@@ -52,6 +52,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableDoubleStateOf
 import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -87,6 +88,7 @@ import org.meshtastic.core.common.util.nowMillis
 import org.meshtastic.core.common.util.nowSeconds
 import org.meshtastic.core.model.DataPacket
 import org.meshtastic.core.model.Node
+import org.meshtastic.core.model.NodeAddress
 import org.meshtastic.core.resources.Res
 import org.meshtastic.core.resources.calculating
 import org.meshtastic.core.resources.cancel
@@ -113,9 +115,11 @@ import org.meshtastic.core.resources.map_purge_success
 import org.meshtastic.core.resources.map_style_selection
 import org.meshtastic.core.resources.map_subDescription
 import org.meshtastic.core.resources.map_tile_source
+import org.meshtastic.core.resources.now
 import org.meshtastic.core.resources.only_favorites
 import org.meshtastic.core.resources.show_precision_circle
 import org.meshtastic.core.resources.show_waypoints
+import org.meshtastic.core.resources.unknown
 import org.meshtastic.core.resources.waypoint_delete
 import org.meshtastic.core.resources.you
 import org.meshtastic.core.ui.component.BasicListItem
@@ -239,6 +243,9 @@ fun MapView(
     val haptic = LocalHapticFeedback.current
     fun performHapticFeedback() = haptic.performHapticFeedback(HapticFeedbackType.LongPress)
 
+    val unknownText = stringResource(Res.string.unknown)
+    val nowText = stringResource(Res.string.now)
+
     // Accompanist permissions state for location
     val locationPermissionsState =
         rememberMultiplePermissionsState(permissions = listOf(Manifest.permission.ACCESS_FINE_LOCATION))
@@ -355,36 +362,37 @@ fun MapView(
 
             val (p, u) = node.position to node.user
             val nodePosition = GeoPoint(node.latitude, node.longitude)
-            MarkerWithLabel(mapView = this, label = "${u.short_name} ${formatAgo(p.time)}").apply {
-                id = u.id
-                title = u.long_name
-                snippet =
-                    getString(
-                        Res.string.map_node_popup_details,
-                        node.gpsString(),
-                        formatAgo(node.lastHeard),
-                        formatAgo(p.time),
-                        if (node.batteryStr != "") node.batteryStr else "?",
-                    )
-                ourNode?.distanceStr(node, displayUnits)?.let { dist ->
-                    ourNode.bearing(node)?.let { bearing ->
-                        subDescription = getString(Res.string.map_subDescription, bearing, dist)
+            MarkerWithLabel(mapView = this, label = "${u.short_name} ${formatAgo(p.time, unknownText, nowText)}")
+                .apply {
+                    id = u.id
+                    title = u.long_name
+                    snippet =
+                        getString(
+                            Res.string.map_node_popup_details,
+                            node.gpsString(),
+                            formatAgo(node.lastHeard, unknownText, nowText),
+                            formatAgo(p.time, unknownText, nowText),
+                            if (node.batteryStr != "") node.batteryStr else "?",
+                        )
+                    ourNode?.distanceStr(node, displayUnits)?.let { dist ->
+                        ourNode.bearing(node)?.let { bearing ->
+                            subDescription = getString(Res.string.map_subDescription, bearing, dist)
+                        }
+                    }
+                    setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
+                    position = nodePosition
+                    icon = markerIcon
+                    setNodeColors(node.colors)
+                    if (!mapFilterStateValue.showPrecisionCircle) {
+                        setPrecisionBits(0)
+                    } else {
+                        setPrecisionBits(p.precision_bits)
+                    }
+                    setOnLongClickListener {
+                        navigateToNodeDetails(node.num)
+                        true
                     }
                 }
-                setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
-                position = nodePosition
-                icon = markerIcon
-                setNodeColors(node.colors)
-                if (!mapFilterStateValue.showPrecisionCircle) {
-                    setPrecisionBits(0)
-                } else {
-                    setPrecisionBits(p.precision_bits)
-                }
-                setOnLongClickListener {
-                    navigateToNodeDetails(node.num)
-                    true
-                }
-            }
         }
     }
 
@@ -433,7 +441,7 @@ fun MapView(
         }
     }
 
-    fun getUsername(id: String?) = if (id == DataPacket.ID_LOCAL || (myId != null && id == myId)) {
+    fun getUsername(id: String?) = if (id == NodeAddress.ID_LOCAL || (myId != null && id == myId)) {
         getString(Res.string.you)
     } else {
         mapViewModel.getUser(id).long_name
@@ -446,7 +454,7 @@ fun MapView(
             if (!mapFilterState.showWaypoints) return@mapNotNull null // Use collected mapFilterState
             val lock = if (pt.locked_to != 0) "\uD83D\uDD12" else ""
             val time = DateFormatter.formatDateTime(waypoint.time)
-            val label = pt.name + " " + formatAgo((waypoint.time / 1000).toInt())
+            val label = pt.name + " " + formatAgo((waypoint.time / 1000).toInt(), unknownText, nowText)
             val emoji = String(Character.toChars(if (pt.icon == 0) 128205 else pt.icon))
             val now = nowMillis
             val expireTimeMillis = pt.expire * 1000L
@@ -818,15 +826,15 @@ private fun FdroidMainMapFilterDropdown(
 
 @Composable
 private fun MapStyleDialog(selectedMapStyle: Int, onDismiss: () -> Unit, onSelectMapStyle: (Int) -> Unit) {
-    val selected = remember { mutableStateOf(selectedMapStyle) }
+    val selected = remember { mutableIntStateOf(selectedMapStyle) }
 
     MapsDialog(onDismiss = onDismiss) {
         CustomTileSource.mTileSources.values.forEachIndexed { index, style ->
             ListItem(
                 text = style,
-                trailingIcon = if (index == selected.value) MeshtasticIcons.Check else null,
+                trailingIcon = if (index == selected.intValue) MeshtasticIcons.Check else null,
                 onClick = {
-                    selected.value = index
+                    selected.intValue = index
                     onSelectMapStyle(index)
                     onDismiss()
                 },
@@ -879,7 +887,7 @@ private fun PurgeTileSourceDialog(onDismiss: () -> Unit) {
     val context = LocalContext.current
     val cache = SqlTileWriterExt()
 
-    val sourceList by derivedStateOf { cache.sources.map { it.source as String } }
+    val sourceList by remember { derivedStateOf { cache.sources.map { it.source as String } } }
 
     val selected = remember { mutableStateListOf<Int>() }
 

androidApp/src/fdroid/kotlin/org/meshtastic/app/map/MapViewModel.kt

@@ -22,11 +22,11 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import org.koin.core.annotation.KoinViewModel
 import org.meshtastic.core.common.BuildConfigProvider
-import org.meshtastic.core.model.RadioController
 import org.meshtastic.core.repository.MapPrefs
 import org.meshtastic.core.repository.NodeRepository
 import org.meshtastic.core.repository.PacketRepository
 import org.meshtastic.core.repository.RadioConfigRepository
+import org.meshtastic.core.repository.RadioController
 import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
 import org.meshtastic.feature.map.BaseMapViewModel
 import org.meshtastic.proto.LocalConfig