refactor(mobile-platform): remove duplicate messenger types (#32050)

## **Description**

Apply the messenger type refactoring from PR #31467 to the messenger
files owned by `@MetaMask/mobile-platform`. This is the final team in a
series of per-team PRs (see #31969, #31971, #31973, #31974, #31977,
#31978, #31979, #31980, #32005).

The refactoring:
- Narrows `rootMessenger` parameters from the unnarrowed `RootMessenger`
to `RootMessenger<MessengerActions<X>, MessengerEvents<X>>`, making
callers' requirements explicit in the type signature.
- Simplifies 4-param `new Messenger<N, A, E, Root>({...})` constructors
to typed variable declarations (`const messenger: XMessenger = new
Messenger({...})`), letting TypeScript infer the generic arguments.
- Converts `ReturnType<typeof getXInitMessenger>` type aliases to
explicit `Messenger<'Namespace', Actions, Events>` types.
- Removes re-exports of package types from two messenger files
(`ClientControllerMessenger`, `GeolocationControllerActions/Events`) —
callers should import directly from the package.

Three files (`account-tracker-controller-messenger`,
`multichain-routing-service-messenger`,
`snap-account-service-messenger`) have package-defined action types that
do not extend `GlobalActions` (the same structural mismatch as
`SnapInterfaceControllerMessenger`). These use `Messenger<'Root', A, E>`
directly in the parameter type to bypass the `extends GlobalActions`
constraint on the `RootMessenger` type alias while still providing
equivalent narrowing.

## **Changelog**

CHANGELOG entry: null

## **Related issues**

Refs: #31467

## **Manual testing steps**

N/A — type-only changes; no runtime behaviour altered.

## **Screenshots/Recordings**

### **Before**

N/A

### **After**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

#### Performance checks (if applicable)

- [ ] I've tested on Android
- [ ] I've tested with a power user scenario
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> **Low Risk**
> Compile-time-only changes across messenger wiring; delegate
action/event lists are unchanged, so runtime Engine behavior should be
unaffected aside from stricter TypeScript at call sites.
> 
> **Overview**
> Applies the messenger typing refactor from #31467 across
**mobile-platform** Engine messenger factories: callers must pass a
**narrowed** `rootMessenger` (`RootMessenger<MessengerActions<X>,
MessengerEvents<X>>` or equivalent) instead of an unnarrowed root, and
child messengers are created via **typed** `const messenger: XMessenger
= new Messenger({...})` rather than four-parameter `new Messenger<...>`
generics.
> 
> **Init messenger** type aliases move from `ReturnType<typeof
getXInitMessenger>` to explicit `Messenger<'Namespace', Actions,
Events>`. Several factories that previously took
**`RootExtendedMessenger`** now take **`RootMessenger`** with the same
delegate wiring. **`ClientControllerMessenger`** and **Geolocation**
action/event re-exports are removed from messenger modules (import from
packages instead). Messenger tests import **`RootMessenger`** from
`../types` instead of ad-hoc `ExtendedMessenger` / local root types.
> 
> **Exceptions:** `account-tracker-controller-messenger`,
`multichain-routing-service-messenger`, and
`snap-account-service-messenger` narrow the root parameter with
`Messenger<'Root', Actions, Events>` where package action types do not
satisfy `GlobalActions` on the `RootMessenger` alias.
> 
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
2d73fd3. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: Mrtenz

app/core/Engine/messengers/account-tracker-controller-messenger.ts

@@ -4,7 +4,6 @@ import {
   MessengerEvents,
 } from '@metamask/messenger';
 import { AccountTrackerControllerMessenger } from '@metamask/assets-controllers';
-import { RootMessenger } from '../types';
 
 /**
  * Get the AccountTrackerControllerMessenger for the AccountTrackerController.
@@ -13,14 +12,13 @@ import { RootMessenger } from '../types';
  * @returns The AccountTrackerControllerMessenger.
  */
 export function getAccountTrackerControllerMessenger(
-  rootMessenger: RootMessenger,
-): AccountTrackerControllerMessenger {
-  const messenger = new Messenger<
-    'AccountTrackerController',
+  rootMessenger: Messenger<
+    'Root',
     MessengerActions<AccountTrackerControllerMessenger>,
-    MessengerEvents<AccountTrackerControllerMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<AccountTrackerControllerMessenger>
+  >,
+): AccountTrackerControllerMessenger {
+  const messenger: AccountTrackerControllerMessenger = new Messenger({
     namespace: 'AccountTrackerController',
     parent: rootMessenger,
   });

app/core/Engine/messengers/address-book-controller-messenger.ts

@@ -13,14 +13,12 @@ import { RootMessenger } from '../types';
  * @returns The AddressBookControllerMessenger.
  */
 export function getAddressBookControllerMessenger(
-  rootMessenger: RootMessenger,
-): AddressBookControllerMessenger {
-  const messenger = new Messenger<
-    'AddressBookController',
+  rootMessenger: RootMessenger<
     MessengerActions<AddressBookControllerMessenger>,
-    MessengerEvents<AddressBookControllerMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<AddressBookControllerMessenger>
+  >,
+): AddressBookControllerMessenger {
+  const messenger: AddressBookControllerMessenger = new Messenger({
     namespace: 'AddressBookController',
     parent: rootMessenger,
   });

app/core/Engine/messengers/analytics-controller-messenger.ts

@@ -14,22 +14,22 @@ import { RootMessenger } from '../types';
  * @returns The AnalyticsControllerMessenger.
  */
 export function getAnalyticsControllerMessenger(
-  rootMessenger: RootMessenger,
-): AnalyticsControllerMessenger {
-  const messenger = new Messenger<
-    'AnalyticsController',
+  rootMessenger: RootMessenger<
     MessengerActions<AnalyticsControllerMessenger>,
-    MessengerEvents<AnalyticsControllerMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<AnalyticsControllerMessenger>
+  >,
+): AnalyticsControllerMessenger {
+  const messenger: AnalyticsControllerMessenger = new Messenger({
     namespace: 'AnalyticsController',
     parent: rootMessenger,
   });
   return messenger;
 }
 
-export type AnalyticsControllerInitMessenger = ReturnType<
-  typeof getAnalyticsControllerInitMessenger
+export type AnalyticsControllerInitMessenger = Messenger<
+  'AnalyticsControllerInit',
+  never,
+  AccountsControllerChangeEvent
 >;
 
 /**
@@ -41,14 +41,12 @@ export type AnalyticsControllerInitMessenger = ReturnType<
  * @returns The AnalyticsControllerInitMessenger.
  */
 export function getAnalyticsControllerInitMessenger(
-  rootMessenger: RootMessenger,
-) {
-  const messenger = new Messenger<
-    'AnalyticsControllerInit',
-    never,
-    AccountsControllerChangeEvent,
-    RootMessenger
-  >({
+  rootMessenger: RootMessenger<
+    MessengerActions<AnalyticsControllerInitMessenger>,
+    MessengerEvents<AnalyticsControllerInitMessenger>
+  >,
+): AnalyticsControllerInitMessenger {
+  const messenger: AnalyticsControllerInitMessenger = new Messenger({
     namespace: 'AnalyticsControllerInit',
     parent: rootMessenger,
   });

app/core/Engine/messengers/app-metadata-controller-messenger/index.ts

@@ -4,25 +4,23 @@ import {
   MessengerEvents,
 } from '@metamask/messenger';
 import { AppMetadataControllerMessenger } from '@metamask/app-metadata-controller';
-import { RootExtendedMessenger, RootMessenger } from '../../types';
+import { RootMessenger } from '../../types';
 
 /**
  * Get the AppMetadataControllerMessenger for the AppMetadataController.
  *
- * @param rootExtendedMessenger - The root extended messenger.
+ * @param rootMessenger - The root messenger.
  * @returns The AppMetadataControllerMessenger.
  */
 export function getAppMetadataControllerMessenger(
-  rootExtendedMessenger: RootExtendedMessenger,
-): AppMetadataControllerMessenger {
-  const messenger = new Messenger<
-    'AppMetadataController',
+  rootMessenger: RootMessenger<
     MessengerActions<AppMetadataControllerMessenger>,
-    MessengerEvents<AppMetadataControllerMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<AppMetadataControllerMessenger>
+  >,
+): AppMetadataControllerMessenger {
+  const messenger: AppMetadataControllerMessenger = new Messenger({
     namespace: 'AppMetadataController',
-    parent: rootExtendedMessenger,
+    parent: rootMessenger,
   });
   return messenger;
 }

app/core/Engine/messengers/assets-contract-controller-messenger.ts

@@ -14,14 +14,12 @@ import { AssetsContractControllerMessenger } from '@metamask/assets-controllers'
  * @returns The AssetsContractControllerMessenger.
  */
 export function getAssetsContractControllerMessenger(
-  rootMessenger: RootMessenger,
-): AssetsContractControllerMessenger {
-  const messenger = new Messenger<
-    'AssetsContractController',
+  rootMessenger: RootMessenger<
     MessengerActions<AssetsContractControllerMessenger>,
-    MessengerEvents<AssetsContractControllerMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<AssetsContractControllerMessenger>
+  >,
+): AssetsContractControllerMessenger {
+  const messenger: AssetsContractControllerMessenger = new Messenger({
     namespace: 'AssetsContractController',
     parent: rootMessenger,
   });

app/core/Engine/messengers/assets-controller/assets-controller-messenger.ts

@@ -8,28 +8,26 @@ import { AuthenticationController } from '@metamask/profile-sync-controller';
 import type { PreferencesControllerGetStateAction } from '@metamask/preferences-controller';
 import type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
 import type { AnalyticsControllerActions } from '@metamask/analytics-controller';
-import { RootExtendedMessenger, RootMessenger } from '../../types';
+import { RootMessenger } from '../../types';
 
 /**
  * Get the messenger for the AssetsController. This is scoped to the
  * actions and events that the AssetsController is allowed to handle.
  *
- * @param rootExtendedMessenger - The root extended messenger.
+ * @param rootMessenger - The root messenger.
  * @returns The AssetsControllerMessenger.
  */
 export function getAssetsControllerMessenger(
-  rootExtendedMessenger: RootExtendedMessenger,
-): AssetsControllerMessenger {
-  const messenger = new Messenger<
-    'AssetsController',
+  rootMessenger: RootMessenger<
     MessengerActions<AssetsControllerMessenger>,
-    MessengerEvents<AssetsControllerMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<AssetsControllerMessenger>
+  >,
+): AssetsControllerMessenger {
+  const messenger: AssetsControllerMessenger = new Messenger({
     namespace: 'AssetsController',
-    parent: rootExtendedMessenger,
+    parent: rootMessenger,
   });
-  rootExtendedMessenger.delegate({
+  rootMessenger.delegate({
     actions: [
       'AccountTreeController:getAccountsFromSelectedAccountGroup',
       'NetworkEnablementController:getState',
@@ -67,34 +65,37 @@ export function getAssetsControllerMessenger(
   return messenger;
 }
 
-export type AssetsControllerInitMessenger = ReturnType<
-  typeof getAssetsControllerInitMessenger
+type AssetsControllerInitMessengerActions =
+  | AuthenticationController.AuthenticationControllerGetBearerTokenAction
+  | PreferencesControllerGetStateAction
+  | RemoteFeatureFlagControllerGetStateAction
+  | AnalyticsControllerActions;
+
+export type AssetsControllerInitMessenger = Messenger<
+  'AssetsControllerInit',
+  AssetsControllerInitMessengerActions,
+  never
 >;
 
 /**
  * Get the messenger for the AssetsController initialization. This is scoped to the
  * actions and events that the AssetsController is allowed to handle during
  * initialization.
  *
- * @param rootExtendedMessenger - The root extended messenger.
+ * @param rootMessenger - The root messenger.
  * @returns The AssetsControllerInitMessenger.
  */
 export function getAssetsControllerInitMessenger(
-  rootExtendedMessenger: RootExtendedMessenger,
-) {
-  const messenger = new Messenger<
-    'AssetsControllerInit',
-    | AuthenticationController.AuthenticationControllerGetBearerTokenAction
-    | PreferencesControllerGetStateAction
-    | RemoteFeatureFlagControllerGetStateAction
-    | AnalyticsControllerActions,
-    never,
-    RootMessenger
-  >({
+  rootMessenger: RootMessenger<
+    MessengerActions<AssetsControllerInitMessenger>,
+    MessengerEvents<AssetsControllerInitMessenger>
+  >,
+): AssetsControllerInitMessenger {
+  const messenger: AssetsControllerInitMessenger = new Messenger({
     namespace: 'AssetsControllerInit',
-    parent: rootExtendedMessenger,
+    parent: rootMessenger,
   });
-  rootExtendedMessenger.delegate({
+  rootMessenger.delegate({
     actions: [
       'AuthenticationController:getBearerToken',
       'PreferencesController:getState',

app/core/Engine/messengers/authenticated-user-storage-service-messenger.ts

@@ -13,14 +13,12 @@ import type { RootMessenger } from '../types';
  * @returns The AuthenticatedUserStorageMessenger.
  */
 export function getAuthenticatedUserStorageServiceMessenger(
-  rootMessenger: RootMessenger,
-): AuthenticatedUserStorageMessenger {
-  const serviceMessenger = new Messenger<
-    'AuthenticatedUserStorageService',
+  rootMessenger: RootMessenger<
     MessengerActions<AuthenticatedUserStorageMessenger>,
-    MessengerEvents<AuthenticatedUserStorageMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<AuthenticatedUserStorageMessenger>
+  >,
+): AuthenticatedUserStorageMessenger {
+  const serviceMessenger: AuthenticatedUserStorageMessenger = new Messenger({
     namespace: 'AuthenticatedUserStorageService',
     parent: rootMessenger,
   });

app/core/Engine/messengers/bridge-controller-messenger/index.ts

@@ -1,7 +1,7 @@
 import { BridgeControllerMessenger } from '@metamask/bridge-controller';
 import { AnalyticsControllerActions } from '@metamask/analytics-controller';
 import type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
-import { RootExtendedMessenger, RootMessenger } from '../../types';
+import { RootMessenger } from '../../types';
 import {
   Messenger,
   MessengerActions,
@@ -11,22 +11,20 @@ import {
 /**
  * Get the BridgeControllerMessenger for the BridgeController.
  *
- * @param rootExtendedMessenger - The base controller messenger.
+ * @param rootMessenger - The root messenger.
  * @returns The BridgeControllerMessenger.
  */
 export function getBridgeControllerMessenger(
-  rootExtendedMessenger: RootExtendedMessenger,
-): BridgeControllerMessenger {
-  const messenger = new Messenger<
-    'BridgeController',
+  rootMessenger: RootMessenger<
     MessengerActions<BridgeControllerMessenger>,
-    MessengerEvents<BridgeControllerMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<BridgeControllerMessenger>
+  >,
+): BridgeControllerMessenger {
+  const messenger: BridgeControllerMessenger = new Messenger({
     namespace: 'BridgeController',
-    parent: rootExtendedMessenger,
+    parent: rootMessenger,
   });
-  rootExtendedMessenger.delegate({
+  rootMessenger.delegate({
     actions: [
       'AccountsController:getAccountByAddress',
       'SnapController:handleRequest',
@@ -49,31 +47,26 @@ type BridgeControllerInitMessengerActions =
   | AnalyticsControllerActions
   | RemoteFeatureFlagControllerGetStateAction;
 
+export type BridgeControllerInitMessenger = Messenger<
+  'BridgeControllerInit',
+  BridgeControllerInitMessengerActions,
+  never
+>;
+
 /**
  * Get the BridgeControllerInitMessenger for the BridgeController.
  * This messenger is used during controller initialization to call other controllers.
  *
  * @param rootMessenger - The root messenger.
  * @returns The BridgeControllerInitMessenger.
  */
-export type BridgeControllerInitMessenger = ReturnType<
-  typeof getBridgeControllerInitMessenger
->;
-
 export function getBridgeControllerInitMessenger(
-  rootMessenger: RootMessenger,
-): Messenger<
-  'BridgeControllerInit',
-  BridgeControllerInitMessengerActions,
-  never,
-  RootMessenger
-> {
-  const messenger = new Messenger<
-    'BridgeControllerInit',
-    BridgeControllerInitMessengerActions,
-    never,
-    RootMessenger
-  >({
+  rootMessenger: RootMessenger<
+    MessengerActions<BridgeControllerInitMessenger>,
+    MessengerEvents<BridgeControllerInitMessenger>
+  >,
+): BridgeControllerInitMessenger {
+  const messenger: BridgeControllerInitMessenger = new Messenger({
     namespace: 'BridgeControllerInit',
     parent: rootMessenger,
   });

app/core/Engine/messengers/bridge-status-controller-messenger/index.ts

@@ -1,5 +1,5 @@
 import { BridgeStatusControllerMessenger } from '@metamask/bridge-status-controller';
-import { RootExtendedMessenger, RootMessenger } from '../../types';
+import { RootMessenger } from '../../types';
 import {
   Messenger,
   MessengerActions,
@@ -9,22 +9,20 @@ import {
 /**
  * Get the BridgeControllerMessenger for the BridgeController.
  *
- * @param rootExtendedMessenger - The base controller messenger.
+ * @param rootMessenger - The root messenger.
  * @returns The BridgeControllerMessenger.
  */
 export function getBridgeStatusControllerMessenger(
-  rootExtendedMessenger: RootExtendedMessenger,
-): BridgeStatusControllerMessenger {
-  const messenger = new Messenger<
-    'BridgeStatusController',
+  rootMessenger: RootMessenger<
     MessengerActions<BridgeStatusControllerMessenger>,
-    MessengerEvents<BridgeStatusControllerMessenger>,
-    RootMessenger
-  >({
+    MessengerEvents<BridgeStatusControllerMessenger>
+  >,
+): BridgeStatusControllerMessenger {
+  const messenger: BridgeStatusControllerMessenger = new Messenger({
     namespace: 'BridgeStatusController',
-    parent: rootExtendedMessenger,
+    parent: rootMessenger,
   });
-  rootExtendedMessenger.delegate({
+  rootMessenger.delegate({
     actions: [
       'AccountsController:getAccountByAddress',
       'NetworkController:getNetworkClientById',