diff --git a/package.json b/package.json
index 0f846575bc5b..ac61c8298e51 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,8 @@
     "gem:bundle:install": "bundle install --gemfile=ios/Gemfile",
     "clean:android": "rm -rf android/app/build",
     "clean": "yarn clean:ios && yarn clean:android && yarn install --immutable",
-    "generate-method-action-types": "messenger-generate-action-types --fix app && prettier --write 'app/**/*-method-action-types.ts'",
-    "generate-method-action-types:check": "yarn generate-method-action-types && git diff --exit-code 'app/**/*-method-action-types.ts'",
-    "lint": "NODE_OPTIONS='--max-old-space-size=8192' eslint '**/*.{js,ts,tsx}' --cache && yarn generate-method-action-types:check",
-    "lint:fix": "NODE_OPTIONS='--max-old-space-size=8192' eslint '**/*.{js,ts,tsx}' --fix --cache && yarn generate-method-action-types",
+    "lint": "NODE_OPTIONS='--max-old-space-size=8192' eslint '**/*.{js,ts,tsx}' --cache && yarn messenger-action-types:check",
+    "lint:fix": "NODE_OPTIONS='--max-old-space-size=8192' eslint '**/*.{js,ts,tsx}' --fix --cache && yarn messenger-action-types:generate",
     "lint:clean": "rm -f .eslintcache",
     "lint:tsc": "NODE_OPTIONS='--max-old-space-size=8192' tsc --project ./tsconfig.json",
     "format": "prettier '**/*.{js,ts,tsx,json}' --write",
@@ -152,7 +150,9 @@
     "a:ios": "scripts/perps/agentic/preflight.sh --platform ios --wallet-setup",
     "a:android": "scripts/perps/agentic/preflight.sh --platform android --wallet-setup",
     "a:setup:ios": "scripts/perps/agentic/preflight.sh --platform ios --clean --wallet-setup",
-    "a:setup:android": "scripts/perps/agentic/preflight.sh --platform android --clean --wallet-setup"
+    "a:setup:android": "scripts/perps/agentic/preflight.sh --platform android --clean --wallet-setup",
+    "messenger-action-types:generate": "messenger-action-types --generate app && prettier --write \"app/**/*-method-action-types.ts\"",
+    "messenger-action-types:check": "messenger-action-types --generate app; prettier --write \"app/**/*-method-action-types.ts\" && git diff --exit-code \"app/**/*-method-action-types.ts\""
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -542,6 +542,7 @@
     "@metamask/eslint-config-typescript": "^13.0.0",
     "@metamask/eslint-plugin-design-tokens": "^1.0.0",
     "@metamask/foundryup": "1.0.0",
+    "@metamask/messenger-cli": "^0.1.0",
     "@metamask/mobile-provider": "^3.0.0",
     "@metamask/object-multiplex": "^1.1.0",
     "@metamask/providers": "^18.3.1",
diff --git a/yarn.lock b/yarn.lock
index edd8c58a85b5..40ad0530e57f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8904,6 +8904,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/messenger-cli@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@metamask/messenger-cli@npm:0.1.0"
+  dependencies:
+    "@metamask/utils": "npm:^11.9.0"
+    yargs: "npm:^17.7.2"
+  peerDependencies:
+    eslint: ">=8"
+    typescript: ">=5.0.0"
+  peerDependenciesMeta:
+    eslint:
+      optional: true
+  bin:
+    messenger-action-types: ./dist/cli.mjs
+  checksum: 10/dd359df00f2eba98dcfe5f3d8352d859f2e814220e709efe989ecb68c611ba32ea515fd6099a770a706066f1820abd07a134a2acf5fc6b883518c5d19991a8e2
+  languageName: node
+  linkType: hard
+
 "@metamask/messenger@npm:^1.0.0, @metamask/messenger@npm:^1.1.0, @metamask/messenger@npm:^1.1.1":
   version: 1.1.1
   resolution: "@metamask/messenger@npm:1.1.1"
@@ -35490,6 +35508,7 @@ __metadata:
     "@metamask/logging-controller": "npm:^8.0.0"
     "@metamask/message-signing-snap": "npm:^1.1.2"
     "@metamask/messenger": "npm:^1.1.0"
+    "@metamask/messenger-cli": "npm:^0.1.0"
     "@metamask/metamask-eth-abis": "npm:3.1.1"
     "@metamask/mobile-provider": "npm:^3.0.0"
     "@metamask/mobile-wallet-protocol-core": "npm:^0.4.0"